diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/Elastic.Clients.Elasticsearch.Serverless.csproj b/src/Elastic.Clients.Elasticsearch.Serverless/Elastic.Clients.Elasticsearch.Serverless.csproj
index 8ba54c7ca36..c3273d3eb74 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/Elastic.Clients.Elasticsearch.Serverless.csproj
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/Elastic.Clients.Elasticsearch.Serverless.csproj
@@ -19,9 +19,14 @@
     <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Nullable>annotations</Nullable>
+    <PolySharpIncludeRuntimeSupportedAttributes>true</PolySharpIncludeRuntimeSupportedAttributes>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Elastic.Transport" Version="0.5.7" />
+    <PackageReference Include="PolySharp" Version="1.15.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
   <ItemGroup>
     <InternalsVisibleTo Include="Tests" Key="$(ExposedPublicKey)" />
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/AsyncSearch/AsyncSearchStatusResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/AsyncSearch/AsyncSearchStatusResponse.g.cs
index ac935fb70ef..7a585979fc3 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/AsyncSearch/AsyncSearchStatusResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/AsyncSearch/AsyncSearchStatusResponse.g.cs
@@ -18,14 +18,161 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.AsyncSearch;
 
+internal sealed partial class AsyncSearchStatusResponseConverter : System.Text.Json.Serialization.JsonConverter<AsyncSearchStatusResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropClusters = System.Text.Json.JsonEncodedText.Encode("_clusters");
+	private static readonly System.Text.Json.JsonEncodedText PropCompletionStatus = System.Text.Json.JsonEncodedText.Encode("completion_status");
+	private static readonly System.Text.Json.JsonEncodedText PropCompletionTime = System.Text.Json.JsonEncodedText.Encode("completion_time");
+	private static readonly System.Text.Json.JsonEncodedText PropCompletionTimeInMillis = System.Text.Json.JsonEncodedText.Encode("completion_time_in_millis");
+	private static readonly System.Text.Json.JsonEncodedText PropExpirationTime = System.Text.Json.JsonEncodedText.Encode("expiration_time");
+	private static readonly System.Text.Json.JsonEncodedText PropExpirationTimeInMillis = System.Text.Json.JsonEncodedText.Encode("expiration_time_in_millis");
+	private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("id");
+	private static readonly System.Text.Json.JsonEncodedText PropIsPartial = System.Text.Json.JsonEncodedText.Encode("is_partial");
+	private static readonly System.Text.Json.JsonEncodedText PropIsRunning = System.Text.Json.JsonEncodedText.Encode("is_running");
+	private static readonly System.Text.Json.JsonEncodedText PropShards = System.Text.Json.JsonEncodedText.Encode("_shards");
+	private static readonly System.Text.Json.JsonEncodedText PropStartTime = System.Text.Json.JsonEncodedText.Encode("start_time");
+	private static readonly System.Text.Json.JsonEncodedText PropStartTimeInMillis = System.Text.Json.JsonEncodedText.Encode("start_time_in_millis");
+
+	public override AsyncSearchStatusResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.ClusterStatistics?> propClusters = default;
+		LocalJsonProperty<int?> propCompletionStatus = default;
+		LocalJsonProperty<DateTimeOffset?> propCompletionTime = default;
+		LocalJsonProperty<long?> propCompletionTimeInMillis = default;
+		LocalJsonProperty<DateTimeOffset?> propExpirationTime = default;
+		LocalJsonProperty<long> propExpirationTimeInMillis = default;
+		LocalJsonProperty<string?> propId = default;
+		LocalJsonProperty<bool> propIsPartial = default;
+		LocalJsonProperty<bool> propIsRunning = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.ShardStatistics> propShards = default;
+		LocalJsonProperty<DateTimeOffset?> propStartTime = default;
+		LocalJsonProperty<long> propStartTimeInMillis = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propClusters.TryRead(ref reader, options, PropClusters))
+			{
+				continue;
+			}
+
+			if (propCompletionStatus.TryRead(ref reader, options, PropCompletionStatus))
+			{
+				continue;
+			}
+
+			if (propCompletionTime.TryRead(ref reader, options, PropCompletionTime))
+			{
+				continue;
+			}
+
+			if (propCompletionTimeInMillis.TryRead(ref reader, options, PropCompletionTimeInMillis))
+			{
+				continue;
+			}
+
+			if (propExpirationTime.TryRead(ref reader, options, PropExpirationTime))
+			{
+				continue;
+			}
+
+			if (propExpirationTimeInMillis.TryRead(ref reader, options, PropExpirationTimeInMillis))
+			{
+				continue;
+			}
+
+			if (propId.TryRead(ref reader, options, PropId))
+			{
+				continue;
+			}
+
+			if (propIsPartial.TryRead(ref reader, options, PropIsPartial))
+			{
+				continue;
+			}
+
+			if (propIsRunning.TryRead(ref reader, options, PropIsRunning))
+			{
+				continue;
+			}
+
+			if (propShards.TryRead(ref reader, options, PropShards))
+			{
+				continue;
+			}
+
+			if (propStartTime.TryRead(ref reader, options, PropStartTime))
+			{
+				continue;
+			}
+
+			if (propStartTimeInMillis.TryRead(ref reader, options, PropStartTimeInMillis))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new AsyncSearchStatusResponse
+		{
+			Clusters = propClusters.Value
+,
+			CompletionStatus = propCompletionStatus.Value
+,
+			CompletionTime = propCompletionTime.Value
+,
+			CompletionTimeInMillis = propCompletionTimeInMillis.Value
+,
+			ExpirationTime = propExpirationTime.Value
+,
+			ExpirationTimeInMillis = propExpirationTimeInMillis.Value
+,
+			Id = propId.Value
+,
+			IsPartial = propIsPartial.Value
+,
+			IsRunning = propIsRunning.Value
+,
+			Shards = propShards.Value
+,
+			StartTime = propStartTime.Value
+,
+			StartTimeInMillis = propStartTimeInMillis.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, AsyncSearchStatusResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropClusters, value.Clusters);
+		writer.WriteProperty(options, PropCompletionStatus, value.CompletionStatus);
+		writer.WriteProperty(options, PropCompletionTime, value.CompletionTime);
+		writer.WriteProperty(options, PropCompletionTimeInMillis, value.CompletionTimeInMillis);
+		writer.WriteProperty(options, PropExpirationTime, value.ExpirationTime);
+		writer.WriteProperty(options, PropExpirationTimeInMillis, value.ExpirationTimeInMillis);
+		writer.WriteProperty(options, PropId, value.Id);
+		writer.WriteProperty(options, PropIsPartial, value.IsPartial);
+		writer.WriteProperty(options, PropIsRunning, value.IsRunning);
+		writer.WriteProperty(options, PropShards, value.Shards);
+		writer.WriteProperty(options, PropStartTime, value.StartTime);
+		writer.WriteProperty(options, PropStartTimeInMillis, value.StartTimeInMillis);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(AsyncSearchStatusResponseConverter))]
 public sealed partial class AsyncSearchStatusResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -34,7 +181,6 @@ public sealed partial class AsyncSearchStatusResponse : ElasticsearchResponse
 	/// Not shown for local-only searches.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("_clusters")]
 	public Elastic.Clients.Elasticsearch.Serverless.ClusterStatistics? Clusters { get; init; }
 
 	/// <summary>
@@ -44,7 +190,6 @@ public sealed partial class AsyncSearchStatusResponse : ElasticsearchResponse
 	/// 503 indicates that the async search was completed with an error.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("completion_status")]
 	public int? CompletionStatus { get; init; }
 
 	/// <summary>
@@ -53,9 +198,7 @@ public sealed partial class AsyncSearchStatusResponse : ElasticsearchResponse
 	/// when the search has completed.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("completion_time")]
 	public DateTimeOffset? CompletionTime { get; init; }
-	[JsonInclude, JsonPropertyName("completion_time_in_millis")]
 	public long? CompletionTimeInMillis { get; init; }
 
 	/// <summary>
@@ -63,11 +206,8 @@ public sealed partial class AsyncSearchStatusResponse : ElasticsearchResponse
 	/// Indicates when the async search will expire.
 	/// </para>
 	/// </summary>
-	[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; }
 
 	/// <summary>
@@ -76,7 +216,6 @@ public sealed partial class AsyncSearchStatusResponse : ElasticsearchResponse
 	/// While the query is running, <c>is_partial</c> is always set to <c>true</c>.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("is_partial")]
 	public bool IsPartial { get; init; }
 
 	/// <summary>
@@ -85,7 +224,6 @@ public sealed partial class AsyncSearchStatusResponse : ElasticsearchResponse
 	/// NOTE: If the search failed after some shards returned their results or the node that is coordinating the async search dies, results may be partial even though <c>is_running</c> is <c>false</c>.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("is_running")]
 	public bool IsRunning { get; init; }
 
 	/// <summary>
@@ -93,10 +231,7 @@ public sealed partial class AsyncSearchStatusResponse : ElasticsearchResponse
 	/// Indicates how many shards have run the query so far.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("_shards")]
 	public Elastic.Clients.Elasticsearch.Serverless.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.Serverless/_Generated/Api/AsyncSearch/DeleteAsyncSearchResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/AsyncSearch/DeleteAsyncSearchResponse.g.cs
index 66a78fb63cb..f9853190696 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/AsyncSearch/DeleteAsyncSearchResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/AsyncSearch/DeleteAsyncSearchResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.AsyncSearch;
 
+internal sealed partial class DeleteAsyncSearchResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteAsyncSearchResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override DeleteAsyncSearchResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteAsyncSearchResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteAsyncSearchResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteAsyncSearchResponseConverter))]
 public sealed partial class DeleteAsyncSearchResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class DeleteAsyncSearchResponse : ElasticsearchResponse
 	/// 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.Serverless/_Generated/Api/AsyncSearch/GetAsyncSearchResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/AsyncSearch/GetAsyncSearchResponse.g.cs
index a7fd20fd67d..1e8cf4d10f0 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/AsyncSearch/GetAsyncSearchResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/AsyncSearch/GetAsyncSearchResponse.g.cs
@@ -18,14 +18,158 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.AsyncSearch;
 
+internal sealed partial class GetAsyncSearchResponseConverter<TDocument> : System.Text.Json.Serialization.JsonConverter<GetAsyncSearchResponse<TDocument>>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCompletionTime = System.Text.Json.JsonEncodedText.Encode("completion_time");
+	private static readonly System.Text.Json.JsonEncodedText PropCompletionTimeInMillis = System.Text.Json.JsonEncodedText.Encode("completion_time_in_millis");
+	private static readonly System.Text.Json.JsonEncodedText PropExpirationTime = System.Text.Json.JsonEncodedText.Encode("expiration_time");
+	private static readonly System.Text.Json.JsonEncodedText PropExpirationTimeInMillis = System.Text.Json.JsonEncodedText.Encode("expiration_time_in_millis");
+	private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("id");
+	private static readonly System.Text.Json.JsonEncodedText PropIsPartial = System.Text.Json.JsonEncodedText.Encode("is_partial");
+	private static readonly System.Text.Json.JsonEncodedText PropIsRunning = System.Text.Json.JsonEncodedText.Encode("is_running");
+	private static readonly System.Text.Json.JsonEncodedText PropResponse = System.Text.Json.JsonEncodedText.Encode("response");
+	private static readonly System.Text.Json.JsonEncodedText PropStartTime = System.Text.Json.JsonEncodedText.Encode("start_time");
+	private static readonly System.Text.Json.JsonEncodedText PropStartTimeInMillis = System.Text.Json.JsonEncodedText.Encode("start_time_in_millis");
+
+	public override GetAsyncSearchResponse<TDocument> Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<DateTimeOffset?> propCompletionTime = default;
+		LocalJsonProperty<long?> propCompletionTimeInMillis = default;
+		LocalJsonProperty<DateTimeOffset?> propExpirationTime = default;
+		LocalJsonProperty<long> propExpirationTimeInMillis = default;
+		LocalJsonProperty<string?> propId = default;
+		LocalJsonProperty<bool> propIsPartial = default;
+		LocalJsonProperty<bool> propIsRunning = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.AsyncSearch.AsyncSearch<TDocument>> propResponse = default;
+		LocalJsonProperty<DateTimeOffset?> propStartTime = default;
+		LocalJsonProperty<long> propStartTimeInMillis = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCompletionTime.TryRead(ref reader, options, PropCompletionTime))
+			{
+				continue;
+			}
+
+			if (propCompletionTimeInMillis.TryRead(ref reader, options, PropCompletionTimeInMillis))
+			{
+				continue;
+			}
+
+			if (propExpirationTime.TryRead(ref reader, options, PropExpirationTime))
+			{
+				continue;
+			}
+
+			if (propExpirationTimeInMillis.TryRead(ref reader, options, PropExpirationTimeInMillis))
+			{
+				continue;
+			}
+
+			if (propId.TryRead(ref reader, options, PropId))
+			{
+				continue;
+			}
+
+			if (propIsPartial.TryRead(ref reader, options, PropIsPartial))
+			{
+				continue;
+			}
+
+			if (propIsRunning.TryRead(ref reader, options, PropIsRunning))
+			{
+				continue;
+			}
+
+			if (propResponse.TryRead(ref reader, options, PropResponse))
+			{
+				continue;
+			}
+
+			if (propStartTime.TryRead(ref reader, options, PropStartTime))
+			{
+				continue;
+			}
+
+			if (propStartTimeInMillis.TryRead(ref reader, options, PropStartTimeInMillis))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetAsyncSearchResponse<TDocument>
+		{
+			CompletionTime = propCompletionTime.Value
+,
+			CompletionTimeInMillis = propCompletionTimeInMillis.Value
+,
+			ExpirationTime = propExpirationTime.Value
+,
+			ExpirationTimeInMillis = propExpirationTimeInMillis.Value
+,
+			Id = propId.Value
+,
+			IsPartial = propIsPartial.Value
+,
+			IsRunning = propIsRunning.Value
+,
+			Response = propResponse.Value
+,
+			StartTime = propStartTime.Value
+,
+			StartTimeInMillis = propStartTimeInMillis.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetAsyncSearchResponse<TDocument> value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCompletionTime, value.CompletionTime);
+		writer.WriteProperty(options, PropCompletionTimeInMillis, value.CompletionTimeInMillis);
+		writer.WriteProperty(options, PropExpirationTime, value.ExpirationTime);
+		writer.WriteProperty(options, PropExpirationTimeInMillis, value.ExpirationTimeInMillis);
+		writer.WriteProperty(options, PropId, value.Id);
+		writer.WriteProperty(options, PropIsPartial, value.IsPartial);
+		writer.WriteProperty(options, PropIsRunning, value.IsRunning);
+		writer.WriteProperty(options, PropResponse, value.Response);
+		writer.WriteProperty(options, PropStartTime, value.StartTime);
+		writer.WriteProperty(options, PropStartTimeInMillis, value.StartTimeInMillis);
+		writer.WriteEndObject();
+	}
+}
+
+internal sealed partial class GetAsyncSearchResponseConverterFactory : System.Text.Json.Serialization.JsonConverterFactory
+{
+	public override bool CanConvert(System.Type typeToConvert)
+	{
+		return typeToConvert.IsGenericType && typeToConvert.GetGenericTypeDefinition() == typeof(GetAsyncSearchResponse<>);
+	}
+
+	public override System.Text.Json.Serialization.JsonConverter CreateConverter(System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		var args = typeToConvert.GetGenericArguments();
+#pragma warning disable IL3050
+		var converter = (System.Text.Json.Serialization.JsonConverter)System.Activator.CreateInstance(typeof(GetAsyncSearchResponseConverter<>).MakeGenericType(args[0]), System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public, binder: null, args: null, culture: null)!;
+#pragma warning restore IL3050
+		return converter;
+	}
+}
+
+[JsonConverter(typeof(GetAsyncSearchResponseConverterFactory))]
 public sealed partial class GetAsyncSearchResponse<TDocument> : ElasticsearchResponse
 {
 	/// <summary>
@@ -34,9 +178,7 @@ public sealed partial class GetAsyncSearchResponse<TDocument> : ElasticsearchRes
 	/// when the search has completed.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("completion_time")]
 	public DateTimeOffset? CompletionTime { get; init; }
-	[JsonInclude, JsonPropertyName("completion_time_in_millis")]
 	public long? CompletionTimeInMillis { get; init; }
 
 	/// <summary>
@@ -44,11 +186,8 @@ public sealed partial class GetAsyncSearchResponse<TDocument> : ElasticsearchRes
 	/// Indicates when the async search will expire.
 	/// </para>
 	/// </summary>
-	[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; }
 
 	/// <summary>
@@ -57,7 +196,6 @@ public sealed partial class GetAsyncSearchResponse<TDocument> : ElasticsearchRes
 	/// While the query is running, <c>is_partial</c> is always set to <c>true</c>.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("is_partial")]
 	public bool IsPartial { get; init; }
 
 	/// <summary>
@@ -66,12 +204,8 @@ public sealed partial class GetAsyncSearchResponse<TDocument> : ElasticsearchRes
 	/// NOTE: If the search failed after some shards returned their results or the node that is coordinating the async search dies, results may be partial even though <c>is_running</c> is <c>false</c>.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("is_running")]
 	public bool IsRunning { get; init; }
-	[JsonInclude, JsonPropertyName("response")]
 	public Elastic.Clients.Elasticsearch.Serverless.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.Serverless/_Generated/Api/AsyncSearch/SubmitAsyncSearchRequest.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/AsyncSearch/SubmitAsyncSearchRequest.g.cs
index da346fb535f..d3199154d1a 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/AsyncSearch/SubmitAsyncSearchRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/AsyncSearch/SubmitAsyncSearchRequest.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Requests;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport;
@@ -231,410 +232,346 @@ public sealed partial class SubmitAsyncSearchRequestParameters : RequestParamete
 	public Elastic.Clients.Elasticsearch.Serverless.Duration? WaitForCompletionTimeout { get => Q<Elastic.Clients.Elasticsearch.Serverless.Duration?>("wait_for_completion_timeout"); set => Q("wait_for_completion_timeout", value); }
 }
 
-internal sealed partial class SubmitAsyncSearchRequestConverter : JsonConverter<SubmitAsyncSearchRequest>
+internal sealed partial class SubmitAsyncSearchRequestConverter : System.Text.Json.Serialization.JsonConverter<SubmitAsyncSearchRequest>
 {
-	public override SubmitAsyncSearchRequest Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		var variant = new SubmitAsyncSearchRequest();
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
-		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations1 = System.Text.Json.JsonEncodedText.Encode("aggs");
+	private static readonly System.Text.Json.JsonEncodedText PropCollapse = System.Text.Json.JsonEncodedText.Encode("collapse");
+	private static readonly System.Text.Json.JsonEncodedText PropDocvalueFields = System.Text.Json.JsonEncodedText.Encode("docvalue_fields");
+	private static readonly System.Text.Json.JsonEncodedText PropExplain = System.Text.Json.JsonEncodedText.Encode("explain");
+	private static readonly System.Text.Json.JsonEncodedText PropExt = System.Text.Json.JsonEncodedText.Encode("ext");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropFrom = System.Text.Json.JsonEncodedText.Encode("from");
+	private static readonly System.Text.Json.JsonEncodedText PropHighlight = System.Text.Json.JsonEncodedText.Encode("highlight");
+	private static readonly System.Text.Json.JsonEncodedText PropIndicesBoost = System.Text.Json.JsonEncodedText.Encode("indices_boost");
+	private static readonly System.Text.Json.JsonEncodedText PropKnn = System.Text.Json.JsonEncodedText.Encode("knn");
+	private static readonly System.Text.Json.JsonEncodedText PropMinScore = System.Text.Json.JsonEncodedText.Encode("min_score");
+	private static readonly System.Text.Json.JsonEncodedText PropPit = System.Text.Json.JsonEncodedText.Encode("pit");
+	private static readonly System.Text.Json.JsonEncodedText PropPostFilter = System.Text.Json.JsonEncodedText.Encode("post_filter");
+	private static readonly System.Text.Json.JsonEncodedText PropProfile = System.Text.Json.JsonEncodedText.Encode("profile");
+	private static readonly System.Text.Json.JsonEncodedText PropQuery = System.Text.Json.JsonEncodedText.Encode("query");
+	private static readonly System.Text.Json.JsonEncodedText PropRescore = System.Text.Json.JsonEncodedText.Encode("rescore");
+	private static readonly System.Text.Json.JsonEncodedText PropRuntimeMappings = System.Text.Json.JsonEncodedText.Encode("runtime_mappings");
+	private static readonly System.Text.Json.JsonEncodedText PropScriptFields = System.Text.Json.JsonEncodedText.Encode("script_fields");
+	private static readonly System.Text.Json.JsonEncodedText PropSearchAfter = System.Text.Json.JsonEncodedText.Encode("search_after");
+	private static readonly System.Text.Json.JsonEncodedText PropSeqNoPrimaryTerm = System.Text.Json.JsonEncodedText.Encode("seq_no_primary_term");
+	private static readonly System.Text.Json.JsonEncodedText PropSize = System.Text.Json.JsonEncodedText.Encode("size");
+	private static readonly System.Text.Json.JsonEncodedText PropSlice = System.Text.Json.JsonEncodedText.Encode("slice");
+	private static readonly System.Text.Json.JsonEncodedText PropSort = System.Text.Json.JsonEncodedText.Encode("sort");
+	private static readonly System.Text.Json.JsonEncodedText PropSource = System.Text.Json.JsonEncodedText.Encode("_source");
+	private static readonly System.Text.Json.JsonEncodedText PropStats = System.Text.Json.JsonEncodedText.Encode("stats");
+	private static readonly System.Text.Json.JsonEncodedText PropStoredFields = System.Text.Json.JsonEncodedText.Encode("stored_fields");
+	private static readonly System.Text.Json.JsonEncodedText PropSuggest = System.Text.Json.JsonEncodedText.Encode("suggest");
+	private static readonly System.Text.Json.JsonEncodedText PropTerminateAfter = System.Text.Json.JsonEncodedText.Encode("terminate_after");
+	private static readonly System.Text.Json.JsonEncodedText PropTimeout = System.Text.Json.JsonEncodedText.Encode("timeout");
+	private static readonly System.Text.Json.JsonEncodedText PropTrackScores = System.Text.Json.JsonEncodedText.Encode("track_scores");
+	private static readonly System.Text.Json.JsonEncodedText PropTrackTotalHits = System.Text.Json.JsonEncodedText.Encode("track_total_hits");
+	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("version");
+
+	public override SubmitAsyncSearchRequest Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.Aggregation>?> propAggregations = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Core.Search.FieldCollapse?> propCollapse = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.FieldAndFormat>?> propDocvalueFields = default;
+		LocalJsonProperty<bool?> propExplain = default;
+		LocalJsonProperty<IDictionary<string, object>?> propExt = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.FieldAndFormat>?> propFields = default;
+		LocalJsonProperty<int?> propFrom = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Core.Search.Highlight?> propHighlight = default;
+		LocalJsonProperty<ICollection<IDictionary<Elastic.Clients.Elasticsearch.Serverless.IndexName, double>>?> propIndicesBoost = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.KnnSearch>?> propKnn = default;
+		LocalJsonProperty<double?> propMinScore = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Core.Search.PointInTimeReference?> propPit = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query?> propPostFilter = default;
+		LocalJsonProperty<bool?> propProfile = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query?> propQuery = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.Core.Search.Rescore>?> propRescore = default;
+		LocalJsonProperty<IDictionary<Elastic.Clients.Elasticsearch.Serverless.Field, Elastic.Clients.Elasticsearch.Serverless.Mapping.RuntimeField>?> propRuntimeMappings = default;
+		LocalJsonProperty<IDictionary<string, Elastic.Clients.Elasticsearch.Serverless.ScriptField>?> propScriptFields = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.FieldValue>?> propSearchAfter = default;
+		LocalJsonProperty<bool?> propSeqNoPrimaryTerm = default;
+		LocalJsonProperty<int?> propSize = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.SlicedScroll?> propSlice = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.SortOptions>?> propSort = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Core.Search.SourceConfig?> propSource = default;
+		LocalJsonProperty<ICollection<string>?> propStats = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Fields?> propStoredFields = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Core.Search.Suggester?> propSuggest = default;
+		LocalJsonProperty<long?> propTerminateAfter = default;
+		LocalJsonProperty<string?> propTimeout = default;
+		LocalJsonProperty<bool?> propTrackScores = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Core.Search.TrackHits?> propTrackTotalHits = default;
+		LocalJsonProperty<bool?> propVersion = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAggregations.TryRead(ref reader, options, PropAggregations) || propAggregations.TryRead(ref reader, options, PropAggregations1))
 			{
-				var property = reader.GetString();
-				if (property == "aggregations" || property == "aggs")
-				{
-					variant.Aggregations = JsonSerializer.Deserialize<IDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.Aggregation>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "collapse")
-				{
-					variant.Collapse = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Core.Search.FieldCollapse?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "docvalue_fields")
-				{
-					variant.DocvalueFields = JsonSerializer.Deserialize<ICollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.FieldAndFormat>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "explain")
-				{
-					variant.Explain = JsonSerializer.Deserialize<bool?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "ext")
-				{
-					variant.Ext = JsonSerializer.Deserialize<IDictionary<string, object>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "fields")
-				{
-					variant.Fields = JsonSerializer.Deserialize<ICollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.FieldAndFormat>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "from")
-				{
-					variant.From = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "highlight")
-				{
-					variant.Highlight = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Core.Search.Highlight?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "indices_boost")
-				{
-					variant.IndicesBoost = JsonSerializer.Deserialize<ICollection<IDictionary<Elastic.Clients.Elasticsearch.Serverless.IndexName, double>>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "knn")
-				{
-					variant.Knn = JsonSerializer.Deserialize<ICollection<Elastic.Clients.Elasticsearch.Serverless.KnnSearch>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "min_score")
-				{
-					variant.MinScore = JsonSerializer.Deserialize<double?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "pit")
-				{
-					variant.Pit = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Core.Search.PointInTimeReference?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "post_filter")
-				{
-					variant.PostFilter = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "profile")
-				{
-					variant.Profile = JsonSerializer.Deserialize<bool?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "query")
-				{
-					variant.Query = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "rescore")
-				{
-					variant.Rescore = JsonSerializer.Deserialize<ICollection<Elastic.Clients.Elasticsearch.Serverless.Core.Search.Rescore>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "runtime_mappings")
-				{
-					variant.RuntimeMappings = JsonSerializer.Deserialize<IDictionary<Elastic.Clients.Elasticsearch.Serverless.Field, Elastic.Clients.Elasticsearch.Serverless.Mapping.RuntimeField>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "script_fields")
-				{
-					variant.ScriptFields = JsonSerializer.Deserialize<IDictionary<string, Elastic.Clients.Elasticsearch.Serverless.ScriptField>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "search_after")
-				{
-					variant.SearchAfter = JsonSerializer.Deserialize<ICollection<Elastic.Clients.Elasticsearch.Serverless.FieldValue>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "seq_no_primary_term")
-				{
-					variant.SeqNoPrimaryTerm = JsonSerializer.Deserialize<bool?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "size")
-				{
-					variant.Size = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "slice")
-				{
-					variant.Slice = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.SlicedScroll?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "sort")
-				{
-					variant.Sort = JsonSerializer.Deserialize<ICollection<Elastic.Clients.Elasticsearch.Serverless.SortOptions>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "_source")
-				{
-					variant.Source = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Core.Search.SourceConfig?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "stats")
-				{
-					variant.Stats = JsonSerializer.Deserialize<ICollection<string>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "stored_fields")
-				{
-					variant.StoredFields = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Fields?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "suggest")
-				{
-					variant.Suggest = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Core.Search.Suggester?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "terminate_after")
-				{
-					variant.TerminateAfter = JsonSerializer.Deserialize<long?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "timeout")
-				{
-					variant.Timeout = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "track_scores")
-				{
-					variant.TrackScores = JsonSerializer.Deserialize<bool?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "track_total_hits")
-				{
-					variant.TrackTotalHits = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Core.Search.TrackHits?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "version")
-				{
-					variant.Version = JsonSerializer.Deserialize<bool?>(ref reader, options);
-					continue;
-				}
+				continue;
 			}
-		}
-
-		return variant;
-	}
-
-	public override void Write(Utf8JsonWriter writer, SubmitAsyncSearchRequest value, JsonSerializerOptions options)
-	{
-		writer.WriteStartObject();
-		if (value.Aggregations is not null)
-		{
-			writer.WritePropertyName("aggregations");
-			JsonSerializer.Serialize(writer, value.Aggregations, options);
-		}
 
-		if (value.Collapse is not null)
-		{
-			writer.WritePropertyName("collapse");
-			JsonSerializer.Serialize(writer, value.Collapse, options);
-		}
+			if (propCollapse.TryRead(ref reader, options, PropCollapse))
+			{
+				continue;
+			}
 
-		if (value.DocvalueFields is not null)
-		{
-			writer.WritePropertyName("docvalue_fields");
-			JsonSerializer.Serialize(writer, value.DocvalueFields, options);
-		}
+			if (propDocvalueFields.TryRead(ref reader, options, PropDocvalueFields))
+			{
+				continue;
+			}
 
-		if (value.Explain.HasValue)
-		{
-			writer.WritePropertyName("explain");
-			writer.WriteBooleanValue(value.Explain.Value);
-		}
+			if (propExplain.TryRead(ref reader, options, PropExplain))
+			{
+				continue;
+			}
 
-		if (value.Ext is not null)
-		{
-			writer.WritePropertyName("ext");
-			JsonSerializer.Serialize(writer, value.Ext, options);
-		}
+			if (propExt.TryRead(ref reader, options, PropExt))
+			{
+				continue;
+			}
 
-		if (value.Fields is not null)
-		{
-			writer.WritePropertyName("fields");
-			JsonSerializer.Serialize(writer, value.Fields, options);
-		}
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
 
-		if (value.From.HasValue)
-		{
-			writer.WritePropertyName("from");
-			writer.WriteNumberValue(value.From.Value);
-		}
+			if (propFrom.TryRead(ref reader, options, PropFrom))
+			{
+				continue;
+			}
 
-		if (value.Highlight is not null)
-		{
-			writer.WritePropertyName("highlight");
-			JsonSerializer.Serialize(writer, value.Highlight, options);
-		}
+			if (propHighlight.TryRead(ref reader, options, PropHighlight))
+			{
+				continue;
+			}
 
-		if (value.IndicesBoost is not null)
-		{
-			writer.WritePropertyName("indices_boost");
-			JsonSerializer.Serialize(writer, value.IndicesBoost, options);
-		}
+			if (propIndicesBoost.TryRead(ref reader, options, PropIndicesBoost))
+			{
+				continue;
+			}
 
-		if (value.Knn is not null)
-		{
-			writer.WritePropertyName("knn");
-			JsonSerializer.Serialize(writer, value.Knn, options);
-		}
+			if (propKnn.TryRead(ref reader, options, PropKnn, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.KnnSearch>?, Elastic.Clients.Elasticsearch.Serverless.KnnSearch>)))
+			{
+				continue;
+			}
 
-		if (value.MinScore.HasValue)
-		{
-			writer.WritePropertyName("min_score");
-			writer.WriteNumberValue(value.MinScore.Value);
-		}
+			if (propMinScore.TryRead(ref reader, options, PropMinScore))
+			{
+				continue;
+			}
 
-		if (value.Pit is not null)
-		{
-			writer.WritePropertyName("pit");
-			JsonSerializer.Serialize(writer, value.Pit, options);
-		}
+			if (propPit.TryRead(ref reader, options, PropPit))
+			{
+				continue;
+			}
 
-		if (value.PostFilter is not null)
-		{
-			writer.WritePropertyName("post_filter");
-			JsonSerializer.Serialize(writer, value.PostFilter, options);
-		}
+			if (propPostFilter.TryRead(ref reader, options, PropPostFilter))
+			{
+				continue;
+			}
 
-		if (value.Profile.HasValue)
-		{
-			writer.WritePropertyName("profile");
-			writer.WriteBooleanValue(value.Profile.Value);
-		}
+			if (propProfile.TryRead(ref reader, options, PropProfile))
+			{
+				continue;
+			}
 
-		if (value.Query is not null)
-		{
-			writer.WritePropertyName("query");
-			JsonSerializer.Serialize(writer, value.Query, options);
-		}
+			if (propQuery.TryRead(ref reader, options, PropQuery))
+			{
+				continue;
+			}
 
-		if (value.Rescore is not null)
-		{
-			writer.WritePropertyName("rescore");
-			JsonSerializer.Serialize(writer, value.Rescore, options);
-		}
+			if (propRescore.TryRead(ref reader, options, PropRescore, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Core.Search.Rescore>?, Elastic.Clients.Elasticsearch.Serverless.Core.Search.Rescore>)))
+			{
+				continue;
+			}
 
-		if (value.RuntimeMappings is not null)
-		{
-			writer.WritePropertyName("runtime_mappings");
-			JsonSerializer.Serialize(writer, value.RuntimeMappings, options);
-		}
+			if (propRuntimeMappings.TryRead(ref reader, options, PropRuntimeMappings))
+			{
+				continue;
+			}
 
-		if (value.ScriptFields is not null)
-		{
-			writer.WritePropertyName("script_fields");
-			JsonSerializer.Serialize(writer, value.ScriptFields, options);
-		}
+			if (propScriptFields.TryRead(ref reader, options, PropScriptFields))
+			{
+				continue;
+			}
 
-		if (value.SearchAfter is not null)
-		{
-			writer.WritePropertyName("search_after");
-			JsonSerializer.Serialize(writer, value.SearchAfter, options);
-		}
+			if (propSearchAfter.TryRead(ref reader, options, PropSearchAfter))
+			{
+				continue;
+			}
 
-		if (value.SeqNoPrimaryTerm.HasValue)
-		{
-			writer.WritePropertyName("seq_no_primary_term");
-			writer.WriteBooleanValue(value.SeqNoPrimaryTerm.Value);
-		}
+			if (propSeqNoPrimaryTerm.TryRead(ref reader, options, PropSeqNoPrimaryTerm))
+			{
+				continue;
+			}
 
-		if (value.Size.HasValue)
-		{
-			writer.WritePropertyName("size");
-			writer.WriteNumberValue(value.Size.Value);
-		}
+			if (propSize.TryRead(ref reader, options, PropSize))
+			{
+				continue;
+			}
 
-		if (value.Slice is not null)
-		{
-			writer.WritePropertyName("slice");
-			JsonSerializer.Serialize(writer, value.Slice, options);
-		}
+			if (propSlice.TryRead(ref reader, options, PropSlice))
+			{
+				continue;
+			}
 
-		if (value.Sort is not null)
-		{
-			writer.WritePropertyName("sort");
-			JsonSerializer.Serialize(writer, value.Sort, options);
-		}
+			if (propSort.TryRead(ref reader, options, PropSort, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.SortOptions>?, Elastic.Clients.Elasticsearch.Serverless.SortOptions>)))
+			{
+				continue;
+			}
 
-		if (value.Source is not null)
-		{
-			writer.WritePropertyName("_source");
-			JsonSerializer.Serialize(writer, value.Source, options);
-		}
+			if (propSource.TryRead(ref reader, options, PropSource))
+			{
+				continue;
+			}
 
-		if (value.Stats is not null)
-		{
-			writer.WritePropertyName("stats");
-			JsonSerializer.Serialize(writer, value.Stats, options);
-		}
+			if (propStats.TryRead(ref reader, options, PropStats))
+			{
+				continue;
+			}
 
-		if (value.StoredFields is not null)
-		{
-			writer.WritePropertyName("stored_fields");
-			new FieldsConverter().Write(writer, value.StoredFields, options);
-		}
+			if (propStoredFields.TryRead(ref reader, options, PropStoredFields, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
 
-		if (value.Suggest is not null)
-		{
-			writer.WritePropertyName("suggest");
-			JsonSerializer.Serialize(writer, value.Suggest, options);
-		}
+			if (propSuggest.TryRead(ref reader, options, PropSuggest))
+			{
+				continue;
+			}
 
-		if (value.TerminateAfter.HasValue)
-		{
-			writer.WritePropertyName("terminate_after");
-			writer.WriteNumberValue(value.TerminateAfter.Value);
-		}
+			if (propTerminateAfter.TryRead(ref reader, options, PropTerminateAfter))
+			{
+				continue;
+			}
 
-		if (!string.IsNullOrEmpty(value.Timeout))
-		{
-			writer.WritePropertyName("timeout");
-			writer.WriteStringValue(value.Timeout);
-		}
+			if (propTimeout.TryRead(ref reader, options, PropTimeout))
+			{
+				continue;
+			}
 
-		if (value.TrackScores.HasValue)
-		{
-			writer.WritePropertyName("track_scores");
-			writer.WriteBooleanValue(value.TrackScores.Value);
-		}
+			if (propTrackScores.TryRead(ref reader, options, PropTrackScores))
+			{
+				continue;
+			}
 
-		if (value.TrackTotalHits is not null)
-		{
-			writer.WritePropertyName("track_total_hits");
-			JsonSerializer.Serialize(writer, value.TrackTotalHits, options);
-		}
+			if (propTrackTotalHits.TryRead(ref reader, options, PropTrackTotalHits))
+			{
+				continue;
+			}
 
-		if (value.Version.HasValue)
-		{
-			writer.WritePropertyName("version");
-			writer.WriteBooleanValue(value.Version.Value);
-		}
+			if (propVersion.TryRead(ref reader, options, PropVersion))
+			{
+				continue;
+			}
 
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SubmitAsyncSearchRequest
+		{
+			Aggregations = propAggregations.Value
+	,
+			Collapse = propCollapse.Value
+	,
+			DocvalueFields = propDocvalueFields.Value
+	,
+			Explain = propExplain.Value
+	,
+			Ext = propExt.Value
+	,
+			Fields = propFields.Value
+	,
+			From = propFrom.Value
+	,
+			Highlight = propHighlight.Value
+	,
+			IndicesBoost = propIndicesBoost.Value
+	,
+			Knn = propKnn.Value
+	,
+			MinScore = propMinScore.Value
+	,
+			Pit = propPit.Value
+	,
+			PostFilter = propPostFilter.Value
+	,
+			Profile = propProfile.Value
+	,
+			Query = propQuery.Value
+	,
+			Rescore = propRescore.Value
+	,
+			RuntimeMappings = propRuntimeMappings.Value
+	,
+			ScriptFields = propScriptFields.Value
+	,
+			SearchAfter = propSearchAfter.Value
+	,
+			SeqNoPrimaryTerm = propSeqNoPrimaryTerm.Value
+	,
+			Size = propSize.Value
+	,
+			Slice = propSlice.Value
+	,
+			Sort = propSort.Value
+	,
+			Source = propSource.Value
+	,
+			Stats = propStats.Value
+	,
+			StoredFields = propStoredFields.Value
+	,
+			Suggest = propSuggest.Value
+	,
+			TerminateAfter = propTerminateAfter.Value
+	,
+			Timeout = propTimeout.Value
+	,
+			TrackScores = propTrackScores.Value
+	,
+			TrackTotalHits = propTrackTotalHits.Value
+	,
+			Version = propVersion.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SubmitAsyncSearchRequest value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAggregations, value.Aggregations);
+		writer.WriteProperty(options, PropCollapse, value.Collapse);
+		writer.WriteProperty(options, PropDocvalueFields, value.DocvalueFields);
+		writer.WriteProperty(options, PropExplain, value.Explain);
+		writer.WriteProperty(options, PropExt, value.Ext);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropFrom, value.From);
+		writer.WriteProperty(options, PropHighlight, value.Highlight);
+		writer.WriteProperty(options, PropIndicesBoost, value.IndicesBoost);
+		writer.WriteProperty(options, PropKnn, value.Knn, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.KnnSearch>?, Elastic.Clients.Elasticsearch.Serverless.KnnSearch>));
+		writer.WriteProperty(options, PropMinScore, value.MinScore);
+		writer.WriteProperty(options, PropPit, value.Pit);
+		writer.WriteProperty(options, PropPostFilter, value.PostFilter);
+		writer.WriteProperty(options, PropProfile, value.Profile);
+		writer.WriteProperty(options, PropQuery, value.Query);
+		writer.WriteProperty(options, PropRescore, value.Rescore, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Core.Search.Rescore>?, Elastic.Clients.Elasticsearch.Serverless.Core.Search.Rescore>));
+		writer.WriteProperty(options, PropRuntimeMappings, value.RuntimeMappings);
+		writer.WriteProperty(options, PropScriptFields, value.ScriptFields);
+		writer.WriteProperty(options, PropSearchAfter, value.SearchAfter);
+		writer.WriteProperty(options, PropSeqNoPrimaryTerm, value.SeqNoPrimaryTerm);
+		writer.WriteProperty(options, PropSize, value.Size);
+		writer.WriteProperty(options, PropSlice, value.Slice);
+		writer.WriteProperty(options, PropSort, value.Sort, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.SortOptions>?, Elastic.Clients.Elasticsearch.Serverless.SortOptions>));
+		writer.WriteProperty(options, PropSource, value.Source);
+		writer.WriteProperty(options, PropStats, value.Stats);
+		writer.WriteProperty(options, PropStoredFields, value.StoredFields, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropSuggest, value.Suggest);
+		writer.WriteProperty(options, PropTerminateAfter, value.TerminateAfter);
+		writer.WriteProperty(options, PropTimeout, value.Timeout);
+		writer.WriteProperty(options, PropTrackScores, value.TrackScores);
+		writer.WriteProperty(options, PropTrackTotalHits, value.TrackTotalHits);
+		writer.WriteProperty(options, PropVersion, value.Version);
 		writer.WriteEndObject();
 	}
 }
@@ -678,7 +615,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices
 	/// Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes <c>_all</c> 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>
@@ -686,7 +622,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices
 	/// 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>
@@ -694,7 +629,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices
 	/// The analyzer to use for the query string
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public string? Analyzer { get => Q<string?>("analyzer"); set => Q("analyzer", value); }
 
 	/// <summary>
@@ -702,7 +636,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices
 	/// 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>
@@ -711,7 +644,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices
 	/// A partial reduction is performed every time the coordinating node has received a certain number of new shard responses (5 by default).
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public long? BatchedReduceSize { get => Q<long?>("batched_reduce_size"); set => Q("batched_reduce_size", value); }
 
 	/// <summary>
@@ -719,7 +651,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices
 	/// The default value is the only supported value.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public bool? CcsMinimizeRoundtrips { get => Q<bool?>("ccs_minimize_roundtrips"); set => Q("ccs_minimize_roundtrips", value); }
 
 	/// <summary>
@@ -727,7 +658,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices
 	/// The default operator for query string query (AND or OR)
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Operator? DefaultOperator { get => Q<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Operator?>("default_operator"); set => Q("default_operator", value); }
 
 	/// <summary>
@@ -735,7 +665,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices
 	/// 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>
@@ -743,7 +672,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices
 	/// Whether to expand wildcard expression to concrete indices that are open, closed or both.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.ExpandWildcard>? ExpandWildcards { get => Q<ICollection<Elastic.Clients.Elasticsearch.Serverless.ExpandWildcard>?>("expand_wildcards"); set => Q("expand_wildcards", value); }
 
 	/// <summary>
@@ -751,7 +679,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices
 	/// 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>
@@ -759,7 +686,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices
 	/// 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>
@@ -767,7 +693,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices
 	/// If <c>true</c>, results are stored for later retrieval when the search completes within the <c>wait_for_completion_timeout</c>.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public bool? KeepOnCompletion { get => Q<bool?>("keep_on_completion"); set => Q("keep_on_completion", value); }
 
 	/// <summary>
@@ -775,7 +700,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices
 	/// 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>
@@ -783,7 +707,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices
 	/// 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>
@@ -791,7 +714,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices
 	/// 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>
@@ -799,7 +721,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices
 	/// Query in the Lucene query string syntax
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public string? QueryLuceneSyntax { get => Q<string?>("q"); set => Q("q", value); }
 
 	/// <summary>
@@ -807,7 +728,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices
 	/// 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>
@@ -815,7 +735,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices
 	/// 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>
@@ -823,7 +742,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices
 	/// A comma-separated list of specific routing values
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Serverless.Routing? Routing { get => Q<Elastic.Clients.Elasticsearch.Serverless.Routing?>("routing"); set => Q("routing", value); }
 
 	/// <summary>
@@ -831,7 +749,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices
 	/// Search operation type
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Serverless.SearchType? SearchType { get => Q<Elastic.Clients.Elasticsearch.Serverless.SearchType?>("search_type"); set => Q("search_type", value); }
 
 	/// <summary>
@@ -839,7 +756,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices
 	/// A list of fields to exclude from the returned _source field
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Serverless.Fields? SourceExcludes { get => Q<Elastic.Clients.Elasticsearch.Serverless.Fields?>("_source_excludes"); set => Q("_source_excludes", value); }
 
 	/// <summary>
@@ -847,7 +763,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices
 	/// A list of fields to extract and return from the _source field
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Serverless.Fields? SourceIncludes { get => Q<Elastic.Clients.Elasticsearch.Serverless.Fields?>("_source_includes"); set => Q("_source_includes", value); }
 
 	/// <summary>
@@ -855,7 +770,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices
 	/// Specifies which field to use for suggestions.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Serverless.Field? SuggestField { get => Q<Elastic.Clients.Elasticsearch.Serverless.Field?>("suggest_field"); set => Q("suggest_field", value); }
 
 	/// <summary>
@@ -863,7 +777,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices
 	/// Specify suggest mode
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Serverless.SuggestMode? SuggestMode { get => Q<Elastic.Clients.Elasticsearch.Serverless.SuggestMode?>("suggest_mode"); set => Q("suggest_mode", value); }
 
 	/// <summary>
@@ -871,7 +784,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices
 	/// How many suggestions to return in response
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public long? SuggestSize { get => Q<long?>("suggest_size"); set => Q("suggest_size", value); }
 
 	/// <summary>
@@ -879,7 +791,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices
 	/// 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>
@@ -887,7 +798,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices
 	/// 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>
@@ -896,11 +806,8 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices
 	/// When the async search completes within the timeout, the response won’t include the ID as the results are not stored in the cluster.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Serverless.Duration? WaitForCompletionTimeout { get => Q<Elastic.Clients.Elasticsearch.Serverless.Duration?>("wait_for_completion_timeout"); set => Q("wait_for_completion_timeout", value); }
-	[JsonInclude, JsonPropertyName("aggregations")]
 	public IDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.Aggregation>? Aggregations { get; set; }
-	[JsonInclude, JsonPropertyName("collapse")]
 	public Elastic.Clients.Elasticsearch.Serverless.Core.Search.FieldCollapse? Collapse { get; set; }
 
 	/// <summary>
@@ -909,7 +816,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices
 	/// names matching these patterns in the hits.fields property of the response.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("docvalue_fields")]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.FieldAndFormat>? DocvalueFields { get; set; }
 
 	/// <summary>
@@ -917,7 +823,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices
 	/// If true, returns detailed information about score computation as part of a hit.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("explain")]
 	public bool? Explain { get; set; }
 
 	/// <summary>
@@ -925,7 +830,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices
 	/// Configuration of search extensions defined by Elasticsearch plugins.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("ext")]
 	public IDictionary<string, object>? Ext { get; set; }
 
 	/// <summary>
@@ -934,7 +838,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices
 	/// matching these patterns in the hits.fields property of the response.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("fields")]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.FieldAndFormat>? Fields { get; set; }
 
 	/// <summary>
@@ -944,9 +847,7 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices
 	/// search_after parameter.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("from")]
 	public int? From { get; set; }
-	[JsonInclude, JsonPropertyName("highlight")]
 	public Elastic.Clients.Elasticsearch.Serverless.Core.Search.Highlight? Highlight { get; set; }
 
 	/// <summary>
@@ -954,7 +855,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices
 	/// Boosts the _score of documents from specified indices.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("indices_boost")]
 	public ICollection<IDictionary<Elastic.Clients.Elasticsearch.Serverless.IndexName, double>>? IndicesBoost { get; set; }
 
 	/// <summary>
@@ -962,8 +862,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices
 	/// Defines the approximate kNN search to run.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("knn")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.Serverless.KnnSearch))]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.KnnSearch>? Knn { get; set; }
 
 	/// <summary>
@@ -972,7 +870,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices
 	/// not included in the search results.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("min_score")]
 	public double? MinScore { get; set; }
 
 	/// <summary>
@@ -981,11 +878,8 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices
 	/// cannot specify an &lt;index> in the request path.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("pit")]
 	public Elastic.Clients.Elasticsearch.Serverless.Core.Search.PointInTimeReference? Pit { get; set; }
-	[JsonInclude, JsonPropertyName("post_filter")]
 	public Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query? PostFilter { get; set; }
-	[JsonInclude, JsonPropertyName("profile")]
 	public bool? Profile { get; set; }
 
 	/// <summary>
@@ -993,10 +887,7 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices
 	/// Defines the search definition using the Query DSL.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("query")]
 	public Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query? Query { get; set; }
-	[JsonInclude, JsonPropertyName("rescore")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.Serverless.Core.Search.Rescore))]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.Core.Search.Rescore>? Rescore { get; set; }
 
 	/// <summary>
@@ -1005,7 +896,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices
 	/// precedence over mapped fields with the same name.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("runtime_mappings")]
 	public IDictionary<Elastic.Clients.Elasticsearch.Serverless.Field, Elastic.Clients.Elasticsearch.Serverless.Mapping.RuntimeField>? RuntimeMappings { get; set; }
 
 	/// <summary>
@@ -1013,9 +903,7 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices
 	/// Retrieve a script evaluation (based on different fields) for each hit.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("script_fields")]
 	public IDictionary<string, Elastic.Clients.Elasticsearch.Serverless.ScriptField>? ScriptFields { get; set; }
-	[JsonInclude, JsonPropertyName("search_after")]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.FieldValue>? SearchAfter { get; set; }
 
 	/// <summary>
@@ -1024,7 +912,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices
 	/// of each hit. See Optimistic concurrency control.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("seq_no_primary_term")]
 	public bool? SeqNoPrimaryTerm { get; set; }
 
 	/// <summary>
@@ -1034,12 +921,8 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices
 	/// hits, use the search_after parameter.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("size")]
 	public int? Size { get; set; }
-	[JsonInclude, JsonPropertyName("slice")]
 	public Elastic.Clients.Elasticsearch.Serverless.SlicedScroll? Slice { get; set; }
-	[JsonInclude, JsonPropertyName("sort")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.Serverless.SortOptions))]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.SortOptions>? Sort { get; set; }
 
 	/// <summary>
@@ -1048,7 +931,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices
 	/// fields are returned in the hits._source property of the search response.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("_source")]
 	public Elastic.Clients.Elasticsearch.Serverless.Core.Search.SourceConfig? Source { get; set; }
 
 	/// <summary>
@@ -1058,7 +940,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices
 	/// the indices stats API.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("stats")]
 	public ICollection<string>? Stats { get; set; }
 
 	/// <summary>
@@ -1069,10 +950,7 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices
 	/// and stored fields in the search response.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("stored_fields")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Serverless.Fields? StoredFields { get; set; }
-	[JsonInclude, JsonPropertyName("suggest")]
 	public Elastic.Clients.Elasticsearch.Serverless.Core.Search.Suggester? Suggest { get; set; }
 
 	/// <summary>
@@ -1082,7 +960,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices
 	/// before sorting. Defaults to 0, which does not terminate query execution early.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("terminate_after")]
 	public long? TerminateAfter { get; set; }
 
 	/// <summary>
@@ -1092,7 +969,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices
 	/// Defaults to no timeout.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("timeout")]
 	public string? Timeout { get; set; }
 
 	/// <summary>
@@ -1100,7 +976,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices
 	/// 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>
@@ -1111,7 +986,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices
 	/// Defaults to 10,000 hits.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("track_total_hits")]
 	public Elastic.Clients.Elasticsearch.Serverless.Core.Search.TrackHits? TrackTotalHits { get; set; }
 
 	/// <summary>
@@ -1119,7 +993,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices
 	/// If true, returns document version as part of a hit.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("version")]
 	public bool? Version { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/AsyncSearch/SubmitAsyncSearchResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/AsyncSearch/SubmitAsyncSearchResponse.g.cs
index 2aa8d3f0afe..776b863bd4b 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/AsyncSearch/SubmitAsyncSearchResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/AsyncSearch/SubmitAsyncSearchResponse.g.cs
@@ -18,14 +18,158 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.AsyncSearch;
 
+internal sealed partial class SubmitAsyncSearchResponseConverter<TDocument> : System.Text.Json.Serialization.JsonConverter<SubmitAsyncSearchResponse<TDocument>>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCompletionTime = System.Text.Json.JsonEncodedText.Encode("completion_time");
+	private static readonly System.Text.Json.JsonEncodedText PropCompletionTimeInMillis = System.Text.Json.JsonEncodedText.Encode("completion_time_in_millis");
+	private static readonly System.Text.Json.JsonEncodedText PropExpirationTime = System.Text.Json.JsonEncodedText.Encode("expiration_time");
+	private static readonly System.Text.Json.JsonEncodedText PropExpirationTimeInMillis = System.Text.Json.JsonEncodedText.Encode("expiration_time_in_millis");
+	private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("id");
+	private static readonly System.Text.Json.JsonEncodedText PropIsPartial = System.Text.Json.JsonEncodedText.Encode("is_partial");
+	private static readonly System.Text.Json.JsonEncodedText PropIsRunning = System.Text.Json.JsonEncodedText.Encode("is_running");
+	private static readonly System.Text.Json.JsonEncodedText PropResponse = System.Text.Json.JsonEncodedText.Encode("response");
+	private static readonly System.Text.Json.JsonEncodedText PropStartTime = System.Text.Json.JsonEncodedText.Encode("start_time");
+	private static readonly System.Text.Json.JsonEncodedText PropStartTimeInMillis = System.Text.Json.JsonEncodedText.Encode("start_time_in_millis");
+
+	public override SubmitAsyncSearchResponse<TDocument> Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<DateTimeOffset?> propCompletionTime = default;
+		LocalJsonProperty<long?> propCompletionTimeInMillis = default;
+		LocalJsonProperty<DateTimeOffset?> propExpirationTime = default;
+		LocalJsonProperty<long> propExpirationTimeInMillis = default;
+		LocalJsonProperty<string?> propId = default;
+		LocalJsonProperty<bool> propIsPartial = default;
+		LocalJsonProperty<bool> propIsRunning = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.AsyncSearch.AsyncSearch<TDocument>> propResponse = default;
+		LocalJsonProperty<DateTimeOffset?> propStartTime = default;
+		LocalJsonProperty<long> propStartTimeInMillis = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCompletionTime.TryRead(ref reader, options, PropCompletionTime))
+			{
+				continue;
+			}
+
+			if (propCompletionTimeInMillis.TryRead(ref reader, options, PropCompletionTimeInMillis))
+			{
+				continue;
+			}
+
+			if (propExpirationTime.TryRead(ref reader, options, PropExpirationTime))
+			{
+				continue;
+			}
+
+			if (propExpirationTimeInMillis.TryRead(ref reader, options, PropExpirationTimeInMillis))
+			{
+				continue;
+			}
+
+			if (propId.TryRead(ref reader, options, PropId))
+			{
+				continue;
+			}
+
+			if (propIsPartial.TryRead(ref reader, options, PropIsPartial))
+			{
+				continue;
+			}
+
+			if (propIsRunning.TryRead(ref reader, options, PropIsRunning))
+			{
+				continue;
+			}
+
+			if (propResponse.TryRead(ref reader, options, PropResponse))
+			{
+				continue;
+			}
+
+			if (propStartTime.TryRead(ref reader, options, PropStartTime))
+			{
+				continue;
+			}
+
+			if (propStartTimeInMillis.TryRead(ref reader, options, PropStartTimeInMillis))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SubmitAsyncSearchResponse<TDocument>
+		{
+			CompletionTime = propCompletionTime.Value
+,
+			CompletionTimeInMillis = propCompletionTimeInMillis.Value
+,
+			ExpirationTime = propExpirationTime.Value
+,
+			ExpirationTimeInMillis = propExpirationTimeInMillis.Value
+,
+			Id = propId.Value
+,
+			IsPartial = propIsPartial.Value
+,
+			IsRunning = propIsRunning.Value
+,
+			Response = propResponse.Value
+,
+			StartTime = propStartTime.Value
+,
+			StartTimeInMillis = propStartTimeInMillis.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SubmitAsyncSearchResponse<TDocument> value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCompletionTime, value.CompletionTime);
+		writer.WriteProperty(options, PropCompletionTimeInMillis, value.CompletionTimeInMillis);
+		writer.WriteProperty(options, PropExpirationTime, value.ExpirationTime);
+		writer.WriteProperty(options, PropExpirationTimeInMillis, value.ExpirationTimeInMillis);
+		writer.WriteProperty(options, PropId, value.Id);
+		writer.WriteProperty(options, PropIsPartial, value.IsPartial);
+		writer.WriteProperty(options, PropIsRunning, value.IsRunning);
+		writer.WriteProperty(options, PropResponse, value.Response);
+		writer.WriteProperty(options, PropStartTime, value.StartTime);
+		writer.WriteProperty(options, PropStartTimeInMillis, value.StartTimeInMillis);
+		writer.WriteEndObject();
+	}
+}
+
+internal sealed partial class SubmitAsyncSearchResponseConverterFactory : System.Text.Json.Serialization.JsonConverterFactory
+{
+	public override bool CanConvert(System.Type typeToConvert)
+	{
+		return typeToConvert.IsGenericType && typeToConvert.GetGenericTypeDefinition() == typeof(SubmitAsyncSearchResponse<>);
+	}
+
+	public override System.Text.Json.Serialization.JsonConverter CreateConverter(System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		var args = typeToConvert.GetGenericArguments();
+#pragma warning disable IL3050
+		var converter = (System.Text.Json.Serialization.JsonConverter)System.Activator.CreateInstance(typeof(SubmitAsyncSearchResponseConverter<>).MakeGenericType(args[0]), System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public, binder: null, args: null, culture: null)!;
+#pragma warning restore IL3050
+		return converter;
+	}
+}
+
+[JsonConverter(typeof(SubmitAsyncSearchResponseConverterFactory))]
 public sealed partial class SubmitAsyncSearchResponse<TDocument> : ElasticsearchResponse
 {
 	/// <summary>
@@ -34,9 +178,7 @@ public sealed partial class SubmitAsyncSearchResponse<TDocument> : Elasticsearch
 	/// when the search has completed.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("completion_time")]
 	public DateTimeOffset? CompletionTime { get; init; }
-	[JsonInclude, JsonPropertyName("completion_time_in_millis")]
 	public long? CompletionTimeInMillis { get; init; }
 
 	/// <summary>
@@ -44,11 +186,8 @@ public sealed partial class SubmitAsyncSearchResponse<TDocument> : Elasticsearch
 	/// Indicates when the async search will expire.
 	/// </para>
 	/// </summary>
-	[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; }
 
 	/// <summary>
@@ -57,7 +196,6 @@ public sealed partial class SubmitAsyncSearchResponse<TDocument> : Elasticsearch
 	/// While the query is running, <c>is_partial</c> is always set to <c>true</c>.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("is_partial")]
 	public bool IsPartial { get; init; }
 
 	/// <summary>
@@ -66,12 +204,8 @@ public sealed partial class SubmitAsyncSearchResponse<TDocument> : Elasticsearch
 	/// NOTE: If the search failed after some shards returned their results or the node that is coordinating the async search dies, results may be partial even though <c>is_running</c> is <c>false</c>.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("is_running")]
 	public bool IsRunning { get; init; }
-	[JsonInclude, JsonPropertyName("response")]
 	public Elastic.Clients.Elasticsearch.Serverless.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.Serverless/_Generated/Api/BulkResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/BulkResponse.g.cs
index 6540f2c9a6c..47b7600bf46 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/BulkResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/BulkResponse.g.cs
@@ -18,20 +18,74 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless;
 
+internal sealed partial class BulkResponseConverter : System.Text.Json.Serialization.JsonConverter<BulkResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropErrors = System.Text.Json.JsonEncodedText.Encode("errors");
+	private static readonly System.Text.Json.JsonEncodedText PropIngestTook = System.Text.Json.JsonEncodedText.Encode("ingest_took");
+	private static readonly System.Text.Json.JsonEncodedText PropTook = System.Text.Json.JsonEncodedText.Encode("took");
+
+	public override BulkResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propErrors = default;
+		LocalJsonProperty<long?> propIngestTook = default;
+		LocalJsonProperty<long> propTook = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propErrors.TryRead(ref reader, options, PropErrors))
+			{
+				continue;
+			}
+
+			if (propIngestTook.TryRead(ref reader, options, PropIngestTook))
+			{
+				continue;
+			}
+
+			if (propTook.TryRead(ref reader, options, PropTook))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new BulkResponse
+		{
+			Errors = propErrors.Value
+,
+			IngestTook = propIngestTook.Value
+,
+			Took = propTook.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, BulkResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropErrors, value.Errors);
+		writer.WriteProperty(options, PropIngestTook, value.IngestTook);
+		writer.WriteProperty(options, PropTook, value.Took);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(BulkResponseConverter))]
 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.Serverless/_Generated/Api/ClearScrollResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/ClearScrollResponse.g.cs
index 121e9946eb2..f2b8b4d4ac3 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/ClearScrollResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/ClearScrollResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless;
 
+internal sealed partial class ClearScrollResponseConverter : System.Text.Json.Serialization.JsonConverter<ClearScrollResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropNumFreed = System.Text.Json.JsonEncodedText.Encode("num_freed");
+	private static readonly System.Text.Json.JsonEncodedText PropSucceeded = System.Text.Json.JsonEncodedText.Encode("succeeded");
+
+	public override ClearScrollResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<int> propNumFreed = default;
+		LocalJsonProperty<bool> propSucceeded = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propNumFreed.TryRead(ref reader, options, PropNumFreed))
+			{
+				continue;
+			}
+
+			if (propSucceeded.TryRead(ref reader, options, PropSucceeded))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ClearScrollResponse
+		{
+			NumFreed = propNumFreed.Value
+,
+			Succeeded = propSucceeded.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ClearScrollResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropNumFreed, value.NumFreed);
+		writer.WriteProperty(options, PropSucceeded, value.Succeeded);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ClearScrollResponseConverter))]
 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.Serverless/_Generated/Api/ClosePointInTimeResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/ClosePointInTimeResponse.g.cs
index e12e0397740..a62832bb505 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/ClosePointInTimeResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/ClosePointInTimeResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless;
 
+internal sealed partial class ClosePointInTimeResponseConverter : System.Text.Json.Serialization.JsonConverter<ClosePointInTimeResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropNumFreed = System.Text.Json.JsonEncodedText.Encode("num_freed");
+	private static readonly System.Text.Json.JsonEncodedText PropSucceeded = System.Text.Json.JsonEncodedText.Encode("succeeded");
+
+	public override ClosePointInTimeResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<int> propNumFreed = default;
+		LocalJsonProperty<bool> propSucceeded = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propNumFreed.TryRead(ref reader, options, PropNumFreed))
+			{
+				continue;
+			}
+
+			if (propSucceeded.TryRead(ref reader, options, PropSucceeded))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ClosePointInTimeResponse
+		{
+			NumFreed = propNumFreed.Value
+,
+			Succeeded = propSucceeded.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ClosePointInTimeResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropNumFreed, value.NumFreed);
+		writer.WriteProperty(options, PropSucceeded, value.Succeeded);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ClosePointInTimeResponseConverter))]
 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.Serverless/_Generated/Api/Cluster/AllocationExplainResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Cluster/AllocationExplainResponse.g.cs
index ce1cf06e5b0..bc58e78369b 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Cluster/AllocationExplainResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Cluster/AllocationExplainResponse.g.cs
@@ -18,64 +18,316 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Cluster;
 
+internal sealed partial class AllocationExplainResponseConverter : System.Text.Json.Serialization.JsonConverter<AllocationExplainResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAllocateExplanation = System.Text.Json.JsonEncodedText.Encode("allocate_explanation");
+	private static readonly System.Text.Json.JsonEncodedText PropAllocationDelay = System.Text.Json.JsonEncodedText.Encode("allocation_delay");
+	private static readonly System.Text.Json.JsonEncodedText PropAllocationDelayInMillis = System.Text.Json.JsonEncodedText.Encode("allocation_delay_in_millis");
+	private static readonly System.Text.Json.JsonEncodedText PropCanAllocate = System.Text.Json.JsonEncodedText.Encode("can_allocate");
+	private static readonly System.Text.Json.JsonEncodedText PropCanMoveToOtherNode = System.Text.Json.JsonEncodedText.Encode("can_move_to_other_node");
+	private static readonly System.Text.Json.JsonEncodedText PropCanRebalanceCluster = System.Text.Json.JsonEncodedText.Encode("can_rebalance_cluster");
+	private static readonly System.Text.Json.JsonEncodedText PropCanRebalanceClusterDecisions = System.Text.Json.JsonEncodedText.Encode("can_rebalance_cluster_decisions");
+	private static readonly System.Text.Json.JsonEncodedText PropCanRebalanceToOtherNode = System.Text.Json.JsonEncodedText.Encode("can_rebalance_to_other_node");
+	private static readonly System.Text.Json.JsonEncodedText PropCanRemainDecisions = System.Text.Json.JsonEncodedText.Encode("can_remain_decisions");
+	private static readonly System.Text.Json.JsonEncodedText PropCanRemainOnCurrentNode = System.Text.Json.JsonEncodedText.Encode("can_remain_on_current_node");
+	private static readonly System.Text.Json.JsonEncodedText PropClusterInfo = System.Text.Json.JsonEncodedText.Encode("cluster_info");
+	private static readonly System.Text.Json.JsonEncodedText PropConfiguredDelay = System.Text.Json.JsonEncodedText.Encode("configured_delay");
+	private static readonly System.Text.Json.JsonEncodedText PropConfiguredDelayInMillis = System.Text.Json.JsonEncodedText.Encode("configured_delay_in_millis");
+	private static readonly System.Text.Json.JsonEncodedText PropCurrentNode = System.Text.Json.JsonEncodedText.Encode("current_node");
+	private static readonly System.Text.Json.JsonEncodedText PropCurrentState = System.Text.Json.JsonEncodedText.Encode("current_state");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropMoveExplanation = System.Text.Json.JsonEncodedText.Encode("move_explanation");
+	private static readonly System.Text.Json.JsonEncodedText PropNodeAllocationDecisions = System.Text.Json.JsonEncodedText.Encode("node_allocation_decisions");
+	private static readonly System.Text.Json.JsonEncodedText PropNote = System.Text.Json.JsonEncodedText.Encode("note");
+	private static readonly System.Text.Json.JsonEncodedText PropPrimary = System.Text.Json.JsonEncodedText.Encode("primary");
+	private static readonly System.Text.Json.JsonEncodedText PropRebalanceExplanation = System.Text.Json.JsonEncodedText.Encode("rebalance_explanation");
+	private static readonly System.Text.Json.JsonEncodedText PropRemainingDelay = System.Text.Json.JsonEncodedText.Encode("remaining_delay");
+	private static readonly System.Text.Json.JsonEncodedText PropRemainingDelayInMillis = System.Text.Json.JsonEncodedText.Encode("remaining_delay_in_millis");
+	private static readonly System.Text.Json.JsonEncodedText PropShard = System.Text.Json.JsonEncodedText.Encode("shard");
+	private static readonly System.Text.Json.JsonEncodedText PropUnassignedInfo = System.Text.Json.JsonEncodedText.Encode("unassigned_info");
+
+	public override AllocationExplainResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string?> propAllocateExplanation = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Duration?> propAllocationDelay = default;
+		LocalJsonProperty<long?> propAllocationDelayInMillis = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Cluster.Decision?> propCanAllocate = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Cluster.Decision?> propCanMoveToOtherNode = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Cluster.Decision?> propCanRebalanceCluster = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Cluster.AllocationDecision>?> propCanRebalanceClusterDecisions = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Cluster.Decision?> propCanRebalanceToOtherNode = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Cluster.AllocationDecision>?> propCanRemainDecisions = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Cluster.Decision?> propCanRemainOnCurrentNode = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Cluster.ClusterInfo?> propClusterInfo = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Duration?> propConfiguredDelay = default;
+		LocalJsonProperty<long?> propConfiguredDelayInMillis = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Cluster.CurrentNode?> propCurrentNode = default;
+		LocalJsonProperty<string> propCurrentState = default;
+		LocalJsonProperty<string> propIndex = default;
+		LocalJsonProperty<string?> propMoveExplanation = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Cluster.NodeAllocationExplanation>?> propNodeAllocationDecisions = default;
+		LocalJsonProperty<string?> propNote = default;
+		LocalJsonProperty<bool> propPrimary = default;
+		LocalJsonProperty<string?> propRebalanceExplanation = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Duration?> propRemainingDelay = default;
+		LocalJsonProperty<long?> propRemainingDelayInMillis = default;
+		LocalJsonProperty<int> propShard = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Cluster.UnassignedInformation?> propUnassignedInfo = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAllocateExplanation.TryRead(ref reader, options, PropAllocateExplanation))
+			{
+				continue;
+			}
+
+			if (propAllocationDelay.TryRead(ref reader, options, PropAllocationDelay))
+			{
+				continue;
+			}
+
+			if (propAllocationDelayInMillis.TryRead(ref reader, options, PropAllocationDelayInMillis))
+			{
+				continue;
+			}
+
+			if (propCanAllocate.TryRead(ref reader, options, PropCanAllocate))
+			{
+				continue;
+			}
+
+			if (propCanMoveToOtherNode.TryRead(ref reader, options, PropCanMoveToOtherNode))
+			{
+				continue;
+			}
+
+			if (propCanRebalanceCluster.TryRead(ref reader, options, PropCanRebalanceCluster))
+			{
+				continue;
+			}
+
+			if (propCanRebalanceClusterDecisions.TryRead(ref reader, options, PropCanRebalanceClusterDecisions))
+			{
+				continue;
+			}
+
+			if (propCanRebalanceToOtherNode.TryRead(ref reader, options, PropCanRebalanceToOtherNode))
+			{
+				continue;
+			}
+
+			if (propCanRemainDecisions.TryRead(ref reader, options, PropCanRemainDecisions))
+			{
+				continue;
+			}
+
+			if (propCanRemainOnCurrentNode.TryRead(ref reader, options, PropCanRemainOnCurrentNode))
+			{
+				continue;
+			}
+
+			if (propClusterInfo.TryRead(ref reader, options, PropClusterInfo))
+			{
+				continue;
+			}
+
+			if (propConfiguredDelay.TryRead(ref reader, options, PropConfiguredDelay))
+			{
+				continue;
+			}
+
+			if (propConfiguredDelayInMillis.TryRead(ref reader, options, PropConfiguredDelayInMillis))
+			{
+				continue;
+			}
+
+			if (propCurrentNode.TryRead(ref reader, options, PropCurrentNode))
+			{
+				continue;
+			}
+
+			if (propCurrentState.TryRead(ref reader, options, PropCurrentState))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propMoveExplanation.TryRead(ref reader, options, PropMoveExplanation))
+			{
+				continue;
+			}
+
+			if (propNodeAllocationDecisions.TryRead(ref reader, options, PropNodeAllocationDecisions))
+			{
+				continue;
+			}
+
+			if (propNote.TryRead(ref reader, options, PropNote))
+			{
+				continue;
+			}
+
+			if (propPrimary.TryRead(ref reader, options, PropPrimary))
+			{
+				continue;
+			}
+
+			if (propRebalanceExplanation.TryRead(ref reader, options, PropRebalanceExplanation))
+			{
+				continue;
+			}
+
+			if (propRemainingDelay.TryRead(ref reader, options, PropRemainingDelay))
+			{
+				continue;
+			}
+
+			if (propRemainingDelayInMillis.TryRead(ref reader, options, PropRemainingDelayInMillis))
+			{
+				continue;
+			}
+
+			if (propShard.TryRead(ref reader, options, PropShard))
+			{
+				continue;
+			}
+
+			if (propUnassignedInfo.TryRead(ref reader, options, PropUnassignedInfo))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new AllocationExplainResponse
+		{
+			AllocateExplanation = propAllocateExplanation.Value
+,
+			AllocationDelay = propAllocationDelay.Value
+,
+			AllocationDelayInMillis = propAllocationDelayInMillis.Value
+,
+			CanAllocate = propCanAllocate.Value
+,
+			CanMoveToOtherNode = propCanMoveToOtherNode.Value
+,
+			CanRebalanceCluster = propCanRebalanceCluster.Value
+,
+			CanRebalanceClusterDecisions = propCanRebalanceClusterDecisions.Value
+,
+			CanRebalanceToOtherNode = propCanRebalanceToOtherNode.Value
+,
+			CanRemainDecisions = propCanRemainDecisions.Value
+,
+			CanRemainOnCurrentNode = propCanRemainOnCurrentNode.Value
+,
+			ClusterInfo = propClusterInfo.Value
+,
+			ConfiguredDelay = propConfiguredDelay.Value
+,
+			ConfiguredDelayInMillis = propConfiguredDelayInMillis.Value
+,
+			CurrentNode = propCurrentNode.Value
+,
+			CurrentState = propCurrentState.Value
+,
+			Index = propIndex.Value
+,
+			MoveExplanation = propMoveExplanation.Value
+,
+			NodeAllocationDecisions = propNodeAllocationDecisions.Value
+,
+			Note = propNote.Value
+,
+			Primary = propPrimary.Value
+,
+			RebalanceExplanation = propRebalanceExplanation.Value
+,
+			RemainingDelay = propRemainingDelay.Value
+,
+			RemainingDelayInMillis = propRemainingDelayInMillis.Value
+,
+			Shard = propShard.Value
+,
+			UnassignedInfo = propUnassignedInfo.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, AllocationExplainResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAllocateExplanation, value.AllocateExplanation);
+		writer.WriteProperty(options, PropAllocationDelay, value.AllocationDelay);
+		writer.WriteProperty(options, PropAllocationDelayInMillis, value.AllocationDelayInMillis);
+		writer.WriteProperty(options, PropCanAllocate, value.CanAllocate);
+		writer.WriteProperty(options, PropCanMoveToOtherNode, value.CanMoveToOtherNode);
+		writer.WriteProperty(options, PropCanRebalanceCluster, value.CanRebalanceCluster);
+		writer.WriteProperty(options, PropCanRebalanceClusterDecisions, value.CanRebalanceClusterDecisions);
+		writer.WriteProperty(options, PropCanRebalanceToOtherNode, value.CanRebalanceToOtherNode);
+		writer.WriteProperty(options, PropCanRemainDecisions, value.CanRemainDecisions);
+		writer.WriteProperty(options, PropCanRemainOnCurrentNode, value.CanRemainOnCurrentNode);
+		writer.WriteProperty(options, PropClusterInfo, value.ClusterInfo);
+		writer.WriteProperty(options, PropConfiguredDelay, value.ConfiguredDelay);
+		writer.WriteProperty(options, PropConfiguredDelayInMillis, value.ConfiguredDelayInMillis);
+		writer.WriteProperty(options, PropCurrentNode, value.CurrentNode);
+		writer.WriteProperty(options, PropCurrentState, value.CurrentState);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropMoveExplanation, value.MoveExplanation);
+		writer.WriteProperty(options, PropNodeAllocationDecisions, value.NodeAllocationDecisions);
+		writer.WriteProperty(options, PropNote, value.Note);
+		writer.WriteProperty(options, PropPrimary, value.Primary);
+		writer.WriteProperty(options, PropRebalanceExplanation, value.RebalanceExplanation);
+		writer.WriteProperty(options, PropRemainingDelay, value.RemainingDelay);
+		writer.WriteProperty(options, PropRemainingDelayInMillis, value.RemainingDelayInMillis);
+		writer.WriteProperty(options, PropShard, value.Shard);
+		writer.WriteProperty(options, PropUnassignedInfo, value.UnassignedInfo);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(AllocationExplainResponseConverter))]
 public sealed partial class AllocationExplainResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("allocate_explanation")]
 	public string? AllocateExplanation { get; init; }
-	[JsonInclude, JsonPropertyName("allocation_delay")]
 	public Elastic.Clients.Elasticsearch.Serverless.Duration? AllocationDelay { get; init; }
-	[JsonInclude, JsonPropertyName("allocation_delay_in_millis")]
 	public long? AllocationDelayInMillis { get; init; }
-	[JsonInclude, JsonPropertyName("can_allocate")]
 	public Elastic.Clients.Elasticsearch.Serverless.Cluster.Decision? CanAllocate { get; init; }
-	[JsonInclude, JsonPropertyName("can_move_to_other_node")]
 	public Elastic.Clients.Elasticsearch.Serverless.Cluster.Decision? CanMoveToOtherNode { get; init; }
-	[JsonInclude, JsonPropertyName("can_rebalance_cluster")]
 	public Elastic.Clients.Elasticsearch.Serverless.Cluster.Decision? CanRebalanceCluster { get; init; }
-	[JsonInclude, JsonPropertyName("can_rebalance_cluster_decisions")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Cluster.AllocationDecision>? CanRebalanceClusterDecisions { get; init; }
-	[JsonInclude, JsonPropertyName("can_rebalance_to_other_node")]
 	public Elastic.Clients.Elasticsearch.Serverless.Cluster.Decision? CanRebalanceToOtherNode { get; init; }
-	[JsonInclude, JsonPropertyName("can_remain_decisions")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Cluster.AllocationDecision>? CanRemainDecisions { get; init; }
-	[JsonInclude, JsonPropertyName("can_remain_on_current_node")]
 	public Elastic.Clients.Elasticsearch.Serverless.Cluster.Decision? CanRemainOnCurrentNode { get; init; }
-	[JsonInclude, JsonPropertyName("cluster_info")]
 	public Elastic.Clients.Elasticsearch.Serverless.Cluster.ClusterInfo? ClusterInfo { get; init; }
-	[JsonInclude, JsonPropertyName("configured_delay")]
 	public Elastic.Clients.Elasticsearch.Serverless.Duration? ConfiguredDelay { get; init; }
-	[JsonInclude, JsonPropertyName("configured_delay_in_millis")]
 	public long? ConfiguredDelayInMillis { get; init; }
-	[JsonInclude, JsonPropertyName("current_node")]
 	public Elastic.Clients.Elasticsearch.Serverless.Cluster.CurrentNode? CurrentNode { get; init; }
-	[JsonInclude, JsonPropertyName("current_state")]
 	public string CurrentState { get; init; }
-	[JsonInclude, JsonPropertyName("index")]
 	public string Index { get; init; }
-	[JsonInclude, JsonPropertyName("move_explanation")]
 	public string? MoveExplanation { get; init; }
-	[JsonInclude, JsonPropertyName("node_allocation_decisions")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Cluster.NodeAllocationExplanation>? NodeAllocationDecisions { get; init; }
-	[JsonInclude, JsonPropertyName("note")]
 	public string? Note { get; init; }
-	[JsonInclude, JsonPropertyName("primary")]
 	public bool Primary { get; init; }
-	[JsonInclude, JsonPropertyName("rebalance_explanation")]
 	public string? RebalanceExplanation { get; init; }
-	[JsonInclude, JsonPropertyName("remaining_delay")]
 	public Elastic.Clients.Elasticsearch.Serverless.Duration? RemainingDelay { get; init; }
-	[JsonInclude, JsonPropertyName("remaining_delay_in_millis")]
 	public long? RemainingDelayInMillis { get; init; }
-	[JsonInclude, JsonPropertyName("shard")]
 	public int Shard { get; init; }
-	[JsonInclude, JsonPropertyName("unassigned_info")]
 	public Elastic.Clients.Elasticsearch.Serverless.Cluster.UnassignedInformation? UnassignedInfo { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Cluster/ClusterInfoResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Cluster/ClusterInfoResponse.g.cs
index 6c4a5a88c82..29892443165 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Cluster/ClusterInfoResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Cluster/ClusterInfoResponse.g.cs
@@ -18,24 +18,96 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Cluster;
 
+internal sealed partial class ClusterInfoResponseConverter : System.Text.Json.Serialization.JsonConverter<ClusterInfoResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropClusterName = System.Text.Json.JsonEncodedText.Encode("cluster_name");
+	private static readonly System.Text.Json.JsonEncodedText PropHttp = System.Text.Json.JsonEncodedText.Encode("http");
+	private static readonly System.Text.Json.JsonEncodedText PropIngest = System.Text.Json.JsonEncodedText.Encode("ingest");
+	private static readonly System.Text.Json.JsonEncodedText PropScript = System.Text.Json.JsonEncodedText.Encode("script");
+	private static readonly System.Text.Json.JsonEncodedText PropThreadPool = System.Text.Json.JsonEncodedText.Encode("thread_pool");
+
+	public override ClusterInfoResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propClusterName = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Nodes.Http?> propHttp = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Nodes.Ingest?> propIngest = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Nodes.Scripting?> propScript = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Nodes.ThreadCount>?> propThreadPool = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propClusterName.TryRead(ref reader, options, PropClusterName))
+			{
+				continue;
+			}
+
+			if (propHttp.TryRead(ref reader, options, PropHttp))
+			{
+				continue;
+			}
+
+			if (propIngest.TryRead(ref reader, options, PropIngest))
+			{
+				continue;
+			}
+
+			if (propScript.TryRead(ref reader, options, PropScript))
+			{
+				continue;
+			}
+
+			if (propThreadPool.TryRead(ref reader, options, PropThreadPool))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ClusterInfoResponse
+		{
+			ClusterName = propClusterName.Value
+,
+			Http = propHttp.Value
+,
+			Ingest = propIngest.Value
+,
+			Script = propScript.Value
+,
+			ThreadPool = propThreadPool.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ClusterInfoResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropClusterName, value.ClusterName);
+		writer.WriteProperty(options, PropHttp, value.Http);
+		writer.WriteProperty(options, PropIngest, value.Ingest);
+		writer.WriteProperty(options, PropScript, value.Script);
+		writer.WriteProperty(options, PropThreadPool, value.ThreadPool);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ClusterInfoResponseConverter))]
 public sealed partial class ClusterInfoResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("cluster_name")]
 	public string ClusterName { get; init; }
-	[JsonInclude, JsonPropertyName("http")]
 	public Elastic.Clients.Elasticsearch.Serverless.Nodes.Http? Http { get; init; }
-	[JsonInclude, JsonPropertyName("ingest")]
 	public Elastic.Clients.Elasticsearch.Serverless.Nodes.Ingest? Ingest { get; init; }
-	[JsonInclude, JsonPropertyName("script")]
 	public Elastic.Clients.Elasticsearch.Serverless.Nodes.Scripting? Script { get; init; }
-	[JsonInclude, JsonPropertyName("thread_pool")]
 	public IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Nodes.ThreadCount>? ThreadPool { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Cluster/ClusterStatsResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Cluster/ClusterStatsResponse.g.cs
index 12d77b02a34..b70f1ad6d9a 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Cluster/ClusterStatsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Cluster/ClusterStatsResponse.g.cs
@@ -18,14 +18,111 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Cluster;
 
+internal sealed partial class ClusterStatsResponseConverter : System.Text.Json.Serialization.JsonConverter<ClusterStatsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropClusterName = System.Text.Json.JsonEncodedText.Encode("cluster_name");
+	private static readonly System.Text.Json.JsonEncodedText PropClusterUuid = System.Text.Json.JsonEncodedText.Encode("cluster_uuid");
+	private static readonly System.Text.Json.JsonEncodedText PropIndices = System.Text.Json.JsonEncodedText.Encode("indices");
+	private static readonly System.Text.Json.JsonEncodedText PropNodes = System.Text.Json.JsonEncodedText.Encode("nodes");
+	private static readonly System.Text.Json.JsonEncodedText PropNodeStats = System.Text.Json.JsonEncodedText.Encode("_nodes");
+	private static readonly System.Text.Json.JsonEncodedText PropStatus = System.Text.Json.JsonEncodedText.Encode("status");
+	private static readonly System.Text.Json.JsonEncodedText PropTimestamp = System.Text.Json.JsonEncodedText.Encode("timestamp");
+
+	public override ClusterStatsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propClusterName = default;
+		LocalJsonProperty<string> propClusterUuid = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Cluster.ClusterIndices> propIndices = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Cluster.ClusterNodes> propNodes = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.NodeStatistics?> propNodeStats = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.HealthStatus> propStatus = default;
+		LocalJsonProperty<long> propTimestamp = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propClusterName.TryRead(ref reader, options, PropClusterName))
+			{
+				continue;
+			}
+
+			if (propClusterUuid.TryRead(ref reader, options, PropClusterUuid))
+			{
+				continue;
+			}
+
+			if (propIndices.TryRead(ref reader, options, PropIndices))
+			{
+				continue;
+			}
+
+			if (propNodes.TryRead(ref reader, options, PropNodes))
+			{
+				continue;
+			}
+
+			if (propNodeStats.TryRead(ref reader, options, PropNodeStats))
+			{
+				continue;
+			}
+
+			if (propStatus.TryRead(ref reader, options, PropStatus))
+			{
+				continue;
+			}
+
+			if (propTimestamp.TryRead(ref reader, options, PropTimestamp))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ClusterStatsResponse
+		{
+			ClusterName = propClusterName.Value
+,
+			ClusterUuid = propClusterUuid.Value
+,
+			Indices = propIndices.Value
+,
+			Nodes = propNodes.Value
+,
+			NodeStats = propNodeStats.Value
+,
+			Status = propStatus.Value
+,
+			Timestamp = propTimestamp.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ClusterStatsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropClusterName, value.ClusterName);
+		writer.WriteProperty(options, PropClusterUuid, value.ClusterUuid);
+		writer.WriteProperty(options, PropIndices, value.Indices);
+		writer.WriteProperty(options, PropNodes, value.Nodes);
+		writer.WriteProperty(options, PropNodeStats, value.NodeStats);
+		writer.WriteProperty(options, PropStatus, value.Status);
+		writer.WriteProperty(options, PropTimestamp, value.Timestamp);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ClusterStatsResponseConverter))]
 public sealed partial class ClusterStatsResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,7 +130,6 @@ public sealed partial class ClusterStatsResponse : ElasticsearchResponse
 	/// Name of the cluster, based on the cluster name setting.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("cluster_name")]
 	public string ClusterName { get; init; }
 
 	/// <summary>
@@ -41,7 +137,6 @@ public sealed partial class ClusterStatsResponse : ElasticsearchResponse
 	/// Unique identifier for the cluster.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("cluster_uuid")]
 	public string ClusterUuid { get; init; }
 
 	/// <summary>
@@ -49,7 +144,6 @@ public sealed partial class ClusterStatsResponse : ElasticsearchResponse
 	/// Contains statistics about indices with shards assigned to selected nodes.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("indices")]
 	public Elastic.Clients.Elasticsearch.Serverless.Cluster.ClusterIndices Indices { get; init; }
 
 	/// <summary>
@@ -57,7 +151,6 @@ public sealed partial class ClusterStatsResponse : ElasticsearchResponse
 	/// Contains statistics about nodes selected by the request’s node filters.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("nodes")]
 	public Elastic.Clients.Elasticsearch.Serverless.Cluster.ClusterNodes Nodes { get; init; }
 
 	/// <summary>
@@ -65,7 +158,6 @@ public sealed partial class ClusterStatsResponse : ElasticsearchResponse
 	/// Contains statistics about the number of nodes selected by the request’s node filters.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("_nodes")]
 	public Elastic.Clients.Elasticsearch.Serverless.NodeStatistics? NodeStats { get; init; }
 
 	/// <summary>
@@ -73,7 +165,6 @@ public sealed partial class ClusterStatsResponse : ElasticsearchResponse
 	/// Health status of the cluster, based on the state of its primary and replica shards.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("status")]
 	public Elastic.Clients.Elasticsearch.Serverless.HealthStatus Status { get; init; }
 
 	/// <summary>
@@ -81,6 +172,5 @@ public sealed partial class ClusterStatsResponse : ElasticsearchResponse
 	/// Unix timestamp, in milliseconds, for the last time the cluster statistics were refreshed.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("timestamp")]
 	public long Timestamp { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Cluster/DeleteComponentTemplateResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Cluster/DeleteComponentTemplateResponse.g.cs
index e0f3c244fef..8d636827853 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Cluster/DeleteComponentTemplateResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Cluster/DeleteComponentTemplateResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Cluster;
 
+internal sealed partial class DeleteComponentTemplateResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteComponentTemplateResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override DeleteComponentTemplateResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteComponentTemplateResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteComponentTemplateResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteComponentTemplateResponseConverter))]
 public sealed partial class DeleteComponentTemplateResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class DeleteComponentTemplateResponse : ElasticsearchRespo
 	/// 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.Serverless/_Generated/Api/Cluster/GetClusterSettingsResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Cluster/GetClusterSettingsResponse.g.cs
index 01f99ea2bce..02f306dd8aa 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Cluster/GetClusterSettingsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Cluster/GetClusterSettingsResponse.g.cs
@@ -18,20 +18,74 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Cluster;
 
+internal sealed partial class GetClusterSettingsResponseConverter : System.Text.Json.Serialization.JsonConverter<GetClusterSettingsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropDefaults = System.Text.Json.JsonEncodedText.Encode("defaults");
+	private static readonly System.Text.Json.JsonEncodedText PropPersistent = System.Text.Json.JsonEncodedText.Encode("persistent");
+	private static readonly System.Text.Json.JsonEncodedText PropTransient = System.Text.Json.JsonEncodedText.Encode("transient");
+
+	public override GetClusterSettingsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyDictionary<string, object>?> propDefaults = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, object>> propPersistent = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, object>> propTransient = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propDefaults.TryRead(ref reader, options, PropDefaults))
+			{
+				continue;
+			}
+
+			if (propPersistent.TryRead(ref reader, options, PropPersistent))
+			{
+				continue;
+			}
+
+			if (propTransient.TryRead(ref reader, options, PropTransient))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetClusterSettingsResponse
+		{
+			Defaults = propDefaults.Value
+,
+			Persistent = propPersistent.Value
+,
+			Transient = propTransient.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetClusterSettingsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDefaults, value.Defaults);
+		writer.WriteProperty(options, PropPersistent, value.Persistent);
+		writer.WriteProperty(options, PropTransient, value.Transient);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetClusterSettingsResponseConverter))]
 public sealed partial class GetClusterSettingsResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("defaults")]
 	public IReadOnlyDictionary<string, object>? Defaults { get; init; }
-	[JsonInclude, JsonPropertyName("persistent")]
 	public IReadOnlyDictionary<string, object> Persistent { get; init; }
-	[JsonInclude, JsonPropertyName("transient")]
 	public IReadOnlyDictionary<string, object> Transient { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Cluster/GetComponentTemplateResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Cluster/GetComponentTemplateResponse.g.cs
index 949e435bcb1..9b3062fb043 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Cluster/GetComponentTemplateResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Cluster/GetComponentTemplateResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Cluster;
 
+internal sealed partial class GetComponentTemplateResponseConverter : System.Text.Json.Serialization.JsonConverter<GetComponentTemplateResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropComponentTemplates = System.Text.Json.JsonEncodedText.Encode("component_templates");
+
+	public override GetComponentTemplateResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Cluster.ComponentTemplate>> propComponentTemplates = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propComponentTemplates.TryRead(ref reader, options, PropComponentTemplates))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetComponentTemplateResponse
+		{
+			ComponentTemplates = propComponentTemplates.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetComponentTemplateResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropComponentTemplates, value.ComponentTemplates);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetComponentTemplateResponseConverter))]
 public sealed partial class GetComponentTemplateResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("component_templates")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Cluster.ComponentTemplate> ComponentTemplates { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Cluster/HealthResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Cluster/HealthResponse.g.cs
index 609d064dd95..2ca8e700a19 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Cluster/HealthResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Cluster/HealthResponse.g.cs
@@ -18,14 +18,221 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Cluster;
 
+internal sealed partial class HealthResponseConverter : System.Text.Json.Serialization.JsonConverter<HealthResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropActivePrimaryShards = System.Text.Json.JsonEncodedText.Encode("active_primary_shards");
+	private static readonly System.Text.Json.JsonEncodedText PropActiveShards = System.Text.Json.JsonEncodedText.Encode("active_shards");
+	private static readonly System.Text.Json.JsonEncodedText PropActiveShardsPercentAsNumber = System.Text.Json.JsonEncodedText.Encode("active_shards_percent_as_number");
+	private static readonly System.Text.Json.JsonEncodedText PropClusterName = System.Text.Json.JsonEncodedText.Encode("cluster_name");
+	private static readonly System.Text.Json.JsonEncodedText PropDelayedUnassignedShards = System.Text.Json.JsonEncodedText.Encode("delayed_unassigned_shards");
+	private static readonly System.Text.Json.JsonEncodedText PropIndices = System.Text.Json.JsonEncodedText.Encode("indices");
+	private static readonly System.Text.Json.JsonEncodedText PropInitializingShards = System.Text.Json.JsonEncodedText.Encode("initializing_shards");
+	private static readonly System.Text.Json.JsonEncodedText PropNumberOfDataNodes = System.Text.Json.JsonEncodedText.Encode("number_of_data_nodes");
+	private static readonly System.Text.Json.JsonEncodedText PropNumberOfInFlightFetch = System.Text.Json.JsonEncodedText.Encode("number_of_in_flight_fetch");
+	private static readonly System.Text.Json.JsonEncodedText PropNumberOfNodes = System.Text.Json.JsonEncodedText.Encode("number_of_nodes");
+	private static readonly System.Text.Json.JsonEncodedText PropNumberOfPendingTasks = System.Text.Json.JsonEncodedText.Encode("number_of_pending_tasks");
+	private static readonly System.Text.Json.JsonEncodedText PropRelocatingShards = System.Text.Json.JsonEncodedText.Encode("relocating_shards");
+	private static readonly System.Text.Json.JsonEncodedText PropStatus = System.Text.Json.JsonEncodedText.Encode("status");
+	private static readonly System.Text.Json.JsonEncodedText PropTaskMaxWaitingInQueue = System.Text.Json.JsonEncodedText.Encode("task_max_waiting_in_queue");
+	private static readonly System.Text.Json.JsonEncodedText PropTaskMaxWaitingInQueueMillis = System.Text.Json.JsonEncodedText.Encode("task_max_waiting_in_queue_millis");
+	private static readonly System.Text.Json.JsonEncodedText PropTimedOut = System.Text.Json.JsonEncodedText.Encode("timed_out");
+	private static readonly System.Text.Json.JsonEncodedText PropUnassignedPrimaryShards = System.Text.Json.JsonEncodedText.Encode("unassigned_primary_shards");
+	private static readonly System.Text.Json.JsonEncodedText PropUnassignedShards = System.Text.Json.JsonEncodedText.Encode("unassigned_shards");
+
+	public override HealthResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<int> propActivePrimaryShards = default;
+		LocalJsonProperty<int> propActiveShards = default;
+		LocalJsonProperty<double> propActiveShardsPercentAsNumber = default;
+		LocalJsonProperty<string> propClusterName = default;
+		LocalJsonProperty<int> propDelayedUnassignedShards = default;
+		LocalJsonProperty<IReadOnlyDictionary<Elastic.Clients.Elasticsearch.Serverless.IndexName, Elastic.Clients.Elasticsearch.Serverless.Cluster.IndexHealthStats>?> propIndices = default;
+		LocalJsonProperty<int> propInitializingShards = default;
+		LocalJsonProperty<int> propNumberOfDataNodes = default;
+		LocalJsonProperty<int> propNumberOfInFlightFetch = default;
+		LocalJsonProperty<int> propNumberOfNodes = default;
+		LocalJsonProperty<int> propNumberOfPendingTasks = default;
+		LocalJsonProperty<int> propRelocatingShards = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.HealthStatus> propStatus = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Duration?> propTaskMaxWaitingInQueue = default;
+		LocalJsonProperty<long> propTaskMaxWaitingInQueueMillis = default;
+		LocalJsonProperty<bool> propTimedOut = default;
+		LocalJsonProperty<int> propUnassignedPrimaryShards = default;
+		LocalJsonProperty<int> propUnassignedShards = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propActivePrimaryShards.TryRead(ref reader, options, PropActivePrimaryShards))
+			{
+				continue;
+			}
+
+			if (propActiveShards.TryRead(ref reader, options, PropActiveShards))
+			{
+				continue;
+			}
+
+			if (propActiveShardsPercentAsNumber.TryRead(ref reader, options, PropActiveShardsPercentAsNumber))
+			{
+				continue;
+			}
+
+			if (propClusterName.TryRead(ref reader, options, PropClusterName))
+			{
+				continue;
+			}
+
+			if (propDelayedUnassignedShards.TryRead(ref reader, options, PropDelayedUnassignedShards))
+			{
+				continue;
+			}
+
+			if (propIndices.TryRead(ref reader, options, PropIndices))
+			{
+				continue;
+			}
+
+			if (propInitializingShards.TryRead(ref reader, options, PropInitializingShards))
+			{
+				continue;
+			}
+
+			if (propNumberOfDataNodes.TryRead(ref reader, options, PropNumberOfDataNodes))
+			{
+				continue;
+			}
+
+			if (propNumberOfInFlightFetch.TryRead(ref reader, options, PropNumberOfInFlightFetch))
+			{
+				continue;
+			}
+
+			if (propNumberOfNodes.TryRead(ref reader, options, PropNumberOfNodes))
+			{
+				continue;
+			}
+
+			if (propNumberOfPendingTasks.TryRead(ref reader, options, PropNumberOfPendingTasks))
+			{
+				continue;
+			}
+
+			if (propRelocatingShards.TryRead(ref reader, options, PropRelocatingShards))
+			{
+				continue;
+			}
+
+			if (propStatus.TryRead(ref reader, options, PropStatus))
+			{
+				continue;
+			}
+
+			if (propTaskMaxWaitingInQueue.TryRead(ref reader, options, PropTaskMaxWaitingInQueue))
+			{
+				continue;
+			}
+
+			if (propTaskMaxWaitingInQueueMillis.TryRead(ref reader, options, PropTaskMaxWaitingInQueueMillis))
+			{
+				continue;
+			}
+
+			if (propTimedOut.TryRead(ref reader, options, PropTimedOut))
+			{
+				continue;
+			}
+
+			if (propUnassignedPrimaryShards.TryRead(ref reader, options, PropUnassignedPrimaryShards))
+			{
+				continue;
+			}
+
+			if (propUnassignedShards.TryRead(ref reader, options, PropUnassignedShards))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new HealthResponse
+		{
+			ActivePrimaryShards = propActivePrimaryShards.Value
+,
+			ActiveShards = propActiveShards.Value
+,
+			ActiveShardsPercentAsNumber = propActiveShardsPercentAsNumber.Value
+,
+			ClusterName = propClusterName.Value
+,
+			DelayedUnassignedShards = propDelayedUnassignedShards.Value
+,
+			Indices = propIndices.Value
+,
+			InitializingShards = propInitializingShards.Value
+,
+			NumberOfDataNodes = propNumberOfDataNodes.Value
+,
+			NumberOfInFlightFetch = propNumberOfInFlightFetch.Value
+,
+			NumberOfNodes = propNumberOfNodes.Value
+,
+			NumberOfPendingTasks = propNumberOfPendingTasks.Value
+,
+			RelocatingShards = propRelocatingShards.Value
+,
+			Status = propStatus.Value
+,
+			TaskMaxWaitingInQueue = propTaskMaxWaitingInQueue.Value
+,
+			TaskMaxWaitingInQueueMillis = propTaskMaxWaitingInQueueMillis.Value
+,
+			TimedOut = propTimedOut.Value
+,
+			UnassignedPrimaryShards = propUnassignedPrimaryShards.Value
+,
+			UnassignedShards = propUnassignedShards.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, HealthResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropActivePrimaryShards, value.ActivePrimaryShards);
+		writer.WriteProperty(options, PropActiveShards, value.ActiveShards);
+		writer.WriteProperty(options, PropActiveShardsPercentAsNumber, value.ActiveShardsPercentAsNumber);
+		writer.WriteProperty(options, PropClusterName, value.ClusterName);
+		writer.WriteProperty(options, PropDelayedUnassignedShards, value.DelayedUnassignedShards);
+		writer.WriteProperty(options, PropIndices, value.Indices);
+		writer.WriteProperty(options, PropInitializingShards, value.InitializingShards);
+		writer.WriteProperty(options, PropNumberOfDataNodes, value.NumberOfDataNodes);
+		writer.WriteProperty(options, PropNumberOfInFlightFetch, value.NumberOfInFlightFetch);
+		writer.WriteProperty(options, PropNumberOfNodes, value.NumberOfNodes);
+		writer.WriteProperty(options, PropNumberOfPendingTasks, value.NumberOfPendingTasks);
+		writer.WriteProperty(options, PropRelocatingShards, value.RelocatingShards);
+		writer.WriteProperty(options, PropStatus, value.Status);
+		writer.WriteProperty(options, PropTaskMaxWaitingInQueue, value.TaskMaxWaitingInQueue);
+		writer.WriteProperty(options, PropTaskMaxWaitingInQueueMillis, value.TaskMaxWaitingInQueueMillis);
+		writer.WriteProperty(options, PropTimedOut, value.TimedOut);
+		writer.WriteProperty(options, PropUnassignedPrimaryShards, value.UnassignedPrimaryShards);
+		writer.WriteProperty(options, PropUnassignedShards, value.UnassignedShards);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(HealthResponseConverter))]
 public sealed partial class HealthResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,7 +240,6 @@ public sealed partial class HealthResponse : ElasticsearchResponse
 	/// The number of active primary shards.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("active_primary_shards")]
 	public int ActivePrimaryShards { get; init; }
 
 	/// <summary>
@@ -41,7 +247,6 @@ public sealed partial class HealthResponse : ElasticsearchResponse
 	/// The total number of active primary and replica shards.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("active_shards")]
 	public int ActiveShards { get; init; }
 
 	/// <summary>
@@ -49,7 +254,6 @@ public sealed partial class HealthResponse : ElasticsearchResponse
 	/// 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>
@@ -57,7 +261,6 @@ public sealed partial class HealthResponse : ElasticsearchResponse
 	/// The name of the cluster.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("cluster_name")]
 	public string ClusterName { get; init; }
 
 	/// <summary>
@@ -65,10 +268,7 @@ public sealed partial class HealthResponse : ElasticsearchResponse
 	/// 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.Serverless.Cluster.IndexHealthStats))]
 	public IReadOnlyDictionary<Elastic.Clients.Elasticsearch.Serverless.IndexName, Elastic.Clients.Elasticsearch.Serverless.Cluster.IndexHealthStats>? Indices { get; init; }
 
 	/// <summary>
@@ -76,7 +276,6 @@ public sealed partial class HealthResponse : ElasticsearchResponse
 	/// The number of shards that are under initialization.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("initializing_shards")]
 	public int InitializingShards { get; init; }
 
 	/// <summary>
@@ -84,7 +283,6 @@ public sealed partial class HealthResponse : ElasticsearchResponse
 	/// The number of nodes that are dedicated data nodes.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("number_of_data_nodes")]
 	public int NumberOfDataNodes { get; init; }
 
 	/// <summary>
@@ -92,7 +290,6 @@ public sealed partial class HealthResponse : ElasticsearchResponse
 	/// The number of unfinished fetches.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("number_of_in_flight_fetch")]
 	public int NumberOfInFlightFetch { get; init; }
 
 	/// <summary>
@@ -100,7 +297,6 @@ public sealed partial class HealthResponse : ElasticsearchResponse
 	/// The number of nodes within the cluster.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("number_of_nodes")]
 	public int NumberOfNodes { get; init; }
 
 	/// <summary>
@@ -108,7 +304,6 @@ public sealed partial class HealthResponse : ElasticsearchResponse
 	/// 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>
@@ -116,9 +311,7 @@ public sealed partial class HealthResponse : ElasticsearchResponse
 	/// 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.Serverless.HealthStatus Status { get; init; }
 
 	/// <summary>
@@ -126,7 +319,6 @@ public sealed partial class HealthResponse : ElasticsearchResponse
 	/// 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.Serverless.Duration? TaskMaxWaitingInQueue { get; init; }
 
 	/// <summary>
@@ -134,7 +326,6 @@ public sealed partial class HealthResponse : ElasticsearchResponse
 	/// 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>
@@ -142,7 +333,6 @@ public sealed partial class HealthResponse : ElasticsearchResponse
 	/// 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>
@@ -150,7 +340,6 @@ public sealed partial class HealthResponse : ElasticsearchResponse
 	/// The number of primary shards that are not allocated.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("unassigned_primary_shards")]
 	public int UnassignedPrimaryShards { get; init; }
 
 	/// <summary>
@@ -158,6 +347,5 @@ public sealed partial class HealthResponse : ElasticsearchResponse
 	/// 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.Serverless/_Generated/Api/Cluster/PendingTasksResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Cluster/PendingTasksResponse.g.cs
index d4cd024db8e..dbad8cde7cf 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Cluster/PendingTasksResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Cluster/PendingTasksResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Cluster;
 
+internal sealed partial class PendingTasksResponseConverter : System.Text.Json.Serialization.JsonConverter<PendingTasksResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropTasks = System.Text.Json.JsonEncodedText.Encode("tasks");
+
+	public override PendingTasksResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Cluster.PendingTask>> propTasks = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propTasks.TryRead(ref reader, options, PropTasks))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PendingTasksResponse
+		{
+			Tasks = propTasks.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PendingTasksResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropTasks, value.Tasks);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PendingTasksResponseConverter))]
 public sealed partial class PendingTasksResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("tasks")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Cluster.PendingTask> Tasks { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Cluster/PutComponentTemplateResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Cluster/PutComponentTemplateResponse.g.cs
index 6b23a00a031..3a6fc13e92d 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Cluster/PutComponentTemplateResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Cluster/PutComponentTemplateResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Cluster;
 
+internal sealed partial class PutComponentTemplateResponseConverter : System.Text.Json.Serialization.JsonConverter<PutComponentTemplateResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override PutComponentTemplateResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutComponentTemplateResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutComponentTemplateResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PutComponentTemplateResponseConverter))]
 public sealed partial class PutComponentTemplateResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class PutComponentTemplateResponse : ElasticsearchResponse
 	/// 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.Serverless/_Generated/Api/CountResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/CountResponse.g.cs
index f5f128d25bc..938a4706c0a 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/CountResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/CountResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless;
 
+internal sealed partial class CountResponseConverter : System.Text.Json.Serialization.JsonConverter<CountResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCount = System.Text.Json.JsonEncodedText.Encode("count");
+	private static readonly System.Text.Json.JsonEncodedText PropShards = System.Text.Json.JsonEncodedText.Encode("_shards");
+
+	public override CountResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<long> propCount = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.ShardStatistics> propShards = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCount.TryRead(ref reader, options, PropCount))
+			{
+				continue;
+			}
+
+			if (propShards.TryRead(ref reader, options, PropShards))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new CountResponse
+		{
+			Count = propCount.Value
+,
+			Shards = propShards.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, CountResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCount, value.Count);
+		writer.WriteProperty(options, PropShards, value.Shards);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(CountResponseConverter))]
 public sealed partial class CountResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("count")]
 	public long Count { get; init; }
-	[JsonInclude, JsonPropertyName("_shards")]
 	public Elastic.Clients.Elasticsearch.Serverless.ShardStatistics Shards { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/CreateRequest.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/CreateRequest.g.cs
index effdf74767f..51590692fad 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/CreateRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/CreateRequest.g.cs
@@ -94,7 +94,7 @@ public sealed partial class CreateRequestParameters : RequestParameters
 /// If the target is an index and the document already exists, the request updates the document and increments its version.
 /// </para>
 /// </summary>
-public sealed partial class CreateRequest<TDocument> : PlainRequest<CreateRequestParameters>, ISelfSerializable
+public sealed partial class CreateRequest<TDocument> : PlainRequest<CreateRequestParameters>, ISelfTwoWaySerializable
 {
 	public CreateRequest(Elastic.Clients.Elasticsearch.Serverless.IndexName index, Elastic.Clients.Elasticsearch.Serverless.Id id) : base(r => r.Required("index", index).Required("id", id))
 	{
@@ -168,13 +168,17 @@ public CreateRequest(Elastic.Clients.Elasticsearch.Serverless.IndexName index, E
 	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Serverless.WaitForActiveShards? WaitForActiveShards { get => Q<Elastic.Clients.Elasticsearch.Serverless.WaitForActiveShards?>("wait_for_active_shards"); set => Q("wait_for_active_shards", value); }
-	[JsonIgnore]
 	public TDocument Document { get; set; }
 
-	void ISelfSerializable.Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
+	void ISelfTwoWaySerializable.Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 	{
 		settings.SourceSerializer.Serialize(Document, writer);
 	}
+
+	void ISelfTwoWaySerializable.Deserialize(ref Utf8JsonReader reader, JsonSerializerOptions options, IElasticsearchClientSettings settings)
+	{
+		Document = settings.SourceSerializer.Deserialize<TDocument>(ref reader);
+	}
 }
 
 /// <summary>
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/CreateResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/CreateResponse.g.cs
index 17ad3a8848c..c1ae9fcab9f 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/CreateResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/CreateResponse.g.cs
@@ -18,30 +18,129 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless;
 
+internal sealed partial class CreateResponseConverter : System.Text.Json.Serialization.JsonConverter<CreateResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropForcedRefresh = System.Text.Json.JsonEncodedText.Encode("forced_refresh");
+	private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("_id");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("_index");
+	private static readonly System.Text.Json.JsonEncodedText PropPrimaryTerm = System.Text.Json.JsonEncodedText.Encode("_primary_term");
+	private static readonly System.Text.Json.JsonEncodedText PropResult = System.Text.Json.JsonEncodedText.Encode("result");
+	private static readonly System.Text.Json.JsonEncodedText PropSeqNo = System.Text.Json.JsonEncodedText.Encode("_seq_no");
+	private static readonly System.Text.Json.JsonEncodedText PropShards = System.Text.Json.JsonEncodedText.Encode("_shards");
+	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("_version");
+
+	public override CreateResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool?> propForcedRefresh = default;
+		LocalJsonProperty<string> propId = default;
+		LocalJsonProperty<string> propIndex = default;
+		LocalJsonProperty<long?> propPrimaryTerm = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Result> propResult = default;
+		LocalJsonProperty<long?> propSeqNo = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.ShardStatistics> propShards = default;
+		LocalJsonProperty<long> propVersion = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propForcedRefresh.TryRead(ref reader, options, PropForcedRefresh))
+			{
+				continue;
+			}
+
+			if (propId.TryRead(ref reader, options, PropId))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propPrimaryTerm.TryRead(ref reader, options, PropPrimaryTerm))
+			{
+				continue;
+			}
+
+			if (propResult.TryRead(ref reader, options, PropResult))
+			{
+				continue;
+			}
+
+			if (propSeqNo.TryRead(ref reader, options, PropSeqNo))
+			{
+				continue;
+			}
+
+			if (propShards.TryRead(ref reader, options, PropShards))
+			{
+				continue;
+			}
+
+			if (propVersion.TryRead(ref reader, options, PropVersion))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new CreateResponse
+		{
+			ForcedRefresh = propForcedRefresh.Value
+,
+			Id = propId.Value
+,
+			Index = propIndex.Value
+,
+			PrimaryTerm = propPrimaryTerm.Value
+,
+			Result = propResult.Value
+,
+			SeqNo = propSeqNo.Value
+,
+			Shards = propShards.Value
+,
+			Version = propVersion.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, CreateResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropForcedRefresh, value.ForcedRefresh);
+		writer.WriteProperty(options, PropId, value.Id);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropPrimaryTerm, value.PrimaryTerm);
+		writer.WriteProperty(options, PropResult, value.Result);
+		writer.WriteProperty(options, PropSeqNo, value.SeqNo);
+		writer.WriteProperty(options, PropShards, value.Shards);
+		writer.WriteProperty(options, PropVersion, value.Version);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(CreateResponseConverter))]
 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.Serverless.Result Result { get; init; }
-	[JsonInclude, JsonPropertyName("_seq_no")]
 	public long? SeqNo { get; init; }
-	[JsonInclude, JsonPropertyName("_shards")]
 	public Elastic.Clients.Elasticsearch.Serverless.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.Serverless/_Generated/Api/DeleteByQueryResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/DeleteByQueryResponse.g.cs
index a8cb2a4cddf..df09c6659c7 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/DeleteByQueryResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/DeleteByQueryResponse.g.cs
@@ -18,46 +18,217 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless;
 
+internal sealed partial class DeleteByQueryResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteByQueryResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropBatches = System.Text.Json.JsonEncodedText.Encode("batches");
+	private static readonly System.Text.Json.JsonEncodedText PropDeleted = System.Text.Json.JsonEncodedText.Encode("deleted");
+	private static readonly System.Text.Json.JsonEncodedText PropFailures = System.Text.Json.JsonEncodedText.Encode("failures");
+	private static readonly System.Text.Json.JsonEncodedText PropNoops = System.Text.Json.JsonEncodedText.Encode("noops");
+	private static readonly System.Text.Json.JsonEncodedText PropRequestsPerSecond = System.Text.Json.JsonEncodedText.Encode("requests_per_second");
+	private static readonly System.Text.Json.JsonEncodedText PropRetries = System.Text.Json.JsonEncodedText.Encode("retries");
+	private static readonly System.Text.Json.JsonEncodedText PropSliceId = System.Text.Json.JsonEncodedText.Encode("slice_id");
+	private static readonly System.Text.Json.JsonEncodedText PropTask = System.Text.Json.JsonEncodedText.Encode("task");
+	private static readonly System.Text.Json.JsonEncodedText PropThrottled = System.Text.Json.JsonEncodedText.Encode("throttled");
+	private static readonly System.Text.Json.JsonEncodedText PropThrottledMillis = System.Text.Json.JsonEncodedText.Encode("throttled_millis");
+	private static readonly System.Text.Json.JsonEncodedText PropThrottledUntil = System.Text.Json.JsonEncodedText.Encode("throttled_until");
+	private static readonly System.Text.Json.JsonEncodedText PropThrottledUntilMillis = System.Text.Json.JsonEncodedText.Encode("throttled_until_millis");
+	private static readonly System.Text.Json.JsonEncodedText PropTimedOut = System.Text.Json.JsonEncodedText.Encode("timed_out");
+	private static readonly System.Text.Json.JsonEncodedText PropTook = System.Text.Json.JsonEncodedText.Encode("took");
+	private static readonly System.Text.Json.JsonEncodedText PropTotal = System.Text.Json.JsonEncodedText.Encode("total");
+	private static readonly System.Text.Json.JsonEncodedText PropVersionConflicts = System.Text.Json.JsonEncodedText.Encode("version_conflicts");
+
+	public override DeleteByQueryResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<long?> propBatches = default;
+		LocalJsonProperty<long?> propDeleted = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.BulkIndexByScrollFailure>?> propFailures = default;
+		LocalJsonProperty<long?> propNoops = default;
+		LocalJsonProperty<float?> propRequestsPerSecond = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Retries?> propRetries = default;
+		LocalJsonProperty<int?> propSliceId = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.TaskId?> propTask = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Duration?> propThrottled = default;
+		LocalJsonProperty<long?> propThrottledMillis = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Duration?> propThrottledUntil = default;
+		LocalJsonProperty<long?> propThrottledUntilMillis = default;
+		LocalJsonProperty<bool?> propTimedOut = default;
+		LocalJsonProperty<long?> propTook = default;
+		LocalJsonProperty<long?> propTotal = default;
+		LocalJsonProperty<long?> propVersionConflicts = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBatches.TryRead(ref reader, options, PropBatches))
+			{
+				continue;
+			}
+
+			if (propDeleted.TryRead(ref reader, options, PropDeleted))
+			{
+				continue;
+			}
+
+			if (propFailures.TryRead(ref reader, options, PropFailures))
+			{
+				continue;
+			}
+
+			if (propNoops.TryRead(ref reader, options, PropNoops))
+			{
+				continue;
+			}
+
+			if (propRequestsPerSecond.TryRead(ref reader, options, PropRequestsPerSecond))
+			{
+				continue;
+			}
+
+			if (propRetries.TryRead(ref reader, options, PropRetries))
+			{
+				continue;
+			}
+
+			if (propSliceId.TryRead(ref reader, options, PropSliceId))
+			{
+				continue;
+			}
+
+			if (propTask.TryRead(ref reader, options, PropTask))
+			{
+				continue;
+			}
+
+			if (propThrottled.TryRead(ref reader, options, PropThrottled))
+			{
+				continue;
+			}
+
+			if (propThrottledMillis.TryRead(ref reader, options, PropThrottledMillis))
+			{
+				continue;
+			}
+
+			if (propThrottledUntil.TryRead(ref reader, options, PropThrottledUntil))
+			{
+				continue;
+			}
+
+			if (propThrottledUntilMillis.TryRead(ref reader, options, PropThrottledUntilMillis))
+			{
+				continue;
+			}
+
+			if (propTimedOut.TryRead(ref reader, options, PropTimedOut))
+			{
+				continue;
+			}
+
+			if (propTook.TryRead(ref reader, options, PropTook))
+			{
+				continue;
+			}
+
+			if (propTotal.TryRead(ref reader, options, PropTotal))
+			{
+				continue;
+			}
+
+			if (propVersionConflicts.TryRead(ref reader, options, PropVersionConflicts))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteByQueryResponse
+		{
+			Batches = propBatches.Value
+,
+			Deleted = propDeleted.Value
+,
+			Failures = propFailures.Value
+,
+			Noops = propNoops.Value
+,
+			RequestsPerSecond = propRequestsPerSecond.Value
+,
+			Retries = propRetries.Value
+,
+			SliceId = propSliceId.Value
+,
+			Task = propTask.Value
+,
+			Throttled = propThrottled.Value
+,
+			ThrottledMillis = propThrottledMillis.Value
+,
+			ThrottledUntil = propThrottledUntil.Value
+,
+			ThrottledUntilMillis = propThrottledUntilMillis.Value
+,
+			TimedOut = propTimedOut.Value
+,
+			Took = propTook.Value
+,
+			Total = propTotal.Value
+,
+			VersionConflicts = propVersionConflicts.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteByQueryResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBatches, value.Batches);
+		writer.WriteProperty(options, PropDeleted, value.Deleted);
+		writer.WriteProperty(options, PropFailures, value.Failures);
+		writer.WriteProperty(options, PropNoops, value.Noops);
+		writer.WriteProperty(options, PropRequestsPerSecond, value.RequestsPerSecond);
+		writer.WriteProperty(options, PropRetries, value.Retries);
+		writer.WriteProperty(options, PropSliceId, value.SliceId);
+		writer.WriteProperty(options, PropTask, value.Task);
+		writer.WriteProperty(options, PropThrottled, value.Throttled);
+		writer.WriteProperty(options, PropThrottledMillis, value.ThrottledMillis);
+		writer.WriteProperty(options, PropThrottledUntil, value.ThrottledUntil);
+		writer.WriteProperty(options, PropThrottledUntilMillis, value.ThrottledUntilMillis);
+		writer.WriteProperty(options, PropTimedOut, value.TimedOut);
+		writer.WriteProperty(options, PropTook, value.Took);
+		writer.WriteProperty(options, PropTotal, value.Total);
+		writer.WriteProperty(options, PropVersionConflicts, value.VersionConflicts);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteByQueryResponseConverter))]
 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.Serverless.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.Serverless.Retries? Retries { get; init; }
-	[JsonInclude, JsonPropertyName("slice_id")]
 	public int? SliceId { get; init; }
-	[JsonInclude, JsonPropertyName("task")]
 	public Elastic.Clients.Elasticsearch.Serverless.TaskId? Task { get; init; }
-	[JsonInclude, JsonPropertyName("throttled")]
 	public Elastic.Clients.Elasticsearch.Serverless.Duration? Throttled { get; init; }
-	[JsonInclude, JsonPropertyName("throttled_millis")]
 	public long? ThrottledMillis { get; init; }
-	[JsonInclude, JsonPropertyName("throttled_until")]
 	public Elastic.Clients.Elasticsearch.Serverless.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.Serverless/_Generated/Api/DeleteByQueryRethrottleResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/DeleteByQueryRethrottleResponse.g.cs
index 8873be7f541..727347c4446 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/DeleteByQueryRethrottleResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/DeleteByQueryRethrottleResponse.g.cs
@@ -18,17 +18,83 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless;
 
+internal sealed partial class DeleteByQueryRethrottleResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteByQueryRethrottleResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropNodeFailures = System.Text.Json.JsonEncodedText.Encode("node_failures");
+	private static readonly System.Text.Json.JsonEncodedText PropNodes = System.Text.Json.JsonEncodedText.Encode("nodes");
+	private static readonly System.Text.Json.JsonEncodedText PropTaskFailures = System.Text.Json.JsonEncodedText.Encode("task_failures");
+	private static readonly System.Text.Json.JsonEncodedText PropTasks = System.Text.Json.JsonEncodedText.Encode("tasks");
+
+	public override DeleteByQueryRethrottleResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.ErrorCause>?> propNodeFailures = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Tasks.NodeTasks>?> propNodes = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.TaskFailure>?> propTaskFailures = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Tasks.TaskInfos?> propTasks = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propNodeFailures.TryRead(ref reader, options, PropNodeFailures))
+			{
+				continue;
+			}
+
+			if (propNodes.TryRead(ref reader, options, PropNodes))
+			{
+				continue;
+			}
+
+			if (propTaskFailures.TryRead(ref reader, options, PropTaskFailures))
+			{
+				continue;
+			}
+
+			if (propTasks.TryRead(ref reader, options, PropTasks))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteByQueryRethrottleResponse
+		{
+			NodeFailures = propNodeFailures.Value
+,
+			Nodes = propNodes.Value
+,
+			TaskFailures = propTaskFailures.Value
+,
+			Tasks = propTasks.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteByQueryRethrottleResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropNodeFailures, value.NodeFailures);
+		writer.WriteProperty(options, PropNodes, value.Nodes);
+		writer.WriteProperty(options, PropTaskFailures, value.TaskFailures);
+		writer.WriteProperty(options, PropTasks, value.Tasks);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteByQueryRethrottleResponseConverter))]
 public sealed partial class DeleteByQueryRethrottleResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("node_failures")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.ErrorCause>? NodeFailures { get; init; }
 
 	/// <summary>
@@ -36,9 +102,7 @@ public sealed partial class DeleteByQueryRethrottleResponse : ElasticsearchRespo
 	/// Task information grouped by node, if <c>group_by</c> was set to <c>node</c> (the default).
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("nodes")]
 	public IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Tasks.NodeTasks>? Nodes { get; init; }
-	[JsonInclude, JsonPropertyName("task_failures")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.TaskFailure>? TaskFailures { get; init; }
 
 	/// <summary>
@@ -47,6 +111,5 @@ public sealed partial class DeleteByQueryRethrottleResponse : ElasticsearchRespo
 	/// <c>group_by</c> was set to <c>parents</c>.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("tasks")]
 	public Elastic.Clients.Elasticsearch.Serverless.Tasks.TaskInfos? Tasks { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/DeleteResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/DeleteResponse.g.cs
index 14f7602e577..117dfbe12e2 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/DeleteResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/DeleteResponse.g.cs
@@ -18,30 +18,129 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless;
 
+internal sealed partial class DeleteResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropForcedRefresh = System.Text.Json.JsonEncodedText.Encode("forced_refresh");
+	private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("_id");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("_index");
+	private static readonly System.Text.Json.JsonEncodedText PropPrimaryTerm = System.Text.Json.JsonEncodedText.Encode("_primary_term");
+	private static readonly System.Text.Json.JsonEncodedText PropResult = System.Text.Json.JsonEncodedText.Encode("result");
+	private static readonly System.Text.Json.JsonEncodedText PropSeqNo = System.Text.Json.JsonEncodedText.Encode("_seq_no");
+	private static readonly System.Text.Json.JsonEncodedText PropShards = System.Text.Json.JsonEncodedText.Encode("_shards");
+	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("_version");
+
+	public override DeleteResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool?> propForcedRefresh = default;
+		LocalJsonProperty<string> propId = default;
+		LocalJsonProperty<string> propIndex = default;
+		LocalJsonProperty<long?> propPrimaryTerm = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Result> propResult = default;
+		LocalJsonProperty<long?> propSeqNo = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.ShardStatistics> propShards = default;
+		LocalJsonProperty<long> propVersion = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propForcedRefresh.TryRead(ref reader, options, PropForcedRefresh))
+			{
+				continue;
+			}
+
+			if (propId.TryRead(ref reader, options, PropId))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propPrimaryTerm.TryRead(ref reader, options, PropPrimaryTerm))
+			{
+				continue;
+			}
+
+			if (propResult.TryRead(ref reader, options, PropResult))
+			{
+				continue;
+			}
+
+			if (propSeqNo.TryRead(ref reader, options, PropSeqNo))
+			{
+				continue;
+			}
+
+			if (propShards.TryRead(ref reader, options, PropShards))
+			{
+				continue;
+			}
+
+			if (propVersion.TryRead(ref reader, options, PropVersion))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteResponse
+		{
+			ForcedRefresh = propForcedRefresh.Value
+,
+			Id = propId.Value
+,
+			Index = propIndex.Value
+,
+			PrimaryTerm = propPrimaryTerm.Value
+,
+			Result = propResult.Value
+,
+			SeqNo = propSeqNo.Value
+,
+			Shards = propShards.Value
+,
+			Version = propVersion.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropForcedRefresh, value.ForcedRefresh);
+		writer.WriteProperty(options, PropId, value.Id);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropPrimaryTerm, value.PrimaryTerm);
+		writer.WriteProperty(options, PropResult, value.Result);
+		writer.WriteProperty(options, PropSeqNo, value.SeqNo);
+		writer.WriteProperty(options, PropShards, value.Shards);
+		writer.WriteProperty(options, PropVersion, value.Version);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteResponseConverter))]
 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.Serverless.Result Result { get; init; }
-	[JsonInclude, JsonPropertyName("_seq_no")]
 	public long? SeqNo { get; init; }
-	[JsonInclude, JsonPropertyName("_shards")]
 	public Elastic.Clients.Elasticsearch.Serverless.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.Serverless/_Generated/Api/DeleteScriptResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/DeleteScriptResponse.g.cs
index a12cef4ef93..15174dbe7d5 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/DeleteScriptResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/DeleteScriptResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless;
 
+internal sealed partial class DeleteScriptResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteScriptResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override DeleteScriptResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteScriptResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteScriptResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteScriptResponseConverter))]
 public sealed partial class DeleteScriptResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class DeleteScriptResponse : ElasticsearchResponse
 	/// 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.Serverless/_Generated/Api/Enrich/DeletePolicyResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Enrich/DeletePolicyResponse.g.cs
index ddcc0a34a0c..08aad0f3c00 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Enrich/DeletePolicyResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Enrich/DeletePolicyResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Enrich;
 
+internal sealed partial class DeletePolicyResponseConverter : System.Text.Json.Serialization.JsonConverter<DeletePolicyResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override DeletePolicyResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeletePolicyResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeletePolicyResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeletePolicyResponseConverter))]
 public sealed partial class DeletePolicyResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class DeletePolicyResponse : ElasticsearchResponse
 	/// 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.Serverless/_Generated/Api/Enrich/EnrichStatsResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Enrich/EnrichStatsResponse.g.cs
index 8bfd8cf71e0..318c579ca31 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Enrich/EnrichStatsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Enrich/EnrichStatsResponse.g.cs
@@ -18,14 +18,71 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Enrich;
 
+internal sealed partial class EnrichStatsResponseConverter : System.Text.Json.Serialization.JsonConverter<EnrichStatsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCacheStats = System.Text.Json.JsonEncodedText.Encode("cache_stats");
+	private static readonly System.Text.Json.JsonEncodedText PropCoordinatorStats = System.Text.Json.JsonEncodedText.Encode("coordinator_stats");
+	private static readonly System.Text.Json.JsonEncodedText PropExecutingPolicies = System.Text.Json.JsonEncodedText.Encode("executing_policies");
+
+	public override EnrichStatsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Enrich.CacheStats>?> propCacheStats = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Enrich.CoordinatorStats>> propCoordinatorStats = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Enrich.ExecutingPolicy>> propExecutingPolicies = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCacheStats.TryRead(ref reader, options, PropCacheStats))
+			{
+				continue;
+			}
+
+			if (propCoordinatorStats.TryRead(ref reader, options, PropCoordinatorStats))
+			{
+				continue;
+			}
+
+			if (propExecutingPolicies.TryRead(ref reader, options, PropExecutingPolicies))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new EnrichStatsResponse
+		{
+			CacheStats = propCacheStats.Value
+,
+			CoordinatorStats = propCoordinatorStats.Value
+,
+			ExecutingPolicies = propExecutingPolicies.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, EnrichStatsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCacheStats, value.CacheStats);
+		writer.WriteProperty(options, PropCoordinatorStats, value.CoordinatorStats);
+		writer.WriteProperty(options, PropExecutingPolicies, value.ExecutingPolicies);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(EnrichStatsResponseConverter))]
 public sealed partial class EnrichStatsResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,7 +90,6 @@ public sealed partial class EnrichStatsResponse : ElasticsearchResponse
 	/// Objects containing information about the enrich cache stats on each ingest node.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("cache_stats")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Enrich.CacheStats>? CacheStats { get; init; }
 
 	/// <summary>
@@ -41,7 +97,6 @@ public sealed partial class EnrichStatsResponse : ElasticsearchResponse
 	/// Objects containing information about each coordinating ingest node for configured enrich processors.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("coordinator_stats")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Enrich.CoordinatorStats> CoordinatorStats { get; init; }
 
 	/// <summary>
@@ -49,6 +104,5 @@ public sealed partial class EnrichStatsResponse : ElasticsearchResponse
 	/// Objects containing information about each enrich policy that is currently executing.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("executing_policies")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Enrich.ExecutingPolicy> ExecutingPolicies { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Enrich/ExecutePolicyResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Enrich/ExecutePolicyResponse.g.cs
index 456ddb5ba4f..0f6451c4bef 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Enrich/ExecutePolicyResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Enrich/ExecutePolicyResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Enrich;
 
+internal sealed partial class ExecutePolicyResponseConverter : System.Text.Json.Serialization.JsonConverter<ExecutePolicyResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStatus = System.Text.Json.JsonEncodedText.Encode("status");
+	private static readonly System.Text.Json.JsonEncodedText PropTaskId = System.Text.Json.JsonEncodedText.Encode("task_id");
+
+	public override ExecutePolicyResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Enrich.ExecuteEnrichPolicyStatus?> propStatus = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.TaskId?> propTaskId = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStatus.TryRead(ref reader, options, PropStatus))
+			{
+				continue;
+			}
+
+			if (propTaskId.TryRead(ref reader, options, PropTaskId))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ExecutePolicyResponse
+		{
+			Status = propStatus.Value
+,
+			TaskId = propTaskId.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ExecutePolicyResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStatus, value.Status);
+		writer.WriteProperty(options, PropTaskId, value.TaskId);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ExecutePolicyResponseConverter))]
 public sealed partial class ExecutePolicyResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("status")]
 	public Elastic.Clients.Elasticsearch.Serverless.Enrich.ExecuteEnrichPolicyStatus? Status { get; init; }
-	[JsonInclude, JsonPropertyName("task_id")]
 	public Elastic.Clients.Elasticsearch.Serverless.TaskId? TaskId { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Enrich/GetPolicyResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Enrich/GetPolicyResponse.g.cs
index a6859836745..7e10f4bc7b4 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Enrich/GetPolicyResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Enrich/GetPolicyResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Enrich;
 
+internal sealed partial class GetPolicyResponseConverter : System.Text.Json.Serialization.JsonConverter<GetPolicyResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropPolicies = System.Text.Json.JsonEncodedText.Encode("policies");
+
+	public override GetPolicyResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Enrich.EnrichSummary>> propPolicies = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propPolicies.TryRead(ref reader, options, PropPolicies))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetPolicyResponse
+		{
+			Policies = propPolicies.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetPolicyResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropPolicies, value.Policies);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetPolicyResponseConverter))]
 public sealed partial class GetPolicyResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("policies")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Enrich.EnrichSummary> Policies { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Enrich/PutPolicyResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Enrich/PutPolicyResponse.g.cs
index b139f4781c1..d70e1531faa 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Enrich/PutPolicyResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Enrich/PutPolicyResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Enrich;
 
+internal sealed partial class PutPolicyResponseConverter : System.Text.Json.Serialization.JsonConverter<PutPolicyResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override PutPolicyResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutPolicyResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutPolicyResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PutPolicyResponseConverter))]
 public sealed partial class PutPolicyResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class PutPolicyResponse : ElasticsearchResponse
 	/// 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.Serverless/_Generated/Api/Eql/EqlDeleteResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Eql/EqlDeleteResponse.g.cs
index 38f55f2b5cc..989e15608a7 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Eql/EqlDeleteResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Eql/EqlDeleteResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Eql;
 
+internal sealed partial class EqlDeleteResponseConverter : System.Text.Json.Serialization.JsonConverter<EqlDeleteResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override EqlDeleteResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new EqlDeleteResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, EqlDeleteResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(EqlDeleteResponseConverter))]
 public sealed partial class EqlDeleteResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class EqlDeleteResponse : ElasticsearchResponse
 	/// 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.Serverless/_Generated/Api/Eql/EqlGetResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Eql/EqlGetResponse.g.cs
index 19dc034e90b..d7caec39f45 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Eql/EqlGetResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Eql/EqlGetResponse.g.cs
@@ -18,14 +18,128 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Eql;
 
+internal sealed partial class EqlGetResponseConverter<TEvent> : System.Text.Json.Serialization.JsonConverter<EqlGetResponse<TEvent>>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropHits = System.Text.Json.JsonEncodedText.Encode("hits");
+	private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("id");
+	private static readonly System.Text.Json.JsonEncodedText PropIsPartial = System.Text.Json.JsonEncodedText.Encode("is_partial");
+	private static readonly System.Text.Json.JsonEncodedText PropIsRunning = System.Text.Json.JsonEncodedText.Encode("is_running");
+	private static readonly System.Text.Json.JsonEncodedText PropShardFailures = System.Text.Json.JsonEncodedText.Encode("shard_failures");
+	private static readonly System.Text.Json.JsonEncodedText PropTimedOut = System.Text.Json.JsonEncodedText.Encode("timed_out");
+	private static readonly System.Text.Json.JsonEncodedText PropTook = System.Text.Json.JsonEncodedText.Encode("took");
+
+	public override EqlGetResponse<TEvent> Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Eql.EqlHits<TEvent>> propHits = default;
+		LocalJsonProperty<string?> propId = default;
+		LocalJsonProperty<bool?> propIsPartial = default;
+		LocalJsonProperty<bool?> propIsRunning = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.ShardFailure>?> propShardFailures = default;
+		LocalJsonProperty<bool?> propTimedOut = default;
+		LocalJsonProperty<long?> propTook = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propHits.TryRead(ref reader, options, PropHits))
+			{
+				continue;
+			}
+
+			if (propId.TryRead(ref reader, options, PropId))
+			{
+				continue;
+			}
+
+			if (propIsPartial.TryRead(ref reader, options, PropIsPartial))
+			{
+				continue;
+			}
+
+			if (propIsRunning.TryRead(ref reader, options, PropIsRunning))
+			{
+				continue;
+			}
+
+			if (propShardFailures.TryRead(ref reader, options, PropShardFailures))
+			{
+				continue;
+			}
+
+			if (propTimedOut.TryRead(ref reader, options, PropTimedOut))
+			{
+				continue;
+			}
+
+			if (propTook.TryRead(ref reader, options, PropTook))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new EqlGetResponse<TEvent>
+		{
+			Hits = propHits.Value
+,
+			Id = propId.Value
+,
+			IsPartial = propIsPartial.Value
+,
+			IsRunning = propIsRunning.Value
+,
+			ShardFailures = propShardFailures.Value
+,
+			TimedOut = propTimedOut.Value
+,
+			Took = propTook.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, EqlGetResponse<TEvent> value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropHits, value.Hits);
+		writer.WriteProperty(options, PropId, value.Id);
+		writer.WriteProperty(options, PropIsPartial, value.IsPartial);
+		writer.WriteProperty(options, PropIsRunning, value.IsRunning);
+		writer.WriteProperty(options, PropShardFailures, value.ShardFailures);
+		writer.WriteProperty(options, PropTimedOut, value.TimedOut);
+		writer.WriteProperty(options, PropTook, value.Took);
+		writer.WriteEndObject();
+	}
+}
+
+internal sealed partial class EqlGetResponseConverterFactory : System.Text.Json.Serialization.JsonConverterFactory
+{
+	public override bool CanConvert(System.Type typeToConvert)
+	{
+		return typeToConvert.IsGenericType && typeToConvert.GetGenericTypeDefinition() == typeof(EqlGetResponse<>);
+	}
+
+	public override System.Text.Json.Serialization.JsonConverter CreateConverter(System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		var args = typeToConvert.GetGenericArguments();
+#pragma warning disable IL3050
+		var converter = (System.Text.Json.Serialization.JsonConverter)System.Activator.CreateInstance(typeof(EqlGetResponseConverter<>).MakeGenericType(args[0]), System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public, binder: null, args: null, culture: null)!;
+#pragma warning restore IL3050
+		return converter;
+	}
+}
+
+[JsonConverter(typeof(EqlGetResponseConverterFactory))]
 public sealed partial class EqlGetResponse<TEvent> : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,7 +147,6 @@ public sealed partial class EqlGetResponse<TEvent> : ElasticsearchResponse
 	/// Contains matching events and sequences. Also contains related metadata.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("hits")]
 	public Elastic.Clients.Elasticsearch.Serverless.Eql.EqlHits<TEvent> Hits { get; init; }
 
 	/// <summary>
@@ -41,7 +154,6 @@ public sealed partial class EqlGetResponse<TEvent> : ElasticsearchResponse
 	/// Identifier for the search.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("id")]
 	public string? Id { get; init; }
 
 	/// <summary>
@@ -49,7 +161,6 @@ public sealed partial class EqlGetResponse<TEvent> : ElasticsearchResponse
 	/// If true, the response does not contain complete search results.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("is_partial")]
 	public bool? IsPartial { get; init; }
 
 	/// <summary>
@@ -57,7 +168,6 @@ public sealed partial class EqlGetResponse<TEvent> : ElasticsearchResponse
 	/// If true, the search request is still executing.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("is_running")]
 	public bool? IsRunning { get; init; }
 
 	/// <summary>
@@ -65,7 +175,6 @@ public sealed partial class EqlGetResponse<TEvent> : ElasticsearchResponse
 	/// Contains information about shard failures (if any), in case allow_partial_search_results=true
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("shard_failures")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.ShardFailure>? ShardFailures { get; init; }
 
 	/// <summary>
@@ -73,7 +182,6 @@ public sealed partial class EqlGetResponse<TEvent> : ElasticsearchResponse
 	/// If true, the request timed out before completion.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("timed_out")]
 	public bool? TimedOut { get; init; }
 
 	/// <summary>
@@ -81,6 +189,5 @@ public sealed partial class EqlGetResponse<TEvent> : ElasticsearchResponse
 	/// 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.Serverless/_Generated/Api/Eql/EqlSearchRequest.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Eql/EqlSearchRequest.g.cs
index 41ebfb7e630..0b09a1dd39b 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Eql/EqlSearchRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Eql/EqlSearchRequest.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Requests;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport;
@@ -43,6 +44,199 @@ public sealed partial class EqlSearchRequestParameters : RequestParameters
 	public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
 }
 
+internal sealed partial class EqlSearchRequestConverter : System.Text.Json.Serialization.JsonConverter<EqlSearchRequest>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAllowPartialSearchResults = System.Text.Json.JsonEncodedText.Encode("allow_partial_search_results");
+	private static readonly System.Text.Json.JsonEncodedText PropAllowPartialSequenceResults = System.Text.Json.JsonEncodedText.Encode("allow_partial_sequence_results");
+	private static readonly System.Text.Json.JsonEncodedText PropCaseSensitive = System.Text.Json.JsonEncodedText.Encode("case_sensitive");
+	private static readonly System.Text.Json.JsonEncodedText PropEventCategoryField = System.Text.Json.JsonEncodedText.Encode("event_category_field");
+	private static readonly System.Text.Json.JsonEncodedText PropFetchSize = System.Text.Json.JsonEncodedText.Encode("fetch_size");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropFilter = System.Text.Json.JsonEncodedText.Encode("filter");
+	private static readonly System.Text.Json.JsonEncodedText PropKeepAlive = System.Text.Json.JsonEncodedText.Encode("keep_alive");
+	private static readonly System.Text.Json.JsonEncodedText PropKeepOnCompletion = System.Text.Json.JsonEncodedText.Encode("keep_on_completion");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxSamplesPerKey = System.Text.Json.JsonEncodedText.Encode("max_samples_per_key");
+	private static readonly System.Text.Json.JsonEncodedText PropQuery = System.Text.Json.JsonEncodedText.Encode("query");
+	private static readonly System.Text.Json.JsonEncodedText PropResultPosition = System.Text.Json.JsonEncodedText.Encode("result_position");
+	private static readonly System.Text.Json.JsonEncodedText PropRuntimeMappings = System.Text.Json.JsonEncodedText.Encode("runtime_mappings");
+	private static readonly System.Text.Json.JsonEncodedText PropSize = System.Text.Json.JsonEncodedText.Encode("size");
+	private static readonly System.Text.Json.JsonEncodedText PropTiebreakerField = System.Text.Json.JsonEncodedText.Encode("tiebreaker_field");
+	private static readonly System.Text.Json.JsonEncodedText PropTimestampField = System.Text.Json.JsonEncodedText.Encode("timestamp_field");
+	private static readonly System.Text.Json.JsonEncodedText PropWaitForCompletionTimeout = System.Text.Json.JsonEncodedText.Encode("wait_for_completion_timeout");
+
+	public override EqlSearchRequest Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool?> propAllowPartialSearchResults = default;
+		LocalJsonProperty<bool?> propAllowPartialSequenceResults = default;
+		LocalJsonProperty<bool?> propCaseSensitive = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Field?> propEventCategoryField = default;
+		LocalJsonProperty<int?> propFetchSize = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.FieldAndFormat>?> propFields = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query>?> propFilter = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Duration?> propKeepAlive = default;
+		LocalJsonProperty<bool?> propKeepOnCompletion = default;
+		LocalJsonProperty<int?> propMaxSamplesPerKey = default;
+		LocalJsonProperty<string> propQuery = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Eql.ResultPosition?> propResultPosition = default;
+		LocalJsonProperty<IDictionary<Elastic.Clients.Elasticsearch.Serverless.Field, Elastic.Clients.Elasticsearch.Serverless.Mapping.RuntimeField>?> propRuntimeMappings = default;
+		LocalJsonProperty<int?> propSize = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Field?> propTiebreakerField = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Field?> propTimestampField = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Duration?> propWaitForCompletionTimeout = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAllowPartialSearchResults.TryRead(ref reader, options, PropAllowPartialSearchResults))
+			{
+				continue;
+			}
+
+			if (propAllowPartialSequenceResults.TryRead(ref reader, options, PropAllowPartialSequenceResults))
+			{
+				continue;
+			}
+
+			if (propCaseSensitive.TryRead(ref reader, options, PropCaseSensitive))
+			{
+				continue;
+			}
+
+			if (propEventCategoryField.TryRead(ref reader, options, PropEventCategoryField))
+			{
+				continue;
+			}
+
+			if (propFetchSize.TryRead(ref reader, options, PropFetchSize))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.FieldAndFormat>?, Elastic.Clients.Elasticsearch.Serverless.QueryDsl.FieldAndFormat>)))
+			{
+				continue;
+			}
+
+			if (propFilter.TryRead(ref reader, options, PropFilter, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query>?, Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query>)))
+			{
+				continue;
+			}
+
+			if (propKeepAlive.TryRead(ref reader, options, PropKeepAlive))
+			{
+				continue;
+			}
+
+			if (propKeepOnCompletion.TryRead(ref reader, options, PropKeepOnCompletion))
+			{
+				continue;
+			}
+
+			if (propMaxSamplesPerKey.TryRead(ref reader, options, PropMaxSamplesPerKey))
+			{
+				continue;
+			}
+
+			if (propQuery.TryRead(ref reader, options, PropQuery))
+			{
+				continue;
+			}
+
+			if (propResultPosition.TryRead(ref reader, options, PropResultPosition))
+			{
+				continue;
+			}
+
+			if (propRuntimeMappings.TryRead(ref reader, options, PropRuntimeMappings))
+			{
+				continue;
+			}
+
+			if (propSize.TryRead(ref reader, options, PropSize))
+			{
+				continue;
+			}
+
+			if (propTiebreakerField.TryRead(ref reader, options, PropTiebreakerField))
+			{
+				continue;
+			}
+
+			if (propTimestampField.TryRead(ref reader, options, PropTimestampField))
+			{
+				continue;
+			}
+
+			if (propWaitForCompletionTimeout.TryRead(ref reader, options, PropWaitForCompletionTimeout))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new EqlSearchRequest
+		{
+			AllowPartialSearchResults = propAllowPartialSearchResults.Value
+	,
+			AllowPartialSequenceResults = propAllowPartialSequenceResults.Value
+	,
+			CaseSensitive = propCaseSensitive.Value
+	,
+			EventCategoryField = propEventCategoryField.Value
+	,
+			FetchSize = propFetchSize.Value
+	,
+			Fields = propFields.Value
+	,
+			Filter = propFilter.Value
+	,
+			KeepAlive = propKeepAlive.Value
+	,
+			KeepOnCompletion = propKeepOnCompletion.Value
+	,
+			MaxSamplesPerKey = propMaxSamplesPerKey.Value
+	,
+			Query = propQuery.Value
+	,
+			ResultPosition = propResultPosition.Value
+	,
+			RuntimeMappings = propRuntimeMappings.Value
+	,
+			Size = propSize.Value
+	,
+			TiebreakerField = propTiebreakerField.Value
+	,
+			TimestampField = propTimestampField.Value
+	,
+			WaitForCompletionTimeout = propWaitForCompletionTimeout.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, EqlSearchRequest value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAllowPartialSearchResults, value.AllowPartialSearchResults);
+		writer.WriteProperty(options, PropAllowPartialSequenceResults, value.AllowPartialSequenceResults);
+		writer.WriteProperty(options, PropCaseSensitive, value.CaseSensitive);
+		writer.WriteProperty(options, PropEventCategoryField, value.EventCategoryField);
+		writer.WriteProperty(options, PropFetchSize, value.FetchSize);
+		writer.WriteProperty(options, PropFields, value.Fields, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.FieldAndFormat>?, Elastic.Clients.Elasticsearch.Serverless.QueryDsl.FieldAndFormat>));
+		writer.WriteProperty(options, PropFilter, value.Filter, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query>?, Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query>));
+		writer.WriteProperty(options, PropKeepAlive, value.KeepAlive);
+		writer.WriteProperty(options, PropKeepOnCompletion, value.KeepOnCompletion);
+		writer.WriteProperty(options, PropMaxSamplesPerKey, value.MaxSamplesPerKey);
+		writer.WriteProperty(options, PropQuery, value.Query);
+		writer.WriteProperty(options, PropResultPosition, value.ResultPosition);
+		writer.WriteProperty(options, PropRuntimeMappings, value.RuntimeMappings);
+		writer.WriteProperty(options, PropSize, value.Size);
+		writer.WriteProperty(options, PropTiebreakerField, value.TiebreakerField);
+		writer.WriteProperty(options, PropTimestampField, value.TimestampField);
+		writer.WriteProperty(options, PropWaitForCompletionTimeout, value.WaitForCompletionTimeout);
+		writer.WriteEndObject();
+	}
+}
+
 /// <summary>
 /// <para>
 /// Get EQL search results.
@@ -50,6 +244,7 @@ public sealed partial class EqlSearchRequestParameters : RequestParameters
 /// EQL assumes each document in a data stream or index corresponds to an event.
 /// </para>
 /// </summary>
+[JsonConverter(typeof(EqlSearchRequestConverter))]
 public sealed partial class EqlSearchRequest : PlainRequest<EqlSearchRequestParameters>
 {
 	public EqlSearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices indices) : base(r => r.Required("index", indices))
@@ -64,9 +259,7 @@ public EqlSearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices indices
 
 	internal override string OperationName => "eql.search";
 
-	[JsonIgnore]
 	public bool? AllowNoIndices { get => Q<bool?>("allow_no_indices"); set => Q("allow_no_indices", value); }
-	[JsonIgnore]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.ExpandWildcard>? ExpandWildcards { get => Q<ICollection<Elastic.Clients.Elasticsearch.Serverless.ExpandWildcard>?>("expand_wildcards"); set => Q("expand_wildcards", value); }
 
 	/// <summary>
@@ -74,13 +267,9 @@ public EqlSearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices indices
 	/// 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); }
-	[JsonInclude, JsonPropertyName("allow_partial_search_results")]
 	public bool? AllowPartialSearchResults { get; set; }
-	[JsonInclude, JsonPropertyName("allow_partial_sequence_results")]
 	public bool? AllowPartialSequenceResults { get; set; }
-	[JsonInclude, JsonPropertyName("case_sensitive")]
 	public bool? CaseSensitive { get; set; }
 
 	/// <summary>
@@ -88,7 +277,6 @@ public EqlSearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices indices
 	/// Field containing the event classification, such as process, file, or network.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("event_category_field")]
 	public Elastic.Clients.Elasticsearch.Serverless.Field? EventCategoryField { get; set; }
 
 	/// <summary>
@@ -96,7 +284,6 @@ public EqlSearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices indices
 	/// Maximum number of events to search at a time for sequence queries.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("fetch_size")]
 	public int? FetchSize { get; set; }
 
 	/// <summary>
@@ -104,8 +291,6 @@ public EqlSearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices indices
 	/// 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.Serverless.QueryDsl.FieldAndFormat))]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.FieldAndFormat>? Fields { get; set; }
 
 	/// <summary>
@@ -113,12 +298,8 @@ public EqlSearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices indices
 	/// 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.Serverless.QueryDsl.Query))]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query>? Filter { get; set; }
-	[JsonInclude, JsonPropertyName("keep_alive")]
 	public Elastic.Clients.Elasticsearch.Serverless.Duration? KeepAlive { get; set; }
-	[JsonInclude, JsonPropertyName("keep_on_completion")]
 	public bool? KeepOnCompletion { get; set; }
 
 	/// <summary>
@@ -128,7 +309,6 @@ public EqlSearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices indices
 	/// <c>max_samples_per_key</c> parameter. Pipes are not supported for sample queries.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("max_samples_per_key")]
 	public int? MaxSamplesPerKey { get; set; }
 
 	/// <summary>
@@ -136,11 +316,8 @@ public EqlSearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices indices
 	/// EQL query you wish to run.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("query")]
 	public string Query { get; set; }
-	[JsonInclude, JsonPropertyName("result_position")]
 	public Elastic.Clients.Elasticsearch.Serverless.Eql.ResultPosition? ResultPosition { get; set; }
-	[JsonInclude, JsonPropertyName("runtime_mappings")]
 	public IDictionary<Elastic.Clients.Elasticsearch.Serverless.Field, Elastic.Clients.Elasticsearch.Serverless.Mapping.RuntimeField>? RuntimeMappings { get; set; }
 
 	/// <summary>
@@ -148,7 +325,6 @@ public EqlSearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices indices
 	/// 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>
@@ -156,7 +332,6 @@ public EqlSearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices indices
 	/// Field used to sort hits with the same timestamp in ascending order
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("tiebreaker_field")]
 	public Elastic.Clients.Elasticsearch.Serverless.Field? TiebreakerField { get; set; }
 
 	/// <summary>
@@ -164,9 +339,7 @@ public EqlSearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices indices
 	/// Field containing event timestamp. Default "@timestamp"
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("timestamp_field")]
 	public Elastic.Clients.Elasticsearch.Serverless.Field? TimestampField { get; set; }
-	[JsonInclude, JsonPropertyName("wait_for_completion_timeout")]
 	public Elastic.Clients.Elasticsearch.Serverless.Duration? WaitForCompletionTimeout { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Eql/EqlSearchResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Eql/EqlSearchResponse.g.cs
index c33426f84df..a18bdebebde 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Eql/EqlSearchResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Eql/EqlSearchResponse.g.cs
@@ -18,14 +18,128 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Eql;
 
+internal sealed partial class EqlSearchResponseConverter<TEvent> : System.Text.Json.Serialization.JsonConverter<EqlSearchResponse<TEvent>>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropHits = System.Text.Json.JsonEncodedText.Encode("hits");
+	private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("id");
+	private static readonly System.Text.Json.JsonEncodedText PropIsPartial = System.Text.Json.JsonEncodedText.Encode("is_partial");
+	private static readonly System.Text.Json.JsonEncodedText PropIsRunning = System.Text.Json.JsonEncodedText.Encode("is_running");
+	private static readonly System.Text.Json.JsonEncodedText PropShardFailures = System.Text.Json.JsonEncodedText.Encode("shard_failures");
+	private static readonly System.Text.Json.JsonEncodedText PropTimedOut = System.Text.Json.JsonEncodedText.Encode("timed_out");
+	private static readonly System.Text.Json.JsonEncodedText PropTook = System.Text.Json.JsonEncodedText.Encode("took");
+
+	public override EqlSearchResponse<TEvent> Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Eql.EqlHits<TEvent>> propHits = default;
+		LocalJsonProperty<string?> propId = default;
+		LocalJsonProperty<bool?> propIsPartial = default;
+		LocalJsonProperty<bool?> propIsRunning = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.ShardFailure>?> propShardFailures = default;
+		LocalJsonProperty<bool?> propTimedOut = default;
+		LocalJsonProperty<long?> propTook = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propHits.TryRead(ref reader, options, PropHits))
+			{
+				continue;
+			}
+
+			if (propId.TryRead(ref reader, options, PropId))
+			{
+				continue;
+			}
+
+			if (propIsPartial.TryRead(ref reader, options, PropIsPartial))
+			{
+				continue;
+			}
+
+			if (propIsRunning.TryRead(ref reader, options, PropIsRunning))
+			{
+				continue;
+			}
+
+			if (propShardFailures.TryRead(ref reader, options, PropShardFailures))
+			{
+				continue;
+			}
+
+			if (propTimedOut.TryRead(ref reader, options, PropTimedOut))
+			{
+				continue;
+			}
+
+			if (propTook.TryRead(ref reader, options, PropTook))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new EqlSearchResponse<TEvent>
+		{
+			Hits = propHits.Value
+,
+			Id = propId.Value
+,
+			IsPartial = propIsPartial.Value
+,
+			IsRunning = propIsRunning.Value
+,
+			ShardFailures = propShardFailures.Value
+,
+			TimedOut = propTimedOut.Value
+,
+			Took = propTook.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, EqlSearchResponse<TEvent> value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropHits, value.Hits);
+		writer.WriteProperty(options, PropId, value.Id);
+		writer.WriteProperty(options, PropIsPartial, value.IsPartial);
+		writer.WriteProperty(options, PropIsRunning, value.IsRunning);
+		writer.WriteProperty(options, PropShardFailures, value.ShardFailures);
+		writer.WriteProperty(options, PropTimedOut, value.TimedOut);
+		writer.WriteProperty(options, PropTook, value.Took);
+		writer.WriteEndObject();
+	}
+}
+
+internal sealed partial class EqlSearchResponseConverterFactory : System.Text.Json.Serialization.JsonConverterFactory
+{
+	public override bool CanConvert(System.Type typeToConvert)
+	{
+		return typeToConvert.IsGenericType && typeToConvert.GetGenericTypeDefinition() == typeof(EqlSearchResponse<>);
+	}
+
+	public override System.Text.Json.Serialization.JsonConverter CreateConverter(System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		var args = typeToConvert.GetGenericArguments();
+#pragma warning disable IL3050
+		var converter = (System.Text.Json.Serialization.JsonConverter)System.Activator.CreateInstance(typeof(EqlSearchResponseConverter<>).MakeGenericType(args[0]), System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public, binder: null, args: null, culture: null)!;
+#pragma warning restore IL3050
+		return converter;
+	}
+}
+
+[JsonConverter(typeof(EqlSearchResponseConverterFactory))]
 public sealed partial class EqlSearchResponse<TEvent> : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,7 +147,6 @@ public sealed partial class EqlSearchResponse<TEvent> : ElasticsearchResponse
 	/// Contains matching events and sequences. Also contains related metadata.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("hits")]
 	public Elastic.Clients.Elasticsearch.Serverless.Eql.EqlHits<TEvent> Hits { get; init; }
 
 	/// <summary>
@@ -41,7 +154,6 @@ public sealed partial class EqlSearchResponse<TEvent> : ElasticsearchResponse
 	/// Identifier for the search.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("id")]
 	public string? Id { get; init; }
 
 	/// <summary>
@@ -49,7 +161,6 @@ public sealed partial class EqlSearchResponse<TEvent> : ElasticsearchResponse
 	/// If true, the response does not contain complete search results.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("is_partial")]
 	public bool? IsPartial { get; init; }
 
 	/// <summary>
@@ -57,7 +168,6 @@ public sealed partial class EqlSearchResponse<TEvent> : ElasticsearchResponse
 	/// If true, the search request is still executing.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("is_running")]
 	public bool? IsRunning { get; init; }
 
 	/// <summary>
@@ -65,7 +175,6 @@ public sealed partial class EqlSearchResponse<TEvent> : ElasticsearchResponse
 	/// Contains information about shard failures (if any), in case allow_partial_search_results=true
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("shard_failures")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.ShardFailure>? ShardFailures { get; init; }
 
 	/// <summary>
@@ -73,7 +182,6 @@ public sealed partial class EqlSearchResponse<TEvent> : ElasticsearchResponse
 	/// If true, the request timed out before completion.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("timed_out")]
 	public bool? TimedOut { get; init; }
 
 	/// <summary>
@@ -81,6 +189,5 @@ public sealed partial class EqlSearchResponse<TEvent> : ElasticsearchResponse
 	/// 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.Serverless/_Generated/Api/Eql/GetEqlStatusResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Eql/GetEqlStatusResponse.g.cs
index 5112f40661b..562b19430a1 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Eql/GetEqlStatusResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Eql/GetEqlStatusResponse.g.cs
@@ -18,14 +18,101 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Eql;
 
+internal sealed partial class GetEqlStatusResponseConverter : System.Text.Json.Serialization.JsonConverter<GetEqlStatusResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCompletionStatus = System.Text.Json.JsonEncodedText.Encode("completion_status");
+	private static readonly System.Text.Json.JsonEncodedText PropExpirationTimeInMillis = System.Text.Json.JsonEncodedText.Encode("expiration_time_in_millis");
+	private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("id");
+	private static readonly System.Text.Json.JsonEncodedText PropIsPartial = System.Text.Json.JsonEncodedText.Encode("is_partial");
+	private static readonly System.Text.Json.JsonEncodedText PropIsRunning = System.Text.Json.JsonEncodedText.Encode("is_running");
+	private static readonly System.Text.Json.JsonEncodedText PropStartTimeInMillis = System.Text.Json.JsonEncodedText.Encode("start_time_in_millis");
+
+	public override GetEqlStatusResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<int?> propCompletionStatus = default;
+		LocalJsonProperty<long?> propExpirationTimeInMillis = default;
+		LocalJsonProperty<string> propId = default;
+		LocalJsonProperty<bool> propIsPartial = default;
+		LocalJsonProperty<bool> propIsRunning = default;
+		LocalJsonProperty<long?> propStartTimeInMillis = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCompletionStatus.TryRead(ref reader, options, PropCompletionStatus))
+			{
+				continue;
+			}
+
+			if (propExpirationTimeInMillis.TryRead(ref reader, options, PropExpirationTimeInMillis))
+			{
+				continue;
+			}
+
+			if (propId.TryRead(ref reader, options, PropId))
+			{
+				continue;
+			}
+
+			if (propIsPartial.TryRead(ref reader, options, PropIsPartial))
+			{
+				continue;
+			}
+
+			if (propIsRunning.TryRead(ref reader, options, PropIsRunning))
+			{
+				continue;
+			}
+
+			if (propStartTimeInMillis.TryRead(ref reader, options, PropStartTimeInMillis))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetEqlStatusResponse
+		{
+			CompletionStatus = propCompletionStatus.Value
+,
+			ExpirationTimeInMillis = propExpirationTimeInMillis.Value
+,
+			Id = propId.Value
+,
+			IsPartial = propIsPartial.Value
+,
+			IsRunning = propIsRunning.Value
+,
+			StartTimeInMillis = propStartTimeInMillis.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetEqlStatusResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCompletionStatus, value.CompletionStatus);
+		writer.WriteProperty(options, PropExpirationTimeInMillis, value.ExpirationTimeInMillis);
+		writer.WriteProperty(options, PropId, value.Id);
+		writer.WriteProperty(options, PropIsPartial, value.IsPartial);
+		writer.WriteProperty(options, PropIsRunning, value.IsRunning);
+		writer.WriteProperty(options, PropStartTimeInMillis, value.StartTimeInMillis);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetEqlStatusResponseConverter))]
 public sealed partial class GetEqlStatusResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,7 +120,6 @@ public sealed partial class GetEqlStatusResponse : ElasticsearchResponse
 	/// 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>
@@ -41,7 +127,6 @@ public sealed partial class GetEqlStatusResponse : ElasticsearchResponse
 	/// 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>
@@ -49,7 +134,6 @@ public sealed partial class GetEqlStatusResponse : ElasticsearchResponse
 	/// Identifier for the search.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("id")]
 	public string Id { get; init; }
 
 	/// <summary>
@@ -57,7 +141,6 @@ public sealed partial class GetEqlStatusResponse : ElasticsearchResponse
 	/// 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>
@@ -65,7 +148,6 @@ public sealed partial class GetEqlStatusResponse : ElasticsearchResponse
 	/// 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>
@@ -73,6 +155,5 @@ public sealed partial class GetEqlStatusResponse : ElasticsearchResponse
 	/// 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.Serverless/_Generated/Api/ExplainResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/ExplainResponse.g.cs
index 6925c56fc6f..77685838faf 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/ExplainResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/ExplainResponse.g.cs
@@ -18,24 +18,113 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless;
 
+internal sealed partial class ExplainResponseConverter<TDocument> : System.Text.Json.Serialization.JsonConverter<ExplainResponse<TDocument>>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropExplanation = System.Text.Json.JsonEncodedText.Encode("explanation");
+	private static readonly System.Text.Json.JsonEncodedText PropGet = System.Text.Json.JsonEncodedText.Encode("get");
+	private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("_id");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("_index");
+	private static readonly System.Text.Json.JsonEncodedText PropMatched = System.Text.Json.JsonEncodedText.Encode("matched");
+
+	public override ExplainResponse<TDocument> Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Core.Explain.ExplanationDetail?> propExplanation = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.InlineGet<TDocument>?> propGet = default;
+		LocalJsonProperty<string> propId = default;
+		LocalJsonProperty<string> propIndex = default;
+		LocalJsonProperty<bool> propMatched = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propExplanation.TryRead(ref reader, options, PropExplanation))
+			{
+				continue;
+			}
+
+			if (propGet.TryRead(ref reader, options, PropGet))
+			{
+				continue;
+			}
+
+			if (propId.TryRead(ref reader, options, PropId))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propMatched.TryRead(ref reader, options, PropMatched))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ExplainResponse<TDocument>
+		{
+			Explanation = propExplanation.Value
+,
+			Get = propGet.Value
+,
+			Id = propId.Value
+,
+			Index = propIndex.Value
+,
+			Matched = propMatched.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ExplainResponse<TDocument> value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropExplanation, value.Explanation);
+		writer.WriteProperty(options, PropGet, value.Get);
+		writer.WriteProperty(options, PropId, value.Id);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropMatched, value.Matched);
+		writer.WriteEndObject();
+	}
+}
+
+internal sealed partial class ExplainResponseConverterFactory : System.Text.Json.Serialization.JsonConverterFactory
+{
+	public override bool CanConvert(System.Type typeToConvert)
+	{
+		return typeToConvert.IsGenericType && typeToConvert.GetGenericTypeDefinition() == typeof(ExplainResponse<>);
+	}
+
+	public override System.Text.Json.Serialization.JsonConverter CreateConverter(System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		var args = typeToConvert.GetGenericArguments();
+#pragma warning disable IL3050
+		var converter = (System.Text.Json.Serialization.JsonConverter)System.Activator.CreateInstance(typeof(ExplainResponseConverter<>).MakeGenericType(args[0]), System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public, binder: null, args: null, culture: null)!;
+#pragma warning restore IL3050
+		return converter;
+	}
+}
+
+[JsonConverter(typeof(ExplainResponseConverterFactory))]
 public sealed partial class ExplainResponse<TDocument> : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("explanation")]
 	public Elastic.Clients.Elasticsearch.Serverless.Core.Explain.ExplanationDetail? Explanation { get; init; }
-	[JsonInclude, JsonPropertyName("get")]
 	public Elastic.Clients.Elasticsearch.Serverless.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.Serverless/_Generated/Api/FieldCapsRequest.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/FieldCapsRequest.g.cs
index c947c938007..277c8c4b740 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/FieldCapsRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/FieldCapsRequest.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Requests;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport;
@@ -84,6 +85,59 @@ public sealed partial class FieldCapsRequestParameters : RequestParameters
 	public ICollection<string>? Types { get => Q<ICollection<string>?>("types"); set => Q("types", value); }
 }
 
+internal sealed partial class FieldCapsRequestConverter : System.Text.Json.Serialization.JsonConverter<FieldCapsRequest>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropIndexFilter = System.Text.Json.JsonEncodedText.Encode("index_filter");
+	private static readonly System.Text.Json.JsonEncodedText PropRuntimeMappings = System.Text.Json.JsonEncodedText.Encode("runtime_mappings");
+
+	public override FieldCapsRequest Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Fields?> propFields = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query?> propIndexFilter = default;
+		LocalJsonProperty<IDictionary<Elastic.Clients.Elasticsearch.Serverless.Field, Elastic.Clients.Elasticsearch.Serverless.Mapping.RuntimeField>?> propRuntimeMappings = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propFields.TryRead(ref reader, options, PropFields, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propIndexFilter.TryRead(ref reader, options, PropIndexFilter))
+			{
+				continue;
+			}
+
+			if (propRuntimeMappings.TryRead(ref reader, options, PropRuntimeMappings))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new FieldCapsRequest
+		{
+			Fields = propFields.Value
+	,
+			IndexFilter = propIndexFilter.Value
+	,
+			RuntimeMappings = propRuntimeMappings.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, FieldCapsRequest value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropFields, value.Fields, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropIndexFilter, value.IndexFilter);
+		writer.WriteProperty(options, PropRuntimeMappings, value.RuntimeMappings);
+		writer.WriteEndObject();
+	}
+}
+
 /// <summary>
 /// <para>
 /// Get the field capabilities.
@@ -97,6 +151,7 @@ public sealed partial class FieldCapsRequestParameters : RequestParameters
 /// For example, a runtime field with a type of keyword is returned the same as any other field that belongs to the <c>keyword</c> family.
 /// </para>
 /// </summary>
+[JsonConverter(typeof(FieldCapsRequestConverter))]
 public sealed partial class FieldCapsRequest : PlainRequest<FieldCapsRequestParameters>
 {
 	public FieldCapsRequest()
@@ -122,7 +177,6 @@ public FieldCapsRequest(Elastic.Clients.Elasticsearch.Serverless.Indices? indice
 	/// targeting <c>foo*,bar*</c> 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>
@@ -130,7 +184,6 @@ public FieldCapsRequest(Elastic.Clients.Elasticsearch.Serverless.Indices? indice
 	/// 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 <c>open,hidden</c>.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.ExpandWildcard>? ExpandWildcards { get => Q<ICollection<Elastic.Clients.Elasticsearch.Serverless.ExpandWildcard>?>("expand_wildcards"); set => Q("expand_wildcards", value); }
 
 	/// <summary>
@@ -138,7 +191,6 @@ public FieldCapsRequest(Elastic.Clients.Elasticsearch.Serverless.Indices? indice
 	/// 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>
@@ -146,7 +198,6 @@ public FieldCapsRequest(Elastic.Clients.Elasticsearch.Serverless.Indices? indice
 	/// If <c>true</c>, 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>
@@ -154,7 +205,6 @@ public FieldCapsRequest(Elastic.Clients.Elasticsearch.Serverless.Indices? indice
 	/// If false, empty fields are not included in the response.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public bool? IncludeEmptyFields { get => Q<bool?>("include_empty_fields"); set => Q("include_empty_fields", value); }
 
 	/// <summary>
@@ -162,7 +212,6 @@ public FieldCapsRequest(Elastic.Clients.Elasticsearch.Serverless.Indices? indice
 	/// 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>
@@ -170,7 +219,6 @@ public FieldCapsRequest(Elastic.Clients.Elasticsearch.Serverless.Indices? indice
 	/// 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>
@@ -178,8 +226,6 @@ public FieldCapsRequest(Elastic.Clients.Elasticsearch.Serverless.Indices? indice
 	/// List of fields to retrieve capabilities for. Wildcard (<c>*</c>) expressions are supported.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("fields")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Serverless.Fields? Fields { get; set; }
 
 	/// <summary>
@@ -187,7 +233,6 @@ public FieldCapsRequest(Elastic.Clients.Elasticsearch.Serverless.Indices? indice
 	/// 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.Serverless.QueryDsl.Query? IndexFilter { get; set; }
 
 	/// <summary>
@@ -196,7 +241,6 @@ public FieldCapsRequest(Elastic.Clients.Elasticsearch.Serverless.Indices? indice
 	/// 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.Serverless.Field, Elastic.Clients.Elasticsearch.Serverless.Mapping.RuntimeField>? RuntimeMappings { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/FieldCapsResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/FieldCapsResponse.g.cs
index b812902de68..b4e3b046129 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/FieldCapsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/FieldCapsResponse.g.cs
@@ -18,20 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless;
 
+internal sealed partial class FieldCapsResponseConverter : System.Text.Json.Serialization.JsonConverter<FieldCapsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropIndices = System.Text.Json.JsonEncodedText.Encode("indices");
+
+	public override FieldCapsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyDictionary<Elastic.Clients.Elasticsearch.Serverless.Field, IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Core.FieldCaps.FieldCapability>>> propFields = default;
+		LocalJsonProperty<IReadOnlyCollection<string>> propIndices = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propIndices.TryRead(ref reader, options, PropIndices, typeof(SingleOrManyMarker<IReadOnlyCollection<string>, string>)))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new FieldCapsResponse
+		{
+			Fields = propFields.Value
+,
+			Indices = propIndices.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, FieldCapsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropIndices, value.Indices, typeof(SingleOrManyMarker<IReadOnlyCollection<string>, string>));
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(FieldCapsResponseConverter))]
 public sealed partial class FieldCapsResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("fields")]
-	[ReadOnlyFieldDictionaryConverter(typeof(IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Core.FieldCaps.FieldCapability>))]
 	public IReadOnlyDictionary<Elastic.Clients.Elasticsearch.Serverless.Field, IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Core.FieldCaps.FieldCapability>> Fields { get; init; }
-	[JsonInclude, JsonPropertyName("indices")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public IReadOnlyCollection<string> Indices { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/GetResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/GetResponse.g.cs
index 6991ba6a6f9..e4fdfe776e2 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/GetResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/GetResponse.g.cs
@@ -18,35 +18,168 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless;
 
+internal sealed partial class GetResponseConverter<TDocument> : System.Text.Json.Serialization.JsonConverter<GetResponse<TDocument>>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropFound = System.Text.Json.JsonEncodedText.Encode("found");
+	private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("_id");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnored = System.Text.Json.JsonEncodedText.Encode("_ignored");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("_index");
+	private static readonly System.Text.Json.JsonEncodedText PropPrimaryTerm = System.Text.Json.JsonEncodedText.Encode("_primary_term");
+	private static readonly System.Text.Json.JsonEncodedText PropRouting = System.Text.Json.JsonEncodedText.Encode("_routing");
+	private static readonly System.Text.Json.JsonEncodedText PropSeqNo = System.Text.Json.JsonEncodedText.Encode("_seq_no");
+	private static readonly System.Text.Json.JsonEncodedText PropSource = System.Text.Json.JsonEncodedText.Encode("_source");
+	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("_version");
+
+	public override GetResponse<TDocument> Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.FieldValues?> propFields = default;
+		LocalJsonProperty<bool> propFound = default;
+		LocalJsonProperty<string> propId = default;
+		LocalJsonProperty<IReadOnlyCollection<string>?> propIgnored = default;
+		LocalJsonProperty<string> propIndex = default;
+		LocalJsonProperty<long?> propPrimaryTerm = default;
+		LocalJsonProperty<string?> propRouting = default;
+		LocalJsonProperty<long?> propSeqNo = default;
+		LocalJsonProperty<TDocument?> propSource = default;
+		LocalJsonProperty<long?> propVersion = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propFound.TryRead(ref reader, options, PropFound))
+			{
+				continue;
+			}
+
+			if (propId.TryRead(ref reader, options, PropId))
+			{
+				continue;
+			}
+
+			if (propIgnored.TryRead(ref reader, options, PropIgnored))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propPrimaryTerm.TryRead(ref reader, options, PropPrimaryTerm))
+			{
+				continue;
+			}
+
+			if (propRouting.TryRead(ref reader, options, PropRouting))
+			{
+				continue;
+			}
+
+			if (propSeqNo.TryRead(ref reader, options, PropSeqNo))
+			{
+				continue;
+			}
+
+			if (propSource.TryRead(ref reader, options, PropSource, typeof(SourceMarker<TDocument?>)))
+			{
+				continue;
+			}
+
+			if (propVersion.TryRead(ref reader, options, PropVersion))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetResponse<TDocument>
+		{
+			Fields = propFields.Value
+,
+			Found = propFound.Value
+,
+			Id = propId.Value
+,
+			Ignored = propIgnored.Value
+,
+			Index = propIndex.Value
+,
+			PrimaryTerm = propPrimaryTerm.Value
+,
+			Routing = propRouting.Value
+,
+			SeqNo = propSeqNo.Value
+,
+			Source = propSource.Value
+,
+			Version = propVersion.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetResponse<TDocument> value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropFound, value.Found);
+		writer.WriteProperty(options, PropId, value.Id);
+		writer.WriteProperty(options, PropIgnored, value.Ignored);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropPrimaryTerm, value.PrimaryTerm);
+		writer.WriteProperty(options, PropRouting, value.Routing);
+		writer.WriteProperty(options, PropSeqNo, value.SeqNo);
+		writer.WriteProperty(options, PropSource, value.Source, typeof(SourceMarker<TDocument?>));
+		writer.WriteProperty(options, PropVersion, value.Version);
+		writer.WriteEndObject();
+	}
+}
+
+internal sealed partial class GetResponseConverterFactory : System.Text.Json.Serialization.JsonConverterFactory
+{
+	public override bool CanConvert(System.Type typeToConvert)
+	{
+		return typeToConvert.IsGenericType && typeToConvert.GetGenericTypeDefinition() == typeof(GetResponse<>);
+	}
+
+	public override System.Text.Json.Serialization.JsonConverter CreateConverter(System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		var args = typeToConvert.GetGenericArguments();
+#pragma warning disable IL3050
+		var converter = (System.Text.Json.Serialization.JsonConverter)System.Activator.CreateInstance(typeof(GetResponseConverter<>).MakeGenericType(args[0]), System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public, binder: null, args: null, culture: null)!;
+#pragma warning restore IL3050
+		return converter;
+	}
+}
+
+[JsonConverter(typeof(GetResponseConverterFactory))]
 public sealed partial class GetResponse<TDocument> : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Serverless.FieldValues? Fields { get; init; }
-	[JsonInclude, JsonPropertyName("found")]
 	public bool Found { 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("_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.Serverless/_Generated/Api/GetScriptResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/GetScriptResponse.g.cs
index e283ddb5ab6..576bfb0a2e0 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/GetScriptResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/GetScriptResponse.g.cs
@@ -18,20 +18,74 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless;
 
+internal sealed partial class GetScriptResponseConverter : System.Text.Json.Serialization.JsonConverter<GetScriptResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropFound = System.Text.Json.JsonEncodedText.Encode("found");
+	private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("_id");
+	private static readonly System.Text.Json.JsonEncodedText PropScript = System.Text.Json.JsonEncodedText.Encode("script");
+
+	public override GetScriptResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propFound = default;
+		LocalJsonProperty<string> propId = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.StoredScript?> propScript = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propFound.TryRead(ref reader, options, PropFound))
+			{
+				continue;
+			}
+
+			if (propId.TryRead(ref reader, options, PropId))
+			{
+				continue;
+			}
+
+			if (propScript.TryRead(ref reader, options, PropScript))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetScriptResponse
+		{
+			Found = propFound.Value
+,
+			Id = propId.Value
+,
+			Script = propScript.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetScriptResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropFound, value.Found);
+		writer.WriteProperty(options, PropId, value.Id);
+		writer.WriteProperty(options, PropScript, value.Script);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetScriptResponseConverter))]
 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.Serverless.StoredScript? Script { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Graph/ExploreResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Graph/ExploreResponse.g.cs
index b4c16e5ce14..a5412d3cb5b 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Graph/ExploreResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Graph/ExploreResponse.g.cs
@@ -18,24 +18,96 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Graph;
 
+internal sealed partial class ExploreResponseConverter : System.Text.Json.Serialization.JsonConverter<ExploreResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropConnections = System.Text.Json.JsonEncodedText.Encode("connections");
+	private static readonly System.Text.Json.JsonEncodedText PropFailures = System.Text.Json.JsonEncodedText.Encode("failures");
+	private static readonly System.Text.Json.JsonEncodedText PropTimedOut = System.Text.Json.JsonEncodedText.Encode("timed_out");
+	private static readonly System.Text.Json.JsonEncodedText PropTook = System.Text.Json.JsonEncodedText.Encode("took");
+	private static readonly System.Text.Json.JsonEncodedText PropVertices = System.Text.Json.JsonEncodedText.Encode("vertices");
+
+	public override ExploreResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Graph.Connection>> propConnections = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.ShardFailure>> propFailures = default;
+		LocalJsonProperty<bool> propTimedOut = default;
+		LocalJsonProperty<long> propTook = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Graph.Vertex>> propVertices = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propConnections.TryRead(ref reader, options, PropConnections))
+			{
+				continue;
+			}
+
+			if (propFailures.TryRead(ref reader, options, PropFailures))
+			{
+				continue;
+			}
+
+			if (propTimedOut.TryRead(ref reader, options, PropTimedOut))
+			{
+				continue;
+			}
+
+			if (propTook.TryRead(ref reader, options, PropTook))
+			{
+				continue;
+			}
+
+			if (propVertices.TryRead(ref reader, options, PropVertices))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ExploreResponse
+		{
+			Connections = propConnections.Value
+,
+			Failures = propFailures.Value
+,
+			TimedOut = propTimedOut.Value
+,
+			Took = propTook.Value
+,
+			Vertices = propVertices.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ExploreResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropConnections, value.Connections);
+		writer.WriteProperty(options, PropFailures, value.Failures);
+		writer.WriteProperty(options, PropTimedOut, value.TimedOut);
+		writer.WriteProperty(options, PropTook, value.Took);
+		writer.WriteProperty(options, PropVertices, value.Vertices);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ExploreResponseConverter))]
 public sealed partial class ExploreResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("connections")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Graph.Connection> Connections { get; init; }
-	[JsonInclude, JsonPropertyName("failures")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.ShardFailure> Failures { get; init; }
-	[JsonInclude, JsonPropertyName("timed_out")]
 	public bool TimedOut { get; init; }
-	[JsonInclude, JsonPropertyName("took")]
 	public long Took { get; init; }
-	[JsonInclude, JsonPropertyName("vertices")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Graph.Vertex> Vertices { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/HealthReportResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/HealthReportResponse.g.cs
index dc6e11408ba..2a3b4255fbc 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/HealthReportResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/HealthReportResponse.g.cs
@@ -18,20 +18,74 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless;
 
+internal sealed partial class HealthReportResponseConverter : System.Text.Json.Serialization.JsonConverter<HealthReportResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropClusterName = System.Text.Json.JsonEncodedText.Encode("cluster_name");
+	private static readonly System.Text.Json.JsonEncodedText PropIndicators = System.Text.Json.JsonEncodedText.Encode("indicators");
+	private static readonly System.Text.Json.JsonEncodedText PropStatus = System.Text.Json.JsonEncodedText.Encode("status");
+
+	public override HealthReportResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propClusterName = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Core.HealthReport.Indicators> propIndicators = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Core.HealthReport.IndicatorHealthStatus?> propStatus = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propClusterName.TryRead(ref reader, options, PropClusterName))
+			{
+				continue;
+			}
+
+			if (propIndicators.TryRead(ref reader, options, PropIndicators))
+			{
+				continue;
+			}
+
+			if (propStatus.TryRead(ref reader, options, PropStatus))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new HealthReportResponse
+		{
+			ClusterName = propClusterName.Value
+,
+			Indicators = propIndicators.Value
+,
+			Status = propStatus.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, HealthReportResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropClusterName, value.ClusterName);
+		writer.WriteProperty(options, PropIndicators, value.Indicators);
+		writer.WriteProperty(options, PropStatus, value.Status);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(HealthReportResponseConverter))]
 public sealed partial class HealthReportResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("cluster_name")]
 	public string ClusterName { get; init; }
-	[JsonInclude, JsonPropertyName("indicators")]
 	public Elastic.Clients.Elasticsearch.Serverless.Core.HealthReport.Indicators Indicators { get; init; }
-	[JsonInclude, JsonPropertyName("status")]
 	public Elastic.Clients.Elasticsearch.Serverless.Core.HealthReport.IndicatorHealthStatus? Status { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/AnalyzeIndexRequest.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/AnalyzeIndexRequest.g.cs
index c26f3bc5ee2..13b21c496c3 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/AnalyzeIndexRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/AnalyzeIndexRequest.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Requests;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport;
@@ -34,6 +35,119 @@ public sealed partial class AnalyzeIndexRequestParameters : RequestParameters
 {
 }
 
+internal sealed partial class AnalyzeIndexRequestConverter : System.Text.Json.Serialization.JsonConverter<AnalyzeIndexRequest>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAnalyzer = System.Text.Json.JsonEncodedText.Encode("analyzer");
+	private static readonly System.Text.Json.JsonEncodedText PropAttributes = System.Text.Json.JsonEncodedText.Encode("attributes");
+	private static readonly System.Text.Json.JsonEncodedText PropCharFilter = System.Text.Json.JsonEncodedText.Encode("char_filter");
+	private static readonly System.Text.Json.JsonEncodedText PropExplain = System.Text.Json.JsonEncodedText.Encode("explain");
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropFilter = System.Text.Json.JsonEncodedText.Encode("filter");
+	private static readonly System.Text.Json.JsonEncodedText PropNormalizer = System.Text.Json.JsonEncodedText.Encode("normalizer");
+	private static readonly System.Text.Json.JsonEncodedText PropText = System.Text.Json.JsonEncodedText.Encode("text");
+	private static readonly System.Text.Json.JsonEncodedText PropTokenizer = System.Text.Json.JsonEncodedText.Encode("tokenizer");
+
+	public override AnalyzeIndexRequest Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string?> propAnalyzer = default;
+		LocalJsonProperty<ICollection<string>?> propAttributes = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.Analysis.ICharFilter>?> propCharFilter = default;
+		LocalJsonProperty<bool?> propExplain = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Field?> propField = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.Analysis.ITokenFilter>?> propFilter = default;
+		LocalJsonProperty<string?> propNormalizer = default;
+		LocalJsonProperty<ICollection<string>?> propText = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Analysis.ITokenizer?> propTokenizer = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAnalyzer.TryRead(ref reader, options, PropAnalyzer))
+			{
+				continue;
+			}
+
+			if (propAttributes.TryRead(ref reader, options, PropAttributes))
+			{
+				continue;
+			}
+
+			if (propCharFilter.TryRead(ref reader, options, PropCharFilter))
+			{
+				continue;
+			}
+
+			if (propExplain.TryRead(ref reader, options, PropExplain))
+			{
+				continue;
+			}
+
+			if (propField.TryRead(ref reader, options, PropField))
+			{
+				continue;
+			}
+
+			if (propFilter.TryRead(ref reader, options, PropFilter))
+			{
+				continue;
+			}
+
+			if (propNormalizer.TryRead(ref reader, options, PropNormalizer))
+			{
+				continue;
+			}
+
+			if (propText.TryRead(ref reader, options, PropText, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propTokenizer.TryRead(ref reader, options, PropTokenizer))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new AnalyzeIndexRequest
+		{
+			Analyzer = propAnalyzer.Value
+,
+			Attributes = propAttributes.Value
+,
+			CharFilter = propCharFilter.Value
+,
+			Explain = propExplain.Value
+,
+			Field = propField.Value
+,
+			Filter = propFilter.Value
+,
+			Normalizer = propNormalizer.Value
+,
+			Text = propText.Value
+,
+			Tokenizer = propTokenizer.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, AnalyzeIndexRequest value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAnalyzer, value.Analyzer);
+		writer.WriteProperty(options, PropAttributes, value.Attributes);
+		writer.WriteProperty(options, PropCharFilter, value.CharFilter);
+		writer.WriteProperty(options, PropExplain, value.Explain);
+		writer.WriteProperty(options, PropField, value.Field);
+		writer.WriteProperty(options, PropFilter, value.Filter);
+		writer.WriteProperty(options, PropNormalizer, value.Normalizer);
+		writer.WriteProperty(options, PropText, value.Text, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropTokenizer, value.Tokenizer);
+		writer.WriteEndObject();
+	}
+}
+
 /// <summary>
 /// <para>
 /// Get tokens from text analysis.
@@ -46,6 +160,7 @@ public sealed partial class AnalyzeIndexRequestParameters : RequestParameters
 /// The <c>_analyze</c> endpoint without a specified index will always use <c>10000</c> as its limit.
 /// </para>
 /// </summary>
+[JsonConverter(typeof(AnalyzeIndexRequestConverter))]
 public sealed partial class AnalyzeIndexRequest : PlainRequest<AnalyzeIndexRequestParameters>
 {
 	public AnalyzeIndexRequest()
@@ -70,7 +185,6 @@ public AnalyzeIndexRequest(Elastic.Clients.Elasticsearch.Serverless.IndexName? i
 	/// This could be a built-in analyzer, or an analyzer that’s been configured in the index.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("analyzer")]
 	public string? Analyzer { get; set; }
 
 	/// <summary>
@@ -78,7 +192,6 @@ public AnalyzeIndexRequest(Elastic.Clients.Elasticsearch.Serverless.IndexName? i
 	/// Array of token attributes used to filter the output of the <c>explain</c> parameter.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("attributes")]
 	public ICollection<string>? Attributes { get; set; }
 
 	/// <summary>
@@ -86,7 +199,6 @@ public AnalyzeIndexRequest(Elastic.Clients.Elasticsearch.Serverless.IndexName? i
 	/// Array of character filters used to preprocess characters before the tokenizer.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("char_filter")]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.Analysis.ICharFilter>? CharFilter { get; set; }
 
 	/// <summary>
@@ -94,7 +206,6 @@ public AnalyzeIndexRequest(Elastic.Clients.Elasticsearch.Serverless.IndexName? i
 	/// If <c>true</c>, the response includes token attributes and additional details.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("explain")]
 	public bool? Explain { get; set; }
 
 	/// <summary>
@@ -104,7 +215,6 @@ public AnalyzeIndexRequest(Elastic.Clients.Elasticsearch.Serverless.IndexName? i
 	/// If specified, the <c>analyzer</c> parameter overrides this value.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("field")]
 	public Elastic.Clients.Elasticsearch.Serverless.Field? Field { get; set; }
 
 	/// <summary>
@@ -112,7 +222,6 @@ public AnalyzeIndexRequest(Elastic.Clients.Elasticsearch.Serverless.IndexName? i
 	/// Array of token filters used to apply after the tokenizer.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("filter")]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.Analysis.ITokenFilter>? Filter { get; set; }
 
 	/// <summary>
@@ -120,7 +229,6 @@ public AnalyzeIndexRequest(Elastic.Clients.Elasticsearch.Serverless.IndexName? i
 	/// Normalizer to use to convert text into a single token.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("normalizer")]
 	public string? Normalizer { get; set; }
 
 	/// <summary>
@@ -129,8 +237,6 @@ public AnalyzeIndexRequest(Elastic.Clients.Elasticsearch.Serverless.IndexName? i
 	/// If an array of strings is provided, it is analyzed as a multi-value field.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("text")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Text { get; set; }
 
 	/// <summary>
@@ -138,7 +244,6 @@ public AnalyzeIndexRequest(Elastic.Clients.Elasticsearch.Serverless.IndexName? i
 	/// Tokenizer to use to convert text into tokens.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("tokenizer")]
 	public Elastic.Clients.Elasticsearch.Serverless.Analysis.ITokenizer? Tokenizer { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/AnalyzeIndexResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/AnalyzeIndexResponse.g.cs
index e2a51c4d93c..21f8c9a9047 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/AnalyzeIndexResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/AnalyzeIndexResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.IndexManagement;
 
+internal sealed partial class AnalyzeIndexResponseConverter : System.Text.Json.Serialization.JsonConverter<AnalyzeIndexResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropDetail = System.Text.Json.JsonEncodedText.Encode("detail");
+	private static readonly System.Text.Json.JsonEncodedText PropTokens = System.Text.Json.JsonEncodedText.Encode("tokens");
+
+	public override AnalyzeIndexResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.AnalyzeDetail?> propDetail = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.AnalyzeToken>?> propTokens = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propDetail.TryRead(ref reader, options, PropDetail))
+			{
+				continue;
+			}
+
+			if (propTokens.TryRead(ref reader, options, PropTokens))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new AnalyzeIndexResponse
+		{
+			Detail = propDetail.Value
+,
+			Tokens = propTokens.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, AnalyzeIndexResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDetail, value.Detail);
+		writer.WriteProperty(options, PropTokens, value.Tokens);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(AnalyzeIndexResponseConverter))]
 public sealed partial class AnalyzeIndexResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("detail")]
 	public Elastic.Clients.Elasticsearch.Serverless.IndexManagement.AnalyzeDetail? Detail { get; init; }
-	[JsonInclude, JsonPropertyName("tokens")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.AnalyzeToken>? Tokens { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/ClearCacheResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/ClearCacheResponse.g.cs
index 17ef061beb2..31a8903cf42 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/ClearCacheResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/ClearCacheResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.IndexManagement;
 
+internal sealed partial class ClearCacheResponseConverter : System.Text.Json.Serialization.JsonConverter<ClearCacheResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropShards = System.Text.Json.JsonEncodedText.Encode("_shards");
+
+	public override ClearCacheResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.ShardStatistics?> propShards = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propShards.TryRead(ref reader, options, PropShards))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ClearCacheResponse
+		{
+			Shards = propShards.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ClearCacheResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropShards, value.Shards);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ClearCacheResponseConverter))]
 public sealed partial class ClearCacheResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("_shards")]
 	public Elastic.Clients.Elasticsearch.Serverless.ShardStatistics? Shards { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/CloseIndexResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/CloseIndexResponse.g.cs
index 26696939f0e..27e23c0f6b5 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/CloseIndexResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/CloseIndexResponse.g.cs
@@ -18,21 +18,74 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.IndexManagement;
 
+internal sealed partial class CloseIndexResponseConverter : System.Text.Json.Serialization.JsonConverter<CloseIndexResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+	private static readonly System.Text.Json.JsonEncodedText PropIndices = System.Text.Json.JsonEncodedText.Encode("indices");
+	private static readonly System.Text.Json.JsonEncodedText PropShardsAcknowledged = System.Text.Json.JsonEncodedText.Encode("shards_acknowledged");
+
+	public override CloseIndexResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		LocalJsonProperty<IReadOnlyDictionary<Elastic.Clients.Elasticsearch.Serverless.IndexName, Elastic.Clients.Elasticsearch.Serverless.IndexManagement.CloseIndexResult>> propIndices = default;
+		LocalJsonProperty<bool> propShardsAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			if (propIndices.TryRead(ref reader, options, PropIndices))
+			{
+				continue;
+			}
+
+			if (propShardsAcknowledged.TryRead(ref reader, options, PropShardsAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new CloseIndexResponse
+		{
+			Acknowledged = propAcknowledged.Value
+,
+			Indices = propIndices.Value
+,
+			ShardsAcknowledged = propShardsAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, CloseIndexResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteProperty(options, PropIndices, value.Indices);
+		writer.WriteProperty(options, PropShardsAcknowledged, value.ShardsAcknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(CloseIndexResponseConverter))]
 public sealed partial class CloseIndexResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("acknowledged")]
 	public bool Acknowledged { get; init; }
-	[JsonInclude, JsonPropertyName("indices")]
-	[ReadOnlyIndexNameDictionaryConverter(typeof(Elastic.Clients.Elasticsearch.Serverless.IndexManagement.CloseIndexResult))]
 	public IReadOnlyDictionary<Elastic.Clients.Elasticsearch.Serverless.IndexName, Elastic.Clients.Elasticsearch.Serverless.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.Serverless/_Generated/Api/IndexManagement/CreateDataStreamResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/CreateDataStreamResponse.g.cs
index a52e895259d..202233145dd 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/CreateDataStreamResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/CreateDataStreamResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.IndexManagement;
 
+internal sealed partial class CreateDataStreamResponseConverter : System.Text.Json.Serialization.JsonConverter<CreateDataStreamResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override CreateDataStreamResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new CreateDataStreamResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, CreateDataStreamResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(CreateDataStreamResponseConverter))]
 public sealed partial class CreateDataStreamResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class CreateDataStreamResponse : ElasticsearchResponse
 	/// 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.Serverless/_Generated/Api/IndexManagement/CreateIndexResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/CreateIndexResponse.g.cs
index 16a1cc6de10..551d3a79f91 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/CreateIndexResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/CreateIndexResponse.g.cs
@@ -18,20 +18,74 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.IndexManagement;
 
+internal sealed partial class CreateIndexResponseConverter : System.Text.Json.Serialization.JsonConverter<CreateIndexResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropShardsAcknowledged = System.Text.Json.JsonEncodedText.Encode("shards_acknowledged");
+
+	public override CreateIndexResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		LocalJsonProperty<string> propIndex = default;
+		LocalJsonProperty<bool> propShardsAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propShardsAcknowledged.TryRead(ref reader, options, PropShardsAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new CreateIndexResponse
+		{
+			Acknowledged = propAcknowledged.Value
+,
+			Index = propIndex.Value
+,
+			ShardsAcknowledged = propShardsAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, CreateIndexResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropShardsAcknowledged, value.ShardsAcknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(CreateIndexResponseConverter))]
 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.Serverless/_Generated/Api/IndexManagement/DataStreamsStatsResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/DataStreamsStatsResponse.g.cs
index 138befc6cfe..57a74e7f8c6 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/DataStreamsStatsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/DataStreamsStatsResponse.g.cs
@@ -18,14 +18,101 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.IndexManagement;
 
+internal sealed partial class DataStreamsStatsResponseConverter : System.Text.Json.Serialization.JsonConverter<DataStreamsStatsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropBackingIndices = System.Text.Json.JsonEncodedText.Encode("backing_indices");
+	private static readonly System.Text.Json.JsonEncodedText PropDataStreamCount = System.Text.Json.JsonEncodedText.Encode("data_stream_count");
+	private static readonly System.Text.Json.JsonEncodedText PropDataStreams = System.Text.Json.JsonEncodedText.Encode("data_streams");
+	private static readonly System.Text.Json.JsonEncodedText PropShards = System.Text.Json.JsonEncodedText.Encode("_shards");
+	private static readonly System.Text.Json.JsonEncodedText PropTotalStoreSizeBytes = System.Text.Json.JsonEncodedText.Encode("total_store_size_bytes");
+	private static readonly System.Text.Json.JsonEncodedText PropTotalStoreSizes = System.Text.Json.JsonEncodedText.Encode("total_store_sizes");
+
+	public override DataStreamsStatsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<int> propBackingIndices = default;
+		LocalJsonProperty<int> propDataStreamCount = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.DataStreamsStatsItem>> propDataStreams = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.ShardStatistics> propShards = default;
+		LocalJsonProperty<long> propTotalStoreSizeBytes = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.ByteSize?> propTotalStoreSizes = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBackingIndices.TryRead(ref reader, options, PropBackingIndices))
+			{
+				continue;
+			}
+
+			if (propDataStreamCount.TryRead(ref reader, options, PropDataStreamCount))
+			{
+				continue;
+			}
+
+			if (propDataStreams.TryRead(ref reader, options, PropDataStreams))
+			{
+				continue;
+			}
+
+			if (propShards.TryRead(ref reader, options, PropShards))
+			{
+				continue;
+			}
+
+			if (propTotalStoreSizeBytes.TryRead(ref reader, options, PropTotalStoreSizeBytes))
+			{
+				continue;
+			}
+
+			if (propTotalStoreSizes.TryRead(ref reader, options, PropTotalStoreSizes))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DataStreamsStatsResponse
+		{
+			BackingIndices = propBackingIndices.Value
+,
+			DataStreamCount = propDataStreamCount.Value
+,
+			DataStreams = propDataStreams.Value
+,
+			Shards = propShards.Value
+,
+			TotalStoreSizeBytes = propTotalStoreSizeBytes.Value
+,
+			TotalStoreSizes = propTotalStoreSizes.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DataStreamsStatsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBackingIndices, value.BackingIndices);
+		writer.WriteProperty(options, PropDataStreamCount, value.DataStreamCount);
+		writer.WriteProperty(options, PropDataStreams, value.DataStreams);
+		writer.WriteProperty(options, PropShards, value.Shards);
+		writer.WriteProperty(options, PropTotalStoreSizeBytes, value.TotalStoreSizeBytes);
+		writer.WriteProperty(options, PropTotalStoreSizes, value.TotalStoreSizes);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DataStreamsStatsResponseConverter))]
 public sealed partial class DataStreamsStatsResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,7 +120,6 @@ public sealed partial class DataStreamsStatsResponse : ElasticsearchResponse
 	/// Total number of backing indices for the selected data streams.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("backing_indices")]
 	public int BackingIndices { get; init; }
 
 	/// <summary>
@@ -41,7 +127,6 @@ public sealed partial class DataStreamsStatsResponse : ElasticsearchResponse
 	/// Total number of selected data streams.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("data_stream_count")]
 	public int DataStreamCount { get; init; }
 
 	/// <summary>
@@ -49,7 +134,6 @@ public sealed partial class DataStreamsStatsResponse : ElasticsearchResponse
 	/// Contains statistics for the selected data streams.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("data_streams")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.DataStreamsStatsItem> DataStreams { get; init; }
 
 	/// <summary>
@@ -57,7 +141,6 @@ public sealed partial class DataStreamsStatsResponse : ElasticsearchResponse
 	/// Contains information about shards that attempted to execute the request.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("_shards")]
 	public Elastic.Clients.Elasticsearch.Serverless.ShardStatistics Shards { get; init; }
 
 	/// <summary>
@@ -65,7 +148,6 @@ public sealed partial class DataStreamsStatsResponse : ElasticsearchResponse
 	/// Total size, in bytes, of all shards for the selected data streams.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("total_store_size_bytes")]
 	public long TotalStoreSizeBytes { get; init; }
 
 	/// <summary>
@@ -74,6 +156,5 @@ public sealed partial class DataStreamsStatsResponse : ElasticsearchResponse
 	/// This property is included only if the <c>human</c> query parameter is <c>true</c>
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("total_store_sizes")]
 	public Elastic.Clients.Elasticsearch.Serverless.ByteSize? TotalStoreSizes { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/DeleteAliasResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/DeleteAliasResponse.g.cs
index befb38314ab..059206cadbd 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/DeleteAliasResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/DeleteAliasResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.IndexManagement;
 
+internal sealed partial class DeleteAliasResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteAliasResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override DeleteAliasResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteAliasResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteAliasResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteAliasResponseConverter))]
 public sealed partial class DeleteAliasResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class DeleteAliasResponse : ElasticsearchResponse
 	/// 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.Serverless/_Generated/Api/IndexManagement/DeleteDataLifecycleResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/DeleteDataLifecycleResponse.g.cs
index eae7ae00e1b..5bdafc218c0 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/DeleteDataLifecycleResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/DeleteDataLifecycleResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.IndexManagement;
 
+internal sealed partial class DeleteDataLifecycleResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteDataLifecycleResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override DeleteDataLifecycleResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteDataLifecycleResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteDataLifecycleResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteDataLifecycleResponseConverter))]
 public sealed partial class DeleteDataLifecycleResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class DeleteDataLifecycleResponse : ElasticsearchResponse
 	/// 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.Serverless/_Generated/Api/IndexManagement/DeleteDataStreamResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/DeleteDataStreamResponse.g.cs
index 74b889a2db1..cee9d9fe47f 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/DeleteDataStreamResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/DeleteDataStreamResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.IndexManagement;
 
+internal sealed partial class DeleteDataStreamResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteDataStreamResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override DeleteDataStreamResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteDataStreamResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteDataStreamResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteDataStreamResponseConverter))]
 public sealed partial class DeleteDataStreamResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class DeleteDataStreamResponse : ElasticsearchResponse
 	/// 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.Serverless/_Generated/Api/IndexManagement/DeleteIndexResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/DeleteIndexResponse.g.cs
index b0aee2bc50b..5350ad83a4f 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/DeleteIndexResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/DeleteIndexResponse.g.cs
@@ -18,14 +18,61 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.IndexManagement;
 
+internal sealed partial class DeleteIndexResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteIndexResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+	private static readonly System.Text.Json.JsonEncodedText PropShards = System.Text.Json.JsonEncodedText.Encode("_shards");
+
+	public override DeleteIndexResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.ShardStatistics?> propShards = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			if (propShards.TryRead(ref reader, options, PropShards))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteIndexResponse
+		{
+			Acknowledged = propAcknowledged.Value
+,
+			Shards = propShards.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteIndexResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteProperty(options, PropShards, value.Shards);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteIndexResponseConverter))]
 public sealed partial class DeleteIndexResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,8 +80,6 @@ public sealed partial class DeleteIndexResponse : ElasticsearchResponse
 	/// 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; }
-	[JsonInclude, JsonPropertyName("_shards")]
 	public Elastic.Clients.Elasticsearch.Serverless.ShardStatistics? Shards { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/DeleteIndexTemplateResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/DeleteIndexTemplateResponse.g.cs
index f90d768e4c0..129f9d0452f 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/DeleteIndexTemplateResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/DeleteIndexTemplateResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.IndexManagement;
 
+internal sealed partial class DeleteIndexTemplateResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteIndexTemplateResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override DeleteIndexTemplateResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteIndexTemplateResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteIndexTemplateResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteIndexTemplateResponseConverter))]
 public sealed partial class DeleteIndexTemplateResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class DeleteIndexTemplateResponse : ElasticsearchResponse
 	/// 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.Serverless/_Generated/Api/IndexManagement/ExplainDataLifecycleResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/ExplainDataLifecycleResponse.g.cs
index 00f3c417846..32dc93214af 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/ExplainDataLifecycleResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/ExplainDataLifecycleResponse.g.cs
@@ -18,17 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.IndexManagement;
 
+internal sealed partial class ExplainDataLifecycleResponseConverter : System.Text.Json.Serialization.JsonConverter<ExplainDataLifecycleResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropIndices = System.Text.Json.JsonEncodedText.Encode("indices");
+
+	public override ExplainDataLifecycleResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyDictionary<Elastic.Clients.Elasticsearch.Serverless.IndexName, Elastic.Clients.Elasticsearch.Serverless.IndexManagement.DataStreamLifecycleExplain>> propIndices = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propIndices.TryRead(ref reader, options, PropIndices))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ExplainDataLifecycleResponse
+		{
+			Indices = propIndices.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ExplainDataLifecycleResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropIndices, value.Indices);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ExplainDataLifecycleResponseConverter))]
 public sealed partial class ExplainDataLifecycleResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("indices")]
-	[ReadOnlyIndexNameDictionaryConverter(typeof(Elastic.Clients.Elasticsearch.Serverless.IndexManagement.DataStreamLifecycleExplain))]
 	public IReadOnlyDictionary<Elastic.Clients.Elasticsearch.Serverless.IndexName, Elastic.Clients.Elasticsearch.Serverless.IndexManagement.DataStreamLifecycleExplain> Indices { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/FlushResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/FlushResponse.g.cs
index 687c6c94df6..5e0a232f53e 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/FlushResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/FlushResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.IndexManagement;
 
+internal sealed partial class FlushResponseConverter : System.Text.Json.Serialization.JsonConverter<FlushResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropShards = System.Text.Json.JsonEncodedText.Encode("_shards");
+
+	public override FlushResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.ShardStatistics?> propShards = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propShards.TryRead(ref reader, options, PropShards))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new FlushResponse
+		{
+			Shards = propShards.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, FlushResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropShards, value.Shards);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(FlushResponseConverter))]
 public sealed partial class FlushResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("_shards")]
 	public Elastic.Clients.Elasticsearch.Serverless.ShardStatistics? Shards { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/ForcemergeResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/ForcemergeResponse.g.cs
index a26e677edd8..cb35739739a 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/ForcemergeResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/ForcemergeResponse.g.cs
@@ -18,17 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.IndexManagement;
 
+internal sealed partial class ForcemergeResponseConverter : System.Text.Json.Serialization.JsonConverter<ForcemergeResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropShards = System.Text.Json.JsonEncodedText.Encode("_shards");
+	private static readonly System.Text.Json.JsonEncodedText PropTask = System.Text.Json.JsonEncodedText.Encode("task");
+
+	public override ForcemergeResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.ShardStatistics?> propShards = default;
+		LocalJsonProperty<string?> propTask = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propShards.TryRead(ref reader, options, PropShards))
+			{
+				continue;
+			}
+
+			if (propTask.TryRead(ref reader, options, PropTask))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ForcemergeResponse
+		{
+			Shards = propShards.Value
+,
+			Task = propTask.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ForcemergeResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropShards, value.Shards);
+		writer.WriteProperty(options, PropTask, value.Task);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ForcemergeResponseConverter))]
 public sealed partial class ForcemergeResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("_shards")]
 	public Elastic.Clients.Elasticsearch.Serverless.ShardStatistics? Shards { get; init; }
 
 	/// <summary>
@@ -37,6 +83,5 @@ public sealed partial class ForcemergeResponse : ElasticsearchResponse
 	/// you can use the task_id to get the status of the task at _tasks/&lt;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.Serverless/_Generated/Api/IndexManagement/GetDataLifecycleResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/GetDataLifecycleResponse.g.cs
index 4a0274cceec..fdc388ebf56 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/GetDataLifecycleResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/GetDataLifecycleResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.IndexManagement;
 
+internal sealed partial class GetDataLifecycleResponseConverter : System.Text.Json.Serialization.JsonConverter<GetDataLifecycleResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropDataStreams = System.Text.Json.JsonEncodedText.Encode("data_streams");
+
+	public override GetDataLifecycleResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.DataStreamWithLifecycle>> propDataStreams = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propDataStreams.TryRead(ref reader, options, PropDataStreams))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetDataLifecycleResponse
+		{
+			DataStreams = propDataStreams.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetDataLifecycleResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDataStreams, value.DataStreams);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetDataLifecycleResponseConverter))]
 public sealed partial class GetDataLifecycleResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("data_streams")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.DataStreamWithLifecycle> DataStreams { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/GetDataStreamResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/GetDataStreamResponse.g.cs
index 6ce14db89d9..78466ae599d 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/GetDataStreamResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/GetDataStreamResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.IndexManagement;
 
+internal sealed partial class GetDataStreamResponseConverter : System.Text.Json.Serialization.JsonConverter<GetDataStreamResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropDataStreams = System.Text.Json.JsonEncodedText.Encode("data_streams");
+
+	public override GetDataStreamResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.DataStream>> propDataStreams = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propDataStreams.TryRead(ref reader, options, PropDataStreams))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetDataStreamResponse
+		{
+			DataStreams = propDataStreams.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetDataStreamResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDataStreams, value.DataStreams);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetDataStreamResponseConverter))]
 public sealed partial class GetDataStreamResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("data_streams")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.DataStream> DataStreams { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/GetIndexTemplateResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/GetIndexTemplateResponse.g.cs
index 101331f8170..0ea1d3e677a 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/GetIndexTemplateResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/GetIndexTemplateResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.IndexManagement;
 
+internal sealed partial class GetIndexTemplateResponseConverter : System.Text.Json.Serialization.JsonConverter<GetIndexTemplateResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropIndexTemplates = System.Text.Json.JsonEncodedText.Encode("index_templates");
+
+	public override GetIndexTemplateResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.IndexTemplateItem>> propIndexTemplates = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propIndexTemplates.TryRead(ref reader, options, PropIndexTemplates))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetIndexTemplateResponse
+		{
+			IndexTemplates = propIndexTemplates.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetIndexTemplateResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropIndexTemplates, value.IndexTemplates);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetIndexTemplateResponseConverter))]
 public sealed partial class GetIndexTemplateResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("index_templates")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.IndexTemplateItem> IndexTemplates { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/IndicesStatsResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/IndicesStatsResponse.g.cs
index adfc57c3a06..dc2058597f4 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/IndicesStatsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/IndicesStatsResponse.g.cs
@@ -18,20 +18,74 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.IndexManagement;
 
+internal sealed partial class IndicesStatsResponseConverter : System.Text.Json.Serialization.JsonConverter<IndicesStatsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAll = System.Text.Json.JsonEncodedText.Encode("_all");
+	private static readonly System.Text.Json.JsonEncodedText PropIndices = System.Text.Json.JsonEncodedText.Encode("indices");
+	private static readonly System.Text.Json.JsonEncodedText PropShards = System.Text.Json.JsonEncodedText.Encode("_shards");
+
+	public override IndicesStatsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.IndicesStats> propAll = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.IndexManagement.IndicesStats>?> propIndices = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.ShardStatistics> propShards = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAll.TryRead(ref reader, options, PropAll))
+			{
+				continue;
+			}
+
+			if (propIndices.TryRead(ref reader, options, PropIndices))
+			{
+				continue;
+			}
+
+			if (propShards.TryRead(ref reader, options, PropShards))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new IndicesStatsResponse
+		{
+			All = propAll.Value
+,
+			Indices = propIndices.Value
+,
+			Shards = propShards.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IndicesStatsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAll, value.All);
+		writer.WriteProperty(options, PropIndices, value.Indices);
+		writer.WriteProperty(options, PropShards, value.Shards);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(IndicesStatsResponseConverter))]
 public sealed partial class IndicesStatsResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("_all")]
 	public Elastic.Clients.Elasticsearch.Serverless.IndexManagement.IndicesStats All { get; init; }
-	[JsonInclude, JsonPropertyName("indices")]
 	public IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.IndexManagement.IndicesStats>? Indices { get; init; }
-	[JsonInclude, JsonPropertyName("_shards")]
 	public Elastic.Clients.Elasticsearch.Serverless.ShardStatistics Shards { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/MigrateToDataStreamResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/MigrateToDataStreamResponse.g.cs
index 5e5077e08bd..9a501c87b0d 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/MigrateToDataStreamResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/MigrateToDataStreamResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.IndexManagement;
 
+internal sealed partial class MigrateToDataStreamResponseConverter : System.Text.Json.Serialization.JsonConverter<MigrateToDataStreamResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override MigrateToDataStreamResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new MigrateToDataStreamResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, MigrateToDataStreamResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(MigrateToDataStreamResponseConverter))]
 public sealed partial class MigrateToDataStreamResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class MigrateToDataStreamResponse : ElasticsearchResponse
 	/// 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.Serverless/_Generated/Api/IndexManagement/ModifyDataStreamResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/ModifyDataStreamResponse.g.cs
index 70e5ef0f6a2..c2963136bb7 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/ModifyDataStreamResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/ModifyDataStreamResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.IndexManagement;
 
+internal sealed partial class ModifyDataStreamResponseConverter : System.Text.Json.Serialization.JsonConverter<ModifyDataStreamResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override ModifyDataStreamResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ModifyDataStreamResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ModifyDataStreamResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ModifyDataStreamResponseConverter))]
 public sealed partial class ModifyDataStreamResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class ModifyDataStreamResponse : ElasticsearchResponse
 	/// 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.Serverless/_Generated/Api/IndexManagement/OpenIndexResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/OpenIndexResponse.g.cs
index 196b23e35d7..ca03dcda83e 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/OpenIndexResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/OpenIndexResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.IndexManagement;
 
+internal sealed partial class OpenIndexResponseConverter : System.Text.Json.Serialization.JsonConverter<OpenIndexResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+	private static readonly System.Text.Json.JsonEncodedText PropShardsAcknowledged = System.Text.Json.JsonEncodedText.Encode("shards_acknowledged");
+
+	public override OpenIndexResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		LocalJsonProperty<bool> propShardsAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			if (propShardsAcknowledged.TryRead(ref reader, options, PropShardsAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new OpenIndexResponse
+		{
+			Acknowledged = propAcknowledged.Value
+,
+			ShardsAcknowledged = propShardsAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, OpenIndexResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteProperty(options, PropShardsAcknowledged, value.ShardsAcknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(OpenIndexResponseConverter))]
 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.Serverless/_Generated/Api/IndexManagement/PutAliasResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/PutAliasResponse.g.cs
index f22ac858682..dea9ad11f21 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/PutAliasResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/PutAliasResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.IndexManagement;
 
+internal sealed partial class PutAliasResponseConverter : System.Text.Json.Serialization.JsonConverter<PutAliasResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override PutAliasResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutAliasResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutAliasResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PutAliasResponseConverter))]
 public sealed partial class PutAliasResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class PutAliasResponse : ElasticsearchResponse
 	/// 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.Serverless/_Generated/Api/IndexManagement/PutDataLifecycleRequest.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/PutDataLifecycleRequest.g.cs
index 39f545869db..1782b443e23 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/PutDataLifecycleRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/PutDataLifecycleRequest.g.cs
@@ -65,7 +65,7 @@ public sealed partial class PutDataLifecycleRequestParameters : RequestParameter
 /// Update the data stream lifecycle of the specified data streams.
 /// </para>
 /// </summary>
-public sealed partial class PutDataLifecycleRequest : PlainRequest<PutDataLifecycleRequestParameters>, ISelfSerializable
+public sealed partial class PutDataLifecycleRequest : PlainRequest<PutDataLifecycleRequestParameters>, ISelfTwoWaySerializable
 {
 	public PutDataLifecycleRequest(Elastic.Clients.Elasticsearch.Serverless.DataStreamNames name) : base(r => r.Required("name", name))
 	{
@@ -107,13 +107,17 @@ public PutDataLifecycleRequest(Elastic.Clients.Elasticsearch.Serverless.DataStre
 	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Serverless.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Serverless.Duration?>("timeout"); set => Q("timeout", value); }
-	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Serverless.IndexManagement.DataStreamLifecycle Lifecycle { get; set; }
 
-	void ISelfSerializable.Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
+	void ISelfTwoWaySerializable.Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 	{
 		JsonSerializer.Serialize(writer, Lifecycle, options);
 	}
+
+	void ISelfTwoWaySerializable.Deserialize(ref Utf8JsonReader reader, JsonSerializerOptions options, IElasticsearchClientSettings settings)
+	{
+		Lifecycle = settings.RequestResponseSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.DataStreamLifecycle>(ref reader);
+	}
 }
 
 /// <summary>
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/PutDataLifecycleResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/PutDataLifecycleResponse.g.cs
index 633a0f789a7..648420c9955 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/PutDataLifecycleResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/PutDataLifecycleResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.IndexManagement;
 
+internal sealed partial class PutDataLifecycleResponseConverter : System.Text.Json.Serialization.JsonConverter<PutDataLifecycleResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override PutDataLifecycleResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutDataLifecycleResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutDataLifecycleResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PutDataLifecycleResponseConverter))]
 public sealed partial class PutDataLifecycleResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class PutDataLifecycleResponse : ElasticsearchResponse
 	/// 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.Serverless/_Generated/Api/IndexManagement/PutIndexTemplateResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/PutIndexTemplateResponse.g.cs
index 0296d8cd3c5..d06f26f7352 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/PutIndexTemplateResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/PutIndexTemplateResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.IndexManagement;
 
+internal sealed partial class PutIndexTemplateResponseConverter : System.Text.Json.Serialization.JsonConverter<PutIndexTemplateResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override PutIndexTemplateResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutIndexTemplateResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutIndexTemplateResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PutIndexTemplateResponseConverter))]
 public sealed partial class PutIndexTemplateResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class PutIndexTemplateResponse : ElasticsearchResponse
 	/// 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.Serverless/_Generated/Api/IndexManagement/PutIndicesSettingsRequest.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/PutIndicesSettingsRequest.g.cs
index 11aab97f1e4..e6c83ba2262 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/PutIndicesSettingsRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/PutIndicesSettingsRequest.g.cs
@@ -114,7 +114,7 @@ public sealed partial class PutIndicesSettingsRequestParameters : RequestParamet
 /// To change the analyzer for existing backing indices, you must create a new data stream and reindex your data into it.
 /// </para>
 /// </summary>
-public sealed partial class PutIndicesSettingsRequest : PlainRequest<PutIndicesSettingsRequestParameters>, ISelfSerializable
+public sealed partial class PutIndicesSettingsRequest : PlainRequest<PutIndicesSettingsRequestParameters>, ISelfTwoWaySerializable
 {
 	public PutIndicesSettingsRequest()
 	{
@@ -197,13 +197,17 @@ public PutIndicesSettingsRequest(Elastic.Clients.Elasticsearch.Serverless.Indice
 	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Serverless.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Serverless.Duration?>("timeout"); set => Q("timeout", value); }
-	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Serverless.IndexManagement.IndexSettings Settings { get; set; }
 
-	void ISelfSerializable.Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
+	void ISelfTwoWaySerializable.Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 	{
 		JsonSerializer.Serialize(writer, Settings, options);
 	}
+
+	void ISelfTwoWaySerializable.Deserialize(ref Utf8JsonReader reader, JsonSerializerOptions options, IElasticsearchClientSettings settings)
+	{
+		Settings = settings.RequestResponseSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.IndexSettings>(ref reader);
+	}
 }
 
 /// <summary>
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/PutIndicesSettingsResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/PutIndicesSettingsResponse.g.cs
index bf6e6f4e7ae..a9e9fd4132c 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/PutIndicesSettingsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/PutIndicesSettingsResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.IndexManagement;
 
+internal sealed partial class PutIndicesSettingsResponseConverter : System.Text.Json.Serialization.JsonConverter<PutIndicesSettingsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override PutIndicesSettingsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutIndicesSettingsResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutIndicesSettingsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PutIndicesSettingsResponseConverter))]
 public sealed partial class PutIndicesSettingsResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class PutIndicesSettingsResponse : ElasticsearchResponse
 	/// 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.Serverless/_Generated/Api/IndexManagement/PutMappingRequest.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/PutMappingRequest.g.cs
index ea4d3ac7b6a..3d354c34019 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/PutMappingRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/PutMappingRequest.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Requests;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport;
@@ -81,6 +82,139 @@ public sealed partial class PutMappingRequestParameters : RequestParameters
 	public bool? WriteIndexOnly { get => Q<bool?>("write_index_only"); set => Q("write_index_only", value); }
 }
 
+internal sealed partial class PutMappingRequestConverter : System.Text.Json.Serialization.JsonConverter<PutMappingRequest>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropDateDetection = System.Text.Json.JsonEncodedText.Encode("date_detection");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamic = System.Text.Json.JsonEncodedText.Encode("dynamic");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamicDateFormats = System.Text.Json.JsonEncodedText.Encode("dynamic_date_formats");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamicTemplates = System.Text.Json.JsonEncodedText.Encode("dynamic_templates");
+	private static readonly System.Text.Json.JsonEncodedText PropFieldNames = System.Text.Json.JsonEncodedText.Encode("_field_names");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("_meta");
+	private static readonly System.Text.Json.JsonEncodedText PropNumericDetection = System.Text.Json.JsonEncodedText.Encode("numeric_detection");
+	private static readonly System.Text.Json.JsonEncodedText PropProperties = System.Text.Json.JsonEncodedText.Encode("properties");
+	private static readonly System.Text.Json.JsonEncodedText PropRouting = System.Text.Json.JsonEncodedText.Encode("_routing");
+	private static readonly System.Text.Json.JsonEncodedText PropRuntime = System.Text.Json.JsonEncodedText.Encode("runtime");
+	private static readonly System.Text.Json.JsonEncodedText PropSource = System.Text.Json.JsonEncodedText.Encode("_source");
+
+	public override PutMappingRequest Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool?> propDateDetection = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicMapping?> propDynamic = default;
+		LocalJsonProperty<ICollection<string>?> propDynamicDateFormats = default;
+		LocalJsonProperty<ICollection<IDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicTemplate>>?> propDynamicTemplates = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.FieldNamesField?> propFieldNames = default;
+		LocalJsonProperty<IDictionary<string, object>?> propMeta = default;
+		LocalJsonProperty<bool?> propNumericDetection = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties?> propProperties = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.RoutingField?> propRouting = default;
+		LocalJsonProperty<IDictionary<Elastic.Clients.Elasticsearch.Serverless.Field, Elastic.Clients.Elasticsearch.Serverless.Mapping.RuntimeField>?> propRuntime = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.SourceField?> propSource = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propDateDetection.TryRead(ref reader, options, PropDateDetection))
+			{
+				continue;
+			}
+
+			if (propDynamic.TryRead(ref reader, options, PropDynamic))
+			{
+				continue;
+			}
+
+			if (propDynamicDateFormats.TryRead(ref reader, options, PropDynamicDateFormats))
+			{
+				continue;
+			}
+
+			if (propDynamicTemplates.TryRead(ref reader, options, PropDynamicTemplates, typeof(SingleOrManyMarker<IReadOnlyCollection<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicTemplate>>?, IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicTemplate>>)))
+			{
+				continue;
+			}
+
+			if (propFieldNames.TryRead(ref reader, options, PropFieldNames))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propNumericDetection.TryRead(ref reader, options, PropNumericDetection))
+			{
+				continue;
+			}
+
+			if (propProperties.TryRead(ref reader, options, PropProperties))
+			{
+				continue;
+			}
+
+			if (propRouting.TryRead(ref reader, options, PropRouting))
+			{
+				continue;
+			}
+
+			if (propRuntime.TryRead(ref reader, options, PropRuntime))
+			{
+				continue;
+			}
+
+			if (propSource.TryRead(ref reader, options, PropSource))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutMappingRequest
+		{
+			DateDetection = propDateDetection.Value
+	,
+			Dynamic = propDynamic.Value
+	,
+			DynamicDateFormats = propDynamicDateFormats.Value
+	,
+			DynamicTemplates = propDynamicTemplates.Value
+	,
+			FieldNames = propFieldNames.Value
+	,
+			Meta = propMeta.Value
+	,
+			NumericDetection = propNumericDetection.Value
+	,
+			Properties = propProperties.Value
+	,
+			Routing = propRouting.Value
+	,
+			Runtime = propRuntime.Value
+	,
+			Source = propSource.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutMappingRequest value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDateDetection, value.DateDetection);
+		writer.WriteProperty(options, PropDynamic, value.Dynamic);
+		writer.WriteProperty(options, PropDynamicDateFormats, value.DynamicDateFormats);
+		writer.WriteProperty(options, PropDynamicTemplates, value.DynamicTemplates, typeof(SingleOrManyMarker<IReadOnlyCollection<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicTemplate>>?, IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicTemplate>>));
+		writer.WriteProperty(options, PropFieldNames, value.FieldNames);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropNumericDetection, value.NumericDetection);
+		writer.WriteProperty(options, PropProperties, value.Properties);
+		writer.WriteProperty(options, PropRouting, value.Routing);
+		writer.WriteProperty(options, PropRuntime, value.Runtime);
+		writer.WriteProperty(options, PropSource, value.Source);
+		writer.WriteEndObject();
+	}
+}
+
 /// <summary>
 /// <para>
 /// Update field mappings.
@@ -123,6 +257,7 @@ public sealed partial class PutMappingRequestParameters : RequestParameters
 /// Instead, add an alias field to create an alternate field name.
 /// </para>
 /// </summary>
+[JsonConverter(typeof(PutMappingRequestConverter))]
 public sealed partial class PutMappingRequest : PlainRequest<PutMappingRequestParameters>
 {
 	public PutMappingRequest(Elastic.Clients.Elasticsearch.Serverless.Indices indices) : base(r => r.Required("index", indices))
@@ -143,7 +278,6 @@ public PutMappingRequest(Elastic.Clients.Elasticsearch.Serverless.Indices indice
 	/// This behavior applies even if the request targets other open indices.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public bool? AllowNoIndices { get => Q<bool?>("allow_no_indices"); set => Q("allow_no_indices", value); }
 
 	/// <summary>
@@ -154,7 +288,6 @@ public PutMappingRequest(Elastic.Clients.Elasticsearch.Serverless.Indices indice
 	/// Valid values are: <c>all</c>, <c>open</c>, <c>closed</c>, <c>hidden</c>, <c>none</c>.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.ExpandWildcard>? ExpandWildcards { get => Q<ICollection<Elastic.Clients.Elasticsearch.Serverless.ExpandWildcard>?>("expand_wildcards"); set => Q("expand_wildcards", value); }
 
 	/// <summary>
@@ -162,7 +295,6 @@ public PutMappingRequest(Elastic.Clients.Elasticsearch.Serverless.Indices indice
 	/// If <c>false</c>, the request returns an error if it targets a missing or closed index.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
 
 	/// <summary>
@@ -171,7 +303,6 @@ public PutMappingRequest(Elastic.Clients.Elasticsearch.Serverless.Indices indice
 	/// If no response is received before the timeout expires, the request fails and returns an error.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Serverless.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Serverless.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 	/// <summary>
@@ -180,7 +311,6 @@ public PutMappingRequest(Elastic.Clients.Elasticsearch.Serverless.Indices indice
 	/// If no response is received before the timeout expires, the request fails and returns an error.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Serverless.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Serverless.Duration?>("timeout"); set => Q("timeout", value); }
 
 	/// <summary>
@@ -188,7 +318,6 @@ public PutMappingRequest(Elastic.Clients.Elasticsearch.Serverless.Indices indice
 	/// If <c>true</c>, the mappings are applied only to the current write index for the target.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public bool? WriteIndexOnly { get => Q<bool?>("write_index_only"); set => Q("write_index_only", value); }
 
 	/// <summary>
@@ -196,7 +325,6 @@ public PutMappingRequest(Elastic.Clients.Elasticsearch.Serverless.Indices indice
 	/// Controls whether dynamic date detection is enabled.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("date_detection")]
 	public bool? DateDetection { get; set; }
 
 	/// <summary>
@@ -204,7 +332,6 @@ public PutMappingRequest(Elastic.Clients.Elasticsearch.Serverless.Indices indice
 	/// Controls whether new fields are added dynamically.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicMapping? Dynamic { get; set; }
 
 	/// <summary>
@@ -214,7 +341,6 @@ public PutMappingRequest(Elastic.Clients.Elasticsearch.Serverless.Indices indice
 	/// a new date field is added instead of string.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("dynamic_date_formats")]
 	public ICollection<string>? DynamicDateFormats { get; set; }
 
 	/// <summary>
@@ -222,8 +348,6 @@ public PutMappingRequest(Elastic.Clients.Elasticsearch.Serverless.Indices indice
 	/// Specify dynamic templates for the mapping.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("dynamic_templates")]
-	[SingleOrManyCollectionConverter(typeof(IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicTemplate>))]
 	public ICollection<IDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicTemplate>>? DynamicTemplates { get; set; }
 
 	/// <summary>
@@ -231,7 +355,6 @@ public PutMappingRequest(Elastic.Clients.Elasticsearch.Serverless.Indices indice
 	/// Control whether field names are enabled for the index.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("_field_names")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.FieldNamesField? FieldNames { get; set; }
 
 	/// <summary>
@@ -241,7 +364,6 @@ public PutMappingRequest(Elastic.Clients.Elasticsearch.Serverless.Indices indice
 	/// application-specific metadata.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("_meta")]
 	public IDictionary<string, object>? Meta { get; set; }
 
 	/// <summary>
@@ -249,7 +371,6 @@ public PutMappingRequest(Elastic.Clients.Elasticsearch.Serverless.Indices indice
 	/// Automatically map strings into numeric data types for all fields.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("numeric_detection")]
 	public bool? NumericDetection { get; set; }
 
 	/// <summary>
@@ -274,7 +395,6 @@ public PutMappingRequest(Elastic.Clients.Elasticsearch.Serverless.Indices indice
 	/// </item>
 	/// </list>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties? Properties { get; set; }
 
 	/// <summary>
@@ -282,7 +402,6 @@ public PutMappingRequest(Elastic.Clients.Elasticsearch.Serverless.Indices indice
 	/// Enable making a routing value required on indexed documents.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("_routing")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.RoutingField? Routing { get; set; }
 
 	/// <summary>
@@ -290,7 +409,6 @@ public PutMappingRequest(Elastic.Clients.Elasticsearch.Serverless.Indices indice
 	/// Mapping of runtime fields for the index.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("runtime")]
 	public IDictionary<Elastic.Clients.Elasticsearch.Serverless.Field, Elastic.Clients.Elasticsearch.Serverless.Mapping.RuntimeField>? Runtime { get; set; }
 
 	/// <summary>
@@ -298,7 +416,6 @@ public PutMappingRequest(Elastic.Clients.Elasticsearch.Serverless.Indices indice
 	/// Control whether the _source field is enabled on the index.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("_source")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.SourceField? Source { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/PutMappingResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/PutMappingResponse.g.cs
index 3e6986a7ede..06b3a83a5b9 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/PutMappingResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/PutMappingResponse.g.cs
@@ -18,14 +18,61 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.IndexManagement;
 
+internal sealed partial class PutMappingResponseConverter : System.Text.Json.Serialization.JsonConverter<PutMappingResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+	private static readonly System.Text.Json.JsonEncodedText PropShards = System.Text.Json.JsonEncodedText.Encode("_shards");
+
+	public override PutMappingResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.ShardStatistics?> propShards = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			if (propShards.TryRead(ref reader, options, PropShards))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutMappingResponse
+		{
+			Acknowledged = propAcknowledged.Value
+,
+			Shards = propShards.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutMappingResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteProperty(options, PropShards, value.Shards);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PutMappingResponseConverter))]
 public sealed partial class PutMappingResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,8 +80,6 @@ public sealed partial class PutMappingResponse : ElasticsearchResponse
 	/// 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; }
-	[JsonInclude, JsonPropertyName("_shards")]
 	public Elastic.Clients.Elasticsearch.Serverless.ShardStatistics? Shards { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/RefreshResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/RefreshResponse.g.cs
index 52956bca56e..5bd554b18de 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/RefreshResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/RefreshResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.IndexManagement;
 
+internal sealed partial class RefreshResponseConverter : System.Text.Json.Serialization.JsonConverter<RefreshResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropShards = System.Text.Json.JsonEncodedText.Encode("_shards");
+
+	public override RefreshResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.ShardStatistics?> propShards = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propShards.TryRead(ref reader, options, PropShards))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new RefreshResponse
+		{
+			Shards = propShards.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, RefreshResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropShards, value.Shards);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(RefreshResponseConverter))]
 public sealed partial class RefreshResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("_shards")]
 	public Elastic.Clients.Elasticsearch.Serverless.ShardStatistics? Shards { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/ResolveIndexResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/ResolveIndexResponse.g.cs
index ec8b5501790..3d51583838e 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/ResolveIndexResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/ResolveIndexResponse.g.cs
@@ -18,20 +18,74 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.IndexManagement;
 
+internal sealed partial class ResolveIndexResponseConverter : System.Text.Json.Serialization.JsonConverter<ResolveIndexResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAliases = System.Text.Json.JsonEncodedText.Encode("aliases");
+	private static readonly System.Text.Json.JsonEncodedText PropDataStreams = System.Text.Json.JsonEncodedText.Encode("data_streams");
+	private static readonly System.Text.Json.JsonEncodedText PropIndices = System.Text.Json.JsonEncodedText.Encode("indices");
+
+	public override ResolveIndexResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.ResolveIndexAliasItem>> propAliases = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.ResolveIndexDataStreamsItem>> propDataStreams = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.ResolveIndexItem>> propIndices = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAliases.TryRead(ref reader, options, PropAliases))
+			{
+				continue;
+			}
+
+			if (propDataStreams.TryRead(ref reader, options, PropDataStreams))
+			{
+				continue;
+			}
+
+			if (propIndices.TryRead(ref reader, options, PropIndices))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ResolveIndexResponse
+		{
+			Aliases = propAliases.Value
+,
+			DataStreams = propDataStreams.Value
+,
+			Indices = propIndices.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ResolveIndexResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAliases, value.Aliases);
+		writer.WriteProperty(options, PropDataStreams, value.DataStreams);
+		writer.WriteProperty(options, PropIndices, value.Indices);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ResolveIndexResponseConverter))]
 public sealed partial class ResolveIndexResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("aliases")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.ResolveIndexAliasItem> Aliases { get; init; }
-	[JsonInclude, JsonPropertyName("data_streams")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.ResolveIndexDataStreamsItem> DataStreams { get; init; }
-	[JsonInclude, JsonPropertyName("indices")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.ResolveIndexItem> Indices { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/RolloverResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/RolloverResponse.g.cs
index ffdebd2dbda..5f0d86aafe9 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/RolloverResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/RolloverResponse.g.cs
@@ -18,28 +18,118 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.IndexManagement;
 
+internal sealed partial class RolloverResponseConverter : System.Text.Json.Serialization.JsonConverter<RolloverResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+	private static readonly System.Text.Json.JsonEncodedText PropConditions = System.Text.Json.JsonEncodedText.Encode("conditions");
+	private static readonly System.Text.Json.JsonEncodedText PropDryRun = System.Text.Json.JsonEncodedText.Encode("dry_run");
+	private static readonly System.Text.Json.JsonEncodedText PropNewIndex = System.Text.Json.JsonEncodedText.Encode("new_index");
+	private static readonly System.Text.Json.JsonEncodedText PropOldIndex = System.Text.Json.JsonEncodedText.Encode("old_index");
+	private static readonly System.Text.Json.JsonEncodedText PropRolledOver = System.Text.Json.JsonEncodedText.Encode("rolled_over");
+	private static readonly System.Text.Json.JsonEncodedText PropShardsAcknowledged = System.Text.Json.JsonEncodedText.Encode("shards_acknowledged");
+
+	public override RolloverResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, bool>> propConditions = default;
+		LocalJsonProperty<bool> propDryRun = default;
+		LocalJsonProperty<string> propNewIndex = default;
+		LocalJsonProperty<string> propOldIndex = default;
+		LocalJsonProperty<bool> propRolledOver = default;
+		LocalJsonProperty<bool> propShardsAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			if (propConditions.TryRead(ref reader, options, PropConditions))
+			{
+				continue;
+			}
+
+			if (propDryRun.TryRead(ref reader, options, PropDryRun))
+			{
+				continue;
+			}
+
+			if (propNewIndex.TryRead(ref reader, options, PropNewIndex))
+			{
+				continue;
+			}
+
+			if (propOldIndex.TryRead(ref reader, options, PropOldIndex))
+			{
+				continue;
+			}
+
+			if (propRolledOver.TryRead(ref reader, options, PropRolledOver))
+			{
+				continue;
+			}
+
+			if (propShardsAcknowledged.TryRead(ref reader, options, PropShardsAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new RolloverResponse
+		{
+			Acknowledged = propAcknowledged.Value
+,
+			Conditions = propConditions.Value
+,
+			DryRun = propDryRun.Value
+,
+			NewIndex = propNewIndex.Value
+,
+			OldIndex = propOldIndex.Value
+,
+			RolledOver = propRolledOver.Value
+,
+			ShardsAcknowledged = propShardsAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, RolloverResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteProperty(options, PropConditions, value.Conditions);
+		writer.WriteProperty(options, PropDryRun, value.DryRun);
+		writer.WriteProperty(options, PropNewIndex, value.NewIndex);
+		writer.WriteProperty(options, PropOldIndex, value.OldIndex);
+		writer.WriteProperty(options, PropRolledOver, value.RolledOver);
+		writer.WriteProperty(options, PropShardsAcknowledged, value.ShardsAcknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(RolloverResponseConverter))]
 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.Serverless/_Generated/Api/IndexManagement/SegmentsResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/SegmentsResponse.g.cs
index a013b743050..0517e2c3a65 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/SegmentsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/SegmentsResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.IndexManagement;
 
+internal sealed partial class SegmentsResponseConverter : System.Text.Json.Serialization.JsonConverter<SegmentsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropIndices = System.Text.Json.JsonEncodedText.Encode("indices");
+	private static readonly System.Text.Json.JsonEncodedText PropShards = System.Text.Json.JsonEncodedText.Encode("_shards");
+
+	public override SegmentsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.IndexManagement.IndexSegment>> propIndices = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.ShardStatistics> propShards = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propIndices.TryRead(ref reader, options, PropIndices))
+			{
+				continue;
+			}
+
+			if (propShards.TryRead(ref reader, options, PropShards))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SegmentsResponse
+		{
+			Indices = propIndices.Value
+,
+			Shards = propShards.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SegmentsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropIndices, value.Indices);
+		writer.WriteProperty(options, PropShards, value.Shards);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(SegmentsResponseConverter))]
 public sealed partial class SegmentsResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("indices")]
 	public IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.IndexManagement.IndexSegment> Indices { get; init; }
-	[JsonInclude, JsonPropertyName("_shards")]
 	public Elastic.Clients.Elasticsearch.Serverless.ShardStatistics Shards { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/SimulateIndexTemplateResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/SimulateIndexTemplateResponse.g.cs
index d5f4ab63e53..142801a9f9b 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/SimulateIndexTemplateResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/SimulateIndexTemplateResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.IndexManagement;
 
+internal sealed partial class SimulateIndexTemplateResponseConverter : System.Text.Json.Serialization.JsonConverter<SimulateIndexTemplateResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropOverlapping = System.Text.Json.JsonEncodedText.Encode("overlapping");
+	private static readonly System.Text.Json.JsonEncodedText PropTemplate = System.Text.Json.JsonEncodedText.Encode("template");
+
+	public override SimulateIndexTemplateResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.Overlapping>?> propOverlapping = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.Template> propTemplate = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propOverlapping.TryRead(ref reader, options, PropOverlapping))
+			{
+				continue;
+			}
+
+			if (propTemplate.TryRead(ref reader, options, PropTemplate))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SimulateIndexTemplateResponse
+		{
+			Overlapping = propOverlapping.Value
+,
+			Template = propTemplate.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SimulateIndexTemplateResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropOverlapping, value.Overlapping);
+		writer.WriteProperty(options, PropTemplate, value.Template);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(SimulateIndexTemplateResponseConverter))]
 public sealed partial class SimulateIndexTemplateResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("overlapping")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.Overlapping>? Overlapping { get; init; }
-	[JsonInclude, JsonPropertyName("template")]
 	public Elastic.Clients.Elasticsearch.Serverless.IndexManagement.Template Template { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/SimulateTemplateResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/SimulateTemplateResponse.g.cs
index 2cc6cb2844c..3a117cd0dbb 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/SimulateTemplateResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/SimulateTemplateResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.IndexManagement;
 
+internal sealed partial class SimulateTemplateResponseConverter : System.Text.Json.Serialization.JsonConverter<SimulateTemplateResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropOverlapping = System.Text.Json.JsonEncodedText.Encode("overlapping");
+	private static readonly System.Text.Json.JsonEncodedText PropTemplate = System.Text.Json.JsonEncodedText.Encode("template");
+
+	public override SimulateTemplateResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.Overlapping>?> propOverlapping = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.Template> propTemplate = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propOverlapping.TryRead(ref reader, options, PropOverlapping))
+			{
+				continue;
+			}
+
+			if (propTemplate.TryRead(ref reader, options, PropTemplate))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SimulateTemplateResponse
+		{
+			Overlapping = propOverlapping.Value
+,
+			Template = propTemplate.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SimulateTemplateResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropOverlapping, value.Overlapping);
+		writer.WriteProperty(options, PropTemplate, value.Template);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(SimulateTemplateResponseConverter))]
 public sealed partial class SimulateTemplateResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("overlapping")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.Overlapping>? Overlapping { get; init; }
-	[JsonInclude, JsonPropertyName("template")]
 	public Elastic.Clients.Elasticsearch.Serverless.IndexManagement.Template Template { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/UpdateAliasesResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/UpdateAliasesResponse.g.cs
index cca0075dcba..c18e16d3737 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/UpdateAliasesResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/UpdateAliasesResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.IndexManagement;
 
+internal sealed partial class UpdateAliasesResponseConverter : System.Text.Json.Serialization.JsonConverter<UpdateAliasesResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override UpdateAliasesResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new UpdateAliasesResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, UpdateAliasesResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(UpdateAliasesResponseConverter))]
 public sealed partial class UpdateAliasesResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class UpdateAliasesResponse : ElasticsearchResponse
 	/// 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.Serverless/_Generated/Api/IndexManagement/ValidateQueryResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/ValidateQueryResponse.g.cs
index 6d138d626de..8ad7cd97213 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/ValidateQueryResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexManagement/ValidateQueryResponse.g.cs
@@ -18,22 +18,85 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.IndexManagement;
 
+internal sealed partial class ValidateQueryResponseConverter : System.Text.Json.Serialization.JsonConverter<ValidateQueryResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropError = System.Text.Json.JsonEncodedText.Encode("error");
+	private static readonly System.Text.Json.JsonEncodedText PropExplanations = System.Text.Json.JsonEncodedText.Encode("explanations");
+	private static readonly System.Text.Json.JsonEncodedText PropShards = System.Text.Json.JsonEncodedText.Encode("_shards");
+	private static readonly System.Text.Json.JsonEncodedText PropValid = System.Text.Json.JsonEncodedText.Encode("valid");
+
+	public override ValidateQueryResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string?> propError = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.IndicesValidationExplanation>?> propExplanations = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.ShardStatistics?> propShards = default;
+		LocalJsonProperty<bool> propValid = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propError.TryRead(ref reader, options, PropError))
+			{
+				continue;
+			}
+
+			if (propExplanations.TryRead(ref reader, options, PropExplanations))
+			{
+				continue;
+			}
+
+			if (propShards.TryRead(ref reader, options, PropShards))
+			{
+				continue;
+			}
+
+			if (propValid.TryRead(ref reader, options, PropValid))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ValidateQueryResponse
+		{
+			Error = propError.Value
+,
+			Explanations = propExplanations.Value
+,
+			Shards = propShards.Value
+,
+			Valid = propValid.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ValidateQueryResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropError, value.Error);
+		writer.WriteProperty(options, PropExplanations, value.Explanations);
+		writer.WriteProperty(options, PropShards, value.Shards);
+		writer.WriteProperty(options, PropValid, value.Valid);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ValidateQueryResponseConverter))]
 public sealed partial class ValidateQueryResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("error")]
 	public string? Error { get; init; }
-	[JsonInclude, JsonPropertyName("explanations")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.IndicesValidationExplanation>? Explanations { get; init; }
-	[JsonInclude, JsonPropertyName("_shards")]
 	public Elastic.Clients.Elasticsearch.Serverless.ShardStatistics? Shards { get; init; }
-	[JsonInclude, JsonPropertyName("valid")]
 	public bool Valid { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexRequest.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexRequest.g.cs
index de8f1f2caf9..49cabe29d25 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexRequest.g.cs
@@ -127,7 +127,7 @@ public sealed partial class IndexRequestParameters : RequestParameters
 /// If the target is an index and the document already exists, the request updates the document and increments its version.
 /// </para>
 /// </summary>
-public sealed partial class IndexRequest<TDocument> : PlainRequest<IndexRequestParameters>, ISelfSerializable
+public sealed partial class IndexRequest<TDocument> : PlainRequest<IndexRequestParameters>, ISelfTwoWaySerializable
 {
 	public IndexRequest(Elastic.Clients.Elasticsearch.Serverless.IndexName index, Elastic.Clients.Elasticsearch.Serverless.Id? id) : base(r => r.Required("index", index).Optional("id", id))
 	{
@@ -242,13 +242,17 @@ public IndexRequest(Elastic.Clients.Elasticsearch.Serverless.IndexName index) :
 	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Serverless.WaitForActiveShards? WaitForActiveShards { get => Q<Elastic.Clients.Elasticsearch.Serverless.WaitForActiveShards?>("wait_for_active_shards"); set => Q("wait_for_active_shards", value); }
-	[JsonIgnore]
 	public TDocument Document { get; set; }
 
-	void ISelfSerializable.Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
+	void ISelfTwoWaySerializable.Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 	{
 		settings.SourceSerializer.Serialize(Document, writer);
 	}
+
+	void ISelfTwoWaySerializable.Deserialize(ref Utf8JsonReader reader, JsonSerializerOptions options, IElasticsearchClientSettings settings)
+	{
+		Document = settings.SourceSerializer.Deserialize<TDocument>(ref reader);
+	}
 }
 
 /// <summary>
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexResponse.g.cs
index ce056a65bd4..37b968a3e03 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/IndexResponse.g.cs
@@ -18,30 +18,129 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless;
 
+internal sealed partial class IndexResponseConverter : System.Text.Json.Serialization.JsonConverter<IndexResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropForcedRefresh = System.Text.Json.JsonEncodedText.Encode("forced_refresh");
+	private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("_id");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("_index");
+	private static readonly System.Text.Json.JsonEncodedText PropPrimaryTerm = System.Text.Json.JsonEncodedText.Encode("_primary_term");
+	private static readonly System.Text.Json.JsonEncodedText PropResult = System.Text.Json.JsonEncodedText.Encode("result");
+	private static readonly System.Text.Json.JsonEncodedText PropSeqNo = System.Text.Json.JsonEncodedText.Encode("_seq_no");
+	private static readonly System.Text.Json.JsonEncodedText PropShards = System.Text.Json.JsonEncodedText.Encode("_shards");
+	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("_version");
+
+	public override IndexResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool?> propForcedRefresh = default;
+		LocalJsonProperty<string> propId = default;
+		LocalJsonProperty<string> propIndex = default;
+		LocalJsonProperty<long?> propPrimaryTerm = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Result> propResult = default;
+		LocalJsonProperty<long?> propSeqNo = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.ShardStatistics> propShards = default;
+		LocalJsonProperty<long> propVersion = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propForcedRefresh.TryRead(ref reader, options, PropForcedRefresh))
+			{
+				continue;
+			}
+
+			if (propId.TryRead(ref reader, options, PropId))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propPrimaryTerm.TryRead(ref reader, options, PropPrimaryTerm))
+			{
+				continue;
+			}
+
+			if (propResult.TryRead(ref reader, options, PropResult))
+			{
+				continue;
+			}
+
+			if (propSeqNo.TryRead(ref reader, options, PropSeqNo))
+			{
+				continue;
+			}
+
+			if (propShards.TryRead(ref reader, options, PropShards))
+			{
+				continue;
+			}
+
+			if (propVersion.TryRead(ref reader, options, PropVersion))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new IndexResponse
+		{
+			ForcedRefresh = propForcedRefresh.Value
+,
+			Id = propId.Value
+,
+			Index = propIndex.Value
+,
+			PrimaryTerm = propPrimaryTerm.Value
+,
+			Result = propResult.Value
+,
+			SeqNo = propSeqNo.Value
+,
+			Shards = propShards.Value
+,
+			Version = propVersion.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IndexResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropForcedRefresh, value.ForcedRefresh);
+		writer.WriteProperty(options, PropId, value.Id);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropPrimaryTerm, value.PrimaryTerm);
+		writer.WriteProperty(options, PropResult, value.Result);
+		writer.WriteProperty(options, PropSeqNo, value.SeqNo);
+		writer.WriteProperty(options, PropShards, value.Shards);
+		writer.WriteProperty(options, PropVersion, value.Version);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(IndexResponseConverter))]
 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.Serverless.Result Result { get; init; }
-	[JsonInclude, JsonPropertyName("_seq_no")]
 	public long? SeqNo { get; init; }
-	[JsonInclude, JsonPropertyName("_shards")]
 	public Elastic.Clients.Elasticsearch.Serverless.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.Serverless/_Generated/Api/Inference/DeleteInferenceResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Inference/DeleteInferenceResponse.g.cs
index 87912c59bf7..9fdb1508ef9 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Inference/DeleteInferenceResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Inference/DeleteInferenceResponse.g.cs
@@ -18,14 +18,61 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Inference;
 
+internal sealed partial class DeleteInferenceResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteInferenceResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+	private static readonly System.Text.Json.JsonEncodedText PropPipelines = System.Text.Json.JsonEncodedText.Encode("pipelines");
+
+	public override DeleteInferenceResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		LocalJsonProperty<IReadOnlyCollection<string>> propPipelines = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			if (propPipelines.TryRead(ref reader, options, PropPipelines))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteInferenceResponse
+		{
+			Acknowledged = propAcknowledged.Value
+,
+			Pipelines = propPipelines.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteInferenceResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteProperty(options, PropPipelines, value.Pipelines);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteInferenceResponseConverter))]
 public sealed partial class DeleteInferenceResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,8 +80,6 @@ public sealed partial class DeleteInferenceResponse : ElasticsearchResponse
 	/// 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; }
-	[JsonInclude, JsonPropertyName("pipelines")]
 	public IReadOnlyCollection<string> Pipelines { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Inference/GetInferenceResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Inference/GetInferenceResponse.g.cs
index eadcef93ac5..ea45b0380a5 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Inference/GetInferenceResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Inference/GetInferenceResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Inference;
 
+internal sealed partial class GetInferenceResponseConverter : System.Text.Json.Serialization.JsonConverter<GetInferenceResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropEndpoints = System.Text.Json.JsonEncodedText.Encode("endpoints");
+
+	public override GetInferenceResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Inference.InferenceEndpointInfo>> propEndpoints = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propEndpoints.TryRead(ref reader, options, PropEndpoints))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetInferenceResponse
+		{
+			Endpoints = propEndpoints.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetInferenceResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropEndpoints, value.Endpoints);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetInferenceResponseConverter))]
 public sealed partial class GetInferenceResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("endpoints")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Inference.InferenceEndpointInfo> Endpoints { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Inference/InferenceRequest.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Inference/InferenceRequest.g.cs
index 6e94c6b33af..34bd4a76f2f 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Inference/InferenceRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Inference/InferenceRequest.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Requests;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport;
@@ -40,11 +41,65 @@ public sealed partial class InferenceRequestParameters : RequestParameters
 	public Elastic.Clients.Elasticsearch.Serverless.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Serverless.Duration?>("timeout"); set => Q("timeout", value); }
 }
 
+internal sealed partial class InferenceRequestConverter : System.Text.Json.Serialization.JsonConverter<InferenceRequest>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropInput = System.Text.Json.JsonEncodedText.Encode("input");
+	private static readonly System.Text.Json.JsonEncodedText PropQuery = System.Text.Json.JsonEncodedText.Encode("query");
+	private static readonly System.Text.Json.JsonEncodedText PropTaskSettings = System.Text.Json.JsonEncodedText.Encode("task_settings");
+
+	public override InferenceRequest Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>> propInput = default;
+		LocalJsonProperty<string?> propQuery = default;
+		LocalJsonProperty<object?> propTaskSettings = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propInput.TryRead(ref reader, options, PropInput, typeof(SingleOrManyMarker<IReadOnlyCollection<string>, string>)))
+			{
+				continue;
+			}
+
+			if (propQuery.TryRead(ref reader, options, PropQuery))
+			{
+				continue;
+			}
+
+			if (propTaskSettings.TryRead(ref reader, options, PropTaskSettings))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new InferenceRequest
+		{
+			Input = propInput.Value
+	,
+			Query = propQuery.Value
+	,
+			TaskSettings = propTaskSettings.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, InferenceRequest value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropInput, value.Input, typeof(SingleOrManyMarker<IReadOnlyCollection<string>, string>));
+		writer.WriteProperty(options, PropQuery, value.Query);
+		writer.WriteProperty(options, PropTaskSettings, value.TaskSettings);
+		writer.WriteEndObject();
+	}
+}
+
 /// <summary>
 /// <para>
 /// Perform inference on the service
 /// </para>
 /// </summary>
+[JsonConverter(typeof(InferenceRequestConverter))]
 public sealed partial class InferenceRequest : PlainRequest<InferenceRequestParameters>
 {
 	public InferenceRequest(Elastic.Clients.Elasticsearch.Serverless.Id inferenceId) : base(r => r.Required("inference_id", inferenceId))
@@ -68,7 +123,6 @@ public InferenceRequest(Elastic.Clients.Elasticsearch.Serverless.Inference.TaskT
 	/// Specifies the amount of time to wait for the inference request to complete.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Serverless.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Serverless.Duration?>("timeout"); set => Q("timeout", value); }
 
 	/// <summary>
@@ -77,8 +131,6 @@ public InferenceRequest(Elastic.Clients.Elasticsearch.Serverless.Inference.TaskT
 	/// Either a string or an array of strings.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("input")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string> Input { get; set; }
 
 	/// <summary>
@@ -87,7 +139,6 @@ public InferenceRequest(Elastic.Clients.Elasticsearch.Serverless.Inference.TaskT
 	/// Not required for other tasks.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("query")]
 	public string? Query { get; set; }
 
 	/// <summary>
@@ -95,7 +146,6 @@ public InferenceRequest(Elastic.Clients.Elasticsearch.Serverless.Inference.TaskT
 	/// Optional task settings
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("task_settings")]
 	public object? TaskSettings { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Inference/InferenceResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Inference/InferenceResponse.g.cs
index 0e2891aecf9..8a2e32ff84c 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Inference/InferenceResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Inference/InferenceResponse.g.cs
@@ -18,14 +18,39 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Inference;
 
+internal sealed partial class InferenceResponseConverter : System.Text.Json.Serialization.JsonConverter<InferenceResponse>
+{
+	public override InferenceResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new InferenceResponse { };
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, InferenceResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(InferenceResponseConverter))]
 public sealed partial class InferenceResponse : ElasticsearchResponse
 {
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Inference/PutInferenceRequest.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Inference/PutInferenceRequest.g.cs
index eadac2de1ea..9bb8e6bde28 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Inference/PutInferenceRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Inference/PutInferenceRequest.g.cs
@@ -49,7 +49,7 @@ public sealed partial class PutInferenceRequestParameters : RequestParameters
 /// However, if you do not plan to use the inference APIs to use these models or if you want to use non-NLP models, use the machine learning trained model APIs.
 /// </para>
 /// </summary>
-public sealed partial class PutInferenceRequest : PlainRequest<PutInferenceRequestParameters>, ISelfSerializable
+public sealed partial class PutInferenceRequest : PlainRequest<PutInferenceRequestParameters>, ISelfTwoWaySerializable
 {
 	public PutInferenceRequest(Elastic.Clients.Elasticsearch.Serverless.Id inferenceId) : base(r => r.Required("inference_id", inferenceId))
 	{
@@ -67,13 +67,17 @@ public PutInferenceRequest(Elastic.Clients.Elasticsearch.Serverless.Inference.Ta
 
 	internal override string OperationName => "inference.put";
 
-	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Serverless.Inference.InferenceEndpoint InferenceConfig { get; set; }
 
-	void ISelfSerializable.Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
+	void ISelfTwoWaySerializable.Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 	{
 		JsonSerializer.Serialize(writer, InferenceConfig, options);
 	}
+
+	void ISelfTwoWaySerializable.Deserialize(ref Utf8JsonReader reader, JsonSerializerOptions options, IElasticsearchClientSettings settings)
+	{
+		InferenceConfig = settings.RequestResponseSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Inference.InferenceEndpoint>(ref reader);
+	}
 }
 
 /// <summary>
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Inference/PutInferenceResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Inference/PutInferenceResponse.g.cs
index 88c831242f4..c8386e18463 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Inference/PutInferenceResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Inference/PutInferenceResponse.g.cs
@@ -18,14 +18,91 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Inference;
 
+internal sealed partial class PutInferenceResponseConverter : System.Text.Json.Serialization.JsonConverter<PutInferenceResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropInferenceId = System.Text.Json.JsonEncodedText.Encode("inference_id");
+	private static readonly System.Text.Json.JsonEncodedText PropService = System.Text.Json.JsonEncodedText.Encode("service");
+	private static readonly System.Text.Json.JsonEncodedText PropServiceSettings = System.Text.Json.JsonEncodedText.Encode("service_settings");
+	private static readonly System.Text.Json.JsonEncodedText PropTaskSettings = System.Text.Json.JsonEncodedText.Encode("task_settings");
+	private static readonly System.Text.Json.JsonEncodedText PropTaskType = System.Text.Json.JsonEncodedText.Encode("task_type");
+
+	public override PutInferenceResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propInferenceId = default;
+		LocalJsonProperty<string> propService = default;
+		LocalJsonProperty<object> propServiceSettings = default;
+		LocalJsonProperty<object?> propTaskSettings = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Inference.TaskType> propTaskType = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propInferenceId.TryRead(ref reader, options, PropInferenceId))
+			{
+				continue;
+			}
+
+			if (propService.TryRead(ref reader, options, PropService))
+			{
+				continue;
+			}
+
+			if (propServiceSettings.TryRead(ref reader, options, PropServiceSettings))
+			{
+				continue;
+			}
+
+			if (propTaskSettings.TryRead(ref reader, options, PropTaskSettings))
+			{
+				continue;
+			}
+
+			if (propTaskType.TryRead(ref reader, options, PropTaskType))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutInferenceResponse
+		{
+			InferenceId = propInferenceId.Value
+,
+			Service = propService.Value
+,
+			ServiceSettings = propServiceSettings.Value
+,
+			TaskSettings = propTaskSettings.Value
+,
+			TaskType = propTaskType.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutInferenceResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropInferenceId, value.InferenceId);
+		writer.WriteProperty(options, PropService, value.Service);
+		writer.WriteProperty(options, PropServiceSettings, value.ServiceSettings);
+		writer.WriteProperty(options, PropTaskSettings, value.TaskSettings);
+		writer.WriteProperty(options, PropTaskType, value.TaskType);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PutInferenceResponseConverter))]
 public sealed partial class PutInferenceResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,7 +110,6 @@ public sealed partial class PutInferenceResponse : ElasticsearchResponse
 	/// The inference Id
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("inference_id")]
 	public string InferenceId { get; init; }
 
 	/// <summary>
@@ -41,7 +117,6 @@ public sealed partial class PutInferenceResponse : ElasticsearchResponse
 	/// The service type
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("service")]
 	public string Service { get; init; }
 
 	/// <summary>
@@ -49,7 +124,6 @@ public sealed partial class PutInferenceResponse : ElasticsearchResponse
 	/// Settings specific to the service
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("service_settings")]
 	public object ServiceSettings { get; init; }
 
 	/// <summary>
@@ -57,7 +131,6 @@ public sealed partial class PutInferenceResponse : ElasticsearchResponse
 	/// Task settings specific to the service and task type
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("task_settings")]
 	public object? TaskSettings { get; init; }
 
 	/// <summary>
@@ -65,6 +138,5 @@ public sealed partial class PutInferenceResponse : ElasticsearchResponse
 	/// The task type
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("task_type")]
 	public Elastic.Clients.Elasticsearch.Serverless.Inference.TaskType TaskType { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/InfoResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/InfoResponse.g.cs
index ea3e2509507..2760e3b01fd 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/InfoResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/InfoResponse.g.cs
@@ -18,14 +18,91 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless;
 
+internal sealed partial class InfoResponseConverter : System.Text.Json.Serialization.JsonConverter<InfoResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropClusterName = System.Text.Json.JsonEncodedText.Encode("cluster_name");
+	private static readonly System.Text.Json.JsonEncodedText PropClusterUuid = System.Text.Json.JsonEncodedText.Encode("cluster_uuid");
+	private static readonly System.Text.Json.JsonEncodedText PropName = System.Text.Json.JsonEncodedText.Encode("name");
+	private static readonly System.Text.Json.JsonEncodedText PropTagline = System.Text.Json.JsonEncodedText.Encode("tagline");
+	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("version");
+
+	public override InfoResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propClusterName = default;
+		LocalJsonProperty<string> propClusterUuid = default;
+		LocalJsonProperty<string> propName = default;
+		LocalJsonProperty<string> propTagline = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.ElasticsearchVersionInfo> propVersion = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propClusterName.TryRead(ref reader, options, PropClusterName))
+			{
+				continue;
+			}
+
+			if (propClusterUuid.TryRead(ref reader, options, PropClusterUuid))
+			{
+				continue;
+			}
+
+			if (propName.TryRead(ref reader, options, PropName))
+			{
+				continue;
+			}
+
+			if (propTagline.TryRead(ref reader, options, PropTagline))
+			{
+				continue;
+			}
+
+			if (propVersion.TryRead(ref reader, options, PropVersion))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new InfoResponse
+		{
+			ClusterName = propClusterName.Value
+,
+			ClusterUuid = propClusterUuid.Value
+,
+			Name = propName.Value
+,
+			Tagline = propTagline.Value
+,
+			Version = propVersion.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, InfoResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropClusterName, value.ClusterName);
+		writer.WriteProperty(options, PropClusterUuid, value.ClusterUuid);
+		writer.WriteProperty(options, PropName, value.Name);
+		writer.WriteProperty(options, PropTagline, value.Tagline);
+		writer.WriteProperty(options, PropVersion, value.Version);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(InfoResponseConverter))]
 public sealed partial class InfoResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,9 +110,7 @@ public sealed partial class InfoResponse : ElasticsearchResponse
 	/// The responding cluster's name.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("cluster_name")]
 	public string ClusterName { get; init; }
-	[JsonInclude, JsonPropertyName("cluster_uuid")]
 	public string ClusterUuid { get; init; }
 
 	/// <summary>
@@ -43,9 +118,7 @@ public sealed partial class InfoResponse : ElasticsearchResponse
 	/// The responding node's name.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("name")]
 	public string Name { get; init; }
-	[JsonInclude, JsonPropertyName("tagline")]
 	public string Tagline { get; init; }
 
 	/// <summary>
@@ -53,6 +126,5 @@ public sealed partial class InfoResponse : ElasticsearchResponse
 	/// The running version of Elasticsearch.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("version")]
 	public Elastic.Clients.Elasticsearch.Serverless.ElasticsearchVersionInfo Version { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Ingest/DeleteGeoipDatabaseResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Ingest/DeleteGeoipDatabaseResponse.g.cs
index d25a7acde05..4cb6ddd45f3 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Ingest/DeleteGeoipDatabaseResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Ingest/DeleteGeoipDatabaseResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Ingest;
 
+internal sealed partial class DeleteGeoipDatabaseResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteGeoipDatabaseResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override DeleteGeoipDatabaseResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteGeoipDatabaseResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteGeoipDatabaseResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteGeoipDatabaseResponseConverter))]
 public sealed partial class DeleteGeoipDatabaseResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class DeleteGeoipDatabaseResponse : ElasticsearchResponse
 	/// 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.Serverless/_Generated/Api/Ingest/DeleteIpLocationDatabaseResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Ingest/DeleteIpLocationDatabaseResponse.g.cs
index faadfbc99b4..a24bbc0d53d 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Ingest/DeleteIpLocationDatabaseResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Ingest/DeleteIpLocationDatabaseResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Ingest;
 
+internal sealed partial class DeleteIpLocationDatabaseResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteIpLocationDatabaseResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override DeleteIpLocationDatabaseResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteIpLocationDatabaseResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteIpLocationDatabaseResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteIpLocationDatabaseResponseConverter))]
 public sealed partial class DeleteIpLocationDatabaseResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class DeleteIpLocationDatabaseResponse : ElasticsearchResp
 	/// 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.Serverless/_Generated/Api/Ingest/DeletePipelineResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Ingest/DeletePipelineResponse.g.cs
index a607d2fedf7..bf41b4b2e47 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Ingest/DeletePipelineResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Ingest/DeletePipelineResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Ingest;
 
+internal sealed partial class DeletePipelineResponseConverter : System.Text.Json.Serialization.JsonConverter<DeletePipelineResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override DeletePipelineResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeletePipelineResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeletePipelineResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeletePipelineResponseConverter))]
 public sealed partial class DeletePipelineResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class DeletePipelineResponse : ElasticsearchResponse
 	/// 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.Serverless/_Generated/Api/Ingest/GeoIpStatsResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Ingest/GeoIpStatsResponse.g.cs
index cf6f1342cd0..a96028ea986 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Ingest/GeoIpStatsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Ingest/GeoIpStatsResponse.g.cs
@@ -18,14 +18,61 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Ingest;
 
+internal sealed partial class GeoIpStatsResponseConverter : System.Text.Json.Serialization.JsonConverter<GeoIpStatsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropNodes = System.Text.Json.JsonEncodedText.Encode("nodes");
+	private static readonly System.Text.Json.JsonEncodedText PropStats = System.Text.Json.JsonEncodedText.Encode("stats");
+
+	public override GeoIpStatsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Ingest.GeoIpNodeDatabases>> propNodes = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Ingest.GeoIpDownloadStatistics> propStats = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propNodes.TryRead(ref reader, options, PropNodes))
+			{
+				continue;
+			}
+
+			if (propStats.TryRead(ref reader, options, PropStats))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GeoIpStatsResponse
+		{
+			Nodes = propNodes.Value
+,
+			Stats = propStats.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GeoIpStatsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropNodes, value.Nodes);
+		writer.WriteProperty(options, PropStats, value.Stats);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GeoIpStatsResponseConverter))]
 public sealed partial class GeoIpStatsResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,7 +80,6 @@ public sealed partial class GeoIpStatsResponse : ElasticsearchResponse
 	/// Downloaded GeoIP2 databases for each node.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("nodes")]
 	public IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Ingest.GeoIpNodeDatabases> Nodes { get; init; }
 
 	/// <summary>
@@ -41,6 +87,5 @@ public sealed partial class GeoIpStatsResponse : ElasticsearchResponse
 	/// Download statistics for all GeoIP2 databases.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("stats")]
 	public Elastic.Clients.Elasticsearch.Serverless.Ingest.GeoIpDownloadStatistics Stats { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Ingest/GetGeoipDatabaseResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Ingest/GetGeoipDatabaseResponse.g.cs
index 92e10c2b774..446f5746d09 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Ingest/GetGeoipDatabaseResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Ingest/GetGeoipDatabaseResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Ingest;
 
+internal sealed partial class GetGeoipDatabaseResponseConverter : System.Text.Json.Serialization.JsonConverter<GetGeoipDatabaseResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropDatabases = System.Text.Json.JsonEncodedText.Encode("databases");
+
+	public override GetGeoipDatabaseResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Ingest.DatabaseConfigurationMetadata>> propDatabases = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propDatabases.TryRead(ref reader, options, PropDatabases))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetGeoipDatabaseResponse
+		{
+			Databases = propDatabases.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetGeoipDatabaseResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDatabases, value.Databases);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetGeoipDatabaseResponseConverter))]
 public sealed partial class GetGeoipDatabaseResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("databases")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Ingest.DatabaseConfigurationMetadata> Databases { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Ingest/GetIpLocationDatabaseResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Ingest/GetIpLocationDatabaseResponse.g.cs
index 3413683d5e0..3552d01e850 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Ingest/GetIpLocationDatabaseResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Ingest/GetIpLocationDatabaseResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Ingest;
 
+internal sealed partial class GetIpLocationDatabaseResponseConverter : System.Text.Json.Serialization.JsonConverter<GetIpLocationDatabaseResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropDatabases = System.Text.Json.JsonEncodedText.Encode("databases");
+
+	public override GetIpLocationDatabaseResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Ingest.IpDatabaseConfigurationMetadata>> propDatabases = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propDatabases.TryRead(ref reader, options, PropDatabases))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetIpLocationDatabaseResponse
+		{
+			Databases = propDatabases.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetIpLocationDatabaseResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDatabases, value.Databases);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetIpLocationDatabaseResponseConverter))]
 public sealed partial class GetIpLocationDatabaseResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("databases")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Ingest.IpDatabaseConfigurationMetadata> Databases { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Ingest/ProcessorGrokResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Ingest/ProcessorGrokResponse.g.cs
index ec998cacb5b..ea008f3d1cd 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Ingest/ProcessorGrokResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Ingest/ProcessorGrokResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Ingest;
 
+internal sealed partial class ProcessorGrokResponseConverter : System.Text.Json.Serialization.JsonConverter<ProcessorGrokResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropPatterns = System.Text.Json.JsonEncodedText.Encode("patterns");
+
+	public override ProcessorGrokResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyDictionary<string, string>> propPatterns = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propPatterns.TryRead(ref reader, options, PropPatterns))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ProcessorGrokResponse
+		{
+			Patterns = propPatterns.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ProcessorGrokResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropPatterns, value.Patterns);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ProcessorGrokResponseConverter))]
 public sealed partial class ProcessorGrokResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("patterns")]
 	public IReadOnlyDictionary<string, string> Patterns { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Ingest/PutGeoipDatabaseResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Ingest/PutGeoipDatabaseResponse.g.cs
index c098d37a2a9..24065342334 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Ingest/PutGeoipDatabaseResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Ingest/PutGeoipDatabaseResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Ingest;
 
+internal sealed partial class PutGeoipDatabaseResponseConverter : System.Text.Json.Serialization.JsonConverter<PutGeoipDatabaseResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override PutGeoipDatabaseResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutGeoipDatabaseResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutGeoipDatabaseResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PutGeoipDatabaseResponseConverter))]
 public sealed partial class PutGeoipDatabaseResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class PutGeoipDatabaseResponse : ElasticsearchResponse
 	/// 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.Serverless/_Generated/Api/Ingest/PutIpLocationDatabaseRequest.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Ingest/PutIpLocationDatabaseRequest.g.cs
index 8f337335f24..e2701cad8bb 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Ingest/PutIpLocationDatabaseRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Ingest/PutIpLocationDatabaseRequest.g.cs
@@ -56,7 +56,7 @@ public sealed partial class PutIpLocationDatabaseRequestParameters : RequestPara
 /// Create or update an IP geolocation database configuration.
 /// </para>
 /// </summary>
-public sealed partial class PutIpLocationDatabaseRequest : PlainRequest<PutIpLocationDatabaseRequestParameters>, ISelfSerializable
+public sealed partial class PutIpLocationDatabaseRequest : PlainRequest<PutIpLocationDatabaseRequestParameters>, ISelfTwoWaySerializable
 {
 	public PutIpLocationDatabaseRequest(Elastic.Clients.Elasticsearch.Serverless.Id id) : base(r => r.Required("id", id))
 	{
@@ -89,13 +89,17 @@ public PutIpLocationDatabaseRequest(Elastic.Clients.Elasticsearch.Serverless.Id
 	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Serverless.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Serverless.Duration?>("timeout"); set => Q("timeout", value); }
-	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Serverless.Ingest.DatabaseConfiguration Configuration { get; set; }
 
-	void ISelfSerializable.Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
+	void ISelfTwoWaySerializable.Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 	{
 		JsonSerializer.Serialize(writer, Configuration, options);
 	}
+
+	void ISelfTwoWaySerializable.Deserialize(ref Utf8JsonReader reader, JsonSerializerOptions options, IElasticsearchClientSettings settings)
+	{
+		Configuration = settings.RequestResponseSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.DatabaseConfiguration>(ref reader);
+	}
 }
 
 /// <summary>
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Ingest/PutIpLocationDatabaseResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Ingest/PutIpLocationDatabaseResponse.g.cs
index 3f5f8d048f0..cc2ba7ed95f 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Ingest/PutIpLocationDatabaseResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Ingest/PutIpLocationDatabaseResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Ingest;
 
+internal sealed partial class PutIpLocationDatabaseResponseConverter : System.Text.Json.Serialization.JsonConverter<PutIpLocationDatabaseResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override PutIpLocationDatabaseResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutIpLocationDatabaseResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutIpLocationDatabaseResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PutIpLocationDatabaseResponseConverter))]
 public sealed partial class PutIpLocationDatabaseResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class PutIpLocationDatabaseResponse : ElasticsearchRespons
 	/// 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.Serverless/_Generated/Api/Ingest/PutPipelineResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Ingest/PutPipelineResponse.g.cs
index 1e248573d0c..6ab2e45c21b 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Ingest/PutPipelineResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Ingest/PutPipelineResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Ingest;
 
+internal sealed partial class PutPipelineResponseConverter : System.Text.Json.Serialization.JsonConverter<PutPipelineResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override PutPipelineResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutPipelineResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutPipelineResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PutPipelineResponseConverter))]
 public sealed partial class PutPipelineResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class PutPipelineResponse : ElasticsearchResponse
 	/// 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.Serverless/_Generated/Api/Ingest/SimulateResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Ingest/SimulateResponse.g.cs
index ce9751221ea..6622099c75c 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Ingest/SimulateResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Ingest/SimulateResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Ingest;
 
+internal sealed partial class SimulateResponseConverter : System.Text.Json.Serialization.JsonConverter<SimulateResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropDocs = System.Text.Json.JsonEncodedText.Encode("docs");
+
+	public override SimulateResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Ingest.SimulateDocumentResult>> propDocs = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propDocs.TryRead(ref reader, options, PropDocs))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SimulateResponse
+		{
+			Docs = propDocs.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SimulateResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDocs, value.Docs);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(SimulateResponseConverter))]
 public sealed partial class SimulateResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("docs")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Ingest.SimulateDocumentResult> Docs { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/LicenseManagement/GetLicenseResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/LicenseManagement/GetLicenseResponse.g.cs
index 8fa51607bf7..17bc4b01ac7 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/LicenseManagement/GetLicenseResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/LicenseManagement/GetLicenseResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.LicenseManagement;
 
+internal sealed partial class GetLicenseResponseConverter : System.Text.Json.Serialization.JsonConverter<GetLicenseResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropLicense = System.Text.Json.JsonEncodedText.Encode("license");
+
+	public override GetLicenseResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.LicenseManagement.LicenseInformation> propLicense = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propLicense.TryRead(ref reader, options, PropLicense))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetLicenseResponse
+		{
+			License = propLicense.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetLicenseResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropLicense, value.License);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetLicenseResponseConverter))]
 public sealed partial class GetLicenseResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("license")]
 	public Elastic.Clients.Elasticsearch.Serverless.LicenseManagement.LicenseInformation License { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/ClearTrainedModelDeploymentCacheResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/ClearTrainedModelDeploymentCacheResponse.g.cs
index 85eda28ed17..481d057e286 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/ClearTrainedModelDeploymentCacheResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/ClearTrainedModelDeploymentCacheResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.MachineLearning;
 
+internal sealed partial class ClearTrainedModelDeploymentCacheResponseConverter : System.Text.Json.Serialization.JsonConverter<ClearTrainedModelDeploymentCacheResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCleared = System.Text.Json.JsonEncodedText.Encode("cleared");
+
+	public override ClearTrainedModelDeploymentCacheResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propCleared = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCleared.TryRead(ref reader, options, PropCleared))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ClearTrainedModelDeploymentCacheResponse
+		{
+			Cleared = propCleared.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ClearTrainedModelDeploymentCacheResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCleared, value.Cleared);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ClearTrainedModelDeploymentCacheResponseConverter))]
 public sealed partial class ClearTrainedModelDeploymentCacheResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("cleared")]
 	public bool Cleared { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/CloseJobResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/CloseJobResponse.g.cs
index 77e3416af09..3573a0cc572 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/CloseJobResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/CloseJobResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.MachineLearning;
 
+internal sealed partial class CloseJobResponseConverter : System.Text.Json.Serialization.JsonConverter<CloseJobResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropClosed = System.Text.Json.JsonEncodedText.Encode("closed");
+
+	public override CloseJobResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propClosed = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propClosed.TryRead(ref reader, options, PropClosed))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new CloseJobResponse
+		{
+			Closed = propClosed.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, CloseJobResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropClosed, value.Closed);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(CloseJobResponseConverter))]
 public sealed partial class CloseJobResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("closed")]
 	public bool Closed { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/DeleteCalendarEventResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/DeleteCalendarEventResponse.g.cs
index f71ba556930..24a88b47834 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/DeleteCalendarEventResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/DeleteCalendarEventResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.MachineLearning;
 
+internal sealed partial class DeleteCalendarEventResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteCalendarEventResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override DeleteCalendarEventResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteCalendarEventResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteCalendarEventResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteCalendarEventResponseConverter))]
 public sealed partial class DeleteCalendarEventResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class DeleteCalendarEventResponse : ElasticsearchResponse
 	/// 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.Serverless/_Generated/Api/MachineLearning/DeleteCalendarJobResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/DeleteCalendarJobResponse.g.cs
index 93f5a7e4768..bdc40917638 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/DeleteCalendarJobResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/DeleteCalendarJobResponse.g.cs
@@ -18,14 +18,71 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.MachineLearning;
 
+internal sealed partial class DeleteCalendarJobResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteCalendarJobResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCalendarId = System.Text.Json.JsonEncodedText.Encode("calendar_id");
+	private static readonly System.Text.Json.JsonEncodedText PropDescription = System.Text.Json.JsonEncodedText.Encode("description");
+	private static readonly System.Text.Json.JsonEncodedText PropJobIds = System.Text.Json.JsonEncodedText.Encode("job_ids");
+
+	public override DeleteCalendarJobResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propCalendarId = default;
+		LocalJsonProperty<string?> propDescription = default;
+		LocalJsonProperty<IReadOnlyCollection<string>> propJobIds = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCalendarId.TryRead(ref reader, options, PropCalendarId))
+			{
+				continue;
+			}
+
+			if (propDescription.TryRead(ref reader, options, PropDescription))
+			{
+				continue;
+			}
+
+			if (propJobIds.TryRead(ref reader, options, PropJobIds, typeof(SingleOrManyMarker<IReadOnlyCollection<string>, string>)))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteCalendarJobResponse
+		{
+			CalendarId = propCalendarId.Value
+,
+			Description = propDescription.Value
+,
+			JobIds = propJobIds.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteCalendarJobResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCalendarId, value.CalendarId);
+		writer.WriteProperty(options, PropDescription, value.Description);
+		writer.WriteProperty(options, PropJobIds, value.JobIds, typeof(SingleOrManyMarker<IReadOnlyCollection<string>, string>));
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteCalendarJobResponseConverter))]
 public sealed partial class DeleteCalendarJobResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,7 +90,6 @@ public sealed partial class DeleteCalendarJobResponse : ElasticsearchResponse
 	/// A string that uniquely identifies a calendar.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("calendar_id")]
 	public string CalendarId { get; init; }
 
 	/// <summary>
@@ -41,7 +97,6 @@ public sealed partial class DeleteCalendarJobResponse : ElasticsearchResponse
 	/// A description of the calendar.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("description")]
 	public string? Description { get; init; }
 
 	/// <summary>
@@ -49,7 +104,5 @@ public sealed partial class DeleteCalendarJobResponse : ElasticsearchResponse
 	/// A list of anomaly detection job identifiers or group names.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("job_ids")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public IReadOnlyCollection<string> JobIds { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/DeleteCalendarResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/DeleteCalendarResponse.g.cs
index e52c9343723..4533f9a5f6c 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/DeleteCalendarResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/DeleteCalendarResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.MachineLearning;
 
+internal sealed partial class DeleteCalendarResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteCalendarResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override DeleteCalendarResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteCalendarResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteCalendarResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteCalendarResponseConverter))]
 public sealed partial class DeleteCalendarResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class DeleteCalendarResponse : ElasticsearchResponse
 	/// 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.Serverless/_Generated/Api/MachineLearning/DeleteDataFrameAnalyticsResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/DeleteDataFrameAnalyticsResponse.g.cs
index 25d09960c32..79fa6c5faa0 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/DeleteDataFrameAnalyticsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/DeleteDataFrameAnalyticsResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.MachineLearning;
 
+internal sealed partial class DeleteDataFrameAnalyticsResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteDataFrameAnalyticsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override DeleteDataFrameAnalyticsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteDataFrameAnalyticsResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteDataFrameAnalyticsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteDataFrameAnalyticsResponseConverter))]
 public sealed partial class DeleteDataFrameAnalyticsResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class DeleteDataFrameAnalyticsResponse : ElasticsearchResp
 	/// 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.Serverless/_Generated/Api/MachineLearning/DeleteDatafeedResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/DeleteDatafeedResponse.g.cs
index 82dcab69bde..bcd7fba4bd6 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/DeleteDatafeedResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/DeleteDatafeedResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.MachineLearning;
 
+internal sealed partial class DeleteDatafeedResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteDatafeedResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override DeleteDatafeedResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteDatafeedResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteDatafeedResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteDatafeedResponseConverter))]
 public sealed partial class DeleteDatafeedResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class DeleteDatafeedResponse : ElasticsearchResponse
 	/// 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.Serverless/_Generated/Api/MachineLearning/DeleteExpiredDataResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/DeleteExpiredDataResponse.g.cs
index 08048c0922c..89ed2cba300 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/DeleteExpiredDataResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/DeleteExpiredDataResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.MachineLearning;
 
+internal sealed partial class DeleteExpiredDataResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteExpiredDataResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropDeleted = System.Text.Json.JsonEncodedText.Encode("deleted");
+
+	public override DeleteExpiredDataResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propDeleted = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propDeleted.TryRead(ref reader, options, PropDeleted))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteExpiredDataResponse
+		{
+			Deleted = propDeleted.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteExpiredDataResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDeleted, value.Deleted);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteExpiredDataResponseConverter))]
 public sealed partial class DeleteExpiredDataResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("deleted")]
 	public bool Deleted { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/DeleteFilterResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/DeleteFilterResponse.g.cs
index 1cfbc6d6b8b..a1c0a3f6aad 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/DeleteFilterResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/DeleteFilterResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.MachineLearning;
 
+internal sealed partial class DeleteFilterResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteFilterResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override DeleteFilterResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteFilterResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteFilterResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteFilterResponseConverter))]
 public sealed partial class DeleteFilterResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class DeleteFilterResponse : ElasticsearchResponse
 	/// 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.Serverless/_Generated/Api/MachineLearning/DeleteForecastResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/DeleteForecastResponse.g.cs
index f2d0e1be4df..3af1c17d4bb 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/DeleteForecastResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/DeleteForecastResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.MachineLearning;
 
+internal sealed partial class DeleteForecastResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteForecastResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override DeleteForecastResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteForecastResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteForecastResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteForecastResponseConverter))]
 public sealed partial class DeleteForecastResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class DeleteForecastResponse : ElasticsearchResponse
 	/// 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.Serverless/_Generated/Api/MachineLearning/DeleteJobResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/DeleteJobResponse.g.cs
index eaba9314e44..d6f118e9b7b 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/DeleteJobResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/DeleteJobResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.MachineLearning;
 
+internal sealed partial class DeleteJobResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteJobResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override DeleteJobResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteJobResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteJobResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteJobResponseConverter))]
 public sealed partial class DeleteJobResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class DeleteJobResponse : ElasticsearchResponse
 	/// 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.Serverless/_Generated/Api/MachineLearning/DeleteModelSnapshotResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/DeleteModelSnapshotResponse.g.cs
index 4dcd0a28b87..d076534ac84 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/DeleteModelSnapshotResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/DeleteModelSnapshotResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.MachineLearning;
 
+internal sealed partial class DeleteModelSnapshotResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteModelSnapshotResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override DeleteModelSnapshotResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteModelSnapshotResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteModelSnapshotResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteModelSnapshotResponseConverter))]
 public sealed partial class DeleteModelSnapshotResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class DeleteModelSnapshotResponse : ElasticsearchResponse
 	/// 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.Serverless/_Generated/Api/MachineLearning/DeleteTrainedModelAliasResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/DeleteTrainedModelAliasResponse.g.cs
index 77efa89d63c..a128791f79c 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/DeleteTrainedModelAliasResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/DeleteTrainedModelAliasResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.MachineLearning;
 
+internal sealed partial class DeleteTrainedModelAliasResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteTrainedModelAliasResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override DeleteTrainedModelAliasResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteTrainedModelAliasResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteTrainedModelAliasResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteTrainedModelAliasResponseConverter))]
 public sealed partial class DeleteTrainedModelAliasResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class DeleteTrainedModelAliasResponse : ElasticsearchRespo
 	/// 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.Serverless/_Generated/Api/MachineLearning/DeleteTrainedModelResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/DeleteTrainedModelResponse.g.cs
index 6afafbd30f8..8a4afea243e 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/DeleteTrainedModelResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/DeleteTrainedModelResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.MachineLearning;
 
+internal sealed partial class DeleteTrainedModelResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteTrainedModelResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override DeleteTrainedModelResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteTrainedModelResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteTrainedModelResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteTrainedModelResponseConverter))]
 public sealed partial class DeleteTrainedModelResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class DeleteTrainedModelResponse : ElasticsearchResponse
 	/// 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.Serverless/_Generated/Api/MachineLearning/EstimateModelMemoryResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/EstimateModelMemoryResponse.g.cs
index 922869af4c3..9915b50cf5b 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/EstimateModelMemoryResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/EstimateModelMemoryResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.MachineLearning;
 
+internal sealed partial class EstimateModelMemoryResponseConverter : System.Text.Json.Serialization.JsonConverter<EstimateModelMemoryResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropModelMemoryEstimate = System.Text.Json.JsonEncodedText.Encode("model_memory_estimate");
+
+	public override EstimateModelMemoryResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propModelMemoryEstimate = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propModelMemoryEstimate.TryRead(ref reader, options, PropModelMemoryEstimate))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new EstimateModelMemoryResponse
+		{
+			ModelMemoryEstimate = propModelMemoryEstimate.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, EstimateModelMemoryResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropModelMemoryEstimate, value.ModelMemoryEstimate);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(EstimateModelMemoryResponseConverter))]
 public sealed partial class EstimateModelMemoryResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("model_memory_estimate")]
 	public string ModelMemoryEstimate { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/EvaluateDataFrameResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/EvaluateDataFrameResponse.g.cs
index 29141cbaa77..4ca70747b7e 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/EvaluateDataFrameResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/EvaluateDataFrameResponse.g.cs
@@ -18,14 +18,71 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.MachineLearning;
 
+internal sealed partial class EvaluateDataFrameResponseConverter : System.Text.Json.Serialization.JsonConverter<EvaluateDataFrameResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropClassification = System.Text.Json.JsonEncodedText.Encode("classification");
+	private static readonly System.Text.Json.JsonEncodedText PropOutlierDetection = System.Text.Json.JsonEncodedText.Encode("outlier_detection");
+	private static readonly System.Text.Json.JsonEncodedText PropRegression = System.Text.Json.JsonEncodedText.Encode("regression");
+
+	public override EvaluateDataFrameResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeClassificationSummary?> propClassification = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeOutlierDetectionSummary?> propOutlierDetection = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeRegressionSummary?> propRegression = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propClassification.TryRead(ref reader, options, PropClassification))
+			{
+				continue;
+			}
+
+			if (propOutlierDetection.TryRead(ref reader, options, PropOutlierDetection))
+			{
+				continue;
+			}
+
+			if (propRegression.TryRead(ref reader, options, PropRegression))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new EvaluateDataFrameResponse
+		{
+			Classification = propClassification.Value
+,
+			OutlierDetection = propOutlierDetection.Value
+,
+			Regression = propRegression.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, EvaluateDataFrameResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropClassification, value.Classification);
+		writer.WriteProperty(options, PropOutlierDetection, value.OutlierDetection);
+		writer.WriteProperty(options, PropRegression, value.Regression);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(EvaluateDataFrameResponseConverter))]
 public sealed partial class EvaluateDataFrameResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -34,7 +91,6 @@ public sealed partial class EvaluateDataFrameResponse : ElasticsearchResponse
 	/// It outputs a prediction that identifies to which of the classes each document belongs.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("classification")]
 	public Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeClassificationSummary? Classification { get; init; }
 
 	/// <summary>
@@ -43,7 +99,6 @@ public sealed partial class EvaluateDataFrameResponse : ElasticsearchResponse
 	/// It outputs the probability that each document is an outlier.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("outlier_detection")]
 	public Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeOutlierDetectionSummary? OutlierDetection { get; init; }
 
 	/// <summary>
@@ -51,6 +106,5 @@ public sealed partial class EvaluateDataFrameResponse : ElasticsearchResponse
 	/// Evaluation results for a regression analysis which outputs a prediction of values.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("regression")]
 	public Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeRegressionSummary? Regression { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/ExplainDataFrameAnalyticsResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/ExplainDataFrameAnalyticsResponse.g.cs
index a6c84a58c69..d2398cc1a85 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/ExplainDataFrameAnalyticsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/ExplainDataFrameAnalyticsResponse.g.cs
@@ -18,14 +18,61 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.MachineLearning;
 
+internal sealed partial class ExplainDataFrameAnalyticsResponseConverter : System.Text.Json.Serialization.JsonConverter<ExplainDataFrameAnalyticsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropFieldSelection = System.Text.Json.JsonEncodedText.Encode("field_selection");
+	private static readonly System.Text.Json.JsonEncodedText PropMemoryEstimation = System.Text.Json.JsonEncodedText.Encode("memory_estimation");
+
+	public override ExplainDataFrameAnalyticsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeAnalyticsFieldSelection>> propFieldSelection = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeAnalyticsMemoryEstimation> propMemoryEstimation = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propFieldSelection.TryRead(ref reader, options, PropFieldSelection))
+			{
+				continue;
+			}
+
+			if (propMemoryEstimation.TryRead(ref reader, options, PropMemoryEstimation))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ExplainDataFrameAnalyticsResponse
+		{
+			FieldSelection = propFieldSelection.Value
+,
+			MemoryEstimation = propMemoryEstimation.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ExplainDataFrameAnalyticsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropFieldSelection, value.FieldSelection);
+		writer.WriteProperty(options, PropMemoryEstimation, value.MemoryEstimation);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ExplainDataFrameAnalyticsResponseConverter))]
 public sealed partial class ExplainDataFrameAnalyticsResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,7 +80,6 @@ public sealed partial class ExplainDataFrameAnalyticsResponse : ElasticsearchRes
 	/// An array of objects that explain selection for each field, sorted by the field names.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("field_selection")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeAnalyticsFieldSelection> FieldSelection { get; init; }
 
 	/// <summary>
@@ -41,6 +87,5 @@ public sealed partial class ExplainDataFrameAnalyticsResponse : ElasticsearchRes
 	/// An array of objects that explain selection for each field, sorted by the field names.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("memory_estimation")]
 	public Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeAnalyticsMemoryEstimation MemoryEstimation { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/FlushJobResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/FlushJobResponse.g.cs
index 153a31d6ccb..5df944eb7a6 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/FlushJobResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/FlushJobResponse.g.cs
@@ -18,17 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.MachineLearning;
 
+internal sealed partial class FlushJobResponseConverter : System.Text.Json.Serialization.JsonConverter<FlushJobResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropFlushed = System.Text.Json.JsonEncodedText.Encode("flushed");
+	private static readonly System.Text.Json.JsonEncodedText PropLastFinalizedBucketEnd = System.Text.Json.JsonEncodedText.Encode("last_finalized_bucket_end");
+
+	public override FlushJobResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propFlushed = default;
+		LocalJsonProperty<int?> propLastFinalizedBucketEnd = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propFlushed.TryRead(ref reader, options, PropFlushed))
+			{
+				continue;
+			}
+
+			if (propLastFinalizedBucketEnd.TryRead(ref reader, options, PropLastFinalizedBucketEnd))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new FlushJobResponse
+		{
+			Flushed = propFlushed.Value
+,
+			LastFinalizedBucketEnd = propLastFinalizedBucketEnd.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, FlushJobResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropFlushed, value.Flushed);
+		writer.WriteProperty(options, PropLastFinalizedBucketEnd, value.LastFinalizedBucketEnd);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(FlushJobResponseConverter))]
 public sealed partial class FlushJobResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("flushed")]
 	public bool Flushed { get; init; }
 
 	/// <summary>
@@ -37,6 +83,5 @@ public sealed partial class FlushJobResponse : ElasticsearchResponse
 	/// the last bucket that was processed.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("last_finalized_bucket_end")]
 	public int? LastFinalizedBucketEnd { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/ForecastResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/ForecastResponse.g.cs
index 1e1980755b1..886249ef23d 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/ForecastResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/ForecastResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.MachineLearning;
 
+internal sealed partial class ForecastResponseConverter : System.Text.Json.Serialization.JsonConverter<ForecastResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+	private static readonly System.Text.Json.JsonEncodedText PropForecastId = System.Text.Json.JsonEncodedText.Encode("forecast_id");
+
+	public override ForecastResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		LocalJsonProperty<string> propForecastId = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			if (propForecastId.TryRead(ref reader, options, PropForecastId))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ForecastResponse
+		{
+			Acknowledged = propAcknowledged.Value
+,
+			ForecastId = propForecastId.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ForecastResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteProperty(options, PropForecastId, value.ForecastId);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ForecastResponseConverter))]
 public sealed partial class ForecastResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("acknowledged")]
 	public bool Acknowledged { get; init; }
-	[JsonInclude, JsonPropertyName("forecast_id")]
 	public string ForecastId { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/GetBucketsResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/GetBucketsResponse.g.cs
index 39a5dfa7a94..88eac819299 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/GetBucketsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/GetBucketsResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.MachineLearning;
 
+internal sealed partial class GetBucketsResponseConverter : System.Text.Json.Serialization.JsonConverter<GetBucketsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropBuckets = System.Text.Json.JsonEncodedText.Encode("buckets");
+	private static readonly System.Text.Json.JsonEncodedText PropCount = System.Text.Json.JsonEncodedText.Encode("count");
+
+	public override GetBucketsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.BucketSummary>> propBuckets = default;
+		LocalJsonProperty<long> propCount = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBuckets.TryRead(ref reader, options, PropBuckets))
+			{
+				continue;
+			}
+
+			if (propCount.TryRead(ref reader, options, PropCount))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetBucketsResponse
+		{
+			Buckets = propBuckets.Value
+,
+			Count = propCount.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetBucketsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBuckets, value.Buckets);
+		writer.WriteProperty(options, PropCount, value.Count);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetBucketsResponseConverter))]
 public sealed partial class GetBucketsResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("buckets")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.BucketSummary> Buckets { get; init; }
-	[JsonInclude, JsonPropertyName("count")]
 	public long Count { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/GetCalendarEventsResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/GetCalendarEventsResponse.g.cs
index e283a01a1d2..a09cba9e51b 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/GetCalendarEventsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/GetCalendarEventsResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.MachineLearning;
 
+internal sealed partial class GetCalendarEventsResponseConverter : System.Text.Json.Serialization.JsonConverter<GetCalendarEventsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCount = System.Text.Json.JsonEncodedText.Encode("count");
+	private static readonly System.Text.Json.JsonEncodedText PropEvents = System.Text.Json.JsonEncodedText.Encode("events");
+
+	public override GetCalendarEventsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<long> propCount = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.CalendarEvent>> propEvents = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCount.TryRead(ref reader, options, PropCount))
+			{
+				continue;
+			}
+
+			if (propEvents.TryRead(ref reader, options, PropEvents))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetCalendarEventsResponse
+		{
+			Count = propCount.Value
+,
+			Events = propEvents.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetCalendarEventsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCount, value.Count);
+		writer.WriteProperty(options, PropEvents, value.Events);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetCalendarEventsResponseConverter))]
 public sealed partial class GetCalendarEventsResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("count")]
 	public long Count { get; init; }
-	[JsonInclude, JsonPropertyName("events")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.CalendarEvent> Events { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/GetCalendarsResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/GetCalendarsResponse.g.cs
index afda50d69dd..6ab9a795284 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/GetCalendarsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/GetCalendarsResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.MachineLearning;
 
+internal sealed partial class GetCalendarsResponseConverter : System.Text.Json.Serialization.JsonConverter<GetCalendarsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCalendars = System.Text.Json.JsonEncodedText.Encode("calendars");
+	private static readonly System.Text.Json.JsonEncodedText PropCount = System.Text.Json.JsonEncodedText.Encode("count");
+
+	public override GetCalendarsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.Calendar>> propCalendars = default;
+		LocalJsonProperty<long> propCount = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCalendars.TryRead(ref reader, options, PropCalendars))
+			{
+				continue;
+			}
+
+			if (propCount.TryRead(ref reader, options, PropCount))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetCalendarsResponse
+		{
+			Calendars = propCalendars.Value
+,
+			Count = propCount.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetCalendarsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCalendars, value.Calendars);
+		writer.WriteProperty(options, PropCount, value.Count);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetCalendarsResponseConverter))]
 public sealed partial class GetCalendarsResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("calendars")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.Calendar> Calendars { get; init; }
-	[JsonInclude, JsonPropertyName("count")]
 	public long Count { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/GetCategoriesResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/GetCategoriesResponse.g.cs
index 024ea36bf85..5e299be4e78 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/GetCategoriesResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/GetCategoriesResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.MachineLearning;
 
+internal sealed partial class GetCategoriesResponseConverter : System.Text.Json.Serialization.JsonConverter<GetCategoriesResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCategories = System.Text.Json.JsonEncodedText.Encode("categories");
+	private static readonly System.Text.Json.JsonEncodedText PropCount = System.Text.Json.JsonEncodedText.Encode("count");
+
+	public override GetCategoriesResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.Category>> propCategories = default;
+		LocalJsonProperty<long> propCount = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCategories.TryRead(ref reader, options, PropCategories))
+			{
+				continue;
+			}
+
+			if (propCount.TryRead(ref reader, options, PropCount))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetCategoriesResponse
+		{
+			Categories = propCategories.Value
+,
+			Count = propCount.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetCategoriesResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCategories, value.Categories);
+		writer.WriteProperty(options, PropCount, value.Count);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetCategoriesResponseConverter))]
 public sealed partial class GetCategoriesResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("categories")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.Category> Categories { get; init; }
-	[JsonInclude, JsonPropertyName("count")]
 	public long Count { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/GetDataFrameAnalyticsResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/GetDataFrameAnalyticsResponse.g.cs
index 42dc76a3e59..c1ebf50cc2a 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/GetDataFrameAnalyticsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/GetDataFrameAnalyticsResponse.g.cs
@@ -18,17 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.MachineLearning;
 
+internal sealed partial class GetDataFrameAnalyticsResponseConverter : System.Text.Json.Serialization.JsonConverter<GetDataFrameAnalyticsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCount = System.Text.Json.JsonEncodedText.Encode("count");
+	private static readonly System.Text.Json.JsonEncodedText PropDataFrameAnalytics = System.Text.Json.JsonEncodedText.Encode("data_frame_analytics");
+
+	public override GetDataFrameAnalyticsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<int> propCount = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeAnalyticsSummary>> propDataFrameAnalytics = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCount.TryRead(ref reader, options, PropCount))
+			{
+				continue;
+			}
+
+			if (propDataFrameAnalytics.TryRead(ref reader, options, PropDataFrameAnalytics))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetDataFrameAnalyticsResponse
+		{
+			Count = propCount.Value
+,
+			DataFrameAnalytics = propDataFrameAnalytics.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetDataFrameAnalyticsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCount, value.Count);
+		writer.WriteProperty(options, PropDataFrameAnalytics, value.DataFrameAnalytics);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetDataFrameAnalyticsResponseConverter))]
 public sealed partial class GetDataFrameAnalyticsResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("count")]
 	public int Count { get; init; }
 
 	/// <summary>
@@ -36,6 +82,5 @@ public sealed partial class GetDataFrameAnalyticsResponse : ElasticsearchRespons
 	/// An array of data frame analytics job resources, which are sorted by the id value in ascending order.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("data_frame_analytics")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeAnalyticsSummary> DataFrameAnalytics { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/GetDataFrameAnalyticsStatsResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/GetDataFrameAnalyticsStatsResponse.g.cs
index 771939f5968..c35bed6d8fc 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/GetDataFrameAnalyticsStatsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/GetDataFrameAnalyticsStatsResponse.g.cs
@@ -18,17 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.MachineLearning;
 
+internal sealed partial class GetDataFrameAnalyticsStatsResponseConverter : System.Text.Json.Serialization.JsonConverter<GetDataFrameAnalyticsStatsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCount = System.Text.Json.JsonEncodedText.Encode("count");
+	private static readonly System.Text.Json.JsonEncodedText PropDataFrameAnalytics = System.Text.Json.JsonEncodedText.Encode("data_frame_analytics");
+
+	public override GetDataFrameAnalyticsStatsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<long> propCount = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeAnalytics>> propDataFrameAnalytics = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCount.TryRead(ref reader, options, PropCount))
+			{
+				continue;
+			}
+
+			if (propDataFrameAnalytics.TryRead(ref reader, options, PropDataFrameAnalytics))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetDataFrameAnalyticsStatsResponse
+		{
+			Count = propCount.Value
+,
+			DataFrameAnalytics = propDataFrameAnalytics.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetDataFrameAnalyticsStatsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCount, value.Count);
+		writer.WriteProperty(options, PropDataFrameAnalytics, value.DataFrameAnalytics);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetDataFrameAnalyticsStatsResponseConverter))]
 public sealed partial class GetDataFrameAnalyticsStatsResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("count")]
 	public long Count { get; init; }
 
 	/// <summary>
@@ -36,6 +82,5 @@ public sealed partial class GetDataFrameAnalyticsStatsResponse : ElasticsearchRe
 	/// An array of objects that contain usage information for data frame analytics jobs, which are sorted by the id value in ascending order.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("data_frame_analytics")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeAnalytics> DataFrameAnalytics { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/GetDatafeedStatsResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/GetDatafeedStatsResponse.g.cs
index cc43d913335..81149391815 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/GetDatafeedStatsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/GetDatafeedStatsResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.MachineLearning;
 
+internal sealed partial class GetDatafeedStatsResponseConverter : System.Text.Json.Serialization.JsonConverter<GetDatafeedStatsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCount = System.Text.Json.JsonEncodedText.Encode("count");
+	private static readonly System.Text.Json.JsonEncodedText PropDatafeeds = System.Text.Json.JsonEncodedText.Encode("datafeeds");
+
+	public override GetDatafeedStatsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<long> propCount = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DatafeedStats>> propDatafeeds = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCount.TryRead(ref reader, options, PropCount))
+			{
+				continue;
+			}
+
+			if (propDatafeeds.TryRead(ref reader, options, PropDatafeeds))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetDatafeedStatsResponse
+		{
+			Count = propCount.Value
+,
+			Datafeeds = propDatafeeds.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetDatafeedStatsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCount, value.Count);
+		writer.WriteProperty(options, PropDatafeeds, value.Datafeeds);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetDatafeedStatsResponseConverter))]
 public sealed partial class GetDatafeedStatsResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("count")]
 	public long Count { get; init; }
-	[JsonInclude, JsonPropertyName("datafeeds")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DatafeedStats> Datafeeds { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/GetDatafeedsResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/GetDatafeedsResponse.g.cs
index caa45e6562a..0b7ceb7dc56 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/GetDatafeedsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/GetDatafeedsResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.MachineLearning;
 
+internal sealed partial class GetDatafeedsResponseConverter : System.Text.Json.Serialization.JsonConverter<GetDatafeedsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCount = System.Text.Json.JsonEncodedText.Encode("count");
+	private static readonly System.Text.Json.JsonEncodedText PropDatafeeds = System.Text.Json.JsonEncodedText.Encode("datafeeds");
+
+	public override GetDatafeedsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<long> propCount = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.Datafeed>> propDatafeeds = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCount.TryRead(ref reader, options, PropCount))
+			{
+				continue;
+			}
+
+			if (propDatafeeds.TryRead(ref reader, options, PropDatafeeds))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetDatafeedsResponse
+		{
+			Count = propCount.Value
+,
+			Datafeeds = propDatafeeds.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetDatafeedsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCount, value.Count);
+		writer.WriteProperty(options, PropDatafeeds, value.Datafeeds);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetDatafeedsResponseConverter))]
 public sealed partial class GetDatafeedsResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("count")]
 	public long Count { get; init; }
-	[JsonInclude, JsonPropertyName("datafeeds")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.Datafeed> Datafeeds { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/GetFiltersResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/GetFiltersResponse.g.cs
index 428014f53fa..7a73fe87223 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/GetFiltersResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/GetFiltersResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.MachineLearning;
 
+internal sealed partial class GetFiltersResponseConverter : System.Text.Json.Serialization.JsonConverter<GetFiltersResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCount = System.Text.Json.JsonEncodedText.Encode("count");
+	private static readonly System.Text.Json.JsonEncodedText PropFilters = System.Text.Json.JsonEncodedText.Encode("filters");
+
+	public override GetFiltersResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<long> propCount = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.Filter>> propFilters = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCount.TryRead(ref reader, options, PropCount))
+			{
+				continue;
+			}
+
+			if (propFilters.TryRead(ref reader, options, PropFilters))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetFiltersResponse
+		{
+			Count = propCount.Value
+,
+			Filters = propFilters.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetFiltersResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCount, value.Count);
+		writer.WriteProperty(options, PropFilters, value.Filters);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetFiltersResponseConverter))]
 public sealed partial class GetFiltersResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("count")]
 	public long Count { get; init; }
-	[JsonInclude, JsonPropertyName("filters")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.Filter> Filters { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/GetInfluencersResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/GetInfluencersResponse.g.cs
index 3d09d58a4df..d45f15ed7ae 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/GetInfluencersResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/GetInfluencersResponse.g.cs
@@ -18,17 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.MachineLearning;
 
+internal sealed partial class GetInfluencersResponseConverter : System.Text.Json.Serialization.JsonConverter<GetInfluencersResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCount = System.Text.Json.JsonEncodedText.Encode("count");
+	private static readonly System.Text.Json.JsonEncodedText PropInfluencers = System.Text.Json.JsonEncodedText.Encode("influencers");
+
+	public override GetInfluencersResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<long> propCount = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.Influencer>> propInfluencers = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCount.TryRead(ref reader, options, PropCount))
+			{
+				continue;
+			}
+
+			if (propInfluencers.TryRead(ref reader, options, PropInfluencers))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetInfluencersResponse
+		{
+			Count = propCount.Value
+,
+			Influencers = propInfluencers.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetInfluencersResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCount, value.Count);
+		writer.WriteProperty(options, PropInfluencers, value.Influencers);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetInfluencersResponseConverter))]
 public sealed partial class GetInfluencersResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("count")]
 	public long Count { get; init; }
 
 	/// <summary>
@@ -36,6 +82,5 @@ public sealed partial class GetInfluencersResponse : ElasticsearchResponse
 	/// Array of influencer objects
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("influencers")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.Influencer> Influencers { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/GetJobStatsResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/GetJobStatsResponse.g.cs
index 52145377e72..f322ac3ccb0 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/GetJobStatsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/GetJobStatsResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.MachineLearning;
 
+internal sealed partial class GetJobStatsResponseConverter : System.Text.Json.Serialization.JsonConverter<GetJobStatsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCount = System.Text.Json.JsonEncodedText.Encode("count");
+	private static readonly System.Text.Json.JsonEncodedText PropJobs = System.Text.Json.JsonEncodedText.Encode("jobs");
+
+	public override GetJobStatsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<long> propCount = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.JobStats>> propJobs = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCount.TryRead(ref reader, options, PropCount))
+			{
+				continue;
+			}
+
+			if (propJobs.TryRead(ref reader, options, PropJobs))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetJobStatsResponse
+		{
+			Count = propCount.Value
+,
+			Jobs = propJobs.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetJobStatsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCount, value.Count);
+		writer.WriteProperty(options, PropJobs, value.Jobs);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetJobStatsResponseConverter))]
 public sealed partial class GetJobStatsResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("count")]
 	public long Count { get; init; }
-	[JsonInclude, JsonPropertyName("jobs")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.JobStats> Jobs { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/GetJobsResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/GetJobsResponse.g.cs
index c49c0f0fc55..c864fa4d783 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/GetJobsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/GetJobsResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.MachineLearning;
 
+internal sealed partial class GetJobsResponseConverter : System.Text.Json.Serialization.JsonConverter<GetJobsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCount = System.Text.Json.JsonEncodedText.Encode("count");
+	private static readonly System.Text.Json.JsonEncodedText PropJobs = System.Text.Json.JsonEncodedText.Encode("jobs");
+
+	public override GetJobsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<long> propCount = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.Job>> propJobs = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCount.TryRead(ref reader, options, PropCount))
+			{
+				continue;
+			}
+
+			if (propJobs.TryRead(ref reader, options, PropJobs))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetJobsResponse
+		{
+			Count = propCount.Value
+,
+			Jobs = propJobs.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetJobsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCount, value.Count);
+		writer.WriteProperty(options, PropJobs, value.Jobs);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetJobsResponseConverter))]
 public sealed partial class GetJobsResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("count")]
 	public long Count { get; init; }
-	[JsonInclude, JsonPropertyName("jobs")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.Job> Jobs { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/GetMemoryStatsResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/GetMemoryStatsResponse.g.cs
index 5160f398936..039dbb453bf 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/GetMemoryStatsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/GetMemoryStatsResponse.g.cs
@@ -18,20 +18,74 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.MachineLearning;
 
+internal sealed partial class GetMemoryStatsResponseConverter : System.Text.Json.Serialization.JsonConverter<GetMemoryStatsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropClusterName = System.Text.Json.JsonEncodedText.Encode("cluster_name");
+	private static readonly System.Text.Json.JsonEncodedText PropNodes = System.Text.Json.JsonEncodedText.Encode("nodes");
+	private static readonly System.Text.Json.JsonEncodedText PropNodeStatistics = System.Text.Json.JsonEncodedText.Encode("_nodes");
+
+	public override GetMemoryStatsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propClusterName = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.MachineLearning.Memory>> propNodes = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.NodeStatistics> propNodeStatistics = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propClusterName.TryRead(ref reader, options, PropClusterName))
+			{
+				continue;
+			}
+
+			if (propNodes.TryRead(ref reader, options, PropNodes))
+			{
+				continue;
+			}
+
+			if (propNodeStatistics.TryRead(ref reader, options, PropNodeStatistics))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetMemoryStatsResponse
+		{
+			ClusterName = propClusterName.Value
+,
+			Nodes = propNodes.Value
+,
+			NodeStatistics = propNodeStatistics.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetMemoryStatsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropClusterName, value.ClusterName);
+		writer.WriteProperty(options, PropNodes, value.Nodes);
+		writer.WriteProperty(options, PropNodeStatistics, value.NodeStatistics);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetMemoryStatsResponseConverter))]
 public sealed partial class GetMemoryStatsResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("cluster_name")]
 	public string ClusterName { get; init; }
-	[JsonInclude, JsonPropertyName("nodes")]
 	public IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.MachineLearning.Memory> Nodes { get; init; }
-	[JsonInclude, JsonPropertyName("_nodes")]
 	public Elastic.Clients.Elasticsearch.Serverless.NodeStatistics NodeStatistics { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/GetModelSnapshotUpgradeStatsResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/GetModelSnapshotUpgradeStatsResponse.g.cs
index da5c014af7e..2ae4d68a213 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/GetModelSnapshotUpgradeStatsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/GetModelSnapshotUpgradeStatsResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.MachineLearning;
 
+internal sealed partial class GetModelSnapshotUpgradeStatsResponseConverter : System.Text.Json.Serialization.JsonConverter<GetModelSnapshotUpgradeStatsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCount = System.Text.Json.JsonEncodedText.Encode("count");
+	private static readonly System.Text.Json.JsonEncodedText PropModelSnapshotUpgrades = System.Text.Json.JsonEncodedText.Encode("model_snapshot_upgrades");
+
+	public override GetModelSnapshotUpgradeStatsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<long> propCount = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.ModelSnapshotUpgrade>> propModelSnapshotUpgrades = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCount.TryRead(ref reader, options, PropCount))
+			{
+				continue;
+			}
+
+			if (propModelSnapshotUpgrades.TryRead(ref reader, options, PropModelSnapshotUpgrades))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetModelSnapshotUpgradeStatsResponse
+		{
+			Count = propCount.Value
+,
+			ModelSnapshotUpgrades = propModelSnapshotUpgrades.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetModelSnapshotUpgradeStatsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCount, value.Count);
+		writer.WriteProperty(options, PropModelSnapshotUpgrades, value.ModelSnapshotUpgrades);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetModelSnapshotUpgradeStatsResponseConverter))]
 public sealed partial class GetModelSnapshotUpgradeStatsResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("count")]
 	public long Count { get; init; }
-	[JsonInclude, JsonPropertyName("model_snapshot_upgrades")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.ModelSnapshotUpgrade> ModelSnapshotUpgrades { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/GetModelSnapshotsResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/GetModelSnapshotsResponse.g.cs
index 080fdc6766e..6efd1736d51 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/GetModelSnapshotsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/GetModelSnapshotsResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.MachineLearning;
 
+internal sealed partial class GetModelSnapshotsResponseConverter : System.Text.Json.Serialization.JsonConverter<GetModelSnapshotsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCount = System.Text.Json.JsonEncodedText.Encode("count");
+	private static readonly System.Text.Json.JsonEncodedText PropModelSnapshots = System.Text.Json.JsonEncodedText.Encode("model_snapshots");
+
+	public override GetModelSnapshotsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<long> propCount = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.ModelSnapshot>> propModelSnapshots = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCount.TryRead(ref reader, options, PropCount))
+			{
+				continue;
+			}
+
+			if (propModelSnapshots.TryRead(ref reader, options, PropModelSnapshots))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetModelSnapshotsResponse
+		{
+			Count = propCount.Value
+,
+			ModelSnapshots = propModelSnapshots.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetModelSnapshotsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCount, value.Count);
+		writer.WriteProperty(options, PropModelSnapshots, value.ModelSnapshots);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetModelSnapshotsResponseConverter))]
 public sealed partial class GetModelSnapshotsResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("count")]
 	public long Count { get; init; }
-	[JsonInclude, JsonPropertyName("model_snapshots")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.ModelSnapshot> ModelSnapshots { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/GetOverallBucketsResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/GetOverallBucketsResponse.g.cs
index f5d132ee50e..90e42d44ab2 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/GetOverallBucketsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/GetOverallBucketsResponse.g.cs
@@ -18,17 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.MachineLearning;
 
+internal sealed partial class GetOverallBucketsResponseConverter : System.Text.Json.Serialization.JsonConverter<GetOverallBucketsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCount = System.Text.Json.JsonEncodedText.Encode("count");
+	private static readonly System.Text.Json.JsonEncodedText PropOverallBuckets = System.Text.Json.JsonEncodedText.Encode("overall_buckets");
+
+	public override GetOverallBucketsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<long> propCount = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.OverallBucket>> propOverallBuckets = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCount.TryRead(ref reader, options, PropCount))
+			{
+				continue;
+			}
+
+			if (propOverallBuckets.TryRead(ref reader, options, PropOverallBuckets))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetOverallBucketsResponse
+		{
+			Count = propCount.Value
+,
+			OverallBuckets = propOverallBuckets.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetOverallBucketsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCount, value.Count);
+		writer.WriteProperty(options, PropOverallBuckets, value.OverallBuckets);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetOverallBucketsResponseConverter))]
 public sealed partial class GetOverallBucketsResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("count")]
 	public long Count { get; init; }
 
 	/// <summary>
@@ -36,6 +82,5 @@ public sealed partial class GetOverallBucketsResponse : ElasticsearchResponse
 	/// Array of overall bucket objects
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("overall_buckets")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.OverallBucket> OverallBuckets { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/GetRecordsResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/GetRecordsResponse.g.cs
index a7e647c1031..0447542c7ea 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/GetRecordsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/GetRecordsResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.MachineLearning;
 
+internal sealed partial class GetRecordsResponseConverter : System.Text.Json.Serialization.JsonConverter<GetRecordsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCount = System.Text.Json.JsonEncodedText.Encode("count");
+	private static readonly System.Text.Json.JsonEncodedText PropRecords = System.Text.Json.JsonEncodedText.Encode("records");
+
+	public override GetRecordsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<long> propCount = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.Anomaly>> propRecords = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCount.TryRead(ref reader, options, PropCount))
+			{
+				continue;
+			}
+
+			if (propRecords.TryRead(ref reader, options, PropRecords))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetRecordsResponse
+		{
+			Count = propCount.Value
+,
+			Records = propRecords.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetRecordsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCount, value.Count);
+		writer.WriteProperty(options, PropRecords, value.Records);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetRecordsResponseConverter))]
 public sealed partial class GetRecordsResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("count")]
 	public long Count { get; init; }
-	[JsonInclude, JsonPropertyName("records")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.Anomaly> Records { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/GetTrainedModelsResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/GetTrainedModelsResponse.g.cs
index cd391598dfc..c6a85b72331 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/GetTrainedModelsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/GetTrainedModelsResponse.g.cs
@@ -18,17 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.MachineLearning;
 
+internal sealed partial class GetTrainedModelsResponseConverter : System.Text.Json.Serialization.JsonConverter<GetTrainedModelsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCount = System.Text.Json.JsonEncodedText.Encode("count");
+	private static readonly System.Text.Json.JsonEncodedText PropTrainedModelConfigs = System.Text.Json.JsonEncodedText.Encode("trained_model_configs");
+
+	public override GetTrainedModelsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<int> propCount = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.TrainedModelConfig>> propTrainedModelConfigs = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCount.TryRead(ref reader, options, PropCount))
+			{
+				continue;
+			}
+
+			if (propTrainedModelConfigs.TryRead(ref reader, options, PropTrainedModelConfigs))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetTrainedModelsResponse
+		{
+			Count = propCount.Value
+,
+			TrainedModelConfigs = propTrainedModelConfigs.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetTrainedModelsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCount, value.Count);
+		writer.WriteProperty(options, PropTrainedModelConfigs, value.TrainedModelConfigs);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetTrainedModelsResponseConverter))]
 public sealed partial class GetTrainedModelsResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("count")]
 	public int Count { get; init; }
 
 	/// <summary>
@@ -36,6 +82,5 @@ public sealed partial class GetTrainedModelsResponse : ElasticsearchResponse
 	/// An array of trained model resources, which are sorted by the model_id value in ascending order.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("trained_model_configs")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.TrainedModelConfig> TrainedModelConfigs { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/GetTrainedModelsStatsResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/GetTrainedModelsStatsResponse.g.cs
index ae4dc05f018..52c0c1748a1 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/GetTrainedModelsStatsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/GetTrainedModelsStatsResponse.g.cs
@@ -18,14 +18,61 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.MachineLearning;
 
+internal sealed partial class GetTrainedModelsStatsResponseConverter : System.Text.Json.Serialization.JsonConverter<GetTrainedModelsStatsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCount = System.Text.Json.JsonEncodedText.Encode("count");
+	private static readonly System.Text.Json.JsonEncodedText PropTrainedModelStats = System.Text.Json.JsonEncodedText.Encode("trained_model_stats");
+
+	public override GetTrainedModelsStatsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<int> propCount = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.TrainedModelStats>> propTrainedModelStats = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCount.TryRead(ref reader, options, PropCount))
+			{
+				continue;
+			}
+
+			if (propTrainedModelStats.TryRead(ref reader, options, PropTrainedModelStats))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetTrainedModelsStatsResponse
+		{
+			Count = propCount.Value
+,
+			TrainedModelStats = propTrainedModelStats.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetTrainedModelsStatsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCount, value.Count);
+		writer.WriteProperty(options, PropTrainedModelStats, value.TrainedModelStats);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetTrainedModelsStatsResponseConverter))]
 public sealed partial class GetTrainedModelsStatsResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,7 +80,6 @@ public sealed partial class GetTrainedModelsStatsResponse : ElasticsearchRespons
 	/// The total number of trained model statistics that matched the requested ID patterns. Could be higher than the number of items in the trained_model_stats array as the size of the array is restricted by the supplied size parameter.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("count")]
 	public int Count { get; init; }
 
 	/// <summary>
@@ -41,6 +87,5 @@ public sealed partial class GetTrainedModelsStatsResponse : ElasticsearchRespons
 	/// An array of trained model statistics, which are sorted by the model_id value in ascending order.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("trained_model_stats")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.TrainedModelStats> TrainedModelStats { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/InferTrainedModelResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/InferTrainedModelResponse.g.cs
index 098482e4cab..3a29d6ea225 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/InferTrainedModelResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/InferTrainedModelResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.MachineLearning;
 
+internal sealed partial class InferTrainedModelResponseConverter : System.Text.Json.Serialization.JsonConverter<InferTrainedModelResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropInferenceResults = System.Text.Json.JsonEncodedText.Encode("inference_results");
+
+	public override InferTrainedModelResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.InferenceResponseResult>> propInferenceResults = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propInferenceResults.TryRead(ref reader, options, PropInferenceResults))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new InferTrainedModelResponse
+		{
+			InferenceResults = propInferenceResults.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, InferTrainedModelResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropInferenceResults, value.InferenceResults);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(InferTrainedModelResponseConverter))]
 public sealed partial class InferTrainedModelResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("inference_results")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.InferenceResponseResult> InferenceResults { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/MlInfoResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/MlInfoResponse.g.cs
index 259dbfea229..6e897619369 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/MlInfoResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/MlInfoResponse.g.cs
@@ -18,22 +18,85 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.MachineLearning;
 
+internal sealed partial class MlInfoResponseConverter : System.Text.Json.Serialization.JsonConverter<MlInfoResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropDefaults = System.Text.Json.JsonEncodedText.Encode("defaults");
+	private static readonly System.Text.Json.JsonEncodedText PropLimits = System.Text.Json.JsonEncodedText.Encode("limits");
+	private static readonly System.Text.Json.JsonEncodedText PropNativeCode = System.Text.Json.JsonEncodedText.Encode("native_code");
+	private static readonly System.Text.Json.JsonEncodedText PropUpgradeMode = System.Text.Json.JsonEncodedText.Encode("upgrade_mode");
+
+	public override MlInfoResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.Defaults> propDefaults = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.Limits> propLimits = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.NativeCode> propNativeCode = default;
+		LocalJsonProperty<bool> propUpgradeMode = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propDefaults.TryRead(ref reader, options, PropDefaults))
+			{
+				continue;
+			}
+
+			if (propLimits.TryRead(ref reader, options, PropLimits))
+			{
+				continue;
+			}
+
+			if (propNativeCode.TryRead(ref reader, options, PropNativeCode))
+			{
+				continue;
+			}
+
+			if (propUpgradeMode.TryRead(ref reader, options, PropUpgradeMode))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new MlInfoResponse
+		{
+			Defaults = propDefaults.Value
+,
+			Limits = propLimits.Value
+,
+			NativeCode = propNativeCode.Value
+,
+			UpgradeMode = propUpgradeMode.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, MlInfoResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDefaults, value.Defaults);
+		writer.WriteProperty(options, PropLimits, value.Limits);
+		writer.WriteProperty(options, PropNativeCode, value.NativeCode);
+		writer.WriteProperty(options, PropUpgradeMode, value.UpgradeMode);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(MlInfoResponseConverter))]
 public sealed partial class MlInfoResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("defaults")]
 	public Elastic.Clients.Elasticsearch.Serverless.MachineLearning.Defaults Defaults { get; init; }
-	[JsonInclude, JsonPropertyName("limits")]
 	public Elastic.Clients.Elasticsearch.Serverless.MachineLearning.Limits Limits { get; init; }
-	[JsonInclude, JsonPropertyName("native_code")]
 	public Elastic.Clients.Elasticsearch.Serverless.MachineLearning.NativeCode NativeCode { get; init; }
-	[JsonInclude, JsonPropertyName("upgrade_mode")]
 	public bool UpgradeMode { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/OpenJobResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/OpenJobResponse.g.cs
index cd43a5e3eda..a4f4a39d157 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/OpenJobResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/OpenJobResponse.g.cs
@@ -18,14 +18,61 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.MachineLearning;
 
+internal sealed partial class OpenJobResponseConverter : System.Text.Json.Serialization.JsonConverter<OpenJobResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropNode = System.Text.Json.JsonEncodedText.Encode("node");
+	private static readonly System.Text.Json.JsonEncodedText PropOpened = System.Text.Json.JsonEncodedText.Encode("opened");
+
+	public override OpenJobResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propNode = default;
+		LocalJsonProperty<bool> propOpened = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propNode.TryRead(ref reader, options, PropNode))
+			{
+				continue;
+			}
+
+			if (propOpened.TryRead(ref reader, options, PropOpened))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new OpenJobResponse
+		{
+			Node = propNode.Value
+,
+			Opened = propOpened.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, OpenJobResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropNode, value.Node);
+		writer.WriteProperty(options, PropOpened, value.Opened);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(OpenJobResponseConverter))]
 public sealed partial class OpenJobResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -34,8 +81,6 @@ public sealed partial class OpenJobResponse : ElasticsearchResponse
 	/// If the job is allowed to open lazily and has not yet been assigned to a node, this value is an empty string.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("node")]
 	public string Node { get; init; }
-	[JsonInclude, JsonPropertyName("opened")]
 	public bool Opened { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/PostCalendarEventsResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/PostCalendarEventsResponse.g.cs
index f667f11c4bb..ea49ecdcf57 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/PostCalendarEventsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/PostCalendarEventsResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.MachineLearning;
 
+internal sealed partial class PostCalendarEventsResponseConverter : System.Text.Json.Serialization.JsonConverter<PostCalendarEventsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropEvents = System.Text.Json.JsonEncodedText.Encode("events");
+
+	public override PostCalendarEventsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.CalendarEvent>> propEvents = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propEvents.TryRead(ref reader, options, PropEvents))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PostCalendarEventsResponse
+		{
+			Events = propEvents.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PostCalendarEventsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropEvents, value.Events);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PostCalendarEventsResponseConverter))]
 public sealed partial class PostCalendarEventsResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("events")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.CalendarEvent> Events { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/PreviewDataFrameAnalyticsResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/PreviewDataFrameAnalyticsResponse.g.cs
index aaa361ed3cb..9817ab57898 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/PreviewDataFrameAnalyticsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/PreviewDataFrameAnalyticsResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.MachineLearning;
 
+internal sealed partial class PreviewDataFrameAnalyticsResponseConverter : System.Text.Json.Serialization.JsonConverter<PreviewDataFrameAnalyticsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropFeatureValues = System.Text.Json.JsonEncodedText.Encode("feature_values");
+
+	public override PreviewDataFrameAnalyticsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<IReadOnlyDictionary<string, string>>> propFeatureValues = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propFeatureValues.TryRead(ref reader, options, PropFeatureValues))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PreviewDataFrameAnalyticsResponse
+		{
+			FeatureValues = propFeatureValues.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PreviewDataFrameAnalyticsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropFeatureValues, value.FeatureValues);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PreviewDataFrameAnalyticsResponseConverter))]
 public sealed partial class PreviewDataFrameAnalyticsResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class PreviewDataFrameAnalyticsResponse : ElasticsearchRes
 	/// An array of objects that contain feature name and value pairs. The features have been processed and indicate what will be sent to the model for training.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("feature_values")]
 	public IReadOnlyCollection<IReadOnlyDictionary<string, string>> FeatureValues { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/PutCalendarJobResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/PutCalendarJobResponse.g.cs
index b1d318b6602..84013fc93de 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/PutCalendarJobResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/PutCalendarJobResponse.g.cs
@@ -18,14 +18,71 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.MachineLearning;
 
+internal sealed partial class PutCalendarJobResponseConverter : System.Text.Json.Serialization.JsonConverter<PutCalendarJobResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCalendarId = System.Text.Json.JsonEncodedText.Encode("calendar_id");
+	private static readonly System.Text.Json.JsonEncodedText PropDescription = System.Text.Json.JsonEncodedText.Encode("description");
+	private static readonly System.Text.Json.JsonEncodedText PropJobIds = System.Text.Json.JsonEncodedText.Encode("job_ids");
+
+	public override PutCalendarJobResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propCalendarId = default;
+		LocalJsonProperty<string?> propDescription = default;
+		LocalJsonProperty<IReadOnlyCollection<string>> propJobIds = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCalendarId.TryRead(ref reader, options, PropCalendarId))
+			{
+				continue;
+			}
+
+			if (propDescription.TryRead(ref reader, options, PropDescription))
+			{
+				continue;
+			}
+
+			if (propJobIds.TryRead(ref reader, options, PropJobIds, typeof(SingleOrManyMarker<IReadOnlyCollection<string>, string>)))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutCalendarJobResponse
+		{
+			CalendarId = propCalendarId.Value
+,
+			Description = propDescription.Value
+,
+			JobIds = propJobIds.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutCalendarJobResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCalendarId, value.CalendarId);
+		writer.WriteProperty(options, PropDescription, value.Description);
+		writer.WriteProperty(options, PropJobIds, value.JobIds, typeof(SingleOrManyMarker<IReadOnlyCollection<string>, string>));
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PutCalendarJobResponseConverter))]
 public sealed partial class PutCalendarJobResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,7 +90,6 @@ public sealed partial class PutCalendarJobResponse : ElasticsearchResponse
 	/// A string that uniquely identifies a calendar.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("calendar_id")]
 	public string CalendarId { get; init; }
 
 	/// <summary>
@@ -41,7 +97,6 @@ public sealed partial class PutCalendarJobResponse : ElasticsearchResponse
 	/// A description of the calendar.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("description")]
 	public string? Description { get; init; }
 
 	/// <summary>
@@ -49,7 +104,5 @@ public sealed partial class PutCalendarJobResponse : ElasticsearchResponse
 	/// A list of anomaly detection job identifiers or group names.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("job_ids")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public IReadOnlyCollection<string> JobIds { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/PutCalendarResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/PutCalendarResponse.g.cs
index 6196799ffd7..1988a684b42 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/PutCalendarResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/PutCalendarResponse.g.cs
@@ -18,14 +18,71 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.MachineLearning;
 
+internal sealed partial class PutCalendarResponseConverter : System.Text.Json.Serialization.JsonConverter<PutCalendarResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCalendarId = System.Text.Json.JsonEncodedText.Encode("calendar_id");
+	private static readonly System.Text.Json.JsonEncodedText PropDescription = System.Text.Json.JsonEncodedText.Encode("description");
+	private static readonly System.Text.Json.JsonEncodedText PropJobIds = System.Text.Json.JsonEncodedText.Encode("job_ids");
+
+	public override PutCalendarResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propCalendarId = default;
+		LocalJsonProperty<string?> propDescription = default;
+		LocalJsonProperty<IReadOnlyCollection<string>> propJobIds = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCalendarId.TryRead(ref reader, options, PropCalendarId))
+			{
+				continue;
+			}
+
+			if (propDescription.TryRead(ref reader, options, PropDescription))
+			{
+				continue;
+			}
+
+			if (propJobIds.TryRead(ref reader, options, PropJobIds, typeof(SingleOrManyMarker<IReadOnlyCollection<string>, string>)))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutCalendarResponse
+		{
+			CalendarId = propCalendarId.Value
+,
+			Description = propDescription.Value
+,
+			JobIds = propJobIds.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutCalendarResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCalendarId, value.CalendarId);
+		writer.WriteProperty(options, PropDescription, value.Description);
+		writer.WriteProperty(options, PropJobIds, value.JobIds, typeof(SingleOrManyMarker<IReadOnlyCollection<string>, string>));
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PutCalendarResponseConverter))]
 public sealed partial class PutCalendarResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,7 +90,6 @@ public sealed partial class PutCalendarResponse : ElasticsearchResponse
 	/// A string that uniquely identifies a calendar.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("calendar_id")]
 	public string CalendarId { get; init; }
 
 	/// <summary>
@@ -41,7 +97,6 @@ public sealed partial class PutCalendarResponse : ElasticsearchResponse
 	/// A description of the calendar.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("description")]
 	public string? Description { get; init; }
 
 	/// <summary>
@@ -49,7 +104,5 @@ public sealed partial class PutCalendarResponse : ElasticsearchResponse
 	/// A list of anomaly detection job identifiers or group names.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("job_ids")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public IReadOnlyCollection<string> JobIds { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/PutDataFrameAnalyticsResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/PutDataFrameAnalyticsResponse.g.cs
index 60f90198ccf..c576b65bbe0 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/PutDataFrameAnalyticsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/PutDataFrameAnalyticsResponse.g.cs
@@ -18,40 +18,184 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.MachineLearning;
 
+internal sealed partial class PutDataFrameAnalyticsResponseConverter : System.Text.Json.Serialization.JsonConverter<PutDataFrameAnalyticsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAllowLazyStart = System.Text.Json.JsonEncodedText.Encode("allow_lazy_start");
+	private static readonly System.Text.Json.JsonEncodedText PropAnalysis = System.Text.Json.JsonEncodedText.Encode("analysis");
+	private static readonly System.Text.Json.JsonEncodedText PropAnalyzedFields = System.Text.Json.JsonEncodedText.Encode("analyzed_fields");
+	private static readonly System.Text.Json.JsonEncodedText PropAuthorization = System.Text.Json.JsonEncodedText.Encode("authorization");
+	private static readonly System.Text.Json.JsonEncodedText PropCreateTime = System.Text.Json.JsonEncodedText.Encode("create_time");
+	private static readonly System.Text.Json.JsonEncodedText PropDescription = System.Text.Json.JsonEncodedText.Encode("description");
+	private static readonly System.Text.Json.JsonEncodedText PropDest = System.Text.Json.JsonEncodedText.Encode("dest");
+	private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("id");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxNumThreads = System.Text.Json.JsonEncodedText.Encode("max_num_threads");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("_meta");
+	private static readonly System.Text.Json.JsonEncodedText PropModelMemoryLimit = System.Text.Json.JsonEncodedText.Encode("model_memory_limit");
+	private static readonly System.Text.Json.JsonEncodedText PropSource = System.Text.Json.JsonEncodedText.Encode("source");
+	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("version");
+
+	public override PutDataFrameAnalyticsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAllowLazyStart = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeAnalysis> propAnalysis = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeAnalysisAnalyzedFields?> propAnalyzedFields = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeAnalyticsAuthorization?> propAuthorization = default;
+		LocalJsonProperty<long> propCreateTime = default;
+		LocalJsonProperty<string?> propDescription = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeAnalyticsDestination> propDest = default;
+		LocalJsonProperty<string> propId = default;
+		LocalJsonProperty<int> propMaxNumThreads = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, object>?> propMeta = default;
+		LocalJsonProperty<string> propModelMemoryLimit = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeAnalyticsSource> propSource = default;
+		LocalJsonProperty<string> propVersion = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAllowLazyStart.TryRead(ref reader, options, PropAllowLazyStart))
+			{
+				continue;
+			}
+
+			if (propAnalysis.TryRead(ref reader, options, PropAnalysis))
+			{
+				continue;
+			}
+
+			if (propAnalyzedFields.TryRead(ref reader, options, PropAnalyzedFields))
+			{
+				continue;
+			}
+
+			if (propAuthorization.TryRead(ref reader, options, PropAuthorization))
+			{
+				continue;
+			}
+
+			if (propCreateTime.TryRead(ref reader, options, PropCreateTime))
+			{
+				continue;
+			}
+
+			if (propDescription.TryRead(ref reader, options, PropDescription))
+			{
+				continue;
+			}
+
+			if (propDest.TryRead(ref reader, options, PropDest))
+			{
+				continue;
+			}
+
+			if (propId.TryRead(ref reader, options, PropId))
+			{
+				continue;
+			}
+
+			if (propMaxNumThreads.TryRead(ref reader, options, PropMaxNumThreads))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propModelMemoryLimit.TryRead(ref reader, options, PropModelMemoryLimit))
+			{
+				continue;
+			}
+
+			if (propSource.TryRead(ref reader, options, PropSource))
+			{
+				continue;
+			}
+
+			if (propVersion.TryRead(ref reader, options, PropVersion))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutDataFrameAnalyticsResponse
+		{
+			AllowLazyStart = propAllowLazyStart.Value
+,
+			Analysis = propAnalysis.Value
+,
+			AnalyzedFields = propAnalyzedFields.Value
+,
+			Authorization = propAuthorization.Value
+,
+			CreateTime = propCreateTime.Value
+,
+			Description = propDescription.Value
+,
+			Dest = propDest.Value
+,
+			Id = propId.Value
+,
+			MaxNumThreads = propMaxNumThreads.Value
+,
+			Meta = propMeta.Value
+,
+			ModelMemoryLimit = propModelMemoryLimit.Value
+,
+			Source = propSource.Value
+,
+			Version = propVersion.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutDataFrameAnalyticsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAllowLazyStart, value.AllowLazyStart);
+		writer.WriteProperty(options, PropAnalysis, value.Analysis);
+		writer.WriteProperty(options, PropAnalyzedFields, value.AnalyzedFields);
+		writer.WriteProperty(options, PropAuthorization, value.Authorization);
+		writer.WriteProperty(options, PropCreateTime, value.CreateTime);
+		writer.WriteProperty(options, PropDescription, value.Description);
+		writer.WriteProperty(options, PropDest, value.Dest);
+		writer.WriteProperty(options, PropId, value.Id);
+		writer.WriteProperty(options, PropMaxNumThreads, value.MaxNumThreads);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropModelMemoryLimit, value.ModelMemoryLimit);
+		writer.WriteProperty(options, PropSource, value.Source);
+		writer.WriteProperty(options, PropVersion, value.Version);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PutDataFrameAnalyticsResponseConverter))]
 public sealed partial class PutDataFrameAnalyticsResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("allow_lazy_start")]
 	public bool AllowLazyStart { get; init; }
-	[JsonInclude, JsonPropertyName("analysis")]
 	public Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeAnalysis Analysis { get; init; }
-	[JsonInclude, JsonPropertyName("analyzed_fields")]
 	public Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeAnalysisAnalyzedFields? AnalyzedFields { get; init; }
-	[JsonInclude, JsonPropertyName("authorization")]
 	public Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeAnalyticsAuthorization? Authorization { get; init; }
-	[JsonInclude, JsonPropertyName("create_time")]
 	public long CreateTime { get; init; }
-	[JsonInclude, JsonPropertyName("description")]
 	public string? Description { get; init; }
-	[JsonInclude, JsonPropertyName("dest")]
 	public Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeAnalyticsDestination Dest { get; init; }
-	[JsonInclude, JsonPropertyName("id")]
 	public string Id { get; init; }
-	[JsonInclude, JsonPropertyName("max_num_threads")]
 	public int MaxNumThreads { get; init; }
-	[JsonInclude, JsonPropertyName("_meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
-	[JsonInclude, JsonPropertyName("model_memory_limit")]
 	public string ModelMemoryLimit { get; init; }
-	[JsonInclude, JsonPropertyName("source")]
 	public Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeAnalyticsSource Source { get; init; }
-	[JsonInclude, JsonPropertyName("version")]
 	public string Version { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/PutDatafeedRequest.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/PutDatafeedRequest.g.cs
index a37c4b8b3ae..0271ffc3085 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/PutDatafeedRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/PutDatafeedRequest.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Requests;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport;
@@ -56,194 +57,167 @@ public sealed partial class PutDatafeedRequestParameters : RequestParameters
 	public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
 }
 
-internal sealed partial class PutDatafeedRequestConverter : JsonConverter<PutDatafeedRequest>
+internal sealed partial class PutDatafeedRequestConverter : System.Text.Json.Serialization.JsonConverter<PutDatafeedRequest>
 {
-	public override PutDatafeedRequest Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations1 = System.Text.Json.JsonEncodedText.Encode("aggs");
+	private static readonly System.Text.Json.JsonEncodedText PropChunkingConfig = System.Text.Json.JsonEncodedText.Encode("chunking_config");
+	private static readonly System.Text.Json.JsonEncodedText PropDelayedDataCheckConfig = System.Text.Json.JsonEncodedText.Encode("delayed_data_check_config");
+	private static readonly System.Text.Json.JsonEncodedText PropFrequency = System.Text.Json.JsonEncodedText.Encode("frequency");
+	private static readonly System.Text.Json.JsonEncodedText PropHeaders = System.Text.Json.JsonEncodedText.Encode("headers");
+	private static readonly System.Text.Json.JsonEncodedText PropIndices = System.Text.Json.JsonEncodedText.Encode("indices");
+	private static readonly System.Text.Json.JsonEncodedText PropIndices1 = System.Text.Json.JsonEncodedText.Encode("indexes");
+	private static readonly System.Text.Json.JsonEncodedText PropIndicesOptions = System.Text.Json.JsonEncodedText.Encode("indices_options");
+	private static readonly System.Text.Json.JsonEncodedText PropJobId = System.Text.Json.JsonEncodedText.Encode("job_id");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxEmptySearches = System.Text.Json.JsonEncodedText.Encode("max_empty_searches");
+	private static readonly System.Text.Json.JsonEncodedText PropQuery = System.Text.Json.JsonEncodedText.Encode("query");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryDelay = System.Text.Json.JsonEncodedText.Encode("query_delay");
+	private static readonly System.Text.Json.JsonEncodedText PropRuntimeMappings = System.Text.Json.JsonEncodedText.Encode("runtime_mappings");
+	private static readonly System.Text.Json.JsonEncodedText PropScriptFields = System.Text.Json.JsonEncodedText.Encode("script_fields");
+	private static readonly System.Text.Json.JsonEncodedText PropScrollSize = System.Text.Json.JsonEncodedText.Encode("scroll_size");
+
+	public override PutDatafeedRequest Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		var variant = new PutDatafeedRequest();
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.Aggregation>?> propAggregations = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.ChunkingConfig?> propChunkingConfig = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DelayedDataCheckConfig?> propDelayedDataCheckConfig = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Duration?> propFrequency = default;
+		LocalJsonProperty<IDictionary<string, Union<string, ICollection<string>>>?> propHeaders = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Indices?> propIndices = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.IndicesOptions?> propIndicesOptions = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Id?> propJobId = default;
+		LocalJsonProperty<int?> propMaxEmptySearches = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query?> propQuery = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Duration?> propQueryDelay = default;
+		LocalJsonProperty<IDictionary<Elastic.Clients.Elasticsearch.Serverless.Field, Elastic.Clients.Elasticsearch.Serverless.Mapping.RuntimeField>?> propRuntimeMappings = default;
+		LocalJsonProperty<IDictionary<string, Elastic.Clients.Elasticsearch.Serverless.ScriptField>?> propScriptFields = default;
+		LocalJsonProperty<int?> propScrollSize = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propAggregations.TryRead(ref reader, options, PropAggregations) || propAggregations.TryRead(ref reader, options, PropAggregations1))
 			{
-				var property = reader.GetString();
-				if (property == "aggregations" || property == "aggs")
-				{
-					variant.Aggregations = JsonSerializer.Deserialize<IDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.Aggregation>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "chunking_config")
-				{
-					variant.ChunkingConfig = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.ChunkingConfig?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "delayed_data_check_config")
-				{
-					variant.DelayedDataCheckConfig = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DelayedDataCheckConfig?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "frequency")
-				{
-					variant.Frequency = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Duration?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "headers")
-				{
-					variant.Headers = JsonSerializer.Deserialize<IDictionary<string, Union<string, ICollection<string>>>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "indices" || property == "indexes")
-				{
-					variant.Indices = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Indices?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "indices_options")
-				{
-					variant.IndicesOptions = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.IndicesOptions?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "job_id")
-				{
-					variant.JobId = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Id?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "max_empty_searches")
-				{
-					variant.MaxEmptySearches = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "query")
-				{
-					variant.Query = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "query_delay")
-				{
-					variant.QueryDelay = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Duration?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "runtime_mappings")
-				{
-					variant.RuntimeMappings = JsonSerializer.Deserialize<IDictionary<Elastic.Clients.Elasticsearch.Serverless.Field, Elastic.Clients.Elasticsearch.Serverless.Mapping.RuntimeField>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "script_fields")
-				{
-					variant.ScriptFields = JsonSerializer.Deserialize<IDictionary<string, Elastic.Clients.Elasticsearch.Serverless.ScriptField>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "scroll_size")
-				{
-					variant.ScrollSize = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
+				continue;
 			}
-		}
 
-		return variant;
-	}
+			if (propChunkingConfig.TryRead(ref reader, options, PropChunkingConfig))
+			{
+				continue;
+			}
 
-	public override void Write(Utf8JsonWriter writer, PutDatafeedRequest value, JsonSerializerOptions options)
-	{
-		writer.WriteStartObject();
-		if (value.Aggregations is not null)
-		{
-			writer.WritePropertyName("aggregations");
-			JsonSerializer.Serialize(writer, value.Aggregations, options);
-		}
+			if (propDelayedDataCheckConfig.TryRead(ref reader, options, PropDelayedDataCheckConfig))
+			{
+				continue;
+			}
 
-		if (value.ChunkingConfig is not null)
-		{
-			writer.WritePropertyName("chunking_config");
-			JsonSerializer.Serialize(writer, value.ChunkingConfig, options);
-		}
+			if (propFrequency.TryRead(ref reader, options, PropFrequency))
+			{
+				continue;
+			}
 
-		if (value.DelayedDataCheckConfig is not null)
-		{
-			writer.WritePropertyName("delayed_data_check_config");
-			JsonSerializer.Serialize(writer, value.DelayedDataCheckConfig, options);
-		}
+			if (propHeaders.TryRead(ref reader, options, PropHeaders))
+			{
+				continue;
+			}
 
-		if (value.Frequency is not null)
-		{
-			writer.WritePropertyName("frequency");
-			JsonSerializer.Serialize(writer, value.Frequency, options);
-		}
+			if (propIndices.TryRead(ref reader, options, PropIndices) || propIndices.TryRead(ref reader, options, PropIndices1))
+			{
+				continue;
+			}
 
-		if (value.Headers is not null)
-		{
-			writer.WritePropertyName("headers");
-			JsonSerializer.Serialize(writer, value.Headers, options);
-		}
+			if (propIndicesOptions.TryRead(ref reader, options, PropIndicesOptions))
+			{
+				continue;
+			}
 
-		if (value.Indices is not null)
-		{
-			writer.WritePropertyName("indices");
-			JsonSerializer.Serialize(writer, value.Indices, options);
-		}
+			if (propJobId.TryRead(ref reader, options, PropJobId))
+			{
+				continue;
+			}
 
-		if (value.IndicesOptions is not null)
-		{
-			writer.WritePropertyName("indices_options");
-			JsonSerializer.Serialize(writer, value.IndicesOptions, options);
-		}
+			if (propMaxEmptySearches.TryRead(ref reader, options, PropMaxEmptySearches))
+			{
+				continue;
+			}
 
-		if (value.JobId is not null)
-		{
-			writer.WritePropertyName("job_id");
-			JsonSerializer.Serialize(writer, value.JobId, options);
-		}
+			if (propQuery.TryRead(ref reader, options, PropQuery))
+			{
+				continue;
+			}
 
-		if (value.MaxEmptySearches.HasValue)
-		{
-			writer.WritePropertyName("max_empty_searches");
-			writer.WriteNumberValue(value.MaxEmptySearches.Value);
-		}
+			if (propQueryDelay.TryRead(ref reader, options, PropQueryDelay))
+			{
+				continue;
+			}
 
-		if (value.Query is not null)
-		{
-			writer.WritePropertyName("query");
-			JsonSerializer.Serialize(writer, value.Query, options);
-		}
+			if (propRuntimeMappings.TryRead(ref reader, options, PropRuntimeMappings))
+			{
+				continue;
+			}
 
-		if (value.QueryDelay is not null)
-		{
-			writer.WritePropertyName("query_delay");
-			JsonSerializer.Serialize(writer, value.QueryDelay, options);
-		}
+			if (propScriptFields.TryRead(ref reader, options, PropScriptFields))
+			{
+				continue;
+			}
 
-		if (value.RuntimeMappings is not null)
-		{
-			writer.WritePropertyName("runtime_mappings");
-			JsonSerializer.Serialize(writer, value.RuntimeMappings, options);
-		}
+			if (propScrollSize.TryRead(ref reader, options, PropScrollSize))
+			{
+				continue;
+			}
 
-		if (value.ScriptFields is not null)
-		{
-			writer.WritePropertyName("script_fields");
-			JsonSerializer.Serialize(writer, value.ScriptFields, options);
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		if (value.ScrollSize.HasValue)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutDatafeedRequest
 		{
-			writer.WritePropertyName("scroll_size");
-			writer.WriteNumberValue(value.ScrollSize.Value);
-		}
+			Aggregations = propAggregations.Value
+	,
+			ChunkingConfig = propChunkingConfig.Value
+	,
+			DelayedDataCheckConfig = propDelayedDataCheckConfig.Value
+	,
+			Frequency = propFrequency.Value
+	,
+			Headers = propHeaders.Value
+	,
+			Indices = propIndices.Value
+	,
+			IndicesOptions = propIndicesOptions.Value
+	,
+			JobId = propJobId.Value
+	,
+			MaxEmptySearches = propMaxEmptySearches.Value
+	,
+			Query = propQuery.Value
+	,
+			QueryDelay = propQueryDelay.Value
+	,
+			RuntimeMappings = propRuntimeMappings.Value
+	,
+			ScriptFields = propScriptFields.Value
+	,
+			ScrollSize = propScrollSize.Value
+		};
+	}
 
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutDatafeedRequest value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAggregations, value.Aggregations);
+		writer.WriteProperty(options, PropChunkingConfig, value.ChunkingConfig);
+		writer.WriteProperty(options, PropDelayedDataCheckConfig, value.DelayedDataCheckConfig);
+		writer.WriteProperty(options, PropFrequency, value.Frequency);
+		writer.WriteProperty(options, PropHeaders, value.Headers);
+		writer.WriteProperty(options, PropIndices, value.Indices);
+		writer.WriteProperty(options, PropIndicesOptions, value.IndicesOptions);
+		writer.WriteProperty(options, PropJobId, value.JobId);
+		writer.WriteProperty(options, PropMaxEmptySearches, value.MaxEmptySearches);
+		writer.WriteProperty(options, PropQuery, value.Query);
+		writer.WriteProperty(options, PropQueryDelay, value.QueryDelay);
+		writer.WriteProperty(options, PropRuntimeMappings, value.RuntimeMappings);
+		writer.WriteProperty(options, PropScriptFields, value.ScriptFields);
+		writer.WriteProperty(options, PropScrollSize, value.ScrollSize);
 		writer.WriteEndObject();
 	}
 }
@@ -289,7 +263,6 @@ public PutDatafeedRequest()
 	/// string or when no indices are specified.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public bool? AllowNoIndices { get => Q<bool?>("allow_no_indices"); set => Q("allow_no_indices", value); }
 
 	/// <summary>
@@ -298,7 +271,6 @@ public PutDatafeedRequest()
 	/// whether wildcard expressions match hidden data streams. Supports comma-separated values.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.ExpandWildcard>? ExpandWildcards { get => Q<ICollection<Elastic.Clients.Elasticsearch.Serverless.ExpandWildcard>?>("expand_wildcards"); set => Q("expand_wildcards", value); }
 
 	/// <summary>
@@ -306,7 +278,6 @@ public PutDatafeedRequest()
 	/// If true, unavailable indices (missing or closed) are ignored.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
 
 	/// <summary>
@@ -315,7 +286,6 @@ public PutDatafeedRequest()
 	/// Support for aggregations is limited and should be used only with low cardinality data.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("aggregations")]
 	public IDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.Aggregation>? Aggregations { get; set; }
 
 	/// <summary>
@@ -326,7 +296,6 @@ public PutDatafeedRequest()
 	/// it is an advanced configuration option.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("chunking_config")]
 	public Elastic.Clients.Elasticsearch.Serverless.MachineLearning.ChunkingConfig? ChunkingConfig { get; set; }
 
 	/// <summary>
@@ -338,7 +307,6 @@ public PutDatafeedRequest()
 	/// This check runs only on real-time datafeeds.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("delayed_data_check_config")]
 	public Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DelayedDataCheckConfig? DelayedDataCheckConfig { get; set; }
 
 	/// <summary>
@@ -350,9 +318,7 @@ public PutDatafeedRequest()
 	/// aggregations, this value must be divisible by the interval of the date histogram aggregation.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("frequency")]
 	public Elastic.Clients.Elasticsearch.Serverless.Duration? Frequency { get; set; }
-	[JsonInclude, JsonPropertyName("headers")]
 	public IDictionary<string, Union<string, ICollection<string>>>? Headers { get; set; }
 
 	/// <summary>
@@ -361,7 +327,6 @@ public PutDatafeedRequest()
 	/// learning nodes must have the <c>remote_cluster_client</c> role.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("indices")]
 	public Elastic.Clients.Elasticsearch.Serverless.Indices? Indices { get; set; }
 
 	/// <summary>
@@ -369,7 +334,6 @@ public PutDatafeedRequest()
 	/// Specifies index expansion options that are used during search
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("indices_options")]
 	public Elastic.Clients.Elasticsearch.Serverless.IndicesOptions? IndicesOptions { get; set; }
 
 	/// <summary>
@@ -377,7 +341,6 @@ public PutDatafeedRequest()
 	/// Identifier for the anomaly detection job.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("job_id")]
 	public Elastic.Clients.Elasticsearch.Serverless.Id? JobId { get; set; }
 
 	/// <summary>
@@ -388,7 +351,6 @@ public PutDatafeedRequest()
 	/// end time that sees no data remains started until it is explicitly stopped. By default, it is not set.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("max_empty_searches")]
 	public int? MaxEmptySearches { get; set; }
 
 	/// <summary>
@@ -398,7 +360,6 @@ public PutDatafeedRequest()
 	/// object is passed verbatim to Elasticsearch.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("query")]
 	public Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query? Query { get; set; }
 
 	/// <summary>
@@ -409,7 +370,6 @@ public PutDatafeedRequest()
 	/// when there are multiple jobs running on the same node.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("query_delay")]
 	public Elastic.Clients.Elasticsearch.Serverless.Duration? QueryDelay { get; set; }
 
 	/// <summary>
@@ -417,7 +377,6 @@ public PutDatafeedRequest()
 	/// Specifies runtime fields for the datafeed search.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("runtime_mappings")]
 	public IDictionary<Elastic.Clients.Elasticsearch.Serverless.Field, Elastic.Clients.Elasticsearch.Serverless.Mapping.RuntimeField>? RuntimeMappings { get; set; }
 
 	/// <summary>
@@ -426,7 +385,6 @@ public PutDatafeedRequest()
 	/// The detector configuration objects in a job can contain functions that use these script fields.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("script_fields")]
 	public IDictionary<string, Elastic.Clients.Elasticsearch.Serverless.ScriptField>? ScriptFields { get; set; }
 
 	/// <summary>
@@ -435,7 +393,6 @@ public PutDatafeedRequest()
 	/// The maximum value is the value of <c>index.max_result_window</c>, which is 10,000 by default.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("scroll_size")]
 	public int? ScrollSize { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/PutDatafeedResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/PutDatafeedResponse.g.cs
index ddabcb1e4ee..2fdf48bb548 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/PutDatafeedResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/PutDatafeedResponse.g.cs
@@ -18,44 +18,206 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.MachineLearning;
 
+internal sealed partial class PutDatafeedResponseConverter : System.Text.Json.Serialization.JsonConverter<PutDatafeedResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropAuthorization = System.Text.Json.JsonEncodedText.Encode("authorization");
+	private static readonly System.Text.Json.JsonEncodedText PropChunkingConfig = System.Text.Json.JsonEncodedText.Encode("chunking_config");
+	private static readonly System.Text.Json.JsonEncodedText PropDatafeedId = System.Text.Json.JsonEncodedText.Encode("datafeed_id");
+	private static readonly System.Text.Json.JsonEncodedText PropDelayedDataCheckConfig = System.Text.Json.JsonEncodedText.Encode("delayed_data_check_config");
+	private static readonly System.Text.Json.JsonEncodedText PropFrequency = System.Text.Json.JsonEncodedText.Encode("frequency");
+	private static readonly System.Text.Json.JsonEncodedText PropIndices = System.Text.Json.JsonEncodedText.Encode("indices");
+	private static readonly System.Text.Json.JsonEncodedText PropIndicesOptions = System.Text.Json.JsonEncodedText.Encode("indices_options");
+	private static readonly System.Text.Json.JsonEncodedText PropJobId = System.Text.Json.JsonEncodedText.Encode("job_id");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxEmptySearches = System.Text.Json.JsonEncodedText.Encode("max_empty_searches");
+	private static readonly System.Text.Json.JsonEncodedText PropQuery = System.Text.Json.JsonEncodedText.Encode("query");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryDelay = System.Text.Json.JsonEncodedText.Encode("query_delay");
+	private static readonly System.Text.Json.JsonEncodedText PropRuntimeMappings = System.Text.Json.JsonEncodedText.Encode("runtime_mappings");
+	private static readonly System.Text.Json.JsonEncodedText PropScriptFields = System.Text.Json.JsonEncodedText.Encode("script_fields");
+	private static readonly System.Text.Json.JsonEncodedText PropScrollSize = System.Text.Json.JsonEncodedText.Encode("scroll_size");
+
+	public override PutDatafeedResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.Aggregation>?> propAggregations = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DatafeedAuthorization?> propAuthorization = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.ChunkingConfig> propChunkingConfig = default;
+		LocalJsonProperty<string> propDatafeedId = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DelayedDataCheckConfig?> propDelayedDataCheckConfig = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Duration?> propFrequency = default;
+		LocalJsonProperty<IReadOnlyCollection<string>> propIndices = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.IndicesOptions?> propIndicesOptions = default;
+		LocalJsonProperty<string> propJobId = default;
+		LocalJsonProperty<int?> propMaxEmptySearches = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query> propQuery = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Duration> propQueryDelay = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Mapping.RuntimeField>?> propRuntimeMappings = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.ScriptField>?> propScriptFields = default;
+		LocalJsonProperty<int> propScrollSize = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAggregations.TryRead(ref reader, options, PropAggregations))
+			{
+				continue;
+			}
+
+			if (propAuthorization.TryRead(ref reader, options, PropAuthorization))
+			{
+				continue;
+			}
+
+			if (propChunkingConfig.TryRead(ref reader, options, PropChunkingConfig))
+			{
+				continue;
+			}
+
+			if (propDatafeedId.TryRead(ref reader, options, PropDatafeedId))
+			{
+				continue;
+			}
+
+			if (propDelayedDataCheckConfig.TryRead(ref reader, options, PropDelayedDataCheckConfig))
+			{
+				continue;
+			}
+
+			if (propFrequency.TryRead(ref reader, options, PropFrequency))
+			{
+				continue;
+			}
+
+			if (propIndices.TryRead(ref reader, options, PropIndices))
+			{
+				continue;
+			}
+
+			if (propIndicesOptions.TryRead(ref reader, options, PropIndicesOptions))
+			{
+				continue;
+			}
+
+			if (propJobId.TryRead(ref reader, options, PropJobId))
+			{
+				continue;
+			}
+
+			if (propMaxEmptySearches.TryRead(ref reader, options, PropMaxEmptySearches))
+			{
+				continue;
+			}
+
+			if (propQuery.TryRead(ref reader, options, PropQuery))
+			{
+				continue;
+			}
+
+			if (propQueryDelay.TryRead(ref reader, options, PropQueryDelay))
+			{
+				continue;
+			}
+
+			if (propRuntimeMappings.TryRead(ref reader, options, PropRuntimeMappings))
+			{
+				continue;
+			}
+
+			if (propScriptFields.TryRead(ref reader, options, PropScriptFields))
+			{
+				continue;
+			}
+
+			if (propScrollSize.TryRead(ref reader, options, PropScrollSize))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutDatafeedResponse
+		{
+			Aggregations = propAggregations.Value
+,
+			Authorization = propAuthorization.Value
+,
+			ChunkingConfig = propChunkingConfig.Value
+,
+			DatafeedId = propDatafeedId.Value
+,
+			DelayedDataCheckConfig = propDelayedDataCheckConfig.Value
+,
+			Frequency = propFrequency.Value
+,
+			Indices = propIndices.Value
+,
+			IndicesOptions = propIndicesOptions.Value
+,
+			JobId = propJobId.Value
+,
+			MaxEmptySearches = propMaxEmptySearches.Value
+,
+			Query = propQuery.Value
+,
+			QueryDelay = propQueryDelay.Value
+,
+			RuntimeMappings = propRuntimeMappings.Value
+,
+			ScriptFields = propScriptFields.Value
+,
+			ScrollSize = propScrollSize.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutDatafeedResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAggregations, value.Aggregations);
+		writer.WriteProperty(options, PropAuthorization, value.Authorization);
+		writer.WriteProperty(options, PropChunkingConfig, value.ChunkingConfig);
+		writer.WriteProperty(options, PropDatafeedId, value.DatafeedId);
+		writer.WriteProperty(options, PropDelayedDataCheckConfig, value.DelayedDataCheckConfig);
+		writer.WriteProperty(options, PropFrequency, value.Frequency);
+		writer.WriteProperty(options, PropIndices, value.Indices);
+		writer.WriteProperty(options, PropIndicesOptions, value.IndicesOptions);
+		writer.WriteProperty(options, PropJobId, value.JobId);
+		writer.WriteProperty(options, PropMaxEmptySearches, value.MaxEmptySearches);
+		writer.WriteProperty(options, PropQuery, value.Query);
+		writer.WriteProperty(options, PropQueryDelay, value.QueryDelay);
+		writer.WriteProperty(options, PropRuntimeMappings, value.RuntimeMappings);
+		writer.WriteProperty(options, PropScriptFields, value.ScriptFields);
+		writer.WriteProperty(options, PropScrollSize, value.ScrollSize);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PutDatafeedResponseConverter))]
 public sealed partial class PutDatafeedResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("aggregations")]
 	public IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.Aggregation>? Aggregations { get; init; }
-	[JsonInclude, JsonPropertyName("authorization")]
 	public Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DatafeedAuthorization? Authorization { get; init; }
-	[JsonInclude, JsonPropertyName("chunking_config")]
 	public Elastic.Clients.Elasticsearch.Serverless.MachineLearning.ChunkingConfig ChunkingConfig { get; init; }
-	[JsonInclude, JsonPropertyName("datafeed_id")]
 	public string DatafeedId { get; init; }
-	[JsonInclude, JsonPropertyName("delayed_data_check_config")]
 	public Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DelayedDataCheckConfig? DelayedDataCheckConfig { get; init; }
-	[JsonInclude, JsonPropertyName("frequency")]
 	public Elastic.Clients.Elasticsearch.Serverless.Duration? Frequency { get; init; }
-	[JsonInclude, JsonPropertyName("indices")]
 	public IReadOnlyCollection<string> Indices { get; init; }
-	[JsonInclude, JsonPropertyName("indices_options")]
 	public Elastic.Clients.Elasticsearch.Serverless.IndicesOptions? IndicesOptions { get; init; }
-	[JsonInclude, JsonPropertyName("job_id")]
 	public string JobId { get; init; }
-	[JsonInclude, JsonPropertyName("max_empty_searches")]
 	public int? MaxEmptySearches { get; init; }
-	[JsonInclude, JsonPropertyName("query")]
 	public Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query Query { get; init; }
-	[JsonInclude, JsonPropertyName("query_delay")]
 	public Elastic.Clients.Elasticsearch.Serverless.Duration QueryDelay { get; init; }
-	[JsonInclude, JsonPropertyName("runtime_mappings")]
 	public IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Mapping.RuntimeField>? RuntimeMappings { get; init; }
-	[JsonInclude, JsonPropertyName("script_fields")]
 	public IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.ScriptField>? ScriptFields { get; init; }
-	[JsonInclude, JsonPropertyName("scroll_size")]
 	public int ScrollSize { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/PutFilterResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/PutFilterResponse.g.cs
index 20f12bc44f0..a96ca88a343 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/PutFilterResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/PutFilterResponse.g.cs
@@ -18,20 +18,74 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.MachineLearning;
 
+internal sealed partial class PutFilterResponseConverter : System.Text.Json.Serialization.JsonConverter<PutFilterResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropDescription = System.Text.Json.JsonEncodedText.Encode("description");
+	private static readonly System.Text.Json.JsonEncodedText PropFilterId = System.Text.Json.JsonEncodedText.Encode("filter_id");
+	private static readonly System.Text.Json.JsonEncodedText PropItems = System.Text.Json.JsonEncodedText.Encode("items");
+
+	public override PutFilterResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propDescription = default;
+		LocalJsonProperty<string> propFilterId = default;
+		LocalJsonProperty<IReadOnlyCollection<string>> propItems = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propDescription.TryRead(ref reader, options, PropDescription))
+			{
+				continue;
+			}
+
+			if (propFilterId.TryRead(ref reader, options, PropFilterId))
+			{
+				continue;
+			}
+
+			if (propItems.TryRead(ref reader, options, PropItems))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutFilterResponse
+		{
+			Description = propDescription.Value
+,
+			FilterId = propFilterId.Value
+,
+			Items = propItems.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutFilterResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDescription, value.Description);
+		writer.WriteProperty(options, PropFilterId, value.FilterId);
+		writer.WriteProperty(options, PropItems, value.Items);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PutFilterResponseConverter))]
 public sealed partial class PutFilterResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("description")]
 	public string Description { get; init; }
-	[JsonInclude, JsonPropertyName("filter_id")]
 	public string FilterId { get; init; }
-	[JsonInclude, JsonPropertyName("items")]
 	public IReadOnlyCollection<string> Items { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/PutJobResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/PutJobResponse.g.cs
index 4046c33265f..02e9513411b 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/PutJobResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/PutJobResponse.g.cs
@@ -18,54 +18,261 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.MachineLearning;
 
+internal sealed partial class PutJobResponseConverter : System.Text.Json.Serialization.JsonConverter<PutJobResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAllowLazyOpen = System.Text.Json.JsonEncodedText.Encode("allow_lazy_open");
+	private static readonly System.Text.Json.JsonEncodedText PropAnalysisConfig = System.Text.Json.JsonEncodedText.Encode("analysis_config");
+	private static readonly System.Text.Json.JsonEncodedText PropAnalysisLimits = System.Text.Json.JsonEncodedText.Encode("analysis_limits");
+	private static readonly System.Text.Json.JsonEncodedText PropBackgroundPersistInterval = System.Text.Json.JsonEncodedText.Encode("background_persist_interval");
+	private static readonly System.Text.Json.JsonEncodedText PropCreateTime = System.Text.Json.JsonEncodedText.Encode("create_time");
+	private static readonly System.Text.Json.JsonEncodedText PropCustomSettings = System.Text.Json.JsonEncodedText.Encode("custom_settings");
+	private static readonly System.Text.Json.JsonEncodedText PropDailyModelSnapshotRetentionAfterDays = System.Text.Json.JsonEncodedText.Encode("daily_model_snapshot_retention_after_days");
+	private static readonly System.Text.Json.JsonEncodedText PropDataDescription = System.Text.Json.JsonEncodedText.Encode("data_description");
+	private static readonly System.Text.Json.JsonEncodedText PropDatafeedConfig = System.Text.Json.JsonEncodedText.Encode("datafeed_config");
+	private static readonly System.Text.Json.JsonEncodedText PropDescription = System.Text.Json.JsonEncodedText.Encode("description");
+	private static readonly System.Text.Json.JsonEncodedText PropGroups = System.Text.Json.JsonEncodedText.Encode("groups");
+	private static readonly System.Text.Json.JsonEncodedText PropJobId = System.Text.Json.JsonEncodedText.Encode("job_id");
+	private static readonly System.Text.Json.JsonEncodedText PropJobType = System.Text.Json.JsonEncodedText.Encode("job_type");
+	private static readonly System.Text.Json.JsonEncodedText PropJobVersion = System.Text.Json.JsonEncodedText.Encode("job_version");
+	private static readonly System.Text.Json.JsonEncodedText PropModelPlotConfig = System.Text.Json.JsonEncodedText.Encode("model_plot_config");
+	private static readonly System.Text.Json.JsonEncodedText PropModelSnapshotId = System.Text.Json.JsonEncodedText.Encode("model_snapshot_id");
+	private static readonly System.Text.Json.JsonEncodedText PropModelSnapshotRetentionDays = System.Text.Json.JsonEncodedText.Encode("model_snapshot_retention_days");
+	private static readonly System.Text.Json.JsonEncodedText PropRenormalizationWindowDays = System.Text.Json.JsonEncodedText.Encode("renormalization_window_days");
+	private static readonly System.Text.Json.JsonEncodedText PropResultsIndexName = System.Text.Json.JsonEncodedText.Encode("results_index_name");
+	private static readonly System.Text.Json.JsonEncodedText PropResultsRetentionDays = System.Text.Json.JsonEncodedText.Encode("results_retention_days");
+
+	public override PutJobResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAllowLazyOpen = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.AnalysisConfigRead> propAnalysisConfig = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.AnalysisLimits> propAnalysisLimits = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Duration?> propBackgroundPersistInterval = default;
+		LocalJsonProperty<DateTimeOffset> propCreateTime = default;
+		LocalJsonProperty<object?> propCustomSettings = default;
+		LocalJsonProperty<long> propDailyModelSnapshotRetentionAfterDays = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataDescription> propDataDescription = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.Datafeed?> propDatafeedConfig = default;
+		LocalJsonProperty<string?> propDescription = default;
+		LocalJsonProperty<IReadOnlyCollection<string>?> propGroups = default;
+		LocalJsonProperty<string> propJobId = default;
+		LocalJsonProperty<string> propJobType = default;
+		LocalJsonProperty<string> propJobVersion = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.ModelPlotConfig?> propModelPlotConfig = default;
+		LocalJsonProperty<string?> propModelSnapshotId = default;
+		LocalJsonProperty<long> propModelSnapshotRetentionDays = default;
+		LocalJsonProperty<long?> propRenormalizationWindowDays = default;
+		LocalJsonProperty<string> propResultsIndexName = default;
+		LocalJsonProperty<long?> propResultsRetentionDays = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAllowLazyOpen.TryRead(ref reader, options, PropAllowLazyOpen))
+			{
+				continue;
+			}
+
+			if (propAnalysisConfig.TryRead(ref reader, options, PropAnalysisConfig))
+			{
+				continue;
+			}
+
+			if (propAnalysisLimits.TryRead(ref reader, options, PropAnalysisLimits))
+			{
+				continue;
+			}
+
+			if (propBackgroundPersistInterval.TryRead(ref reader, options, PropBackgroundPersistInterval))
+			{
+				continue;
+			}
+
+			if (propCreateTime.TryRead(ref reader, options, PropCreateTime))
+			{
+				continue;
+			}
+
+			if (propCustomSettings.TryRead(ref reader, options, PropCustomSettings))
+			{
+				continue;
+			}
+
+			if (propDailyModelSnapshotRetentionAfterDays.TryRead(ref reader, options, PropDailyModelSnapshotRetentionAfterDays))
+			{
+				continue;
+			}
+
+			if (propDataDescription.TryRead(ref reader, options, PropDataDescription))
+			{
+				continue;
+			}
+
+			if (propDatafeedConfig.TryRead(ref reader, options, PropDatafeedConfig))
+			{
+				continue;
+			}
+
+			if (propDescription.TryRead(ref reader, options, PropDescription))
+			{
+				continue;
+			}
+
+			if (propGroups.TryRead(ref reader, options, PropGroups))
+			{
+				continue;
+			}
+
+			if (propJobId.TryRead(ref reader, options, PropJobId))
+			{
+				continue;
+			}
+
+			if (propJobType.TryRead(ref reader, options, PropJobType))
+			{
+				continue;
+			}
+
+			if (propJobVersion.TryRead(ref reader, options, PropJobVersion))
+			{
+				continue;
+			}
+
+			if (propModelPlotConfig.TryRead(ref reader, options, PropModelPlotConfig))
+			{
+				continue;
+			}
+
+			if (propModelSnapshotId.TryRead(ref reader, options, PropModelSnapshotId))
+			{
+				continue;
+			}
+
+			if (propModelSnapshotRetentionDays.TryRead(ref reader, options, PropModelSnapshotRetentionDays))
+			{
+				continue;
+			}
+
+			if (propRenormalizationWindowDays.TryRead(ref reader, options, PropRenormalizationWindowDays))
+			{
+				continue;
+			}
+
+			if (propResultsIndexName.TryRead(ref reader, options, PropResultsIndexName))
+			{
+				continue;
+			}
+
+			if (propResultsRetentionDays.TryRead(ref reader, options, PropResultsRetentionDays))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutJobResponse
+		{
+			AllowLazyOpen = propAllowLazyOpen.Value
+,
+			AnalysisConfig = propAnalysisConfig.Value
+,
+			AnalysisLimits = propAnalysisLimits.Value
+,
+			BackgroundPersistInterval = propBackgroundPersistInterval.Value
+,
+			CreateTime = propCreateTime.Value
+,
+			CustomSettings = propCustomSettings.Value
+,
+			DailyModelSnapshotRetentionAfterDays = propDailyModelSnapshotRetentionAfterDays.Value
+,
+			DataDescription = propDataDescription.Value
+,
+			DatafeedConfig = propDatafeedConfig.Value
+,
+			Description = propDescription.Value
+,
+			Groups = propGroups.Value
+,
+			JobId = propJobId.Value
+,
+			JobType = propJobType.Value
+,
+			JobVersion = propJobVersion.Value
+,
+			ModelPlotConfig = propModelPlotConfig.Value
+,
+			ModelSnapshotId = propModelSnapshotId.Value
+,
+			ModelSnapshotRetentionDays = propModelSnapshotRetentionDays.Value
+,
+			RenormalizationWindowDays = propRenormalizationWindowDays.Value
+,
+			ResultsIndexName = propResultsIndexName.Value
+,
+			ResultsRetentionDays = propResultsRetentionDays.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutJobResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAllowLazyOpen, value.AllowLazyOpen);
+		writer.WriteProperty(options, PropAnalysisConfig, value.AnalysisConfig);
+		writer.WriteProperty(options, PropAnalysisLimits, value.AnalysisLimits);
+		writer.WriteProperty(options, PropBackgroundPersistInterval, value.BackgroundPersistInterval);
+		writer.WriteProperty(options, PropCreateTime, value.CreateTime);
+		writer.WriteProperty(options, PropCustomSettings, value.CustomSettings);
+		writer.WriteProperty(options, PropDailyModelSnapshotRetentionAfterDays, value.DailyModelSnapshotRetentionAfterDays);
+		writer.WriteProperty(options, PropDataDescription, value.DataDescription);
+		writer.WriteProperty(options, PropDatafeedConfig, value.DatafeedConfig);
+		writer.WriteProperty(options, PropDescription, value.Description);
+		writer.WriteProperty(options, PropGroups, value.Groups);
+		writer.WriteProperty(options, PropJobId, value.JobId);
+		writer.WriteProperty(options, PropJobType, value.JobType);
+		writer.WriteProperty(options, PropJobVersion, value.JobVersion);
+		writer.WriteProperty(options, PropModelPlotConfig, value.ModelPlotConfig);
+		writer.WriteProperty(options, PropModelSnapshotId, value.ModelSnapshotId);
+		writer.WriteProperty(options, PropModelSnapshotRetentionDays, value.ModelSnapshotRetentionDays);
+		writer.WriteProperty(options, PropRenormalizationWindowDays, value.RenormalizationWindowDays);
+		writer.WriteProperty(options, PropResultsIndexName, value.ResultsIndexName);
+		writer.WriteProperty(options, PropResultsRetentionDays, value.ResultsRetentionDays);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PutJobResponseConverter))]
 public sealed partial class PutJobResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("allow_lazy_open")]
 	public bool AllowLazyOpen { get; init; }
-	[JsonInclude, JsonPropertyName("analysis_config")]
 	public Elastic.Clients.Elasticsearch.Serverless.MachineLearning.AnalysisConfigRead AnalysisConfig { get; init; }
-	[JsonInclude, JsonPropertyName("analysis_limits")]
 	public Elastic.Clients.Elasticsearch.Serverless.MachineLearning.AnalysisLimits AnalysisLimits { get; init; }
-	[JsonInclude, JsonPropertyName("background_persist_interval")]
 	public Elastic.Clients.Elasticsearch.Serverless.Duration? BackgroundPersistInterval { get; init; }
-	[JsonInclude, JsonPropertyName("create_time")]
 	public DateTimeOffset CreateTime { get; init; }
-	[JsonInclude, JsonPropertyName("custom_settings")]
 	public object? CustomSettings { get; init; }
-	[JsonInclude, JsonPropertyName("daily_model_snapshot_retention_after_days")]
 	public long DailyModelSnapshotRetentionAfterDays { get; init; }
-	[JsonInclude, JsonPropertyName("data_description")]
 	public Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataDescription DataDescription { get; init; }
-	[JsonInclude, JsonPropertyName("datafeed_config")]
 	public Elastic.Clients.Elasticsearch.Serverless.MachineLearning.Datafeed? DatafeedConfig { get; init; }
-	[JsonInclude, JsonPropertyName("description")]
 	public string? Description { get; init; }
-	[JsonInclude, JsonPropertyName("groups")]
 	public IReadOnlyCollection<string>? Groups { get; init; }
-	[JsonInclude, JsonPropertyName("job_id")]
 	public string JobId { get; init; }
-	[JsonInclude, JsonPropertyName("job_type")]
 	public string JobType { get; init; }
-	[JsonInclude, JsonPropertyName("job_version")]
 	public string JobVersion { get; init; }
-	[JsonInclude, JsonPropertyName("model_plot_config")]
 	public Elastic.Clients.Elasticsearch.Serverless.MachineLearning.ModelPlotConfig? ModelPlotConfig { get; init; }
-	[JsonInclude, JsonPropertyName("model_snapshot_id")]
 	public string? ModelSnapshotId { get; init; }
-	[JsonInclude, JsonPropertyName("model_snapshot_retention_days")]
 	public long ModelSnapshotRetentionDays { get; init; }
-	[JsonInclude, JsonPropertyName("renormalization_window_days")]
 	public long? RenormalizationWindowDays { get; init; }
-	[JsonInclude, JsonPropertyName("results_index_name")]
 	public string ResultsIndexName { get; init; }
-	[JsonInclude, JsonPropertyName("results_retention_days")]
 	public long? ResultsRetentionDays { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/PutTrainedModelAliasResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/PutTrainedModelAliasResponse.g.cs
index 8fa9c7fa77b..211575dc08d 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/PutTrainedModelAliasResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/PutTrainedModelAliasResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.MachineLearning;
 
+internal sealed partial class PutTrainedModelAliasResponseConverter : System.Text.Json.Serialization.JsonConverter<PutTrainedModelAliasResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override PutTrainedModelAliasResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutTrainedModelAliasResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutTrainedModelAliasResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PutTrainedModelAliasResponseConverter))]
 public sealed partial class PutTrainedModelAliasResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class PutTrainedModelAliasResponse : ElasticsearchResponse
 	/// 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.Serverless/_Generated/Api/MachineLearning/PutTrainedModelDefinitionPartResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/PutTrainedModelDefinitionPartResponse.g.cs
index dd3c200a6b1..08bc3f259f6 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/PutTrainedModelDefinitionPartResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/PutTrainedModelDefinitionPartResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.MachineLearning;
 
+internal sealed partial class PutTrainedModelDefinitionPartResponseConverter : System.Text.Json.Serialization.JsonConverter<PutTrainedModelDefinitionPartResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override PutTrainedModelDefinitionPartResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutTrainedModelDefinitionPartResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutTrainedModelDefinitionPartResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PutTrainedModelDefinitionPartResponseConverter))]
 public sealed partial class PutTrainedModelDefinitionPartResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class PutTrainedModelDefinitionPartResponse : Elasticsearc
 	/// 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.Serverless/_Generated/Api/MachineLearning/PutTrainedModelResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/PutTrainedModelResponse.g.cs
index 93ed85a9966..530f6708ec4 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/PutTrainedModelResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/PutTrainedModelResponse.g.cs
@@ -18,17 +18,243 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.MachineLearning;
 
+internal sealed partial class PutTrainedModelResponseConverter : System.Text.Json.Serialization.JsonConverter<PutTrainedModelResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCompressedDefinition = System.Text.Json.JsonEncodedText.Encode("compressed_definition");
+	private static readonly System.Text.Json.JsonEncodedText PropCreatedBy = System.Text.Json.JsonEncodedText.Encode("created_by");
+	private static readonly System.Text.Json.JsonEncodedText PropCreateTime = System.Text.Json.JsonEncodedText.Encode("create_time");
+	private static readonly System.Text.Json.JsonEncodedText PropDefaultFieldMap = System.Text.Json.JsonEncodedText.Encode("default_field_map");
+	private static readonly System.Text.Json.JsonEncodedText PropDescription = System.Text.Json.JsonEncodedText.Encode("description");
+	private static readonly System.Text.Json.JsonEncodedText PropEstimatedHeapMemoryUsageBytes = System.Text.Json.JsonEncodedText.Encode("estimated_heap_memory_usage_bytes");
+	private static readonly System.Text.Json.JsonEncodedText PropEstimatedOperations = System.Text.Json.JsonEncodedText.Encode("estimated_operations");
+	private static readonly System.Text.Json.JsonEncodedText PropFullyDefined = System.Text.Json.JsonEncodedText.Encode("fully_defined");
+	private static readonly System.Text.Json.JsonEncodedText PropInferenceConfig = System.Text.Json.JsonEncodedText.Encode("inference_config");
+	private static readonly System.Text.Json.JsonEncodedText PropInput = System.Text.Json.JsonEncodedText.Encode("input");
+	private static readonly System.Text.Json.JsonEncodedText PropLicenseLevel = System.Text.Json.JsonEncodedText.Encode("license_level");
+	private static readonly System.Text.Json.JsonEncodedText PropLocation = System.Text.Json.JsonEncodedText.Encode("location");
+	private static readonly System.Text.Json.JsonEncodedText PropMetadata = System.Text.Json.JsonEncodedText.Encode("metadata");
+	private static readonly System.Text.Json.JsonEncodedText PropModelId = System.Text.Json.JsonEncodedText.Encode("model_id");
+	private static readonly System.Text.Json.JsonEncodedText PropModelPackage = System.Text.Json.JsonEncodedText.Encode("model_package");
+	private static readonly System.Text.Json.JsonEncodedText PropModelSizeBytes = System.Text.Json.JsonEncodedText.Encode("model_size_bytes");
+	private static readonly System.Text.Json.JsonEncodedText PropModelType = System.Text.Json.JsonEncodedText.Encode("model_type");
+	private static readonly System.Text.Json.JsonEncodedText PropPrefixStrings = System.Text.Json.JsonEncodedText.Encode("prefix_strings");
+	private static readonly System.Text.Json.JsonEncodedText PropTags = System.Text.Json.JsonEncodedText.Encode("tags");
+	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("version");
+
+	public override PutTrainedModelResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string?> propCompressedDefinition = default;
+		LocalJsonProperty<string?> propCreatedBy = default;
+		LocalJsonProperty<DateTimeOffset?> propCreateTime = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, string>?> propDefaultFieldMap = default;
+		LocalJsonProperty<string?> propDescription = default;
+		LocalJsonProperty<int?> propEstimatedHeapMemoryUsageBytes = default;
+		LocalJsonProperty<int?> propEstimatedOperations = default;
+		LocalJsonProperty<bool?> propFullyDefined = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.InferenceConfigCreate?> propInferenceConfig = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.TrainedModelConfigInput> propInput = default;
+		LocalJsonProperty<string?> propLicenseLevel = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.TrainedModelLocation?> propLocation = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.TrainedModelConfigMetadata?> propMetadata = default;
+		LocalJsonProperty<string> propModelId = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.ModelPackageConfig?> propModelPackage = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.ByteSize?> propModelSizeBytes = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.TrainedModelType?> propModelType = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.TrainedModelPrefixStrings?> propPrefixStrings = default;
+		LocalJsonProperty<IReadOnlyCollection<string>> propTags = default;
+		LocalJsonProperty<string?> propVersion = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCompressedDefinition.TryRead(ref reader, options, PropCompressedDefinition))
+			{
+				continue;
+			}
+
+			if (propCreatedBy.TryRead(ref reader, options, PropCreatedBy))
+			{
+				continue;
+			}
+
+			if (propCreateTime.TryRead(ref reader, options, PropCreateTime))
+			{
+				continue;
+			}
+
+			if (propDefaultFieldMap.TryRead(ref reader, options, PropDefaultFieldMap))
+			{
+				continue;
+			}
+
+			if (propDescription.TryRead(ref reader, options, PropDescription))
+			{
+				continue;
+			}
+
+			if (propEstimatedHeapMemoryUsageBytes.TryRead(ref reader, options, PropEstimatedHeapMemoryUsageBytes))
+			{
+				continue;
+			}
+
+			if (propEstimatedOperations.TryRead(ref reader, options, PropEstimatedOperations))
+			{
+				continue;
+			}
+
+			if (propFullyDefined.TryRead(ref reader, options, PropFullyDefined))
+			{
+				continue;
+			}
+
+			if (propInferenceConfig.TryRead(ref reader, options, PropInferenceConfig))
+			{
+				continue;
+			}
+
+			if (propInput.TryRead(ref reader, options, PropInput))
+			{
+				continue;
+			}
+
+			if (propLicenseLevel.TryRead(ref reader, options, PropLicenseLevel))
+			{
+				continue;
+			}
+
+			if (propLocation.TryRead(ref reader, options, PropLocation))
+			{
+				continue;
+			}
+
+			if (propMetadata.TryRead(ref reader, options, PropMetadata))
+			{
+				continue;
+			}
+
+			if (propModelId.TryRead(ref reader, options, PropModelId))
+			{
+				continue;
+			}
+
+			if (propModelPackage.TryRead(ref reader, options, PropModelPackage))
+			{
+				continue;
+			}
+
+			if (propModelSizeBytes.TryRead(ref reader, options, PropModelSizeBytes))
+			{
+				continue;
+			}
+
+			if (propModelType.TryRead(ref reader, options, PropModelType))
+			{
+				continue;
+			}
+
+			if (propPrefixStrings.TryRead(ref reader, options, PropPrefixStrings))
+			{
+				continue;
+			}
+
+			if (propTags.TryRead(ref reader, options, PropTags))
+			{
+				continue;
+			}
+
+			if (propVersion.TryRead(ref reader, options, PropVersion))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutTrainedModelResponse
+		{
+			CompressedDefinition = propCompressedDefinition.Value
+,
+			CreatedBy = propCreatedBy.Value
+,
+			CreateTime = propCreateTime.Value
+,
+			DefaultFieldMap = propDefaultFieldMap.Value
+,
+			Description = propDescription.Value
+,
+			EstimatedHeapMemoryUsageBytes = propEstimatedHeapMemoryUsageBytes.Value
+,
+			EstimatedOperations = propEstimatedOperations.Value
+,
+			FullyDefined = propFullyDefined.Value
+,
+			InferenceConfig = propInferenceConfig.Value
+,
+			Input = propInput.Value
+,
+			LicenseLevel = propLicenseLevel.Value
+,
+			Location = propLocation.Value
+,
+			Metadata = propMetadata.Value
+,
+			ModelId = propModelId.Value
+,
+			ModelPackage = propModelPackage.Value
+,
+			ModelSizeBytes = propModelSizeBytes.Value
+,
+			ModelType = propModelType.Value
+,
+			PrefixStrings = propPrefixStrings.Value
+,
+			Tags = propTags.Value
+,
+			Version = propVersion.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutTrainedModelResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCompressedDefinition, value.CompressedDefinition);
+		writer.WriteProperty(options, PropCreatedBy, value.CreatedBy);
+		writer.WriteProperty(options, PropCreateTime, value.CreateTime);
+		writer.WriteProperty(options, PropDefaultFieldMap, value.DefaultFieldMap);
+		writer.WriteProperty(options, PropDescription, value.Description);
+		writer.WriteProperty(options, PropEstimatedHeapMemoryUsageBytes, value.EstimatedHeapMemoryUsageBytes);
+		writer.WriteProperty(options, PropEstimatedOperations, value.EstimatedOperations);
+		writer.WriteProperty(options, PropFullyDefined, value.FullyDefined);
+		writer.WriteProperty(options, PropInferenceConfig, value.InferenceConfig);
+		writer.WriteProperty(options, PropInput, value.Input);
+		writer.WriteProperty(options, PropLicenseLevel, value.LicenseLevel);
+		writer.WriteProperty(options, PropLocation, value.Location);
+		writer.WriteProperty(options, PropMetadata, value.Metadata);
+		writer.WriteProperty(options, PropModelId, value.ModelId);
+		writer.WriteProperty(options, PropModelPackage, value.ModelPackage);
+		writer.WriteProperty(options, PropModelSizeBytes, value.ModelSizeBytes);
+		writer.WriteProperty(options, PropModelType, value.ModelType);
+		writer.WriteProperty(options, PropPrefixStrings, value.PrefixStrings);
+		writer.WriteProperty(options, PropTags, value.Tags);
+		writer.WriteProperty(options, PropVersion, value.Version);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PutTrainedModelResponseConverter))]
 public sealed partial class PutTrainedModelResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("compressed_definition")]
 	public string? CompressedDefinition { get; init; }
 
 	/// <summary>
@@ -36,7 +262,6 @@ public sealed partial class PutTrainedModelResponse : ElasticsearchResponse
 	/// Information on the creator of the trained model.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("created_by")]
 	public string? CreatedBy { get; init; }
 
 	/// <summary>
@@ -44,7 +269,6 @@ public sealed partial class PutTrainedModelResponse : ElasticsearchResponse
 	/// The time when the trained model was created.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("create_time")]
 	public DateTimeOffset? CreateTime { get; init; }
 
 	/// <summary>
@@ -52,7 +276,6 @@ public sealed partial class PutTrainedModelResponse : ElasticsearchResponse
 	/// Any field map described in the inference configuration takes precedence.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("default_field_map")]
 	public IReadOnlyDictionary<string, string>? DefaultFieldMap { get; init; }
 
 	/// <summary>
@@ -60,7 +283,6 @@ public sealed partial class PutTrainedModelResponse : ElasticsearchResponse
 	/// The free-text description of the trained model.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("description")]
 	public string? Description { get; init; }
 
 	/// <summary>
@@ -68,7 +290,6 @@ public sealed partial class PutTrainedModelResponse : ElasticsearchResponse
 	/// The estimated heap usage in bytes to keep the trained model in memory.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("estimated_heap_memory_usage_bytes")]
 	public int? EstimatedHeapMemoryUsageBytes { get; init; }
 
 	/// <summary>
@@ -76,7 +297,6 @@ public sealed partial class PutTrainedModelResponse : ElasticsearchResponse
 	/// The estimated number of operations to use the trained model.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("estimated_operations")]
 	public int? EstimatedOperations { get; init; }
 
 	/// <summary>
@@ -84,7 +304,6 @@ public sealed partial class PutTrainedModelResponse : ElasticsearchResponse
 	/// True if the full model definition is present.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("fully_defined")]
 	public bool? FullyDefined { get; init; }
 
 	/// <summary>
@@ -92,7 +311,6 @@ public sealed partial class PutTrainedModelResponse : ElasticsearchResponse
 	/// The default configuration for inference. This can be either a regression, classification, or one of the many NLP focused configurations. It must match the underlying definition.trained_model's target_type. For pre-packaged models such as ELSER the config is not required.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("inference_config")]
 	public Elastic.Clients.Elasticsearch.Serverless.MachineLearning.InferenceConfigCreate? InferenceConfig { get; init; }
 
 	/// <summary>
@@ -100,7 +318,6 @@ public sealed partial class PutTrainedModelResponse : ElasticsearchResponse
 	/// The input field names for the model definition.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("input")]
 	public Elastic.Clients.Elasticsearch.Serverless.MachineLearning.TrainedModelConfigInput Input { get; init; }
 
 	/// <summary>
@@ -108,9 +325,7 @@ public sealed partial class PutTrainedModelResponse : ElasticsearchResponse
 	/// The license level of the trained model.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("license_level")]
 	public string? LicenseLevel { get; init; }
-	[JsonInclude, JsonPropertyName("location")]
 	public Elastic.Clients.Elasticsearch.Serverless.MachineLearning.TrainedModelLocation? Location { get; init; }
 
 	/// <summary>
@@ -118,7 +333,6 @@ public sealed partial class PutTrainedModelResponse : ElasticsearchResponse
 	/// An object containing metadata about the trained model. For example, models created by data frame analytics contain analysis_config and input objects.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("metadata")]
 	public Elastic.Clients.Elasticsearch.Serverless.MachineLearning.TrainedModelConfigMetadata? Metadata { get; init; }
 
 	/// <summary>
@@ -126,11 +340,8 @@ public sealed partial class PutTrainedModelResponse : ElasticsearchResponse
 	/// Identifier for the trained model.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("model_id")]
 	public string ModelId { get; init; }
-	[JsonInclude, JsonPropertyName("model_package")]
 	public Elastic.Clients.Elasticsearch.Serverless.MachineLearning.ModelPackageConfig? ModelPackage { get; init; }
-	[JsonInclude, JsonPropertyName("model_size_bytes")]
 	public Elastic.Clients.Elasticsearch.Serverless.ByteSize? ModelSizeBytes { get; init; }
 
 	/// <summary>
@@ -138,9 +349,7 @@ public sealed partial class PutTrainedModelResponse : ElasticsearchResponse
 	/// The model type
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("model_type")]
 	public Elastic.Clients.Elasticsearch.Serverless.MachineLearning.TrainedModelType? ModelType { get; init; }
-	[JsonInclude, JsonPropertyName("prefix_strings")]
 	public Elastic.Clients.Elasticsearch.Serverless.MachineLearning.TrainedModelPrefixStrings? PrefixStrings { get; init; }
 
 	/// <summary>
@@ -148,7 +357,6 @@ public sealed partial class PutTrainedModelResponse : ElasticsearchResponse
 	/// A comma delimited string of tags. A trained model can have many tags, or none.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("tags")]
 	public IReadOnlyCollection<string> Tags { get; init; }
 
 	/// <summary>
@@ -156,6 +364,5 @@ public sealed partial class PutTrainedModelResponse : ElasticsearchResponse
 	/// The Elasticsearch version number in which the trained model was created.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/PutTrainedModelVocabularyResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/PutTrainedModelVocabularyResponse.g.cs
index aeb196b185e..8b8821fa667 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/PutTrainedModelVocabularyResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/PutTrainedModelVocabularyResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.MachineLearning;
 
+internal sealed partial class PutTrainedModelVocabularyResponseConverter : System.Text.Json.Serialization.JsonConverter<PutTrainedModelVocabularyResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override PutTrainedModelVocabularyResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutTrainedModelVocabularyResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutTrainedModelVocabularyResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PutTrainedModelVocabularyResponseConverter))]
 public sealed partial class PutTrainedModelVocabularyResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class PutTrainedModelVocabularyResponse : ElasticsearchRes
 	/// 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.Serverless/_Generated/Api/MachineLearning/ResetJobResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/ResetJobResponse.g.cs
index b0d56d75278..fe1147eb6ed 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/ResetJobResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/ResetJobResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.MachineLearning;
 
+internal sealed partial class ResetJobResponseConverter : System.Text.Json.Serialization.JsonConverter<ResetJobResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override ResetJobResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ResetJobResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ResetJobResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ResetJobResponseConverter))]
 public sealed partial class ResetJobResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class ResetJobResponse : ElasticsearchResponse
 	/// 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.Serverless/_Generated/Api/MachineLearning/RevertModelSnapshotResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/RevertModelSnapshotResponse.g.cs
index 019c156ac8b..5b0627b7cf8 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/RevertModelSnapshotResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/RevertModelSnapshotResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.MachineLearning;
 
+internal sealed partial class RevertModelSnapshotResponseConverter : System.Text.Json.Serialization.JsonConverter<RevertModelSnapshotResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropModel = System.Text.Json.JsonEncodedText.Encode("model");
+
+	public override RevertModelSnapshotResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.ModelSnapshot> propModel = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propModel.TryRead(ref reader, options, PropModel))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new RevertModelSnapshotResponse
+		{
+			Model = propModel.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, RevertModelSnapshotResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropModel, value.Model);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(RevertModelSnapshotResponseConverter))]
 public sealed partial class RevertModelSnapshotResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("model")]
 	public Elastic.Clients.Elasticsearch.Serverless.MachineLearning.ModelSnapshot Model { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/SetUpgradeModeResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/SetUpgradeModeResponse.g.cs
index 68adcc98b6f..1917737ebfa 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/SetUpgradeModeResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/SetUpgradeModeResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.MachineLearning;
 
+internal sealed partial class SetUpgradeModeResponseConverter : System.Text.Json.Serialization.JsonConverter<SetUpgradeModeResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override SetUpgradeModeResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SetUpgradeModeResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SetUpgradeModeResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(SetUpgradeModeResponseConverter))]
 public sealed partial class SetUpgradeModeResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class SetUpgradeModeResponse : ElasticsearchResponse
 	/// 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.Serverless/_Generated/Api/MachineLearning/StartDataFrameAnalyticsResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/StartDataFrameAnalyticsResponse.g.cs
index 87442b0d491..4f379e53d38 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/StartDataFrameAnalyticsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/StartDataFrameAnalyticsResponse.g.cs
@@ -18,17 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.MachineLearning;
 
+internal sealed partial class StartDataFrameAnalyticsResponseConverter : System.Text.Json.Serialization.JsonConverter<StartDataFrameAnalyticsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+	private static readonly System.Text.Json.JsonEncodedText PropNode = System.Text.Json.JsonEncodedText.Encode("node");
+
+	public override StartDataFrameAnalyticsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		LocalJsonProperty<string> propNode = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			if (propNode.TryRead(ref reader, options, PropNode))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new StartDataFrameAnalyticsResponse
+		{
+			Acknowledged = propAcknowledged.Value
+,
+			Node = propNode.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, StartDataFrameAnalyticsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteProperty(options, PropNode, value.Node);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(StartDataFrameAnalyticsResponseConverter))]
 public sealed partial class StartDataFrameAnalyticsResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("acknowledged")]
 	public bool Acknowledged { get; init; }
 
 	/// <summary>
@@ -40,6 +86,5 @@ public sealed partial class StartDataFrameAnalyticsResponse : ElasticsearchRespo
 	/// node ID will be "serverless".
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("node")]
 	public string Node { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/StartDatafeedResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/StartDatafeedResponse.g.cs
index 032255be81e..5c5a5da2e56 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/StartDatafeedResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/StartDatafeedResponse.g.cs
@@ -18,14 +18,61 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.MachineLearning;
 
+internal sealed partial class StartDatafeedResponseConverter : System.Text.Json.Serialization.JsonConverter<StartDatafeedResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropNode = System.Text.Json.JsonEncodedText.Encode("node");
+	private static readonly System.Text.Json.JsonEncodedText PropStarted = System.Text.Json.JsonEncodedText.Encode("started");
+
+	public override StartDatafeedResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<string>> propNode = default;
+		LocalJsonProperty<bool> propStarted = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propNode.TryRead(ref reader, options, PropNode, typeof(SingleOrManyMarker<IReadOnlyCollection<string>, string>)))
+			{
+				continue;
+			}
+
+			if (propStarted.TryRead(ref reader, options, PropStarted))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new StartDatafeedResponse
+		{
+			Node = propNode.Value
+,
+			Started = propStarted.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, StartDatafeedResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropNode, value.Node, typeof(SingleOrManyMarker<IReadOnlyCollection<string>, string>));
+		writer.WriteProperty(options, PropStarted, value.Started);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(StartDatafeedResponseConverter))]
 public sealed partial class StartDatafeedResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -34,8 +81,6 @@ public sealed partial class StartDatafeedResponse : ElasticsearchResponse
 	/// If the job is allowed to open lazily and has not yet been assigned to a node, this value is an empty string.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("node")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public IReadOnlyCollection<string> Node { get; init; }
 
 	/// <summary>
@@ -43,6 +88,5 @@ public sealed partial class StartDatafeedResponse : ElasticsearchResponse
 	/// For a successful response, this value is always <c>true</c>. On failure, an exception is returned instead.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("started")]
 	public bool Started { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/StartTrainedModelDeploymentResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/StartTrainedModelDeploymentResponse.g.cs
index 0dd0ac3a36d..14e98a396a1 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/StartTrainedModelDeploymentResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/StartTrainedModelDeploymentResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.MachineLearning;
 
+internal sealed partial class StartTrainedModelDeploymentResponseConverter : System.Text.Json.Serialization.JsonConverter<StartTrainedModelDeploymentResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAssignment = System.Text.Json.JsonEncodedText.Encode("assignment");
+
+	public override StartTrainedModelDeploymentResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.TrainedModelAssignment> propAssignment = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAssignment.TryRead(ref reader, options, PropAssignment))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new StartTrainedModelDeploymentResponse
+		{
+			Assignment = propAssignment.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, StartTrainedModelDeploymentResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAssignment, value.Assignment);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(StartTrainedModelDeploymentResponseConverter))]
 public sealed partial class StartTrainedModelDeploymentResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("assignment")]
 	public Elastic.Clients.Elasticsearch.Serverless.MachineLearning.TrainedModelAssignment Assignment { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/StopDataFrameAnalyticsResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/StopDataFrameAnalyticsResponse.g.cs
index 1617f80e0a0..3cf98300849 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/StopDataFrameAnalyticsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/StopDataFrameAnalyticsResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.MachineLearning;
 
+internal sealed partial class StopDataFrameAnalyticsResponseConverter : System.Text.Json.Serialization.JsonConverter<StopDataFrameAnalyticsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStopped = System.Text.Json.JsonEncodedText.Encode("stopped");
+
+	public override StopDataFrameAnalyticsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propStopped = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStopped.TryRead(ref reader, options, PropStopped))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new StopDataFrameAnalyticsResponse
+		{
+			Stopped = propStopped.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, StopDataFrameAnalyticsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStopped, value.Stopped);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(StopDataFrameAnalyticsResponseConverter))]
 public sealed partial class StopDataFrameAnalyticsResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("stopped")]
 	public bool Stopped { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/StopDatafeedResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/StopDatafeedResponse.g.cs
index 0b7e5f25c34..f93d457cce8 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/StopDatafeedResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/StopDatafeedResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.MachineLearning;
 
+internal sealed partial class StopDatafeedResponseConverter : System.Text.Json.Serialization.JsonConverter<StopDatafeedResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStopped = System.Text.Json.JsonEncodedText.Encode("stopped");
+
+	public override StopDatafeedResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propStopped = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStopped.TryRead(ref reader, options, PropStopped))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new StopDatafeedResponse
+		{
+			Stopped = propStopped.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, StopDatafeedResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStopped, value.Stopped);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(StopDatafeedResponseConverter))]
 public sealed partial class StopDatafeedResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("stopped")]
 	public bool Stopped { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/StopTrainedModelDeploymentResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/StopTrainedModelDeploymentResponse.g.cs
index 76069cdce24..2084fe95f25 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/StopTrainedModelDeploymentResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/StopTrainedModelDeploymentResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.MachineLearning;
 
+internal sealed partial class StopTrainedModelDeploymentResponseConverter : System.Text.Json.Serialization.JsonConverter<StopTrainedModelDeploymentResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStopped = System.Text.Json.JsonEncodedText.Encode("stopped");
+
+	public override StopTrainedModelDeploymentResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propStopped = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStopped.TryRead(ref reader, options, PropStopped))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new StopTrainedModelDeploymentResponse
+		{
+			Stopped = propStopped.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, StopTrainedModelDeploymentResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStopped, value.Stopped);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(StopTrainedModelDeploymentResponseConverter))]
 public sealed partial class StopTrainedModelDeploymentResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("stopped")]
 	public bool Stopped { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/UpdateDataFrameAnalyticsResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/UpdateDataFrameAnalyticsResponse.g.cs
index 0f44712ded6..797f5167792 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/UpdateDataFrameAnalyticsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/UpdateDataFrameAnalyticsResponse.g.cs
@@ -18,38 +18,173 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.MachineLearning;
 
+internal sealed partial class UpdateDataFrameAnalyticsResponseConverter : System.Text.Json.Serialization.JsonConverter<UpdateDataFrameAnalyticsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAllowLazyStart = System.Text.Json.JsonEncodedText.Encode("allow_lazy_start");
+	private static readonly System.Text.Json.JsonEncodedText PropAnalysis = System.Text.Json.JsonEncodedText.Encode("analysis");
+	private static readonly System.Text.Json.JsonEncodedText PropAnalyzedFields = System.Text.Json.JsonEncodedText.Encode("analyzed_fields");
+	private static readonly System.Text.Json.JsonEncodedText PropAuthorization = System.Text.Json.JsonEncodedText.Encode("authorization");
+	private static readonly System.Text.Json.JsonEncodedText PropCreateTime = System.Text.Json.JsonEncodedText.Encode("create_time");
+	private static readonly System.Text.Json.JsonEncodedText PropDescription = System.Text.Json.JsonEncodedText.Encode("description");
+	private static readonly System.Text.Json.JsonEncodedText PropDest = System.Text.Json.JsonEncodedText.Encode("dest");
+	private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("id");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxNumThreads = System.Text.Json.JsonEncodedText.Encode("max_num_threads");
+	private static readonly System.Text.Json.JsonEncodedText PropModelMemoryLimit = System.Text.Json.JsonEncodedText.Encode("model_memory_limit");
+	private static readonly System.Text.Json.JsonEncodedText PropSource = System.Text.Json.JsonEncodedText.Encode("source");
+	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("version");
+
+	public override UpdateDataFrameAnalyticsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAllowLazyStart = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeAnalysis> propAnalysis = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeAnalysisAnalyzedFields?> propAnalyzedFields = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeAnalyticsAuthorization?> propAuthorization = default;
+		LocalJsonProperty<long> propCreateTime = default;
+		LocalJsonProperty<string?> propDescription = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeAnalyticsDestination> propDest = default;
+		LocalJsonProperty<string> propId = default;
+		LocalJsonProperty<int> propMaxNumThreads = default;
+		LocalJsonProperty<string> propModelMemoryLimit = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeAnalyticsSource> propSource = default;
+		LocalJsonProperty<string> propVersion = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAllowLazyStart.TryRead(ref reader, options, PropAllowLazyStart))
+			{
+				continue;
+			}
+
+			if (propAnalysis.TryRead(ref reader, options, PropAnalysis))
+			{
+				continue;
+			}
+
+			if (propAnalyzedFields.TryRead(ref reader, options, PropAnalyzedFields))
+			{
+				continue;
+			}
+
+			if (propAuthorization.TryRead(ref reader, options, PropAuthorization))
+			{
+				continue;
+			}
+
+			if (propCreateTime.TryRead(ref reader, options, PropCreateTime))
+			{
+				continue;
+			}
+
+			if (propDescription.TryRead(ref reader, options, PropDescription))
+			{
+				continue;
+			}
+
+			if (propDest.TryRead(ref reader, options, PropDest))
+			{
+				continue;
+			}
+
+			if (propId.TryRead(ref reader, options, PropId))
+			{
+				continue;
+			}
+
+			if (propMaxNumThreads.TryRead(ref reader, options, PropMaxNumThreads))
+			{
+				continue;
+			}
+
+			if (propModelMemoryLimit.TryRead(ref reader, options, PropModelMemoryLimit))
+			{
+				continue;
+			}
+
+			if (propSource.TryRead(ref reader, options, PropSource))
+			{
+				continue;
+			}
+
+			if (propVersion.TryRead(ref reader, options, PropVersion))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new UpdateDataFrameAnalyticsResponse
+		{
+			AllowLazyStart = propAllowLazyStart.Value
+,
+			Analysis = propAnalysis.Value
+,
+			AnalyzedFields = propAnalyzedFields.Value
+,
+			Authorization = propAuthorization.Value
+,
+			CreateTime = propCreateTime.Value
+,
+			Description = propDescription.Value
+,
+			Dest = propDest.Value
+,
+			Id = propId.Value
+,
+			MaxNumThreads = propMaxNumThreads.Value
+,
+			ModelMemoryLimit = propModelMemoryLimit.Value
+,
+			Source = propSource.Value
+,
+			Version = propVersion.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, UpdateDataFrameAnalyticsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAllowLazyStart, value.AllowLazyStart);
+		writer.WriteProperty(options, PropAnalysis, value.Analysis);
+		writer.WriteProperty(options, PropAnalyzedFields, value.AnalyzedFields);
+		writer.WriteProperty(options, PropAuthorization, value.Authorization);
+		writer.WriteProperty(options, PropCreateTime, value.CreateTime);
+		writer.WriteProperty(options, PropDescription, value.Description);
+		writer.WriteProperty(options, PropDest, value.Dest);
+		writer.WriteProperty(options, PropId, value.Id);
+		writer.WriteProperty(options, PropMaxNumThreads, value.MaxNumThreads);
+		writer.WriteProperty(options, PropModelMemoryLimit, value.ModelMemoryLimit);
+		writer.WriteProperty(options, PropSource, value.Source);
+		writer.WriteProperty(options, PropVersion, value.Version);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(UpdateDataFrameAnalyticsResponseConverter))]
 public sealed partial class UpdateDataFrameAnalyticsResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("allow_lazy_start")]
 	public bool AllowLazyStart { get; init; }
-	[JsonInclude, JsonPropertyName("analysis")]
 	public Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeAnalysis Analysis { get; init; }
-	[JsonInclude, JsonPropertyName("analyzed_fields")]
 	public Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeAnalysisAnalyzedFields? AnalyzedFields { get; init; }
-	[JsonInclude, JsonPropertyName("authorization")]
 	public Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeAnalyticsAuthorization? Authorization { get; init; }
-	[JsonInclude, JsonPropertyName("create_time")]
 	public long CreateTime { get; init; }
-	[JsonInclude, JsonPropertyName("description")]
 	public string? Description { get; init; }
-	[JsonInclude, JsonPropertyName("dest")]
 	public Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeAnalyticsDestination Dest { get; init; }
-	[JsonInclude, JsonPropertyName("id")]
 	public string Id { get; init; }
-	[JsonInclude, JsonPropertyName("max_num_threads")]
 	public int MaxNumThreads { get; init; }
-	[JsonInclude, JsonPropertyName("model_memory_limit")]
 	public string ModelMemoryLimit { get; init; }
-	[JsonInclude, JsonPropertyName("source")]
 	public Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeAnalyticsSource Source { get; init; }
-	[JsonInclude, JsonPropertyName("version")]
 	public string Version { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/UpdateDatafeedRequest.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/UpdateDatafeedRequest.g.cs
index 4a7029991d4..3f474174fe8 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/UpdateDatafeedRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/UpdateDatafeedRequest.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Requests;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport;
@@ -83,182 +84,156 @@ public sealed partial class UpdateDatafeedRequestParameters : RequestParameters
 	public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
 }
 
-internal sealed partial class UpdateDatafeedRequestConverter : JsonConverter<UpdateDatafeedRequest>
+internal sealed partial class UpdateDatafeedRequestConverter : System.Text.Json.Serialization.JsonConverter<UpdateDatafeedRequest>
 {
-	public override UpdateDatafeedRequest Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropChunkingConfig = System.Text.Json.JsonEncodedText.Encode("chunking_config");
+	private static readonly System.Text.Json.JsonEncodedText PropDelayedDataCheckConfig = System.Text.Json.JsonEncodedText.Encode("delayed_data_check_config");
+	private static readonly System.Text.Json.JsonEncodedText PropFrequency = System.Text.Json.JsonEncodedText.Encode("frequency");
+	private static readonly System.Text.Json.JsonEncodedText PropIndices = System.Text.Json.JsonEncodedText.Encode("indices");
+	private static readonly System.Text.Json.JsonEncodedText PropIndices1 = System.Text.Json.JsonEncodedText.Encode("indexes");
+	private static readonly System.Text.Json.JsonEncodedText PropIndicesOptions = System.Text.Json.JsonEncodedText.Encode("indices_options");
+	private static readonly System.Text.Json.JsonEncodedText PropJobId = System.Text.Json.JsonEncodedText.Encode("job_id");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxEmptySearches = System.Text.Json.JsonEncodedText.Encode("max_empty_searches");
+	private static readonly System.Text.Json.JsonEncodedText PropQuery = System.Text.Json.JsonEncodedText.Encode("query");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryDelay = System.Text.Json.JsonEncodedText.Encode("query_delay");
+	private static readonly System.Text.Json.JsonEncodedText PropRuntimeMappings = System.Text.Json.JsonEncodedText.Encode("runtime_mappings");
+	private static readonly System.Text.Json.JsonEncodedText PropScriptFields = System.Text.Json.JsonEncodedText.Encode("script_fields");
+	private static readonly System.Text.Json.JsonEncodedText PropScrollSize = System.Text.Json.JsonEncodedText.Encode("scroll_size");
+
+	public override UpdateDatafeedRequest Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		var variant = new UpdateDatafeedRequest();
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.Aggregation>?> propAggregations = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.ChunkingConfig?> propChunkingConfig = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DelayedDataCheckConfig?> propDelayedDataCheckConfig = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Duration?> propFrequency = default;
+		LocalJsonProperty<ICollection<string>?> propIndices = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.IndicesOptions?> propIndicesOptions = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Id?> propJobId = default;
+		LocalJsonProperty<int?> propMaxEmptySearches = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query?> propQuery = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Duration?> propQueryDelay = default;
+		LocalJsonProperty<IDictionary<Elastic.Clients.Elasticsearch.Serverless.Field, Elastic.Clients.Elasticsearch.Serverless.Mapping.RuntimeField>?> propRuntimeMappings = default;
+		LocalJsonProperty<IDictionary<string, Elastic.Clients.Elasticsearch.Serverless.ScriptField>?> propScriptFields = default;
+		LocalJsonProperty<int?> propScrollSize = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propAggregations.TryRead(ref reader, options, PropAggregations))
 			{
-				var property = reader.GetString();
-				if (property == "aggregations")
-				{
-					variant.Aggregations = JsonSerializer.Deserialize<IDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.Aggregation>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "chunking_config")
-				{
-					variant.ChunkingConfig = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.ChunkingConfig?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "delayed_data_check_config")
-				{
-					variant.DelayedDataCheckConfig = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DelayedDataCheckConfig?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "frequency")
-				{
-					variant.Frequency = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Duration?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "indices" || property == "indexes")
-				{
-					variant.Indices = JsonSerializer.Deserialize<ICollection<string>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "indices_options")
-				{
-					variant.IndicesOptions = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.IndicesOptions?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "job_id")
-				{
-					variant.JobId = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Id?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "max_empty_searches")
-				{
-					variant.MaxEmptySearches = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "query")
-				{
-					variant.Query = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "query_delay")
-				{
-					variant.QueryDelay = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Duration?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "runtime_mappings")
-				{
-					variant.RuntimeMappings = JsonSerializer.Deserialize<IDictionary<Elastic.Clients.Elasticsearch.Serverless.Field, Elastic.Clients.Elasticsearch.Serverless.Mapping.RuntimeField>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "script_fields")
-				{
-					variant.ScriptFields = JsonSerializer.Deserialize<IDictionary<string, Elastic.Clients.Elasticsearch.Serverless.ScriptField>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "scroll_size")
-				{
-					variant.ScrollSize = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
+				continue;
 			}
-		}
 
-		return variant;
-	}
+			if (propChunkingConfig.TryRead(ref reader, options, PropChunkingConfig))
+			{
+				continue;
+			}
 
-	public override void Write(Utf8JsonWriter writer, UpdateDatafeedRequest value, JsonSerializerOptions options)
-	{
-		writer.WriteStartObject();
-		if (value.Aggregations is not null)
-		{
-			writer.WritePropertyName("aggregations");
-			JsonSerializer.Serialize(writer, value.Aggregations, options);
-		}
+			if (propDelayedDataCheckConfig.TryRead(ref reader, options, PropDelayedDataCheckConfig))
+			{
+				continue;
+			}
 
-		if (value.ChunkingConfig is not null)
-		{
-			writer.WritePropertyName("chunking_config");
-			JsonSerializer.Serialize(writer, value.ChunkingConfig, options);
-		}
+			if (propFrequency.TryRead(ref reader, options, PropFrequency))
+			{
+				continue;
+			}
 
-		if (value.DelayedDataCheckConfig is not null)
-		{
-			writer.WritePropertyName("delayed_data_check_config");
-			JsonSerializer.Serialize(writer, value.DelayedDataCheckConfig, options);
-		}
+			if (propIndices.TryRead(ref reader, options, PropIndices) || propIndices.TryRead(ref reader, options, PropIndices1))
+			{
+				continue;
+			}
 
-		if (value.Frequency is not null)
-		{
-			writer.WritePropertyName("frequency");
-			JsonSerializer.Serialize(writer, value.Frequency, options);
-		}
+			if (propIndicesOptions.TryRead(ref reader, options, PropIndicesOptions))
+			{
+				continue;
+			}
 
-		if (value.Indices is not null)
-		{
-			writer.WritePropertyName("indices");
-			JsonSerializer.Serialize(writer, value.Indices, options);
-		}
+			if (propJobId.TryRead(ref reader, options, PropJobId))
+			{
+				continue;
+			}
 
-		if (value.IndicesOptions is not null)
-		{
-			writer.WritePropertyName("indices_options");
-			JsonSerializer.Serialize(writer, value.IndicesOptions, options);
-		}
+			if (propMaxEmptySearches.TryRead(ref reader, options, PropMaxEmptySearches))
+			{
+				continue;
+			}
 
-		if (value.JobId is not null)
-		{
-			writer.WritePropertyName("job_id");
-			JsonSerializer.Serialize(writer, value.JobId, options);
-		}
+			if (propQuery.TryRead(ref reader, options, PropQuery))
+			{
+				continue;
+			}
 
-		if (value.MaxEmptySearches.HasValue)
-		{
-			writer.WritePropertyName("max_empty_searches");
-			writer.WriteNumberValue(value.MaxEmptySearches.Value);
-		}
+			if (propQueryDelay.TryRead(ref reader, options, PropQueryDelay))
+			{
+				continue;
+			}
 
-		if (value.Query is not null)
-		{
-			writer.WritePropertyName("query");
-			JsonSerializer.Serialize(writer, value.Query, options);
-		}
+			if (propRuntimeMappings.TryRead(ref reader, options, PropRuntimeMappings))
+			{
+				continue;
+			}
 
-		if (value.QueryDelay is not null)
-		{
-			writer.WritePropertyName("query_delay");
-			JsonSerializer.Serialize(writer, value.QueryDelay, options);
-		}
+			if (propScriptFields.TryRead(ref reader, options, PropScriptFields))
+			{
+				continue;
+			}
 
-		if (value.RuntimeMappings is not null)
-		{
-			writer.WritePropertyName("runtime_mappings");
-			JsonSerializer.Serialize(writer, value.RuntimeMappings, options);
-		}
+			if (propScrollSize.TryRead(ref reader, options, PropScrollSize))
+			{
+				continue;
+			}
 
-		if (value.ScriptFields is not null)
-		{
-			writer.WritePropertyName("script_fields");
-			JsonSerializer.Serialize(writer, value.ScriptFields, options);
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		if (value.ScrollSize.HasValue)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new UpdateDatafeedRequest
 		{
-			writer.WritePropertyName("scroll_size");
-			writer.WriteNumberValue(value.ScrollSize.Value);
-		}
+			Aggregations = propAggregations.Value
+	,
+			ChunkingConfig = propChunkingConfig.Value
+	,
+			DelayedDataCheckConfig = propDelayedDataCheckConfig.Value
+	,
+			Frequency = propFrequency.Value
+	,
+			Indices = propIndices.Value
+	,
+			IndicesOptions = propIndicesOptions.Value
+	,
+			JobId = propJobId.Value
+	,
+			MaxEmptySearches = propMaxEmptySearches.Value
+	,
+			Query = propQuery.Value
+	,
+			QueryDelay = propQueryDelay.Value
+	,
+			RuntimeMappings = propRuntimeMappings.Value
+	,
+			ScriptFields = propScriptFields.Value
+	,
+			ScrollSize = propScrollSize.Value
+		};
+	}
 
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, UpdateDatafeedRequest value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAggregations, value.Aggregations);
+		writer.WriteProperty(options, PropChunkingConfig, value.ChunkingConfig);
+		writer.WriteProperty(options, PropDelayedDataCheckConfig, value.DelayedDataCheckConfig);
+		writer.WriteProperty(options, PropFrequency, value.Frequency);
+		writer.WriteProperty(options, PropIndices, value.Indices);
+		writer.WriteProperty(options, PropIndicesOptions, value.IndicesOptions);
+		writer.WriteProperty(options, PropJobId, value.JobId);
+		writer.WriteProperty(options, PropMaxEmptySearches, value.MaxEmptySearches);
+		writer.WriteProperty(options, PropQuery, value.Query);
+		writer.WriteProperty(options, PropQueryDelay, value.QueryDelay);
+		writer.WriteProperty(options, PropRuntimeMappings, value.RuntimeMappings);
+		writer.WriteProperty(options, PropScriptFields, value.ScriptFields);
+		writer.WriteProperty(options, PropScrollSize, value.ScrollSize);
 		writer.WriteEndObject();
 	}
 }
@@ -297,7 +272,6 @@ public UpdateDatafeedRequest()
 	/// <c>_all</c> string or when no indices are specified.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public bool? AllowNoIndices { get => Q<bool?>("allow_no_indices"); set => Q("allow_no_indices", value); }
 
 	/// <summary>
@@ -333,7 +307,6 @@ public UpdateDatafeedRequest()
 	/// </item>
 	/// </list>
 	/// </summary>
-	[JsonIgnore]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.ExpandWildcard>? ExpandWildcards { get => Q<ICollection<Elastic.Clients.Elasticsearch.Serverless.ExpandWildcard>?>("expand_wildcards"); set => Q("expand_wildcards", value); }
 
 	/// <summary>
@@ -341,7 +314,6 @@ public UpdateDatafeedRequest()
 	/// If <c>true</c>, unavailable indices (missing or closed) are ignored.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
 
 	/// <summary>
@@ -350,7 +322,6 @@ public UpdateDatafeedRequest()
 	/// with low cardinality data.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("aggregations")]
 	public IDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.Aggregation>? Aggregations { get; set; }
 
 	/// <summary>
@@ -360,7 +331,6 @@ public UpdateDatafeedRequest()
 	/// these time chunks are calculated; it is an advanced configuration option.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("chunking_config")]
 	public Elastic.Clients.Elasticsearch.Serverless.MachineLearning.ChunkingConfig? ChunkingConfig { get; set; }
 
 	/// <summary>
@@ -372,7 +342,6 @@ public UpdateDatafeedRequest()
 	/// datafeeds.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("delayed_data_check_config")]
 	public Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DelayedDataCheckConfig? DelayedDataCheckConfig { get; set; }
 
 	/// <summary>
@@ -384,7 +353,6 @@ public UpdateDatafeedRequest()
 	/// must be divisible by the interval of the date histogram aggregation.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("frequency")]
 	public Elastic.Clients.Elasticsearch.Serverless.Duration? Frequency { get; set; }
 
 	/// <summary>
@@ -393,7 +361,6 @@ public UpdateDatafeedRequest()
 	/// learning nodes must have the <c>remote_cluster_client</c> role.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("indices")]
 	public ICollection<string>? Indices { get; set; }
 
 	/// <summary>
@@ -401,9 +368,7 @@ public UpdateDatafeedRequest()
 	/// Specifies index expansion options that are used during search.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("indices_options")]
 	public Elastic.Clients.Elasticsearch.Serverless.IndicesOptions? IndicesOptions { get; set; }
-	[JsonInclude, JsonPropertyName("job_id")]
 	public Elastic.Clients.Elasticsearch.Serverless.Id? JobId { get; set; }
 
 	/// <summary>
@@ -414,7 +379,6 @@ public UpdateDatafeedRequest()
 	/// end time that sees no data remains started until it is explicitly stopped. By default, it is not set.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("max_empty_searches")]
 	public int? MaxEmptySearches { get; set; }
 
 	/// <summary>
@@ -428,7 +392,6 @@ public UpdateDatafeedRequest()
 	/// when you are satisfied with the results of the job.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("query")]
 	public Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query? Query { get; set; }
 
 	/// <summary>
@@ -439,7 +402,6 @@ public UpdateDatafeedRequest()
 	/// when there are multiple jobs running on the same node.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("query_delay")]
 	public Elastic.Clients.Elasticsearch.Serverless.Duration? QueryDelay { get; set; }
 
 	/// <summary>
@@ -447,7 +409,6 @@ public UpdateDatafeedRequest()
 	/// Specifies runtime fields for the datafeed search.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("runtime_mappings")]
 	public IDictionary<Elastic.Clients.Elasticsearch.Serverless.Field, Elastic.Clients.Elasticsearch.Serverless.Mapping.RuntimeField>? RuntimeMappings { get; set; }
 
 	/// <summary>
@@ -456,7 +417,6 @@ public UpdateDatafeedRequest()
 	/// The detector configuration objects in a job can contain functions that use these script fields.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("script_fields")]
 	public IDictionary<string, Elastic.Clients.Elasticsearch.Serverless.ScriptField>? ScriptFields { get; set; }
 
 	/// <summary>
@@ -465,7 +425,6 @@ public UpdateDatafeedRequest()
 	/// The maximum value is the value of <c>index.max_result_window</c>.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("scroll_size")]
 	public int? ScrollSize { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/UpdateDatafeedResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/UpdateDatafeedResponse.g.cs
index dd2d54e3dd8..9c4e801ca56 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/UpdateDatafeedResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/UpdateDatafeedResponse.g.cs
@@ -18,44 +18,206 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.MachineLearning;
 
+internal sealed partial class UpdateDatafeedResponseConverter : System.Text.Json.Serialization.JsonConverter<UpdateDatafeedResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropAuthorization = System.Text.Json.JsonEncodedText.Encode("authorization");
+	private static readonly System.Text.Json.JsonEncodedText PropChunkingConfig = System.Text.Json.JsonEncodedText.Encode("chunking_config");
+	private static readonly System.Text.Json.JsonEncodedText PropDatafeedId = System.Text.Json.JsonEncodedText.Encode("datafeed_id");
+	private static readonly System.Text.Json.JsonEncodedText PropDelayedDataCheckConfig = System.Text.Json.JsonEncodedText.Encode("delayed_data_check_config");
+	private static readonly System.Text.Json.JsonEncodedText PropFrequency = System.Text.Json.JsonEncodedText.Encode("frequency");
+	private static readonly System.Text.Json.JsonEncodedText PropIndices = System.Text.Json.JsonEncodedText.Encode("indices");
+	private static readonly System.Text.Json.JsonEncodedText PropIndicesOptions = System.Text.Json.JsonEncodedText.Encode("indices_options");
+	private static readonly System.Text.Json.JsonEncodedText PropJobId = System.Text.Json.JsonEncodedText.Encode("job_id");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxEmptySearches = System.Text.Json.JsonEncodedText.Encode("max_empty_searches");
+	private static readonly System.Text.Json.JsonEncodedText PropQuery = System.Text.Json.JsonEncodedText.Encode("query");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryDelay = System.Text.Json.JsonEncodedText.Encode("query_delay");
+	private static readonly System.Text.Json.JsonEncodedText PropRuntimeMappings = System.Text.Json.JsonEncodedText.Encode("runtime_mappings");
+	private static readonly System.Text.Json.JsonEncodedText PropScriptFields = System.Text.Json.JsonEncodedText.Encode("script_fields");
+	private static readonly System.Text.Json.JsonEncodedText PropScrollSize = System.Text.Json.JsonEncodedText.Encode("scroll_size");
+
+	public override UpdateDatafeedResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.Aggregation>?> propAggregations = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DatafeedAuthorization?> propAuthorization = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.ChunkingConfig> propChunkingConfig = default;
+		LocalJsonProperty<string> propDatafeedId = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DelayedDataCheckConfig?> propDelayedDataCheckConfig = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Duration?> propFrequency = default;
+		LocalJsonProperty<IReadOnlyCollection<string>> propIndices = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.IndicesOptions?> propIndicesOptions = default;
+		LocalJsonProperty<string> propJobId = default;
+		LocalJsonProperty<int?> propMaxEmptySearches = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query> propQuery = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Duration> propQueryDelay = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Mapping.RuntimeField>?> propRuntimeMappings = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.ScriptField>?> propScriptFields = default;
+		LocalJsonProperty<int> propScrollSize = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAggregations.TryRead(ref reader, options, PropAggregations))
+			{
+				continue;
+			}
+
+			if (propAuthorization.TryRead(ref reader, options, PropAuthorization))
+			{
+				continue;
+			}
+
+			if (propChunkingConfig.TryRead(ref reader, options, PropChunkingConfig))
+			{
+				continue;
+			}
+
+			if (propDatafeedId.TryRead(ref reader, options, PropDatafeedId))
+			{
+				continue;
+			}
+
+			if (propDelayedDataCheckConfig.TryRead(ref reader, options, PropDelayedDataCheckConfig))
+			{
+				continue;
+			}
+
+			if (propFrequency.TryRead(ref reader, options, PropFrequency))
+			{
+				continue;
+			}
+
+			if (propIndices.TryRead(ref reader, options, PropIndices))
+			{
+				continue;
+			}
+
+			if (propIndicesOptions.TryRead(ref reader, options, PropIndicesOptions))
+			{
+				continue;
+			}
+
+			if (propJobId.TryRead(ref reader, options, PropJobId))
+			{
+				continue;
+			}
+
+			if (propMaxEmptySearches.TryRead(ref reader, options, PropMaxEmptySearches))
+			{
+				continue;
+			}
+
+			if (propQuery.TryRead(ref reader, options, PropQuery))
+			{
+				continue;
+			}
+
+			if (propQueryDelay.TryRead(ref reader, options, PropQueryDelay))
+			{
+				continue;
+			}
+
+			if (propRuntimeMappings.TryRead(ref reader, options, PropRuntimeMappings))
+			{
+				continue;
+			}
+
+			if (propScriptFields.TryRead(ref reader, options, PropScriptFields))
+			{
+				continue;
+			}
+
+			if (propScrollSize.TryRead(ref reader, options, PropScrollSize))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new UpdateDatafeedResponse
+		{
+			Aggregations = propAggregations.Value
+,
+			Authorization = propAuthorization.Value
+,
+			ChunkingConfig = propChunkingConfig.Value
+,
+			DatafeedId = propDatafeedId.Value
+,
+			DelayedDataCheckConfig = propDelayedDataCheckConfig.Value
+,
+			Frequency = propFrequency.Value
+,
+			Indices = propIndices.Value
+,
+			IndicesOptions = propIndicesOptions.Value
+,
+			JobId = propJobId.Value
+,
+			MaxEmptySearches = propMaxEmptySearches.Value
+,
+			Query = propQuery.Value
+,
+			QueryDelay = propQueryDelay.Value
+,
+			RuntimeMappings = propRuntimeMappings.Value
+,
+			ScriptFields = propScriptFields.Value
+,
+			ScrollSize = propScrollSize.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, UpdateDatafeedResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAggregations, value.Aggregations);
+		writer.WriteProperty(options, PropAuthorization, value.Authorization);
+		writer.WriteProperty(options, PropChunkingConfig, value.ChunkingConfig);
+		writer.WriteProperty(options, PropDatafeedId, value.DatafeedId);
+		writer.WriteProperty(options, PropDelayedDataCheckConfig, value.DelayedDataCheckConfig);
+		writer.WriteProperty(options, PropFrequency, value.Frequency);
+		writer.WriteProperty(options, PropIndices, value.Indices);
+		writer.WriteProperty(options, PropIndicesOptions, value.IndicesOptions);
+		writer.WriteProperty(options, PropJobId, value.JobId);
+		writer.WriteProperty(options, PropMaxEmptySearches, value.MaxEmptySearches);
+		writer.WriteProperty(options, PropQuery, value.Query);
+		writer.WriteProperty(options, PropQueryDelay, value.QueryDelay);
+		writer.WriteProperty(options, PropRuntimeMappings, value.RuntimeMappings);
+		writer.WriteProperty(options, PropScriptFields, value.ScriptFields);
+		writer.WriteProperty(options, PropScrollSize, value.ScrollSize);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(UpdateDatafeedResponseConverter))]
 public sealed partial class UpdateDatafeedResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("aggregations")]
 	public IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.Aggregation>? Aggregations { get; init; }
-	[JsonInclude, JsonPropertyName("authorization")]
 	public Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DatafeedAuthorization? Authorization { get; init; }
-	[JsonInclude, JsonPropertyName("chunking_config")]
 	public Elastic.Clients.Elasticsearch.Serverless.MachineLearning.ChunkingConfig ChunkingConfig { get; init; }
-	[JsonInclude, JsonPropertyName("datafeed_id")]
 	public string DatafeedId { get; init; }
-	[JsonInclude, JsonPropertyName("delayed_data_check_config")]
 	public Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DelayedDataCheckConfig? DelayedDataCheckConfig { get; init; }
-	[JsonInclude, JsonPropertyName("frequency")]
 	public Elastic.Clients.Elasticsearch.Serverless.Duration? Frequency { get; init; }
-	[JsonInclude, JsonPropertyName("indices")]
 	public IReadOnlyCollection<string> Indices { get; init; }
-	[JsonInclude, JsonPropertyName("indices_options")]
 	public Elastic.Clients.Elasticsearch.Serverless.IndicesOptions? IndicesOptions { get; init; }
-	[JsonInclude, JsonPropertyName("job_id")]
 	public string JobId { get; init; }
-	[JsonInclude, JsonPropertyName("max_empty_searches")]
 	public int? MaxEmptySearches { get; init; }
-	[JsonInclude, JsonPropertyName("query")]
 	public Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query Query { get; init; }
-	[JsonInclude, JsonPropertyName("query_delay")]
 	public Elastic.Clients.Elasticsearch.Serverless.Duration QueryDelay { get; init; }
-	[JsonInclude, JsonPropertyName("runtime_mappings")]
 	public IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Mapping.RuntimeField>? RuntimeMappings { get; init; }
-	[JsonInclude, JsonPropertyName("script_fields")]
 	public IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.ScriptField>? ScriptFields { get; init; }
-	[JsonInclude, JsonPropertyName("scroll_size")]
 	public int ScrollSize { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/UpdateFilterResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/UpdateFilterResponse.g.cs
index bb37ade045d..4395dac504f 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/UpdateFilterResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/UpdateFilterResponse.g.cs
@@ -18,20 +18,74 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.MachineLearning;
 
+internal sealed partial class UpdateFilterResponseConverter : System.Text.Json.Serialization.JsonConverter<UpdateFilterResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropDescription = System.Text.Json.JsonEncodedText.Encode("description");
+	private static readonly System.Text.Json.JsonEncodedText PropFilterId = System.Text.Json.JsonEncodedText.Encode("filter_id");
+	private static readonly System.Text.Json.JsonEncodedText PropItems = System.Text.Json.JsonEncodedText.Encode("items");
+
+	public override UpdateFilterResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propDescription = default;
+		LocalJsonProperty<string> propFilterId = default;
+		LocalJsonProperty<IReadOnlyCollection<string>> propItems = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propDescription.TryRead(ref reader, options, PropDescription))
+			{
+				continue;
+			}
+
+			if (propFilterId.TryRead(ref reader, options, PropFilterId))
+			{
+				continue;
+			}
+
+			if (propItems.TryRead(ref reader, options, PropItems))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new UpdateFilterResponse
+		{
+			Description = propDescription.Value
+,
+			FilterId = propFilterId.Value
+,
+			Items = propItems.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, UpdateFilterResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDescription, value.Description);
+		writer.WriteProperty(options, PropFilterId, value.FilterId);
+		writer.WriteProperty(options, PropItems, value.Items);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(UpdateFilterResponseConverter))]
 public sealed partial class UpdateFilterResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("description")]
 	public string Description { get; init; }
-	[JsonInclude, JsonPropertyName("filter_id")]
 	public string FilterId { get; init; }
-	[JsonInclude, JsonPropertyName("items")]
 	public IReadOnlyCollection<string> Items { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/UpdateJobResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/UpdateJobResponse.g.cs
index 3ed5d32ed5e..60368e86000 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/UpdateJobResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/UpdateJobResponse.g.cs
@@ -18,56 +18,272 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.MachineLearning;
 
+internal sealed partial class UpdateJobResponseConverter : System.Text.Json.Serialization.JsonConverter<UpdateJobResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAllowLazyOpen = System.Text.Json.JsonEncodedText.Encode("allow_lazy_open");
+	private static readonly System.Text.Json.JsonEncodedText PropAnalysisConfig = System.Text.Json.JsonEncodedText.Encode("analysis_config");
+	private static readonly System.Text.Json.JsonEncodedText PropAnalysisLimits = System.Text.Json.JsonEncodedText.Encode("analysis_limits");
+	private static readonly System.Text.Json.JsonEncodedText PropBackgroundPersistInterval = System.Text.Json.JsonEncodedText.Encode("background_persist_interval");
+	private static readonly System.Text.Json.JsonEncodedText PropCreateTime = System.Text.Json.JsonEncodedText.Encode("create_time");
+	private static readonly System.Text.Json.JsonEncodedText PropCustomSettings = System.Text.Json.JsonEncodedText.Encode("custom_settings");
+	private static readonly System.Text.Json.JsonEncodedText PropDailyModelSnapshotRetentionAfterDays = System.Text.Json.JsonEncodedText.Encode("daily_model_snapshot_retention_after_days");
+	private static readonly System.Text.Json.JsonEncodedText PropDataDescription = System.Text.Json.JsonEncodedText.Encode("data_description");
+	private static readonly System.Text.Json.JsonEncodedText PropDatafeedConfig = System.Text.Json.JsonEncodedText.Encode("datafeed_config");
+	private static readonly System.Text.Json.JsonEncodedText PropDescription = System.Text.Json.JsonEncodedText.Encode("description");
+	private static readonly System.Text.Json.JsonEncodedText PropFinishedTime = System.Text.Json.JsonEncodedText.Encode("finished_time");
+	private static readonly System.Text.Json.JsonEncodedText PropGroups = System.Text.Json.JsonEncodedText.Encode("groups");
+	private static readonly System.Text.Json.JsonEncodedText PropJobId = System.Text.Json.JsonEncodedText.Encode("job_id");
+	private static readonly System.Text.Json.JsonEncodedText PropJobType = System.Text.Json.JsonEncodedText.Encode("job_type");
+	private static readonly System.Text.Json.JsonEncodedText PropJobVersion = System.Text.Json.JsonEncodedText.Encode("job_version");
+	private static readonly System.Text.Json.JsonEncodedText PropModelPlotConfig = System.Text.Json.JsonEncodedText.Encode("model_plot_config");
+	private static readonly System.Text.Json.JsonEncodedText PropModelSnapshotId = System.Text.Json.JsonEncodedText.Encode("model_snapshot_id");
+	private static readonly System.Text.Json.JsonEncodedText PropModelSnapshotRetentionDays = System.Text.Json.JsonEncodedText.Encode("model_snapshot_retention_days");
+	private static readonly System.Text.Json.JsonEncodedText PropRenormalizationWindowDays = System.Text.Json.JsonEncodedText.Encode("renormalization_window_days");
+	private static readonly System.Text.Json.JsonEncodedText PropResultsIndexName = System.Text.Json.JsonEncodedText.Encode("results_index_name");
+	private static readonly System.Text.Json.JsonEncodedText PropResultsRetentionDays = System.Text.Json.JsonEncodedText.Encode("results_retention_days");
+
+	public override UpdateJobResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAllowLazyOpen = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.AnalysisConfigRead> propAnalysisConfig = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.AnalysisLimits> propAnalysisLimits = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Duration?> propBackgroundPersistInterval = default;
+		LocalJsonProperty<long> propCreateTime = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, string>?> propCustomSettings = default;
+		LocalJsonProperty<long> propDailyModelSnapshotRetentionAfterDays = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataDescription> propDataDescription = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.Datafeed?> propDatafeedConfig = default;
+		LocalJsonProperty<string?> propDescription = default;
+		LocalJsonProperty<long?> propFinishedTime = default;
+		LocalJsonProperty<IReadOnlyCollection<string>?> propGroups = default;
+		LocalJsonProperty<string> propJobId = default;
+		LocalJsonProperty<string> propJobType = default;
+		LocalJsonProperty<string> propJobVersion = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.ModelPlotConfig?> propModelPlotConfig = default;
+		LocalJsonProperty<string?> propModelSnapshotId = default;
+		LocalJsonProperty<long> propModelSnapshotRetentionDays = default;
+		LocalJsonProperty<long?> propRenormalizationWindowDays = default;
+		LocalJsonProperty<string> propResultsIndexName = default;
+		LocalJsonProperty<long?> propResultsRetentionDays = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAllowLazyOpen.TryRead(ref reader, options, PropAllowLazyOpen))
+			{
+				continue;
+			}
+
+			if (propAnalysisConfig.TryRead(ref reader, options, PropAnalysisConfig))
+			{
+				continue;
+			}
+
+			if (propAnalysisLimits.TryRead(ref reader, options, PropAnalysisLimits))
+			{
+				continue;
+			}
+
+			if (propBackgroundPersistInterval.TryRead(ref reader, options, PropBackgroundPersistInterval))
+			{
+				continue;
+			}
+
+			if (propCreateTime.TryRead(ref reader, options, PropCreateTime))
+			{
+				continue;
+			}
+
+			if (propCustomSettings.TryRead(ref reader, options, PropCustomSettings))
+			{
+				continue;
+			}
+
+			if (propDailyModelSnapshotRetentionAfterDays.TryRead(ref reader, options, PropDailyModelSnapshotRetentionAfterDays))
+			{
+				continue;
+			}
+
+			if (propDataDescription.TryRead(ref reader, options, PropDataDescription))
+			{
+				continue;
+			}
+
+			if (propDatafeedConfig.TryRead(ref reader, options, PropDatafeedConfig))
+			{
+				continue;
+			}
+
+			if (propDescription.TryRead(ref reader, options, PropDescription))
+			{
+				continue;
+			}
+
+			if (propFinishedTime.TryRead(ref reader, options, PropFinishedTime))
+			{
+				continue;
+			}
+
+			if (propGroups.TryRead(ref reader, options, PropGroups))
+			{
+				continue;
+			}
+
+			if (propJobId.TryRead(ref reader, options, PropJobId))
+			{
+				continue;
+			}
+
+			if (propJobType.TryRead(ref reader, options, PropJobType))
+			{
+				continue;
+			}
+
+			if (propJobVersion.TryRead(ref reader, options, PropJobVersion))
+			{
+				continue;
+			}
+
+			if (propModelPlotConfig.TryRead(ref reader, options, PropModelPlotConfig))
+			{
+				continue;
+			}
+
+			if (propModelSnapshotId.TryRead(ref reader, options, PropModelSnapshotId))
+			{
+				continue;
+			}
+
+			if (propModelSnapshotRetentionDays.TryRead(ref reader, options, PropModelSnapshotRetentionDays))
+			{
+				continue;
+			}
+
+			if (propRenormalizationWindowDays.TryRead(ref reader, options, PropRenormalizationWindowDays))
+			{
+				continue;
+			}
+
+			if (propResultsIndexName.TryRead(ref reader, options, PropResultsIndexName))
+			{
+				continue;
+			}
+
+			if (propResultsRetentionDays.TryRead(ref reader, options, PropResultsRetentionDays))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new UpdateJobResponse
+		{
+			AllowLazyOpen = propAllowLazyOpen.Value
+,
+			AnalysisConfig = propAnalysisConfig.Value
+,
+			AnalysisLimits = propAnalysisLimits.Value
+,
+			BackgroundPersistInterval = propBackgroundPersistInterval.Value
+,
+			CreateTime = propCreateTime.Value
+,
+			CustomSettings = propCustomSettings.Value
+,
+			DailyModelSnapshotRetentionAfterDays = propDailyModelSnapshotRetentionAfterDays.Value
+,
+			DataDescription = propDataDescription.Value
+,
+			DatafeedConfig = propDatafeedConfig.Value
+,
+			Description = propDescription.Value
+,
+			FinishedTime = propFinishedTime.Value
+,
+			Groups = propGroups.Value
+,
+			JobId = propJobId.Value
+,
+			JobType = propJobType.Value
+,
+			JobVersion = propJobVersion.Value
+,
+			ModelPlotConfig = propModelPlotConfig.Value
+,
+			ModelSnapshotId = propModelSnapshotId.Value
+,
+			ModelSnapshotRetentionDays = propModelSnapshotRetentionDays.Value
+,
+			RenormalizationWindowDays = propRenormalizationWindowDays.Value
+,
+			ResultsIndexName = propResultsIndexName.Value
+,
+			ResultsRetentionDays = propResultsRetentionDays.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, UpdateJobResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAllowLazyOpen, value.AllowLazyOpen);
+		writer.WriteProperty(options, PropAnalysisConfig, value.AnalysisConfig);
+		writer.WriteProperty(options, PropAnalysisLimits, value.AnalysisLimits);
+		writer.WriteProperty(options, PropBackgroundPersistInterval, value.BackgroundPersistInterval);
+		writer.WriteProperty(options, PropCreateTime, value.CreateTime);
+		writer.WriteProperty(options, PropCustomSettings, value.CustomSettings);
+		writer.WriteProperty(options, PropDailyModelSnapshotRetentionAfterDays, value.DailyModelSnapshotRetentionAfterDays);
+		writer.WriteProperty(options, PropDataDescription, value.DataDescription);
+		writer.WriteProperty(options, PropDatafeedConfig, value.DatafeedConfig);
+		writer.WriteProperty(options, PropDescription, value.Description);
+		writer.WriteProperty(options, PropFinishedTime, value.FinishedTime);
+		writer.WriteProperty(options, PropGroups, value.Groups);
+		writer.WriteProperty(options, PropJobId, value.JobId);
+		writer.WriteProperty(options, PropJobType, value.JobType);
+		writer.WriteProperty(options, PropJobVersion, value.JobVersion);
+		writer.WriteProperty(options, PropModelPlotConfig, value.ModelPlotConfig);
+		writer.WriteProperty(options, PropModelSnapshotId, value.ModelSnapshotId);
+		writer.WriteProperty(options, PropModelSnapshotRetentionDays, value.ModelSnapshotRetentionDays);
+		writer.WriteProperty(options, PropRenormalizationWindowDays, value.RenormalizationWindowDays);
+		writer.WriteProperty(options, PropResultsIndexName, value.ResultsIndexName);
+		writer.WriteProperty(options, PropResultsRetentionDays, value.ResultsRetentionDays);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(UpdateJobResponseConverter))]
 public sealed partial class UpdateJobResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("allow_lazy_open")]
 	public bool AllowLazyOpen { get; init; }
-	[JsonInclude, JsonPropertyName("analysis_config")]
 	public Elastic.Clients.Elasticsearch.Serverless.MachineLearning.AnalysisConfigRead AnalysisConfig { get; init; }
-	[JsonInclude, JsonPropertyName("analysis_limits")]
 	public Elastic.Clients.Elasticsearch.Serverless.MachineLearning.AnalysisLimits AnalysisLimits { get; init; }
-	[JsonInclude, JsonPropertyName("background_persist_interval")]
 	public Elastic.Clients.Elasticsearch.Serverless.Duration? BackgroundPersistInterval { get; init; }
-	[JsonInclude, JsonPropertyName("create_time")]
 	public long CreateTime { get; init; }
-	[JsonInclude, JsonPropertyName("custom_settings")]
 	public IReadOnlyDictionary<string, string>? CustomSettings { get; init; }
-	[JsonInclude, JsonPropertyName("daily_model_snapshot_retention_after_days")]
 	public long DailyModelSnapshotRetentionAfterDays { get; init; }
-	[JsonInclude, JsonPropertyName("data_description")]
 	public Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataDescription DataDescription { get; init; }
-	[JsonInclude, JsonPropertyName("datafeed_config")]
 	public Elastic.Clients.Elasticsearch.Serverless.MachineLearning.Datafeed? DatafeedConfig { get; init; }
-	[JsonInclude, JsonPropertyName("description")]
 	public string? Description { get; init; }
-	[JsonInclude, JsonPropertyName("finished_time")]
 	public long? FinishedTime { get; init; }
-	[JsonInclude, JsonPropertyName("groups")]
 	public IReadOnlyCollection<string>? Groups { get; init; }
-	[JsonInclude, JsonPropertyName("job_id")]
 	public string JobId { get; init; }
-	[JsonInclude, JsonPropertyName("job_type")]
 	public string JobType { get; init; }
-	[JsonInclude, JsonPropertyName("job_version")]
 	public string JobVersion { get; init; }
-	[JsonInclude, JsonPropertyName("model_plot_config")]
 	public Elastic.Clients.Elasticsearch.Serverless.MachineLearning.ModelPlotConfig? ModelPlotConfig { get; init; }
-	[JsonInclude, JsonPropertyName("model_snapshot_id")]
 	public string? ModelSnapshotId { get; init; }
-	[JsonInclude, JsonPropertyName("model_snapshot_retention_days")]
 	public long ModelSnapshotRetentionDays { get; init; }
-	[JsonInclude, JsonPropertyName("renormalization_window_days")]
 	public long? RenormalizationWindowDays { get; init; }
-	[JsonInclude, JsonPropertyName("results_index_name")]
 	public string ResultsIndexName { get; init; }
-	[JsonInclude, JsonPropertyName("results_retention_days")]
 	public long? ResultsRetentionDays { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/UpdateModelSnapshotResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/UpdateModelSnapshotResponse.g.cs
index b9b8e2ac13c..e5d86d1aec7 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/UpdateModelSnapshotResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/UpdateModelSnapshotResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.MachineLearning;
 
+internal sealed partial class UpdateModelSnapshotResponseConverter : System.Text.Json.Serialization.JsonConverter<UpdateModelSnapshotResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+	private static readonly System.Text.Json.JsonEncodedText PropModel = System.Text.Json.JsonEncodedText.Encode("model");
+
+	public override UpdateModelSnapshotResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.ModelSnapshot> propModel = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			if (propModel.TryRead(ref reader, options, PropModel))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new UpdateModelSnapshotResponse
+		{
+			Acknowledged = propAcknowledged.Value
+,
+			Model = propModel.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, UpdateModelSnapshotResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteProperty(options, PropModel, value.Model);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(UpdateModelSnapshotResponseConverter))]
 public sealed partial class UpdateModelSnapshotResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("acknowledged")]
 	public bool Acknowledged { get; init; }
-	[JsonInclude, JsonPropertyName("model")]
 	public Elastic.Clients.Elasticsearch.Serverless.MachineLearning.ModelSnapshot Model { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/UpgradeJobSnapshotResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/UpgradeJobSnapshotResponse.g.cs
index 0b0d55c900d..19d675cb473 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/UpgradeJobSnapshotResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/UpgradeJobSnapshotResponse.g.cs
@@ -18,14 +18,61 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.MachineLearning;
 
+internal sealed partial class UpgradeJobSnapshotResponseConverter : System.Text.Json.Serialization.JsonConverter<UpgradeJobSnapshotResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCompleted = System.Text.Json.JsonEncodedText.Encode("completed");
+	private static readonly System.Text.Json.JsonEncodedText PropNode = System.Text.Json.JsonEncodedText.Encode("node");
+
+	public override UpgradeJobSnapshotResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propCompleted = default;
+		LocalJsonProperty<string> propNode = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCompleted.TryRead(ref reader, options, PropCompleted))
+			{
+				continue;
+			}
+
+			if (propNode.TryRead(ref reader, options, PropNode))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new UpgradeJobSnapshotResponse
+		{
+			Completed = propCompleted.Value
+,
+			Node = propNode.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, UpgradeJobSnapshotResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCompleted, value.Completed);
+		writer.WriteProperty(options, PropNode, value.Node);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(UpgradeJobSnapshotResponseConverter))]
 public sealed partial class UpgradeJobSnapshotResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,7 +80,6 @@ public sealed partial class UpgradeJobSnapshotResponse : ElasticsearchResponse
 	/// When true, this means the task is complete. When false, it is still running.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("completed")]
 	public bool Completed { get; init; }
 
 	/// <summary>
@@ -41,6 +87,5 @@ public sealed partial class UpgradeJobSnapshotResponse : ElasticsearchResponse
 	/// The ID of the node that the upgrade task was started on if it is still running. In serverless this will be the "serverless".
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("node")]
 	public string Node { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/ValidateDetectorRequest.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/ValidateDetectorRequest.g.cs
index f911314146a..86cc644fdb9 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/ValidateDetectorRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/ValidateDetectorRequest.g.cs
@@ -39,7 +39,7 @@ public sealed partial class ValidateDetectorRequestParameters : RequestParameter
 /// Validate an anomaly detection job.
 /// </para>
 /// </summary>
-public sealed partial class ValidateDetectorRequest : PlainRequest<ValidateDetectorRequestParameters>, ISelfSerializable
+public sealed partial class ValidateDetectorRequest : PlainRequest<ValidateDetectorRequestParameters>, ISelfTwoWaySerializable
 {
 	internal override ApiUrls ApiUrls => ApiUrlLookup.MachineLearningValidateDetector;
 
@@ -49,13 +49,17 @@ public sealed partial class ValidateDetectorRequest : PlainRequest<ValidateDetec
 
 	internal override string OperationName => "ml.validate_detector";
 
-	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Serverless.MachineLearning.Detector Detector { get; set; }
 
-	void ISelfSerializable.Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
+	void ISelfTwoWaySerializable.Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 	{
 		JsonSerializer.Serialize(writer, Detector, options);
 	}
+
+	void ISelfTwoWaySerializable.Deserialize(ref Utf8JsonReader reader, JsonSerializerOptions options, IElasticsearchClientSettings settings)
+	{
+		Detector = settings.RequestResponseSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.Detector>(ref reader);
+	}
 }
 
 /// <summary>
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/ValidateDetectorResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/ValidateDetectorResponse.g.cs
index 9b25cee80ac..cfd780710c8 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/ValidateDetectorResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/ValidateDetectorResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.MachineLearning;
 
+internal sealed partial class ValidateDetectorResponseConverter : System.Text.Json.Serialization.JsonConverter<ValidateDetectorResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override ValidateDetectorResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ValidateDetectorResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ValidateDetectorResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ValidateDetectorResponseConverter))]
 public sealed partial class ValidateDetectorResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class ValidateDetectorResponse : ElasticsearchResponse
 	/// 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.Serverless/_Generated/Api/MachineLearning/ValidateResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/ValidateResponse.g.cs
index 338fd739327..eba96de6f5e 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/ValidateResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MachineLearning/ValidateResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.MachineLearning;
 
+internal sealed partial class ValidateResponseConverter : System.Text.Json.Serialization.JsonConverter<ValidateResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override ValidateResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ValidateResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ValidateResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ValidateResponseConverter))]
 public sealed partial class ValidateResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class ValidateResponse : ElasticsearchResponse
 	/// 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.Serverless/_Generated/Api/MultiGetResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MultiGetResponse.g.cs
index 9f71d27fc58..6bc6609ec6a 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MultiGetResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MultiGetResponse.g.cs
@@ -18,16 +18,69 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless;
 
+internal sealed partial class MultiGetResponseConverter<TDocument> : System.Text.Json.Serialization.JsonConverter<MultiGetResponse<TDocument>>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropDocs = System.Text.Json.JsonEncodedText.Encode("docs");
+
+	public override MultiGetResponse<TDocument> Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Core.MGet.MultiGetResponseItem<TDocument>>> propDocs = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propDocs.TryRead(ref reader, options, PropDocs))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new MultiGetResponse<TDocument>
+		{
+			Docs = propDocs.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, MultiGetResponse<TDocument> value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDocs, value.Docs);
+		writer.WriteEndObject();
+	}
+}
+
+internal sealed partial class MultiGetResponseConverterFactory : System.Text.Json.Serialization.JsonConverterFactory
+{
+	public override bool CanConvert(System.Type typeToConvert)
+	{
+		return typeToConvert.IsGenericType && typeToConvert.GetGenericTypeDefinition() == typeof(MultiGetResponse<>);
+	}
+
+	public override System.Text.Json.Serialization.JsonConverter CreateConverter(System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		var args = typeToConvert.GetGenericArguments();
+#pragma warning disable IL3050
+		var converter = (System.Text.Json.Serialization.JsonConverter)System.Activator.CreateInstance(typeof(MultiGetResponseConverter<>).MakeGenericType(args[0]), System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public, binder: null, args: null, culture: null)!;
+#pragma warning restore IL3050
+		return converter;
+	}
+}
+
+[JsonConverter(typeof(MultiGetResponseConverterFactory))]
 public sealed partial class MultiGetResponse<TDocument> : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("docs")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Core.MGet.MultiGetResponseItem<TDocument>> Docs { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MultiSearchResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MultiSearchResponse.g.cs
index 740fdd5233f..a2a704cc5f9 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MultiSearchResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MultiSearchResponse.g.cs
@@ -18,18 +18,80 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless;
 
+internal sealed partial class MultiSearchResponseConverter<TDocument> : System.Text.Json.Serialization.JsonConverter<MultiSearchResponse<TDocument>>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropResponses = System.Text.Json.JsonEncodedText.Encode("responses");
+	private static readonly System.Text.Json.JsonEncodedText PropTook = System.Text.Json.JsonEncodedText.Encode("took");
+
+	public override MultiSearchResponse<TDocument> Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Core.MSearch.MultiSearchResponseItem<TDocument>>> propResponses = default;
+		LocalJsonProperty<long> propTook = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propResponses.TryRead(ref reader, options, PropResponses))
+			{
+				continue;
+			}
+
+			if (propTook.TryRead(ref reader, options, PropTook))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new MultiSearchResponse<TDocument>
+		{
+			Responses = propResponses.Value
+,
+			Took = propTook.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, MultiSearchResponse<TDocument> value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropResponses, value.Responses);
+		writer.WriteProperty(options, PropTook, value.Took);
+		writer.WriteEndObject();
+	}
+}
+
+internal sealed partial class MultiSearchResponseConverterFactory : System.Text.Json.Serialization.JsonConverterFactory
+{
+	public override bool CanConvert(System.Type typeToConvert)
+	{
+		return typeToConvert.IsGenericType && typeToConvert.GetGenericTypeDefinition() == typeof(MultiSearchResponse<>);
+	}
+
+	public override System.Text.Json.Serialization.JsonConverter CreateConverter(System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		var args = typeToConvert.GetGenericArguments();
+#pragma warning disable IL3050
+		var converter = (System.Text.Json.Serialization.JsonConverter)System.Activator.CreateInstance(typeof(MultiSearchResponseConverter<>).MakeGenericType(args[0]), System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public, binder: null, args: null, culture: null)!;
+#pragma warning restore IL3050
+		return converter;
+	}
+}
+
+[JsonConverter(typeof(MultiSearchResponseConverterFactory))]
 public sealed partial class MultiSearchResponse<TDocument> : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("responses")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.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.Serverless/_Generated/Api/MultiSearchTemplateResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MultiSearchTemplateResponse.g.cs
index 8c59f80a1ab..2a2227083fb 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MultiSearchTemplateResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MultiSearchTemplateResponse.g.cs
@@ -18,18 +18,80 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless;
 
+internal sealed partial class MultiSearchTemplateResponseConverter<TDocument> : System.Text.Json.Serialization.JsonConverter<MultiSearchTemplateResponse<TDocument>>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropResponses = System.Text.Json.JsonEncodedText.Encode("responses");
+	private static readonly System.Text.Json.JsonEncodedText PropTook = System.Text.Json.JsonEncodedText.Encode("took");
+
+	public override MultiSearchTemplateResponse<TDocument> Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Core.MSearch.MultiSearchResponseItem<TDocument>>> propResponses = default;
+		LocalJsonProperty<long> propTook = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propResponses.TryRead(ref reader, options, PropResponses))
+			{
+				continue;
+			}
+
+			if (propTook.TryRead(ref reader, options, PropTook))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new MultiSearchTemplateResponse<TDocument>
+		{
+			Responses = propResponses.Value
+,
+			Took = propTook.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, MultiSearchTemplateResponse<TDocument> value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropResponses, value.Responses);
+		writer.WriteProperty(options, PropTook, value.Took);
+		writer.WriteEndObject();
+	}
+}
+
+internal sealed partial class MultiSearchTemplateResponseConverterFactory : System.Text.Json.Serialization.JsonConverterFactory
+{
+	public override bool CanConvert(System.Type typeToConvert)
+	{
+		return typeToConvert.IsGenericType && typeToConvert.GetGenericTypeDefinition() == typeof(MultiSearchTemplateResponse<>);
+	}
+
+	public override System.Text.Json.Serialization.JsonConverter CreateConverter(System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		var args = typeToConvert.GetGenericArguments();
+#pragma warning disable IL3050
+		var converter = (System.Text.Json.Serialization.JsonConverter)System.Activator.CreateInstance(typeof(MultiSearchTemplateResponseConverter<>).MakeGenericType(args[0]), System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public, binder: null, args: null, culture: null)!;
+#pragma warning restore IL3050
+		return converter;
+	}
+}
+
+[JsonConverter(typeof(MultiSearchTemplateResponseConverterFactory))]
 public sealed partial class MultiSearchTemplateResponse<TDocument> : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("responses")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.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.Serverless/_Generated/Api/MultiTermVectorsResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MultiTermVectorsResponse.g.cs
index 49360764fd3..97d42a42c44 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MultiTermVectorsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/MultiTermVectorsResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless;
 
+internal sealed partial class MultiTermVectorsResponseConverter : System.Text.Json.Serialization.JsonConverter<MultiTermVectorsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropDocs = System.Text.Json.JsonEncodedText.Encode("docs");
+
+	public override MultiTermVectorsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Core.Mtermvectors.MultiTermVectorsResult>> propDocs = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propDocs.TryRead(ref reader, options, PropDocs))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new MultiTermVectorsResponse
+		{
+			Docs = propDocs.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, MultiTermVectorsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDocs, value.Docs);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(MultiTermVectorsResponseConverter))]
 public sealed partial class MultiTermVectorsResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("docs")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Core.Mtermvectors.MultiTermVectorsResult> Docs { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Nodes/HotThreadsResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Nodes/HotThreadsResponse.g.cs
index 12ae0ee843d..ffd1116d103 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Nodes/HotThreadsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Nodes/HotThreadsResponse.g.cs
@@ -18,14 +18,39 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Nodes;
 
+internal sealed partial class HotThreadsResponseConverter : System.Text.Json.Serialization.JsonConverter<HotThreadsResponse>
+{
+	public override HotThreadsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new HotThreadsResponse { };
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, HotThreadsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(HotThreadsResponseConverter))]
 public sealed partial class HotThreadsResponse : ElasticsearchResponse
 {
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Nodes/NodesInfoResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Nodes/NodesInfoResponse.g.cs
index e4455498428..59427c10aa9 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Nodes/NodesInfoResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Nodes/NodesInfoResponse.g.cs
@@ -18,19 +18,74 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Nodes;
 
+internal sealed partial class NodesInfoResponseConverter : System.Text.Json.Serialization.JsonConverter<NodesInfoResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropClusterName = System.Text.Json.JsonEncodedText.Encode("cluster_name");
+	private static readonly System.Text.Json.JsonEncodedText PropNodes = System.Text.Json.JsonEncodedText.Encode("nodes");
+	private static readonly System.Text.Json.JsonEncodedText PropNodeStats = System.Text.Json.JsonEncodedText.Encode("_nodes");
+
+	public override NodesInfoResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propClusterName = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Nodes.NodeInfo>> propNodes = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.NodeStatistics?> propNodeStats = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propClusterName.TryRead(ref reader, options, PropClusterName))
+			{
+				continue;
+			}
+
+			if (propNodes.TryRead(ref reader, options, PropNodes))
+			{
+				continue;
+			}
+
+			if (propNodeStats.TryRead(ref reader, options, PropNodeStats))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new NodesInfoResponse
+		{
+			ClusterName = propClusterName.Value
+,
+			Nodes = propNodes.Value
+,
+			NodeStats = propNodeStats.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, NodesInfoResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropClusterName, value.ClusterName);
+		writer.WriteProperty(options, PropNodes, value.Nodes);
+		writer.WriteProperty(options, PropNodeStats, value.NodeStats);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(NodesInfoResponseConverter))]
 public sealed partial class NodesInfoResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("cluster_name")]
 	public string ClusterName { get; init; }
-	[JsonInclude, JsonPropertyName("nodes")]
 	public IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Nodes.NodeInfo> Nodes { get; init; }
 
 	/// <summary>
@@ -38,6 +93,5 @@ public sealed partial class NodesInfoResponse : ElasticsearchResponse
 	/// Contains statistics about the number of nodes selected by the request’s node filters.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("_nodes")]
 	public Elastic.Clients.Elasticsearch.Serverless.NodeStatistics? NodeStats { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Nodes/NodesStatsResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Nodes/NodesStatsResponse.g.cs
index c61a304dbc5..120a0229cad 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Nodes/NodesStatsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Nodes/NodesStatsResponse.g.cs
@@ -18,19 +18,74 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Nodes;
 
+internal sealed partial class NodesStatsResponseConverter : System.Text.Json.Serialization.JsonConverter<NodesStatsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropClusterName = System.Text.Json.JsonEncodedText.Encode("cluster_name");
+	private static readonly System.Text.Json.JsonEncodedText PropNodes = System.Text.Json.JsonEncodedText.Encode("nodes");
+	private static readonly System.Text.Json.JsonEncodedText PropNodeStats = System.Text.Json.JsonEncodedText.Encode("_nodes");
+
+	public override NodesStatsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string?> propClusterName = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Nodes.Stats>> propNodes = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.NodeStatistics?> propNodeStats = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propClusterName.TryRead(ref reader, options, PropClusterName))
+			{
+				continue;
+			}
+
+			if (propNodes.TryRead(ref reader, options, PropNodes))
+			{
+				continue;
+			}
+
+			if (propNodeStats.TryRead(ref reader, options, PropNodeStats))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new NodesStatsResponse
+		{
+			ClusterName = propClusterName.Value
+,
+			Nodes = propNodes.Value
+,
+			NodeStats = propNodeStats.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, NodesStatsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropClusterName, value.ClusterName);
+		writer.WriteProperty(options, PropNodes, value.Nodes);
+		writer.WriteProperty(options, PropNodeStats, value.NodeStats);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(NodesStatsResponseConverter))]
 public sealed partial class NodesStatsResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("cluster_name")]
 	public string? ClusterName { get; init; }
-	[JsonInclude, JsonPropertyName("nodes")]
 	public IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Nodes.Stats> Nodes { get; init; }
 
 	/// <summary>
@@ -38,6 +93,5 @@ public sealed partial class NodesStatsResponse : ElasticsearchResponse
 	/// Contains statistics about the number of nodes selected by the request’s node filters.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("_nodes")]
 	public Elastic.Clients.Elasticsearch.Serverless.NodeStatistics? NodeStats { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Nodes/NodesUsageResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Nodes/NodesUsageResponse.g.cs
index 2b034f606ba..c6d70946abb 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Nodes/NodesUsageResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Nodes/NodesUsageResponse.g.cs
@@ -18,19 +18,74 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Nodes;
 
+internal sealed partial class NodesUsageResponseConverter : System.Text.Json.Serialization.JsonConverter<NodesUsageResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropClusterName = System.Text.Json.JsonEncodedText.Encode("cluster_name");
+	private static readonly System.Text.Json.JsonEncodedText PropNodes = System.Text.Json.JsonEncodedText.Encode("nodes");
+	private static readonly System.Text.Json.JsonEncodedText PropNodeStats = System.Text.Json.JsonEncodedText.Encode("_nodes");
+
+	public override NodesUsageResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propClusterName = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Nodes.NodeUsage>> propNodes = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.NodeStatistics?> propNodeStats = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propClusterName.TryRead(ref reader, options, PropClusterName))
+			{
+				continue;
+			}
+
+			if (propNodes.TryRead(ref reader, options, PropNodes))
+			{
+				continue;
+			}
+
+			if (propNodeStats.TryRead(ref reader, options, PropNodeStats))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new NodesUsageResponse
+		{
+			ClusterName = propClusterName.Value
+,
+			Nodes = propNodes.Value
+,
+			NodeStats = propNodeStats.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, NodesUsageResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropClusterName, value.ClusterName);
+		writer.WriteProperty(options, PropNodes, value.Nodes);
+		writer.WriteProperty(options, PropNodeStats, value.NodeStats);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(NodesUsageResponseConverter))]
 public sealed partial class NodesUsageResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("cluster_name")]
 	public string ClusterName { get; init; }
-	[JsonInclude, JsonPropertyName("nodes")]
 	public IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Nodes.NodeUsage> Nodes { get; init; }
 
 	/// <summary>
@@ -38,6 +93,5 @@ public sealed partial class NodesUsageResponse : ElasticsearchResponse
 	/// Contains statistics about the number of nodes selected by the request’s node filters.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("_nodes")]
 	public Elastic.Clients.Elasticsearch.Serverless.NodeStatistics? NodeStats { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/OpenPointInTimeResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/OpenPointInTimeResponse.g.cs
index b31084c2922..4bca69ed967 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/OpenPointInTimeResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/OpenPointInTimeResponse.g.cs
@@ -18,17 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless;
 
+internal sealed partial class OpenPointInTimeResponseConverter : System.Text.Json.Serialization.JsonConverter<OpenPointInTimeResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("id");
+	private static readonly System.Text.Json.JsonEncodedText PropShards = System.Text.Json.JsonEncodedText.Encode("_shards");
+
+	public override OpenPointInTimeResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propId = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.ShardStatistics> propShards = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propId.TryRead(ref reader, options, PropId))
+			{
+				continue;
+			}
+
+			if (propShards.TryRead(ref reader, options, PropShards))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new OpenPointInTimeResponse
+		{
+			Id = propId.Value
+,
+			Shards = propShards.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, OpenPointInTimeResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropId, value.Id);
+		writer.WriteProperty(options, PropShards, value.Shards);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(OpenPointInTimeResponseConverter))]
 public sealed partial class OpenPointInTimeResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("id")]
 	public string Id { get; init; }
 
 	/// <summary>
@@ -36,6 +82,5 @@ public sealed partial class OpenPointInTimeResponse : ElasticsearchResponse
 	/// Shards used to create the PIT
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("_shards")]
 	public Elastic.Clients.Elasticsearch.Serverless.ShardStatistics Shards { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/PutScriptResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/PutScriptResponse.g.cs
index bcbe6d1caf9..be7cb9d04e6 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/PutScriptResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/PutScriptResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless;
 
+internal sealed partial class PutScriptResponseConverter : System.Text.Json.Serialization.JsonConverter<PutScriptResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override PutScriptResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutScriptResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutScriptResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PutScriptResponseConverter))]
 public sealed partial class PutScriptResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class PutScriptResponse : ElasticsearchResponse
 	/// 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.Serverless/_Generated/Api/QueryRules/DeleteRuleResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/QueryRules/DeleteRuleResponse.g.cs
index 110941115db..7c448554d5a 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/QueryRules/DeleteRuleResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/QueryRules/DeleteRuleResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.QueryRules;
 
+internal sealed partial class DeleteRuleResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteRuleResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override DeleteRuleResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteRuleResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteRuleResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteRuleResponseConverter))]
 public sealed partial class DeleteRuleResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class DeleteRuleResponse : ElasticsearchResponse
 	/// 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.Serverless/_Generated/Api/QueryRules/DeleteRulesetResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/QueryRules/DeleteRulesetResponse.g.cs
index 84c27bf6567..1831206a0e7 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/QueryRules/DeleteRulesetResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/QueryRules/DeleteRulesetResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.QueryRules;
 
+internal sealed partial class DeleteRulesetResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteRulesetResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override DeleteRulesetResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteRulesetResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteRulesetResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteRulesetResponseConverter))]
 public sealed partial class DeleteRulesetResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class DeleteRulesetResponse : ElasticsearchResponse
 	/// 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.Serverless/_Generated/Api/QueryRules/GetRuleResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/QueryRules/GetRuleResponse.g.cs
index d9ad7a19416..bfca91bf0a7 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/QueryRules/GetRuleResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/QueryRules/GetRuleResponse.g.cs
@@ -18,14 +18,91 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.QueryRules;
 
+internal sealed partial class GetRuleResponseConverter : System.Text.Json.Serialization.JsonConverter<GetRuleResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropActions = System.Text.Json.JsonEncodedText.Encode("actions");
+	private static readonly System.Text.Json.JsonEncodedText PropCriteria = System.Text.Json.JsonEncodedText.Encode("criteria");
+	private static readonly System.Text.Json.JsonEncodedText PropPriority = System.Text.Json.JsonEncodedText.Encode("priority");
+	private static readonly System.Text.Json.JsonEncodedText PropRuleId = System.Text.Json.JsonEncodedText.Encode("rule_id");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override GetRuleResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.QueryRules.QueryRuleActions> propActions = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.QueryRules.QueryRuleCriteria>> propCriteria = default;
+		LocalJsonProperty<int?> propPriority = default;
+		LocalJsonProperty<string> propRuleId = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.QueryRules.QueryRuleType> propType = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propActions.TryRead(ref reader, options, PropActions))
+			{
+				continue;
+			}
+
+			if (propCriteria.TryRead(ref reader, options, PropCriteria, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.QueryRules.QueryRuleCriteria>, Elastic.Clients.Elasticsearch.Serverless.QueryRules.QueryRuleCriteria>)))
+			{
+				continue;
+			}
+
+			if (propPriority.TryRead(ref reader, options, PropPriority))
+			{
+				continue;
+			}
+
+			if (propRuleId.TryRead(ref reader, options, PropRuleId))
+			{
+				continue;
+			}
+
+			if (propType.TryRead(ref reader, options, PropType))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetRuleResponse
+		{
+			Actions = propActions.Value
+,
+			Criteria = propCriteria.Value
+,
+			Priority = propPriority.Value
+,
+			RuleId = propRuleId.Value
+,
+			Type = propType.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetRuleResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropActions, value.Actions);
+		writer.WriteProperty(options, PropCriteria, value.Criteria, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.QueryRules.QueryRuleCriteria>, Elastic.Clients.Elasticsearch.Serverless.QueryRules.QueryRuleCriteria>));
+		writer.WriteProperty(options, PropPriority, value.Priority);
+		writer.WriteProperty(options, PropRuleId, value.RuleId);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetRuleResponseConverter))]
 public sealed partial class GetRuleResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -34,7 +111,6 @@ public sealed partial class GetRuleResponse : ElasticsearchResponse
 	/// The format of this action depends on the rule type.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("actions")]
 	public Elastic.Clients.Elasticsearch.Serverless.QueryRules.QueryRuleActions Actions { get; init; }
 
 	/// <summary>
@@ -43,10 +119,7 @@ public sealed partial class GetRuleResponse : ElasticsearchResponse
 	/// If multiple criteria are specified for a rule, all criteria must be met for the rule to be applied.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("criteria")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.Serverless.QueryRules.QueryRuleCriteria))]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.QueryRules.QueryRuleCriteria> Criteria { get; init; }
-	[JsonInclude, JsonPropertyName("priority")]
 	public int? Priority { get; init; }
 
 	/// <summary>
@@ -54,7 +127,6 @@ public sealed partial class GetRuleResponse : ElasticsearchResponse
 	/// A unique identifier for the rule.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("rule_id")]
 	public string RuleId { get; init; }
 
 	/// <summary>
@@ -64,6 +136,5 @@ public sealed partial class GetRuleResponse : ElasticsearchResponse
 	/// <c>exclude</c> will exclude specific documents from search results.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("type")]
 	public Elastic.Clients.Elasticsearch.Serverless.QueryRules.QueryRuleType Type { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/QueryRules/GetRulesetResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/QueryRules/GetRulesetResponse.g.cs
index d74cfd27de9..aacda151c93 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/QueryRules/GetRulesetResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/QueryRules/GetRulesetResponse.g.cs
@@ -18,14 +18,61 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.QueryRules;
 
+internal sealed partial class GetRulesetResponseConverter : System.Text.Json.Serialization.JsonConverter<GetRulesetResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropRules = System.Text.Json.JsonEncodedText.Encode("rules");
+	private static readonly System.Text.Json.JsonEncodedText PropRulesetId = System.Text.Json.JsonEncodedText.Encode("ruleset_id");
+
+	public override GetRulesetResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.QueryRules.QueryRule>> propRules = default;
+		LocalJsonProperty<string> propRulesetId = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propRules.TryRead(ref reader, options, PropRules))
+			{
+				continue;
+			}
+
+			if (propRulesetId.TryRead(ref reader, options, PropRulesetId))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetRulesetResponse
+		{
+			Rules = propRules.Value
+,
+			RulesetId = propRulesetId.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetRulesetResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropRules, value.Rules);
+		writer.WriteProperty(options, PropRulesetId, value.RulesetId);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetRulesetResponseConverter))]
 public sealed partial class GetRulesetResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,7 +80,6 @@ public sealed partial class GetRulesetResponse : ElasticsearchResponse
 	/// Rules associated with the query ruleset.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("rules")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.QueryRules.QueryRule> Rules { get; init; }
 
 	/// <summary>
@@ -41,6 +87,5 @@ public sealed partial class GetRulesetResponse : ElasticsearchResponse
 	/// A unique identifier for the ruleset.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("ruleset_id")]
 	public string RulesetId { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/QueryRules/ListRulesetsResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/QueryRules/ListRulesetsResponse.g.cs
index f318fa1003c..94ac6034466 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/QueryRules/ListRulesetsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/QueryRules/ListRulesetsResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.QueryRules;
 
+internal sealed partial class ListRulesetsResponseConverter : System.Text.Json.Serialization.JsonConverter<ListRulesetsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCount = System.Text.Json.JsonEncodedText.Encode("count");
+	private static readonly System.Text.Json.JsonEncodedText PropResults = System.Text.Json.JsonEncodedText.Encode("results");
+
+	public override ListRulesetsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<long> propCount = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.QueryRules.QueryRulesetListItem>> propResults = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCount.TryRead(ref reader, options, PropCount))
+			{
+				continue;
+			}
+
+			if (propResults.TryRead(ref reader, options, PropResults))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ListRulesetsResponse
+		{
+			Count = propCount.Value
+,
+			Results = propResults.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ListRulesetsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCount, value.Count);
+		writer.WriteProperty(options, PropResults, value.Results);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ListRulesetsResponseConverter))]
 public sealed partial class ListRulesetsResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("count")]
 	public long Count { get; init; }
-	[JsonInclude, JsonPropertyName("results")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.QueryRules.QueryRulesetListItem> Results { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/QueryRules/PutRuleRequest.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/QueryRules/PutRuleRequest.g.cs
index 091422a640c..2843c3bbcde 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/QueryRules/PutRuleRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/QueryRules/PutRuleRequest.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Requests;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport;
@@ -34,6 +35,69 @@ public sealed partial class PutRuleRequestParameters : RequestParameters
 {
 }
 
+internal sealed partial class PutRuleRequestConverter : System.Text.Json.Serialization.JsonConverter<PutRuleRequest>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropActions = System.Text.Json.JsonEncodedText.Encode("actions");
+	private static readonly System.Text.Json.JsonEncodedText PropCriteria = System.Text.Json.JsonEncodedText.Encode("criteria");
+	private static readonly System.Text.Json.JsonEncodedText PropPriority = System.Text.Json.JsonEncodedText.Encode("priority");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override PutRuleRequest Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.QueryRules.QueryRuleActions> propActions = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.QueryRules.QueryRuleCriteria>> propCriteria = default;
+		LocalJsonProperty<int?> propPriority = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.QueryRules.QueryRuleType> propType = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propActions.TryRead(ref reader, options, PropActions))
+			{
+				continue;
+			}
+
+			if (propCriteria.TryRead(ref reader, options, PropCriteria, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.QueryRules.QueryRuleCriteria>, Elastic.Clients.Elasticsearch.Serverless.QueryRules.QueryRuleCriteria>)))
+			{
+				continue;
+			}
+
+			if (propPriority.TryRead(ref reader, options, PropPriority))
+			{
+				continue;
+			}
+
+			if (propType.TryRead(ref reader, options, PropType))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutRuleRequest
+		{
+			Actions = propActions.Value
+,
+			Criteria = propCriteria.Value
+,
+			Priority = propPriority.Value
+,
+			Type = propType.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutRuleRequest value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropActions, value.Actions);
+		writer.WriteProperty(options, PropCriteria, value.Criteria, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.QueryRules.QueryRuleCriteria>, Elastic.Clients.Elasticsearch.Serverless.QueryRules.QueryRuleCriteria>));
+		writer.WriteProperty(options, PropPriority, value.Priority);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
 /// <summary>
 /// <para>
 /// Create or update a query rule.
@@ -46,6 +110,7 @@ public sealed partial class PutRuleRequestParameters : RequestParameters
 /// If multiple matching rules pin more than 100 documents, only the first 100 documents are pinned in the order they are specified in the ruleset.
 /// </para>
 /// </summary>
+[JsonConverter(typeof(PutRuleRequestConverter))]
 public sealed partial class PutRuleRequest : PlainRequest<PutRuleRequestParameters>
 {
 	public PutRuleRequest(Elastic.Clients.Elasticsearch.Serverless.Id rulesetId, Elastic.Clients.Elasticsearch.Serverless.Id ruleId) : base(r => r.Required("ruleset_id", rulesetId).Required("rule_id", ruleId))
@@ -66,7 +131,6 @@ public PutRuleRequest(Elastic.Clients.Elasticsearch.Serverless.Id rulesetId, Ela
 	/// The format of this action depends on the rule type.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("actions")]
 	public Elastic.Clients.Elasticsearch.Serverless.QueryRules.QueryRuleActions Actions { get; set; }
 
 	/// <summary>
@@ -75,10 +139,7 @@ public PutRuleRequest(Elastic.Clients.Elasticsearch.Serverless.Id rulesetId, Ela
 	/// If multiple criteria are specified for a rule, all criteria must be met for the rule to be applied.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("criteria")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.Serverless.QueryRules.QueryRuleCriteria))]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.QueryRules.QueryRuleCriteria> Criteria { get; set; }
-	[JsonInclude, JsonPropertyName("priority")]
 	public int? Priority { get; set; }
 
 	/// <summary>
@@ -86,7 +147,6 @@ public PutRuleRequest(Elastic.Clients.Elasticsearch.Serverless.Id rulesetId, Ela
 	/// The type of rule.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("type")]
 	public Elastic.Clients.Elasticsearch.Serverless.QueryRules.QueryRuleType Type { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/QueryRules/PutRuleResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/QueryRules/PutRuleResponse.g.cs
index aa8c2bc922d..cb6c5adf056 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/QueryRules/PutRuleResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/QueryRules/PutRuleResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.QueryRules;
 
+internal sealed partial class PutRuleResponseConverter : System.Text.Json.Serialization.JsonConverter<PutRuleResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropResult = System.Text.Json.JsonEncodedText.Encode("result");
+
+	public override PutRuleResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Result> propResult = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propResult.TryRead(ref reader, options, PropResult))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutRuleResponse
+		{
+			Result = propResult.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutRuleResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropResult, value.Result);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PutRuleResponseConverter))]
 public sealed partial class PutRuleResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("result")]
 	public Elastic.Clients.Elasticsearch.Serverless.Result Result { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/QueryRules/PutRulesetRequest.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/QueryRules/PutRulesetRequest.g.cs
index 824807eba5a..8cd31448b70 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/QueryRules/PutRulesetRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/QueryRules/PutRulesetRequest.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Requests;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport;
@@ -34,6 +35,39 @@ public sealed partial class PutRulesetRequestParameters : RequestParameters
 {
 }
 
+internal sealed partial class PutRulesetRequestConverter : System.Text.Json.Serialization.JsonConverter<PutRulesetRequest>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropRules = System.Text.Json.JsonEncodedText.Encode("rules");
+
+	public override PutRulesetRequest Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.QueryRules.QueryRule>> propRules = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propRules.TryRead(ref reader, options, PropRules, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.QueryRules.QueryRule>, Elastic.Clients.Elasticsearch.Serverless.QueryRules.QueryRule>)))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutRulesetRequest
+		{
+			Rules = propRules.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutRulesetRequest value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropRules, value.Rules, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.QueryRules.QueryRule>, Elastic.Clients.Elasticsearch.Serverless.QueryRules.QueryRule>));
+		writer.WriteEndObject();
+	}
+}
+
 /// <summary>
 /// <para>
 /// Create or update a query ruleset.
@@ -47,6 +81,7 @@ public sealed partial class PutRulesetRequestParameters : RequestParameters
 /// If multiple matching rules pin more than 100 documents, only the first 100 documents are pinned in the order they are specified in the ruleset.
 /// </para>
 /// </summary>
+[JsonConverter(typeof(PutRulesetRequestConverter))]
 public sealed partial class PutRulesetRequest : PlainRequest<PutRulesetRequestParameters>
 {
 	public PutRulesetRequest(Elastic.Clients.Elasticsearch.Serverless.Id rulesetId) : base(r => r.Required("ruleset_id", rulesetId))
@@ -61,8 +96,6 @@ public PutRulesetRequest(Elastic.Clients.Elasticsearch.Serverless.Id rulesetId)
 
 	internal override string OperationName => "query_rules.put_ruleset";
 
-	[JsonInclude, JsonPropertyName("rules")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.Serverless.QueryRules.QueryRule))]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.QueryRules.QueryRule> Rules { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/QueryRules/PutRulesetResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/QueryRules/PutRulesetResponse.g.cs
index 3500ffe97f4..c2f3f334e95 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/QueryRules/PutRulesetResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/QueryRules/PutRulesetResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.QueryRules;
 
+internal sealed partial class PutRulesetResponseConverter : System.Text.Json.Serialization.JsonConverter<PutRulesetResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropResult = System.Text.Json.JsonEncodedText.Encode("result");
+
+	public override PutRulesetResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Result> propResult = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propResult.TryRead(ref reader, options, PropResult))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutRulesetResponse
+		{
+			Result = propResult.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutRulesetResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropResult, value.Result);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PutRulesetResponseConverter))]
 public sealed partial class PutRulesetResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("result")]
 	public Elastic.Clients.Elasticsearch.Serverless.Result Result { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/QueryRules/TestResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/QueryRules/TestResponse.g.cs
index f2999d2d408..8e606b3ca27 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/QueryRules/TestResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/QueryRules/TestResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.QueryRules;
 
+internal sealed partial class TestResponseConverter : System.Text.Json.Serialization.JsonConverter<TestResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropMatchedRules = System.Text.Json.JsonEncodedText.Encode("matched_rules");
+	private static readonly System.Text.Json.JsonEncodedText PropTotalMatchedRules = System.Text.Json.JsonEncodedText.Encode("total_matched_rules");
+
+	public override TestResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.QueryRules.QueryRulesetMatchedRule>> propMatchedRules = default;
+		LocalJsonProperty<int> propTotalMatchedRules = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propMatchedRules.TryRead(ref reader, options, PropMatchedRules))
+			{
+				continue;
+			}
+
+			if (propTotalMatchedRules.TryRead(ref reader, options, PropTotalMatchedRules))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new TestResponse
+		{
+			MatchedRules = propMatchedRules.Value
+,
+			TotalMatchedRules = propTotalMatchedRules.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, TestResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropMatchedRules, value.MatchedRules);
+		writer.WriteProperty(options, PropTotalMatchedRules, value.TotalMatchedRules);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(TestResponseConverter))]
 public sealed partial class TestResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("matched_rules")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.QueryRules.QueryRulesetMatchedRule> MatchedRules { get; init; }
-	[JsonInclude, JsonPropertyName("total_matched_rules")]
 	public int TotalMatchedRules { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/RankEvalResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/RankEvalResponse.g.cs
index 52a07698d2f..c93cb06e1d3 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/RankEvalResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/RankEvalResponse.g.cs
@@ -18,14 +18,71 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless;
 
+internal sealed partial class RankEvalResponseConverter : System.Text.Json.Serialization.JsonConverter<RankEvalResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropDetails = System.Text.Json.JsonEncodedText.Encode("details");
+	private static readonly System.Text.Json.JsonEncodedText PropFailures = System.Text.Json.JsonEncodedText.Encode("failures");
+	private static readonly System.Text.Json.JsonEncodedText PropMetricScore = System.Text.Json.JsonEncodedText.Encode("metric_score");
+
+	public override RankEvalResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Core.RankEval.RankEvalMetricDetail>> propDetails = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, object>> propFailures = default;
+		LocalJsonProperty<double> propMetricScore = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propDetails.TryRead(ref reader, options, PropDetails))
+			{
+				continue;
+			}
+
+			if (propFailures.TryRead(ref reader, options, PropFailures))
+			{
+				continue;
+			}
+
+			if (propMetricScore.TryRead(ref reader, options, PropMetricScore))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new RankEvalResponse
+		{
+			Details = propDetails.Value
+,
+			Failures = propFailures.Value
+,
+			MetricScore = propMetricScore.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, RankEvalResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDetails, value.Details);
+		writer.WriteProperty(options, PropFailures, value.Failures);
+		writer.WriteProperty(options, PropMetricScore, value.MetricScore);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(RankEvalResponseConverter))]
 public sealed partial class RankEvalResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,9 +90,7 @@ public sealed partial class RankEvalResponse : ElasticsearchResponse
 	/// 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<string, Elastic.Clients.Elasticsearch.Serverless.Core.RankEval.RankEvalMetricDetail> Details { get; init; }
-	[JsonInclude, JsonPropertyName("failures")]
 	public IReadOnlyDictionary<string, object> Failures { get; init; }
 
 	/// <summary>
@@ -43,6 +98,5 @@ public sealed partial class RankEvalResponse : ElasticsearchResponse
 	/// 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.Serverless/_Generated/Api/ReindexResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/ReindexResponse.g.cs
index b6ff9020f2f..471beb7eb6e 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/ReindexResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/ReindexResponse.g.cs
@@ -18,46 +18,217 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless;
 
+internal sealed partial class ReindexResponseConverter : System.Text.Json.Serialization.JsonConverter<ReindexResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropBatches = System.Text.Json.JsonEncodedText.Encode("batches");
+	private static readonly System.Text.Json.JsonEncodedText PropCreated = System.Text.Json.JsonEncodedText.Encode("created");
+	private static readonly System.Text.Json.JsonEncodedText PropDeleted = System.Text.Json.JsonEncodedText.Encode("deleted");
+	private static readonly System.Text.Json.JsonEncodedText PropFailures = System.Text.Json.JsonEncodedText.Encode("failures");
+	private static readonly System.Text.Json.JsonEncodedText PropNoops = System.Text.Json.JsonEncodedText.Encode("noops");
+	private static readonly System.Text.Json.JsonEncodedText PropRequestsPerSecond = System.Text.Json.JsonEncodedText.Encode("requests_per_second");
+	private static readonly System.Text.Json.JsonEncodedText PropRetries = System.Text.Json.JsonEncodedText.Encode("retries");
+	private static readonly System.Text.Json.JsonEncodedText PropSliceId = System.Text.Json.JsonEncodedText.Encode("slice_id");
+	private static readonly System.Text.Json.JsonEncodedText PropTask = System.Text.Json.JsonEncodedText.Encode("task");
+	private static readonly System.Text.Json.JsonEncodedText PropThrottledMillis = System.Text.Json.JsonEncodedText.Encode("throttled_millis");
+	private static readonly System.Text.Json.JsonEncodedText PropThrottledUntilMillis = System.Text.Json.JsonEncodedText.Encode("throttled_until_millis");
+	private static readonly System.Text.Json.JsonEncodedText PropTimedOut = System.Text.Json.JsonEncodedText.Encode("timed_out");
+	private static readonly System.Text.Json.JsonEncodedText PropTook = System.Text.Json.JsonEncodedText.Encode("took");
+	private static readonly System.Text.Json.JsonEncodedText PropTotal = System.Text.Json.JsonEncodedText.Encode("total");
+	private static readonly System.Text.Json.JsonEncodedText PropUpdated = System.Text.Json.JsonEncodedText.Encode("updated");
+	private static readonly System.Text.Json.JsonEncodedText PropVersionConflicts = System.Text.Json.JsonEncodedText.Encode("version_conflicts");
+
+	public override ReindexResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<long?> propBatches = default;
+		LocalJsonProperty<long?> propCreated = default;
+		LocalJsonProperty<long?> propDeleted = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.BulkIndexByScrollFailure>?> propFailures = default;
+		LocalJsonProperty<long?> propNoops = default;
+		LocalJsonProperty<float?> propRequestsPerSecond = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Retries?> propRetries = default;
+		LocalJsonProperty<int?> propSliceId = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.TaskId?> propTask = default;
+		LocalJsonProperty<long?> propThrottledMillis = default;
+		LocalJsonProperty<long?> propThrottledUntilMillis = default;
+		LocalJsonProperty<bool?> propTimedOut = default;
+		LocalJsonProperty<long?> propTook = default;
+		LocalJsonProperty<long?> propTotal = default;
+		LocalJsonProperty<long?> propUpdated = default;
+		LocalJsonProperty<long?> propVersionConflicts = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBatches.TryRead(ref reader, options, PropBatches))
+			{
+				continue;
+			}
+
+			if (propCreated.TryRead(ref reader, options, PropCreated))
+			{
+				continue;
+			}
+
+			if (propDeleted.TryRead(ref reader, options, PropDeleted))
+			{
+				continue;
+			}
+
+			if (propFailures.TryRead(ref reader, options, PropFailures))
+			{
+				continue;
+			}
+
+			if (propNoops.TryRead(ref reader, options, PropNoops))
+			{
+				continue;
+			}
+
+			if (propRequestsPerSecond.TryRead(ref reader, options, PropRequestsPerSecond))
+			{
+				continue;
+			}
+
+			if (propRetries.TryRead(ref reader, options, PropRetries))
+			{
+				continue;
+			}
+
+			if (propSliceId.TryRead(ref reader, options, PropSliceId))
+			{
+				continue;
+			}
+
+			if (propTask.TryRead(ref reader, options, PropTask))
+			{
+				continue;
+			}
+
+			if (propThrottledMillis.TryRead(ref reader, options, PropThrottledMillis))
+			{
+				continue;
+			}
+
+			if (propThrottledUntilMillis.TryRead(ref reader, options, PropThrottledUntilMillis))
+			{
+				continue;
+			}
+
+			if (propTimedOut.TryRead(ref reader, options, PropTimedOut))
+			{
+				continue;
+			}
+
+			if (propTook.TryRead(ref reader, options, PropTook))
+			{
+				continue;
+			}
+
+			if (propTotal.TryRead(ref reader, options, PropTotal))
+			{
+				continue;
+			}
+
+			if (propUpdated.TryRead(ref reader, options, PropUpdated))
+			{
+				continue;
+			}
+
+			if (propVersionConflicts.TryRead(ref reader, options, PropVersionConflicts))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ReindexResponse
+		{
+			Batches = propBatches.Value
+,
+			Created = propCreated.Value
+,
+			Deleted = propDeleted.Value
+,
+			Failures = propFailures.Value
+,
+			Noops = propNoops.Value
+,
+			RequestsPerSecond = propRequestsPerSecond.Value
+,
+			Retries = propRetries.Value
+,
+			SliceId = propSliceId.Value
+,
+			Task = propTask.Value
+,
+			ThrottledMillis = propThrottledMillis.Value
+,
+			ThrottledUntilMillis = propThrottledUntilMillis.Value
+,
+			TimedOut = propTimedOut.Value
+,
+			Took = propTook.Value
+,
+			Total = propTotal.Value
+,
+			Updated = propUpdated.Value
+,
+			VersionConflicts = propVersionConflicts.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ReindexResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBatches, value.Batches);
+		writer.WriteProperty(options, PropCreated, value.Created);
+		writer.WriteProperty(options, PropDeleted, value.Deleted);
+		writer.WriteProperty(options, PropFailures, value.Failures);
+		writer.WriteProperty(options, PropNoops, value.Noops);
+		writer.WriteProperty(options, PropRequestsPerSecond, value.RequestsPerSecond);
+		writer.WriteProperty(options, PropRetries, value.Retries);
+		writer.WriteProperty(options, PropSliceId, value.SliceId);
+		writer.WriteProperty(options, PropTask, value.Task);
+		writer.WriteProperty(options, PropThrottledMillis, value.ThrottledMillis);
+		writer.WriteProperty(options, PropThrottledUntilMillis, value.ThrottledUntilMillis);
+		writer.WriteProperty(options, PropTimedOut, value.TimedOut);
+		writer.WriteProperty(options, PropTook, value.Took);
+		writer.WriteProperty(options, PropTotal, value.Total);
+		writer.WriteProperty(options, PropUpdated, value.Updated);
+		writer.WriteProperty(options, PropVersionConflicts, value.VersionConflicts);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ReindexResponseConverter))]
 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.Serverless.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.Serverless.Retries? Retries { get; init; }
-	[JsonInclude, JsonPropertyName("slice_id")]
 	public int? SliceId { get; init; }
-	[JsonInclude, JsonPropertyName("task")]
 	public Elastic.Clients.Elasticsearch.Serverless.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.Serverless/_Generated/Api/ReindexRethrottleResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/ReindexRethrottleResponse.g.cs
index 19f4f37fe97..ee3a0083b51 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/ReindexRethrottleResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/ReindexRethrottleResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless;
 
+internal sealed partial class ReindexRethrottleResponseConverter : System.Text.Json.Serialization.JsonConverter<ReindexRethrottleResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropNodes = System.Text.Json.JsonEncodedText.Encode("nodes");
+
+	public override ReindexRethrottleResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Core.ReindexRethrottle.ReindexNode>> propNodes = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propNodes.TryRead(ref reader, options, PropNodes))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ReindexRethrottleResponse
+		{
+			Nodes = propNodes.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ReindexRethrottleResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropNodes, value.Nodes);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ReindexRethrottleResponseConverter))]
 public sealed partial class ReindexRethrottleResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("nodes")]
 	public IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Core.ReindexRethrottle.ReindexNode> Nodes { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/RenderSearchTemplateResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/RenderSearchTemplateResponse.g.cs
index 0ca6fcf6f2f..dc4a9986fa5 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/RenderSearchTemplateResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/RenderSearchTemplateResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless;
 
+internal sealed partial class RenderSearchTemplateResponseConverter : System.Text.Json.Serialization.JsonConverter<RenderSearchTemplateResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropTemplateOutput = System.Text.Json.JsonEncodedText.Encode("template_output");
+
+	public override RenderSearchTemplateResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyDictionary<string, object>> propTemplateOutput = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propTemplateOutput.TryRead(ref reader, options, PropTemplateOutput))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new RenderSearchTemplateResponse
+		{
+			TemplateOutput = propTemplateOutput.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, RenderSearchTemplateResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropTemplateOutput, value.TemplateOutput);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(RenderSearchTemplateResponseConverter))]
 public sealed partial class RenderSearchTemplateResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("template_output")]
 	public IReadOnlyDictionary<string, object> TemplateOutput { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/ScrollResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/ScrollResponse.g.cs
index 3a5ffc51772..67175517348 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/ScrollResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/ScrollResponse.g.cs
@@ -18,42 +18,212 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless;
 
+internal sealed partial class ScrollResponseConverter<TDocument> : System.Text.Json.Serialization.JsonConverter<ScrollResponse<TDocument>>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropClusters = System.Text.Json.JsonEncodedText.Encode("_clusters");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropHitsMetadata = System.Text.Json.JsonEncodedText.Encode("hits");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxScore = System.Text.Json.JsonEncodedText.Encode("max_score");
+	private static readonly System.Text.Json.JsonEncodedText PropNumReducePhases = System.Text.Json.JsonEncodedText.Encode("num_reduce_phases");
+	private static readonly System.Text.Json.JsonEncodedText PropPitId = System.Text.Json.JsonEncodedText.Encode("pit_id");
+	private static readonly System.Text.Json.JsonEncodedText PropProfile = System.Text.Json.JsonEncodedText.Encode("profile");
+	private static readonly System.Text.Json.JsonEncodedText PropScrollId = System.Text.Json.JsonEncodedText.Encode("_scroll_id");
+	private static readonly System.Text.Json.JsonEncodedText PropShards = System.Text.Json.JsonEncodedText.Encode("_shards");
+	private static readonly System.Text.Json.JsonEncodedText PropSuggest = System.Text.Json.JsonEncodedText.Encode("suggest");
+	private static readonly System.Text.Json.JsonEncodedText PropTerminatedEarly = System.Text.Json.JsonEncodedText.Encode("terminated_early");
+	private static readonly System.Text.Json.JsonEncodedText PropTimedOut = System.Text.Json.JsonEncodedText.Encode("timed_out");
+	private static readonly System.Text.Json.JsonEncodedText PropTook = System.Text.Json.JsonEncodedText.Encode("took");
+
+	public override ScrollResponse<TDocument> Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary?> propAggregations = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.ClusterStatistics?> propClusters = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, object>?> propFields = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Core.Search.HitsMetadata<TDocument>> propHitsMetadata = default;
+		LocalJsonProperty<double?> propMaxScore = default;
+		LocalJsonProperty<long?> propNumReducePhases = default;
+		LocalJsonProperty<string?> propPitId = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Core.Search.Profile?> propProfile = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.ScrollId?> propScrollId = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.ShardStatistics> propShards = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Core.Search.SuggestDictionary<TDocument>?> propSuggest = default;
+		LocalJsonProperty<bool?> propTerminatedEarly = default;
+		LocalJsonProperty<bool> propTimedOut = default;
+		LocalJsonProperty<long> propTook = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAggregations.TryRead(ref reader, options, PropAggregations))
+			{
+				continue;
+			}
+
+			if (propClusters.TryRead(ref reader, options, PropClusters))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propHitsMetadata.TryRead(ref reader, options, PropHitsMetadata))
+			{
+				continue;
+			}
+
+			if (propMaxScore.TryRead(ref reader, options, PropMaxScore))
+			{
+				continue;
+			}
+
+			if (propNumReducePhases.TryRead(ref reader, options, PropNumReducePhases))
+			{
+				continue;
+			}
+
+			if (propPitId.TryRead(ref reader, options, PropPitId))
+			{
+				continue;
+			}
+
+			if (propProfile.TryRead(ref reader, options, PropProfile))
+			{
+				continue;
+			}
+
+			if (propScrollId.TryRead(ref reader, options, PropScrollId))
+			{
+				continue;
+			}
+
+			if (propShards.TryRead(ref reader, options, PropShards))
+			{
+				continue;
+			}
+
+			if (propSuggest.TryRead(ref reader, options, PropSuggest))
+			{
+				continue;
+			}
+
+			if (propTerminatedEarly.TryRead(ref reader, options, PropTerminatedEarly))
+			{
+				continue;
+			}
+
+			if (propTimedOut.TryRead(ref reader, options, PropTimedOut))
+			{
+				continue;
+			}
+
+			if (propTook.TryRead(ref reader, options, PropTook))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ScrollResponse<TDocument>
+		{
+			Aggregations = propAggregations.Value
+,
+			Clusters = propClusters.Value
+,
+			Fields = propFields.Value
+,
+			HitsMetadata = propHitsMetadata.Value
+,
+			MaxScore = propMaxScore.Value
+,
+			NumReducePhases = propNumReducePhases.Value
+,
+			PitId = propPitId.Value
+,
+			Profile = propProfile.Value
+,
+			ScrollId = propScrollId.Value
+,
+			Shards = propShards.Value
+,
+			Suggest = propSuggest.Value
+,
+			TerminatedEarly = propTerminatedEarly.Value
+,
+			TimedOut = propTimedOut.Value
+,
+			Took = propTook.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ScrollResponse<TDocument> value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAggregations, value.Aggregations);
+		writer.WriteProperty(options, PropClusters, value.Clusters);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropHitsMetadata, value.HitsMetadata);
+		writer.WriteProperty(options, PropMaxScore, value.MaxScore);
+		writer.WriteProperty(options, PropNumReducePhases, value.NumReducePhases);
+		writer.WriteProperty(options, PropPitId, value.PitId);
+		writer.WriteProperty(options, PropProfile, value.Profile);
+		writer.WriteProperty(options, PropScrollId, value.ScrollId);
+		writer.WriteProperty(options, PropShards, value.Shards);
+		writer.WriteProperty(options, PropSuggest, value.Suggest);
+		writer.WriteProperty(options, PropTerminatedEarly, value.TerminatedEarly);
+		writer.WriteProperty(options, PropTimedOut, value.TimedOut);
+		writer.WriteProperty(options, PropTook, value.Took);
+		writer.WriteEndObject();
+	}
+}
+
+internal sealed partial class ScrollResponseConverterFactory : System.Text.Json.Serialization.JsonConverterFactory
+{
+	public override bool CanConvert(System.Type typeToConvert)
+	{
+		return typeToConvert.IsGenericType && typeToConvert.GetGenericTypeDefinition() == typeof(ScrollResponse<>);
+	}
+
+	public override System.Text.Json.Serialization.JsonConverter CreateConverter(System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		var args = typeToConvert.GetGenericArguments();
+#pragma warning disable IL3050
+		var converter = (System.Text.Json.Serialization.JsonConverter)System.Activator.CreateInstance(typeof(ScrollResponseConverter<>).MakeGenericType(args[0]), System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public, binder: null, args: null, culture: null)!;
+#pragma warning restore IL3050
+		return converter;
+	}
+}
+
+[JsonConverter(typeof(ScrollResponseConverterFactory))]
 public sealed partial class ScrollResponse<TDocument> : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("aggregations")]
 	public Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary? Aggregations { get; init; }
-	[JsonInclude, JsonPropertyName("_clusters")]
 	public Elastic.Clients.Elasticsearch.Serverless.ClusterStatistics? Clusters { get; init; }
-	[JsonInclude, JsonPropertyName("fields")]
 	public IReadOnlyDictionary<string, object>? Fields { get; init; }
-	[JsonInclude, JsonPropertyName("hits")]
 	public Elastic.Clients.Elasticsearch.Serverless.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.Serverless.Core.Search.Profile? Profile { get; init; }
-	[JsonInclude, JsonPropertyName("_scroll_id")]
 	public Elastic.Clients.Elasticsearch.Serverless.ScrollId? ScrollId { get; init; }
-	[JsonInclude, JsonPropertyName("_shards")]
 	public Elastic.Clients.Elasticsearch.Serverless.ShardStatistics Shards { get; init; }
-	[JsonInclude, JsonPropertyName("suggest")]
 	public Elastic.Clients.Elasticsearch.Serverless.Core.Search.SuggestDictionary<TDocument>? Suggest { 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.Serverless/_Generated/Api/SearchMvtRequest.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/SearchMvtRequest.g.cs
index f66e7e1f320..531e63d53f5 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/SearchMvtRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/SearchMvtRequest.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Requests;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport;
@@ -34,6 +35,169 @@ public sealed partial class SearchMvtRequestParameters : RequestParameters
 {
 }
 
+internal sealed partial class SearchMvtRequestConverter : System.Text.Json.Serialization.JsonConverter<SearchMvtRequest>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAggs = System.Text.Json.JsonEncodedText.Encode("aggs");
+	private static readonly System.Text.Json.JsonEncodedText PropBuffer = System.Text.Json.JsonEncodedText.Encode("buffer");
+	private static readonly System.Text.Json.JsonEncodedText PropExactBounds = System.Text.Json.JsonEncodedText.Encode("exact_bounds");
+	private static readonly System.Text.Json.JsonEncodedText PropExtent = System.Text.Json.JsonEncodedText.Encode("extent");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropGridAgg = System.Text.Json.JsonEncodedText.Encode("grid_agg");
+	private static readonly System.Text.Json.JsonEncodedText PropGridPrecision = System.Text.Json.JsonEncodedText.Encode("grid_precision");
+	private static readonly System.Text.Json.JsonEncodedText PropGridType = System.Text.Json.JsonEncodedText.Encode("grid_type");
+	private static readonly System.Text.Json.JsonEncodedText PropQuery = System.Text.Json.JsonEncodedText.Encode("query");
+	private static readonly System.Text.Json.JsonEncodedText PropRuntimeMappings = System.Text.Json.JsonEncodedText.Encode("runtime_mappings");
+	private static readonly System.Text.Json.JsonEncodedText PropSize = System.Text.Json.JsonEncodedText.Encode("size");
+	private static readonly System.Text.Json.JsonEncodedText PropSort = System.Text.Json.JsonEncodedText.Encode("sort");
+	private static readonly System.Text.Json.JsonEncodedText PropTrackTotalHits = System.Text.Json.JsonEncodedText.Encode("track_total_hits");
+	private static readonly System.Text.Json.JsonEncodedText PropWithLabels = System.Text.Json.JsonEncodedText.Encode("with_labels");
+
+	public override SearchMvtRequest Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.Aggregation>?> propAggs = default;
+		LocalJsonProperty<int?> propBuffer = default;
+		LocalJsonProperty<bool?> propExactBounds = default;
+		LocalJsonProperty<int?> propExtent = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Fields?> propFields = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Core.SearchMvt.GridAggregationType?> propGridAgg = default;
+		LocalJsonProperty<int?> propGridPrecision = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Core.SearchMvt.GridType?> propGridType = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query?> propQuery = default;
+		LocalJsonProperty<IDictionary<Elastic.Clients.Elasticsearch.Serverless.Field, Elastic.Clients.Elasticsearch.Serverless.Mapping.RuntimeField>?> propRuntimeMappings = default;
+		LocalJsonProperty<int?> propSize = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.SortOptions>?> propSort = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Core.Search.TrackHits?> propTrackTotalHits = default;
+		LocalJsonProperty<bool?> propWithLabels = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAggs.TryRead(ref reader, options, PropAggs))
+			{
+				continue;
+			}
+
+			if (propBuffer.TryRead(ref reader, options, PropBuffer))
+			{
+				continue;
+			}
+
+			if (propExactBounds.TryRead(ref reader, options, PropExactBounds))
+			{
+				continue;
+			}
+
+			if (propExtent.TryRead(ref reader, options, PropExtent))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propGridAgg.TryRead(ref reader, options, PropGridAgg))
+			{
+				continue;
+			}
+
+			if (propGridPrecision.TryRead(ref reader, options, PropGridPrecision))
+			{
+				continue;
+			}
+
+			if (propGridType.TryRead(ref reader, options, PropGridType))
+			{
+				continue;
+			}
+
+			if (propQuery.TryRead(ref reader, options, PropQuery))
+			{
+				continue;
+			}
+
+			if (propRuntimeMappings.TryRead(ref reader, options, PropRuntimeMappings))
+			{
+				continue;
+			}
+
+			if (propSize.TryRead(ref reader, options, PropSize))
+			{
+				continue;
+			}
+
+			if (propSort.TryRead(ref reader, options, PropSort, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.SortOptions>?, Elastic.Clients.Elasticsearch.Serverless.SortOptions>)))
+			{
+				continue;
+			}
+
+			if (propTrackTotalHits.TryRead(ref reader, options, PropTrackTotalHits))
+			{
+				continue;
+			}
+
+			if (propWithLabels.TryRead(ref reader, options, PropWithLabels))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SearchMvtRequest
+		{
+			Aggs = propAggs.Value
+,
+			Buffer = propBuffer.Value
+,
+			ExactBounds = propExactBounds.Value
+,
+			Extent = propExtent.Value
+,
+			Fields = propFields.Value
+,
+			GridAgg = propGridAgg.Value
+,
+			GridPrecision = propGridPrecision.Value
+,
+			GridType = propGridType.Value
+,
+			Query = propQuery.Value
+,
+			RuntimeMappings = propRuntimeMappings.Value
+,
+			Size = propSize.Value
+,
+			Sort = propSort.Value
+,
+			TrackTotalHits = propTrackTotalHits.Value
+,
+			WithLabels = propWithLabels.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SearchMvtRequest value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAggs, value.Aggs);
+		writer.WriteProperty(options, PropBuffer, value.Buffer);
+		writer.WriteProperty(options, PropExactBounds, value.ExactBounds);
+		writer.WriteProperty(options, PropExtent, value.Extent);
+		writer.WriteProperty(options, PropFields, value.Fields, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropGridAgg, value.GridAgg);
+		writer.WriteProperty(options, PropGridPrecision, value.GridPrecision);
+		writer.WriteProperty(options, PropGridType, value.GridType);
+		writer.WriteProperty(options, PropQuery, value.Query);
+		writer.WriteProperty(options, PropRuntimeMappings, value.RuntimeMappings);
+		writer.WriteProperty(options, PropSize, value.Size);
+		writer.WriteProperty(options, PropSort, value.Sort, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.SortOptions>?, Elastic.Clients.Elasticsearch.Serverless.SortOptions>));
+		writer.WriteProperty(options, PropTrackTotalHits, value.TrackTotalHits);
+		writer.WriteProperty(options, PropWithLabels, value.WithLabels);
+		writer.WriteEndObject();
+	}
+}
+
 /// <summary>
 /// <para>
 /// Search a vector tile.
@@ -42,6 +206,7 @@ public sealed partial class SearchMvtRequestParameters : RequestParameters
 /// Search a vector tile for geospatial values.
 /// </para>
 /// </summary>
+[JsonConverter(typeof(SearchMvtRequestConverter))]
 public sealed partial class SearchMvtRequest : PlainRequest<SearchMvtRequestParameters>
 {
 	public SearchMvtRequest(Elastic.Clients.Elasticsearch.Serverless.Indices indices, Elastic.Clients.Elasticsearch.Serverless.Field field, int zoom, int x, int y) : base(r => r.Required("index", indices).Required("field", field).Required("zoom", zoom).Required("x", x).Required("y", y))
@@ -91,7 +256,6 @@ public SearchMvtRequest(Elastic.Clients.Elasticsearch.Serverless.Indices indices
 	/// </item>
 	/// </list>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("aggs")]
 	public IDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.Aggregation>? Aggs { get; set; }
 
 	/// <summary>
@@ -100,7 +264,6 @@ public SearchMvtRequest(Elastic.Clients.Elasticsearch.Serverless.Indices indices
 	/// to avoid outline artifacts from geometries that extend past the extent of the tile.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("buffer")]
 	public int? Buffer { get; set; }
 
 	/// <summary>
@@ -112,7 +275,6 @@ public SearchMvtRequest(Elastic.Clients.Elasticsearch.Serverless.Indices indices
 	/// bounding box may be larger than the vector tile.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("exact_bounds")]
 	public bool? ExactBounds { get; set; }
 
 	/// <summary>
@@ -120,7 +282,6 @@ public SearchMvtRequest(Elastic.Clients.Elasticsearch.Serverless.Indices indices
 	/// Size, in pixels, of a side of the tile. Vector tiles are square with equal sides.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("extent")]
 	public int? Extent { get; set; }
 
 	/// <summary>
@@ -130,8 +291,6 @@ public SearchMvtRequest(Elastic.Clients.Elasticsearch.Serverless.Indices indices
 	/// values may return inconsistent results.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("fields")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Serverless.Fields? Fields { get; set; }
 
 	/// <summary>
@@ -139,7 +298,6 @@ public SearchMvtRequest(Elastic.Clients.Elasticsearch.Serverless.Indices indices
 	/// Aggregation used to create a grid for the <c>field</c>.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("grid_agg")]
 	public Elastic.Clients.Elasticsearch.Serverless.Core.SearchMvt.GridAggregationType? GridAgg { get; set; }
 
 	/// <summary>
@@ -149,7 +307,6 @@ public SearchMvtRequest(Elastic.Clients.Elasticsearch.Serverless.Indices indices
 	/// don’t include the aggs layer.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("grid_precision")]
 	public int? GridPrecision { get; set; }
 
 	/// <summary>
@@ -160,7 +317,6 @@ public SearchMvtRequest(Elastic.Clients.Elasticsearch.Serverless.Indices indices
 	/// of the cell.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("grid_type")]
 	public Elastic.Clients.Elasticsearch.Serverless.Core.SearchMvt.GridType? GridType { get; set; }
 
 	/// <summary>
@@ -168,7 +324,6 @@ public SearchMvtRequest(Elastic.Clients.Elasticsearch.Serverless.Indices indices
 	/// Query DSL used to filter documents for the search.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("query")]
 	public Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query? Query { get; set; }
 
 	/// <summary>
@@ -177,7 +332,6 @@ public SearchMvtRequest(Elastic.Clients.Elasticsearch.Serverless.Indices indices
 	/// precedence over mapped fields with the same name.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("runtime_mappings")]
 	public IDictionary<Elastic.Clients.Elasticsearch.Serverless.Field, Elastic.Clients.Elasticsearch.Serverless.Mapping.RuntimeField>? RuntimeMappings { get; set; }
 
 	/// <summary>
@@ -186,7 +340,6 @@ public SearchMvtRequest(Elastic.Clients.Elasticsearch.Serverless.Indices indices
 	/// If 0, results don’t include the hits layer.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("size")]
 	public int? Size { get; set; }
 
 	/// <summary>
@@ -196,8 +349,6 @@ public SearchMvtRequest(Elastic.Clients.Elasticsearch.Serverless.Indices indices
 	/// from longest to shortest.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("sort")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.Serverless.SortOptions))]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.SortOptions>? Sort { get; set; }
 
 	/// <summary>
@@ -207,7 +358,6 @@ public SearchMvtRequest(Elastic.Clients.Elasticsearch.Serverless.Indices indices
 	/// not include the total number of hits matching the query.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("track_total_hits")]
 	public Elastic.Clients.Elasticsearch.Serverless.Core.Search.TrackHits? TrackTotalHits { get; set; }
 
 	/// <summary>
@@ -216,7 +366,6 @@ public SearchMvtRequest(Elastic.Clients.Elasticsearch.Serverless.Indices indices
 	/// suggested label positions for the original features.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("with_labels")]
 	public bool? WithLabels { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/SearchRequest.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/SearchRequest.g.cs
index d7dfb6182ad..4e82a540230 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/SearchRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/SearchRequest.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Requests;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport;
@@ -264,422 +265,356 @@ public sealed partial class SearchRequestParameters : RequestParameters
 	public bool? TypedKeys { get => Q<bool?>("typed_keys"); set => Q("typed_keys", value); }
 }
 
-internal sealed partial class SearchRequestConverter : JsonConverter<SearchRequest>
+internal sealed partial class SearchRequestConverter : System.Text.Json.Serialization.JsonConverter<SearchRequest>
 {
-	public override SearchRequest Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		var variant = new SearchRequest();
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
-		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations1 = System.Text.Json.JsonEncodedText.Encode("aggs");
+	private static readonly System.Text.Json.JsonEncodedText PropCollapse = System.Text.Json.JsonEncodedText.Encode("collapse");
+	private static readonly System.Text.Json.JsonEncodedText PropDocvalueFields = System.Text.Json.JsonEncodedText.Encode("docvalue_fields");
+	private static readonly System.Text.Json.JsonEncodedText PropExplain = System.Text.Json.JsonEncodedText.Encode("explain");
+	private static readonly System.Text.Json.JsonEncodedText PropExt = System.Text.Json.JsonEncodedText.Encode("ext");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropFrom = System.Text.Json.JsonEncodedText.Encode("from");
+	private static readonly System.Text.Json.JsonEncodedText PropHighlight = System.Text.Json.JsonEncodedText.Encode("highlight");
+	private static readonly System.Text.Json.JsonEncodedText PropIndicesBoost = System.Text.Json.JsonEncodedText.Encode("indices_boost");
+	private static readonly System.Text.Json.JsonEncodedText PropKnn = System.Text.Json.JsonEncodedText.Encode("knn");
+	private static readonly System.Text.Json.JsonEncodedText PropMinScore = System.Text.Json.JsonEncodedText.Encode("min_score");
+	private static readonly System.Text.Json.JsonEncodedText PropPit = System.Text.Json.JsonEncodedText.Encode("pit");
+	private static readonly System.Text.Json.JsonEncodedText PropPostFilter = System.Text.Json.JsonEncodedText.Encode("post_filter");
+	private static readonly System.Text.Json.JsonEncodedText PropProfile = System.Text.Json.JsonEncodedText.Encode("profile");
+	private static readonly System.Text.Json.JsonEncodedText PropQuery = System.Text.Json.JsonEncodedText.Encode("query");
+	private static readonly System.Text.Json.JsonEncodedText PropRescore = System.Text.Json.JsonEncodedText.Encode("rescore");
+	private static readonly System.Text.Json.JsonEncodedText PropRetriever = System.Text.Json.JsonEncodedText.Encode("retriever");
+	private static readonly System.Text.Json.JsonEncodedText PropRuntimeMappings = System.Text.Json.JsonEncodedText.Encode("runtime_mappings");
+	private static readonly System.Text.Json.JsonEncodedText PropScriptFields = System.Text.Json.JsonEncodedText.Encode("script_fields");
+	private static readonly System.Text.Json.JsonEncodedText PropSearchAfter = System.Text.Json.JsonEncodedText.Encode("search_after");
+	private static readonly System.Text.Json.JsonEncodedText PropSeqNoPrimaryTerm = System.Text.Json.JsonEncodedText.Encode("seq_no_primary_term");
+	private static readonly System.Text.Json.JsonEncodedText PropSize = System.Text.Json.JsonEncodedText.Encode("size");
+	private static readonly System.Text.Json.JsonEncodedText PropSlice = System.Text.Json.JsonEncodedText.Encode("slice");
+	private static readonly System.Text.Json.JsonEncodedText PropSort = System.Text.Json.JsonEncodedText.Encode("sort");
+	private static readonly System.Text.Json.JsonEncodedText PropSource = System.Text.Json.JsonEncodedText.Encode("_source");
+	private static readonly System.Text.Json.JsonEncodedText PropStats = System.Text.Json.JsonEncodedText.Encode("stats");
+	private static readonly System.Text.Json.JsonEncodedText PropStoredFields = System.Text.Json.JsonEncodedText.Encode("stored_fields");
+	private static readonly System.Text.Json.JsonEncodedText PropSuggest = System.Text.Json.JsonEncodedText.Encode("suggest");
+	private static readonly System.Text.Json.JsonEncodedText PropTerminateAfter = System.Text.Json.JsonEncodedText.Encode("terminate_after");
+	private static readonly System.Text.Json.JsonEncodedText PropTimeout = System.Text.Json.JsonEncodedText.Encode("timeout");
+	private static readonly System.Text.Json.JsonEncodedText PropTrackScores = System.Text.Json.JsonEncodedText.Encode("track_scores");
+	private static readonly System.Text.Json.JsonEncodedText PropTrackTotalHits = System.Text.Json.JsonEncodedText.Encode("track_total_hits");
+	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("version");
+
+	public override SearchRequest Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.Aggregation>?> propAggregations = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Core.Search.FieldCollapse?> propCollapse = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.FieldAndFormat>?> propDocvalueFields = default;
+		LocalJsonProperty<bool?> propExplain = default;
+		LocalJsonProperty<IDictionary<string, object>?> propExt = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.FieldAndFormat>?> propFields = default;
+		LocalJsonProperty<int?> propFrom = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Core.Search.Highlight?> propHighlight = default;
+		LocalJsonProperty<ICollection<IDictionary<Elastic.Clients.Elasticsearch.Serverless.IndexName, double>>?> propIndicesBoost = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.KnnSearch>?> propKnn = default;
+		LocalJsonProperty<double?> propMinScore = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Core.Search.PointInTimeReference?> propPit = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query?> propPostFilter = default;
+		LocalJsonProperty<bool?> propProfile = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query?> propQuery = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.Core.Search.Rescore>?> propRescore = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Retriever?> propRetriever = default;
+		LocalJsonProperty<IDictionary<Elastic.Clients.Elasticsearch.Serverless.Field, Elastic.Clients.Elasticsearch.Serverless.Mapping.RuntimeField>?> propRuntimeMappings = default;
+		LocalJsonProperty<IDictionary<string, Elastic.Clients.Elasticsearch.Serverless.ScriptField>?> propScriptFields = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.FieldValue>?> propSearchAfter = default;
+		LocalJsonProperty<bool?> propSeqNoPrimaryTerm = default;
+		LocalJsonProperty<int?> propSize = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.SlicedScroll?> propSlice = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.SortOptions>?> propSort = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Core.Search.SourceConfig?> propSource = default;
+		LocalJsonProperty<ICollection<string>?> propStats = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Fields?> propStoredFields = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Core.Search.Suggester?> propSuggest = default;
+		LocalJsonProperty<long?> propTerminateAfter = default;
+		LocalJsonProperty<string?> propTimeout = default;
+		LocalJsonProperty<bool?> propTrackScores = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Core.Search.TrackHits?> propTrackTotalHits = default;
+		LocalJsonProperty<bool?> propVersion = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAggregations.TryRead(ref reader, options, PropAggregations) || propAggregations.TryRead(ref reader, options, PropAggregations1))
 			{
-				var property = reader.GetString();
-				if (property == "aggregations" || property == "aggs")
-				{
-					variant.Aggregations = JsonSerializer.Deserialize<IDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.Aggregation>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "collapse")
-				{
-					variant.Collapse = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Core.Search.FieldCollapse?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "docvalue_fields")
-				{
-					variant.DocvalueFields = JsonSerializer.Deserialize<ICollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.FieldAndFormat>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "explain")
-				{
-					variant.Explain = JsonSerializer.Deserialize<bool?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "ext")
-				{
-					variant.Ext = JsonSerializer.Deserialize<IDictionary<string, object>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "fields")
-				{
-					variant.Fields = JsonSerializer.Deserialize<ICollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.FieldAndFormat>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "from")
-				{
-					variant.From = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "highlight")
-				{
-					variant.Highlight = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Core.Search.Highlight?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "indices_boost")
-				{
-					variant.IndicesBoost = JsonSerializer.Deserialize<ICollection<IDictionary<Elastic.Clients.Elasticsearch.Serverless.IndexName, double>>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "knn")
-				{
-					variant.Knn = JsonSerializer.Deserialize<ICollection<Elastic.Clients.Elasticsearch.Serverless.KnnSearch>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "min_score")
-				{
-					variant.MinScore = JsonSerializer.Deserialize<double?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "pit")
-				{
-					variant.Pit = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Core.Search.PointInTimeReference?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "post_filter")
-				{
-					variant.PostFilter = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "profile")
-				{
-					variant.Profile = JsonSerializer.Deserialize<bool?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "query")
-				{
-					variant.Query = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "rescore")
-				{
-					variant.Rescore = JsonSerializer.Deserialize<ICollection<Elastic.Clients.Elasticsearch.Serverless.Core.Search.Rescore>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "retriever")
-				{
-					variant.Retriever = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Retriever?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "runtime_mappings")
-				{
-					variant.RuntimeMappings = JsonSerializer.Deserialize<IDictionary<Elastic.Clients.Elasticsearch.Serverless.Field, Elastic.Clients.Elasticsearch.Serverless.Mapping.RuntimeField>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "script_fields")
-				{
-					variant.ScriptFields = JsonSerializer.Deserialize<IDictionary<string, Elastic.Clients.Elasticsearch.Serverless.ScriptField>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "search_after")
-				{
-					variant.SearchAfter = JsonSerializer.Deserialize<ICollection<Elastic.Clients.Elasticsearch.Serverless.FieldValue>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "seq_no_primary_term")
-				{
-					variant.SeqNoPrimaryTerm = JsonSerializer.Deserialize<bool?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "size")
-				{
-					variant.Size = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "slice")
-				{
-					variant.Slice = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.SlicedScroll?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "sort")
-				{
-					variant.Sort = JsonSerializer.Deserialize<ICollection<Elastic.Clients.Elasticsearch.Serverless.SortOptions>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "_source")
-				{
-					variant.Source = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Core.Search.SourceConfig?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "stats")
-				{
-					variant.Stats = JsonSerializer.Deserialize<ICollection<string>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "stored_fields")
-				{
-					variant.StoredFields = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Fields?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "suggest")
-				{
-					variant.Suggest = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Core.Search.Suggester?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "terminate_after")
-				{
-					variant.TerminateAfter = JsonSerializer.Deserialize<long?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "timeout")
-				{
-					variant.Timeout = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "track_scores")
-				{
-					variant.TrackScores = JsonSerializer.Deserialize<bool?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "track_total_hits")
-				{
-					variant.TrackTotalHits = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Core.Search.TrackHits?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "version")
-				{
-					variant.Version = JsonSerializer.Deserialize<bool?>(ref reader, options);
-					continue;
-				}
+				continue;
 			}
-		}
-
-		return variant;
-	}
-
-	public override void Write(Utf8JsonWriter writer, SearchRequest value, JsonSerializerOptions options)
-	{
-		writer.WriteStartObject();
-		if (value.Aggregations is not null)
-		{
-			writer.WritePropertyName("aggregations");
-			JsonSerializer.Serialize(writer, value.Aggregations, options);
-		}
 
-		if (value.Collapse is not null)
-		{
-			writer.WritePropertyName("collapse");
-			JsonSerializer.Serialize(writer, value.Collapse, options);
-		}
+			if (propCollapse.TryRead(ref reader, options, PropCollapse))
+			{
+				continue;
+			}
 
-		if (value.DocvalueFields is not null)
-		{
-			writer.WritePropertyName("docvalue_fields");
-			JsonSerializer.Serialize(writer, value.DocvalueFields, options);
-		}
+			if (propDocvalueFields.TryRead(ref reader, options, PropDocvalueFields))
+			{
+				continue;
+			}
 
-		if (value.Explain.HasValue)
-		{
-			writer.WritePropertyName("explain");
-			writer.WriteBooleanValue(value.Explain.Value);
-		}
+			if (propExplain.TryRead(ref reader, options, PropExplain))
+			{
+				continue;
+			}
 
-		if (value.Ext is not null)
-		{
-			writer.WritePropertyName("ext");
-			JsonSerializer.Serialize(writer, value.Ext, options);
-		}
+			if (propExt.TryRead(ref reader, options, PropExt))
+			{
+				continue;
+			}
 
-		if (value.Fields is not null)
-		{
-			writer.WritePropertyName("fields");
-			JsonSerializer.Serialize(writer, value.Fields, options);
-		}
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
 
-		if (value.From.HasValue)
-		{
-			writer.WritePropertyName("from");
-			writer.WriteNumberValue(value.From.Value);
-		}
+			if (propFrom.TryRead(ref reader, options, PropFrom))
+			{
+				continue;
+			}
 
-		if (value.Highlight is not null)
-		{
-			writer.WritePropertyName("highlight");
-			JsonSerializer.Serialize(writer, value.Highlight, options);
-		}
+			if (propHighlight.TryRead(ref reader, options, PropHighlight))
+			{
+				continue;
+			}
 
-		if (value.IndicesBoost is not null)
-		{
-			writer.WritePropertyName("indices_boost");
-			JsonSerializer.Serialize(writer, value.IndicesBoost, options);
-		}
+			if (propIndicesBoost.TryRead(ref reader, options, PropIndicesBoost))
+			{
+				continue;
+			}
 
-		if (value.Knn is not null)
-		{
-			writer.WritePropertyName("knn");
-			JsonSerializer.Serialize(writer, value.Knn, options);
-		}
+			if (propKnn.TryRead(ref reader, options, PropKnn, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.KnnSearch>?, Elastic.Clients.Elasticsearch.Serverless.KnnSearch>)))
+			{
+				continue;
+			}
 
-		if (value.MinScore.HasValue)
-		{
-			writer.WritePropertyName("min_score");
-			writer.WriteNumberValue(value.MinScore.Value);
-		}
+			if (propMinScore.TryRead(ref reader, options, PropMinScore))
+			{
+				continue;
+			}
 
-		if (value.Pit is not null)
-		{
-			writer.WritePropertyName("pit");
-			JsonSerializer.Serialize(writer, value.Pit, options);
-		}
+			if (propPit.TryRead(ref reader, options, PropPit))
+			{
+				continue;
+			}
 
-		if (value.PostFilter is not null)
-		{
-			writer.WritePropertyName("post_filter");
-			JsonSerializer.Serialize(writer, value.PostFilter, options);
-		}
+			if (propPostFilter.TryRead(ref reader, options, PropPostFilter))
+			{
+				continue;
+			}
 
-		if (value.Profile.HasValue)
-		{
-			writer.WritePropertyName("profile");
-			writer.WriteBooleanValue(value.Profile.Value);
-		}
+			if (propProfile.TryRead(ref reader, options, PropProfile))
+			{
+				continue;
+			}
 
-		if (value.Query is not null)
-		{
-			writer.WritePropertyName("query");
-			JsonSerializer.Serialize(writer, value.Query, options);
-		}
+			if (propQuery.TryRead(ref reader, options, PropQuery))
+			{
+				continue;
+			}
 
-		if (value.Rescore is not null)
-		{
-			writer.WritePropertyName("rescore");
-			JsonSerializer.Serialize(writer, value.Rescore, options);
-		}
+			if (propRescore.TryRead(ref reader, options, PropRescore, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Core.Search.Rescore>?, Elastic.Clients.Elasticsearch.Serverless.Core.Search.Rescore>)))
+			{
+				continue;
+			}
 
-		if (value.Retriever is not null)
-		{
-			writer.WritePropertyName("retriever");
-			JsonSerializer.Serialize(writer, value.Retriever, options);
-		}
+			if (propRetriever.TryRead(ref reader, options, PropRetriever))
+			{
+				continue;
+			}
 
-		if (value.RuntimeMappings is not null)
-		{
-			writer.WritePropertyName("runtime_mappings");
-			JsonSerializer.Serialize(writer, value.RuntimeMappings, options);
-		}
+			if (propRuntimeMappings.TryRead(ref reader, options, PropRuntimeMappings))
+			{
+				continue;
+			}
 
-		if (value.ScriptFields is not null)
-		{
-			writer.WritePropertyName("script_fields");
-			JsonSerializer.Serialize(writer, value.ScriptFields, options);
-		}
+			if (propScriptFields.TryRead(ref reader, options, PropScriptFields))
+			{
+				continue;
+			}
 
-		if (value.SearchAfter is not null)
-		{
-			writer.WritePropertyName("search_after");
-			JsonSerializer.Serialize(writer, value.SearchAfter, options);
-		}
+			if (propSearchAfter.TryRead(ref reader, options, PropSearchAfter))
+			{
+				continue;
+			}
 
-		if (value.SeqNoPrimaryTerm.HasValue)
-		{
-			writer.WritePropertyName("seq_no_primary_term");
-			writer.WriteBooleanValue(value.SeqNoPrimaryTerm.Value);
-		}
+			if (propSeqNoPrimaryTerm.TryRead(ref reader, options, PropSeqNoPrimaryTerm))
+			{
+				continue;
+			}
 
-		if (value.Size.HasValue)
-		{
-			writer.WritePropertyName("size");
-			writer.WriteNumberValue(value.Size.Value);
-		}
+			if (propSize.TryRead(ref reader, options, PropSize))
+			{
+				continue;
+			}
 
-		if (value.Slice is not null)
-		{
-			writer.WritePropertyName("slice");
-			JsonSerializer.Serialize(writer, value.Slice, options);
-		}
+			if (propSlice.TryRead(ref reader, options, PropSlice))
+			{
+				continue;
+			}
 
-		if (value.Sort is not null)
-		{
-			writer.WritePropertyName("sort");
-			JsonSerializer.Serialize(writer, value.Sort, options);
-		}
+			if (propSort.TryRead(ref reader, options, PropSort, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.SortOptions>?, Elastic.Clients.Elasticsearch.Serverless.SortOptions>)))
+			{
+				continue;
+			}
 
-		if (value.Source is not null)
-		{
-			writer.WritePropertyName("_source");
-			JsonSerializer.Serialize(writer, value.Source, options);
-		}
+			if (propSource.TryRead(ref reader, options, PropSource))
+			{
+				continue;
+			}
 
-		if (value.Stats is not null)
-		{
-			writer.WritePropertyName("stats");
-			JsonSerializer.Serialize(writer, value.Stats, options);
-		}
+			if (propStats.TryRead(ref reader, options, PropStats))
+			{
+				continue;
+			}
 
-		if (value.StoredFields is not null)
-		{
-			writer.WritePropertyName("stored_fields");
-			new FieldsConverter().Write(writer, value.StoredFields, options);
-		}
+			if (propStoredFields.TryRead(ref reader, options, PropStoredFields, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
 
-		if (value.Suggest is not null)
-		{
-			writer.WritePropertyName("suggest");
-			JsonSerializer.Serialize(writer, value.Suggest, options);
-		}
+			if (propSuggest.TryRead(ref reader, options, PropSuggest))
+			{
+				continue;
+			}
 
-		if (value.TerminateAfter.HasValue)
-		{
-			writer.WritePropertyName("terminate_after");
-			writer.WriteNumberValue(value.TerminateAfter.Value);
-		}
+			if (propTerminateAfter.TryRead(ref reader, options, PropTerminateAfter))
+			{
+				continue;
+			}
 
-		if (!string.IsNullOrEmpty(value.Timeout))
-		{
-			writer.WritePropertyName("timeout");
-			writer.WriteStringValue(value.Timeout);
-		}
+			if (propTimeout.TryRead(ref reader, options, PropTimeout))
+			{
+				continue;
+			}
 
-		if (value.TrackScores.HasValue)
-		{
-			writer.WritePropertyName("track_scores");
-			writer.WriteBooleanValue(value.TrackScores.Value);
-		}
+			if (propTrackScores.TryRead(ref reader, options, PropTrackScores))
+			{
+				continue;
+			}
 
-		if (value.TrackTotalHits is not null)
-		{
-			writer.WritePropertyName("track_total_hits");
-			JsonSerializer.Serialize(writer, value.TrackTotalHits, options);
-		}
+			if (propTrackTotalHits.TryRead(ref reader, options, PropTrackTotalHits))
+			{
+				continue;
+			}
 
-		if (value.Version.HasValue)
-		{
-			writer.WritePropertyName("version");
-			writer.WriteBooleanValue(value.Version.Value);
-		}
+			if (propVersion.TryRead(ref reader, options, PropVersion))
+			{
+				continue;
+			}
 
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SearchRequest
+		{
+			Aggregations = propAggregations.Value
+	,
+			Collapse = propCollapse.Value
+	,
+			DocvalueFields = propDocvalueFields.Value
+	,
+			Explain = propExplain.Value
+	,
+			Ext = propExt.Value
+	,
+			Fields = propFields.Value
+	,
+			From = propFrom.Value
+	,
+			Highlight = propHighlight.Value
+	,
+			IndicesBoost = propIndicesBoost.Value
+	,
+			Knn = propKnn.Value
+	,
+			MinScore = propMinScore.Value
+	,
+			Pit = propPit.Value
+	,
+			PostFilter = propPostFilter.Value
+	,
+			Profile = propProfile.Value
+	,
+			Query = propQuery.Value
+	,
+			Rescore = propRescore.Value
+	,
+			Retriever = propRetriever.Value
+	,
+			RuntimeMappings = propRuntimeMappings.Value
+	,
+			ScriptFields = propScriptFields.Value
+	,
+			SearchAfter = propSearchAfter.Value
+	,
+			SeqNoPrimaryTerm = propSeqNoPrimaryTerm.Value
+	,
+			Size = propSize.Value
+	,
+			Slice = propSlice.Value
+	,
+			Sort = propSort.Value
+	,
+			Source = propSource.Value
+	,
+			Stats = propStats.Value
+	,
+			StoredFields = propStoredFields.Value
+	,
+			Suggest = propSuggest.Value
+	,
+			TerminateAfter = propTerminateAfter.Value
+	,
+			Timeout = propTimeout.Value
+	,
+			TrackScores = propTrackScores.Value
+	,
+			TrackTotalHits = propTrackTotalHits.Value
+	,
+			Version = propVersion.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SearchRequest value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAggregations, value.Aggregations);
+		writer.WriteProperty(options, PropCollapse, value.Collapse);
+		writer.WriteProperty(options, PropDocvalueFields, value.DocvalueFields);
+		writer.WriteProperty(options, PropExplain, value.Explain);
+		writer.WriteProperty(options, PropExt, value.Ext);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropFrom, value.From);
+		writer.WriteProperty(options, PropHighlight, value.Highlight);
+		writer.WriteProperty(options, PropIndicesBoost, value.IndicesBoost);
+		writer.WriteProperty(options, PropKnn, value.Knn, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.KnnSearch>?, Elastic.Clients.Elasticsearch.Serverless.KnnSearch>));
+		writer.WriteProperty(options, PropMinScore, value.MinScore);
+		writer.WriteProperty(options, PropPit, value.Pit);
+		writer.WriteProperty(options, PropPostFilter, value.PostFilter);
+		writer.WriteProperty(options, PropProfile, value.Profile);
+		writer.WriteProperty(options, PropQuery, value.Query);
+		writer.WriteProperty(options, PropRescore, value.Rescore, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Core.Search.Rescore>?, Elastic.Clients.Elasticsearch.Serverless.Core.Search.Rescore>));
+		writer.WriteProperty(options, PropRetriever, value.Retriever);
+		writer.WriteProperty(options, PropRuntimeMappings, value.RuntimeMappings);
+		writer.WriteProperty(options, PropScriptFields, value.ScriptFields);
+		writer.WriteProperty(options, PropSearchAfter, value.SearchAfter);
+		writer.WriteProperty(options, PropSeqNoPrimaryTerm, value.SeqNoPrimaryTerm);
+		writer.WriteProperty(options, PropSize, value.Size);
+		writer.WriteProperty(options, PropSlice, value.Slice);
+		writer.WriteProperty(options, PropSort, value.Sort, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.SortOptions>?, Elastic.Clients.Elasticsearch.Serverless.SortOptions>));
+		writer.WriteProperty(options, PropSource, value.Source);
+		writer.WriteProperty(options, PropStats, value.Stats);
+		writer.WriteProperty(options, PropStoredFields, value.StoredFields, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropSuggest, value.Suggest);
+		writer.WriteProperty(options, PropTerminateAfter, value.TerminateAfter);
+		writer.WriteProperty(options, PropTimeout, value.Timeout);
+		writer.WriteProperty(options, PropTrackScores, value.TrackScores);
+		writer.WriteProperty(options, PropTrackTotalHits, value.TrackTotalHits);
+		writer.WriteProperty(options, PropVersion, value.Version);
 		writer.WriteEndObject();
 	}
 }
@@ -720,7 +655,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices? indices)
 	/// For example, a request targeting <c>foo*,bar*</c> returns an error if an index starts with <c>foo</c> but no index starts with <c>bar</c>.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public bool? AllowNoIndices { get => Q<bool?>("allow_no_indices"); set => Q("allow_no_indices", value); }
 
 	/// <summary>
@@ -728,7 +662,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices? indices)
 	/// If true, returns partial results if there are shard request timeouts or shard failures. If false, returns an error with no partial results.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public bool? AllowPartialSearchResults { get => Q<bool?>("allow_partial_search_results"); set => Q("allow_partial_search_results", value); }
 
 	/// <summary>
@@ -737,7 +670,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices? indices)
 	/// This parameter can only be used when the q query string parameter is specified.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public string? Analyzer { get => Q<string?>("analyzer"); set => Q("analyzer", value); }
 
 	/// <summary>
@@ -746,7 +678,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices? indices)
 	/// This parameter can only be used when the q query string parameter is specified.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public bool? AnalyzeWildcard { get => Q<bool?>("analyze_wildcard"); set => Q("analyze_wildcard", value); }
 
 	/// <summary>
@@ -755,7 +686,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices? indices)
 	/// 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>
@@ -763,7 +693,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices? indices)
 	/// If true, network round-trips between the coordinating node and the remote clusters are minimized when executing cross-cluster search (CCS) requests.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public bool? CcsMinimizeRoundtrips { get => Q<bool?>("ccs_minimize_roundtrips"); set => Q("ccs_minimize_roundtrips", value); }
 
 	/// <summary>
@@ -772,7 +701,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices? indices)
 	/// This parameter can only be used when the <c>q</c> query string parameter is specified.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Operator? DefaultOperator { get => Q<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Operator?>("default_operator"); set => Q("default_operator", value); }
 
 	/// <summary>
@@ -781,7 +709,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices? indices)
 	/// This parameter can only be used when the q query string parameter is specified.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public string? Df { get => Q<string?>("df"); set => Q("df", value); }
 
 	/// <summary>
@@ -791,7 +718,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices? indices)
 	/// Supports comma-separated values, such as <c>open,hidden</c>.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.ExpandWildcard>? ExpandWildcards { get => Q<ICollection<Elastic.Clients.Elasticsearch.Serverless.ExpandWildcard>?>("expand_wildcards"); set => Q("expand_wildcards", value); }
 
 	/// <summary>
@@ -799,7 +725,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices? indices)
 	/// If <c>true</c>, concrete, expanded or aliased indices will be ignored when frozen.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public bool? IgnoreThrottled { get => Q<bool?>("ignore_throttled"); set => Q("ignore_throttled", value); }
 
 	/// <summary>
@@ -807,7 +732,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices? indices)
 	/// If <c>false</c>, the request returns an error if it targets a missing or closed index.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
 
 	/// <summary>
@@ -816,7 +740,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices? indices)
 	/// This parameter can only be used when the <c>q</c> query string parameter is specified.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public bool? Lenient { get => Q<bool?>("lenient"); set => Q("lenient", value); }
 
 	/// <summary>
@@ -825,7 +748,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices? indices)
 	/// 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>
@@ -840,7 +762,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices? indices)
 	/// <c>&lt;custom-string></c> (any string that does not start with <c>_</c>) to route searches with the same <c>&lt;custom-string></c> to the same shards in the same order.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public string? Preference { get => Q<string?>("preference"); set => Q("preference", value); }
 
 	/// <summary>
@@ -853,7 +774,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices? indices)
 	/// the primary sort of the query targets an indexed field.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public long? PreFilterShardSize { get => Q<long?>("pre_filter_shard_size"); set => Q("pre_filter_shard_size", value); }
 
 	/// <summary>
@@ -862,7 +782,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices? indices)
 	/// Query parameter searches do not support the full Elasticsearch Query DSL but are handy for testing.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public string? QueryLuceneSyntax { get => Q<string?>("q"); set => Q("q", value); }
 
 	/// <summary>
@@ -871,7 +790,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices? indices)
 	/// Defaults to index level settings.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public bool? RequestCache { get => Q<bool?>("request_cache"); set => Q("request_cache", value); }
 
 	/// <summary>
@@ -879,7 +797,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices? indices)
 	/// Indicates whether <c>hits.total</c> 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>
@@ -887,7 +804,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices? indices)
 	/// Custom value used to route operations to a specific shard.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Serverless.Routing? Routing { get => Q<Elastic.Clients.Elasticsearch.Serverless.Routing?>("routing"); set => Q("routing", value); }
 
 	/// <summary>
@@ -897,7 +813,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices? indices)
 	/// You can change this limit using the <c>search.max_keep_alive</c> cluster-level setting.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Serverless.Duration? Scroll { get => Q<Elastic.Clients.Elasticsearch.Serverless.Duration?>("scroll"); set => Q("scroll", value); }
 
 	/// <summary>
@@ -905,7 +820,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices? indices)
 	/// How distributed term frequencies are calculated for relevance scoring.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Serverless.SearchType? SearchType { get => Q<Elastic.Clients.Elasticsearch.Serverless.SearchType?>("search_type"); set => Q("search_type", value); }
 
 	/// <summary>
@@ -915,7 +829,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices? indices)
 	/// If the <c>_source</c> parameter is <c>false</c>, this parameter is ignored.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Serverless.Fields? SourceExcludes { get => Q<Elastic.Clients.Elasticsearch.Serverless.Fields?>("_source_excludes"); set => Q("_source_excludes", value); }
 
 	/// <summary>
@@ -926,7 +839,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices? indices)
 	/// If the <c>_source</c> parameter is <c>false</c>, this parameter is ignored.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Serverless.Fields? SourceIncludes { get => Q<Elastic.Clients.Elasticsearch.Serverless.Fields?>("_source_includes"); set => Q("_source_includes", value); }
 
 	/// <summary>
@@ -934,7 +846,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices? indices)
 	/// Specifies which field to use for suggestions.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Serverless.Field? SuggestField { get => Q<Elastic.Clients.Elasticsearch.Serverless.Field?>("suggest_field"); set => Q("suggest_field", value); }
 
 	/// <summary>
@@ -943,7 +854,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices? indices)
 	/// This parameter can only be used when the <c>suggest_field</c> and <c>suggest_text</c> query string parameters are specified.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Serverless.SuggestMode? SuggestMode { get => Q<Elastic.Clients.Elasticsearch.Serverless.SuggestMode?>("suggest_mode"); set => Q("suggest_mode", value); }
 
 	/// <summary>
@@ -952,7 +862,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices? indices)
 	/// This parameter can only be used when the <c>suggest_field</c> and <c>suggest_text</c> query string parameters are specified.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public long? SuggestSize { get => Q<long?>("suggest_size"); set => Q("suggest_size", value); }
 
 	/// <summary>
@@ -961,7 +870,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices? indices)
 	/// This parameter can only be used when the <c>suggest_field</c> and <c>suggest_text</c> query string parameters are specified.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public string? SuggestText { get => Q<string?>("suggest_text"); set => Q("suggest_text", value); }
 
 	/// <summary>
@@ -969,7 +877,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices? indices)
 	/// If <c>true</c>, aggregation and suggester names are 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>
@@ -977,7 +884,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices? indices)
 	/// Defines the aggregations that are run as part of the search request.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("aggregations")]
 	public IDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.Aggregation>? Aggregations { get; set; }
 
 	/// <summary>
@@ -985,7 +891,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices? indices)
 	/// Collapses search results the values of the specified field.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("collapse")]
 	public Elastic.Clients.Elasticsearch.Serverless.Core.Search.FieldCollapse? Collapse { get; set; }
 
 	/// <summary>
@@ -994,7 +899,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices? indices)
 	/// The request returns doc values for field names matching these patterns in the <c>hits.fields</c> property of the response.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("docvalue_fields")]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.FieldAndFormat>? DocvalueFields { get; set; }
 
 	/// <summary>
@@ -1002,7 +906,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices? indices)
 	/// If true, returns detailed information about score computation as part of a hit.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("explain")]
 	public bool? Explain { get; set; }
 
 	/// <summary>
@@ -1010,7 +913,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices? indices)
 	/// Configuration of search extensions defined by Elasticsearch plugins.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("ext")]
 	public IDictionary<string, object>? Ext { get; set; }
 
 	/// <summary>
@@ -1019,7 +921,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices? indices)
 	/// The request returns values for field names matching these patterns in the <c>hits.fields</c> property of the response.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("fields")]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.FieldAndFormat>? Fields { get; set; }
 
 	/// <summary>
@@ -1030,7 +931,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices? indices)
 	/// To page through more hits, use the <c>search_after</c> parameter.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("from")]
 	public int? From { get; set; }
 
 	/// <summary>
@@ -1038,7 +938,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices? indices)
 	/// Specifies the highlighter to use for retrieving highlighted snippets from one or more fields in your search results.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("highlight")]
 	public Elastic.Clients.Elasticsearch.Serverless.Core.Search.Highlight? Highlight { get; set; }
 
 	/// <summary>
@@ -1046,7 +945,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices? indices)
 	/// Boosts the _score of documents from specified indices.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("indices_boost")]
 	public ICollection<IDictionary<Elastic.Clients.Elasticsearch.Serverless.IndexName, double>>? IndicesBoost { get; set; }
 
 	/// <summary>
@@ -1054,8 +952,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices? indices)
 	/// Defines the approximate kNN search to run.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("knn")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.Serverless.KnnSearch))]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.KnnSearch>? Knn { get; set; }
 
 	/// <summary>
@@ -1064,7 +960,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices? indices)
 	/// Documents with a lower <c>_score</c> are not included in the search results.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("min_score")]
 	public double? MinScore { get; set; }
 
 	/// <summary>
@@ -1073,7 +968,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices? indices)
 	/// If you provide a PIT, you cannot specify an <c>&lt;index></c> in the request path.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("pit")]
 	public Elastic.Clients.Elasticsearch.Serverless.Core.Search.PointInTimeReference? Pit { get; set; }
 
 	/// <summary>
@@ -1083,7 +977,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices? indices)
 	/// A post filter has no impact on the aggregation results.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("post_filter")]
 	public Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query? PostFilter { get; set; }
 
 	/// <summary>
@@ -1092,7 +985,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices? indices)
 	/// NOTE: This is a debugging tool and adds significant overhead to search execution.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("profile")]
 	public bool? Profile { get; set; }
 
 	/// <summary>
@@ -1100,7 +992,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices? indices)
 	/// Defines the search definition using the Query DSL.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("query")]
 	public Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query? Query { get; set; }
 
 	/// <summary>
@@ -1108,8 +999,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices? indices)
 	/// Can be used to improve precision by reordering just the top (for example 100 - 500) documents returned by the <c>query</c> and <c>post_filter</c> phases.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("rescore")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.Serverless.Core.Search.Rescore))]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.Core.Search.Rescore>? Rescore { get; set; }
 
 	/// <summary>
@@ -1117,7 +1006,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices? indices)
 	/// A retriever is a specification to describe top documents returned from a search. A retriever replaces other elements of the search API that also return top documents such as query and knn.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("retriever")]
 	public Elastic.Clients.Elasticsearch.Serverless.Retriever? Retriever { get; set; }
 
 	/// <summary>
@@ -1126,7 +1014,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices? indices)
 	/// These fields take precedence over mapped fields with the same name.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("runtime_mappings")]
 	public IDictionary<Elastic.Clients.Elasticsearch.Serverless.Field, Elastic.Clients.Elasticsearch.Serverless.Mapping.RuntimeField>? RuntimeMappings { get; set; }
 
 	/// <summary>
@@ -1134,7 +1021,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices? indices)
 	/// Retrieve a script evaluation (based on different fields) for each hit.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("script_fields")]
 	public IDictionary<string, Elastic.Clients.Elasticsearch.Serverless.ScriptField>? ScriptFields { get; set; }
 
 	/// <summary>
@@ -1142,7 +1028,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices? indices)
 	/// Used to retrieve the next page of hits using a set of sort values from the previous page.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("search_after")]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.FieldValue>? SearchAfter { get; set; }
 
 	/// <summary>
@@ -1150,7 +1035,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices? indices)
 	/// If <c>true</c>, returns sequence number and primary term of the last modification of each hit.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("seq_no_primary_term")]
 	public bool? SeqNoPrimaryTerm { get; set; }
 
 	/// <summary>
@@ -1160,7 +1044,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices? indices)
 	/// To page through more hits, use the <c>search_after</c> parameter.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("size")]
 	public int? Size { get; set; }
 
 	/// <summary>
@@ -1168,7 +1051,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices? indices)
 	/// Can be used to split a scrolled search into multiple slices that can be consumed independently.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("slice")]
 	public Elastic.Clients.Elasticsearch.Serverless.SlicedScroll? Slice { get; set; }
 
 	/// <summary>
@@ -1176,8 +1058,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices? indices)
 	/// A comma-separated list of &lt;field>:&lt;direction> pairs.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("sort")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.Serverless.SortOptions))]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.SortOptions>? Sort { get; set; }
 
 	/// <summary>
@@ -1186,7 +1066,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices? indices)
 	/// These fields are returned in the hits._source property of the search response.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("_source")]
 	public Elastic.Clients.Elasticsearch.Serverless.Core.Search.SourceConfig? Source { get; set; }
 
 	/// <summary>
@@ -1196,7 +1075,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices? indices)
 	/// You can retrieve these stats using the indices stats API.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("stats")]
 	public ICollection<string>? Stats { get; set; }
 
 	/// <summary>
@@ -1207,8 +1085,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices? indices)
 	/// You can pass <c>_source: true</c> to return both source fields and stored fields in the search response.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("stored_fields")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Serverless.Fields? StoredFields { get; set; }
 
 	/// <summary>
@@ -1216,7 +1092,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices? indices)
 	/// Defines a suggester that provides similar looking terms based on a provided text.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("suggest")]
 	public Elastic.Clients.Elasticsearch.Serverless.Core.Search.Suggester? Suggest { get; set; }
 
 	/// <summary>
@@ -1231,7 +1106,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices? indices)
 	/// If set to <c>0</c> (default), the query does not terminate early.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("terminate_after")]
 	public long? TerminateAfter { get; set; }
 
 	/// <summary>
@@ -1241,7 +1115,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices? indices)
 	/// Defaults to no timeout.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("timeout")]
 	public string? Timeout { get; set; }
 
 	/// <summary>
@@ -1249,7 +1122,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices? indices)
 	/// 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>
@@ -1259,7 +1131,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices? indices)
 	/// If <c>false</c>, the  response does not include the total number of hits matching the query.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("track_total_hits")]
 	public Elastic.Clients.Elasticsearch.Serverless.Core.Search.TrackHits? TrackTotalHits { get; set; }
 
 	/// <summary>
@@ -1267,7 +1138,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Serverless.Indices? indices)
 	/// If true, returns document version as part of a hit.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("version")]
 	public bool? Version { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/SearchResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/SearchResponse.g.cs
index 151530f6fec..7c0674663f6 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/SearchResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/SearchResponse.g.cs
@@ -18,42 +18,212 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless;
 
+internal sealed partial class SearchResponseConverter<TDocument> : System.Text.Json.Serialization.JsonConverter<SearchResponse<TDocument>>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropClusters = System.Text.Json.JsonEncodedText.Encode("_clusters");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropHitsMetadata = System.Text.Json.JsonEncodedText.Encode("hits");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxScore = System.Text.Json.JsonEncodedText.Encode("max_score");
+	private static readonly System.Text.Json.JsonEncodedText PropNumReducePhases = System.Text.Json.JsonEncodedText.Encode("num_reduce_phases");
+	private static readonly System.Text.Json.JsonEncodedText PropPitId = System.Text.Json.JsonEncodedText.Encode("pit_id");
+	private static readonly System.Text.Json.JsonEncodedText PropProfile = System.Text.Json.JsonEncodedText.Encode("profile");
+	private static readonly System.Text.Json.JsonEncodedText PropScrollId = System.Text.Json.JsonEncodedText.Encode("_scroll_id");
+	private static readonly System.Text.Json.JsonEncodedText PropShards = System.Text.Json.JsonEncodedText.Encode("_shards");
+	private static readonly System.Text.Json.JsonEncodedText PropSuggest = System.Text.Json.JsonEncodedText.Encode("suggest");
+	private static readonly System.Text.Json.JsonEncodedText PropTerminatedEarly = System.Text.Json.JsonEncodedText.Encode("terminated_early");
+	private static readonly System.Text.Json.JsonEncodedText PropTimedOut = System.Text.Json.JsonEncodedText.Encode("timed_out");
+	private static readonly System.Text.Json.JsonEncodedText PropTook = System.Text.Json.JsonEncodedText.Encode("took");
+
+	public override SearchResponse<TDocument> Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary?> propAggregations = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.ClusterStatistics?> propClusters = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, object>?> propFields = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Core.Search.HitsMetadata<TDocument>> propHitsMetadata = default;
+		LocalJsonProperty<double?> propMaxScore = default;
+		LocalJsonProperty<long?> propNumReducePhases = default;
+		LocalJsonProperty<string?> propPitId = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Core.Search.Profile?> propProfile = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.ScrollId?> propScrollId = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.ShardStatistics> propShards = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Core.Search.SuggestDictionary<TDocument>?> propSuggest = default;
+		LocalJsonProperty<bool?> propTerminatedEarly = default;
+		LocalJsonProperty<bool> propTimedOut = default;
+		LocalJsonProperty<long> propTook = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAggregations.TryRead(ref reader, options, PropAggregations))
+			{
+				continue;
+			}
+
+			if (propClusters.TryRead(ref reader, options, PropClusters))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propHitsMetadata.TryRead(ref reader, options, PropHitsMetadata))
+			{
+				continue;
+			}
+
+			if (propMaxScore.TryRead(ref reader, options, PropMaxScore))
+			{
+				continue;
+			}
+
+			if (propNumReducePhases.TryRead(ref reader, options, PropNumReducePhases))
+			{
+				continue;
+			}
+
+			if (propPitId.TryRead(ref reader, options, PropPitId))
+			{
+				continue;
+			}
+
+			if (propProfile.TryRead(ref reader, options, PropProfile))
+			{
+				continue;
+			}
+
+			if (propScrollId.TryRead(ref reader, options, PropScrollId))
+			{
+				continue;
+			}
+
+			if (propShards.TryRead(ref reader, options, PropShards))
+			{
+				continue;
+			}
+
+			if (propSuggest.TryRead(ref reader, options, PropSuggest))
+			{
+				continue;
+			}
+
+			if (propTerminatedEarly.TryRead(ref reader, options, PropTerminatedEarly))
+			{
+				continue;
+			}
+
+			if (propTimedOut.TryRead(ref reader, options, PropTimedOut))
+			{
+				continue;
+			}
+
+			if (propTook.TryRead(ref reader, options, PropTook))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SearchResponse<TDocument>
+		{
+			Aggregations = propAggregations.Value
+,
+			Clusters = propClusters.Value
+,
+			Fields = propFields.Value
+,
+			HitsMetadata = propHitsMetadata.Value
+,
+			MaxScore = propMaxScore.Value
+,
+			NumReducePhases = propNumReducePhases.Value
+,
+			PitId = propPitId.Value
+,
+			Profile = propProfile.Value
+,
+			ScrollId = propScrollId.Value
+,
+			Shards = propShards.Value
+,
+			Suggest = propSuggest.Value
+,
+			TerminatedEarly = propTerminatedEarly.Value
+,
+			TimedOut = propTimedOut.Value
+,
+			Took = propTook.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SearchResponse<TDocument> value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAggregations, value.Aggregations);
+		writer.WriteProperty(options, PropClusters, value.Clusters);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropHitsMetadata, value.HitsMetadata);
+		writer.WriteProperty(options, PropMaxScore, value.MaxScore);
+		writer.WriteProperty(options, PropNumReducePhases, value.NumReducePhases);
+		writer.WriteProperty(options, PropPitId, value.PitId);
+		writer.WriteProperty(options, PropProfile, value.Profile);
+		writer.WriteProperty(options, PropScrollId, value.ScrollId);
+		writer.WriteProperty(options, PropShards, value.Shards);
+		writer.WriteProperty(options, PropSuggest, value.Suggest);
+		writer.WriteProperty(options, PropTerminatedEarly, value.TerminatedEarly);
+		writer.WriteProperty(options, PropTimedOut, value.TimedOut);
+		writer.WriteProperty(options, PropTook, value.Took);
+		writer.WriteEndObject();
+	}
+}
+
+internal sealed partial class SearchResponseConverterFactory : System.Text.Json.Serialization.JsonConverterFactory
+{
+	public override bool CanConvert(System.Type typeToConvert)
+	{
+		return typeToConvert.IsGenericType && typeToConvert.GetGenericTypeDefinition() == typeof(SearchResponse<>);
+	}
+
+	public override System.Text.Json.Serialization.JsonConverter CreateConverter(System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		var args = typeToConvert.GetGenericArguments();
+#pragma warning disable IL3050
+		var converter = (System.Text.Json.Serialization.JsonConverter)System.Activator.CreateInstance(typeof(SearchResponseConverter<>).MakeGenericType(args[0]), System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public, binder: null, args: null, culture: null)!;
+#pragma warning restore IL3050
+		return converter;
+	}
+}
+
+[JsonConverter(typeof(SearchResponseConverterFactory))]
 public sealed partial class SearchResponse<TDocument> : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("aggregations")]
 	public Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary? Aggregations { get; init; }
-	[JsonInclude, JsonPropertyName("_clusters")]
 	public Elastic.Clients.Elasticsearch.Serverless.ClusterStatistics? Clusters { get; init; }
-	[JsonInclude, JsonPropertyName("fields")]
 	public IReadOnlyDictionary<string, object>? Fields { get; init; }
-	[JsonInclude, JsonPropertyName("hits")]
 	public Elastic.Clients.Elasticsearch.Serverless.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.Serverless.Core.Search.Profile? Profile { get; init; }
-	[JsonInclude, JsonPropertyName("_scroll_id")]
 	public Elastic.Clients.Elasticsearch.Serverless.ScrollId? ScrollId { get; init; }
-	[JsonInclude, JsonPropertyName("_shards")]
 	public Elastic.Clients.Elasticsearch.Serverless.ShardStatistics Shards { get; init; }
-	[JsonInclude, JsonPropertyName("suggest")]
 	public Elastic.Clients.Elasticsearch.Serverless.Core.Search.SuggestDictionary<TDocument>? Suggest { 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.Serverless/_Generated/Api/SearchTemplateResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/SearchTemplateResponse.g.cs
index 16e9c64ac63..a3eaf51042b 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/SearchTemplateResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/SearchTemplateResponse.g.cs
@@ -18,42 +18,212 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless;
 
+internal sealed partial class SearchTemplateResponseConverter<TDocument> : System.Text.Json.Serialization.JsonConverter<SearchTemplateResponse<TDocument>>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropClusters = System.Text.Json.JsonEncodedText.Encode("_clusters");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropHits = System.Text.Json.JsonEncodedText.Encode("hits");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxScore = System.Text.Json.JsonEncodedText.Encode("max_score");
+	private static readonly System.Text.Json.JsonEncodedText PropNumReducePhases = System.Text.Json.JsonEncodedText.Encode("num_reduce_phases");
+	private static readonly System.Text.Json.JsonEncodedText PropPitId = System.Text.Json.JsonEncodedText.Encode("pit_id");
+	private static readonly System.Text.Json.JsonEncodedText PropProfile = System.Text.Json.JsonEncodedText.Encode("profile");
+	private static readonly System.Text.Json.JsonEncodedText PropScrollId = System.Text.Json.JsonEncodedText.Encode("_scroll_id");
+	private static readonly System.Text.Json.JsonEncodedText PropShards = System.Text.Json.JsonEncodedText.Encode("_shards");
+	private static readonly System.Text.Json.JsonEncodedText PropSuggest = System.Text.Json.JsonEncodedText.Encode("suggest");
+	private static readonly System.Text.Json.JsonEncodedText PropTerminatedEarly = System.Text.Json.JsonEncodedText.Encode("terminated_early");
+	private static readonly System.Text.Json.JsonEncodedText PropTimedOut = System.Text.Json.JsonEncodedText.Encode("timed_out");
+	private static readonly System.Text.Json.JsonEncodedText PropTook = System.Text.Json.JsonEncodedText.Encode("took");
+
+	public override SearchTemplateResponse<TDocument> Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary?> propAggregations = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.ClusterStatistics?> propClusters = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, object>?> propFields = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Core.Search.HitsMetadata<TDocument>> propHits = default;
+		LocalJsonProperty<double?> propMaxScore = default;
+		LocalJsonProperty<long?> propNumReducePhases = default;
+		LocalJsonProperty<string?> propPitId = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Core.Search.Profile?> propProfile = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.ScrollId?> propScrollId = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.ShardStatistics> propShards = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Core.Search.SuggestDictionary<TDocument>?> propSuggest = default;
+		LocalJsonProperty<bool?> propTerminatedEarly = default;
+		LocalJsonProperty<bool> propTimedOut = default;
+		LocalJsonProperty<long> propTook = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAggregations.TryRead(ref reader, options, PropAggregations))
+			{
+				continue;
+			}
+
+			if (propClusters.TryRead(ref reader, options, PropClusters))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propHits.TryRead(ref reader, options, PropHits))
+			{
+				continue;
+			}
+
+			if (propMaxScore.TryRead(ref reader, options, PropMaxScore))
+			{
+				continue;
+			}
+
+			if (propNumReducePhases.TryRead(ref reader, options, PropNumReducePhases))
+			{
+				continue;
+			}
+
+			if (propPitId.TryRead(ref reader, options, PropPitId))
+			{
+				continue;
+			}
+
+			if (propProfile.TryRead(ref reader, options, PropProfile))
+			{
+				continue;
+			}
+
+			if (propScrollId.TryRead(ref reader, options, PropScrollId))
+			{
+				continue;
+			}
+
+			if (propShards.TryRead(ref reader, options, PropShards))
+			{
+				continue;
+			}
+
+			if (propSuggest.TryRead(ref reader, options, PropSuggest))
+			{
+				continue;
+			}
+
+			if (propTerminatedEarly.TryRead(ref reader, options, PropTerminatedEarly))
+			{
+				continue;
+			}
+
+			if (propTimedOut.TryRead(ref reader, options, PropTimedOut))
+			{
+				continue;
+			}
+
+			if (propTook.TryRead(ref reader, options, PropTook))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SearchTemplateResponse<TDocument>
+		{
+			Aggregations = propAggregations.Value
+,
+			Clusters = propClusters.Value
+,
+			Fields = propFields.Value
+,
+			Hits = propHits.Value
+,
+			MaxScore = propMaxScore.Value
+,
+			NumReducePhases = propNumReducePhases.Value
+,
+			PitId = propPitId.Value
+,
+			Profile = propProfile.Value
+,
+			ScrollId = propScrollId.Value
+,
+			Shards = propShards.Value
+,
+			Suggest = propSuggest.Value
+,
+			TerminatedEarly = propTerminatedEarly.Value
+,
+			TimedOut = propTimedOut.Value
+,
+			Took = propTook.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SearchTemplateResponse<TDocument> value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAggregations, value.Aggregations);
+		writer.WriteProperty(options, PropClusters, value.Clusters);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropHits, value.Hits);
+		writer.WriteProperty(options, PropMaxScore, value.MaxScore);
+		writer.WriteProperty(options, PropNumReducePhases, value.NumReducePhases);
+		writer.WriteProperty(options, PropPitId, value.PitId);
+		writer.WriteProperty(options, PropProfile, value.Profile);
+		writer.WriteProperty(options, PropScrollId, value.ScrollId);
+		writer.WriteProperty(options, PropShards, value.Shards);
+		writer.WriteProperty(options, PropSuggest, value.Suggest);
+		writer.WriteProperty(options, PropTerminatedEarly, value.TerminatedEarly);
+		writer.WriteProperty(options, PropTimedOut, value.TimedOut);
+		writer.WriteProperty(options, PropTook, value.Took);
+		writer.WriteEndObject();
+	}
+}
+
+internal sealed partial class SearchTemplateResponseConverterFactory : System.Text.Json.Serialization.JsonConverterFactory
+{
+	public override bool CanConvert(System.Type typeToConvert)
+	{
+		return typeToConvert.IsGenericType && typeToConvert.GetGenericTypeDefinition() == typeof(SearchTemplateResponse<>);
+	}
+
+	public override System.Text.Json.Serialization.JsonConverter CreateConverter(System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		var args = typeToConvert.GetGenericArguments();
+#pragma warning disable IL3050
+		var converter = (System.Text.Json.Serialization.JsonConverter)System.Activator.CreateInstance(typeof(SearchTemplateResponseConverter<>).MakeGenericType(args[0]), System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public, binder: null, args: null, culture: null)!;
+#pragma warning restore IL3050
+		return converter;
+	}
+}
+
+[JsonConverter(typeof(SearchTemplateResponseConverterFactory))]
 public sealed partial class SearchTemplateResponse<TDocument> : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("aggregations")]
 	public Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary? Aggregations { get; init; }
-	[JsonInclude, JsonPropertyName("_clusters")]
 	public Elastic.Clients.Elasticsearch.Serverless.ClusterStatistics? Clusters { get; init; }
-	[JsonInclude, JsonPropertyName("fields")]
 	public IReadOnlyDictionary<string, object>? Fields { get; init; }
-	[JsonInclude, JsonPropertyName("hits")]
 	public Elastic.Clients.Elasticsearch.Serverless.Core.Search.HitsMetadata<TDocument> Hits { 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.Serverless.Core.Search.Profile? Profile { get; init; }
-	[JsonInclude, JsonPropertyName("_scroll_id")]
 	public Elastic.Clients.Elasticsearch.Serverless.ScrollId? ScrollId { get; init; }
-	[JsonInclude, JsonPropertyName("_shards")]
 	public Elastic.Clients.Elasticsearch.Serverless.ShardStatistics Shards { get; init; }
-	[JsonInclude, JsonPropertyName("suggest")]
 	public Elastic.Clients.Elasticsearch.Serverless.Core.Search.SuggestDictionary<TDocument>? Suggest { 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.Serverless/_Generated/Api/Security/ActivateUserProfileResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/ActivateUserProfileResponse.g.cs
index eef852bd9c6..b784d6983e2 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/ActivateUserProfileResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/ActivateUserProfileResponse.g.cs
@@ -18,28 +18,118 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Security;
 
+internal sealed partial class ActivateUserProfileResponseConverter : System.Text.Json.Serialization.JsonConverter<ActivateUserProfileResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropData = System.Text.Json.JsonEncodedText.Encode("data");
+	private static readonly System.Text.Json.JsonEncodedText PropDoc = System.Text.Json.JsonEncodedText.Encode("_doc");
+	private static readonly System.Text.Json.JsonEncodedText PropEnabled = System.Text.Json.JsonEncodedText.Encode("enabled");
+	private static readonly System.Text.Json.JsonEncodedText PropLabels = System.Text.Json.JsonEncodedText.Encode("labels");
+	private static readonly System.Text.Json.JsonEncodedText PropLastSynchronized = System.Text.Json.JsonEncodedText.Encode("last_synchronized");
+	private static readonly System.Text.Json.JsonEncodedText PropUid = System.Text.Json.JsonEncodedText.Encode("uid");
+	private static readonly System.Text.Json.JsonEncodedText PropUser = System.Text.Json.JsonEncodedText.Encode("user");
+
+	public override ActivateUserProfileResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyDictionary<string, object>> propData = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Security.UserProfileHitMetadata> propDoc = default;
+		LocalJsonProperty<bool?> propEnabled = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, object>> propLabels = default;
+		LocalJsonProperty<long> propLastSynchronized = default;
+		LocalJsonProperty<string> propUid = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Security.UserProfileUser> propUser = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propData.TryRead(ref reader, options, PropData))
+			{
+				continue;
+			}
+
+			if (propDoc.TryRead(ref reader, options, PropDoc))
+			{
+				continue;
+			}
+
+			if (propEnabled.TryRead(ref reader, options, PropEnabled))
+			{
+				continue;
+			}
+
+			if (propLabels.TryRead(ref reader, options, PropLabels))
+			{
+				continue;
+			}
+
+			if (propLastSynchronized.TryRead(ref reader, options, PropLastSynchronized))
+			{
+				continue;
+			}
+
+			if (propUid.TryRead(ref reader, options, PropUid))
+			{
+				continue;
+			}
+
+			if (propUser.TryRead(ref reader, options, PropUser))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ActivateUserProfileResponse
+		{
+			Data = propData.Value
+,
+			Doc = propDoc.Value
+,
+			Enabled = propEnabled.Value
+,
+			Labels = propLabels.Value
+,
+			LastSynchronized = propLastSynchronized.Value
+,
+			Uid = propUid.Value
+,
+			User = propUser.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ActivateUserProfileResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropData, value.Data);
+		writer.WriteProperty(options, PropDoc, value.Doc);
+		writer.WriteProperty(options, PropEnabled, value.Enabled);
+		writer.WriteProperty(options, PropLabels, value.Labels);
+		writer.WriteProperty(options, PropLastSynchronized, value.LastSynchronized);
+		writer.WriteProperty(options, PropUid, value.Uid);
+		writer.WriteProperty(options, PropUser, value.User);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ActivateUserProfileResponseConverter))]
 public sealed partial class ActivateUserProfileResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("data")]
 	public IReadOnlyDictionary<string, object> Data { get; init; }
-	[JsonInclude, JsonPropertyName("_doc")]
 	public Elastic.Clients.Elasticsearch.Serverless.Security.UserProfileHitMetadata Doc { get; init; }
-	[JsonInclude, JsonPropertyName("enabled")]
 	public bool? Enabled { get; init; }
-	[JsonInclude, JsonPropertyName("labels")]
 	public IReadOnlyDictionary<string, object> Labels { get; init; }
-	[JsonInclude, JsonPropertyName("last_synchronized")]
 	public long LastSynchronized { get; init; }
-	[JsonInclude, JsonPropertyName("uid")]
 	public string Uid { get; init; }
-	[JsonInclude, JsonPropertyName("user")]
 	public Elastic.Clients.Elasticsearch.Serverless.Security.UserProfileUser User { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/AuthenticateResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/AuthenticateResponse.g.cs
index 3da609f9d34..da0a04c9625 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/AuthenticateResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/AuthenticateResponse.g.cs
@@ -18,36 +18,162 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Security;
 
+internal sealed partial class AuthenticateResponseConverter : System.Text.Json.Serialization.JsonConverter<AuthenticateResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropApiKey = System.Text.Json.JsonEncodedText.Encode("api_key");
+	private static readonly System.Text.Json.JsonEncodedText PropAuthenticationRealm = System.Text.Json.JsonEncodedText.Encode("authentication_realm");
+	private static readonly System.Text.Json.JsonEncodedText PropAuthenticationType = System.Text.Json.JsonEncodedText.Encode("authentication_type");
+	private static readonly System.Text.Json.JsonEncodedText PropEmail = System.Text.Json.JsonEncodedText.Encode("email");
+	private static readonly System.Text.Json.JsonEncodedText PropEnabled = System.Text.Json.JsonEncodedText.Encode("enabled");
+	private static readonly System.Text.Json.JsonEncodedText PropFullName = System.Text.Json.JsonEncodedText.Encode("full_name");
+	private static readonly System.Text.Json.JsonEncodedText PropLookupRealm = System.Text.Json.JsonEncodedText.Encode("lookup_realm");
+	private static readonly System.Text.Json.JsonEncodedText PropMetadata = System.Text.Json.JsonEncodedText.Encode("metadata");
+	private static readonly System.Text.Json.JsonEncodedText PropRoles = System.Text.Json.JsonEncodedText.Encode("roles");
+	private static readonly System.Text.Json.JsonEncodedText PropToken = System.Text.Json.JsonEncodedText.Encode("token");
+	private static readonly System.Text.Json.JsonEncodedText PropUsername = System.Text.Json.JsonEncodedText.Encode("username");
+
+	public override AuthenticateResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Security.AuthenticateApiKey?> propApiKey = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Security.RealmInfo> propAuthenticationRealm = default;
+		LocalJsonProperty<string> propAuthenticationType = default;
+		LocalJsonProperty<string?> propEmail = default;
+		LocalJsonProperty<bool> propEnabled = default;
+		LocalJsonProperty<string?> propFullName = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Security.RealmInfo> propLookupRealm = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, object>> propMetadata = default;
+		LocalJsonProperty<IReadOnlyCollection<string>> propRoles = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Security.AuthenticateToken?> propToken = default;
+		LocalJsonProperty<string> propUsername = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propApiKey.TryRead(ref reader, options, PropApiKey))
+			{
+				continue;
+			}
+
+			if (propAuthenticationRealm.TryRead(ref reader, options, PropAuthenticationRealm))
+			{
+				continue;
+			}
+
+			if (propAuthenticationType.TryRead(ref reader, options, PropAuthenticationType))
+			{
+				continue;
+			}
+
+			if (propEmail.TryRead(ref reader, options, PropEmail))
+			{
+				continue;
+			}
+
+			if (propEnabled.TryRead(ref reader, options, PropEnabled))
+			{
+				continue;
+			}
+
+			if (propFullName.TryRead(ref reader, options, PropFullName))
+			{
+				continue;
+			}
+
+			if (propLookupRealm.TryRead(ref reader, options, PropLookupRealm))
+			{
+				continue;
+			}
+
+			if (propMetadata.TryRead(ref reader, options, PropMetadata))
+			{
+				continue;
+			}
+
+			if (propRoles.TryRead(ref reader, options, PropRoles))
+			{
+				continue;
+			}
+
+			if (propToken.TryRead(ref reader, options, PropToken))
+			{
+				continue;
+			}
+
+			if (propUsername.TryRead(ref reader, options, PropUsername))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new AuthenticateResponse
+		{
+			ApiKey = propApiKey.Value
+,
+			AuthenticationRealm = propAuthenticationRealm.Value
+,
+			AuthenticationType = propAuthenticationType.Value
+,
+			Email = propEmail.Value
+,
+			Enabled = propEnabled.Value
+,
+			FullName = propFullName.Value
+,
+			LookupRealm = propLookupRealm.Value
+,
+			Metadata = propMetadata.Value
+,
+			Roles = propRoles.Value
+,
+			Token = propToken.Value
+,
+			Username = propUsername.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, AuthenticateResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropApiKey, value.ApiKey);
+		writer.WriteProperty(options, PropAuthenticationRealm, value.AuthenticationRealm);
+		writer.WriteProperty(options, PropAuthenticationType, value.AuthenticationType);
+		writer.WriteProperty(options, PropEmail, value.Email);
+		writer.WriteProperty(options, PropEnabled, value.Enabled);
+		writer.WriteProperty(options, PropFullName, value.FullName);
+		writer.WriteProperty(options, PropLookupRealm, value.LookupRealm);
+		writer.WriteProperty(options, PropMetadata, value.Metadata);
+		writer.WriteProperty(options, PropRoles, value.Roles);
+		writer.WriteProperty(options, PropToken, value.Token);
+		writer.WriteProperty(options, PropUsername, value.Username);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(AuthenticateResponseConverter))]
 public sealed partial class AuthenticateResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("api_key")]
 	public Elastic.Clients.Elasticsearch.Serverless.Security.AuthenticateApiKey? ApiKey { get; init; }
-	[JsonInclude, JsonPropertyName("authentication_realm")]
 	public Elastic.Clients.Elasticsearch.Serverless.Security.RealmInfo AuthenticationRealm { get; init; }
-	[JsonInclude, JsonPropertyName("authentication_type")]
 	public string AuthenticationType { get; init; }
-	[JsonInclude, JsonPropertyName("email")]
 	public string? Email { get; init; }
-	[JsonInclude, JsonPropertyName("enabled")]
 	public bool Enabled { get; init; }
-	[JsonInclude, JsonPropertyName("full_name")]
 	public string? FullName { get; init; }
-	[JsonInclude, JsonPropertyName("lookup_realm")]
 	public Elastic.Clients.Elasticsearch.Serverless.Security.RealmInfo LookupRealm { get; init; }
-	[JsonInclude, JsonPropertyName("metadata")]
 	public IReadOnlyDictionary<string, object> Metadata { get; init; }
-	[JsonInclude, JsonPropertyName("roles")]
 	public IReadOnlyCollection<string> Roles { get; init; }
-	[JsonInclude, JsonPropertyName("token")]
 	public Elastic.Clients.Elasticsearch.Serverless.Security.AuthenticateToken? Token { get; init; }
-	[JsonInclude, JsonPropertyName("username")]
 	public string Username { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/BulkDeleteRoleResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/BulkDeleteRoleResponse.g.cs
index 4334b626ee3..ed05f391e6e 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/BulkDeleteRoleResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/BulkDeleteRoleResponse.g.cs
@@ -18,14 +18,71 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Security;
 
+internal sealed partial class BulkDeleteRoleResponseConverter : System.Text.Json.Serialization.JsonConverter<BulkDeleteRoleResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropDeleted = System.Text.Json.JsonEncodedText.Encode("deleted");
+	private static readonly System.Text.Json.JsonEncodedText PropErrors = System.Text.Json.JsonEncodedText.Encode("errors");
+	private static readonly System.Text.Json.JsonEncodedText PropNotFound = System.Text.Json.JsonEncodedText.Encode("not_found");
+
+	public override BulkDeleteRoleResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<string>?> propDeleted = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Security.BulkError?> propErrors = default;
+		LocalJsonProperty<IReadOnlyCollection<string>?> propNotFound = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propDeleted.TryRead(ref reader, options, PropDeleted))
+			{
+				continue;
+			}
+
+			if (propErrors.TryRead(ref reader, options, PropErrors))
+			{
+				continue;
+			}
+
+			if (propNotFound.TryRead(ref reader, options, PropNotFound))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new BulkDeleteRoleResponse
+		{
+			Deleted = propDeleted.Value
+,
+			Errors = propErrors.Value
+,
+			NotFound = propNotFound.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, BulkDeleteRoleResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDeleted, value.Deleted);
+		writer.WriteProperty(options, PropErrors, value.Errors);
+		writer.WriteProperty(options, PropNotFound, value.NotFound);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(BulkDeleteRoleResponseConverter))]
 public sealed partial class BulkDeleteRoleResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,7 +90,6 @@ public sealed partial class BulkDeleteRoleResponse : ElasticsearchResponse
 	/// Array of deleted roles
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("deleted")]
 	public IReadOnlyCollection<string>? Deleted { get; init; }
 
 	/// <summary>
@@ -41,7 +97,6 @@ public sealed partial class BulkDeleteRoleResponse : ElasticsearchResponse
 	/// Present if any deletes resulted in errors
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("errors")]
 	public Elastic.Clients.Elasticsearch.Serverless.Security.BulkError? Errors { get; init; }
 
 	/// <summary>
@@ -49,6 +104,5 @@ public sealed partial class BulkDeleteRoleResponse : ElasticsearchResponse
 	/// Array of roles that could not be found
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("not_found")]
 	public IReadOnlyCollection<string>? NotFound { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/BulkPutRoleResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/BulkPutRoleResponse.g.cs
index 85ff7db5a44..5b7b22eb699 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/BulkPutRoleResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/BulkPutRoleResponse.g.cs
@@ -18,14 +18,81 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Security;
 
+internal sealed partial class BulkPutRoleResponseConverter : System.Text.Json.Serialization.JsonConverter<BulkPutRoleResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCreated = System.Text.Json.JsonEncodedText.Encode("created");
+	private static readonly System.Text.Json.JsonEncodedText PropErrors = System.Text.Json.JsonEncodedText.Encode("errors");
+	private static readonly System.Text.Json.JsonEncodedText PropNoop = System.Text.Json.JsonEncodedText.Encode("noop");
+	private static readonly System.Text.Json.JsonEncodedText PropUpdated = System.Text.Json.JsonEncodedText.Encode("updated");
+
+	public override BulkPutRoleResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<string>?> propCreated = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Security.BulkError?> propErrors = default;
+		LocalJsonProperty<IReadOnlyCollection<string>?> propNoop = default;
+		LocalJsonProperty<IReadOnlyCollection<string>?> propUpdated = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCreated.TryRead(ref reader, options, PropCreated))
+			{
+				continue;
+			}
+
+			if (propErrors.TryRead(ref reader, options, PropErrors))
+			{
+				continue;
+			}
+
+			if (propNoop.TryRead(ref reader, options, PropNoop))
+			{
+				continue;
+			}
+
+			if (propUpdated.TryRead(ref reader, options, PropUpdated))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new BulkPutRoleResponse
+		{
+			Created = propCreated.Value
+,
+			Errors = propErrors.Value
+,
+			Noop = propNoop.Value
+,
+			Updated = propUpdated.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, BulkPutRoleResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCreated, value.Created);
+		writer.WriteProperty(options, PropErrors, value.Errors);
+		writer.WriteProperty(options, PropNoop, value.Noop);
+		writer.WriteProperty(options, PropUpdated, value.Updated);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(BulkPutRoleResponseConverter))]
 public sealed partial class BulkPutRoleResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,7 +100,6 @@ public sealed partial class BulkPutRoleResponse : ElasticsearchResponse
 	/// Array of created roles
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("created")]
 	public IReadOnlyCollection<string>? Created { get; init; }
 
 	/// <summary>
@@ -41,7 +107,6 @@ public sealed partial class BulkPutRoleResponse : ElasticsearchResponse
 	/// Present if any updates resulted in errors
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("errors")]
 	public Elastic.Clients.Elasticsearch.Serverless.Security.BulkError? Errors { get; init; }
 
 	/// <summary>
@@ -49,7 +114,6 @@ public sealed partial class BulkPutRoleResponse : ElasticsearchResponse
 	/// Array of role names without any changes
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("noop")]
 	public IReadOnlyCollection<string>? Noop { get; init; }
 
 	/// <summary>
@@ -57,6 +121,5 @@ public sealed partial class BulkPutRoleResponse : ElasticsearchResponse
 	/// Array of updated roles
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("updated")]
 	public IReadOnlyCollection<string>? Updated { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/ClearApiKeyCacheResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/ClearApiKeyCacheResponse.g.cs
index e7dd4705bee..b19e36c7f3e 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/ClearApiKeyCacheResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/ClearApiKeyCacheResponse.g.cs
@@ -18,20 +18,74 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Security;
 
+internal sealed partial class ClearApiKeyCacheResponseConverter : System.Text.Json.Serialization.JsonConverter<ClearApiKeyCacheResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropClusterName = System.Text.Json.JsonEncodedText.Encode("cluster_name");
+	private static readonly System.Text.Json.JsonEncodedText PropNodes = System.Text.Json.JsonEncodedText.Encode("nodes");
+	private static readonly System.Text.Json.JsonEncodedText PropNodeStats = System.Text.Json.JsonEncodedText.Encode("_nodes");
+
+	public override ClearApiKeyCacheResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propClusterName = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Security.ClusterNode>> propNodes = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.NodeStatistics> propNodeStats = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propClusterName.TryRead(ref reader, options, PropClusterName))
+			{
+				continue;
+			}
+
+			if (propNodes.TryRead(ref reader, options, PropNodes))
+			{
+				continue;
+			}
+
+			if (propNodeStats.TryRead(ref reader, options, PropNodeStats))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ClearApiKeyCacheResponse
+		{
+			ClusterName = propClusterName.Value
+,
+			Nodes = propNodes.Value
+,
+			NodeStats = propNodeStats.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ClearApiKeyCacheResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropClusterName, value.ClusterName);
+		writer.WriteProperty(options, PropNodes, value.Nodes);
+		writer.WriteProperty(options, PropNodeStats, value.NodeStats);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ClearApiKeyCacheResponseConverter))]
 public sealed partial class ClearApiKeyCacheResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("cluster_name")]
 	public string ClusterName { get; init; }
-	[JsonInclude, JsonPropertyName("nodes")]
 	public IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Security.ClusterNode> Nodes { get; init; }
-	[JsonInclude, JsonPropertyName("_nodes")]
 	public Elastic.Clients.Elasticsearch.Serverless.NodeStatistics NodeStats { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/ClearCachedPrivilegesResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/ClearCachedPrivilegesResponse.g.cs
index 80153dbf93b..811c76038db 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/ClearCachedPrivilegesResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/ClearCachedPrivilegesResponse.g.cs
@@ -18,20 +18,74 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Security;
 
+internal sealed partial class ClearCachedPrivilegesResponseConverter : System.Text.Json.Serialization.JsonConverter<ClearCachedPrivilegesResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropClusterName = System.Text.Json.JsonEncodedText.Encode("cluster_name");
+	private static readonly System.Text.Json.JsonEncodedText PropNodes = System.Text.Json.JsonEncodedText.Encode("nodes");
+	private static readonly System.Text.Json.JsonEncodedText PropNodeStats = System.Text.Json.JsonEncodedText.Encode("_nodes");
+
+	public override ClearCachedPrivilegesResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propClusterName = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Security.ClusterNode>> propNodes = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.NodeStatistics> propNodeStats = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propClusterName.TryRead(ref reader, options, PropClusterName))
+			{
+				continue;
+			}
+
+			if (propNodes.TryRead(ref reader, options, PropNodes))
+			{
+				continue;
+			}
+
+			if (propNodeStats.TryRead(ref reader, options, PropNodeStats))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ClearCachedPrivilegesResponse
+		{
+			ClusterName = propClusterName.Value
+,
+			Nodes = propNodes.Value
+,
+			NodeStats = propNodeStats.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ClearCachedPrivilegesResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropClusterName, value.ClusterName);
+		writer.WriteProperty(options, PropNodes, value.Nodes);
+		writer.WriteProperty(options, PropNodeStats, value.NodeStats);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ClearCachedPrivilegesResponseConverter))]
 public sealed partial class ClearCachedPrivilegesResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("cluster_name")]
 	public string ClusterName { get; init; }
-	[JsonInclude, JsonPropertyName("nodes")]
 	public IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Security.ClusterNode> Nodes { get; init; }
-	[JsonInclude, JsonPropertyName("_nodes")]
 	public Elastic.Clients.Elasticsearch.Serverless.NodeStatistics NodeStats { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/ClearCachedRealmsResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/ClearCachedRealmsResponse.g.cs
index efe1c3411eb..787e90930e8 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/ClearCachedRealmsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/ClearCachedRealmsResponse.g.cs
@@ -18,20 +18,74 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Security;
 
+internal sealed partial class ClearCachedRealmsResponseConverter : System.Text.Json.Serialization.JsonConverter<ClearCachedRealmsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropClusterName = System.Text.Json.JsonEncodedText.Encode("cluster_name");
+	private static readonly System.Text.Json.JsonEncodedText PropNodes = System.Text.Json.JsonEncodedText.Encode("nodes");
+	private static readonly System.Text.Json.JsonEncodedText PropNodeStats = System.Text.Json.JsonEncodedText.Encode("_nodes");
+
+	public override ClearCachedRealmsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propClusterName = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Security.ClusterNode>> propNodes = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.NodeStatistics> propNodeStats = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propClusterName.TryRead(ref reader, options, PropClusterName))
+			{
+				continue;
+			}
+
+			if (propNodes.TryRead(ref reader, options, PropNodes))
+			{
+				continue;
+			}
+
+			if (propNodeStats.TryRead(ref reader, options, PropNodeStats))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ClearCachedRealmsResponse
+		{
+			ClusterName = propClusterName.Value
+,
+			Nodes = propNodes.Value
+,
+			NodeStats = propNodeStats.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ClearCachedRealmsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropClusterName, value.ClusterName);
+		writer.WriteProperty(options, PropNodes, value.Nodes);
+		writer.WriteProperty(options, PropNodeStats, value.NodeStats);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ClearCachedRealmsResponseConverter))]
 public sealed partial class ClearCachedRealmsResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("cluster_name")]
 	public string ClusterName { get; init; }
-	[JsonInclude, JsonPropertyName("nodes")]
 	public IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Security.ClusterNode> Nodes { get; init; }
-	[JsonInclude, JsonPropertyName("_nodes")]
 	public Elastic.Clients.Elasticsearch.Serverless.NodeStatistics NodeStats { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/ClearCachedRolesResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/ClearCachedRolesResponse.g.cs
index e28b91f8337..b44c07eb8ef 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/ClearCachedRolesResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/ClearCachedRolesResponse.g.cs
@@ -18,20 +18,74 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Security;
 
+internal sealed partial class ClearCachedRolesResponseConverter : System.Text.Json.Serialization.JsonConverter<ClearCachedRolesResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropClusterName = System.Text.Json.JsonEncodedText.Encode("cluster_name");
+	private static readonly System.Text.Json.JsonEncodedText PropNodes = System.Text.Json.JsonEncodedText.Encode("nodes");
+	private static readonly System.Text.Json.JsonEncodedText PropNodeStats = System.Text.Json.JsonEncodedText.Encode("_nodes");
+
+	public override ClearCachedRolesResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propClusterName = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Security.ClusterNode>> propNodes = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.NodeStatistics> propNodeStats = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propClusterName.TryRead(ref reader, options, PropClusterName))
+			{
+				continue;
+			}
+
+			if (propNodes.TryRead(ref reader, options, PropNodes))
+			{
+				continue;
+			}
+
+			if (propNodeStats.TryRead(ref reader, options, PropNodeStats))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ClearCachedRolesResponse
+		{
+			ClusterName = propClusterName.Value
+,
+			Nodes = propNodes.Value
+,
+			NodeStats = propNodeStats.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ClearCachedRolesResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropClusterName, value.ClusterName);
+		writer.WriteProperty(options, PropNodes, value.Nodes);
+		writer.WriteProperty(options, PropNodeStats, value.NodeStats);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ClearCachedRolesResponseConverter))]
 public sealed partial class ClearCachedRolesResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("cluster_name")]
 	public string ClusterName { get; init; }
-	[JsonInclude, JsonPropertyName("nodes")]
 	public IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Security.ClusterNode> Nodes { get; init; }
-	[JsonInclude, JsonPropertyName("_nodes")]
 	public Elastic.Clients.Elasticsearch.Serverless.NodeStatistics NodeStats { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/ClearCachedServiceTokensResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/ClearCachedServiceTokensResponse.g.cs
index a97f7495f65..2d9850c62b1 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/ClearCachedServiceTokensResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/ClearCachedServiceTokensResponse.g.cs
@@ -18,20 +18,74 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Security;
 
+internal sealed partial class ClearCachedServiceTokensResponseConverter : System.Text.Json.Serialization.JsonConverter<ClearCachedServiceTokensResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropClusterName = System.Text.Json.JsonEncodedText.Encode("cluster_name");
+	private static readonly System.Text.Json.JsonEncodedText PropNodes = System.Text.Json.JsonEncodedText.Encode("nodes");
+	private static readonly System.Text.Json.JsonEncodedText PropNodeStats = System.Text.Json.JsonEncodedText.Encode("_nodes");
+
+	public override ClearCachedServiceTokensResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propClusterName = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Security.ClusterNode>> propNodes = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.NodeStatistics> propNodeStats = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propClusterName.TryRead(ref reader, options, PropClusterName))
+			{
+				continue;
+			}
+
+			if (propNodes.TryRead(ref reader, options, PropNodes))
+			{
+				continue;
+			}
+
+			if (propNodeStats.TryRead(ref reader, options, PropNodeStats))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ClearCachedServiceTokensResponse
+		{
+			ClusterName = propClusterName.Value
+,
+			Nodes = propNodes.Value
+,
+			NodeStats = propNodeStats.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ClearCachedServiceTokensResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropClusterName, value.ClusterName);
+		writer.WriteProperty(options, PropNodes, value.Nodes);
+		writer.WriteProperty(options, PropNodeStats, value.NodeStats);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ClearCachedServiceTokensResponseConverter))]
 public sealed partial class ClearCachedServiceTokensResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("cluster_name")]
 	public string ClusterName { get; init; }
-	[JsonInclude, JsonPropertyName("nodes")]
 	public IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Security.ClusterNode> Nodes { get; init; }
-	[JsonInclude, JsonPropertyName("_nodes")]
 	public Elastic.Clients.Elasticsearch.Serverless.NodeStatistics NodeStats { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/CreateApiKeyResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/CreateApiKeyResponse.g.cs
index 841689b990c..e0b1f0a39de 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/CreateApiKeyResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/CreateApiKeyResponse.g.cs
@@ -18,14 +18,91 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Security;
 
+internal sealed partial class CreateApiKeyResponseConverter : System.Text.Json.Serialization.JsonConverter<CreateApiKeyResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropApiKey = System.Text.Json.JsonEncodedText.Encode("api_key");
+	private static readonly System.Text.Json.JsonEncodedText PropEncoded = System.Text.Json.JsonEncodedText.Encode("encoded");
+	private static readonly System.Text.Json.JsonEncodedText PropExpiration = System.Text.Json.JsonEncodedText.Encode("expiration");
+	private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("id");
+	private static readonly System.Text.Json.JsonEncodedText PropName = System.Text.Json.JsonEncodedText.Encode("name");
+
+	public override CreateApiKeyResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propApiKey = default;
+		LocalJsonProperty<string> propEncoded = default;
+		LocalJsonProperty<long?> propExpiration = default;
+		LocalJsonProperty<string> propId = default;
+		LocalJsonProperty<string> propName = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propApiKey.TryRead(ref reader, options, PropApiKey))
+			{
+				continue;
+			}
+
+			if (propEncoded.TryRead(ref reader, options, PropEncoded))
+			{
+				continue;
+			}
+
+			if (propExpiration.TryRead(ref reader, options, PropExpiration))
+			{
+				continue;
+			}
+
+			if (propId.TryRead(ref reader, options, PropId))
+			{
+				continue;
+			}
+
+			if (propName.TryRead(ref reader, options, PropName))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new CreateApiKeyResponse
+		{
+			ApiKey = propApiKey.Value
+,
+			Encoded = propEncoded.Value
+,
+			Expiration = propExpiration.Value
+,
+			Id = propId.Value
+,
+			Name = propName.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, CreateApiKeyResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropApiKey, value.ApiKey);
+		writer.WriteProperty(options, PropEncoded, value.Encoded);
+		writer.WriteProperty(options, PropExpiration, value.Expiration);
+		writer.WriteProperty(options, PropId, value.Id);
+		writer.WriteProperty(options, PropName, value.Name);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(CreateApiKeyResponseConverter))]
 public sealed partial class CreateApiKeyResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,7 +110,6 @@ public sealed partial class CreateApiKeyResponse : ElasticsearchResponse
 	/// Generated API key.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("api_key")]
 	public string ApiKey { get; init; }
 
 	/// <summary>
@@ -43,7 +119,6 @@ public sealed partial class CreateApiKeyResponse : ElasticsearchResponse
 	/// by a colon (<c>:</c>).
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("encoded")]
 	public string Encoded { get; init; }
 
 	/// <summary>
@@ -51,7 +126,6 @@ public sealed partial class CreateApiKeyResponse : ElasticsearchResponse
 	/// Expiration in milliseconds for the API key.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("expiration")]
 	public long? Expiration { get; init; }
 
 	/// <summary>
@@ -59,7 +133,6 @@ public sealed partial class CreateApiKeyResponse : ElasticsearchResponse
 	/// Unique ID for this API key.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("id")]
 	public string Id { get; init; }
 
 	/// <summary>
@@ -67,6 +140,5 @@ public sealed partial class CreateApiKeyResponse : ElasticsearchResponse
 	/// Specifies the name for this API key.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("name")]
 	public string Name { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/CreateServiceTokenResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/CreateServiceTokenResponse.g.cs
index 14ddc24ddc3..35f6970c439 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/CreateServiceTokenResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/CreateServiceTokenResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Security;
 
+internal sealed partial class CreateServiceTokenResponseConverter : System.Text.Json.Serialization.JsonConverter<CreateServiceTokenResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCreated = System.Text.Json.JsonEncodedText.Encode("created");
+	private static readonly System.Text.Json.JsonEncodedText PropToken = System.Text.Json.JsonEncodedText.Encode("token");
+
+	public override CreateServiceTokenResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propCreated = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Security.ServiceToken> propToken = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCreated.TryRead(ref reader, options, PropCreated))
+			{
+				continue;
+			}
+
+			if (propToken.TryRead(ref reader, options, PropToken))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new CreateServiceTokenResponse
+		{
+			Created = propCreated.Value
+,
+			Token = propToken.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, CreateServiceTokenResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCreated, value.Created);
+		writer.WriteProperty(options, PropToken, value.Token);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(CreateServiceTokenResponseConverter))]
 public sealed partial class CreateServiceTokenResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("created")]
 	public bool Created { get; init; }
-	[JsonInclude, JsonPropertyName("token")]
 	public Elastic.Clients.Elasticsearch.Serverless.Security.ServiceToken Token { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/DeleteRoleMappingResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/DeleteRoleMappingResponse.g.cs
index 69ec38d8224..042febaaa01 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/DeleteRoleMappingResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/DeleteRoleMappingResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Security;
 
+internal sealed partial class DeleteRoleMappingResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteRoleMappingResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropFound = System.Text.Json.JsonEncodedText.Encode("found");
+
+	public override DeleteRoleMappingResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propFound = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propFound.TryRead(ref reader, options, PropFound))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteRoleMappingResponse
+		{
+			Found = propFound.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteRoleMappingResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropFound, value.Found);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteRoleMappingResponseConverter))]
 public sealed partial class DeleteRoleMappingResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("found")]
 	public bool Found { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/DeleteRoleResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/DeleteRoleResponse.g.cs
index e7fc61a464e..a9aee7f7980 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/DeleteRoleResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/DeleteRoleResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Security;
 
+internal sealed partial class DeleteRoleResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteRoleResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropFound = System.Text.Json.JsonEncodedText.Encode("found");
+
+	public override DeleteRoleResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propFound = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propFound.TryRead(ref reader, options, PropFound))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteRoleResponse
+		{
+			Found = propFound.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteRoleResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropFound, value.Found);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteRoleResponseConverter))]
 public sealed partial class DeleteRoleResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("found")]
 	public bool Found { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/DeleteServiceTokenResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/DeleteServiceTokenResponse.g.cs
index 26b35f9f977..7a546a04d0a 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/DeleteServiceTokenResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/DeleteServiceTokenResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Security;
 
+internal sealed partial class DeleteServiceTokenResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteServiceTokenResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropFound = System.Text.Json.JsonEncodedText.Encode("found");
+
+	public override DeleteServiceTokenResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propFound = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propFound.TryRead(ref reader, options, PropFound))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteServiceTokenResponse
+		{
+			Found = propFound.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteServiceTokenResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropFound, value.Found);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteServiceTokenResponseConverter))]
 public sealed partial class DeleteServiceTokenResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("found")]
 	public bool Found { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/DisableUserProfileResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/DisableUserProfileResponse.g.cs
index 13e6c139b7f..40a56b6b93c 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/DisableUserProfileResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/DisableUserProfileResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Security;
 
+internal sealed partial class DisableUserProfileResponseConverter : System.Text.Json.Serialization.JsonConverter<DisableUserProfileResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override DisableUserProfileResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DisableUserProfileResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DisableUserProfileResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DisableUserProfileResponseConverter))]
 public sealed partial class DisableUserProfileResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class DisableUserProfileResponse : ElasticsearchResponse
 	/// 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.Serverless/_Generated/Api/Security/EnableUserProfileResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/EnableUserProfileResponse.g.cs
index 4296ea9afc1..9d821de206d 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/EnableUserProfileResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/EnableUserProfileResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Security;
 
+internal sealed partial class EnableUserProfileResponseConverter : System.Text.Json.Serialization.JsonConverter<EnableUserProfileResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override EnableUserProfileResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new EnableUserProfileResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, EnableUserProfileResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(EnableUserProfileResponseConverter))]
 public sealed partial class EnableUserProfileResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class EnableUserProfileResponse : ElasticsearchResponse
 	/// 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.Serverless/_Generated/Api/Security/GetApiKeyResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/GetApiKeyResponse.g.cs
index 38a73ca81a9..8a28a5ca31d 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/GetApiKeyResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/GetApiKeyResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Security;
 
+internal sealed partial class GetApiKeyResponseConverter : System.Text.Json.Serialization.JsonConverter<GetApiKeyResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropApiKeys = System.Text.Json.JsonEncodedText.Encode("api_keys");
+
+	public override GetApiKeyResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Security.ApiKey>> propApiKeys = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propApiKeys.TryRead(ref reader, options, PropApiKeys))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetApiKeyResponse
+		{
+			ApiKeys = propApiKeys.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetApiKeyResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropApiKeys, value.ApiKeys);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetApiKeyResponseConverter))]
 public sealed partial class GetApiKeyResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("api_keys")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Security.ApiKey> ApiKeys { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/GetBuiltinPrivilegesResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/GetBuiltinPrivilegesResponse.g.cs
index 289a4f1da56..9d20abaf26f 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/GetBuiltinPrivilegesResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/GetBuiltinPrivilegesResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Security;
 
+internal sealed partial class GetBuiltinPrivilegesResponseConverter : System.Text.Json.Serialization.JsonConverter<GetBuiltinPrivilegesResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCluster = System.Text.Json.JsonEncodedText.Encode("cluster");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("index");
+
+	public override GetBuiltinPrivilegesResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Security.ClusterPrivilege>> propCluster = default;
+		LocalJsonProperty<IReadOnlyCollection<string>> propIndex = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCluster.TryRead(ref reader, options, PropCluster))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetBuiltinPrivilegesResponse
+		{
+			Cluster = propCluster.Value
+,
+			Index = propIndex.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetBuiltinPrivilegesResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCluster, value.Cluster);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetBuiltinPrivilegesResponseConverter))]
 public sealed partial class GetBuiltinPrivilegesResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("cluster")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Security.ClusterPrivilege> Cluster { get; init; }
-	[JsonInclude, JsonPropertyName("index")]
 	public IReadOnlyCollection<string> Index { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/GetServiceCredentialsResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/GetServiceCredentialsResponse.g.cs
index 02af7395fcc..8107c23ad47 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/GetServiceCredentialsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/GetServiceCredentialsResponse.g.cs
@@ -18,17 +18,83 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Security;
 
+internal sealed partial class GetServiceCredentialsResponseConverter : System.Text.Json.Serialization.JsonConverter<GetServiceCredentialsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCount = System.Text.Json.JsonEncodedText.Encode("count");
+	private static readonly System.Text.Json.JsonEncodedText PropNodesCredentials = System.Text.Json.JsonEncodedText.Encode("nodes_credentials");
+	private static readonly System.Text.Json.JsonEncodedText PropServiceAccount = System.Text.Json.JsonEncodedText.Encode("service_account");
+	private static readonly System.Text.Json.JsonEncodedText PropTokens = System.Text.Json.JsonEncodedText.Encode("tokens");
+
+	public override GetServiceCredentialsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<int> propCount = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Security.NodesCredentials> propNodesCredentials = default;
+		LocalJsonProperty<string> propServiceAccount = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, IReadOnlyDictionary<string, object>>> propTokens = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCount.TryRead(ref reader, options, PropCount))
+			{
+				continue;
+			}
+
+			if (propNodesCredentials.TryRead(ref reader, options, PropNodesCredentials))
+			{
+				continue;
+			}
+
+			if (propServiceAccount.TryRead(ref reader, options, PropServiceAccount))
+			{
+				continue;
+			}
+
+			if (propTokens.TryRead(ref reader, options, PropTokens))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetServiceCredentialsResponse
+		{
+			Count = propCount.Value
+,
+			NodesCredentials = propNodesCredentials.Value
+,
+			ServiceAccount = propServiceAccount.Value
+,
+			Tokens = propTokens.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetServiceCredentialsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCount, value.Count);
+		writer.WriteProperty(options, PropNodesCredentials, value.NodesCredentials);
+		writer.WriteProperty(options, PropServiceAccount, value.ServiceAccount);
+		writer.WriteProperty(options, PropTokens, value.Tokens);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetServiceCredentialsResponseConverter))]
 public sealed partial class GetServiceCredentialsResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("count")]
 	public int Count { get; init; }
 
 	/// <summary>
@@ -36,10 +102,7 @@ public sealed partial class GetServiceCredentialsResponse : ElasticsearchRespons
 	/// Contains service account credentials collected from all nodes of the cluster
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("nodes_credentials")]
 	public Elastic.Clients.Elasticsearch.Serverless.Security.NodesCredentials NodesCredentials { get; init; }
-	[JsonInclude, JsonPropertyName("service_account")]
 	public string ServiceAccount { get; init; }
-	[JsonInclude, JsonPropertyName("tokens")]
 	public IReadOnlyDictionary<string, IReadOnlyDictionary<string, object>> Tokens { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/GetTokenResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/GetTokenResponse.g.cs
index 36728c4b664..e85cd4a3904 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/GetTokenResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/GetTokenResponse.g.cs
@@ -18,28 +18,118 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Security;
 
+internal sealed partial class GetTokenResponseConverter : System.Text.Json.Serialization.JsonConverter<GetTokenResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAccessToken = System.Text.Json.JsonEncodedText.Encode("access_token");
+	private static readonly System.Text.Json.JsonEncodedText PropAuthentication = System.Text.Json.JsonEncodedText.Encode("authentication");
+	private static readonly System.Text.Json.JsonEncodedText PropExpiresIn = System.Text.Json.JsonEncodedText.Encode("expires_in");
+	private static readonly System.Text.Json.JsonEncodedText PropKerberosAuthenticationResponseToken = System.Text.Json.JsonEncodedText.Encode("kerberos_authentication_response_token");
+	private static readonly System.Text.Json.JsonEncodedText PropRefreshToken = System.Text.Json.JsonEncodedText.Encode("refresh_token");
+	private static readonly System.Text.Json.JsonEncodedText PropScope = System.Text.Json.JsonEncodedText.Encode("scope");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override GetTokenResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propAccessToken = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Security.AuthenticatedUser> propAuthentication = default;
+		LocalJsonProperty<long> propExpiresIn = default;
+		LocalJsonProperty<string?> propKerberosAuthenticationResponseToken = default;
+		LocalJsonProperty<string?> propRefreshToken = default;
+		LocalJsonProperty<string?> propScope = default;
+		LocalJsonProperty<string> propType = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAccessToken.TryRead(ref reader, options, PropAccessToken))
+			{
+				continue;
+			}
+
+			if (propAuthentication.TryRead(ref reader, options, PropAuthentication))
+			{
+				continue;
+			}
+
+			if (propExpiresIn.TryRead(ref reader, options, PropExpiresIn))
+			{
+				continue;
+			}
+
+			if (propKerberosAuthenticationResponseToken.TryRead(ref reader, options, PropKerberosAuthenticationResponseToken))
+			{
+				continue;
+			}
+
+			if (propRefreshToken.TryRead(ref reader, options, PropRefreshToken))
+			{
+				continue;
+			}
+
+			if (propScope.TryRead(ref reader, options, PropScope))
+			{
+				continue;
+			}
+
+			if (propType.TryRead(ref reader, options, PropType))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetTokenResponse
+		{
+			AccessToken = propAccessToken.Value
+,
+			Authentication = propAuthentication.Value
+,
+			ExpiresIn = propExpiresIn.Value
+,
+			KerberosAuthenticationResponseToken = propKerberosAuthenticationResponseToken.Value
+,
+			RefreshToken = propRefreshToken.Value
+,
+			Scope = propScope.Value
+,
+			Type = propType.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetTokenResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAccessToken, value.AccessToken);
+		writer.WriteProperty(options, PropAuthentication, value.Authentication);
+		writer.WriteProperty(options, PropExpiresIn, value.ExpiresIn);
+		writer.WriteProperty(options, PropKerberosAuthenticationResponseToken, value.KerberosAuthenticationResponseToken);
+		writer.WriteProperty(options, PropRefreshToken, value.RefreshToken);
+		writer.WriteProperty(options, PropScope, value.Scope);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetTokenResponseConverter))]
 public sealed partial class GetTokenResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("access_token")]
 	public string AccessToken { get; init; }
-	[JsonInclude, JsonPropertyName("authentication")]
 	public Elastic.Clients.Elasticsearch.Serverless.Security.AuthenticatedUser Authentication { get; init; }
-	[JsonInclude, JsonPropertyName("expires_in")]
 	public long ExpiresIn { get; init; }
-	[JsonInclude, JsonPropertyName("kerberos_authentication_response_token")]
 	public string? KerberosAuthenticationResponseToken { get; init; }
-	[JsonInclude, JsonPropertyName("refresh_token")]
 	public string? RefreshToken { get; init; }
-	[JsonInclude, JsonPropertyName("scope")]
 	public string? Scope { get; init; }
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/GetUserPrivilegesResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/GetUserPrivilegesResponse.g.cs
index 308ab397b53..f98887f6a19 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/GetUserPrivilegesResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/GetUserPrivilegesResponse.g.cs
@@ -18,24 +18,96 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Security;
 
+internal sealed partial class GetUserPrivilegesResponseConverter : System.Text.Json.Serialization.JsonConverter<GetUserPrivilegesResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropApplications = System.Text.Json.JsonEncodedText.Encode("applications");
+	private static readonly System.Text.Json.JsonEncodedText PropCluster = System.Text.Json.JsonEncodedText.Encode("cluster");
+	private static readonly System.Text.Json.JsonEncodedText PropGlobal = System.Text.Json.JsonEncodedText.Encode("global");
+	private static readonly System.Text.Json.JsonEncodedText PropIndices = System.Text.Json.JsonEncodedText.Encode("indices");
+	private static readonly System.Text.Json.JsonEncodedText PropRunAs = System.Text.Json.JsonEncodedText.Encode("run_as");
+
+	public override GetUserPrivilegesResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Security.ApplicationPrivileges>> propApplications = default;
+		LocalJsonProperty<IReadOnlyCollection<string>> propCluster = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Security.GlobalPrivilege>> propGlobal = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Security.UserIndicesPrivileges>> propIndices = default;
+		LocalJsonProperty<IReadOnlyCollection<string>> propRunAs = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propApplications.TryRead(ref reader, options, PropApplications))
+			{
+				continue;
+			}
+
+			if (propCluster.TryRead(ref reader, options, PropCluster))
+			{
+				continue;
+			}
+
+			if (propGlobal.TryRead(ref reader, options, PropGlobal))
+			{
+				continue;
+			}
+
+			if (propIndices.TryRead(ref reader, options, PropIndices))
+			{
+				continue;
+			}
+
+			if (propRunAs.TryRead(ref reader, options, PropRunAs))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetUserPrivilegesResponse
+		{
+			Applications = propApplications.Value
+,
+			Cluster = propCluster.Value
+,
+			Global = propGlobal.Value
+,
+			Indices = propIndices.Value
+,
+			RunAs = propRunAs.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetUserPrivilegesResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropApplications, value.Applications);
+		writer.WriteProperty(options, PropCluster, value.Cluster);
+		writer.WriteProperty(options, PropGlobal, value.Global);
+		writer.WriteProperty(options, PropIndices, value.Indices);
+		writer.WriteProperty(options, PropRunAs, value.RunAs);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetUserPrivilegesResponseConverter))]
 public sealed partial class GetUserPrivilegesResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("applications")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Security.ApplicationPrivileges> Applications { get; init; }
-	[JsonInclude, JsonPropertyName("cluster")]
 	public IReadOnlyCollection<string> Cluster { get; init; }
-	[JsonInclude, JsonPropertyName("global")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Security.GlobalPrivilege> Global { get; init; }
-	[JsonInclude, JsonPropertyName("indices")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Security.UserIndicesPrivileges> Indices { get; init; }
-	[JsonInclude, JsonPropertyName("run_as")]
 	public IReadOnlyCollection<string> RunAs { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/GetUserProfileResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/GetUserProfileResponse.g.cs
index de77684beab..538f65c7fd3 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/GetUserProfileResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/GetUserProfileResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Security;
 
+internal sealed partial class GetUserProfileResponseConverter : System.Text.Json.Serialization.JsonConverter<GetUserProfileResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropErrors = System.Text.Json.JsonEncodedText.Encode("errors");
+	private static readonly System.Text.Json.JsonEncodedText PropProfiles = System.Text.Json.JsonEncodedText.Encode("profiles");
+
+	public override GetUserProfileResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Security.GetUserProfileErrors?> propErrors = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Security.UserProfileWithMetadata>> propProfiles = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propErrors.TryRead(ref reader, options, PropErrors))
+			{
+				continue;
+			}
+
+			if (propProfiles.TryRead(ref reader, options, PropProfiles))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetUserProfileResponse
+		{
+			Errors = propErrors.Value
+,
+			Profiles = propProfiles.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetUserProfileResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropErrors, value.Errors);
+		writer.WriteProperty(options, PropProfiles, value.Profiles);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetUserProfileResponseConverter))]
 public sealed partial class GetUserProfileResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("errors")]
 	public Elastic.Clients.Elasticsearch.Serverless.Security.GetUserProfileErrors? Errors { get; init; }
-	[JsonInclude, JsonPropertyName("profiles")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Security.UserProfileWithMetadata> Profiles { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/GrantApiKeyResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/GrantApiKeyResponse.g.cs
index 60f9d7f83b5..f720b37ed2e 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/GrantApiKeyResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/GrantApiKeyResponse.g.cs
@@ -18,24 +18,96 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Security;
 
+internal sealed partial class GrantApiKeyResponseConverter : System.Text.Json.Serialization.JsonConverter<GrantApiKeyResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropApiKey = System.Text.Json.JsonEncodedText.Encode("api_key");
+	private static readonly System.Text.Json.JsonEncodedText PropEncoded = System.Text.Json.JsonEncodedText.Encode("encoded");
+	private static readonly System.Text.Json.JsonEncodedText PropExpiration = System.Text.Json.JsonEncodedText.Encode("expiration");
+	private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("id");
+	private static readonly System.Text.Json.JsonEncodedText PropName = System.Text.Json.JsonEncodedText.Encode("name");
+
+	public override GrantApiKeyResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propApiKey = default;
+		LocalJsonProperty<string> propEncoded = default;
+		LocalJsonProperty<long?> propExpiration = default;
+		LocalJsonProperty<string> propId = default;
+		LocalJsonProperty<string> propName = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propApiKey.TryRead(ref reader, options, PropApiKey))
+			{
+				continue;
+			}
+
+			if (propEncoded.TryRead(ref reader, options, PropEncoded))
+			{
+				continue;
+			}
+
+			if (propExpiration.TryRead(ref reader, options, PropExpiration))
+			{
+				continue;
+			}
+
+			if (propId.TryRead(ref reader, options, PropId))
+			{
+				continue;
+			}
+
+			if (propName.TryRead(ref reader, options, PropName))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GrantApiKeyResponse
+		{
+			ApiKey = propApiKey.Value
+,
+			Encoded = propEncoded.Value
+,
+			Expiration = propExpiration.Value
+,
+			Id = propId.Value
+,
+			Name = propName.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GrantApiKeyResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropApiKey, value.ApiKey);
+		writer.WriteProperty(options, PropEncoded, value.Encoded);
+		writer.WriteProperty(options, PropExpiration, value.Expiration);
+		writer.WriteProperty(options, PropId, value.Id);
+		writer.WriteProperty(options, PropName, value.Name);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GrantApiKeyResponseConverter))]
 public sealed partial class GrantApiKeyResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("api_key")]
 	public string ApiKey { get; init; }
-	[JsonInclude, JsonPropertyName("encoded")]
 	public string Encoded { get; init; }
-	[JsonInclude, JsonPropertyName("expiration")]
 	public long? Expiration { get; init; }
-	[JsonInclude, JsonPropertyName("id")]
 	public string Id { get; init; }
-	[JsonInclude, JsonPropertyName("name")]
 	public string Name { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/HasPrivilegesResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/HasPrivilegesResponse.g.cs
index 4411a6e4215..92951110a4f 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/HasPrivilegesResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/HasPrivilegesResponse.g.cs
@@ -18,25 +18,96 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Security;
 
+internal sealed partial class HasPrivilegesResponseConverter : System.Text.Json.Serialization.JsonConverter<HasPrivilegesResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropApplication = System.Text.Json.JsonEncodedText.Encode("application");
+	private static readonly System.Text.Json.JsonEncodedText PropCluster = System.Text.Json.JsonEncodedText.Encode("cluster");
+	private static readonly System.Text.Json.JsonEncodedText PropHasAllRequested = System.Text.Json.JsonEncodedText.Encode("has_all_requested");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropUsername = System.Text.Json.JsonEncodedText.Encode("username");
+
+	public override HasPrivilegesResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyDictionary<string, IReadOnlyDictionary<string, IReadOnlyDictionary<string, bool>>>> propApplication = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, bool>> propCluster = default;
+		LocalJsonProperty<bool> propHasAllRequested = default;
+		LocalJsonProperty<IReadOnlyDictionary<Elastic.Clients.Elasticsearch.Serverless.IndexName, IReadOnlyDictionary<string, bool>>> propIndex = default;
+		LocalJsonProperty<string> propUsername = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propApplication.TryRead(ref reader, options, PropApplication))
+			{
+				continue;
+			}
+
+			if (propCluster.TryRead(ref reader, options, PropCluster))
+			{
+				continue;
+			}
+
+			if (propHasAllRequested.TryRead(ref reader, options, PropHasAllRequested))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propUsername.TryRead(ref reader, options, PropUsername))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new HasPrivilegesResponse
+		{
+			Application = propApplication.Value
+,
+			Cluster = propCluster.Value
+,
+			HasAllRequested = propHasAllRequested.Value
+,
+			Index = propIndex.Value
+,
+			Username = propUsername.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, HasPrivilegesResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropApplication, value.Application);
+		writer.WriteProperty(options, PropCluster, value.Cluster);
+		writer.WriteProperty(options, PropHasAllRequested, value.HasAllRequested);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropUsername, value.Username);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(HasPrivilegesResponseConverter))]
 public sealed partial class HasPrivilegesResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("application")]
 	public IReadOnlyDictionary<string, IReadOnlyDictionary<string, IReadOnlyDictionary<string, bool>>> Application { get; init; }
-	[JsonInclude, JsonPropertyName("cluster")]
 	public IReadOnlyDictionary<string, bool> Cluster { get; init; }
-	[JsonInclude, JsonPropertyName("has_all_requested")]
 	public bool HasAllRequested { get; init; }
-	[JsonInclude, JsonPropertyName("index")]
-	[ReadOnlyIndexNameDictionaryConverter(typeof(IReadOnlyDictionary<string, bool>))]
 	public IReadOnlyDictionary<Elastic.Clients.Elasticsearch.Serverless.IndexName, IReadOnlyDictionary<string, bool>> Index { get; init; }
-	[JsonInclude, JsonPropertyName("username")]
 	public string Username { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/HasPrivilegesUserProfileResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/HasPrivilegesUserProfileResponse.g.cs
index 050f0f7f9b3..8ed86214507 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/HasPrivilegesUserProfileResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/HasPrivilegesUserProfileResponse.g.cs
@@ -18,14 +18,61 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Security;
 
+internal sealed partial class HasPrivilegesUserProfileResponseConverter : System.Text.Json.Serialization.JsonConverter<HasPrivilegesUserProfileResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropErrors = System.Text.Json.JsonEncodedText.Encode("errors");
+	private static readonly System.Text.Json.JsonEncodedText PropHasPrivilegeUids = System.Text.Json.JsonEncodedText.Encode("has_privilege_uids");
+
+	public override HasPrivilegesUserProfileResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Security.HasPrivilegesUserProfileErrors?> propErrors = default;
+		LocalJsonProperty<IReadOnlyCollection<string>> propHasPrivilegeUids = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propErrors.TryRead(ref reader, options, PropErrors))
+			{
+				continue;
+			}
+
+			if (propHasPrivilegeUids.TryRead(ref reader, options, PropHasPrivilegeUids))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new HasPrivilegesUserProfileResponse
+		{
+			Errors = propErrors.Value
+,
+			HasPrivilegeUids = propHasPrivilegeUids.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, HasPrivilegesUserProfileResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropErrors, value.Errors);
+		writer.WriteProperty(options, PropHasPrivilegeUids, value.HasPrivilegeUids);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(HasPrivilegesUserProfileResponseConverter))]
 public sealed partial class HasPrivilegesUserProfileResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -36,7 +83,6 @@ public sealed partial class HasPrivilegesUserProfileResponse : ElasticsearchResp
 	/// requested privileges. This field is absent if empty.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("errors")]
 	public Elastic.Clients.Elasticsearch.Serverless.Security.HasPrivilegesUserProfileErrors? Errors { get; init; }
 
 	/// <summary>
@@ -45,6 +91,5 @@ public sealed partial class HasPrivilegesUserProfileResponse : ElasticsearchResp
 	/// have all the requested privileges.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("has_privilege_uids")]
 	public IReadOnlyCollection<string> HasPrivilegeUids { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/InvalidateApiKeyResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/InvalidateApiKeyResponse.g.cs
index aa223f94def..2d6a8e6feba 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/InvalidateApiKeyResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/InvalidateApiKeyResponse.g.cs
@@ -18,22 +18,85 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Security;
 
+internal sealed partial class InvalidateApiKeyResponseConverter : System.Text.Json.Serialization.JsonConverter<InvalidateApiKeyResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropErrorCount = System.Text.Json.JsonEncodedText.Encode("error_count");
+	private static readonly System.Text.Json.JsonEncodedText PropErrorDetails = System.Text.Json.JsonEncodedText.Encode("error_details");
+	private static readonly System.Text.Json.JsonEncodedText PropInvalidatedApiKeys = System.Text.Json.JsonEncodedText.Encode("invalidated_api_keys");
+	private static readonly System.Text.Json.JsonEncodedText PropPreviouslyInvalidatedApiKeys = System.Text.Json.JsonEncodedText.Encode("previously_invalidated_api_keys");
+
+	public override InvalidateApiKeyResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<int> propErrorCount = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.ErrorCause>?> propErrorDetails = default;
+		LocalJsonProperty<IReadOnlyCollection<string>> propInvalidatedApiKeys = default;
+		LocalJsonProperty<IReadOnlyCollection<string>> propPreviouslyInvalidatedApiKeys = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propErrorCount.TryRead(ref reader, options, PropErrorCount))
+			{
+				continue;
+			}
+
+			if (propErrorDetails.TryRead(ref reader, options, PropErrorDetails))
+			{
+				continue;
+			}
+
+			if (propInvalidatedApiKeys.TryRead(ref reader, options, PropInvalidatedApiKeys))
+			{
+				continue;
+			}
+
+			if (propPreviouslyInvalidatedApiKeys.TryRead(ref reader, options, PropPreviouslyInvalidatedApiKeys))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new InvalidateApiKeyResponse
+		{
+			ErrorCount = propErrorCount.Value
+,
+			ErrorDetails = propErrorDetails.Value
+,
+			InvalidatedApiKeys = propInvalidatedApiKeys.Value
+,
+			PreviouslyInvalidatedApiKeys = propPreviouslyInvalidatedApiKeys.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, InvalidateApiKeyResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropErrorCount, value.ErrorCount);
+		writer.WriteProperty(options, PropErrorDetails, value.ErrorDetails);
+		writer.WriteProperty(options, PropInvalidatedApiKeys, value.InvalidatedApiKeys);
+		writer.WriteProperty(options, PropPreviouslyInvalidatedApiKeys, value.PreviouslyInvalidatedApiKeys);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(InvalidateApiKeyResponseConverter))]
 public sealed partial class InvalidateApiKeyResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("error_count")]
 	public int ErrorCount { get; init; }
-	[JsonInclude, JsonPropertyName("error_details")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.ErrorCause>? ErrorDetails { get; init; }
-	[JsonInclude, JsonPropertyName("invalidated_api_keys")]
 	public IReadOnlyCollection<string> InvalidatedApiKeys { get; init; }
-	[JsonInclude, JsonPropertyName("previously_invalidated_api_keys")]
 	public IReadOnlyCollection<string> PreviouslyInvalidatedApiKeys { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/InvalidateTokenResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/InvalidateTokenResponse.g.cs
index 7d3014db840..3213c411b82 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/InvalidateTokenResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/InvalidateTokenResponse.g.cs
@@ -18,22 +18,85 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Security;
 
+internal sealed partial class InvalidateTokenResponseConverter : System.Text.Json.Serialization.JsonConverter<InvalidateTokenResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropErrorCount = System.Text.Json.JsonEncodedText.Encode("error_count");
+	private static readonly System.Text.Json.JsonEncodedText PropErrorDetails = System.Text.Json.JsonEncodedText.Encode("error_details");
+	private static readonly System.Text.Json.JsonEncodedText PropInvalidatedTokens = System.Text.Json.JsonEncodedText.Encode("invalidated_tokens");
+	private static readonly System.Text.Json.JsonEncodedText PropPreviouslyInvalidatedTokens = System.Text.Json.JsonEncodedText.Encode("previously_invalidated_tokens");
+
+	public override InvalidateTokenResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<long> propErrorCount = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.ErrorCause>?> propErrorDetails = default;
+		LocalJsonProperty<long> propInvalidatedTokens = default;
+		LocalJsonProperty<long> propPreviouslyInvalidatedTokens = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propErrorCount.TryRead(ref reader, options, PropErrorCount))
+			{
+				continue;
+			}
+
+			if (propErrorDetails.TryRead(ref reader, options, PropErrorDetails))
+			{
+				continue;
+			}
+
+			if (propInvalidatedTokens.TryRead(ref reader, options, PropInvalidatedTokens))
+			{
+				continue;
+			}
+
+			if (propPreviouslyInvalidatedTokens.TryRead(ref reader, options, PropPreviouslyInvalidatedTokens))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new InvalidateTokenResponse
+		{
+			ErrorCount = propErrorCount.Value
+,
+			ErrorDetails = propErrorDetails.Value
+,
+			InvalidatedTokens = propInvalidatedTokens.Value
+,
+			PreviouslyInvalidatedTokens = propPreviouslyInvalidatedTokens.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, InvalidateTokenResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropErrorCount, value.ErrorCount);
+		writer.WriteProperty(options, PropErrorDetails, value.ErrorDetails);
+		writer.WriteProperty(options, PropInvalidatedTokens, value.InvalidatedTokens);
+		writer.WriteProperty(options, PropPreviouslyInvalidatedTokens, value.PreviouslyInvalidatedTokens);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(InvalidateTokenResponseConverter))]
 public sealed partial class InvalidateTokenResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("error_count")]
 	public long ErrorCount { get; init; }
-	[JsonInclude, JsonPropertyName("error_details")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.ErrorCause>? ErrorDetails { get; init; }
-	[JsonInclude, JsonPropertyName("invalidated_tokens")]
 	public long InvalidatedTokens { get; init; }
-	[JsonInclude, JsonPropertyName("previously_invalidated_tokens")]
 	public long PreviouslyInvalidatedTokens { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/PutPrivilegesRequest.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/PutPrivilegesRequest.g.cs
index 2a4b0e681d5..a21e4f0143a 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/PutPrivilegesRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/PutPrivilegesRequest.g.cs
@@ -47,7 +47,7 @@ public sealed partial class PutPrivilegesRequestParameters : RequestParameters
 /// Create or update application privileges.
 /// </para>
 /// </summary>
-public sealed partial class PutPrivilegesRequest : PlainRequest<PutPrivilegesRequestParameters>, ISelfSerializable
+public sealed partial class PutPrivilegesRequest : PlainRequest<PutPrivilegesRequestParameters>, ISelfTwoWaySerializable
 {
 	internal override ApiUrls ApiUrls => ApiUrlLookup.SecurityPutPrivileges;
 
@@ -66,10 +66,15 @@ public sealed partial class PutPrivilegesRequest : PlainRequest<PutPrivilegesReq
 	public Elastic.Clients.Elasticsearch.Serverless.Refresh? Refresh { get => Q<Elastic.Clients.Elasticsearch.Serverless.Refresh?>("refresh"); set => Q("refresh", value); }
 	public Dictionary<string, Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Security.PrivilegeActions>> Privileges { get; set; }
 
-	void ISelfSerializable.Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
+	void ISelfTwoWaySerializable.Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 	{
 		JsonSerializer.Serialize(writer, Privileges, options);
 	}
+
+	void ISelfTwoWaySerializable.Deserialize(ref Utf8JsonReader reader, JsonSerializerOptions options, IElasticsearchClientSettings settings)
+	{
+		Privileges = settings.RequestResponseSerializer.Deserialize<Dictionary<string, Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Security.PrivilegeActions>>>(ref reader);
+	}
 }
 
 /// <summary>
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/PutRoleMappingResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/PutRoleMappingResponse.g.cs
index df37b6dc402..27ea5997fbe 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/PutRoleMappingResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/PutRoleMappingResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Security;
 
+internal sealed partial class PutRoleMappingResponseConverter : System.Text.Json.Serialization.JsonConverter<PutRoleMappingResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCreated = System.Text.Json.JsonEncodedText.Encode("created");
+	private static readonly System.Text.Json.JsonEncodedText PropRoleMapping = System.Text.Json.JsonEncodedText.Encode("role_mapping");
+
+	public override PutRoleMappingResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool?> propCreated = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Security.CreatedStatus> propRoleMapping = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCreated.TryRead(ref reader, options, PropCreated))
+			{
+				continue;
+			}
+
+			if (propRoleMapping.TryRead(ref reader, options, PropRoleMapping))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutRoleMappingResponse
+		{
+			Created = propCreated.Value
+,
+			RoleMapping = propRoleMapping.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutRoleMappingResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCreated, value.Created);
+		writer.WriteProperty(options, PropRoleMapping, value.RoleMapping);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PutRoleMappingResponseConverter))]
 public sealed partial class PutRoleMappingResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("created")]
 	public bool? Created { get; init; }
-	[JsonInclude, JsonPropertyName("role_mapping")]
 	public Elastic.Clients.Elasticsearch.Serverless.Security.CreatedStatus RoleMapping { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/PutRoleResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/PutRoleResponse.g.cs
index a08aebbae71..ebb8af81f11 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/PutRoleResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/PutRoleResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Security;
 
+internal sealed partial class PutRoleResponseConverter : System.Text.Json.Serialization.JsonConverter<PutRoleResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropRole = System.Text.Json.JsonEncodedText.Encode("role");
+
+	public override PutRoleResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Security.CreatedStatus> propRole = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propRole.TryRead(ref reader, options, PropRole))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutRoleResponse
+		{
+			Role = propRole.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutRoleResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropRole, value.Role);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PutRoleResponseConverter))]
 public sealed partial class PutRoleResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("role")]
 	public Elastic.Clients.Elasticsearch.Serverless.Security.CreatedStatus Role { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/QueryApiKeysRequest.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/QueryApiKeysRequest.g.cs
index 4da4639b1b7..ce631517408 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/QueryApiKeysRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/QueryApiKeysRequest.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Requests;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport;
@@ -55,98 +56,86 @@ public sealed partial class QueryApiKeysRequestParameters : RequestParameters
 	public bool? WithProfileUid { get => Q<bool?>("with_profile_uid"); set => Q("with_profile_uid", value); }
 }
 
-internal sealed partial class QueryApiKeysRequestConverter : JsonConverter<QueryApiKeysRequest>
+internal sealed partial class QueryApiKeysRequestConverter : System.Text.Json.Serialization.JsonConverter<QueryApiKeysRequest>
 {
-	public override QueryApiKeysRequest Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations1 = System.Text.Json.JsonEncodedText.Encode("aggs");
+	private static readonly System.Text.Json.JsonEncodedText PropFrom = System.Text.Json.JsonEncodedText.Encode("from");
+	private static readonly System.Text.Json.JsonEncodedText PropQuery = System.Text.Json.JsonEncodedText.Encode("query");
+	private static readonly System.Text.Json.JsonEncodedText PropSearchAfter = System.Text.Json.JsonEncodedText.Encode("search_after");
+	private static readonly System.Text.Json.JsonEncodedText PropSize = System.Text.Json.JsonEncodedText.Encode("size");
+	private static readonly System.Text.Json.JsonEncodedText PropSort = System.Text.Json.JsonEncodedText.Encode("sort");
+
+	public override QueryApiKeysRequest Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		var variant = new QueryApiKeysRequest();
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Security.ApiKeyAggregation>?> propAggregations = default;
+		LocalJsonProperty<int?> propFrom = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Security.ApiKeyQuery?> propQuery = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.FieldValue>?> propSearchAfter = default;
+		LocalJsonProperty<int?> propSize = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.SortOptions>?> propSort = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propAggregations.TryRead(ref reader, options, PropAggregations) || propAggregations.TryRead(ref reader, options, PropAggregations1))
 			{
-				var property = reader.GetString();
-				if (property == "aggregations" || property == "aggs")
-				{
-					variant.Aggregations = JsonSerializer.Deserialize<IDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Security.ApiKeyAggregation>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "from")
-				{
-					variant.From = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "query")
-				{
-					variant.Query = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Security.ApiKeyQuery?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "search_after")
-				{
-					variant.SearchAfter = JsonSerializer.Deserialize<ICollection<Elastic.Clients.Elasticsearch.Serverless.FieldValue>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "size")
-				{
-					variant.Size = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "sort")
-				{
-					variant.Sort = JsonSerializer.Deserialize<ICollection<Elastic.Clients.Elasticsearch.Serverless.SortOptions>?>(ref reader, options);
-					continue;
-				}
+				continue;
 			}
-		}
 
-		return variant;
-	}
+			if (propFrom.TryRead(ref reader, options, PropFrom))
+			{
+				continue;
+			}
 
-	public override void Write(Utf8JsonWriter writer, QueryApiKeysRequest value, JsonSerializerOptions options)
-	{
-		writer.WriteStartObject();
-		if (value.Aggregations is not null)
-		{
-			writer.WritePropertyName("aggregations");
-			JsonSerializer.Serialize(writer, value.Aggregations, options);
-		}
+			if (propQuery.TryRead(ref reader, options, PropQuery))
+			{
+				continue;
+			}
 
-		if (value.From.HasValue)
-		{
-			writer.WritePropertyName("from");
-			writer.WriteNumberValue(value.From.Value);
-		}
+			if (propSearchAfter.TryRead(ref reader, options, PropSearchAfter))
+			{
+				continue;
+			}
 
-		if (value.Query is not null)
-		{
-			writer.WritePropertyName("query");
-			JsonSerializer.Serialize(writer, value.Query, options);
-		}
+			if (propSize.TryRead(ref reader, options, PropSize))
+			{
+				continue;
+			}
 
-		if (value.SearchAfter is not null)
-		{
-			writer.WritePropertyName("search_after");
-			JsonSerializer.Serialize(writer, value.SearchAfter, options);
-		}
+			if (propSort.TryRead(ref reader, options, PropSort, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.SortOptions>?, Elastic.Clients.Elasticsearch.Serverless.SortOptions>)))
+			{
+				continue;
+			}
 
-		if (value.Size.HasValue)
-		{
-			writer.WritePropertyName("size");
-			writer.WriteNumberValue(value.Size.Value);
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		if (value.Sort is not null)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new QueryApiKeysRequest
 		{
-			writer.WritePropertyName("sort");
-			JsonSerializer.Serialize(writer, value.Sort, options);
-		}
+			Aggregations = propAggregations.Value
+	,
+			From = propFrom.Value
+	,
+			Query = propQuery.Value
+	,
+			SearchAfter = propSearchAfter.Value
+	,
+			Size = propSize.Value
+	,
+			Sort = propSort.Value
+		};
+	}
 
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, QueryApiKeysRequest value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAggregations, value.Aggregations);
+		writer.WriteProperty(options, PropFrom, value.From);
+		writer.WriteProperty(options, PropQuery, value.Query);
+		writer.WriteProperty(options, PropSearchAfter, value.SearchAfter);
+		writer.WriteProperty(options, PropSize, value.Size);
+		writer.WriteProperty(options, PropSort, value.Sort, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.SortOptions>?, Elastic.Clients.Elasticsearch.Serverless.SortOptions>));
 		writer.WriteEndObject();
 	}
 }
@@ -179,7 +168,6 @@ public QueryApiKeysRequest()
 	/// Determines whether aggregation names are 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>
@@ -188,7 +176,6 @@ public QueryApiKeysRequest()
 	/// An API key's actual permission is the intersection of its assigned role descriptors and the owner user's role descriptors.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public bool? WithLimitedBy { get => Q<bool?>("with_limited_by"); set => Q("with_limited_by", value); }
 
 	/// <summary>
@@ -196,7 +183,6 @@ public QueryApiKeysRequest()
 	/// Determines whether to also retrieve the profile uid, for the API key owner principal, if it exists.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public bool? WithProfileUid { get => Q<bool?>("with_profile_uid"); set => Q("with_profile_uid", value); }
 
 	/// <summary>
@@ -208,7 +194,6 @@ public QueryApiKeysRequest()
 	/// Additionally, aggregations only run over the same subset of fields that query works with.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("aggregations")]
 	public IDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Security.ApiKeyAggregation>? Aggregations { get; set; }
 
 	/// <summary>
@@ -218,7 +203,6 @@ public QueryApiKeysRequest()
 	/// To page through more hits, use the <c>search_after</c> parameter.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("from")]
 	public int? From { get; set; }
 
 	/// <summary>
@@ -231,7 +215,6 @@ public QueryApiKeysRequest()
 	/// <c>creation</c>, <c>expiration</c>, <c>invalidated</c>, <c>invalidation</c>, <c>username</c>, <c>realm</c>, and <c>metadata</c>.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("query")]
 	public Elastic.Clients.Elasticsearch.Serverless.Security.ApiKeyQuery? Query { get; set; }
 
 	/// <summary>
@@ -239,7 +222,6 @@ public QueryApiKeysRequest()
 	/// Search after definition
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("search_after")]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.FieldValue>? SearchAfter { get; set; }
 
 	/// <summary>
@@ -249,7 +231,6 @@ public QueryApiKeysRequest()
 	/// To page through more hits, use the <c>search_after</c> parameter.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("size")]
 	public int? Size { get; set; }
 
 	/// <summary>
@@ -258,8 +239,6 @@ public QueryApiKeysRequest()
 	/// In addition, sort can also be applied to the <c>_doc</c> field to sort by index order.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("sort")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.Serverless.SortOptions))]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.SortOptions>? Sort { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/QueryApiKeysResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/QueryApiKeysResponse.g.cs
index 2b1dc469d1f..6fa2cedd5e3 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/QueryApiKeysResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/QueryApiKeysResponse.g.cs
@@ -18,14 +18,81 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Security;
 
+internal sealed partial class QueryApiKeysResponseConverter : System.Text.Json.Serialization.JsonConverter<QueryApiKeysResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropApiKeys = System.Text.Json.JsonEncodedText.Encode("api_keys");
+	private static readonly System.Text.Json.JsonEncodedText PropCount = System.Text.Json.JsonEncodedText.Encode("count");
+	private static readonly System.Text.Json.JsonEncodedText PropTotal = System.Text.Json.JsonEncodedText.Encode("total");
+
+	public override QueryApiKeysResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary?> propAggregations = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Security.ApiKey>> propApiKeys = default;
+		LocalJsonProperty<int> propCount = default;
+		LocalJsonProperty<int> propTotal = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAggregations.TryRead(ref reader, options, PropAggregations))
+			{
+				continue;
+			}
+
+			if (propApiKeys.TryRead(ref reader, options, PropApiKeys))
+			{
+				continue;
+			}
+
+			if (propCount.TryRead(ref reader, options, PropCount))
+			{
+				continue;
+			}
+
+			if (propTotal.TryRead(ref reader, options, PropTotal))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new QueryApiKeysResponse
+		{
+			Aggregations = propAggregations.Value
+,
+			ApiKeys = propApiKeys.Value
+,
+			Count = propCount.Value
+,
+			Total = propTotal.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, QueryApiKeysResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAggregations, value.Aggregations);
+		writer.WriteProperty(options, PropApiKeys, value.ApiKeys);
+		writer.WriteProperty(options, PropCount, value.Count);
+		writer.WriteProperty(options, PropTotal, value.Total);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(QueryApiKeysResponseConverter))]
 public sealed partial class QueryApiKeysResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,7 +100,6 @@ public sealed partial class QueryApiKeysResponse : ElasticsearchResponse
 	/// The aggregations result, if requested.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("aggregations")]
 	public Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary? Aggregations { get; init; }
 
 	/// <summary>
@@ -41,7 +107,6 @@ public sealed partial class QueryApiKeysResponse : ElasticsearchResponse
 	/// A list of API key information.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("api_keys")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Security.ApiKey> ApiKeys { get; init; }
 
 	/// <summary>
@@ -49,7 +114,6 @@ public sealed partial class QueryApiKeysResponse : ElasticsearchResponse
 	/// The number of API keys returned in the response.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("count")]
 	public int Count { get; init; }
 
 	/// <summary>
@@ -57,6 +121,5 @@ public sealed partial class QueryApiKeysResponse : ElasticsearchResponse
 	/// The total number of API keys found.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("total")]
 	public int Total { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/QueryRoleRequest.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/QueryRoleRequest.g.cs
index 7aea332007d..5672a9bd1ab 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/QueryRoleRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/QueryRoleRequest.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Requests;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport;
@@ -34,6 +35,79 @@ public sealed partial class QueryRoleRequestParameters : RequestParameters
 {
 }
 
+internal sealed partial class QueryRoleRequestConverter : System.Text.Json.Serialization.JsonConverter<QueryRoleRequest>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropFrom = System.Text.Json.JsonEncodedText.Encode("from");
+	private static readonly System.Text.Json.JsonEncodedText PropQuery = System.Text.Json.JsonEncodedText.Encode("query");
+	private static readonly System.Text.Json.JsonEncodedText PropSearchAfter = System.Text.Json.JsonEncodedText.Encode("search_after");
+	private static readonly System.Text.Json.JsonEncodedText PropSize = System.Text.Json.JsonEncodedText.Encode("size");
+	private static readonly System.Text.Json.JsonEncodedText PropSort = System.Text.Json.JsonEncodedText.Encode("sort");
+
+	public override QueryRoleRequest Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<int?> propFrom = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Security.RoleQuery?> propQuery = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.FieldValue>?> propSearchAfter = default;
+		LocalJsonProperty<int?> propSize = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.SortOptions>?> propSort = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propFrom.TryRead(ref reader, options, PropFrom))
+			{
+				continue;
+			}
+
+			if (propQuery.TryRead(ref reader, options, PropQuery))
+			{
+				continue;
+			}
+
+			if (propSearchAfter.TryRead(ref reader, options, PropSearchAfter))
+			{
+				continue;
+			}
+
+			if (propSize.TryRead(ref reader, options, PropSize))
+			{
+				continue;
+			}
+
+			if (propSort.TryRead(ref reader, options, PropSort, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.SortOptions>?, Elastic.Clients.Elasticsearch.Serverless.SortOptions>)))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new QueryRoleRequest
+		{
+			From = propFrom.Value
+,
+			Query = propQuery.Value
+,
+			SearchAfter = propSearchAfter.Value
+,
+			Size = propSize.Value
+,
+			Sort = propSort.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, QueryRoleRequest value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropFrom, value.From);
+		writer.WriteProperty(options, PropQuery, value.Query);
+		writer.WriteProperty(options, PropSearchAfter, value.SearchAfter);
+		writer.WriteProperty(options, PropSize, value.Size);
+		writer.WriteProperty(options, PropSort, value.Sort, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.SortOptions>?, Elastic.Clients.Elasticsearch.Serverless.SortOptions>));
+		writer.WriteEndObject();
+	}
+}
+
 /// <summary>
 /// <para>
 /// Find roles with a query.
@@ -42,6 +116,7 @@ public sealed partial class QueryRoleRequestParameters : RequestParameters
 /// Get roles in a paginated manner. You can optionally filter the results with a query.
 /// </para>
 /// </summary>
+[JsonConverter(typeof(QueryRoleRequestConverter))]
 public sealed partial class QueryRoleRequest : PlainRequest<QueryRoleRequestParameters>
 {
 	internal override ApiUrls ApiUrls => ApiUrlLookup.SecurityQueryRole;
@@ -59,7 +134,6 @@ public sealed partial class QueryRoleRequest : PlainRequest<QueryRoleRequestPara
 	/// To page through more hits, use the <c>search_after</c> parameter.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("from")]
 	public int? From { get; set; }
 
 	/// <summary>
@@ -72,7 +146,6 @@ public sealed partial class QueryRoleRequest : PlainRequest<QueryRoleRequestPara
 	/// <c>applications.application</c>, <c>applications.privileges</c>, <c>applications.resources</c>.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("query")]
 	public Elastic.Clients.Elasticsearch.Serverless.Security.RoleQuery? Query { get; set; }
 
 	/// <summary>
@@ -80,7 +153,6 @@ public sealed partial class QueryRoleRequest : PlainRequest<QueryRoleRequestPara
 	/// Search after definition
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("search_after")]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.FieldValue>? SearchAfter { get; set; }
 
 	/// <summary>
@@ -90,7 +162,6 @@ public sealed partial class QueryRoleRequest : PlainRequest<QueryRoleRequestPara
 	/// To page through more hits, use the <c>search_after</c> parameter.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("size")]
 	public int? Size { get; set; }
 
 	/// <summary>
@@ -99,8 +170,6 @@ public sealed partial class QueryRoleRequest : PlainRequest<QueryRoleRequestPara
 	/// In addition, sort can also be applied to the <c>_doc</c> field to sort by index order.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("sort")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.Serverless.SortOptions))]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.SortOptions>? Sort { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/QueryRoleResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/QueryRoleResponse.g.cs
index 9d55064c136..4e8d7afa634 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/QueryRoleResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/QueryRoleResponse.g.cs
@@ -18,14 +18,71 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Security;
 
+internal sealed partial class QueryRoleResponseConverter : System.Text.Json.Serialization.JsonConverter<QueryRoleResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCount = System.Text.Json.JsonEncodedText.Encode("count");
+	private static readonly System.Text.Json.JsonEncodedText PropRoles = System.Text.Json.JsonEncodedText.Encode("roles");
+	private static readonly System.Text.Json.JsonEncodedText PropTotal = System.Text.Json.JsonEncodedText.Encode("total");
+
+	public override QueryRoleResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<int> propCount = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Security.QueryRole>> propRoles = default;
+		LocalJsonProperty<int> propTotal = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCount.TryRead(ref reader, options, PropCount))
+			{
+				continue;
+			}
+
+			if (propRoles.TryRead(ref reader, options, PropRoles))
+			{
+				continue;
+			}
+
+			if (propTotal.TryRead(ref reader, options, PropTotal))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new QueryRoleResponse
+		{
+			Count = propCount.Value
+,
+			Roles = propRoles.Value
+,
+			Total = propTotal.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, QueryRoleResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCount, value.Count);
+		writer.WriteProperty(options, PropRoles, value.Roles);
+		writer.WriteProperty(options, PropTotal, value.Total);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(QueryRoleResponseConverter))]
 public sealed partial class QueryRoleResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,7 +90,6 @@ public sealed partial class QueryRoleResponse : ElasticsearchResponse
 	/// The number of roles returned in the response.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("count")]
 	public int Count { get; init; }
 
 	/// <summary>
@@ -41,7 +97,6 @@ public sealed partial class QueryRoleResponse : ElasticsearchResponse
 	/// The list of roles.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("roles")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Security.QueryRole> Roles { get; init; }
 
 	/// <summary>
@@ -49,6 +104,5 @@ public sealed partial class QueryRoleResponse : ElasticsearchResponse
 	/// The total number of roles found.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("total")]
 	public int Total { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/QueryUserRequest.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/QueryUserRequest.g.cs
index 3d9242111bb..8c957a0796d 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/QueryUserRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/QueryUserRequest.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Requests;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport;
@@ -40,6 +41,79 @@ public sealed partial class QueryUserRequestParameters : RequestParameters
 	public bool? WithProfileUid { get => Q<bool?>("with_profile_uid"); set => Q("with_profile_uid", value); }
 }
 
+internal sealed partial class QueryUserRequestConverter : System.Text.Json.Serialization.JsonConverter<QueryUserRequest>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropFrom = System.Text.Json.JsonEncodedText.Encode("from");
+	private static readonly System.Text.Json.JsonEncodedText PropQuery = System.Text.Json.JsonEncodedText.Encode("query");
+	private static readonly System.Text.Json.JsonEncodedText PropSearchAfter = System.Text.Json.JsonEncodedText.Encode("search_after");
+	private static readonly System.Text.Json.JsonEncodedText PropSize = System.Text.Json.JsonEncodedText.Encode("size");
+	private static readonly System.Text.Json.JsonEncodedText PropSort = System.Text.Json.JsonEncodedText.Encode("sort");
+
+	public override QueryUserRequest Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<int?> propFrom = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Security.UserQuery?> propQuery = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.FieldValue>?> propSearchAfter = default;
+		LocalJsonProperty<int?> propSize = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.SortOptions>?> propSort = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propFrom.TryRead(ref reader, options, PropFrom))
+			{
+				continue;
+			}
+
+			if (propQuery.TryRead(ref reader, options, PropQuery))
+			{
+				continue;
+			}
+
+			if (propSearchAfter.TryRead(ref reader, options, PropSearchAfter))
+			{
+				continue;
+			}
+
+			if (propSize.TryRead(ref reader, options, PropSize))
+			{
+				continue;
+			}
+
+			if (propSort.TryRead(ref reader, options, PropSort, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.SortOptions>?, Elastic.Clients.Elasticsearch.Serverless.SortOptions>)))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new QueryUserRequest
+		{
+			From = propFrom.Value
+	,
+			Query = propQuery.Value
+	,
+			SearchAfter = propSearchAfter.Value
+	,
+			Size = propSize.Value
+	,
+			Sort = propSort.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, QueryUserRequest value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropFrom, value.From);
+		writer.WriteProperty(options, PropQuery, value.Query);
+		writer.WriteProperty(options, PropSearchAfter, value.SearchAfter);
+		writer.WriteProperty(options, PropSize, value.Size);
+		writer.WriteProperty(options, PropSort, value.Sort, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.SortOptions>?, Elastic.Clients.Elasticsearch.Serverless.SortOptions>));
+		writer.WriteEndObject();
+	}
+}
+
 /// <summary>
 /// <para>
 /// Find users with a query.
@@ -49,6 +123,7 @@ public sealed partial class QueryUserRequestParameters : RequestParameters
 /// You can optionally filter the results with a query.
 /// </para>
 /// </summary>
+[JsonConverter(typeof(QueryUserRequestConverter))]
 public sealed partial class QueryUserRequest : PlainRequest<QueryUserRequestParameters>
 {
 	internal override ApiUrls ApiUrls => ApiUrlLookup.SecurityQueryUser;
@@ -64,7 +139,6 @@ public sealed partial class QueryUserRequest : PlainRequest<QueryUserRequestPara
 	/// If true will return the User Profile ID for the users in the query result, if any.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public bool? WithProfileUid { get => Q<bool?>("with_profile_uid"); set => Q("with_profile_uid", value); }
 
 	/// <summary>
@@ -74,7 +148,6 @@ public sealed partial class QueryUserRequest : PlainRequest<QueryUserRequestPara
 	/// To page through more hits, use the <c>search_after</c> parameter.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("from")]
 	public int? From { get; set; }
 
 	/// <summary>
@@ -86,7 +159,6 @@ public sealed partial class QueryUserRequest : PlainRequest<QueryUserRequestPara
 	/// You can query the following information associated with user: <c>username</c>, <c>roles</c>, <c>enabled</c>
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("query")]
 	public Elastic.Clients.Elasticsearch.Serverless.Security.UserQuery? Query { get; set; }
 
 	/// <summary>
@@ -94,7 +166,6 @@ public sealed partial class QueryUserRequest : PlainRequest<QueryUserRequestPara
 	/// Search after definition
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("search_after")]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.FieldValue>? SearchAfter { get; set; }
 
 	/// <summary>
@@ -104,7 +175,6 @@ public sealed partial class QueryUserRequest : PlainRequest<QueryUserRequestPara
 	/// To page through more hits, use the <c>search_after</c> parameter.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("size")]
 	public int? Size { get; set; }
 
 	/// <summary>
@@ -113,8 +183,6 @@ public sealed partial class QueryUserRequest : PlainRequest<QueryUserRequestPara
 	/// In addition, sort can also be applied to the <c>_doc</c> field to sort by index order.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("sort")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.Serverless.SortOptions))]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.SortOptions>? Sort { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/QueryUserResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/QueryUserResponse.g.cs
index adf3180f98f..adf8a468f5f 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/QueryUserResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/QueryUserResponse.g.cs
@@ -18,14 +18,71 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Security;
 
+internal sealed partial class QueryUserResponseConverter : System.Text.Json.Serialization.JsonConverter<QueryUserResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCount = System.Text.Json.JsonEncodedText.Encode("count");
+	private static readonly System.Text.Json.JsonEncodedText PropTotal = System.Text.Json.JsonEncodedText.Encode("total");
+	private static readonly System.Text.Json.JsonEncodedText PropUsers = System.Text.Json.JsonEncodedText.Encode("users");
+
+	public override QueryUserResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<int> propCount = default;
+		LocalJsonProperty<int> propTotal = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Security.QueryUser>> propUsers = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCount.TryRead(ref reader, options, PropCount))
+			{
+				continue;
+			}
+
+			if (propTotal.TryRead(ref reader, options, PropTotal))
+			{
+				continue;
+			}
+
+			if (propUsers.TryRead(ref reader, options, PropUsers))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new QueryUserResponse
+		{
+			Count = propCount.Value
+,
+			Total = propTotal.Value
+,
+			Users = propUsers.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, QueryUserResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCount, value.Count);
+		writer.WriteProperty(options, PropTotal, value.Total);
+		writer.WriteProperty(options, PropUsers, value.Users);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(QueryUserResponseConverter))]
 public sealed partial class QueryUserResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,7 +90,6 @@ public sealed partial class QueryUserResponse : ElasticsearchResponse
 	/// The number of users returned in the response.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("count")]
 	public int Count { get; init; }
 
 	/// <summary>
@@ -41,7 +97,6 @@ public sealed partial class QueryUserResponse : ElasticsearchResponse
 	/// The total number of users found.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("total")]
 	public int Total { get; init; }
 
 	/// <summary>
@@ -49,6 +104,5 @@ public sealed partial class QueryUserResponse : ElasticsearchResponse
 	/// A list of user information.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("users")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Security.QueryUser> Users { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/SamlAuthenticateResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/SamlAuthenticateResponse.g.cs
index 9ba0d7b25de..9bc5b9f2f5c 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/SamlAuthenticateResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/SamlAuthenticateResponse.g.cs
@@ -18,24 +18,96 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Security;
 
+internal sealed partial class SamlAuthenticateResponseConverter : System.Text.Json.Serialization.JsonConverter<SamlAuthenticateResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAccessToken = System.Text.Json.JsonEncodedText.Encode("access_token");
+	private static readonly System.Text.Json.JsonEncodedText PropExpiresIn = System.Text.Json.JsonEncodedText.Encode("expires_in");
+	private static readonly System.Text.Json.JsonEncodedText PropRealm = System.Text.Json.JsonEncodedText.Encode("realm");
+	private static readonly System.Text.Json.JsonEncodedText PropRefreshToken = System.Text.Json.JsonEncodedText.Encode("refresh_token");
+	private static readonly System.Text.Json.JsonEncodedText PropUsername = System.Text.Json.JsonEncodedText.Encode("username");
+
+	public override SamlAuthenticateResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propAccessToken = default;
+		LocalJsonProperty<int> propExpiresIn = default;
+		LocalJsonProperty<string> propRealm = default;
+		LocalJsonProperty<string> propRefreshToken = default;
+		LocalJsonProperty<string> propUsername = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAccessToken.TryRead(ref reader, options, PropAccessToken))
+			{
+				continue;
+			}
+
+			if (propExpiresIn.TryRead(ref reader, options, PropExpiresIn))
+			{
+				continue;
+			}
+
+			if (propRealm.TryRead(ref reader, options, PropRealm))
+			{
+				continue;
+			}
+
+			if (propRefreshToken.TryRead(ref reader, options, PropRefreshToken))
+			{
+				continue;
+			}
+
+			if (propUsername.TryRead(ref reader, options, PropUsername))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SamlAuthenticateResponse
+		{
+			AccessToken = propAccessToken.Value
+,
+			ExpiresIn = propExpiresIn.Value
+,
+			Realm = propRealm.Value
+,
+			RefreshToken = propRefreshToken.Value
+,
+			Username = propUsername.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SamlAuthenticateResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAccessToken, value.AccessToken);
+		writer.WriteProperty(options, PropExpiresIn, value.ExpiresIn);
+		writer.WriteProperty(options, PropRealm, value.Realm);
+		writer.WriteProperty(options, PropRefreshToken, value.RefreshToken);
+		writer.WriteProperty(options, PropUsername, value.Username);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(SamlAuthenticateResponseConverter))]
 public sealed partial class SamlAuthenticateResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("access_token")]
 	public string AccessToken { get; init; }
-	[JsonInclude, JsonPropertyName("expires_in")]
 	public int ExpiresIn { get; init; }
-	[JsonInclude, JsonPropertyName("realm")]
 	public string Realm { get; init; }
-	[JsonInclude, JsonPropertyName("refresh_token")]
 	public string RefreshToken { get; init; }
-	[JsonInclude, JsonPropertyName("username")]
 	public string Username { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/SamlInvalidateResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/SamlInvalidateResponse.g.cs
index 41fa0eb26b9..a984ad74829 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/SamlInvalidateResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/SamlInvalidateResponse.g.cs
@@ -18,20 +18,74 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Security;
 
+internal sealed partial class SamlInvalidateResponseConverter : System.Text.Json.Serialization.JsonConverter<SamlInvalidateResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropInvalidated = System.Text.Json.JsonEncodedText.Encode("invalidated");
+	private static readonly System.Text.Json.JsonEncodedText PropRealm = System.Text.Json.JsonEncodedText.Encode("realm");
+	private static readonly System.Text.Json.JsonEncodedText PropRedirect = System.Text.Json.JsonEncodedText.Encode("redirect");
+
+	public override SamlInvalidateResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<int> propInvalidated = default;
+		LocalJsonProperty<string> propRealm = default;
+		LocalJsonProperty<string> propRedirect = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propInvalidated.TryRead(ref reader, options, PropInvalidated))
+			{
+				continue;
+			}
+
+			if (propRealm.TryRead(ref reader, options, PropRealm))
+			{
+				continue;
+			}
+
+			if (propRedirect.TryRead(ref reader, options, PropRedirect))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SamlInvalidateResponse
+		{
+			Invalidated = propInvalidated.Value
+,
+			Realm = propRealm.Value
+,
+			Redirect = propRedirect.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SamlInvalidateResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropInvalidated, value.Invalidated);
+		writer.WriteProperty(options, PropRealm, value.Realm);
+		writer.WriteProperty(options, PropRedirect, value.Redirect);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(SamlInvalidateResponseConverter))]
 public sealed partial class SamlInvalidateResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("invalidated")]
 	public int Invalidated { get; init; }
-	[JsonInclude, JsonPropertyName("realm")]
 	public string Realm { get; init; }
-	[JsonInclude, JsonPropertyName("redirect")]
 	public string Redirect { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/SamlLogoutResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/SamlLogoutResponse.g.cs
index 0d354b5df3a..24dffca1b7b 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/SamlLogoutResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/SamlLogoutResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Security;
 
+internal sealed partial class SamlLogoutResponseConverter : System.Text.Json.Serialization.JsonConverter<SamlLogoutResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropRedirect = System.Text.Json.JsonEncodedText.Encode("redirect");
+
+	public override SamlLogoutResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propRedirect = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propRedirect.TryRead(ref reader, options, PropRedirect))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SamlLogoutResponse
+		{
+			Redirect = propRedirect.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SamlLogoutResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropRedirect, value.Redirect);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(SamlLogoutResponseConverter))]
 public sealed partial class SamlLogoutResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("redirect")]
 	public string Redirect { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/SamlPrepareAuthenticationResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/SamlPrepareAuthenticationResponse.g.cs
index 892f9c1435b..d1cfa83da54 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/SamlPrepareAuthenticationResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/SamlPrepareAuthenticationResponse.g.cs
@@ -18,20 +18,74 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Security;
 
+internal sealed partial class SamlPrepareAuthenticationResponseConverter : System.Text.Json.Serialization.JsonConverter<SamlPrepareAuthenticationResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("id");
+	private static readonly System.Text.Json.JsonEncodedText PropRealm = System.Text.Json.JsonEncodedText.Encode("realm");
+	private static readonly System.Text.Json.JsonEncodedText PropRedirect = System.Text.Json.JsonEncodedText.Encode("redirect");
+
+	public override SamlPrepareAuthenticationResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propId = default;
+		LocalJsonProperty<string> propRealm = default;
+		LocalJsonProperty<string> propRedirect = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propId.TryRead(ref reader, options, PropId))
+			{
+				continue;
+			}
+
+			if (propRealm.TryRead(ref reader, options, PropRealm))
+			{
+				continue;
+			}
+
+			if (propRedirect.TryRead(ref reader, options, PropRedirect))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SamlPrepareAuthenticationResponse
+		{
+			Id = propId.Value
+,
+			Realm = propRealm.Value
+,
+			Redirect = propRedirect.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SamlPrepareAuthenticationResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropId, value.Id);
+		writer.WriteProperty(options, PropRealm, value.Realm);
+		writer.WriteProperty(options, PropRedirect, value.Redirect);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(SamlPrepareAuthenticationResponseConverter))]
 public sealed partial class SamlPrepareAuthenticationResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("id")]
 	public string Id { get; init; }
-	[JsonInclude, JsonPropertyName("realm")]
 	public string Realm { get; init; }
-	[JsonInclude, JsonPropertyName("redirect")]
 	public string Redirect { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/SamlServiceProviderMetadataResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/SamlServiceProviderMetadataResponse.g.cs
index 05aec4d42a5..4a8158cc2ed 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/SamlServiceProviderMetadataResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/SamlServiceProviderMetadataResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Security;
 
+internal sealed partial class SamlServiceProviderMetadataResponseConverter : System.Text.Json.Serialization.JsonConverter<SamlServiceProviderMetadataResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropMetadata = System.Text.Json.JsonEncodedText.Encode("metadata");
+
+	public override SamlServiceProviderMetadataResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propMetadata = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propMetadata.TryRead(ref reader, options, PropMetadata))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SamlServiceProviderMetadataResponse
+		{
+			Metadata = propMetadata.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SamlServiceProviderMetadataResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropMetadata, value.Metadata);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(SamlServiceProviderMetadataResponseConverter))]
 public sealed partial class SamlServiceProviderMetadataResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("metadata")]
 	public string Metadata { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/SuggestUserProfilesRequest.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/SuggestUserProfilesRequest.g.cs
index 8aa590fb3b4..f712831c87f 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/SuggestUserProfilesRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/SuggestUserProfilesRequest.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Requests;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport;
@@ -34,6 +35,69 @@ public sealed partial class SuggestUserProfilesRequestParameters : RequestParame
 {
 }
 
+internal sealed partial class SuggestUserProfilesRequestConverter : System.Text.Json.Serialization.JsonConverter<SuggestUserProfilesRequest>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropData = System.Text.Json.JsonEncodedText.Encode("data");
+	private static readonly System.Text.Json.JsonEncodedText PropHint = System.Text.Json.JsonEncodedText.Encode("hint");
+	private static readonly System.Text.Json.JsonEncodedText PropName = System.Text.Json.JsonEncodedText.Encode("name");
+	private static readonly System.Text.Json.JsonEncodedText PropSize = System.Text.Json.JsonEncodedText.Encode("size");
+
+	public override SuggestUserProfilesRequest Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propData = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Security.Hint?> propHint = default;
+		LocalJsonProperty<string?> propName = default;
+		LocalJsonProperty<long?> propSize = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propData.TryRead(ref reader, options, PropData, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propHint.TryRead(ref reader, options, PropHint))
+			{
+				continue;
+			}
+
+			if (propName.TryRead(ref reader, options, PropName))
+			{
+				continue;
+			}
+
+			if (propSize.TryRead(ref reader, options, PropSize))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SuggestUserProfilesRequest
+		{
+			Data = propData.Value
+,
+			Hint = propHint.Value
+,
+			Name = propName.Value
+,
+			Size = propSize.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SuggestUserProfilesRequest value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropData, value.Data, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropHint, value.Hint);
+		writer.WriteProperty(options, PropName, value.Name);
+		writer.WriteProperty(options, PropSize, value.Size);
+		writer.WriteEndObject();
+	}
+}
+
 /// <summary>
 /// <para>
 /// Suggest a user profile.
@@ -42,6 +106,7 @@ public sealed partial class SuggestUserProfilesRequestParameters : RequestParame
 /// Get suggestions for user profiles that match specified search criteria.
 /// </para>
 /// </summary>
+[JsonConverter(typeof(SuggestUserProfilesRequestConverter))]
 public sealed partial class SuggestUserProfilesRequest : PlainRequest<SuggestUserProfilesRequestParameters>
 {
 	internal override ApiUrls ApiUrls => ApiUrlLookup.SecuritySuggestUserProfiles;
@@ -60,8 +125,6 @@ public sealed partial class SuggestUserProfilesRequest : PlainRequest<SuggestUse
 	/// By default returns no <c>data</c> content.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("data")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Data { get; set; }
 
 	/// <summary>
@@ -72,7 +135,6 @@ public sealed partial class SuggestUserProfilesRequest : PlainRequest<SuggestUse
 	/// as long as the profile matches the <c>name</c> field query.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("hint")]
 	public Elastic.Clients.Elasticsearch.Serverless.Security.Hint? Hint { get; set; }
 
 	/// <summary>
@@ -81,7 +143,6 @@ public sealed partial class SuggestUserProfilesRequest : PlainRequest<SuggestUse
 	/// Name-related fields are the user's <c>username</c>, <c>full_name</c>, and <c>email</c>.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("name")]
 	public string? Name { get; set; }
 
 	/// <summary>
@@ -89,7 +150,6 @@ public sealed partial class SuggestUserProfilesRequest : PlainRequest<SuggestUse
 	/// Number of profiles to return.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("size")]
 	public long? Size { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/SuggestUserProfilesResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/SuggestUserProfilesResponse.g.cs
index 3ec3181c5a7..7e1c9446b3c 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/SuggestUserProfilesResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/SuggestUserProfilesResponse.g.cs
@@ -18,20 +18,74 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Security;
 
+internal sealed partial class SuggestUserProfilesResponseConverter : System.Text.Json.Serialization.JsonConverter<SuggestUserProfilesResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropProfiles = System.Text.Json.JsonEncodedText.Encode("profiles");
+	private static readonly System.Text.Json.JsonEncodedText PropTook = System.Text.Json.JsonEncodedText.Encode("took");
+	private static readonly System.Text.Json.JsonEncodedText PropTotal = System.Text.Json.JsonEncodedText.Encode("total");
+
+	public override SuggestUserProfilesResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Security.UserProfile>> propProfiles = default;
+		LocalJsonProperty<long> propTook = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Security.TotalUserProfiles> propTotal = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propProfiles.TryRead(ref reader, options, PropProfiles))
+			{
+				continue;
+			}
+
+			if (propTook.TryRead(ref reader, options, PropTook))
+			{
+				continue;
+			}
+
+			if (propTotal.TryRead(ref reader, options, PropTotal))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SuggestUserProfilesResponse
+		{
+			Profiles = propProfiles.Value
+,
+			Took = propTook.Value
+,
+			Total = propTotal.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SuggestUserProfilesResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropProfiles, value.Profiles);
+		writer.WriteProperty(options, PropTook, value.Took);
+		writer.WriteProperty(options, PropTotal, value.Total);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(SuggestUserProfilesResponseConverter))]
 public sealed partial class SuggestUserProfilesResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("profiles")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Security.UserProfile> Profiles { get; init; }
-	[JsonInclude, JsonPropertyName("took")]
 	public long Took { get; init; }
-	[JsonInclude, JsonPropertyName("total")]
 	public Elastic.Clients.Elasticsearch.Serverless.Security.TotalUserProfiles Total { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/UpdateApiKeyResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/UpdateApiKeyResponse.g.cs
index c9a0279b423..bd2e734dbef 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/UpdateApiKeyResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/UpdateApiKeyResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Security;
 
+internal sealed partial class UpdateApiKeyResponseConverter : System.Text.Json.Serialization.JsonConverter<UpdateApiKeyResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropUpdated = System.Text.Json.JsonEncodedText.Encode("updated");
+
+	public override UpdateApiKeyResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propUpdated = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propUpdated.TryRead(ref reader, options, PropUpdated))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new UpdateApiKeyResponse
+		{
+			Updated = propUpdated.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, UpdateApiKeyResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropUpdated, value.Updated);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(UpdateApiKeyResponseConverter))]
 public sealed partial class UpdateApiKeyResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -34,6 +71,5 @@ public sealed partial class UpdateApiKeyResponse : ElasticsearchResponse
 	/// If <c>false</c>, the API key didn’t change because no change was detected.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("updated")]
 	public bool Updated { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/UpdateUserProfileDataResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/UpdateUserProfileDataResponse.g.cs
index 1c0d0221b89..e7f33398456 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/UpdateUserProfileDataResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Security/UpdateUserProfileDataResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Security;
 
+internal sealed partial class UpdateUserProfileDataResponseConverter : System.Text.Json.Serialization.JsonConverter<UpdateUserProfileDataResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override UpdateUserProfileDataResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new UpdateUserProfileDataResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, UpdateUserProfileDataResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(UpdateUserProfileDataResponseConverter))]
 public sealed partial class UpdateUserProfileDataResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class UpdateUserProfileDataResponse : ElasticsearchRespons
 	/// 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.Serverless/_Generated/Api/Snapshot/CleanupRepositoryResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Snapshot/CleanupRepositoryResponse.g.cs
index 55ac4578906..de98a48bc5e 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Snapshot/CleanupRepositoryResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Snapshot/CleanupRepositoryResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Snapshot;
 
+internal sealed partial class CleanupRepositoryResponseConverter : System.Text.Json.Serialization.JsonConverter<CleanupRepositoryResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropResults = System.Text.Json.JsonEncodedText.Encode("results");
+
+	public override CleanupRepositoryResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Snapshot.CleanupRepositoryResults> propResults = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propResults.TryRead(ref reader, options, PropResults))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new CleanupRepositoryResponse
+		{
+			Results = propResults.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, CleanupRepositoryResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropResults, value.Results);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(CleanupRepositoryResponseConverter))]
 public sealed partial class CleanupRepositoryResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class CleanupRepositoryResponse : ElasticsearchResponse
 	/// Statistics for cleanup operations.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("results")]
 	public Elastic.Clients.Elasticsearch.Serverless.Snapshot.CleanupRepositoryResults Results { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Snapshot/CloneSnapshotResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Snapshot/CloneSnapshotResponse.g.cs
index 270cd3d5615..81cb1413cd5 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Snapshot/CloneSnapshotResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Snapshot/CloneSnapshotResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Snapshot;
 
+internal sealed partial class CloneSnapshotResponseConverter : System.Text.Json.Serialization.JsonConverter<CloneSnapshotResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override CloneSnapshotResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new CloneSnapshotResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, CloneSnapshotResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(CloneSnapshotResponseConverter))]
 public sealed partial class CloneSnapshotResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class CloneSnapshotResponse : ElasticsearchResponse
 	/// 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.Serverless/_Generated/Api/Snapshot/CreateRepositoryRequest.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Snapshot/CreateRepositoryRequest.g.cs
index 5fbc4fb7562..6b3dfeaf2eb 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Snapshot/CreateRepositoryRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Snapshot/CreateRepositoryRequest.g.cs
@@ -72,7 +72,7 @@ public sealed partial class CreateRepositoryRequestParameters : RequestParameter
 /// If both parameters are specified, only the query parameter is used.
 /// </para>
 /// </summary>
-public sealed partial class CreateRepositoryRequest : PlainRequest<CreateRepositoryRequestParameters>, ISelfSerializable
+public sealed partial class CreateRepositoryRequest : PlainRequest<CreateRepositoryRequestParameters>, ISelfTwoWaySerializable
 {
 	public CreateRepositoryRequest(Elastic.Clients.Elasticsearch.Serverless.Name name) : base(r => r.Required("repository", name))
 	{
@@ -115,13 +115,17 @@ public CreateRepositoryRequest(Elastic.Clients.Elasticsearch.Serverless.Name nam
 	/// </summary>
 	[JsonIgnore]
 	public bool? Verify { get => Q<bool?>("verify"); set => Q("verify", value); }
-	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Serverless.Snapshot.IRepository Repository { get; set; }
 
-	void ISelfSerializable.Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
+	void ISelfTwoWaySerializable.Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 	{
 		JsonSerializer.Serialize(writer, Repository, options);
 	}
+
+	void ISelfTwoWaySerializable.Deserialize(ref Utf8JsonReader reader, JsonSerializerOptions options, IElasticsearchClientSettings settings)
+	{
+		Repository = settings.RequestResponseSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Snapshot.IRepository>(ref reader);
+	}
 }
 
 /// <summary>
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Snapshot/CreateRepositoryResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Snapshot/CreateRepositoryResponse.g.cs
index 8ad697984f4..08c7a854d57 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Snapshot/CreateRepositoryResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Snapshot/CreateRepositoryResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Snapshot;
 
+internal sealed partial class CreateRepositoryResponseConverter : System.Text.Json.Serialization.JsonConverter<CreateRepositoryResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override CreateRepositoryResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new CreateRepositoryResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, CreateRepositoryResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(CreateRepositoryResponseConverter))]
 public sealed partial class CreateRepositoryResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class CreateRepositoryResponse : ElasticsearchResponse
 	/// 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.Serverless/_Generated/Api/Snapshot/CreateSnapshotRequest.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Snapshot/CreateSnapshotRequest.g.cs
index 5d1a775287e..5fe6b7b5415 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Snapshot/CreateSnapshotRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Snapshot/CreateSnapshotRequest.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Requests;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport;
@@ -49,12 +50,106 @@ public sealed partial class CreateSnapshotRequestParameters : RequestParameters
 	public bool? WaitForCompletion { get => Q<bool?>("wait_for_completion"); set => Q("wait_for_completion", value); }
 }
 
+internal sealed partial class CreateSnapshotRequestConverter : System.Text.Json.Serialization.JsonConverter<CreateSnapshotRequest>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropExpandWildcards = System.Text.Json.JsonEncodedText.Encode("expand_wildcards");
+	private static readonly System.Text.Json.JsonEncodedText PropFeatureStates = System.Text.Json.JsonEncodedText.Encode("feature_states");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreUnavailable = System.Text.Json.JsonEncodedText.Encode("ignore_unavailable");
+	private static readonly System.Text.Json.JsonEncodedText PropIncludeGlobalState = System.Text.Json.JsonEncodedText.Encode("include_global_state");
+	private static readonly System.Text.Json.JsonEncodedText PropIndices = System.Text.Json.JsonEncodedText.Encode("indices");
+	private static readonly System.Text.Json.JsonEncodedText PropMetadata = System.Text.Json.JsonEncodedText.Encode("metadata");
+	private static readonly System.Text.Json.JsonEncodedText PropPartial = System.Text.Json.JsonEncodedText.Encode("partial");
+
+	public override CreateSnapshotRequest Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.ExpandWildcard>?> propExpandWildcards = default;
+		LocalJsonProperty<ICollection<string>?> propFeatureStates = default;
+		LocalJsonProperty<bool?> propIgnoreUnavailable = default;
+		LocalJsonProperty<bool?> propIncludeGlobalState = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Indices?> propIndices = default;
+		LocalJsonProperty<IDictionary<string, object>?> propMetadata = default;
+		LocalJsonProperty<bool?> propPartial = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propExpandWildcards.TryRead(ref reader, options, PropExpandWildcards, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.ExpandWildcard>?, Elastic.Clients.Elasticsearch.Serverless.ExpandWildcard>)))
+			{
+				continue;
+			}
+
+			if (propFeatureStates.TryRead(ref reader, options, PropFeatureStates))
+			{
+				continue;
+			}
+
+			if (propIgnoreUnavailable.TryRead(ref reader, options, PropIgnoreUnavailable))
+			{
+				continue;
+			}
+
+			if (propIncludeGlobalState.TryRead(ref reader, options, PropIncludeGlobalState))
+			{
+				continue;
+			}
+
+			if (propIndices.TryRead(ref reader, options, PropIndices))
+			{
+				continue;
+			}
+
+			if (propMetadata.TryRead(ref reader, options, PropMetadata))
+			{
+				continue;
+			}
+
+			if (propPartial.TryRead(ref reader, options, PropPartial))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new CreateSnapshotRequest
+		{
+			ExpandWildcards = propExpandWildcards.Value
+	,
+			FeatureStates = propFeatureStates.Value
+	,
+			IgnoreUnavailable = propIgnoreUnavailable.Value
+	,
+			IncludeGlobalState = propIncludeGlobalState.Value
+	,
+			Indices = propIndices.Value
+	,
+			Metadata = propMetadata.Value
+	,
+			Partial = propPartial.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, CreateSnapshotRequest value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropExpandWildcards, value.ExpandWildcards, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.ExpandWildcard>?, Elastic.Clients.Elasticsearch.Serverless.ExpandWildcard>));
+		writer.WriteProperty(options, PropFeatureStates, value.FeatureStates);
+		writer.WriteProperty(options, PropIgnoreUnavailable, value.IgnoreUnavailable);
+		writer.WriteProperty(options, PropIncludeGlobalState, value.IncludeGlobalState);
+		writer.WriteProperty(options, PropIndices, value.Indices);
+		writer.WriteProperty(options, PropMetadata, value.Metadata);
+		writer.WriteProperty(options, PropPartial, value.Partial);
+		writer.WriteEndObject();
+	}
+}
+
 /// <summary>
 /// <para>
 /// Create a snapshot.
 /// Take a snapshot of a cluster or of data streams and indices.
 /// </para>
 /// </summary>
+[JsonConverter(typeof(CreateSnapshotRequestConverter))]
 public sealed partial class CreateSnapshotRequest : PlainRequest<CreateSnapshotRequestParameters>
 {
 	public CreateSnapshotRequest(Elastic.Clients.Elasticsearch.Serverless.Name repository, Elastic.Clients.Elasticsearch.Serverless.Name snapshot) : base(r => r.Required("repository", repository).Required("snapshot", snapshot))
@@ -75,7 +170,6 @@ public CreateSnapshotRequest(Elastic.Clients.Elasticsearch.Serverless.Name repos
 	/// If no response is received before the timeout expires, the request fails and returns an error.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Serverless.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Serverless.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 	/// <summary>
@@ -84,7 +178,6 @@ public CreateSnapshotRequest(Elastic.Clients.Elasticsearch.Serverless.Name repos
 	/// If <c>false</c>, the request returns a response when the snapshot initializes.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public bool? WaitForCompletion { get => Q<bool?>("wait_for_completion"); set => Q("wait_for_completion", value); }
 
 	/// <summary>
@@ -93,8 +186,6 @@ public CreateSnapshotRequest(Elastic.Clients.Elasticsearch.Serverless.Name repos
 	/// It supports comma-separated values such as <c>open,hidden</c>.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("expand_wildcards")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.Serverless.ExpandWildcard))]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.ExpandWildcard>? ExpandWildcards { get; set; }
 
 	/// <summary>
@@ -112,7 +203,6 @@ public CreateSnapshotRequest(Elastic.Clients.Elasticsearch.Serverless.Name repos
 	/// To exclude all feature states, regardless of the <c>include_global_state</c> value, specify an array with only the value <c>none</c> (<c>["none"]</c>).
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("feature_states")]
 	public ICollection<string>? FeatureStates { get; set; }
 
 	/// <summary>
@@ -121,7 +211,6 @@ public CreateSnapshotRequest(Elastic.Clients.Elasticsearch.Serverless.Name repos
 	/// If <c>false</c>, the request returns an error for any data stream or index that is missing or closed.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("ignore_unavailable")]
 	public bool? IgnoreUnavailable { get; set; }
 
 	/// <summary>
@@ -131,7 +220,6 @@ public CreateSnapshotRequest(Elastic.Clients.Elasticsearch.Serverless.Name repos
 	/// It also includes data stored in system indices, such as Watches and task records (configurable via <c>feature_states</c>).
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("include_global_state")]
 	public bool? IncludeGlobalState { get; set; }
 
 	/// <summary>
@@ -146,7 +234,6 @@ public CreateSnapshotRequest(Elastic.Clients.Elasticsearch.Serverless.Name repos
 	/// Use <c>feature_states</c> instead.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("indices")]
 	public Elastic.Clients.Elasticsearch.Serverless.Indices? Indices { get; set; }
 
 	/// <summary>
@@ -156,7 +243,6 @@ public CreateSnapshotRequest(Elastic.Clients.Elasticsearch.Serverless.Name repos
 	/// This information is not automatically generated by Elasticsearch.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("metadata")]
 	public IDictionary<string, object>? Metadata { get; set; }
 
 	/// <summary>
@@ -169,7 +255,6 @@ public CreateSnapshotRequest(Elastic.Clients.Elasticsearch.Serverless.Name repos
 	/// If <c>false</c>, the entire restore operation will fail if one or more indices included in the snapshot do not have all primary shards available.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("partial")]
 	public bool? Partial { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Snapshot/CreateSnapshotResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Snapshot/CreateSnapshotResponse.g.cs
index 5a29b97af9c..236ead1ee46 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Snapshot/CreateSnapshotResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Snapshot/CreateSnapshotResponse.g.cs
@@ -18,14 +18,61 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Snapshot;
 
+internal sealed partial class CreateSnapshotResponseConverter : System.Text.Json.Serialization.JsonConverter<CreateSnapshotResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAccepted = System.Text.Json.JsonEncodedText.Encode("accepted");
+	private static readonly System.Text.Json.JsonEncodedText PropSnapshot = System.Text.Json.JsonEncodedText.Encode("snapshot");
+
+	public override CreateSnapshotResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool?> propAccepted = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Snapshot.SnapshotInfo?> propSnapshot = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAccepted.TryRead(ref reader, options, PropAccepted))
+			{
+				continue;
+			}
+
+			if (propSnapshot.TryRead(ref reader, options, PropSnapshot))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new CreateSnapshotResponse
+		{
+			Accepted = propAccepted.Value
+,
+			Snapshot = propSnapshot.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, CreateSnapshotResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAccepted, value.Accepted);
+		writer.WriteProperty(options, PropSnapshot, value.Snapshot);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(CreateSnapshotResponseConverter))]
 public sealed partial class CreateSnapshotResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,7 +80,6 @@ public sealed partial class CreateSnapshotResponse : ElasticsearchResponse
 	/// Equals <c>true</c> if the snapshot was accepted. Present when the request had <c>wait_for_completion</c> set to <c>false</c>
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("accepted")]
 	public bool? Accepted { get; init; }
 
 	/// <summary>
@@ -41,6 +87,5 @@ public sealed partial class CreateSnapshotResponse : ElasticsearchResponse
 	/// Snapshot information. Present when the request had <c>wait_for_completion</c> set to <c>true</c>
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("snapshot")]
 	public Elastic.Clients.Elasticsearch.Serverless.Snapshot.SnapshotInfo? Snapshot { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Snapshot/DeleteRepositoryResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Snapshot/DeleteRepositoryResponse.g.cs
index b9feee61eab..63ded85d288 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Snapshot/DeleteRepositoryResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Snapshot/DeleteRepositoryResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Snapshot;
 
+internal sealed partial class DeleteRepositoryResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteRepositoryResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override DeleteRepositoryResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteRepositoryResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteRepositoryResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteRepositoryResponseConverter))]
 public sealed partial class DeleteRepositoryResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class DeleteRepositoryResponse : ElasticsearchResponse
 	/// 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.Serverless/_Generated/Api/Snapshot/DeleteSnapshotResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Snapshot/DeleteSnapshotResponse.g.cs
index 1657e82dd35..14061c3c699 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Snapshot/DeleteSnapshotResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Snapshot/DeleteSnapshotResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Snapshot;
 
+internal sealed partial class DeleteSnapshotResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteSnapshotResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override DeleteSnapshotResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteSnapshotResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteSnapshotResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteSnapshotResponseConverter))]
 public sealed partial class DeleteSnapshotResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class DeleteSnapshotResponse : ElasticsearchResponse
 	/// 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.Serverless/_Generated/Api/Snapshot/GetSnapshotResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Snapshot/GetSnapshotResponse.g.cs
index c60a2655c2c..fd9bdf87c3f 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Snapshot/GetSnapshotResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Snapshot/GetSnapshotResponse.g.cs
@@ -18,14 +18,91 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Snapshot;
 
+internal sealed partial class GetSnapshotResponseConverter : System.Text.Json.Serialization.JsonConverter<GetSnapshotResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropNext = System.Text.Json.JsonEncodedText.Encode("next");
+	private static readonly System.Text.Json.JsonEncodedText PropRemaining = System.Text.Json.JsonEncodedText.Encode("remaining");
+	private static readonly System.Text.Json.JsonEncodedText PropResponses = System.Text.Json.JsonEncodedText.Encode("responses");
+	private static readonly System.Text.Json.JsonEncodedText PropSnapshots = System.Text.Json.JsonEncodedText.Encode("snapshots");
+	private static readonly System.Text.Json.JsonEncodedText PropTotal = System.Text.Json.JsonEncodedText.Encode("total");
+
+	public override GetSnapshotResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string?> propNext = default;
+		LocalJsonProperty<int> propRemaining = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Snapshot.SnapshotResponseItem>?> propResponses = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Snapshot.SnapshotInfo>?> propSnapshots = default;
+		LocalJsonProperty<int> propTotal = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propNext.TryRead(ref reader, options, PropNext))
+			{
+				continue;
+			}
+
+			if (propRemaining.TryRead(ref reader, options, PropRemaining))
+			{
+				continue;
+			}
+
+			if (propResponses.TryRead(ref reader, options, PropResponses))
+			{
+				continue;
+			}
+
+			if (propSnapshots.TryRead(ref reader, options, PropSnapshots))
+			{
+				continue;
+			}
+
+			if (propTotal.TryRead(ref reader, options, PropTotal))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetSnapshotResponse
+		{
+			Next = propNext.Value
+,
+			Remaining = propRemaining.Value
+,
+			Responses = propResponses.Value
+,
+			Snapshots = propSnapshots.Value
+,
+			Total = propTotal.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetSnapshotResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropNext, value.Next);
+		writer.WriteProperty(options, PropRemaining, value.Remaining);
+		writer.WriteProperty(options, PropResponses, value.Responses);
+		writer.WriteProperty(options, PropSnapshots, value.Snapshots);
+		writer.WriteProperty(options, PropTotal, value.Total);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetSnapshotResponseConverter))]
 public sealed partial class GetSnapshotResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -34,7 +111,6 @@ public sealed partial class GetSnapshotResponse : ElasticsearchResponse
 	/// It can be used as the <c>after</c> query parameter to fetch additional results.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("next")]
 	public string? Next { get; init; }
 
 	/// <summary>
@@ -42,11 +118,8 @@ public sealed partial class GetSnapshotResponse : ElasticsearchResponse
 	/// The number of remaining snapshots that were not returned due to size limits and that can be fetched by additional requests using the <c>next</c> field value.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("remaining")]
 	public int Remaining { get; init; }
-	[JsonInclude, JsonPropertyName("responses")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Snapshot.SnapshotResponseItem>? Responses { get; init; }
-	[JsonInclude, JsonPropertyName("snapshots")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Snapshot.SnapshotInfo>? Snapshots { get; init; }
 
 	/// <summary>
@@ -54,6 +127,5 @@ public sealed partial class GetSnapshotResponse : ElasticsearchResponse
 	/// The total number of snapshots that match the request when ignoring the size limit or <c>after</c> query parameter.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("total")]
 	public int Total { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Snapshot/RestoreResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Snapshot/RestoreResponse.g.cs
index 0ee5b1548b6..9c4deff841f 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Snapshot/RestoreResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Snapshot/RestoreResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Snapshot;
 
+internal sealed partial class RestoreResponseConverter : System.Text.Json.Serialization.JsonConverter<RestoreResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAccepted = System.Text.Json.JsonEncodedText.Encode("accepted");
+	private static readonly System.Text.Json.JsonEncodedText PropSnapshot = System.Text.Json.JsonEncodedText.Encode("snapshot");
+
+	public override RestoreResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool?> propAccepted = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Snapshot.SnapshotRestore?> propSnapshot = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAccepted.TryRead(ref reader, options, PropAccepted))
+			{
+				continue;
+			}
+
+			if (propSnapshot.TryRead(ref reader, options, PropSnapshot))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new RestoreResponse
+		{
+			Accepted = propAccepted.Value
+,
+			Snapshot = propSnapshot.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, RestoreResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAccepted, value.Accepted);
+		writer.WriteProperty(options, PropSnapshot, value.Snapshot);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(RestoreResponseConverter))]
 public sealed partial class RestoreResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("accepted")]
 	public bool? Accepted { get; init; }
-	[JsonInclude, JsonPropertyName("snapshot")]
 	public Elastic.Clients.Elasticsearch.Serverless.Snapshot.SnapshotRestore? Snapshot { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Snapshot/SnapshotStatusResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Snapshot/SnapshotStatusResponse.g.cs
index ce5388ec913..068fe27f475 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Snapshot/SnapshotStatusResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Snapshot/SnapshotStatusResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Snapshot;
 
+internal sealed partial class SnapshotStatusResponseConverter : System.Text.Json.Serialization.JsonConverter<SnapshotStatusResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropSnapshots = System.Text.Json.JsonEncodedText.Encode("snapshots");
+
+	public override SnapshotStatusResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Snapshot.Status>> propSnapshots = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propSnapshots.TryRead(ref reader, options, PropSnapshots))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SnapshotStatusResponse
+		{
+			Snapshots = propSnapshots.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SnapshotStatusResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropSnapshots, value.Snapshots);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(SnapshotStatusResponseConverter))]
 public sealed partial class SnapshotStatusResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("snapshots")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Snapshot.Status> Snapshots { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Snapshot/VerifyRepositoryResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Snapshot/VerifyRepositoryResponse.g.cs
index dd525ba1d2f..73229b5cd66 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Snapshot/VerifyRepositoryResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Snapshot/VerifyRepositoryResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Snapshot;
 
+internal sealed partial class VerifyRepositoryResponseConverter : System.Text.Json.Serialization.JsonConverter<VerifyRepositoryResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropNodes = System.Text.Json.JsonEncodedText.Encode("nodes");
+
+	public override VerifyRepositoryResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Snapshot.CompactNodeInfo>> propNodes = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propNodes.TryRead(ref reader, options, PropNodes))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new VerifyRepositoryResponse
+		{
+			Nodes = propNodes.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, VerifyRepositoryResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropNodes, value.Nodes);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(VerifyRepositoryResponseConverter))]
 public sealed partial class VerifyRepositoryResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -34,6 +71,5 @@ public sealed partial class VerifyRepositoryResponse : ElasticsearchResponse
 	/// The key is the ID of the node.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("nodes")]
 	public IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Snapshot.CompactNodeInfo> Nodes { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/SnapshotLifecycleManagement/DeleteLifecycleResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/SnapshotLifecycleManagement/DeleteLifecycleResponse.g.cs
index c55e6564aa6..e0b943bbff9 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/SnapshotLifecycleManagement/DeleteLifecycleResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/SnapshotLifecycleManagement/DeleteLifecycleResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.SnapshotLifecycleManagement;
 
+internal sealed partial class DeleteLifecycleResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteLifecycleResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override DeleteLifecycleResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteLifecycleResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteLifecycleResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteLifecycleResponseConverter))]
 public sealed partial class DeleteLifecycleResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class DeleteLifecycleResponse : ElasticsearchResponse
 	/// 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.Serverless/_Generated/Api/SnapshotLifecycleManagement/ExecuteLifecycleResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/SnapshotLifecycleManagement/ExecuteLifecycleResponse.g.cs
index c3b46581b3c..fb465c2d444 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/SnapshotLifecycleManagement/ExecuteLifecycleResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/SnapshotLifecycleManagement/ExecuteLifecycleResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.SnapshotLifecycleManagement;
 
+internal sealed partial class ExecuteLifecycleResponseConverter : System.Text.Json.Serialization.JsonConverter<ExecuteLifecycleResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropSnapshotName = System.Text.Json.JsonEncodedText.Encode("snapshot_name");
+
+	public override ExecuteLifecycleResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propSnapshotName = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propSnapshotName.TryRead(ref reader, options, PropSnapshotName))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ExecuteLifecycleResponse
+		{
+			SnapshotName = propSnapshotName.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ExecuteLifecycleResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropSnapshotName, value.SnapshotName);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ExecuteLifecycleResponseConverter))]
 public sealed partial class ExecuteLifecycleResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("snapshot_name")]
 	public string SnapshotName { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/SnapshotLifecycleManagement/ExecuteRetentionResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/SnapshotLifecycleManagement/ExecuteRetentionResponse.g.cs
index df9da9e895a..03a3b299019 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/SnapshotLifecycleManagement/ExecuteRetentionResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/SnapshotLifecycleManagement/ExecuteRetentionResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.SnapshotLifecycleManagement;
 
+internal sealed partial class ExecuteRetentionResponseConverter : System.Text.Json.Serialization.JsonConverter<ExecuteRetentionResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override ExecuteRetentionResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ExecuteRetentionResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ExecuteRetentionResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ExecuteRetentionResponseConverter))]
 public sealed partial class ExecuteRetentionResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class ExecuteRetentionResponse : ElasticsearchResponse
 	/// 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.Serverless/_Generated/Api/SnapshotLifecycleManagement/GetSlmStatusResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/SnapshotLifecycleManagement/GetSlmStatusResponse.g.cs
index 65874614e4f..7a0d4fd1af2 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/SnapshotLifecycleManagement/GetSlmStatusResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/SnapshotLifecycleManagement/GetSlmStatusResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.SnapshotLifecycleManagement;
 
+internal sealed partial class GetSlmStatusResponseConverter : System.Text.Json.Serialization.JsonConverter<GetSlmStatusResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropOperationMode = System.Text.Json.JsonEncodedText.Encode("operation_mode");
+
+	public override GetSlmStatusResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.LifecycleOperationMode> propOperationMode = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propOperationMode.TryRead(ref reader, options, PropOperationMode))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetSlmStatusResponse
+		{
+			OperationMode = propOperationMode.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetSlmStatusResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropOperationMode, value.OperationMode);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetSlmStatusResponseConverter))]
 public sealed partial class GetSlmStatusResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("operation_mode")]
 	public Elastic.Clients.Elasticsearch.Serverless.LifecycleOperationMode OperationMode { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/SnapshotLifecycleManagement/GetStatsResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/SnapshotLifecycleManagement/GetStatsResponse.g.cs
index 3306a7ae841..365ecb813ad 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/SnapshotLifecycleManagement/GetStatsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/SnapshotLifecycleManagement/GetStatsResponse.g.cs
@@ -18,34 +18,151 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.SnapshotLifecycleManagement;
 
+internal sealed partial class GetStatsResponseConverter : System.Text.Json.Serialization.JsonConverter<GetStatsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropPolicyStats = System.Text.Json.JsonEncodedText.Encode("policy_stats");
+	private static readonly System.Text.Json.JsonEncodedText PropRetentionDeletionTime = System.Text.Json.JsonEncodedText.Encode("retention_deletion_time");
+	private static readonly System.Text.Json.JsonEncodedText PropRetentionDeletionTimeMillis = System.Text.Json.JsonEncodedText.Encode("retention_deletion_time_millis");
+	private static readonly System.Text.Json.JsonEncodedText PropRetentionFailed = System.Text.Json.JsonEncodedText.Encode("retention_failed");
+	private static readonly System.Text.Json.JsonEncodedText PropRetentionRuns = System.Text.Json.JsonEncodedText.Encode("retention_runs");
+	private static readonly System.Text.Json.JsonEncodedText PropRetentionTimedOut = System.Text.Json.JsonEncodedText.Encode("retention_timed_out");
+	private static readonly System.Text.Json.JsonEncodedText PropTotalSnapshotDeletionFailures = System.Text.Json.JsonEncodedText.Encode("total_snapshot_deletion_failures");
+	private static readonly System.Text.Json.JsonEncodedText PropTotalSnapshotsDeleted = System.Text.Json.JsonEncodedText.Encode("total_snapshots_deleted");
+	private static readonly System.Text.Json.JsonEncodedText PropTotalSnapshotsFailed = System.Text.Json.JsonEncodedText.Encode("total_snapshots_failed");
+	private static readonly System.Text.Json.JsonEncodedText PropTotalSnapshotsTaken = System.Text.Json.JsonEncodedText.Encode("total_snapshots_taken");
+
+	public override GetStatsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<string>> propPolicyStats = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Duration> propRetentionDeletionTime = default;
+		LocalJsonProperty<long> propRetentionDeletionTimeMillis = default;
+		LocalJsonProperty<long> propRetentionFailed = default;
+		LocalJsonProperty<long> propRetentionRuns = default;
+		LocalJsonProperty<long> propRetentionTimedOut = default;
+		LocalJsonProperty<long> propTotalSnapshotDeletionFailures = default;
+		LocalJsonProperty<long> propTotalSnapshotsDeleted = default;
+		LocalJsonProperty<long> propTotalSnapshotsFailed = default;
+		LocalJsonProperty<long> propTotalSnapshotsTaken = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propPolicyStats.TryRead(ref reader, options, PropPolicyStats))
+			{
+				continue;
+			}
+
+			if (propRetentionDeletionTime.TryRead(ref reader, options, PropRetentionDeletionTime))
+			{
+				continue;
+			}
+
+			if (propRetentionDeletionTimeMillis.TryRead(ref reader, options, PropRetentionDeletionTimeMillis))
+			{
+				continue;
+			}
+
+			if (propRetentionFailed.TryRead(ref reader, options, PropRetentionFailed))
+			{
+				continue;
+			}
+
+			if (propRetentionRuns.TryRead(ref reader, options, PropRetentionRuns))
+			{
+				continue;
+			}
+
+			if (propRetentionTimedOut.TryRead(ref reader, options, PropRetentionTimedOut))
+			{
+				continue;
+			}
+
+			if (propTotalSnapshotDeletionFailures.TryRead(ref reader, options, PropTotalSnapshotDeletionFailures))
+			{
+				continue;
+			}
+
+			if (propTotalSnapshotsDeleted.TryRead(ref reader, options, PropTotalSnapshotsDeleted))
+			{
+				continue;
+			}
+
+			if (propTotalSnapshotsFailed.TryRead(ref reader, options, PropTotalSnapshotsFailed))
+			{
+				continue;
+			}
+
+			if (propTotalSnapshotsTaken.TryRead(ref reader, options, PropTotalSnapshotsTaken))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetStatsResponse
+		{
+			PolicyStats = propPolicyStats.Value
+,
+			RetentionDeletionTime = propRetentionDeletionTime.Value
+,
+			RetentionDeletionTimeMillis = propRetentionDeletionTimeMillis.Value
+,
+			RetentionFailed = propRetentionFailed.Value
+,
+			RetentionRuns = propRetentionRuns.Value
+,
+			RetentionTimedOut = propRetentionTimedOut.Value
+,
+			TotalSnapshotDeletionFailures = propTotalSnapshotDeletionFailures.Value
+,
+			TotalSnapshotsDeleted = propTotalSnapshotsDeleted.Value
+,
+			TotalSnapshotsFailed = propTotalSnapshotsFailed.Value
+,
+			TotalSnapshotsTaken = propTotalSnapshotsTaken.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetStatsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropPolicyStats, value.PolicyStats);
+		writer.WriteProperty(options, PropRetentionDeletionTime, value.RetentionDeletionTime);
+		writer.WriteProperty(options, PropRetentionDeletionTimeMillis, value.RetentionDeletionTimeMillis);
+		writer.WriteProperty(options, PropRetentionFailed, value.RetentionFailed);
+		writer.WriteProperty(options, PropRetentionRuns, value.RetentionRuns);
+		writer.WriteProperty(options, PropRetentionTimedOut, value.RetentionTimedOut);
+		writer.WriteProperty(options, PropTotalSnapshotDeletionFailures, value.TotalSnapshotDeletionFailures);
+		writer.WriteProperty(options, PropTotalSnapshotsDeleted, value.TotalSnapshotsDeleted);
+		writer.WriteProperty(options, PropTotalSnapshotsFailed, value.TotalSnapshotsFailed);
+		writer.WriteProperty(options, PropTotalSnapshotsTaken, value.TotalSnapshotsTaken);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetStatsResponseConverter))]
 public sealed partial class GetStatsResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("policy_stats")]
 	public IReadOnlyCollection<string> PolicyStats { get; init; }
-	[JsonInclude, JsonPropertyName("retention_deletion_time")]
 	public Elastic.Clients.Elasticsearch.Serverless.Duration RetentionDeletionTime { get; init; }
-	[JsonInclude, JsonPropertyName("retention_deletion_time_millis")]
 	public long RetentionDeletionTimeMillis { get; init; }
-	[JsonInclude, JsonPropertyName("retention_failed")]
 	public long RetentionFailed { get; init; }
-	[JsonInclude, JsonPropertyName("retention_runs")]
 	public long RetentionRuns { get; init; }
-	[JsonInclude, JsonPropertyName("retention_timed_out")]
 	public long RetentionTimedOut { get; init; }
-	[JsonInclude, JsonPropertyName("total_snapshot_deletion_failures")]
 	public long TotalSnapshotDeletionFailures { get; init; }
-	[JsonInclude, JsonPropertyName("total_snapshots_deleted")]
 	public long TotalSnapshotsDeleted { get; init; }
-	[JsonInclude, JsonPropertyName("total_snapshots_failed")]
 	public long TotalSnapshotsFailed { get; init; }
-	[JsonInclude, JsonPropertyName("total_snapshots_taken")]
 	public long TotalSnapshotsTaken { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/SnapshotLifecycleManagement/PutLifecycleResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/SnapshotLifecycleManagement/PutLifecycleResponse.g.cs
index 81e78167d5f..26b373f8916 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/SnapshotLifecycleManagement/PutLifecycleResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/SnapshotLifecycleManagement/PutLifecycleResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.SnapshotLifecycleManagement;
 
+internal sealed partial class PutLifecycleResponseConverter : System.Text.Json.Serialization.JsonConverter<PutLifecycleResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override PutLifecycleResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutLifecycleResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutLifecycleResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PutLifecycleResponseConverter))]
 public sealed partial class PutLifecycleResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class PutLifecycleResponse : ElasticsearchResponse
 	/// 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.Serverless/_Generated/Api/SnapshotLifecycleManagement/StartSlmResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/SnapshotLifecycleManagement/StartSlmResponse.g.cs
index 3c808d5388b..330844a8095 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/SnapshotLifecycleManagement/StartSlmResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/SnapshotLifecycleManagement/StartSlmResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.SnapshotLifecycleManagement;
 
+internal sealed partial class StartSlmResponseConverter : System.Text.Json.Serialization.JsonConverter<StartSlmResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override StartSlmResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new StartSlmResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, StartSlmResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(StartSlmResponseConverter))]
 public sealed partial class StartSlmResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class StartSlmResponse : ElasticsearchResponse
 	/// 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.Serverless/_Generated/Api/SnapshotLifecycleManagement/StopSlmResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/SnapshotLifecycleManagement/StopSlmResponse.g.cs
index 158747d810b..091dc6f5fac 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/SnapshotLifecycleManagement/StopSlmResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/SnapshotLifecycleManagement/StopSlmResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.SnapshotLifecycleManagement;
 
+internal sealed partial class StopSlmResponseConverter : System.Text.Json.Serialization.JsonConverter<StopSlmResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override StopSlmResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new StopSlmResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, StopSlmResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(StopSlmResponseConverter))]
 public sealed partial class StopSlmResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class StopSlmResponse : ElasticsearchResponse
 	/// 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.Serverless/_Generated/Api/Sql/ClearCursorResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Sql/ClearCursorResponse.g.cs
index 821827b04e5..5ce62c01cab 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Sql/ClearCursorResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Sql/ClearCursorResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Sql;
 
+internal sealed partial class ClearCursorResponseConverter : System.Text.Json.Serialization.JsonConverter<ClearCursorResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropSucceeded = System.Text.Json.JsonEncodedText.Encode("succeeded");
+
+	public override ClearCursorResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propSucceeded = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propSucceeded.TryRead(ref reader, options, PropSucceeded))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ClearCursorResponse
+		{
+			Succeeded = propSucceeded.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ClearCursorResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropSucceeded, value.Succeeded);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ClearCursorResponseConverter))]
 public sealed partial class ClearCursorResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("succeeded")]
 	public bool Succeeded { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Sql/DeleteAsyncResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Sql/DeleteAsyncResponse.g.cs
index 09cfb3fee42..f3c073810f6 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Sql/DeleteAsyncResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Sql/DeleteAsyncResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Sql;
 
+internal sealed partial class DeleteAsyncResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteAsyncResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override DeleteAsyncResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteAsyncResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteAsyncResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteAsyncResponseConverter))]
 public sealed partial class DeleteAsyncResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class DeleteAsyncResponse : ElasticsearchResponse
 	/// 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.Serverless/_Generated/Api/Sql/GetAsyncResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Sql/GetAsyncResponse.g.cs
index b2f81b3bb98..4b99049e15d 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Sql/GetAsyncResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Sql/GetAsyncResponse.g.cs
@@ -18,14 +18,91 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Sql;
 
+internal sealed partial class GetAsyncResponseConverter : System.Text.Json.Serialization.JsonConverter<GetAsyncResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropColumns = System.Text.Json.JsonEncodedText.Encode("columns");
+	private static readonly System.Text.Json.JsonEncodedText PropCursor = System.Text.Json.JsonEncodedText.Encode("cursor");
+	private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("id");
+	private static readonly System.Text.Json.JsonEncodedText PropIsPartial = System.Text.Json.JsonEncodedText.Encode("is_partial");
+	private static readonly System.Text.Json.JsonEncodedText PropIsRunning = System.Text.Json.JsonEncodedText.Encode("is_running");
+
+	public override GetAsyncResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Sql.Column>?> propColumns = default;
+		LocalJsonProperty<string?> propCursor = default;
+		LocalJsonProperty<string> propId = default;
+		LocalJsonProperty<bool> propIsPartial = default;
+		LocalJsonProperty<bool> propIsRunning = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propColumns.TryRead(ref reader, options, PropColumns))
+			{
+				continue;
+			}
+
+			if (propCursor.TryRead(ref reader, options, PropCursor))
+			{
+				continue;
+			}
+
+			if (propId.TryRead(ref reader, options, PropId))
+			{
+				continue;
+			}
+
+			if (propIsPartial.TryRead(ref reader, options, PropIsPartial))
+			{
+				continue;
+			}
+
+			if (propIsRunning.TryRead(ref reader, options, PropIsRunning))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetAsyncResponse
+		{
+			Columns = propColumns.Value
+,
+			Cursor = propCursor.Value
+,
+			Id = propId.Value
+,
+			IsPartial = propIsPartial.Value
+,
+			IsRunning = propIsRunning.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetAsyncResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropColumns, value.Columns);
+		writer.WriteProperty(options, PropCursor, value.Cursor);
+		writer.WriteProperty(options, PropId, value.Id);
+		writer.WriteProperty(options, PropIsPartial, value.IsPartial);
+		writer.WriteProperty(options, PropIsRunning, value.IsRunning);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetAsyncResponseConverter))]
 public sealed partial class GetAsyncResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,7 +110,6 @@ public sealed partial class GetAsyncResponse : ElasticsearchResponse
 	/// Column headings for the search results. Each object is a column.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("columns")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Sql.Column>? Columns { get; init; }
 
 	/// <summary>
@@ -42,7 +118,6 @@ public sealed partial class GetAsyncResponse : ElasticsearchResponse
 	/// TXT responses, this value is returned in the <c>Cursor</c> HTTP header.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("cursor")]
 	public string? Cursor { get; init; }
 
 	/// <summary>
@@ -52,7 +127,6 @@ public sealed partial class GetAsyncResponse : ElasticsearchResponse
 	/// in the <c>Async-ID</c> HTTP header.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("id")]
 	public string Id { get; init; }
 
 	/// <summary>
@@ -64,7 +138,6 @@ public sealed partial class GetAsyncResponse : ElasticsearchResponse
 	/// For CSV, TSV, and TXT responses, this value is returned in the <c>Async-partial</c> HTTP header.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("is_partial")]
 	public bool IsPartial { get; init; }
 
 	/// <summary>
@@ -75,6 +148,5 @@ public sealed partial class GetAsyncResponse : ElasticsearchResponse
 	/// 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.Serverless/_Generated/Api/Sql/GetAsyncStatusResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Sql/GetAsyncStatusResponse.g.cs
index 7e4c8941777..678dee31c04 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Sql/GetAsyncStatusResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Sql/GetAsyncStatusResponse.g.cs
@@ -18,14 +18,101 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Sql;
 
+internal sealed partial class GetAsyncStatusResponseConverter : System.Text.Json.Serialization.JsonConverter<GetAsyncStatusResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCompletionStatus = System.Text.Json.JsonEncodedText.Encode("completion_status");
+	private static readonly System.Text.Json.JsonEncodedText PropExpirationTimeInMillis = System.Text.Json.JsonEncodedText.Encode("expiration_time_in_millis");
+	private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("id");
+	private static readonly System.Text.Json.JsonEncodedText PropIsPartial = System.Text.Json.JsonEncodedText.Encode("is_partial");
+	private static readonly System.Text.Json.JsonEncodedText PropIsRunning = System.Text.Json.JsonEncodedText.Encode("is_running");
+	private static readonly System.Text.Json.JsonEncodedText PropStartTimeInMillis = System.Text.Json.JsonEncodedText.Encode("start_time_in_millis");
+
+	public override GetAsyncStatusResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<int?> propCompletionStatus = default;
+		LocalJsonProperty<long> propExpirationTimeInMillis = default;
+		LocalJsonProperty<string> propId = default;
+		LocalJsonProperty<bool> propIsPartial = default;
+		LocalJsonProperty<bool> propIsRunning = default;
+		LocalJsonProperty<long> propStartTimeInMillis = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCompletionStatus.TryRead(ref reader, options, PropCompletionStatus))
+			{
+				continue;
+			}
+
+			if (propExpirationTimeInMillis.TryRead(ref reader, options, PropExpirationTimeInMillis))
+			{
+				continue;
+			}
+
+			if (propId.TryRead(ref reader, options, PropId))
+			{
+				continue;
+			}
+
+			if (propIsPartial.TryRead(ref reader, options, PropIsPartial))
+			{
+				continue;
+			}
+
+			if (propIsRunning.TryRead(ref reader, options, PropIsRunning))
+			{
+				continue;
+			}
+
+			if (propStartTimeInMillis.TryRead(ref reader, options, PropStartTimeInMillis))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetAsyncStatusResponse
+		{
+			CompletionStatus = propCompletionStatus.Value
+,
+			ExpirationTimeInMillis = propExpirationTimeInMillis.Value
+,
+			Id = propId.Value
+,
+			IsPartial = propIsPartial.Value
+,
+			IsRunning = propIsRunning.Value
+,
+			StartTimeInMillis = propStartTimeInMillis.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetAsyncStatusResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCompletionStatus, value.CompletionStatus);
+		writer.WriteProperty(options, PropExpirationTimeInMillis, value.ExpirationTimeInMillis);
+		writer.WriteProperty(options, PropId, value.Id);
+		writer.WriteProperty(options, PropIsPartial, value.IsPartial);
+		writer.WriteProperty(options, PropIsRunning, value.IsRunning);
+		writer.WriteProperty(options, PropStartTimeInMillis, value.StartTimeInMillis);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetAsyncStatusResponseConverter))]
 public sealed partial class GetAsyncStatusResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,7 +120,6 @@ public sealed partial class GetAsyncStatusResponse : ElasticsearchResponse
 	/// 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>
@@ -42,7 +128,6 @@ public sealed partial class GetAsyncStatusResponse : ElasticsearchResponse
 	/// 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>
@@ -50,7 +135,6 @@ public sealed partial class GetAsyncStatusResponse : ElasticsearchResponse
 	/// Identifier for the search.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("id")]
 	public string Id { get; init; }
 
 	/// <summary>
@@ -61,7 +145,6 @@ public sealed partial class GetAsyncStatusResponse : ElasticsearchResponse
 	/// timeout.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("is_partial")]
 	public bool IsPartial { get; init; }
 
 	/// <summary>
@@ -69,7 +152,6 @@ public sealed partial class GetAsyncStatusResponse : ElasticsearchResponse
 	/// If <c>true</c>, the search is still running. If <c>false</c>, the search has finished.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("is_running")]
 	public bool IsRunning { get; init; }
 
 	/// <summary>
@@ -78,6 +160,5 @@ public sealed partial class GetAsyncStatusResponse : ElasticsearchResponse
 	/// 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.Serverless/_Generated/Api/Sql/QueryResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Sql/QueryResponse.g.cs
index 3b1a52167ce..15e7cdd9418 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Sql/QueryResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Sql/QueryResponse.g.cs
@@ -18,14 +18,91 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Sql;
 
+internal sealed partial class QueryResponseConverter : System.Text.Json.Serialization.JsonConverter<QueryResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropColumns = System.Text.Json.JsonEncodedText.Encode("columns");
+	private static readonly System.Text.Json.JsonEncodedText PropCursor = System.Text.Json.JsonEncodedText.Encode("cursor");
+	private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("id");
+	private static readonly System.Text.Json.JsonEncodedText PropIsPartial = System.Text.Json.JsonEncodedText.Encode("is_partial");
+	private static readonly System.Text.Json.JsonEncodedText PropIsRunning = System.Text.Json.JsonEncodedText.Encode("is_running");
+
+	public override QueryResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Sql.Column>?> propColumns = default;
+		LocalJsonProperty<string?> propCursor = default;
+		LocalJsonProperty<string?> propId = default;
+		LocalJsonProperty<bool?> propIsPartial = default;
+		LocalJsonProperty<bool?> propIsRunning = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propColumns.TryRead(ref reader, options, PropColumns))
+			{
+				continue;
+			}
+
+			if (propCursor.TryRead(ref reader, options, PropCursor))
+			{
+				continue;
+			}
+
+			if (propId.TryRead(ref reader, options, PropId))
+			{
+				continue;
+			}
+
+			if (propIsPartial.TryRead(ref reader, options, PropIsPartial))
+			{
+				continue;
+			}
+
+			if (propIsRunning.TryRead(ref reader, options, PropIsRunning))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new QueryResponse
+		{
+			Columns = propColumns.Value
+,
+			Cursor = propCursor.Value
+,
+			Id = propId.Value
+,
+			IsPartial = propIsPartial.Value
+,
+			IsRunning = propIsRunning.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, QueryResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropColumns, value.Columns);
+		writer.WriteProperty(options, PropCursor, value.Cursor);
+		writer.WriteProperty(options, PropId, value.Id);
+		writer.WriteProperty(options, PropIsPartial, value.IsPartial);
+		writer.WriteProperty(options, PropIsRunning, value.IsRunning);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(QueryResponseConverter))]
 public sealed partial class QueryResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,7 +110,6 @@ public sealed partial class QueryResponse : ElasticsearchResponse
 	/// Column headings for the search results. Each object is a column.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("columns")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Sql.Column>? Columns { get; init; }
 
 	/// <summary>
@@ -42,7 +118,6 @@ public sealed partial class QueryResponse : ElasticsearchResponse
 	/// TXT responses, this value is returned in the <c>Cursor</c> HTTP header.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("cursor")]
 	public string? Cursor { get; init; }
 
 	/// <summary>
@@ -52,7 +127,6 @@ public sealed partial class QueryResponse : ElasticsearchResponse
 	/// in the <c>Async-ID</c> HTTP header.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("id")]
 	public string? Id { get; init; }
 
 	/// <summary>
@@ -64,7 +138,6 @@ public sealed partial class QueryResponse : ElasticsearchResponse
 	/// For CSV, TSV, and TXT responses, this value is returned in the <c>Async-partial</c> HTTP header.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("is_partial")]
 	public bool? IsPartial { get; init; }
 
 	/// <summary>
@@ -75,6 +148,5 @@ public sealed partial class QueryResponse : ElasticsearchResponse
 	/// 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.Serverless/_Generated/Api/Sql/TranslateResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Sql/TranslateResponse.g.cs
index 99fbe12d829..bb2943db053 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Sql/TranslateResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Sql/TranslateResponse.g.cs
@@ -18,27 +18,107 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Sql;
 
+internal sealed partial class TranslateResponseConverter : System.Text.Json.Serialization.JsonConverter<TranslateResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropQuery = System.Text.Json.JsonEncodedText.Encode("query");
+	private static readonly System.Text.Json.JsonEncodedText PropSize = System.Text.Json.JsonEncodedText.Encode("size");
+	private static readonly System.Text.Json.JsonEncodedText PropSort = System.Text.Json.JsonEncodedText.Encode("sort");
+	private static readonly System.Text.Json.JsonEncodedText PropSource = System.Text.Json.JsonEncodedText.Encode("_source");
+
+	public override TranslateResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.Aggregation>?> propAggregations = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.FieldAndFormat>?> propFields = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query?> propQuery = default;
+		LocalJsonProperty<long?> propSize = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.SortOptions>?> propSort = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Core.Search.SourceConfig?> propSource = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAggregations.TryRead(ref reader, options, PropAggregations))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propQuery.TryRead(ref reader, options, PropQuery))
+			{
+				continue;
+			}
+
+			if (propSize.TryRead(ref reader, options, PropSize))
+			{
+				continue;
+			}
+
+			if (propSort.TryRead(ref reader, options, PropSort, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.SortOptions>?, Elastic.Clients.Elasticsearch.Serverless.SortOptions>)))
+			{
+				continue;
+			}
+
+			if (propSource.TryRead(ref reader, options, PropSource))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new TranslateResponse
+		{
+			Aggregations = propAggregations.Value
+,
+			Fields = propFields.Value
+,
+			Query = propQuery.Value
+,
+			Size = propSize.Value
+,
+			Sort = propSort.Value
+,
+			Source = propSource.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, TranslateResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAggregations, value.Aggregations);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropQuery, value.Query);
+		writer.WriteProperty(options, PropSize, value.Size);
+		writer.WriteProperty(options, PropSort, value.Sort, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.SortOptions>?, Elastic.Clients.Elasticsearch.Serverless.SortOptions>));
+		writer.WriteProperty(options, PropSource, value.Source);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(TranslateResponseConverter))]
 public sealed partial class TranslateResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("aggregations")]
 	public IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.Aggregation>? Aggregations { get; init; }
-	[JsonInclude, JsonPropertyName("fields")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.FieldAndFormat>? Fields { get; init; }
-	[JsonInclude, JsonPropertyName("query")]
 	public Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query? Query { get; init; }
-	[JsonInclude, JsonPropertyName("size")]
 	public long? Size { get; init; }
-	[JsonInclude, JsonPropertyName("sort")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.Serverless.SortOptions))]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.SortOptions>? Sort { get; init; }
-	[JsonInclude, JsonPropertyName("_source")]
 	public Elastic.Clients.Elasticsearch.Serverless.Core.Search.SourceConfig? Source { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Synonyms/DeleteSynonymResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Synonyms/DeleteSynonymResponse.g.cs
index 479bdd5aaa4..01452b5eeb5 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Synonyms/DeleteSynonymResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Synonyms/DeleteSynonymResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Synonyms;
 
+internal sealed partial class DeleteSynonymResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteSynonymResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override DeleteSynonymResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteSynonymResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteSynonymResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteSynonymResponseConverter))]
 public sealed partial class DeleteSynonymResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class DeleteSynonymResponse : ElasticsearchResponse
 	/// 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.Serverless/_Generated/Api/Synonyms/DeleteSynonymRuleResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Synonyms/DeleteSynonymRuleResponse.g.cs
index 73974df9ed9..8bbb903060f 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Synonyms/DeleteSynonymRuleResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Synonyms/DeleteSynonymRuleResponse.g.cs
@@ -18,14 +18,61 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Synonyms;
 
+internal sealed partial class DeleteSynonymRuleResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteSynonymRuleResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropReloadAnalyzersDetails = System.Text.Json.JsonEncodedText.Encode("reload_analyzers_details");
+	private static readonly System.Text.Json.JsonEncodedText PropResult = System.Text.Json.JsonEncodedText.Encode("result");
+
+	public override DeleteSynonymRuleResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.ReloadResult> propReloadAnalyzersDetails = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Result> propResult = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propReloadAnalyzersDetails.TryRead(ref reader, options, PropReloadAnalyzersDetails))
+			{
+				continue;
+			}
+
+			if (propResult.TryRead(ref reader, options, PropResult))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteSynonymRuleResponse
+		{
+			ReloadAnalyzersDetails = propReloadAnalyzersDetails.Value
+,
+			Result = propResult.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteSynonymRuleResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropReloadAnalyzersDetails, value.ReloadAnalyzersDetails);
+		writer.WriteProperty(options, PropResult, value.Result);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteSynonymRuleResponseConverter))]
 public sealed partial class DeleteSynonymRuleResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -34,7 +81,6 @@ public sealed partial class DeleteSynonymRuleResponse : ElasticsearchResponse
 	/// This is the analyzers reloading result
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("reload_analyzers_details")]
 	public Elastic.Clients.Elasticsearch.Serverless.IndexManagement.ReloadResult ReloadAnalyzersDetails { get; init; }
 
 	/// <summary>
@@ -42,6 +88,5 @@ public sealed partial class DeleteSynonymRuleResponse : ElasticsearchResponse
 	/// Update operation result
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("result")]
 	public Elastic.Clients.Elasticsearch.Serverless.Result Result { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Synonyms/GetSynonymResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Synonyms/GetSynonymResponse.g.cs
index b9a0e5a1d26..b070575ab30 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Synonyms/GetSynonymResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Synonyms/GetSynonymResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Synonyms;
 
+internal sealed partial class GetSynonymResponseConverter : System.Text.Json.Serialization.JsonConverter<GetSynonymResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCount = System.Text.Json.JsonEncodedText.Encode("count");
+	private static readonly System.Text.Json.JsonEncodedText PropSynonymsSet = System.Text.Json.JsonEncodedText.Encode("synonyms_set");
+
+	public override GetSynonymResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<int> propCount = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Synonyms.SynonymRuleRead>> propSynonymsSet = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCount.TryRead(ref reader, options, PropCount))
+			{
+				continue;
+			}
+
+			if (propSynonymsSet.TryRead(ref reader, options, PropSynonymsSet))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetSynonymResponse
+		{
+			Count = propCount.Value
+,
+			SynonymsSet = propSynonymsSet.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetSynonymResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCount, value.Count);
+		writer.WriteProperty(options, PropSynonymsSet, value.SynonymsSet);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetSynonymResponseConverter))]
 public sealed partial class GetSynonymResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("count")]
 	public int Count { get; init; }
-	[JsonInclude, JsonPropertyName("synonyms_set")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Synonyms.SynonymRuleRead> SynonymsSet { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Synonyms/GetSynonymRuleResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Synonyms/GetSynonymRuleResponse.g.cs
index ddf0532449c..5056ea5c257 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Synonyms/GetSynonymRuleResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Synonyms/GetSynonymRuleResponse.g.cs
@@ -18,14 +18,61 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Synonyms;
 
+internal sealed partial class GetSynonymRuleResponseConverter : System.Text.Json.Serialization.JsonConverter<GetSynonymRuleResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("id");
+	private static readonly System.Text.Json.JsonEncodedText PropSynonyms = System.Text.Json.JsonEncodedText.Encode("synonyms");
+
+	public override GetSynonymRuleResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propId = default;
+		LocalJsonProperty<string> propSynonyms = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propId.TryRead(ref reader, options, PropId))
+			{
+				continue;
+			}
+
+			if (propSynonyms.TryRead(ref reader, options, PropSynonyms))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetSynonymRuleResponse
+		{
+			Id = propId.Value
+,
+			Synonyms = propSynonyms.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetSynonymRuleResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropId, value.Id);
+		writer.WriteProperty(options, PropSynonyms, value.Synonyms);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetSynonymRuleResponseConverter))]
 public sealed partial class GetSynonymRuleResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,7 +80,6 @@ public sealed partial class GetSynonymRuleResponse : ElasticsearchResponse
 	/// Synonym Rule identifier
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("id")]
 	public string Id { get; init; }
 
 	/// <summary>
@@ -41,6 +87,5 @@ public sealed partial class GetSynonymRuleResponse : ElasticsearchResponse
 	/// Synonyms, in Solr format, that conform the synonym rule. See https://www.elastic.co/guide/en/elasticsearch/reference/current/analysis-synonym-graph-tokenfilter.html#_solr_synonyms_2
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("synonyms")]
 	public string Synonyms { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Synonyms/GetSynonymsSetsResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Synonyms/GetSynonymsSetsResponse.g.cs
index d995d7a68a9..6f437f7d0d6 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Synonyms/GetSynonymsSetsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Synonyms/GetSynonymsSetsResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Synonyms;
 
+internal sealed partial class GetSynonymsSetsResponseConverter : System.Text.Json.Serialization.JsonConverter<GetSynonymsSetsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCount = System.Text.Json.JsonEncodedText.Encode("count");
+	private static readonly System.Text.Json.JsonEncodedText PropResults = System.Text.Json.JsonEncodedText.Encode("results");
+
+	public override GetSynonymsSetsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<int> propCount = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Synonyms.SynonymsSetItem>> propResults = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCount.TryRead(ref reader, options, PropCount))
+			{
+				continue;
+			}
+
+			if (propResults.TryRead(ref reader, options, PropResults))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetSynonymsSetsResponse
+		{
+			Count = propCount.Value
+,
+			Results = propResults.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetSynonymsSetsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCount, value.Count);
+		writer.WriteProperty(options, PropResults, value.Results);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetSynonymsSetsResponseConverter))]
 public sealed partial class GetSynonymsSetsResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("count")]
 	public int Count { get; init; }
-	[JsonInclude, JsonPropertyName("results")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Synonyms.SynonymsSetItem> Results { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Synonyms/PutSynonymRequest.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Synonyms/PutSynonymRequest.g.cs
index 917cc4d52a7..fb695bc6c4b 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Synonyms/PutSynonymRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Synonyms/PutSynonymRequest.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Requests;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport;
@@ -34,6 +35,39 @@ public sealed partial class PutSynonymRequestParameters : RequestParameters
 {
 }
 
+internal sealed partial class PutSynonymRequestConverter : System.Text.Json.Serialization.JsonConverter<PutSynonymRequest>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropSynonymsSet = System.Text.Json.JsonEncodedText.Encode("synonyms_set");
+
+	public override PutSynonymRequest Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.Synonyms.SynonymRule>> propSynonymsSet = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propSynonymsSet.TryRead(ref reader, options, PropSynonymsSet, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Synonyms.SynonymRule>, Elastic.Clients.Elasticsearch.Serverless.Synonyms.SynonymRule>)))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutSynonymRequest
+		{
+			SynonymsSet = propSynonymsSet.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutSynonymRequest value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropSynonymsSet, value.SynonymsSet, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Synonyms.SynonymRule>, Elastic.Clients.Elasticsearch.Serverless.Synonyms.SynonymRule>));
+		writer.WriteEndObject();
+	}
+}
+
 /// <summary>
 /// <para>
 /// Create or update a synonym set.
@@ -41,6 +75,7 @@ public sealed partial class PutSynonymRequestParameters : RequestParameters
 /// If you need to manage more synonym rules, you can create multiple synonym sets.
 /// </para>
 /// </summary>
+[JsonConverter(typeof(PutSynonymRequestConverter))]
 public sealed partial class PutSynonymRequest : PlainRequest<PutSynonymRequestParameters>
 {
 	public PutSynonymRequest(Elastic.Clients.Elasticsearch.Serverless.Id id) : base(r => r.Required("id", id))
@@ -60,8 +95,6 @@ public PutSynonymRequest(Elastic.Clients.Elasticsearch.Serverless.Id id) : base(
 	/// The synonym set information to update
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("synonyms_set")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.Serverless.Synonyms.SynonymRule))]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.Synonyms.SynonymRule> SynonymsSet { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Synonyms/PutSynonymResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Synonyms/PutSynonymResponse.g.cs
index 7d199169ef8..1ea5f244476 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Synonyms/PutSynonymResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Synonyms/PutSynonymResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Synonyms;
 
+internal sealed partial class PutSynonymResponseConverter : System.Text.Json.Serialization.JsonConverter<PutSynonymResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropReloadAnalyzersDetails = System.Text.Json.JsonEncodedText.Encode("reload_analyzers_details");
+	private static readonly System.Text.Json.JsonEncodedText PropResult = System.Text.Json.JsonEncodedText.Encode("result");
+
+	public override PutSynonymResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.ReloadResult> propReloadAnalyzersDetails = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Result> propResult = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propReloadAnalyzersDetails.TryRead(ref reader, options, PropReloadAnalyzersDetails))
+			{
+				continue;
+			}
+
+			if (propResult.TryRead(ref reader, options, PropResult))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutSynonymResponse
+		{
+			ReloadAnalyzersDetails = propReloadAnalyzersDetails.Value
+,
+			Result = propResult.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutSynonymResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropReloadAnalyzersDetails, value.ReloadAnalyzersDetails);
+		writer.WriteProperty(options, PropResult, value.Result);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PutSynonymResponseConverter))]
 public sealed partial class PutSynonymResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("reload_analyzers_details")]
 	public Elastic.Clients.Elasticsearch.Serverless.IndexManagement.ReloadResult ReloadAnalyzersDetails { get; init; }
-	[JsonInclude, JsonPropertyName("result")]
 	public Elastic.Clients.Elasticsearch.Serverless.Result Result { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Synonyms/PutSynonymRuleResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Synonyms/PutSynonymRuleResponse.g.cs
index 242f0cd0cde..1d251b26dc5 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Synonyms/PutSynonymRuleResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Synonyms/PutSynonymRuleResponse.g.cs
@@ -18,14 +18,61 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Synonyms;
 
+internal sealed partial class PutSynonymRuleResponseConverter : System.Text.Json.Serialization.JsonConverter<PutSynonymRuleResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropReloadAnalyzersDetails = System.Text.Json.JsonEncodedText.Encode("reload_analyzers_details");
+	private static readonly System.Text.Json.JsonEncodedText PropResult = System.Text.Json.JsonEncodedText.Encode("result");
+
+	public override PutSynonymRuleResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.ReloadResult> propReloadAnalyzersDetails = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Result> propResult = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propReloadAnalyzersDetails.TryRead(ref reader, options, PropReloadAnalyzersDetails))
+			{
+				continue;
+			}
+
+			if (propResult.TryRead(ref reader, options, PropResult))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutSynonymRuleResponse
+		{
+			ReloadAnalyzersDetails = propReloadAnalyzersDetails.Value
+,
+			Result = propResult.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutSynonymRuleResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropReloadAnalyzersDetails, value.ReloadAnalyzersDetails);
+		writer.WriteProperty(options, PropResult, value.Result);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PutSynonymRuleResponseConverter))]
 public sealed partial class PutSynonymRuleResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -34,7 +81,6 @@ public sealed partial class PutSynonymRuleResponse : ElasticsearchResponse
 	/// This is the analyzers reloading result
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("reload_analyzers_details")]
 	public Elastic.Clients.Elasticsearch.Serverless.IndexManagement.ReloadResult ReloadAnalyzersDetails { get; init; }
 
 	/// <summary>
@@ -42,6 +88,5 @@ public sealed partial class PutSynonymRuleResponse : ElasticsearchResponse
 	/// Update operation result
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("result")]
 	public Elastic.Clients.Elasticsearch.Serverless.Result Result { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/TermVectorsRequest.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/TermVectorsRequest.g.cs
index 7854f379409..971ac783c59 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/TermVectorsRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/TermVectorsRequest.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Requests;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport;
@@ -112,6 +113,76 @@ public sealed partial class TermVectorsRequestParameters : RequestParameters
 	public Elastic.Clients.Elasticsearch.Serverless.VersionType? VersionType { get => Q<Elastic.Clients.Elasticsearch.Serverless.VersionType?>("version_type"); set => Q("version_type", value); }
 }
 
+internal sealed partial class TermVectorsRequestConverter<TDocument> : System.Text.Json.Serialization.JsonConverter<TermVectorsRequest<TDocument>>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropDoc = System.Text.Json.JsonEncodedText.Encode("doc");
+	private static readonly System.Text.Json.JsonEncodedText PropFilter = System.Text.Json.JsonEncodedText.Encode("filter");
+	private static readonly System.Text.Json.JsonEncodedText PropPerFieldAnalyzer = System.Text.Json.JsonEncodedText.Encode("per_field_analyzer");
+
+	public override TermVectorsRequest<TDocument> Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<TDocument?> propDoc = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Core.TermVectors.Filter?> propFilter = default;
+		LocalJsonProperty<IDictionary<Elastic.Clients.Elasticsearch.Serverless.Field, string>?> propPerFieldAnalyzer = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propDoc.TryRead(ref reader, options, PropDoc, typeof(SourceMarker<TDocument?>)))
+			{
+				continue;
+			}
+
+			if (propFilter.TryRead(ref reader, options, PropFilter))
+			{
+				continue;
+			}
+
+			if (propPerFieldAnalyzer.TryRead(ref reader, options, PropPerFieldAnalyzer))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new TermVectorsRequest<TDocument>
+		{
+			Doc = propDoc.Value
+	,
+			Filter = propFilter.Value
+	,
+			PerFieldAnalyzer = propPerFieldAnalyzer.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, TermVectorsRequest<TDocument> value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDoc, value.Doc, typeof(SourceMarker<TDocument?>));
+		writer.WriteProperty(options, PropFilter, value.Filter);
+		writer.WriteProperty(options, PropPerFieldAnalyzer, value.PerFieldAnalyzer);
+		writer.WriteEndObject();
+	}
+}
+
+internal sealed partial class TermVectorsRequestConverterFactory : System.Text.Json.Serialization.JsonConverterFactory
+{
+	public override bool CanConvert(System.Type typeToConvert)
+	{
+		return typeToConvert.IsGenericType && typeToConvert.GetGenericTypeDefinition() == typeof(TermVectorsRequest<>);
+	}
+
+	public override System.Text.Json.Serialization.JsonConverter CreateConverter(System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		var args = typeToConvert.GetGenericArguments();
+#pragma warning disable IL3050
+		var converter = (System.Text.Json.Serialization.JsonConverter)System.Activator.CreateInstance(typeof(TermVectorsRequestConverter<>).MakeGenericType(args[0]), System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public, binder: null, args: null, culture: null)!;
+#pragma warning restore IL3050
+		return converter;
+	}
+}
+
 /// <summary>
 /// <para>
 /// Get term vector information.
@@ -120,6 +191,7 @@ public sealed partial class TermVectorsRequestParameters : RequestParameters
 /// Get information and statistics about terms in the fields of a particular document.
 /// </para>
 /// </summary>
+[JsonConverter(typeof(TermVectorsRequestConverterFactory))]
 public sealed partial class TermVectorsRequest<TDocument> : PlainRequest<TermVectorsRequestParameters>
 {
 	public TermVectorsRequest(Elastic.Clients.Elasticsearch.Serverless.IndexName index, Elastic.Clients.Elasticsearch.Serverless.Id? id) : base(r => r.Required("index", index).Optional("id", id))
@@ -144,7 +216,6 @@ public TermVectorsRequest(Elastic.Clients.Elasticsearch.Serverless.IndexName ind
 	/// Used as the default list unless a specific field list is provided in the <c>completion_fields</c> or <c>fielddata_fields</c> parameters.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Serverless.Fields? Fields { get => Q<Elastic.Clients.Elasticsearch.Serverless.Fields?>("fields"); set => Q("fields", value); }
 
 	/// <summary>
@@ -152,7 +223,6 @@ public TermVectorsRequest(Elastic.Clients.Elasticsearch.Serverless.IndexName ind
 	/// If <c>true</c>, the response includes the document count, sum of document frequencies, and sum of total term frequencies.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public bool? FieldStatistics { get => Q<bool?>("field_statistics"); set => Q("field_statistics", value); }
 
 	/// <summary>
@@ -160,7 +230,6 @@ public TermVectorsRequest(Elastic.Clients.Elasticsearch.Serverless.IndexName ind
 	/// If <c>true</c>, the response includes term offsets.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public bool? Offsets { get => Q<bool?>("offsets"); set => Q("offsets", value); }
 
 	/// <summary>
@@ -168,7 +237,6 @@ public TermVectorsRequest(Elastic.Clients.Elasticsearch.Serverless.IndexName ind
 	/// If <c>true</c>, the response includes term payloads.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public bool? Payloads { get => Q<bool?>("payloads"); set => Q("payloads", value); }
 
 	/// <summary>
@@ -176,7 +244,6 @@ public TermVectorsRequest(Elastic.Clients.Elasticsearch.Serverless.IndexName ind
 	/// If <c>true</c>, the response includes term positions.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public bool? Positions { get => Q<bool?>("positions"); set => Q("positions", value); }
 
 	/// <summary>
@@ -185,7 +252,6 @@ public TermVectorsRequest(Elastic.Clients.Elasticsearch.Serverless.IndexName ind
 	/// Random by default.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public string? Preference { get => Q<string?>("preference"); set => Q("preference", value); }
 
 	/// <summary>
@@ -193,7 +259,6 @@ public TermVectorsRequest(Elastic.Clients.Elasticsearch.Serverless.IndexName ind
 	/// 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>
@@ -201,7 +266,6 @@ public TermVectorsRequest(Elastic.Clients.Elasticsearch.Serverless.IndexName ind
 	/// Custom value used to route operations to a specific shard.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Serverless.Routing? Routing { get => Q<Elastic.Clients.Elasticsearch.Serverless.Routing?>("routing"); set => Q("routing", value); }
 
 	/// <summary>
@@ -209,7 +273,6 @@ public TermVectorsRequest(Elastic.Clients.Elasticsearch.Serverless.IndexName ind
 	/// If <c>true</c>, the response includes term frequency and document frequency.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public bool? TermStatistics { get => Q<bool?>("term_statistics"); set => Q("term_statistics", value); }
 
 	/// <summary>
@@ -217,7 +280,6 @@ public TermVectorsRequest(Elastic.Clients.Elasticsearch.Serverless.IndexName ind
 	/// If <c>true</c>, returns the document version as part of a hit.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public long? Version { get => Q<long?>("version"); set => Q("version", value); }
 
 	/// <summary>
@@ -225,7 +287,6 @@ public TermVectorsRequest(Elastic.Clients.Elasticsearch.Serverless.IndexName ind
 	/// Specific version type.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Serverless.VersionType? VersionType { get => Q<Elastic.Clients.Elasticsearch.Serverless.VersionType?>("version_type"); set => Q("version_type", value); }
 
 	/// <summary>
@@ -233,8 +294,6 @@ public TermVectorsRequest(Elastic.Clients.Elasticsearch.Serverless.IndexName ind
 	/// An artificial document (a document not present in the index) for which you want to retrieve term vectors.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("doc")]
-	[SourceConverter]
 	public TDocument? Doc { get; set; }
 
 	/// <summary>
@@ -242,7 +301,6 @@ public TermVectorsRequest(Elastic.Clients.Elasticsearch.Serverless.IndexName ind
 	/// Filter terms based on their tf-idf scores.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("filter")]
 	public Elastic.Clients.Elasticsearch.Serverless.Core.TermVectors.Filter? Filter { get; set; }
 
 	/// <summary>
@@ -250,7 +308,6 @@ public TermVectorsRequest(Elastic.Clients.Elasticsearch.Serverless.IndexName ind
 	/// Overrides the default per-field analyzer.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("per_field_analyzer")]
 	public IDictionary<Elastic.Clients.Elasticsearch.Serverless.Field, string>? PerFieldAnalyzer { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/TermVectorsResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/TermVectorsResponse.g.cs
index f2c69d342cf..756bc61a5ed 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/TermVectorsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/TermVectorsResponse.g.cs
@@ -18,27 +18,107 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless;
 
+internal sealed partial class TermVectorsResponseConverter : System.Text.Json.Serialization.JsonConverter<TermVectorsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropFound = System.Text.Json.JsonEncodedText.Encode("found");
+	private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("_id");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("_index");
+	private static readonly System.Text.Json.JsonEncodedText PropTermVectors = System.Text.Json.JsonEncodedText.Encode("term_vectors");
+	private static readonly System.Text.Json.JsonEncodedText PropTook = System.Text.Json.JsonEncodedText.Encode("took");
+	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("_version");
+
+	public override TermVectorsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propFound = default;
+		LocalJsonProperty<string?> propId = default;
+		LocalJsonProperty<string> propIndex = default;
+		LocalJsonProperty<IReadOnlyDictionary<Elastic.Clients.Elasticsearch.Serverless.Field, Elastic.Clients.Elasticsearch.Serverless.Core.TermVectors.TermVector>?> propTermVectors = default;
+		LocalJsonProperty<long> propTook = default;
+		LocalJsonProperty<long> propVersion = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propFound.TryRead(ref reader, options, PropFound))
+			{
+				continue;
+			}
+
+			if (propId.TryRead(ref reader, options, PropId))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propTermVectors.TryRead(ref reader, options, PropTermVectors))
+			{
+				continue;
+			}
+
+			if (propTook.TryRead(ref reader, options, PropTook))
+			{
+				continue;
+			}
+
+			if (propVersion.TryRead(ref reader, options, PropVersion))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new TermVectorsResponse
+		{
+			Found = propFound.Value
+,
+			Id = propId.Value
+,
+			Index = propIndex.Value
+,
+			TermVectors = propTermVectors.Value
+,
+			Took = propTook.Value
+,
+			Version = propVersion.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, TermVectorsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropFound, value.Found);
+		writer.WriteProperty(options, PropId, value.Id);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropTermVectors, value.TermVectors);
+		writer.WriteProperty(options, PropTook, value.Took);
+		writer.WriteProperty(options, PropVersion, value.Version);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(TermVectorsResponseConverter))]
 public sealed partial class TermVectorsResponse : ElasticsearchResponse
 {
-	[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("term_vectors")]
-	[ReadOnlyFieldDictionaryConverter(typeof(Elastic.Clients.Elasticsearch.Serverless.Core.TermVectors.TermVector))]
 	public IReadOnlyDictionary<Elastic.Clients.Elasticsearch.Serverless.Field, Elastic.Clients.Elasticsearch.Serverless.Core.TermVectors.TermVector>? TermVectors { get; init; }
-	[JsonInclude, JsonPropertyName("took")]
 	public long Took { get; init; }
-	[JsonInclude, JsonPropertyName("_version")]
 	public long Version { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/TermsEnumResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/TermsEnumResponse.g.cs
index 622d36f7f49..7d9c20d6a44 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/TermsEnumResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/TermsEnumResponse.g.cs
@@ -18,20 +18,74 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless;
 
+internal sealed partial class TermsEnumResponseConverter : System.Text.Json.Serialization.JsonConverter<TermsEnumResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropComplete = System.Text.Json.JsonEncodedText.Encode("complete");
+	private static readonly System.Text.Json.JsonEncodedText PropShards = System.Text.Json.JsonEncodedText.Encode("_shards");
+	private static readonly System.Text.Json.JsonEncodedText PropTerms = System.Text.Json.JsonEncodedText.Encode("terms");
+
+	public override TermsEnumResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propComplete = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.ShardStatistics> propShards = default;
+		LocalJsonProperty<IReadOnlyCollection<string>> propTerms = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propComplete.TryRead(ref reader, options, PropComplete))
+			{
+				continue;
+			}
+
+			if (propShards.TryRead(ref reader, options, PropShards))
+			{
+				continue;
+			}
+
+			if (propTerms.TryRead(ref reader, options, PropTerms))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new TermsEnumResponse
+		{
+			Complete = propComplete.Value
+,
+			Shards = propShards.Value
+,
+			Terms = propTerms.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, TermsEnumResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropComplete, value.Complete);
+		writer.WriteProperty(options, PropShards, value.Shards);
+		writer.WriteProperty(options, PropTerms, value.Terms);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(TermsEnumResponseConverter))]
 public sealed partial class TermsEnumResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("complete")]
 	public bool Complete { get; init; }
-	[JsonInclude, JsonPropertyName("_shards")]
 	public Elastic.Clients.Elasticsearch.Serverless.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.Serverless/_Generated/Api/TextStructure/TestGrokPatternResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/TextStructure/TestGrokPatternResponse.g.cs
index 6eafe234525..6d904c196cb 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/TextStructure/TestGrokPatternResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/TextStructure/TestGrokPatternResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.TextStructure;
 
+internal sealed partial class TestGrokPatternResponseConverter : System.Text.Json.Serialization.JsonConverter<TestGrokPatternResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropMatches = System.Text.Json.JsonEncodedText.Encode("matches");
+
+	public override TestGrokPatternResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.TextStructure.MatchedText>> propMatches = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propMatches.TryRead(ref reader, options, PropMatches))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new TestGrokPatternResponse
+		{
+			Matches = propMatches.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, TestGrokPatternResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropMatches, value.Matches);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(TestGrokPatternResponseConverter))]
 public sealed partial class TestGrokPatternResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("matches")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.TextStructure.MatchedText> Matches { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/TransformManagement/DeleteTransformResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/TransformManagement/DeleteTransformResponse.g.cs
index b39ea167e98..dcef9580976 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/TransformManagement/DeleteTransformResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/TransformManagement/DeleteTransformResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.TransformManagement;
 
+internal sealed partial class DeleteTransformResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteTransformResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override DeleteTransformResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteTransformResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteTransformResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteTransformResponseConverter))]
 public sealed partial class DeleteTransformResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class DeleteTransformResponse : ElasticsearchResponse
 	/// 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.Serverless/_Generated/Api/TransformManagement/GetTransformResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/TransformManagement/GetTransformResponse.g.cs
index 44e4b3afaa7..129510ee75d 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/TransformManagement/GetTransformResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/TransformManagement/GetTransformResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.TransformManagement;
 
+internal sealed partial class GetTransformResponseConverter : System.Text.Json.Serialization.JsonConverter<GetTransformResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCount = System.Text.Json.JsonEncodedText.Encode("count");
+	private static readonly System.Text.Json.JsonEncodedText PropTransforms = System.Text.Json.JsonEncodedText.Encode("transforms");
+
+	public override GetTransformResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<long> propCount = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.TransformManagement.TransformSummary>> propTransforms = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCount.TryRead(ref reader, options, PropCount))
+			{
+				continue;
+			}
+
+			if (propTransforms.TryRead(ref reader, options, PropTransforms))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetTransformResponse
+		{
+			Count = propCount.Value
+,
+			Transforms = propTransforms.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetTransformResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCount, value.Count);
+		writer.WriteProperty(options, PropTransforms, value.Transforms);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetTransformResponseConverter))]
 public sealed partial class GetTransformResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("count")]
 	public long Count { get; init; }
-	[JsonInclude, JsonPropertyName("transforms")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.TransformManagement.TransformSummary> Transforms { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/TransformManagement/GetTransformStatsResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/TransformManagement/GetTransformStatsResponse.g.cs
index ad4f91559ef..886e5cd5657 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/TransformManagement/GetTransformStatsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/TransformManagement/GetTransformStatsResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.TransformManagement;
 
+internal sealed partial class GetTransformStatsResponseConverter : System.Text.Json.Serialization.JsonConverter<GetTransformStatsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCount = System.Text.Json.JsonEncodedText.Encode("count");
+	private static readonly System.Text.Json.JsonEncodedText PropTransforms = System.Text.Json.JsonEncodedText.Encode("transforms");
+
+	public override GetTransformStatsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<long> propCount = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.TransformManagement.TransformStats>> propTransforms = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCount.TryRead(ref reader, options, PropCount))
+			{
+				continue;
+			}
+
+			if (propTransforms.TryRead(ref reader, options, PropTransforms))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetTransformStatsResponse
+		{
+			Count = propCount.Value
+,
+			Transforms = propTransforms.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetTransformStatsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCount, value.Count);
+		writer.WriteProperty(options, PropTransforms, value.Transforms);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetTransformStatsResponseConverter))]
 public sealed partial class GetTransformStatsResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("count")]
 	public long Count { get; init; }
-	[JsonInclude, JsonPropertyName("transforms")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.TransformManagement.TransformStats> Transforms { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/TransformManagement/PreviewTransformResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/TransformManagement/PreviewTransformResponse.g.cs
index 83b1131f2bf..1bf5da7859e 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/TransformManagement/PreviewTransformResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/TransformManagement/PreviewTransformResponse.g.cs
@@ -18,18 +18,80 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.TransformManagement;
 
+internal sealed partial class PreviewTransformResponseConverter<TTransform> : System.Text.Json.Serialization.JsonConverter<PreviewTransformResponse<TTransform>>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropGeneratedDestIndex = System.Text.Json.JsonEncodedText.Encode("generated_dest_index");
+	private static readonly System.Text.Json.JsonEncodedText PropPreview = System.Text.Json.JsonEncodedText.Encode("preview");
+
+	public override PreviewTransformResponse<TTransform> Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.IndexState> propGeneratedDestIndex = default;
+		LocalJsonProperty<IReadOnlyCollection<TTransform>> propPreview = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propGeneratedDestIndex.TryRead(ref reader, options, PropGeneratedDestIndex))
+			{
+				continue;
+			}
+
+			if (propPreview.TryRead(ref reader, options, PropPreview))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PreviewTransformResponse<TTransform>
+		{
+			GeneratedDestIndex = propGeneratedDestIndex.Value
+,
+			Preview = propPreview.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PreviewTransformResponse<TTransform> value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropGeneratedDestIndex, value.GeneratedDestIndex);
+		writer.WriteProperty(options, PropPreview, value.Preview);
+		writer.WriteEndObject();
+	}
+}
+
+internal sealed partial class PreviewTransformResponseConverterFactory : System.Text.Json.Serialization.JsonConverterFactory
+{
+	public override bool CanConvert(System.Type typeToConvert)
+	{
+		return typeToConvert.IsGenericType && typeToConvert.GetGenericTypeDefinition() == typeof(PreviewTransformResponse<>);
+	}
+
+	public override System.Text.Json.Serialization.JsonConverter CreateConverter(System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		var args = typeToConvert.GetGenericArguments();
+#pragma warning disable IL3050
+		var converter = (System.Text.Json.Serialization.JsonConverter)System.Activator.CreateInstance(typeof(PreviewTransformResponseConverter<>).MakeGenericType(args[0]), System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public, binder: null, args: null, culture: null)!;
+#pragma warning restore IL3050
+		return converter;
+	}
+}
+
+[JsonConverter(typeof(PreviewTransformResponseConverterFactory))]
 public sealed partial class PreviewTransformResponse<TTransform> : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("generated_dest_index")]
 	public Elastic.Clients.Elasticsearch.Serverless.IndexManagement.IndexState GeneratedDestIndex { get; init; }
-	[JsonInclude, JsonPropertyName("preview")]
 	public IReadOnlyCollection<TTransform> Preview { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/TransformManagement/PutTransformResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/TransformManagement/PutTransformResponse.g.cs
index 37567c05c87..eaf411d65d3 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/TransformManagement/PutTransformResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/TransformManagement/PutTransformResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.TransformManagement;
 
+internal sealed partial class PutTransformResponseConverter : System.Text.Json.Serialization.JsonConverter<PutTransformResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override PutTransformResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutTransformResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutTransformResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PutTransformResponseConverter))]
 public sealed partial class PutTransformResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class PutTransformResponse : ElasticsearchResponse
 	/// 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.Serverless/_Generated/Api/TransformManagement/ResetTransformResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/TransformManagement/ResetTransformResponse.g.cs
index d97e012a67e..cfdd2d4687f 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/TransformManagement/ResetTransformResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/TransformManagement/ResetTransformResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.TransformManagement;
 
+internal sealed partial class ResetTransformResponseConverter : System.Text.Json.Serialization.JsonConverter<ResetTransformResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override ResetTransformResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ResetTransformResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ResetTransformResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ResetTransformResponseConverter))]
 public sealed partial class ResetTransformResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class ResetTransformResponse : ElasticsearchResponse
 	/// 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.Serverless/_Generated/Api/TransformManagement/ScheduleNowTransformResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/TransformManagement/ScheduleNowTransformResponse.g.cs
index c9a9273b214..175acdd0c9b 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/TransformManagement/ScheduleNowTransformResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/TransformManagement/ScheduleNowTransformResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.TransformManagement;
 
+internal sealed partial class ScheduleNowTransformResponseConverter : System.Text.Json.Serialization.JsonConverter<ScheduleNowTransformResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override ScheduleNowTransformResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ScheduleNowTransformResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ScheduleNowTransformResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ScheduleNowTransformResponseConverter))]
 public sealed partial class ScheduleNowTransformResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class ScheduleNowTransformResponse : ElasticsearchResponse
 	/// 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.Serverless/_Generated/Api/TransformManagement/StartTransformResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/TransformManagement/StartTransformResponse.g.cs
index 595a38b4095..784445cfea7 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/TransformManagement/StartTransformResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/TransformManagement/StartTransformResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.TransformManagement;
 
+internal sealed partial class StartTransformResponseConverter : System.Text.Json.Serialization.JsonConverter<StartTransformResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override StartTransformResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new StartTransformResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, StartTransformResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(StartTransformResponseConverter))]
 public sealed partial class StartTransformResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class StartTransformResponse : ElasticsearchResponse
 	/// 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.Serverless/_Generated/Api/TransformManagement/StopTransformResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/TransformManagement/StopTransformResponse.g.cs
index 985c2bcd51a..122bc85df62 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/TransformManagement/StopTransformResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/TransformManagement/StopTransformResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.TransformManagement;
 
+internal sealed partial class StopTransformResponseConverter : System.Text.Json.Serialization.JsonConverter<StopTransformResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override StopTransformResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new StopTransformResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, StopTransformResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(StopTransformResponseConverter))]
 public sealed partial class StopTransformResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class StopTransformResponse : ElasticsearchResponse
 	/// 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.Serverless/_Generated/Api/TransformManagement/UpdateTransformResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/TransformManagement/UpdateTransformResponse.g.cs
index 3d804e206b9..17e8a9de046 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/TransformManagement/UpdateTransformResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/TransformManagement/UpdateTransformResponse.g.cs
@@ -18,42 +18,195 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.TransformManagement;
 
+internal sealed partial class UpdateTransformResponseConverter : System.Text.Json.Serialization.JsonConverter<UpdateTransformResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAuthorization = System.Text.Json.JsonEncodedText.Encode("authorization");
+	private static readonly System.Text.Json.JsonEncodedText PropCreateTime = System.Text.Json.JsonEncodedText.Encode("create_time");
+	private static readonly System.Text.Json.JsonEncodedText PropDescription = System.Text.Json.JsonEncodedText.Encode("description");
+	private static readonly System.Text.Json.JsonEncodedText PropDest = System.Text.Json.JsonEncodedText.Encode("dest");
+	private static readonly System.Text.Json.JsonEncodedText PropFrequency = System.Text.Json.JsonEncodedText.Encode("frequency");
+	private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("id");
+	private static readonly System.Text.Json.JsonEncodedText PropLatest = System.Text.Json.JsonEncodedText.Encode("latest");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("_meta");
+	private static readonly System.Text.Json.JsonEncodedText PropPivot = System.Text.Json.JsonEncodedText.Encode("pivot");
+	private static readonly System.Text.Json.JsonEncodedText PropRetentionPolicy = System.Text.Json.JsonEncodedText.Encode("retention_policy");
+	private static readonly System.Text.Json.JsonEncodedText PropSettings = System.Text.Json.JsonEncodedText.Encode("settings");
+	private static readonly System.Text.Json.JsonEncodedText PropSource = System.Text.Json.JsonEncodedText.Encode("source");
+	private static readonly System.Text.Json.JsonEncodedText PropSync = System.Text.Json.JsonEncodedText.Encode("sync");
+	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("version");
+
+	public override UpdateTransformResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.TransformAuthorization?> propAuthorization = default;
+		LocalJsonProperty<long> propCreateTime = default;
+		LocalJsonProperty<string> propDescription = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Core.Reindex.Destination> propDest = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Duration?> propFrequency = default;
+		LocalJsonProperty<string> propId = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.TransformManagement.Latest?> propLatest = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, object>?> propMeta = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.TransformManagement.Pivot?> propPivot = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.TransformManagement.RetentionPolicy?> propRetentionPolicy = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.TransformManagement.Settings> propSettings = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Core.Reindex.Source> propSource = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.TransformManagement.Sync?> propSync = default;
+		LocalJsonProperty<string> propVersion = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAuthorization.TryRead(ref reader, options, PropAuthorization))
+			{
+				continue;
+			}
+
+			if (propCreateTime.TryRead(ref reader, options, PropCreateTime))
+			{
+				continue;
+			}
+
+			if (propDescription.TryRead(ref reader, options, PropDescription))
+			{
+				continue;
+			}
+
+			if (propDest.TryRead(ref reader, options, PropDest))
+			{
+				continue;
+			}
+
+			if (propFrequency.TryRead(ref reader, options, PropFrequency))
+			{
+				continue;
+			}
+
+			if (propId.TryRead(ref reader, options, PropId))
+			{
+				continue;
+			}
+
+			if (propLatest.TryRead(ref reader, options, PropLatest))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propPivot.TryRead(ref reader, options, PropPivot))
+			{
+				continue;
+			}
+
+			if (propRetentionPolicy.TryRead(ref reader, options, PropRetentionPolicy))
+			{
+				continue;
+			}
+
+			if (propSettings.TryRead(ref reader, options, PropSettings))
+			{
+				continue;
+			}
+
+			if (propSource.TryRead(ref reader, options, PropSource))
+			{
+				continue;
+			}
+
+			if (propSync.TryRead(ref reader, options, PropSync))
+			{
+				continue;
+			}
+
+			if (propVersion.TryRead(ref reader, options, PropVersion))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new UpdateTransformResponse
+		{
+			Authorization = propAuthorization.Value
+,
+			CreateTime = propCreateTime.Value
+,
+			Description = propDescription.Value
+,
+			Dest = propDest.Value
+,
+			Frequency = propFrequency.Value
+,
+			Id = propId.Value
+,
+			Latest = propLatest.Value
+,
+			Meta = propMeta.Value
+,
+			Pivot = propPivot.Value
+,
+			RetentionPolicy = propRetentionPolicy.Value
+,
+			Settings = propSettings.Value
+,
+			Source = propSource.Value
+,
+			Sync = propSync.Value
+,
+			Version = propVersion.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, UpdateTransformResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAuthorization, value.Authorization);
+		writer.WriteProperty(options, PropCreateTime, value.CreateTime);
+		writer.WriteProperty(options, PropDescription, value.Description);
+		writer.WriteProperty(options, PropDest, value.Dest);
+		writer.WriteProperty(options, PropFrequency, value.Frequency);
+		writer.WriteProperty(options, PropId, value.Id);
+		writer.WriteProperty(options, PropLatest, value.Latest);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropPivot, value.Pivot);
+		writer.WriteProperty(options, PropRetentionPolicy, value.RetentionPolicy);
+		writer.WriteProperty(options, PropSettings, value.Settings);
+		writer.WriteProperty(options, PropSource, value.Source);
+		writer.WriteProperty(options, PropSync, value.Sync);
+		writer.WriteProperty(options, PropVersion, value.Version);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(UpdateTransformResponseConverter))]
 public sealed partial class UpdateTransformResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("authorization")]
 	public Elastic.Clients.Elasticsearch.Serverless.MachineLearning.TransformAuthorization? Authorization { get; init; }
-	[JsonInclude, JsonPropertyName("create_time")]
 	public long CreateTime { get; init; }
-	[JsonInclude, JsonPropertyName("description")]
 	public string Description { get; init; }
-	[JsonInclude, JsonPropertyName("dest")]
 	public Elastic.Clients.Elasticsearch.Serverless.Core.Reindex.Destination Dest { get; init; }
-	[JsonInclude, JsonPropertyName("frequency")]
 	public Elastic.Clients.Elasticsearch.Serverless.Duration? Frequency { get; init; }
-	[JsonInclude, JsonPropertyName("id")]
 	public string Id { get; init; }
-	[JsonInclude, JsonPropertyName("latest")]
 	public Elastic.Clients.Elasticsearch.Serverless.TransformManagement.Latest? Latest { get; init; }
-	[JsonInclude, JsonPropertyName("_meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
-	[JsonInclude, JsonPropertyName("pivot")]
 	public Elastic.Clients.Elasticsearch.Serverless.TransformManagement.Pivot? Pivot { get; init; }
-	[JsonInclude, JsonPropertyName("retention_policy")]
 	public Elastic.Clients.Elasticsearch.Serverless.TransformManagement.RetentionPolicy? RetentionPolicy { get; init; }
-	[JsonInclude, JsonPropertyName("settings")]
 	public Elastic.Clients.Elasticsearch.Serverless.TransformManagement.Settings Settings { get; init; }
-	[JsonInclude, JsonPropertyName("source")]
 	public Elastic.Clients.Elasticsearch.Serverless.Core.Reindex.Source Source { get; init; }
-	[JsonInclude, JsonPropertyName("sync")]
 	public Elastic.Clients.Elasticsearch.Serverless.TransformManagement.Sync? Sync { get; init; }
-	[JsonInclude, JsonPropertyName("version")]
 	public string Version { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/TransformManagement/UpgradeTransformsResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/TransformManagement/UpgradeTransformsResponse.g.cs
index 0d286e7ad75..06eae291da0 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/TransformManagement/UpgradeTransformsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/TransformManagement/UpgradeTransformsResponse.g.cs
@@ -18,14 +18,71 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.TransformManagement;
 
+internal sealed partial class UpgradeTransformsResponseConverter : System.Text.Json.Serialization.JsonConverter<UpgradeTransformsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropNeedsUpdate = System.Text.Json.JsonEncodedText.Encode("needs_update");
+	private static readonly System.Text.Json.JsonEncodedText PropNoAction = System.Text.Json.JsonEncodedText.Encode("no_action");
+	private static readonly System.Text.Json.JsonEncodedText PropUpdated = System.Text.Json.JsonEncodedText.Encode("updated");
+
+	public override UpgradeTransformsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<int> propNeedsUpdate = default;
+		LocalJsonProperty<int> propNoAction = default;
+		LocalJsonProperty<int> propUpdated = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propNeedsUpdate.TryRead(ref reader, options, PropNeedsUpdate))
+			{
+				continue;
+			}
+
+			if (propNoAction.TryRead(ref reader, options, PropNoAction))
+			{
+				continue;
+			}
+
+			if (propUpdated.TryRead(ref reader, options, PropUpdated))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new UpgradeTransformsResponse
+		{
+			NeedsUpdate = propNeedsUpdate.Value
+,
+			NoAction = propNoAction.Value
+,
+			Updated = propUpdated.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, UpgradeTransformsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropNeedsUpdate, value.NeedsUpdate);
+		writer.WriteProperty(options, PropNoAction, value.NoAction);
+		writer.WriteProperty(options, PropUpdated, value.Updated);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(UpgradeTransformsResponseConverter))]
 public sealed partial class UpgradeTransformsResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,7 +90,6 @@ public sealed partial class UpgradeTransformsResponse : ElasticsearchResponse
 	/// The number of transforms that need to be upgraded.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("needs_update")]
 	public int NeedsUpdate { get; init; }
 
 	/// <summary>
@@ -41,7 +97,6 @@ public sealed partial class UpgradeTransformsResponse : ElasticsearchResponse
 	/// The number of transforms that don’t require upgrading.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("no_action")]
 	public int NoAction { get; init; }
 
 	/// <summary>
@@ -49,6 +104,5 @@ public sealed partial class UpgradeTransformsResponse : ElasticsearchResponse
 	/// The number of transforms that have been upgraded.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("updated")]
 	public int Updated { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/UpdateByQueryResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/UpdateByQueryResponse.g.cs
index e5772ccd603..51e790dacba 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/UpdateByQueryResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/UpdateByQueryResponse.g.cs
@@ -18,46 +18,217 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless;
 
+internal sealed partial class UpdateByQueryResponseConverter : System.Text.Json.Serialization.JsonConverter<UpdateByQueryResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropBatches = System.Text.Json.JsonEncodedText.Encode("batches");
+	private static readonly System.Text.Json.JsonEncodedText PropDeleted = System.Text.Json.JsonEncodedText.Encode("deleted");
+	private static readonly System.Text.Json.JsonEncodedText PropFailures = System.Text.Json.JsonEncodedText.Encode("failures");
+	private static readonly System.Text.Json.JsonEncodedText PropNoops = System.Text.Json.JsonEncodedText.Encode("noops");
+	private static readonly System.Text.Json.JsonEncodedText PropRequestsPerSecond = System.Text.Json.JsonEncodedText.Encode("requests_per_second");
+	private static readonly System.Text.Json.JsonEncodedText PropRetries = System.Text.Json.JsonEncodedText.Encode("retries");
+	private static readonly System.Text.Json.JsonEncodedText PropTask = System.Text.Json.JsonEncodedText.Encode("task");
+	private static readonly System.Text.Json.JsonEncodedText PropThrottled = System.Text.Json.JsonEncodedText.Encode("throttled");
+	private static readonly System.Text.Json.JsonEncodedText PropThrottledMillis = System.Text.Json.JsonEncodedText.Encode("throttled_millis");
+	private static readonly System.Text.Json.JsonEncodedText PropThrottledUntil = System.Text.Json.JsonEncodedText.Encode("throttled_until");
+	private static readonly System.Text.Json.JsonEncodedText PropThrottledUntilMillis = System.Text.Json.JsonEncodedText.Encode("throttled_until_millis");
+	private static readonly System.Text.Json.JsonEncodedText PropTimedOut = System.Text.Json.JsonEncodedText.Encode("timed_out");
+	private static readonly System.Text.Json.JsonEncodedText PropTook = System.Text.Json.JsonEncodedText.Encode("took");
+	private static readonly System.Text.Json.JsonEncodedText PropTotal = System.Text.Json.JsonEncodedText.Encode("total");
+	private static readonly System.Text.Json.JsonEncodedText PropUpdated = System.Text.Json.JsonEncodedText.Encode("updated");
+	private static readonly System.Text.Json.JsonEncodedText PropVersionConflicts = System.Text.Json.JsonEncodedText.Encode("version_conflicts");
+
+	public override UpdateByQueryResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<long?> propBatches = default;
+		LocalJsonProperty<long?> propDeleted = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.BulkIndexByScrollFailure>?> propFailures = default;
+		LocalJsonProperty<long?> propNoops = default;
+		LocalJsonProperty<float?> propRequestsPerSecond = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Retries?> propRetries = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.TaskId?> propTask = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Duration?> propThrottled = default;
+		LocalJsonProperty<long?> propThrottledMillis = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Duration?> propThrottledUntil = default;
+		LocalJsonProperty<long?> propThrottledUntilMillis = default;
+		LocalJsonProperty<bool?> propTimedOut = default;
+		LocalJsonProperty<long?> propTook = default;
+		LocalJsonProperty<long?> propTotal = default;
+		LocalJsonProperty<long?> propUpdated = default;
+		LocalJsonProperty<long?> propVersionConflicts = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBatches.TryRead(ref reader, options, PropBatches))
+			{
+				continue;
+			}
+
+			if (propDeleted.TryRead(ref reader, options, PropDeleted))
+			{
+				continue;
+			}
+
+			if (propFailures.TryRead(ref reader, options, PropFailures))
+			{
+				continue;
+			}
+
+			if (propNoops.TryRead(ref reader, options, PropNoops))
+			{
+				continue;
+			}
+
+			if (propRequestsPerSecond.TryRead(ref reader, options, PropRequestsPerSecond))
+			{
+				continue;
+			}
+
+			if (propRetries.TryRead(ref reader, options, PropRetries))
+			{
+				continue;
+			}
+
+			if (propTask.TryRead(ref reader, options, PropTask))
+			{
+				continue;
+			}
+
+			if (propThrottled.TryRead(ref reader, options, PropThrottled))
+			{
+				continue;
+			}
+
+			if (propThrottledMillis.TryRead(ref reader, options, PropThrottledMillis))
+			{
+				continue;
+			}
+
+			if (propThrottledUntil.TryRead(ref reader, options, PropThrottledUntil))
+			{
+				continue;
+			}
+
+			if (propThrottledUntilMillis.TryRead(ref reader, options, PropThrottledUntilMillis))
+			{
+				continue;
+			}
+
+			if (propTimedOut.TryRead(ref reader, options, PropTimedOut))
+			{
+				continue;
+			}
+
+			if (propTook.TryRead(ref reader, options, PropTook))
+			{
+				continue;
+			}
+
+			if (propTotal.TryRead(ref reader, options, PropTotal))
+			{
+				continue;
+			}
+
+			if (propUpdated.TryRead(ref reader, options, PropUpdated))
+			{
+				continue;
+			}
+
+			if (propVersionConflicts.TryRead(ref reader, options, PropVersionConflicts))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new UpdateByQueryResponse
+		{
+			Batches = propBatches.Value
+,
+			Deleted = propDeleted.Value
+,
+			Failures = propFailures.Value
+,
+			Noops = propNoops.Value
+,
+			RequestsPerSecond = propRequestsPerSecond.Value
+,
+			Retries = propRetries.Value
+,
+			Task = propTask.Value
+,
+			Throttled = propThrottled.Value
+,
+			ThrottledMillis = propThrottledMillis.Value
+,
+			ThrottledUntil = propThrottledUntil.Value
+,
+			ThrottledUntilMillis = propThrottledUntilMillis.Value
+,
+			TimedOut = propTimedOut.Value
+,
+			Took = propTook.Value
+,
+			Total = propTotal.Value
+,
+			Updated = propUpdated.Value
+,
+			VersionConflicts = propVersionConflicts.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, UpdateByQueryResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBatches, value.Batches);
+		writer.WriteProperty(options, PropDeleted, value.Deleted);
+		writer.WriteProperty(options, PropFailures, value.Failures);
+		writer.WriteProperty(options, PropNoops, value.Noops);
+		writer.WriteProperty(options, PropRequestsPerSecond, value.RequestsPerSecond);
+		writer.WriteProperty(options, PropRetries, value.Retries);
+		writer.WriteProperty(options, PropTask, value.Task);
+		writer.WriteProperty(options, PropThrottled, value.Throttled);
+		writer.WriteProperty(options, PropThrottledMillis, value.ThrottledMillis);
+		writer.WriteProperty(options, PropThrottledUntil, value.ThrottledUntil);
+		writer.WriteProperty(options, PropThrottledUntilMillis, value.ThrottledUntilMillis);
+		writer.WriteProperty(options, PropTimedOut, value.TimedOut);
+		writer.WriteProperty(options, PropTook, value.Took);
+		writer.WriteProperty(options, PropTotal, value.Total);
+		writer.WriteProperty(options, PropUpdated, value.Updated);
+		writer.WriteProperty(options, PropVersionConflicts, value.VersionConflicts);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(UpdateByQueryResponseConverter))]
 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.Serverless.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.Serverless.Retries? Retries { get; init; }
-	[JsonInclude, JsonPropertyName("task")]
 	public Elastic.Clients.Elasticsearch.Serverless.TaskId? Task { get; init; }
-	[JsonInclude, JsonPropertyName("throttled")]
 	public Elastic.Clients.Elasticsearch.Serverless.Duration? Throttled { get; init; }
-	[JsonInclude, JsonPropertyName("throttled_millis")]
 	public long? ThrottledMillis { get; init; }
-	[JsonInclude, JsonPropertyName("throttled_until")]
 	public Elastic.Clients.Elasticsearch.Serverless.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.Serverless/_Generated/Api/UpdateByQueryRethrottleResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/UpdateByQueryRethrottleResponse.g.cs
index 14c964850d0..2746c2d7499 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/UpdateByQueryRethrottleResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/UpdateByQueryRethrottleResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless;
 
+internal sealed partial class UpdateByQueryRethrottleResponseConverter : System.Text.Json.Serialization.JsonConverter<UpdateByQueryRethrottleResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropNodes = System.Text.Json.JsonEncodedText.Encode("nodes");
+
+	public override UpdateByQueryRethrottleResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Core.UpdateByQueryRethrottle.UpdateByQueryRethrottleNode>> propNodes = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propNodes.TryRead(ref reader, options, PropNodes))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new UpdateByQueryRethrottleResponse
+		{
+			Nodes = propNodes.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, UpdateByQueryRethrottleResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropNodes, value.Nodes);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(UpdateByQueryRethrottleResponseConverter))]
 public sealed partial class UpdateByQueryRethrottleResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("nodes")]
 	public IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Core.UpdateByQueryRethrottle.UpdateByQueryRethrottleNode> Nodes { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/UpdateRequest.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/UpdateRequest.g.cs
index b1c84b42bce..5addf606009 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/UpdateRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/UpdateRequest.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Requests;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport;
@@ -116,12 +117,123 @@ public sealed partial class UpdateRequestParameters : RequestParameters
 	public Elastic.Clients.Elasticsearch.Serverless.WaitForActiveShards? WaitForActiveShards { get => Q<Elastic.Clients.Elasticsearch.Serverless.WaitForActiveShards?>("wait_for_active_shards"); set => Q("wait_for_active_shards", value); }
 }
 
+internal sealed partial class UpdateRequestConverter<TDocument, TPartialDocument> : System.Text.Json.Serialization.JsonConverter<UpdateRequest<TDocument, TPartialDocument>>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropDetectNoop = System.Text.Json.JsonEncodedText.Encode("detect_noop");
+	private static readonly System.Text.Json.JsonEncodedText PropDoc = System.Text.Json.JsonEncodedText.Encode("doc");
+	private static readonly System.Text.Json.JsonEncodedText PropDocAsUpsert = System.Text.Json.JsonEncodedText.Encode("doc_as_upsert");
+	private static readonly System.Text.Json.JsonEncodedText PropScript = System.Text.Json.JsonEncodedText.Encode("script");
+	private static readonly System.Text.Json.JsonEncodedText PropScriptedUpsert = System.Text.Json.JsonEncodedText.Encode("scripted_upsert");
+	private static readonly System.Text.Json.JsonEncodedText PropSource = System.Text.Json.JsonEncodedText.Encode("_source");
+	private static readonly System.Text.Json.JsonEncodedText PropUpsert = System.Text.Json.JsonEncodedText.Encode("upsert");
+
+	public override UpdateRequest<TDocument, TPartialDocument> Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool?> propDetectNoop = default;
+		LocalJsonProperty<TPartialDocument?> propDoc = default;
+		LocalJsonProperty<bool?> propDocAsUpsert = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Script?> propScript = default;
+		LocalJsonProperty<bool?> propScriptedUpsert = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Core.Search.SourceConfig?> propSource = default;
+		LocalJsonProperty<TDocument?> propUpsert = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propDetectNoop.TryRead(ref reader, options, PropDetectNoop))
+			{
+				continue;
+			}
+
+			if (propDoc.TryRead(ref reader, options, PropDoc, typeof(SourceMarker<TPartialDocument?>)))
+			{
+				continue;
+			}
+
+			if (propDocAsUpsert.TryRead(ref reader, options, PropDocAsUpsert))
+			{
+				continue;
+			}
+
+			if (propScript.TryRead(ref reader, options, PropScript))
+			{
+				continue;
+			}
+
+			if (propScriptedUpsert.TryRead(ref reader, options, PropScriptedUpsert))
+			{
+				continue;
+			}
+
+			if (propSource.TryRead(ref reader, options, PropSource))
+			{
+				continue;
+			}
+
+			if (propUpsert.TryRead(ref reader, options, PropUpsert, typeof(SourceMarker<TDocument?>)))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new UpdateRequest<TDocument, TPartialDocument>
+		{
+			DetectNoop = propDetectNoop.Value
+	,
+			Doc = propDoc.Value
+	,
+			DocAsUpsert = propDocAsUpsert.Value
+	,
+			Script = propScript.Value
+	,
+			ScriptedUpsert = propScriptedUpsert.Value
+	,
+			Source = propSource.Value
+	,
+			Upsert = propUpsert.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, UpdateRequest<TDocument, TPartialDocument> value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDetectNoop, value.DetectNoop);
+		writer.WriteProperty(options, PropDoc, value.Doc, typeof(SourceMarker<TPartialDocument?>));
+		writer.WriteProperty(options, PropDocAsUpsert, value.DocAsUpsert);
+		writer.WriteProperty(options, PropScript, value.Script);
+		writer.WriteProperty(options, PropScriptedUpsert, value.ScriptedUpsert);
+		writer.WriteProperty(options, PropSource, value.Source);
+		writer.WriteProperty(options, PropUpsert, value.Upsert, typeof(SourceMarker<TDocument?>));
+		writer.WriteEndObject();
+	}
+}
+
+internal sealed partial class UpdateRequestConverterFactory : System.Text.Json.Serialization.JsonConverterFactory
+{
+	public override bool CanConvert(System.Type typeToConvert)
+	{
+		return typeToConvert.IsGenericType && typeToConvert.GetGenericTypeDefinition() == typeof(UpdateRequest<,>);
+	}
+
+	public override System.Text.Json.Serialization.JsonConverter CreateConverter(System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		var args = typeToConvert.GetGenericArguments();
+#pragma warning disable IL3050
+		var converter = (System.Text.Json.Serialization.JsonConverter)System.Activator.CreateInstance(typeof(UpdateRequestConverter<,>).MakeGenericType(args[0], args[1]), System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public, binder: null, args: null, culture: null)!;
+#pragma warning restore IL3050
+		return converter;
+	}
+}
+
 /// <summary>
 /// <para>
 /// Update a document.
 /// Updates a document by running a script or passing a partial document.
 /// </para>
 /// </summary>
+[JsonConverter(typeof(UpdateRequestConverterFactory))]
 public sealed partial class UpdateRequest<TDocument, TPartialDocument> : PlainRequest<UpdateRequestParameters>
 {
 	public UpdateRequest(Elastic.Clients.Elasticsearch.Serverless.IndexName index, Elastic.Clients.Elasticsearch.Serverless.Id id) : base(r => r.Required("index", index).Required("id", id))
@@ -141,7 +253,6 @@ public UpdateRequest(Elastic.Clients.Elasticsearch.Serverless.IndexName index, E
 	/// 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>
@@ -149,7 +260,6 @@ public UpdateRequest(Elastic.Clients.Elasticsearch.Serverless.IndexName index, E
 	/// 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>
@@ -157,7 +267,6 @@ public UpdateRequest(Elastic.Clients.Elasticsearch.Serverless.IndexName index, E
 	/// The script language.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public string? Lang { get => Q<string?>("lang"); set => Q("lang", value); }
 
 	/// <summary>
@@ -167,7 +276,6 @@ public UpdateRequest(Elastic.Clients.Elasticsearch.Serverless.IndexName index, E
 	/// visible to search, if 'false' do nothing with refreshes.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Serverless.Refresh? Refresh { get => Q<Elastic.Clients.Elasticsearch.Serverless.Refresh?>("refresh"); set => Q("refresh", value); }
 
 	/// <summary>
@@ -175,7 +283,6 @@ public UpdateRequest(Elastic.Clients.Elasticsearch.Serverless.IndexName index, E
 	/// 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>
@@ -183,7 +290,6 @@ public UpdateRequest(Elastic.Clients.Elasticsearch.Serverless.IndexName index, E
 	/// 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>
@@ -191,7 +297,6 @@ public UpdateRequest(Elastic.Clients.Elasticsearch.Serverless.IndexName index, E
 	/// Custom value used to route operations to a specific shard.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Serverless.Routing? Routing { get => Q<Elastic.Clients.Elasticsearch.Serverless.Routing?>("routing"); set => Q("routing", value); }
 
 	/// <summary>
@@ -199,7 +304,6 @@ public UpdateRequest(Elastic.Clients.Elasticsearch.Serverless.IndexName index, E
 	/// Specify the source fields you want to exclude.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Serverless.Fields? SourceExcludes { get => Q<Elastic.Clients.Elasticsearch.Serverless.Fields?>("_source_excludes"); set => Q("_source_excludes", value); }
 
 	/// <summary>
@@ -207,7 +311,6 @@ public UpdateRequest(Elastic.Clients.Elasticsearch.Serverless.IndexName index, E
 	/// Specify the source fields you want to retrieve.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Serverless.Fields? SourceIncludes { get => Q<Elastic.Clients.Elasticsearch.Serverless.Fields?>("_source_includes"); set => Q("_source_includes", value); }
 
 	/// <summary>
@@ -217,7 +320,6 @@ public UpdateRequest(Elastic.Clients.Elasticsearch.Serverless.IndexName index, E
 	/// The actual wait time could be longer, particularly when multiple waits occur.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Serverless.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Serverless.Duration?>("timeout"); set => Q("timeout", value); }
 
 	/// <summary>
@@ -227,7 +329,6 @@ public UpdateRequest(Elastic.Clients.Elasticsearch.Serverless.IndexName index, E
 	/// (number_of_replicas+1). Defaults to 1 meaning the primary shard.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Serverless.WaitForActiveShards? WaitForActiveShards { get => Q<Elastic.Clients.Elasticsearch.Serverless.WaitForActiveShards?>("wait_for_active_shards"); set => Q("wait_for_active_shards", value); }
 
 	/// <summary>
@@ -236,7 +337,6 @@ public UpdateRequest(Elastic.Clients.Elasticsearch.Serverless.IndexName index, E
 	/// to 'noop' if no change to the document occurred.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("detect_noop")]
 	public bool? DetectNoop { get; set; }
 
 	/// <summary>
@@ -244,8 +344,6 @@ public UpdateRequest(Elastic.Clients.Elasticsearch.Serverless.IndexName index, E
 	/// A partial update to an existing document.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("doc")]
-	[SourceConverter]
 	public TPartialDocument? Doc { get; set; }
 
 	/// <summary>
@@ -253,7 +351,6 @@ public UpdateRequest(Elastic.Clients.Elasticsearch.Serverless.IndexName index, E
 	/// 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>
@@ -261,7 +358,6 @@ public UpdateRequest(Elastic.Clients.Elasticsearch.Serverless.IndexName index, E
 	/// Script to execute to update the document.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("script")]
 	public Elastic.Clients.Elasticsearch.Serverless.Script? Script { get; set; }
 
 	/// <summary>
@@ -269,7 +365,6 @@ public UpdateRequest(Elastic.Clients.Elasticsearch.Serverless.IndexName index, E
 	/// 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>
@@ -278,7 +373,6 @@ public UpdateRequest(Elastic.Clients.Elasticsearch.Serverless.IndexName index, E
 	/// list of the fields you want to retrieve.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("_source")]
 	public Elastic.Clients.Elasticsearch.Serverless.Core.Search.SourceConfig? Source { get; set; }
 
 	/// <summary>
@@ -287,8 +381,6 @@ public UpdateRequest(Elastic.Clients.Elasticsearch.Serverless.IndexName index, E
 	/// new document. If the document exists, the 'script' is executed.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("upsert")]
-	[SourceConverter]
 	public TDocument? Upsert { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/UpdateResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/UpdateResponse.g.cs
index d25c3fdaaf5..e395184203f 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/UpdateResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/UpdateResponse.g.cs
@@ -18,32 +18,157 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless;
 
+internal sealed partial class UpdateResponseConverter<TDocument> : System.Text.Json.Serialization.JsonConverter<UpdateResponse<TDocument>>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropForcedRefresh = System.Text.Json.JsonEncodedText.Encode("forced_refresh");
+	private static readonly System.Text.Json.JsonEncodedText PropGet = System.Text.Json.JsonEncodedText.Encode("get");
+	private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("_id");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("_index");
+	private static readonly System.Text.Json.JsonEncodedText PropPrimaryTerm = System.Text.Json.JsonEncodedText.Encode("_primary_term");
+	private static readonly System.Text.Json.JsonEncodedText PropResult = System.Text.Json.JsonEncodedText.Encode("result");
+	private static readonly System.Text.Json.JsonEncodedText PropSeqNo = System.Text.Json.JsonEncodedText.Encode("_seq_no");
+	private static readonly System.Text.Json.JsonEncodedText PropShards = System.Text.Json.JsonEncodedText.Encode("_shards");
+	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("_version");
+
+	public override UpdateResponse<TDocument> Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool?> propForcedRefresh = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.InlineGet<TDocument>?> propGet = default;
+		LocalJsonProperty<string> propId = default;
+		LocalJsonProperty<string> propIndex = default;
+		LocalJsonProperty<long?> propPrimaryTerm = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Result> propResult = default;
+		LocalJsonProperty<long?> propSeqNo = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.ShardStatistics> propShards = default;
+		LocalJsonProperty<long> propVersion = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propForcedRefresh.TryRead(ref reader, options, PropForcedRefresh))
+			{
+				continue;
+			}
+
+			if (propGet.TryRead(ref reader, options, PropGet))
+			{
+				continue;
+			}
+
+			if (propId.TryRead(ref reader, options, PropId))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propPrimaryTerm.TryRead(ref reader, options, PropPrimaryTerm))
+			{
+				continue;
+			}
+
+			if (propResult.TryRead(ref reader, options, PropResult))
+			{
+				continue;
+			}
+
+			if (propSeqNo.TryRead(ref reader, options, PropSeqNo))
+			{
+				continue;
+			}
+
+			if (propShards.TryRead(ref reader, options, PropShards))
+			{
+				continue;
+			}
+
+			if (propVersion.TryRead(ref reader, options, PropVersion))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new UpdateResponse<TDocument>
+		{
+			ForcedRefresh = propForcedRefresh.Value
+,
+			Get = propGet.Value
+,
+			Id = propId.Value
+,
+			Index = propIndex.Value
+,
+			PrimaryTerm = propPrimaryTerm.Value
+,
+			Result = propResult.Value
+,
+			SeqNo = propSeqNo.Value
+,
+			Shards = propShards.Value
+,
+			Version = propVersion.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, UpdateResponse<TDocument> value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropForcedRefresh, value.ForcedRefresh);
+		writer.WriteProperty(options, PropGet, value.Get);
+		writer.WriteProperty(options, PropId, value.Id);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropPrimaryTerm, value.PrimaryTerm);
+		writer.WriteProperty(options, PropResult, value.Result);
+		writer.WriteProperty(options, PropSeqNo, value.SeqNo);
+		writer.WriteProperty(options, PropShards, value.Shards);
+		writer.WriteProperty(options, PropVersion, value.Version);
+		writer.WriteEndObject();
+	}
+}
+
+internal sealed partial class UpdateResponseConverterFactory : System.Text.Json.Serialization.JsonConverterFactory
+{
+	public override bool CanConvert(System.Type typeToConvert)
+	{
+		return typeToConvert.IsGenericType && typeToConvert.GetGenericTypeDefinition() == typeof(UpdateResponse<>);
+	}
+
+	public override System.Text.Json.Serialization.JsonConverter CreateConverter(System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		var args = typeToConvert.GetGenericArguments();
+#pragma warning disable IL3050
+		var converter = (System.Text.Json.Serialization.JsonConverter)System.Activator.CreateInstance(typeof(UpdateResponseConverter<>).MakeGenericType(args[0]), System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public, binder: null, args: null, culture: null)!;
+#pragma warning restore IL3050
+		return converter;
+	}
+}
+
+[JsonConverter(typeof(UpdateResponseConverterFactory))]
 public sealed partial class UpdateResponse<TDocument> : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("forced_refresh")]
 	public bool? ForcedRefresh { get; init; }
-	[JsonInclude, JsonPropertyName("get")]
 	public Elastic.Clients.Elasticsearch.Serverless.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.Serverless.Result Result { get; init; }
-	[JsonInclude, JsonPropertyName("_seq_no")]
 	public long? SeqNo { get; init; }
-	[JsonInclude, JsonPropertyName("_shards")]
 	public Elastic.Clients.Elasticsearch.Serverless.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.Serverless/_Generated/Api/Xpack/XpackInfoResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Xpack/XpackInfoResponse.g.cs
index a189fb4d492..7496e38e031 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Xpack/XpackInfoResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Xpack/XpackInfoResponse.g.cs
@@ -18,22 +18,85 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Xpack;
 
+internal sealed partial class XpackInfoResponseConverter : System.Text.Json.Serialization.JsonConverter<XpackInfoResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropBuild = System.Text.Json.JsonEncodedText.Encode("build");
+	private static readonly System.Text.Json.JsonEncodedText PropFeatures = System.Text.Json.JsonEncodedText.Encode("features");
+	private static readonly System.Text.Json.JsonEncodedText PropLicense = System.Text.Json.JsonEncodedText.Encode("license");
+	private static readonly System.Text.Json.JsonEncodedText PropTagline = System.Text.Json.JsonEncodedText.Encode("tagline");
+
+	public override XpackInfoResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Xpack.BuildInformation> propBuild = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Xpack.Features> propFeatures = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Xpack.MinimalLicenseInformation> propLicense = default;
+		LocalJsonProperty<string> propTagline = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBuild.TryRead(ref reader, options, PropBuild))
+			{
+				continue;
+			}
+
+			if (propFeatures.TryRead(ref reader, options, PropFeatures))
+			{
+				continue;
+			}
+
+			if (propLicense.TryRead(ref reader, options, PropLicense))
+			{
+				continue;
+			}
+
+			if (propTagline.TryRead(ref reader, options, PropTagline))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new XpackInfoResponse
+		{
+			Build = propBuild.Value
+,
+			Features = propFeatures.Value
+,
+			License = propLicense.Value
+,
+			Tagline = propTagline.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, XpackInfoResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBuild, value.Build);
+		writer.WriteProperty(options, PropFeatures, value.Features);
+		writer.WriteProperty(options, PropLicense, value.License);
+		writer.WriteProperty(options, PropTagline, value.Tagline);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(XpackInfoResponseConverter))]
 public sealed partial class XpackInfoResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("build")]
 	public Elastic.Clients.Elasticsearch.Serverless.Xpack.BuildInformation Build { get; init; }
-	[JsonInclude, JsonPropertyName("features")]
 	public Elastic.Clients.Elasticsearch.Serverless.Xpack.Features Features { get; init; }
-	[JsonInclude, JsonPropertyName("license")]
 	public Elastic.Clients.Elasticsearch.Serverless.Xpack.MinimalLicenseInformation License { get; init; }
-	[JsonInclude, JsonPropertyName("tagline")]
 	public string Tagline { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Xpack/XpackUsageResponse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Xpack/XpackUsageResponse.g.cs
index 37622ed3d43..13761b0f131 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Xpack/XpackUsageResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Xpack/XpackUsageResponse.g.cs
@@ -18,72 +18,360 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Xpack;
 
+internal sealed partial class XpackUsageResponseConverter : System.Text.Json.Serialization.JsonConverter<XpackUsageResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAggregateMetric = System.Text.Json.JsonEncodedText.Encode("aggregate_metric");
+	private static readonly System.Text.Json.JsonEncodedText PropAnalytics = System.Text.Json.JsonEncodedText.Encode("analytics");
+	private static readonly System.Text.Json.JsonEncodedText PropArchive = System.Text.Json.JsonEncodedText.Encode("archive");
+	private static readonly System.Text.Json.JsonEncodedText PropCcr = System.Text.Json.JsonEncodedText.Encode("ccr");
+	private static readonly System.Text.Json.JsonEncodedText PropDataFrame = System.Text.Json.JsonEncodedText.Encode("data_frame");
+	private static readonly System.Text.Json.JsonEncodedText PropDataScience = System.Text.Json.JsonEncodedText.Encode("data_science");
+	private static readonly System.Text.Json.JsonEncodedText PropDataStreams = System.Text.Json.JsonEncodedText.Encode("data_streams");
+	private static readonly System.Text.Json.JsonEncodedText PropDataTiers = System.Text.Json.JsonEncodedText.Encode("data_tiers");
+	private static readonly System.Text.Json.JsonEncodedText PropEnrich = System.Text.Json.JsonEncodedText.Encode("enrich");
+	private static readonly System.Text.Json.JsonEncodedText PropEql = System.Text.Json.JsonEncodedText.Encode("eql");
+	private static readonly System.Text.Json.JsonEncodedText PropFlattened = System.Text.Json.JsonEncodedText.Encode("flattened");
+	private static readonly System.Text.Json.JsonEncodedText PropFrozenIndices = System.Text.Json.JsonEncodedText.Encode("frozen_indices");
+	private static readonly System.Text.Json.JsonEncodedText PropGraph = System.Text.Json.JsonEncodedText.Encode("graph");
+	private static readonly System.Text.Json.JsonEncodedText PropHealthApi = System.Text.Json.JsonEncodedText.Encode("health_api");
+	private static readonly System.Text.Json.JsonEncodedText PropIlm = System.Text.Json.JsonEncodedText.Encode("ilm");
+	private static readonly System.Text.Json.JsonEncodedText PropLogstash = System.Text.Json.JsonEncodedText.Encode("logstash");
+	private static readonly System.Text.Json.JsonEncodedText PropMl = System.Text.Json.JsonEncodedText.Encode("ml");
+	private static readonly System.Text.Json.JsonEncodedText PropMonitoring = System.Text.Json.JsonEncodedText.Encode("monitoring");
+	private static readonly System.Text.Json.JsonEncodedText PropRollup = System.Text.Json.JsonEncodedText.Encode("rollup");
+	private static readonly System.Text.Json.JsonEncodedText PropRuntimeFields = System.Text.Json.JsonEncodedText.Encode("runtime_fields");
+	private static readonly System.Text.Json.JsonEncodedText PropSearchableSnapshots = System.Text.Json.JsonEncodedText.Encode("searchable_snapshots");
+	private static readonly System.Text.Json.JsonEncodedText PropSecurity = System.Text.Json.JsonEncodedText.Encode("security");
+	private static readonly System.Text.Json.JsonEncodedText PropSlm = System.Text.Json.JsonEncodedText.Encode("slm");
+	private static readonly System.Text.Json.JsonEncodedText PropSpatial = System.Text.Json.JsonEncodedText.Encode("spatial");
+	private static readonly System.Text.Json.JsonEncodedText PropSql = System.Text.Json.JsonEncodedText.Encode("sql");
+	private static readonly System.Text.Json.JsonEncodedText PropTransform = System.Text.Json.JsonEncodedText.Encode("transform");
+	private static readonly System.Text.Json.JsonEncodedText PropVectors = System.Text.Json.JsonEncodedText.Encode("vectors");
+	private static readonly System.Text.Json.JsonEncodedText PropVotingOnly = System.Text.Json.JsonEncodedText.Encode("voting_only");
+	private static readonly System.Text.Json.JsonEncodedText PropWatcher = System.Text.Json.JsonEncodedText.Encode("watcher");
+
+	public override XpackUsageResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Xpack.Base> propAggregateMetric = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Xpack.Analytics> propAnalytics = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Xpack.Archive> propArchive = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Xpack.Ccr> propCcr = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Xpack.Base?> propDataFrame = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Xpack.Base?> propDataScience = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Xpack.DataStreams?> propDataStreams = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Xpack.DataTiers> propDataTiers = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Xpack.Base?> propEnrich = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Xpack.Eql> propEql = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Xpack.Flattened?> propFlattened = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Xpack.FrozenIndices> propFrozenIndices = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Xpack.Base> propGraph = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Xpack.HealthStatistics?> propHealthApi = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Xpack.Ilm> propIlm = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Xpack.Base> propLogstash = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Xpack.MachineLearning> propMl = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Xpack.Monitoring> propMonitoring = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Xpack.Base> propRollup = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Xpack.RuntimeFieldTypes?> propRuntimeFields = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Xpack.SearchableSnapshots> propSearchableSnapshots = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Xpack.Security> propSecurity = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Xpack.Slm> propSlm = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Xpack.Base> propSpatial = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Xpack.Sql> propSql = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Xpack.Base> propTransform = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Xpack.Vector?> propVectors = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Xpack.Base> propVotingOnly = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Xpack.Watcher> propWatcher = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAggregateMetric.TryRead(ref reader, options, PropAggregateMetric))
+			{
+				continue;
+			}
+
+			if (propAnalytics.TryRead(ref reader, options, PropAnalytics))
+			{
+				continue;
+			}
+
+			if (propArchive.TryRead(ref reader, options, PropArchive))
+			{
+				continue;
+			}
+
+			if (propCcr.TryRead(ref reader, options, PropCcr))
+			{
+				continue;
+			}
+
+			if (propDataFrame.TryRead(ref reader, options, PropDataFrame))
+			{
+				continue;
+			}
+
+			if (propDataScience.TryRead(ref reader, options, PropDataScience))
+			{
+				continue;
+			}
+
+			if (propDataStreams.TryRead(ref reader, options, PropDataStreams))
+			{
+				continue;
+			}
+
+			if (propDataTiers.TryRead(ref reader, options, PropDataTiers))
+			{
+				continue;
+			}
+
+			if (propEnrich.TryRead(ref reader, options, PropEnrich))
+			{
+				continue;
+			}
+
+			if (propEql.TryRead(ref reader, options, PropEql))
+			{
+				continue;
+			}
+
+			if (propFlattened.TryRead(ref reader, options, PropFlattened))
+			{
+				continue;
+			}
+
+			if (propFrozenIndices.TryRead(ref reader, options, PropFrozenIndices))
+			{
+				continue;
+			}
+
+			if (propGraph.TryRead(ref reader, options, PropGraph))
+			{
+				continue;
+			}
+
+			if (propHealthApi.TryRead(ref reader, options, PropHealthApi))
+			{
+				continue;
+			}
+
+			if (propIlm.TryRead(ref reader, options, PropIlm))
+			{
+				continue;
+			}
+
+			if (propLogstash.TryRead(ref reader, options, PropLogstash))
+			{
+				continue;
+			}
+
+			if (propMl.TryRead(ref reader, options, PropMl))
+			{
+				continue;
+			}
+
+			if (propMonitoring.TryRead(ref reader, options, PropMonitoring))
+			{
+				continue;
+			}
+
+			if (propRollup.TryRead(ref reader, options, PropRollup))
+			{
+				continue;
+			}
+
+			if (propRuntimeFields.TryRead(ref reader, options, PropRuntimeFields))
+			{
+				continue;
+			}
+
+			if (propSearchableSnapshots.TryRead(ref reader, options, PropSearchableSnapshots))
+			{
+				continue;
+			}
+
+			if (propSecurity.TryRead(ref reader, options, PropSecurity))
+			{
+				continue;
+			}
+
+			if (propSlm.TryRead(ref reader, options, PropSlm))
+			{
+				continue;
+			}
+
+			if (propSpatial.TryRead(ref reader, options, PropSpatial))
+			{
+				continue;
+			}
+
+			if (propSql.TryRead(ref reader, options, PropSql))
+			{
+				continue;
+			}
+
+			if (propTransform.TryRead(ref reader, options, PropTransform))
+			{
+				continue;
+			}
+
+			if (propVectors.TryRead(ref reader, options, PropVectors))
+			{
+				continue;
+			}
+
+			if (propVotingOnly.TryRead(ref reader, options, PropVotingOnly))
+			{
+				continue;
+			}
+
+			if (propWatcher.TryRead(ref reader, options, PropWatcher))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new XpackUsageResponse
+		{
+			AggregateMetric = propAggregateMetric.Value
+,
+			Analytics = propAnalytics.Value
+,
+			Archive = propArchive.Value
+,
+			Ccr = propCcr.Value
+,
+			DataFrame = propDataFrame.Value
+,
+			DataScience = propDataScience.Value
+,
+			DataStreams = propDataStreams.Value
+,
+			DataTiers = propDataTiers.Value
+,
+			Enrich = propEnrich.Value
+,
+			Eql = propEql.Value
+,
+			Flattened = propFlattened.Value
+,
+			FrozenIndices = propFrozenIndices.Value
+,
+			Graph = propGraph.Value
+,
+			HealthApi = propHealthApi.Value
+,
+			Ilm = propIlm.Value
+,
+			Logstash = propLogstash.Value
+,
+			Ml = propMl.Value
+,
+			Monitoring = propMonitoring.Value
+,
+			Rollup = propRollup.Value
+,
+			RuntimeFields = propRuntimeFields.Value
+,
+			SearchableSnapshots = propSearchableSnapshots.Value
+,
+			Security = propSecurity.Value
+,
+			Slm = propSlm.Value
+,
+			Spatial = propSpatial.Value
+,
+			Sql = propSql.Value
+,
+			Transform = propTransform.Value
+,
+			Vectors = propVectors.Value
+,
+			VotingOnly = propVotingOnly.Value
+,
+			Watcher = propWatcher.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, XpackUsageResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAggregateMetric, value.AggregateMetric);
+		writer.WriteProperty(options, PropAnalytics, value.Analytics);
+		writer.WriteProperty(options, PropArchive, value.Archive);
+		writer.WriteProperty(options, PropCcr, value.Ccr);
+		writer.WriteProperty(options, PropDataFrame, value.DataFrame);
+		writer.WriteProperty(options, PropDataScience, value.DataScience);
+		writer.WriteProperty(options, PropDataStreams, value.DataStreams);
+		writer.WriteProperty(options, PropDataTiers, value.DataTiers);
+		writer.WriteProperty(options, PropEnrich, value.Enrich);
+		writer.WriteProperty(options, PropEql, value.Eql);
+		writer.WriteProperty(options, PropFlattened, value.Flattened);
+		writer.WriteProperty(options, PropFrozenIndices, value.FrozenIndices);
+		writer.WriteProperty(options, PropGraph, value.Graph);
+		writer.WriteProperty(options, PropHealthApi, value.HealthApi);
+		writer.WriteProperty(options, PropIlm, value.Ilm);
+		writer.WriteProperty(options, PropLogstash, value.Logstash);
+		writer.WriteProperty(options, PropMl, value.Ml);
+		writer.WriteProperty(options, PropMonitoring, value.Monitoring);
+		writer.WriteProperty(options, PropRollup, value.Rollup);
+		writer.WriteProperty(options, PropRuntimeFields, value.RuntimeFields);
+		writer.WriteProperty(options, PropSearchableSnapshots, value.SearchableSnapshots);
+		writer.WriteProperty(options, PropSecurity, value.Security);
+		writer.WriteProperty(options, PropSlm, value.Slm);
+		writer.WriteProperty(options, PropSpatial, value.Spatial);
+		writer.WriteProperty(options, PropSql, value.Sql);
+		writer.WriteProperty(options, PropTransform, value.Transform);
+		writer.WriteProperty(options, PropVectors, value.Vectors);
+		writer.WriteProperty(options, PropVotingOnly, value.VotingOnly);
+		writer.WriteProperty(options, PropWatcher, value.Watcher);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(XpackUsageResponseConverter))]
 public sealed partial class XpackUsageResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("aggregate_metric")]
 	public Elastic.Clients.Elasticsearch.Serverless.Xpack.Base AggregateMetric { get; init; }
-	[JsonInclude, JsonPropertyName("analytics")]
 	public Elastic.Clients.Elasticsearch.Serverless.Xpack.Analytics Analytics { get; init; }
-	[JsonInclude, JsonPropertyName("archive")]
 	public Elastic.Clients.Elasticsearch.Serverless.Xpack.Archive Archive { get; init; }
-	[JsonInclude, JsonPropertyName("ccr")]
 	public Elastic.Clients.Elasticsearch.Serverless.Xpack.Ccr Ccr { get; init; }
-	[JsonInclude, JsonPropertyName("data_frame")]
 	public Elastic.Clients.Elasticsearch.Serverless.Xpack.Base? DataFrame { get; init; }
-	[JsonInclude, JsonPropertyName("data_science")]
 	public Elastic.Clients.Elasticsearch.Serverless.Xpack.Base? DataScience { get; init; }
-	[JsonInclude, JsonPropertyName("data_streams")]
 	public Elastic.Clients.Elasticsearch.Serverless.Xpack.DataStreams? DataStreams { get; init; }
-	[JsonInclude, JsonPropertyName("data_tiers")]
 	public Elastic.Clients.Elasticsearch.Serverless.Xpack.DataTiers DataTiers { get; init; }
-	[JsonInclude, JsonPropertyName("enrich")]
 	public Elastic.Clients.Elasticsearch.Serverless.Xpack.Base? Enrich { get; init; }
-	[JsonInclude, JsonPropertyName("eql")]
 	public Elastic.Clients.Elasticsearch.Serverless.Xpack.Eql Eql { get; init; }
-	[JsonInclude, JsonPropertyName("flattened")]
 	public Elastic.Clients.Elasticsearch.Serverless.Xpack.Flattened? Flattened { get; init; }
-	[JsonInclude, JsonPropertyName("frozen_indices")]
 	public Elastic.Clients.Elasticsearch.Serverless.Xpack.FrozenIndices FrozenIndices { get; init; }
-	[JsonInclude, JsonPropertyName("graph")]
 	public Elastic.Clients.Elasticsearch.Serverless.Xpack.Base Graph { get; init; }
-	[JsonInclude, JsonPropertyName("health_api")]
 	public Elastic.Clients.Elasticsearch.Serverless.Xpack.HealthStatistics? HealthApi { get; init; }
-	[JsonInclude, JsonPropertyName("ilm")]
 	public Elastic.Clients.Elasticsearch.Serverless.Xpack.Ilm Ilm { get; init; }
-	[JsonInclude, JsonPropertyName("logstash")]
 	public Elastic.Clients.Elasticsearch.Serverless.Xpack.Base Logstash { get; init; }
-	[JsonInclude, JsonPropertyName("ml")]
 	public Elastic.Clients.Elasticsearch.Serverless.Xpack.MachineLearning Ml { get; init; }
-	[JsonInclude, JsonPropertyName("monitoring")]
 	public Elastic.Clients.Elasticsearch.Serverless.Xpack.Monitoring Monitoring { get; init; }
-	[JsonInclude, JsonPropertyName("rollup")]
 	public Elastic.Clients.Elasticsearch.Serverless.Xpack.Base Rollup { get; init; }
-	[JsonInclude, JsonPropertyName("runtime_fields")]
 	public Elastic.Clients.Elasticsearch.Serverless.Xpack.RuntimeFieldTypes? RuntimeFields { get; init; }
-	[JsonInclude, JsonPropertyName("searchable_snapshots")]
 	public Elastic.Clients.Elasticsearch.Serverless.Xpack.SearchableSnapshots SearchableSnapshots { get; init; }
-	[JsonInclude, JsonPropertyName("security")]
 	public Elastic.Clients.Elasticsearch.Serverless.Xpack.Security Security { get; init; }
-	[JsonInclude, JsonPropertyName("slm")]
 	public Elastic.Clients.Elasticsearch.Serverless.Xpack.Slm Slm { get; init; }
-	[JsonInclude, JsonPropertyName("spatial")]
 	public Elastic.Clients.Elasticsearch.Serverless.Xpack.Base Spatial { get; init; }
-	[JsonInclude, JsonPropertyName("sql")]
 	public Elastic.Clients.Elasticsearch.Serverless.Xpack.Sql Sql { get; init; }
-	[JsonInclude, JsonPropertyName("transform")]
 	public Elastic.Clients.Elasticsearch.Serverless.Xpack.Base Transform { get; init; }
-	[JsonInclude, JsonPropertyName("vectors")]
 	public Elastic.Clients.Elasticsearch.Serverless.Xpack.Vector? Vectors { get; init; }
-	[JsonInclude, JsonPropertyName("voting_only")]
 	public Elastic.Clients.Elasticsearch.Serverless.Xpack.Base VotingOnly { get; init; }
-	[JsonInclude, JsonPropertyName("watcher")]
 	public Elastic.Clients.Elasticsearch.Serverless.Xpack.Watcher Watcher { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/AdjacencyMatrixAggregate.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/AdjacencyMatrixAggregate.g.cs
index ca977c75a2c..f9e840fd59a 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/AdjacencyMatrixAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/AdjacencyMatrixAggregate.g.cs
@@ -33,4 +33,6 @@ public sealed partial class AdjacencyMatrixAggregate : IAggregate
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Aggregations.AdjacencyMatrixBucket> Buckets { get; init; }
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
+
+	string IAggregate.Type => "adjacency_matrix";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/AdjacencyMatrixBucket.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/AdjacencyMatrixBucket.g.cs
index 21d617735bd..1161a7e292f 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/AdjacencyMatrixBucket.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/AdjacencyMatrixBucket.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,49 +28,60 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Aggregations;
 
-internal sealed partial class AdjacencyMatrixBucketConverter : JsonConverter<AdjacencyMatrixBucket>
+internal sealed partial class AdjacencyMatrixBucketConverter : System.Text.Json.Serialization.JsonConverter<AdjacencyMatrixBucket>
 {
-	public override AdjacencyMatrixBucket Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropDocCount = System.Text.Json.JsonEncodedText.Encode("doc_count");
+	private static readonly System.Text.Json.JsonEncodedText PropKey = System.Text.Json.JsonEncodedText.Encode("key");
+
+	public override AdjacencyMatrixBucket Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		long docCount = default;
-		string key = default;
-		Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate> propAggregations = default;
+		LocalJsonProperty<long> propDocCount = default;
+		LocalJsonProperty<string> propKey = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propDocCount.TryRead(ref reader, options, PropDocCount))
 			{
-				var property = reader.GetString();
-				if (property == "doc_count")
-				{
-					docCount = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "key")
-				{
-					key = JsonSerializer.Deserialize<string>(ref reader, options);
-					continue;
-				}
-
-				if (property.Contains("#"))
-				{
-					additionalProperties ??= new Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate>();
-					AggregateDictionaryConverter.ReadItem(ref reader, options, additionalProperties, property);
-					continue;
-				}
+				continue;
+			}
 
-				throw new JsonException("Unknown property read from JSON.");
+			if (propKey.TryRead(ref reader, options, PropKey))
+			{
+				continue;
 			}
+
+			propAggregations ??= new System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate>();
+			Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionaryConverter.ReadItem(ref reader, options, out string key, out Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate value);
+			propAggregations[key] = value;
 		}
 
-		return new AdjacencyMatrixBucket { Aggregations = new Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary(additionalProperties), DocCount = docCount, Key = key };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new AdjacencyMatrixBucket
+		{
+			Aggregations = new Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary(propAggregations)
+,
+			DocCount = propDocCount.Value
+,
+			Key = propKey.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, AdjacencyMatrixBucket value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, AdjacencyMatrixBucket value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'AdjacencyMatrixBucket' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDocCount, value.DocCount);
+		writer.WriteProperty(options, PropKey, value.Key);
+		if (value.Aggregations is not null)
+		{
+			foreach (var item in value.Aggregations)
+			{
+				Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionaryConverter.WriteItem(writer, options, item.Key, item.Value);
+			}
+		}
+
+		writer.WriteEndObject();
 	}
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/AggregateDictionary.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/AggregateDictionary.g.cs
index 7f1f89d7900..c27f5ade03a 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/AggregateDictionary.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/AggregateDictionary.g.cs
@@ -19,6 +19,7 @@
 
 using Elastic.Clients.Elasticsearch.Serverless.Core;
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport;
 using System;
@@ -33,6 +34,7 @@ namespace Elastic.Clients.Elasticsearch.Serverless.Aggregations;
 
 public partial interface IAggregate
 {
+	public string? Type { get; }
 }
 
 [JsonConverter(typeof(AggregateDictionaryConverter))]
@@ -115,530 +117,338 @@ public AggregateDictionary(IReadOnlyDictionary<string, IAggregate> backingDictio
 	private T? TryGet<T>(string key) where T : class, IAggregate => BackingDictionary.TryGetValue(key, out var value) ? value as T : null;
 }
 
-internal sealed partial class AggregateDictionaryConverter : JsonConverter<AggregateDictionary>
+internal sealed partial class AggregateDictionaryConverter : System.Text.Json.Serialization.JsonConverter<AggregateDictionary>
 {
-	public override AggregateDictionary Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	public override AggregateDictionary Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var dictionary = new Dictionary<string, IAggregate>();
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException($"Expected {JsonTokenType.StartObject} but read {reader.TokenType}.");
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		var dictionary = new System.Collections.Generic.Dictionary<string, IAggregate>();
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
-				throw new JsonException($"Expected {JsonTokenType.PropertyName} but read {reader.TokenType}.");
-			var name = reader.GetString();
-			reader.Read();
-			ReadItem(ref reader, options, dictionary, name);
+			ReadItem(ref reader, options, out string name, out IAggregate value);
+			dictionary[name] = value;
 		}
 
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
 		return new AggregateDictionary(dictionary);
 	}
 
-	public override void Write(Utf8JsonWriter writer, AggregateDictionary value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, AggregateDictionary value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'AggregateDictionary' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		foreach (var pair in value)
+		{
+			WriteItem(writer, options, pair.Key, pair.Value);
+		}
+
+		writer.WriteEndObject();
 	}
 
-	public static void ReadItem(ref Utf8JsonReader reader, JsonSerializerOptions options, Dictionary<string, IAggregate> dictionary, string name)
+	internal static void ReadItem(ref System.Text.Json.Utf8JsonReader reader, System.Text.Json.JsonSerializerOptions options, out string name, out IAggregate value)
 	{
-		var nameParts = name.Split('#');
-		if (nameParts.Length != 2)
-			throw new JsonException($"Unable to parse typed-key '{name}'.");
-		var type = nameParts[0];
-		switch (type)
+		reader.ReadPropertyName(options, out string key);
+		reader.Read();
+		var parts = key.Split('#');
+		if (parts.Length != 2)
 		{
-			case "adjacency_matrix":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.AdjacencyMatrixAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "auto_date_histogram":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.AutoDateHistogramAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "avg":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.AverageAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "boxplot":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.BoxplotAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "bucket_metric_value":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.BucketMetricValueAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "cardinality":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.CardinalityAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "children":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.ChildrenAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "composite":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.CompositeAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "simple_long_value":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.CumulativeCardinalityAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "date_histogram":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.DateHistogramAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "date_range":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.DateRangeAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "derivative":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.DerivativeAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "dterms":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.DoubleTermsAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "extended_stats":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.ExtendedStatsAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "extended_stats_bucket":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.ExtendedStatsBucketAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "filter":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.FilterAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "filters":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.FiltersAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "frequent_item_sets":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.FrequentItemSetsAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "geo_bounds":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.GeoBoundsAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "geo_centroid":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.GeoCentroidAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "geo_distance":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.GeoDistanceAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "geohash_grid":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.GeohashGridAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "geohex_grid":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.GeohexGridAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "geo_line":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.GeoLineAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "geotile_grid":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.GeotileGridAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "global":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.GlobalAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "hdr_percentile_ranks":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.HdrPercentileRanksAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "hdr_percentiles":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.HdrPercentilesAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "histogram":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.HistogramAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "inference":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.InferenceAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "ip_prefix":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.IpPrefixAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "ip_range":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.IpRangeAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "lrareterms":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.LongRareTermsAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "lterms":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.LongTermsAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "matrix_stats":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.MatrixStatsAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "max":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.MaxAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "median_absolute_deviation":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.MedianAbsoluteDeviationAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "min":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.MinAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "missing":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.MissingAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "multi_terms":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.MultiTermsAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "nested":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.NestedAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "parent":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.ParentAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "percentiles_bucket":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.PercentilesBucketAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "range":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.RangeAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "rate":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.RateAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "reverse_nested":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.ReverseNestedAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "sampler":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.SamplerAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "scripted_metric":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.ScriptedMetricAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "siglterms":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.SignificantLongTermsAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "sigsterms":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.SignificantStringTermsAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "simple_value":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.SimpleValueAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "stats":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.StatsAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "stats_bucket":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.StatsBucketAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "srareterms":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.StringRareTermsAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "string_stats":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.StringStatsAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "sterms":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.StringTermsAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "sum":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.SumAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "tdigest_percentile_ranks":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.TDigestPercentileRanksAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "tdigest_percentiles":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.TDigestPercentilesAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "time_series":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.TimeSeriesAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "top_hits":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.TopHitsAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "top_metrics":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.TopMetricsAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "t_test":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.TTestAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "umrareterms":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.UnmappedRareTermsAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "unmapped_sampler":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.UnmappedSamplerAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "umsigterms":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.UnmappedSignificantTermsAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "umterms":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.UnmappedTermsAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "value_count":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.ValueCountAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "variable_width_histogram":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.VariableWidthHistogramAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
+			throw new System.Text.Json.JsonException($"Unable to parse typed-key '{key}' for variant '{nameof(IAggregate)}'.");
+		}
 
-			case "weighted_avg":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.WeightedAverageAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
+		var discriminator = parts[0];
+		name = parts[1];
+		value = discriminator switch
+		{
+			"adjacency_matrix" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.AdjacencyMatrixAggregate>(options),
+			"auto_date_histogram" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.AutoDateHistogramAggregate>(options),
+			"avg" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.AverageAggregate>(options),
+			"boxplot" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.BoxplotAggregate>(options),
+			"bucket_metric_value" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.BucketMetricValueAggregate>(options),
+			"cardinality" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.CardinalityAggregate>(options),
+			"children" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.ChildrenAggregate>(options),
+			"composite" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.CompositeAggregate>(options),
+			"simple_long_value" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.CumulativeCardinalityAggregate>(options),
+			"date_histogram" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.DateHistogramAggregate>(options),
+			"date_range" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.DateRangeAggregate>(options),
+			"derivative" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.DerivativeAggregate>(options),
+			"dterms" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.DoubleTermsAggregate>(options),
+			"extended_stats" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.ExtendedStatsAggregate>(options),
+			"extended_stats_bucket" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.ExtendedStatsBucketAggregate>(options),
+			"filter" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.FilterAggregate>(options),
+			"filters" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.FiltersAggregate>(options),
+			"frequent_item_sets" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.FrequentItemSetsAggregate>(options),
+			"geo_bounds" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.GeoBoundsAggregate>(options),
+			"geo_centroid" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.GeoCentroidAggregate>(options),
+			"geo_distance" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.GeoDistanceAggregate>(options),
+			"geohash_grid" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.GeohashGridAggregate>(options),
+			"geohex_grid" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.GeohexGridAggregate>(options),
+			"geo_line" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.GeoLineAggregate>(options),
+			"geotile_grid" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.GeotileGridAggregate>(options),
+			"global" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.GlobalAggregate>(options),
+			"hdr_percentile_ranks" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.HdrPercentileRanksAggregate>(options),
+			"hdr_percentiles" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.HdrPercentilesAggregate>(options),
+			"histogram" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.HistogramAggregate>(options),
+			"inference" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.InferenceAggregate>(options),
+			"ip_prefix" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.IpPrefixAggregate>(options),
+			"ip_range" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.IpRangeAggregate>(options),
+			"lrareterms" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.LongRareTermsAggregate>(options),
+			"lterms" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.LongTermsAggregate>(options),
+			"matrix_stats" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.MatrixStatsAggregate>(options),
+			"max" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.MaxAggregate>(options),
+			"median_absolute_deviation" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.MedianAbsoluteDeviationAggregate>(options),
+			"min" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.MinAggregate>(options),
+			"missing" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.MissingAggregate>(options),
+			"multi_terms" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.MultiTermsAggregate>(options),
+			"nested" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.NestedAggregate>(options),
+			"parent" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.ParentAggregate>(options),
+			"percentiles_bucket" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.PercentilesBucketAggregate>(options),
+			"range" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.RangeAggregate>(options),
+			"rate" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.RateAggregate>(options),
+			"reverse_nested" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.ReverseNestedAggregate>(options),
+			"sampler" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.SamplerAggregate>(options),
+			"scripted_metric" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.ScriptedMetricAggregate>(options),
+			"siglterms" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.SignificantLongTermsAggregate>(options),
+			"sigsterms" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.SignificantStringTermsAggregate>(options),
+			"simple_value" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.SimpleValueAggregate>(options),
+			"stats" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.StatsAggregate>(options),
+			"stats_bucket" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.StatsBucketAggregate>(options),
+			"srareterms" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.StringRareTermsAggregate>(options),
+			"string_stats" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.StringStatsAggregate>(options),
+			"sterms" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.StringTermsAggregate>(options),
+			"sum" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.SumAggregate>(options),
+			"tdigest_percentile_ranks" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.TDigestPercentileRanksAggregate>(options),
+			"tdigest_percentiles" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.TDigestPercentilesAggregate>(options),
+			"time_series" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.TimeSeriesAggregate>(options),
+			"top_hits" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.TopHitsAggregate>(options),
+			"top_metrics" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.TopMetricsAggregate>(options),
+			"t_test" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.TTestAggregate>(options),
+			"umrareterms" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.UnmappedRareTermsAggregate>(options),
+			"unmapped_sampler" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.UnmappedSamplerAggregate>(options),
+			"umsigterms" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.UnmappedSignificantTermsAggregate>(options),
+			"umterms" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.UnmappedTermsAggregate>(options),
+			"value_count" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.ValueCountAggregate>(options),
+			"variable_width_histogram" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.VariableWidthHistogramAggregate>(options),
+			"weighted_avg" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.WeightedAverageAggregate>(options),
+			_ => throw new System.Text.Json.JsonException($"Variant '{discriminator}' is not supported for type '{nameof(IAggregate)}'.")
+		};
+	}
 
+	internal static void WriteItem(System.Text.Json.Utf8JsonWriter writer, System.Text.Json.JsonSerializerOptions options, string name, IAggregate value)
+	{
+		var key = value.Type + '#' + name;
+		switch (value)
+		{
+			case Elastic.Clients.Elasticsearch.Serverless.Aggregations.AdjacencyMatrixAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Serverless.Aggregations.AutoDateHistogramAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Serverless.Aggregations.AverageAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Serverless.Aggregations.BoxplotAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Serverless.Aggregations.BucketMetricValueAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Serverless.Aggregations.CardinalityAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Serverless.Aggregations.ChildrenAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Serverless.Aggregations.CompositeAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Serverless.Aggregations.CumulativeCardinalityAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Serverless.Aggregations.DateHistogramAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Serverless.Aggregations.DateRangeAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Serverless.Aggregations.DerivativeAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Serverless.Aggregations.DoubleTermsAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Serverless.Aggregations.ExtendedStatsAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Serverless.Aggregations.ExtendedStatsBucketAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Serverless.Aggregations.FilterAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Serverless.Aggregations.FiltersAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Serverless.Aggregations.FrequentItemSetsAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Serverless.Aggregations.GeoBoundsAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Serverless.Aggregations.GeoCentroidAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Serverless.Aggregations.GeoDistanceAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Serverless.Aggregations.GeohashGridAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Serverless.Aggregations.GeohexGridAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Serverless.Aggregations.GeoLineAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Serverless.Aggregations.GeotileGridAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Serverless.Aggregations.GlobalAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Serverless.Aggregations.HdrPercentileRanksAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Serverless.Aggregations.HdrPercentilesAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Serverless.Aggregations.HistogramAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Serverless.Aggregations.InferenceAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Serverless.Aggregations.IpPrefixAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Serverless.Aggregations.IpRangeAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Serverless.Aggregations.LongRareTermsAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Serverless.Aggregations.LongTermsAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Serverless.Aggregations.MatrixStatsAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Serverless.Aggregations.MaxAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Serverless.Aggregations.MedianAbsoluteDeviationAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Serverless.Aggregations.MinAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Serverless.Aggregations.MissingAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Serverless.Aggregations.MultiTermsAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Serverless.Aggregations.NestedAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Serverless.Aggregations.ParentAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Serverless.Aggregations.PercentilesBucketAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Serverless.Aggregations.RangeAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Serverless.Aggregations.RateAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Serverless.Aggregations.ReverseNestedAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Serverless.Aggregations.SamplerAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Serverless.Aggregations.ScriptedMetricAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Serverless.Aggregations.SignificantLongTermsAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Serverless.Aggregations.SignificantStringTermsAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Serverless.Aggregations.SimpleValueAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Serverless.Aggregations.StatsAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Serverless.Aggregations.StatsBucketAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Serverless.Aggregations.StringRareTermsAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Serverless.Aggregations.StringStatsAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Serverless.Aggregations.StringTermsAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Serverless.Aggregations.SumAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Serverless.Aggregations.TDigestPercentileRanksAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Serverless.Aggregations.TDigestPercentilesAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Serverless.Aggregations.TimeSeriesAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Serverless.Aggregations.TopHitsAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Serverless.Aggregations.TopMetricsAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Serverless.Aggregations.TTestAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Serverless.Aggregations.UnmappedRareTermsAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Serverless.Aggregations.UnmappedSamplerAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Serverless.Aggregations.UnmappedSignificantTermsAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Serverless.Aggregations.UnmappedTermsAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Serverless.Aggregations.ValueCountAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Serverless.Aggregations.VariableWidthHistogramAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Serverless.Aggregations.WeightedAverageAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
 			default:
-				throw new NotSupportedException($"The tagged variant '{type}' is currently not supported.");
+				throw new System.Text.Json.JsonException($"Variant '{0}' is not supported for type '{nameof(IAggregate)}'.");
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/Aggregation.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/Aggregation.g.cs
index 9e2e2f1a0fb..1404179b9fc 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/Aggregation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/Aggregation.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -39,12 +40,16 @@ internal Aggregation(string variantName, object variant)
 			throw new ArgumentNullException(nameof(variant));
 		if (string.IsNullOrWhiteSpace(variantName))
 			throw new ArgumentException("Variant name must not be empty or whitespace.");
-		VariantName = variantName;
+		VariantType = variantName;
 		Variant = variant;
 	}
 
-	internal object Variant { get; }
-	internal string VariantName { get; }
+	internal Aggregation()
+	{
+	}
+
+	public object Variant { get; internal set; }
+	public string VariantType { get; internal set; }
 
 	public static Aggregation AdjacencyMatrix(Elastic.Clients.Elasticsearch.Serverless.Aggregations.AdjacencyMatrixAggregation adjacencyMatrixAggregation) => new Aggregation("adjacency_matrix", adjacencyMatrixAggregation);
 	public static Aggregation AutoDateHistogram(Elastic.Clients.Elasticsearch.Serverless.Aggregations.AutoDateHistogramAggregation autoDateHistogramAggregation) => new Aggregation("auto_date_histogram", autoDateHistogramAggregation);
@@ -143,797 +148,922 @@ public bool TryGet<T>([NotNullWhen(true)] out T? result) where T : class
 	}
 }
 
-internal sealed partial class AggregationConverter : JsonConverter<Aggregation>
+internal sealed partial class AggregationConverter : System.Text.Json.Serialization.JsonConverter<Aggregation>
 {
-	public override Aggregation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations1 = System.Text.Json.JsonEncodedText.Encode("aggs");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText VariantAdjacencyMatrix = System.Text.Json.JsonEncodedText.Encode("adjacency_matrix");
+	private static readonly System.Text.Json.JsonEncodedText VariantAutoDateHistogram = System.Text.Json.JsonEncodedText.Encode("auto_date_histogram");
+	private static readonly System.Text.Json.JsonEncodedText VariantAvg = System.Text.Json.JsonEncodedText.Encode("avg");
+	private static readonly System.Text.Json.JsonEncodedText VariantAvgBucket = System.Text.Json.JsonEncodedText.Encode("avg_bucket");
+	private static readonly System.Text.Json.JsonEncodedText VariantBoxplot = System.Text.Json.JsonEncodedText.Encode("boxplot");
+	private static readonly System.Text.Json.JsonEncodedText VariantBucketScript = System.Text.Json.JsonEncodedText.Encode("bucket_script");
+	private static readonly System.Text.Json.JsonEncodedText VariantBucketSelector = System.Text.Json.JsonEncodedText.Encode("bucket_selector");
+	private static readonly System.Text.Json.JsonEncodedText VariantBucketSort = System.Text.Json.JsonEncodedText.Encode("bucket_sort");
+	private static readonly System.Text.Json.JsonEncodedText VariantCardinality = System.Text.Json.JsonEncodedText.Encode("cardinality");
+	private static readonly System.Text.Json.JsonEncodedText VariantChildren = System.Text.Json.JsonEncodedText.Encode("children");
+	private static readonly System.Text.Json.JsonEncodedText VariantComposite = System.Text.Json.JsonEncodedText.Encode("composite");
+	private static readonly System.Text.Json.JsonEncodedText VariantCumulativeCardinality = System.Text.Json.JsonEncodedText.Encode("cumulative_cardinality");
+	private static readonly System.Text.Json.JsonEncodedText VariantCumulativeSum = System.Text.Json.JsonEncodedText.Encode("cumulative_sum");
+	private static readonly System.Text.Json.JsonEncodedText VariantDateHistogram = System.Text.Json.JsonEncodedText.Encode("date_histogram");
+	private static readonly System.Text.Json.JsonEncodedText VariantDateRange = System.Text.Json.JsonEncodedText.Encode("date_range");
+	private static readonly System.Text.Json.JsonEncodedText VariantDerivative = System.Text.Json.JsonEncodedText.Encode("derivative");
+	private static readonly System.Text.Json.JsonEncodedText VariantDiversifiedSampler = System.Text.Json.JsonEncodedText.Encode("diversified_sampler");
+	private static readonly System.Text.Json.JsonEncodedText VariantExtendedStats = System.Text.Json.JsonEncodedText.Encode("extended_stats");
+	private static readonly System.Text.Json.JsonEncodedText VariantExtendedStatsBucket = System.Text.Json.JsonEncodedText.Encode("extended_stats_bucket");
+	private static readonly System.Text.Json.JsonEncodedText VariantFilter = System.Text.Json.JsonEncodedText.Encode("filter");
+	private static readonly System.Text.Json.JsonEncodedText VariantFilters = System.Text.Json.JsonEncodedText.Encode("filters");
+	private static readonly System.Text.Json.JsonEncodedText VariantFrequentItemSets = System.Text.Json.JsonEncodedText.Encode("frequent_item_sets");
+	private static readonly System.Text.Json.JsonEncodedText VariantGeoBounds = System.Text.Json.JsonEncodedText.Encode("geo_bounds");
+	private static readonly System.Text.Json.JsonEncodedText VariantGeoCentroid = System.Text.Json.JsonEncodedText.Encode("geo_centroid");
+	private static readonly System.Text.Json.JsonEncodedText VariantGeoDistance = System.Text.Json.JsonEncodedText.Encode("geo_distance");
+	private static readonly System.Text.Json.JsonEncodedText VariantGeohashGrid = System.Text.Json.JsonEncodedText.Encode("geohash_grid");
+	private static readonly System.Text.Json.JsonEncodedText VariantGeohexGrid = System.Text.Json.JsonEncodedText.Encode("geohex_grid");
+	private static readonly System.Text.Json.JsonEncodedText VariantGeoLine = System.Text.Json.JsonEncodedText.Encode("geo_line");
+	private static readonly System.Text.Json.JsonEncodedText VariantGeotileGrid = System.Text.Json.JsonEncodedText.Encode("geotile_grid");
+	private static readonly System.Text.Json.JsonEncodedText VariantGlobal = System.Text.Json.JsonEncodedText.Encode("global");
+	private static readonly System.Text.Json.JsonEncodedText VariantHistogram = System.Text.Json.JsonEncodedText.Encode("histogram");
+	private static readonly System.Text.Json.JsonEncodedText VariantInference = System.Text.Json.JsonEncodedText.Encode("inference");
+	private static readonly System.Text.Json.JsonEncodedText VariantIpPrefix = System.Text.Json.JsonEncodedText.Encode("ip_prefix");
+	private static readonly System.Text.Json.JsonEncodedText VariantIpRange = System.Text.Json.JsonEncodedText.Encode("ip_range");
+	private static readonly System.Text.Json.JsonEncodedText VariantLine = System.Text.Json.JsonEncodedText.Encode("line");
+	private static readonly System.Text.Json.JsonEncodedText VariantMatrixStats = System.Text.Json.JsonEncodedText.Encode("matrix_stats");
+	private static readonly System.Text.Json.JsonEncodedText VariantMax = System.Text.Json.JsonEncodedText.Encode("max");
+	private static readonly System.Text.Json.JsonEncodedText VariantMaxBucket = System.Text.Json.JsonEncodedText.Encode("max_bucket");
+	private static readonly System.Text.Json.JsonEncodedText VariantMedianAbsoluteDeviation = System.Text.Json.JsonEncodedText.Encode("median_absolute_deviation");
+	private static readonly System.Text.Json.JsonEncodedText VariantMin = System.Text.Json.JsonEncodedText.Encode("min");
+	private static readonly System.Text.Json.JsonEncodedText VariantMinBucket = System.Text.Json.JsonEncodedText.Encode("min_bucket");
+	private static readonly System.Text.Json.JsonEncodedText VariantMissing = System.Text.Json.JsonEncodedText.Encode("missing");
+	private static readonly System.Text.Json.JsonEncodedText VariantMovingFn = System.Text.Json.JsonEncodedText.Encode("moving_fn");
+	private static readonly System.Text.Json.JsonEncodedText VariantMovingPercentiles = System.Text.Json.JsonEncodedText.Encode("moving_percentiles");
+	private static readonly System.Text.Json.JsonEncodedText VariantMultiTerms = System.Text.Json.JsonEncodedText.Encode("multi_terms");
+	private static readonly System.Text.Json.JsonEncodedText VariantNested = System.Text.Json.JsonEncodedText.Encode("nested");
+	private static readonly System.Text.Json.JsonEncodedText VariantNormalize = System.Text.Json.JsonEncodedText.Encode("normalize");
+	private static readonly System.Text.Json.JsonEncodedText VariantParent = System.Text.Json.JsonEncodedText.Encode("parent");
+	private static readonly System.Text.Json.JsonEncodedText VariantPercentileRanks = System.Text.Json.JsonEncodedText.Encode("percentile_ranks");
+	private static readonly System.Text.Json.JsonEncodedText VariantPercentiles = System.Text.Json.JsonEncodedText.Encode("percentiles");
+	private static readonly System.Text.Json.JsonEncodedText VariantPercentilesBucket = System.Text.Json.JsonEncodedText.Encode("percentiles_bucket");
+	private static readonly System.Text.Json.JsonEncodedText VariantRange = System.Text.Json.JsonEncodedText.Encode("range");
+	private static readonly System.Text.Json.JsonEncodedText VariantRareTerms = System.Text.Json.JsonEncodedText.Encode("rare_terms");
+	private static readonly System.Text.Json.JsonEncodedText VariantRate = System.Text.Json.JsonEncodedText.Encode("rate");
+	private static readonly System.Text.Json.JsonEncodedText VariantReverseNested = System.Text.Json.JsonEncodedText.Encode("reverse_nested");
+	private static readonly System.Text.Json.JsonEncodedText VariantSampler = System.Text.Json.JsonEncodedText.Encode("sampler");
+	private static readonly System.Text.Json.JsonEncodedText VariantScriptedMetric = System.Text.Json.JsonEncodedText.Encode("scripted_metric");
+	private static readonly System.Text.Json.JsonEncodedText VariantSerialDiff = System.Text.Json.JsonEncodedText.Encode("serial_diff");
+	private static readonly System.Text.Json.JsonEncodedText VariantSignificantTerms = System.Text.Json.JsonEncodedText.Encode("significant_terms");
+	private static readonly System.Text.Json.JsonEncodedText VariantSignificantText = System.Text.Json.JsonEncodedText.Encode("significant_text");
+	private static readonly System.Text.Json.JsonEncodedText VariantStats = System.Text.Json.JsonEncodedText.Encode("stats");
+	private static readonly System.Text.Json.JsonEncodedText VariantStatsBucket = System.Text.Json.JsonEncodedText.Encode("stats_bucket");
+	private static readonly System.Text.Json.JsonEncodedText VariantStringStats = System.Text.Json.JsonEncodedText.Encode("string_stats");
+	private static readonly System.Text.Json.JsonEncodedText VariantSum = System.Text.Json.JsonEncodedText.Encode("sum");
+	private static readonly System.Text.Json.JsonEncodedText VariantSumBucket = System.Text.Json.JsonEncodedText.Encode("sum_bucket");
+	private static readonly System.Text.Json.JsonEncodedText VariantTerms = System.Text.Json.JsonEncodedText.Encode("terms");
+	private static readonly System.Text.Json.JsonEncodedText VariantTopHits = System.Text.Json.JsonEncodedText.Encode("top_hits");
+	private static readonly System.Text.Json.JsonEncodedText VariantTopMetrics = System.Text.Json.JsonEncodedText.Encode("top_metrics");
+	private static readonly System.Text.Json.JsonEncodedText VariantTTest = System.Text.Json.JsonEncodedText.Encode("t_test");
+	private static readonly System.Text.Json.JsonEncodedText VariantValueCount = System.Text.Json.JsonEncodedText.Encode("value_count");
+	private static readonly System.Text.Json.JsonEncodedText VariantVariableWidthHistogram = System.Text.Json.JsonEncodedText.Encode("variable_width_histogram");
+	private static readonly System.Text.Json.JsonEncodedText VariantWeightedAvg = System.Text.Json.JsonEncodedText.Encode("weighted_avg");
+
+	public override Aggregation Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-		{
-			throw new JsonException("Expected start token.");
-		}
-
-		object? variantValue = default;
-		string? variantNameValue = default;
-		IDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.Aggregation>? aggregationsValue = default;
-		IDictionary<string, object>? metaValue = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.Aggregation>?> propAggregations = default;
+		LocalJsonProperty<IDictionary<string, object>?> propMeta = default;
+		var variantType = string.Empty;
+		object? variant = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token.");
-			}
-
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token representing the name of an Elasticsearch field.");
-			}
-
-			var propertyName = reader.GetString();
-			reader.Read();
-			if (propertyName == "aggregations")
+			if (propAggregations.TryRead(ref reader, options, PropAggregations) || propAggregations.TryRead(ref reader, options, PropAggregations1))
 			{
-				aggregationsValue = JsonSerializer.Deserialize<IDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.Aggregation>?>(ref reader, options);
 				continue;
 			}
 
-			if (propertyName == "meta")
+			if (propMeta.TryRead(ref reader, options, PropMeta))
 			{
-				metaValue = JsonSerializer.Deserialize<IDictionary<string, object>?>(ref reader, options);
 				continue;
 			}
 
-			if (propertyName == "adjacency_matrix")
+			if (reader.ValueTextEquals(VariantAdjacencyMatrix))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.AdjacencyMatrixAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantAdjacencyMatrix.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.AdjacencyMatrixAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "auto_date_histogram")
+			if (reader.ValueTextEquals(VariantAutoDateHistogram))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.AutoDateHistogramAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantAutoDateHistogram.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.AutoDateHistogramAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "avg")
+			if (reader.ValueTextEquals(VariantAvg))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.AverageAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantAvg.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.AverageAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "avg_bucket")
+			if (reader.ValueTextEquals(VariantAvgBucket))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.AverageBucketAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantAvgBucket.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.AverageBucketAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "boxplot")
+			if (reader.ValueTextEquals(VariantBoxplot))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.BoxplotAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantBoxplot.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.BoxplotAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "bucket_script")
+			if (reader.ValueTextEquals(VariantBucketScript))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.BucketScriptAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantBucketScript.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.BucketScriptAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "bucket_selector")
+			if (reader.ValueTextEquals(VariantBucketSelector))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.BucketSelectorAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantBucketSelector.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.BucketSelectorAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "bucket_sort")
+			if (reader.ValueTextEquals(VariantBucketSort))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.BucketSortAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantBucketSort.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.BucketSortAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "cardinality")
+			if (reader.ValueTextEquals(VariantCardinality))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.CardinalityAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantCardinality.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.CardinalityAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "children")
+			if (reader.ValueTextEquals(VariantChildren))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.ChildrenAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantChildren.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.ChildrenAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "composite")
+			if (reader.ValueTextEquals(VariantComposite))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.CompositeAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantComposite.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.CompositeAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "cumulative_cardinality")
+			if (reader.ValueTextEquals(VariantCumulativeCardinality))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.CumulativeCardinalityAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantCumulativeCardinality.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.CumulativeCardinalityAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "cumulative_sum")
+			if (reader.ValueTextEquals(VariantCumulativeSum))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.CumulativeSumAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantCumulativeSum.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.CumulativeSumAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "date_histogram")
+			if (reader.ValueTextEquals(VariantDateHistogram))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.DateHistogramAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantDateHistogram.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.DateHistogramAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "date_range")
+			if (reader.ValueTextEquals(VariantDateRange))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.DateRangeAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantDateRange.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.DateRangeAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "derivative")
+			if (reader.ValueTextEquals(VariantDerivative))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.DerivativeAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantDerivative.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.DerivativeAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "diversified_sampler")
+			if (reader.ValueTextEquals(VariantDiversifiedSampler))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.DiversifiedSamplerAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantDiversifiedSampler.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.DiversifiedSamplerAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "extended_stats")
+			if (reader.ValueTextEquals(VariantExtendedStats))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.ExtendedStatsAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantExtendedStats.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.ExtendedStatsAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "extended_stats_bucket")
+			if (reader.ValueTextEquals(VariantExtendedStatsBucket))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.ExtendedStatsBucketAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantExtendedStatsBucket.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.ExtendedStatsBucketAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "filter")
+			if (reader.ValueTextEquals(VariantFilter))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantFilter.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query?>(options);
 				continue;
 			}
 
-			if (propertyName == "filters")
+			if (reader.ValueTextEquals(VariantFilters))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.FiltersAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantFilters.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.FiltersAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "frequent_item_sets")
+			if (reader.ValueTextEquals(VariantFrequentItemSets))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.FrequentItemSetsAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantFrequentItemSets.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.FrequentItemSetsAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "geo_bounds")
+			if (reader.ValueTextEquals(VariantGeoBounds))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.GeoBoundsAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantGeoBounds.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.GeoBoundsAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "geo_centroid")
+			if (reader.ValueTextEquals(VariantGeoCentroid))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.GeoCentroidAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantGeoCentroid.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.GeoCentroidAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "geo_distance")
+			if (reader.ValueTextEquals(VariantGeoDistance))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.GeoDistanceAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantGeoDistance.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.GeoDistanceAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "geohash_grid")
+			if (reader.ValueTextEquals(VariantGeohashGrid))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.GeohashGridAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantGeohashGrid.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.GeohashGridAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "geohex_grid")
+			if (reader.ValueTextEquals(VariantGeohexGrid))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.GeohexGridAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantGeohexGrid.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.GeohexGridAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "geo_line")
+			if (reader.ValueTextEquals(VariantGeoLine))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.GeoLineAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantGeoLine.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.GeoLineAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "geotile_grid")
+			if (reader.ValueTextEquals(VariantGeotileGrid))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.GeotileGridAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantGeotileGrid.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.GeotileGridAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "global")
+			if (reader.ValueTextEquals(VariantGlobal))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.GlobalAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantGlobal.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.GlobalAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "histogram")
+			if (reader.ValueTextEquals(VariantHistogram))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.HistogramAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantHistogram.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.HistogramAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "inference")
+			if (reader.ValueTextEquals(VariantInference))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.InferenceAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantInference.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.InferenceAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "ip_prefix")
+			if (reader.ValueTextEquals(VariantIpPrefix))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.IpPrefixAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantIpPrefix.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.IpPrefixAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "ip_range")
+			if (reader.ValueTextEquals(VariantIpRange))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.IpRangeAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantIpRange.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.IpRangeAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "line")
+			if (reader.ValueTextEquals(VariantLine))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.GeoLineAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantLine.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.GeoLineAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "matrix_stats")
+			if (reader.ValueTextEquals(VariantMatrixStats))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.MatrixStatsAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantMatrixStats.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.MatrixStatsAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "max")
+			if (reader.ValueTextEquals(VariantMax))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.MaxAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantMax.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.MaxAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "max_bucket")
+			if (reader.ValueTextEquals(VariantMaxBucket))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.MaxBucketAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantMaxBucket.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.MaxBucketAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "median_absolute_deviation")
+			if (reader.ValueTextEquals(VariantMedianAbsoluteDeviation))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.MedianAbsoluteDeviationAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantMedianAbsoluteDeviation.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.MedianAbsoluteDeviationAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "min")
+			if (reader.ValueTextEquals(VariantMin))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.MinAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantMin.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.MinAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "min_bucket")
+			if (reader.ValueTextEquals(VariantMinBucket))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.MinBucketAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantMinBucket.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.MinBucketAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "missing")
+			if (reader.ValueTextEquals(VariantMissing))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.MissingAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantMissing.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.MissingAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "moving_fn")
+			if (reader.ValueTextEquals(VariantMovingFn))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.MovingFunctionAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantMovingFn.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.MovingFunctionAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "moving_percentiles")
+			if (reader.ValueTextEquals(VariantMovingPercentiles))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.MovingPercentilesAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantMovingPercentiles.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.MovingPercentilesAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "multi_terms")
+			if (reader.ValueTextEquals(VariantMultiTerms))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.MultiTermsAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantMultiTerms.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.MultiTermsAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "nested")
+			if (reader.ValueTextEquals(VariantNested))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.NestedAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantNested.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.NestedAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "normalize")
+			if (reader.ValueTextEquals(VariantNormalize))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.NormalizeAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantNormalize.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.NormalizeAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "parent")
+			if (reader.ValueTextEquals(VariantParent))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.ParentAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantParent.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.ParentAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "percentile_ranks")
+			if (reader.ValueTextEquals(VariantPercentileRanks))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.PercentileRanksAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantPercentileRanks.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.PercentileRanksAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "percentiles")
+			if (reader.ValueTextEquals(VariantPercentiles))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.PercentilesAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantPercentiles.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.PercentilesAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "percentiles_bucket")
+			if (reader.ValueTextEquals(VariantPercentilesBucket))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.PercentilesBucketAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantPercentilesBucket.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.PercentilesBucketAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "range")
+			if (reader.ValueTextEquals(VariantRange))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.RangeAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantRange.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.RangeAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "rare_terms")
+			if (reader.ValueTextEquals(VariantRareTerms))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.RareTermsAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantRareTerms.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.RareTermsAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "rate")
+			if (reader.ValueTextEquals(VariantRate))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.RateAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantRate.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.RateAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "reverse_nested")
+			if (reader.ValueTextEquals(VariantReverseNested))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.ReverseNestedAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantReverseNested.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.ReverseNestedAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "sampler")
+			if (reader.ValueTextEquals(VariantSampler))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.SamplerAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantSampler.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.SamplerAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "scripted_metric")
+			if (reader.ValueTextEquals(VariantScriptedMetric))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.ScriptedMetricAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantScriptedMetric.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.ScriptedMetricAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "serial_diff")
+			if (reader.ValueTextEquals(VariantSerialDiff))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.SerialDifferencingAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantSerialDiff.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.SerialDifferencingAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "significant_terms")
+			if (reader.ValueTextEquals(VariantSignificantTerms))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.SignificantTermsAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantSignificantTerms.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.SignificantTermsAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "significant_text")
+			if (reader.ValueTextEquals(VariantSignificantText))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.SignificantTextAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantSignificantText.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.SignificantTextAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "stats")
+			if (reader.ValueTextEquals(VariantStats))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.StatsAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantStats.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.StatsAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "stats_bucket")
+			if (reader.ValueTextEquals(VariantStatsBucket))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.StatsBucketAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantStatsBucket.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.StatsBucketAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "string_stats")
+			if (reader.ValueTextEquals(VariantStringStats))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.StringStatsAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantStringStats.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.StringStatsAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "sum")
+			if (reader.ValueTextEquals(VariantSum))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.SumAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantSum.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.SumAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "sum_bucket")
+			if (reader.ValueTextEquals(VariantSumBucket))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.SumBucketAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantSumBucket.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.SumBucketAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "terms")
+			if (reader.ValueTextEquals(VariantTerms))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.TermsAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantTerms.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.TermsAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "top_hits")
+			if (reader.ValueTextEquals(VariantTopHits))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.TopHitsAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantTopHits.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.TopHitsAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "top_metrics")
+			if (reader.ValueTextEquals(VariantTopMetrics))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.TopMetricsAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantTopMetrics.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.TopMetricsAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "t_test")
+			if (reader.ValueTextEquals(VariantTTest))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.TTestAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantTTest.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.TTestAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "value_count")
+			if (reader.ValueTextEquals(VariantValueCount))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.ValueCountAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantValueCount.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.ValueCountAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "variable_width_histogram")
+			if (reader.ValueTextEquals(VariantVariableWidthHistogram))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.VariableWidthHistogramAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantVariableWidthHistogram.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.VariableWidthHistogramAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "weighted_avg")
+			if (reader.ValueTextEquals(VariantWeightedAvg))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.WeightedAverageAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantWeightedAvg.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.WeightedAverageAggregation?>(options);
 				continue;
 			}
 
-			throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'Aggregation' from the response.");
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		var result = new Aggregation(variantNameValue, variantValue);
-		result.Aggregations = aggregationsValue;
-		result.Meta = metaValue;
-		return result;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new Aggregation
+		{
+			VariantType = variantType,
+			Variant = variant,
+			Aggregations = propAggregations.Value
+	,
+			Meta = propMeta.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, Aggregation value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, Aggregation value, System.Text.Json.JsonSerializerOptions options)
 	{
 		writer.WriteStartObject();
-		if (value.Aggregations is not null)
-		{
-			writer.WritePropertyName("aggregations");
-			JsonSerializer.Serialize(writer, value.Aggregations, options);
-		}
-
-		if (value.Meta is not null)
+		switch (value.VariantType)
 		{
-			writer.WritePropertyName("meta");
-			JsonSerializer.Serialize(writer, value.Meta, options);
-		}
-
-		if (value.VariantName is not null && value.Variant is not null)
-		{
-			writer.WritePropertyName(value.VariantName);
-			switch (value.VariantName)
-			{
-				case "adjacency_matrix":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.AdjacencyMatrixAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.AdjacencyMatrixAggregation)value.Variant, options);
-					break;
-				case "auto_date_histogram":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.AutoDateHistogramAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.AutoDateHistogramAggregation)value.Variant, options);
-					break;
-				case "avg":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.AverageAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.AverageAggregation)value.Variant, options);
-					break;
-				case "avg_bucket":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.AverageBucketAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.AverageBucketAggregation)value.Variant, options);
-					break;
-				case "boxplot":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.BoxplotAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.BoxplotAggregation)value.Variant, options);
-					break;
-				case "bucket_script":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.BucketScriptAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.BucketScriptAggregation)value.Variant, options);
-					break;
-				case "bucket_selector":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.BucketSelectorAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.BucketSelectorAggregation)value.Variant, options);
-					break;
-				case "bucket_sort":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.BucketSortAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.BucketSortAggregation)value.Variant, options);
-					break;
-				case "cardinality":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.CardinalityAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.CardinalityAggregation)value.Variant, options);
-					break;
-				case "children":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.ChildrenAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.ChildrenAggregation)value.Variant, options);
-					break;
-				case "composite":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.CompositeAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.CompositeAggregation)value.Variant, options);
-					break;
-				case "cumulative_cardinality":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.CumulativeCardinalityAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.CumulativeCardinalityAggregation)value.Variant, options);
-					break;
-				case "cumulative_sum":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.CumulativeSumAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.CumulativeSumAggregation)value.Variant, options);
-					break;
-				case "date_histogram":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.DateHistogramAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.DateHistogramAggregation)value.Variant, options);
-					break;
-				case "date_range":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.DateRangeAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.DateRangeAggregation)value.Variant, options);
-					break;
-				case "derivative":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.DerivativeAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.DerivativeAggregation)value.Variant, options);
-					break;
-				case "diversified_sampler":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.DiversifiedSamplerAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.DiversifiedSamplerAggregation)value.Variant, options);
-					break;
-				case "extended_stats":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.ExtendedStatsAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.ExtendedStatsAggregation)value.Variant, options);
-					break;
-				case "extended_stats_bucket":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.ExtendedStatsBucketAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.ExtendedStatsBucketAggregation)value.Variant, options);
-					break;
-				case "filter":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query)value.Variant, options);
-					break;
-				case "filters":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.FiltersAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.FiltersAggregation)value.Variant, options);
-					break;
-				case "frequent_item_sets":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.FrequentItemSetsAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.FrequentItemSetsAggregation)value.Variant, options);
-					break;
-				case "geo_bounds":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.GeoBoundsAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.GeoBoundsAggregation)value.Variant, options);
-					break;
-				case "geo_centroid":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.GeoCentroidAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.GeoCentroidAggregation)value.Variant, options);
-					break;
-				case "geo_distance":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.GeoDistanceAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.GeoDistanceAggregation)value.Variant, options);
-					break;
-				case "geohash_grid":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.GeohashGridAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.GeohashGridAggregation)value.Variant, options);
-					break;
-				case "geohex_grid":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.GeohexGridAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.GeohexGridAggregation)value.Variant, options);
-					break;
-				case "geo_line":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.GeoLineAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.GeoLineAggregation)value.Variant, options);
-					break;
-				case "geotile_grid":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.GeotileGridAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.GeotileGridAggregation)value.Variant, options);
-					break;
-				case "global":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.GlobalAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.GlobalAggregation)value.Variant, options);
-					break;
-				case "histogram":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.HistogramAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.HistogramAggregation)value.Variant, options);
-					break;
-				case "inference":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.InferenceAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.InferenceAggregation)value.Variant, options);
-					break;
-				case "ip_prefix":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.IpPrefixAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.IpPrefixAggregation)value.Variant, options);
-					break;
-				case "ip_range":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.IpRangeAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.IpRangeAggregation)value.Variant, options);
-					break;
-				case "line":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.GeoLineAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.GeoLineAggregation)value.Variant, options);
-					break;
-				case "matrix_stats":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.MatrixStatsAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.MatrixStatsAggregation)value.Variant, options);
-					break;
-				case "max":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.MaxAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.MaxAggregation)value.Variant, options);
-					break;
-				case "max_bucket":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.MaxBucketAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.MaxBucketAggregation)value.Variant, options);
-					break;
-				case "median_absolute_deviation":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.MedianAbsoluteDeviationAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.MedianAbsoluteDeviationAggregation)value.Variant, options);
-					break;
-				case "min":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.MinAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.MinAggregation)value.Variant, options);
-					break;
-				case "min_bucket":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.MinBucketAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.MinBucketAggregation)value.Variant, options);
-					break;
-				case "missing":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.MissingAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.MissingAggregation)value.Variant, options);
-					break;
-				case "moving_fn":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.MovingFunctionAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.MovingFunctionAggregation)value.Variant, options);
-					break;
-				case "moving_percentiles":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.MovingPercentilesAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.MovingPercentilesAggregation)value.Variant, options);
-					break;
-				case "multi_terms":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.MultiTermsAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.MultiTermsAggregation)value.Variant, options);
-					break;
-				case "nested":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.NestedAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.NestedAggregation)value.Variant, options);
-					break;
-				case "normalize":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.NormalizeAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.NormalizeAggregation)value.Variant, options);
-					break;
-				case "parent":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.ParentAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.ParentAggregation)value.Variant, options);
-					break;
-				case "percentile_ranks":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.PercentileRanksAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.PercentileRanksAggregation)value.Variant, options);
-					break;
-				case "percentiles":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.PercentilesAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.PercentilesAggregation)value.Variant, options);
-					break;
-				case "percentiles_bucket":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.PercentilesBucketAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.PercentilesBucketAggregation)value.Variant, options);
-					break;
-				case "range":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.RangeAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.RangeAggregation)value.Variant, options);
-					break;
-				case "rare_terms":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.RareTermsAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.RareTermsAggregation)value.Variant, options);
-					break;
-				case "rate":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.RateAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.RateAggregation)value.Variant, options);
-					break;
-				case "reverse_nested":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.ReverseNestedAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.ReverseNestedAggregation)value.Variant, options);
-					break;
-				case "sampler":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.SamplerAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.SamplerAggregation)value.Variant, options);
-					break;
-				case "scripted_metric":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.ScriptedMetricAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.ScriptedMetricAggregation)value.Variant, options);
-					break;
-				case "serial_diff":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.SerialDifferencingAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.SerialDifferencingAggregation)value.Variant, options);
-					break;
-				case "significant_terms":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.SignificantTermsAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.SignificantTermsAggregation)value.Variant, options);
-					break;
-				case "significant_text":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.SignificantTextAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.SignificantTextAggregation)value.Variant, options);
-					break;
-				case "stats":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.StatsAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.StatsAggregation)value.Variant, options);
-					break;
-				case "stats_bucket":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.StatsBucketAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.StatsBucketAggregation)value.Variant, options);
-					break;
-				case "string_stats":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.StringStatsAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.StringStatsAggregation)value.Variant, options);
-					break;
-				case "sum":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.SumAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.SumAggregation)value.Variant, options);
-					break;
-				case "sum_bucket":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.SumBucketAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.SumBucketAggregation)value.Variant, options);
-					break;
-				case "terms":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.TermsAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.TermsAggregation)value.Variant, options);
-					break;
-				case "top_hits":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.TopHitsAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.TopHitsAggregation)value.Variant, options);
-					break;
-				case "top_metrics":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.TopMetricsAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.TopMetricsAggregation)value.Variant, options);
-					break;
-				case "t_test":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.TTestAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.TTestAggregation)value.Variant, options);
-					break;
-				case "value_count":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.ValueCountAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.ValueCountAggregation)value.Variant, options);
-					break;
-				case "variable_width_histogram":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.VariableWidthHistogramAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.VariableWidthHistogramAggregation)value.Variant, options);
-					break;
-				case "weighted_avg":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.WeightedAverageAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.WeightedAverageAggregation)value.Variant, options);
-					break;
-			}
+			case "":
+				break;
+			case "adjacency_matrix":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.AdjacencyMatrixAggregation?)value.Variant);
+				break;
+			case "auto_date_histogram":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.AutoDateHistogramAggregation?)value.Variant);
+				break;
+			case "avg":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.AverageAggregation?)value.Variant);
+				break;
+			case "avg_bucket":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.AverageBucketAggregation?)value.Variant);
+				break;
+			case "boxplot":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.BoxplotAggregation?)value.Variant);
+				break;
+			case "bucket_script":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.BucketScriptAggregation?)value.Variant);
+				break;
+			case "bucket_selector":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.BucketSelectorAggregation?)value.Variant);
+				break;
+			case "bucket_sort":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.BucketSortAggregation?)value.Variant);
+				break;
+			case "cardinality":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.CardinalityAggregation?)value.Variant);
+				break;
+			case "children":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.ChildrenAggregation?)value.Variant);
+				break;
+			case "composite":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.CompositeAggregation?)value.Variant);
+				break;
+			case "cumulative_cardinality":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.CumulativeCardinalityAggregation?)value.Variant);
+				break;
+			case "cumulative_sum":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.CumulativeSumAggregation?)value.Variant);
+				break;
+			case "date_histogram":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.DateHistogramAggregation?)value.Variant);
+				break;
+			case "date_range":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.DateRangeAggregation?)value.Variant);
+				break;
+			case "derivative":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.DerivativeAggregation?)value.Variant);
+				break;
+			case "diversified_sampler":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.DiversifiedSamplerAggregation?)value.Variant);
+				break;
+			case "extended_stats":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.ExtendedStatsAggregation?)value.Variant);
+				break;
+			case "extended_stats_bucket":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.ExtendedStatsBucketAggregation?)value.Variant);
+				break;
+			case "filter":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query?)value.Variant);
+				break;
+			case "filters":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.FiltersAggregation?)value.Variant);
+				break;
+			case "frequent_item_sets":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.FrequentItemSetsAggregation?)value.Variant);
+				break;
+			case "geo_bounds":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.GeoBoundsAggregation?)value.Variant);
+				break;
+			case "geo_centroid":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.GeoCentroidAggregation?)value.Variant);
+				break;
+			case "geo_distance":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.GeoDistanceAggregation?)value.Variant);
+				break;
+			case "geohash_grid":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.GeohashGridAggregation?)value.Variant);
+				break;
+			case "geohex_grid":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.GeohexGridAggregation?)value.Variant);
+				break;
+			case "geo_line":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.GeoLineAggregation?)value.Variant);
+				break;
+			case "geotile_grid":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.GeotileGridAggregation?)value.Variant);
+				break;
+			case "global":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.GlobalAggregation?)value.Variant);
+				break;
+			case "histogram":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.HistogramAggregation?)value.Variant);
+				break;
+			case "inference":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.InferenceAggregation?)value.Variant);
+				break;
+			case "ip_prefix":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.IpPrefixAggregation?)value.Variant);
+				break;
+			case "ip_range":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.IpRangeAggregation?)value.Variant);
+				break;
+			case "line":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.GeoLineAggregation?)value.Variant);
+				break;
+			case "matrix_stats":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.MatrixStatsAggregation?)value.Variant);
+				break;
+			case "max":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.MaxAggregation?)value.Variant);
+				break;
+			case "max_bucket":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.MaxBucketAggregation?)value.Variant);
+				break;
+			case "median_absolute_deviation":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.MedianAbsoluteDeviationAggregation?)value.Variant);
+				break;
+			case "min":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.MinAggregation?)value.Variant);
+				break;
+			case "min_bucket":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.MinBucketAggregation?)value.Variant);
+				break;
+			case "missing":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.MissingAggregation?)value.Variant);
+				break;
+			case "moving_fn":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.MovingFunctionAggregation?)value.Variant);
+				break;
+			case "moving_percentiles":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.MovingPercentilesAggregation?)value.Variant);
+				break;
+			case "multi_terms":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.MultiTermsAggregation?)value.Variant);
+				break;
+			case "nested":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.NestedAggregation?)value.Variant);
+				break;
+			case "normalize":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.NormalizeAggregation?)value.Variant);
+				break;
+			case "parent":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.ParentAggregation?)value.Variant);
+				break;
+			case "percentile_ranks":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.PercentileRanksAggregation?)value.Variant);
+				break;
+			case "percentiles":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.PercentilesAggregation?)value.Variant);
+				break;
+			case "percentiles_bucket":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.PercentilesBucketAggregation?)value.Variant);
+				break;
+			case "range":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.RangeAggregation?)value.Variant);
+				break;
+			case "rare_terms":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.RareTermsAggregation?)value.Variant);
+				break;
+			case "rate":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.RateAggregation?)value.Variant);
+				break;
+			case "reverse_nested":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.ReverseNestedAggregation?)value.Variant);
+				break;
+			case "sampler":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.SamplerAggregation?)value.Variant);
+				break;
+			case "scripted_metric":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.ScriptedMetricAggregation?)value.Variant);
+				break;
+			case "serial_diff":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.SerialDifferencingAggregation?)value.Variant);
+				break;
+			case "significant_terms":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.SignificantTermsAggregation?)value.Variant);
+				break;
+			case "significant_text":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.SignificantTextAggregation?)value.Variant);
+				break;
+			case "stats":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.StatsAggregation?)value.Variant);
+				break;
+			case "stats_bucket":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.StatsBucketAggregation?)value.Variant);
+				break;
+			case "string_stats":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.StringStatsAggregation?)value.Variant);
+				break;
+			case "sum":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.SumAggregation?)value.Variant);
+				break;
+			case "sum_bucket":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.SumBucketAggregation?)value.Variant);
+				break;
+			case "terms":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.TermsAggregation?)value.Variant);
+				break;
+			case "top_hits":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.TopHitsAggregation?)value.Variant);
+				break;
+			case "top_metrics":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.TopMetricsAggregation?)value.Variant);
+				break;
+			case "t_test":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.TTestAggregation?)value.Variant);
+				break;
+			case "value_count":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.ValueCountAggregation?)value.Variant);
+				break;
+			case "variable_width_histogram":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.VariableWidthHistogramAggregation?)value.Variant);
+				break;
+			case "weighted_avg":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.WeightedAverageAggregation?)value.Variant);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.VariantType}' is not supported for type '{nameof(Aggregation)}'.");
 		}
 
+		writer.WriteProperty(options, PropAggregations, value.Aggregations);
+		writer.WriteProperty(options, PropMeta, value.Meta);
 		writer.WriteEndObject();
 	}
 }
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/AutoDateHistogramAggregate.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/AutoDateHistogramAggregate.g.cs
index 7e74900acda..e5a494ee7fc 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/AutoDateHistogramAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/AutoDateHistogramAggregate.g.cs
@@ -35,4 +35,6 @@ public sealed partial class AutoDateHistogramAggregate : IAggregate
 	public string Interval { get; init; }
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
+
+	string IAggregate.Type => "auto_date_histogram";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/AverageAggregate.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/AverageAggregate.g.cs
index c583ff496b8..c52314f371c 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/AverageAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/AverageAggregate.g.cs
@@ -42,4 +42,6 @@ public sealed partial class AverageAggregate : IAggregate
 	public double? Value { get; init; }
 	[JsonInclude, JsonPropertyName("value_as_string")]
 	public string? ValueAsString { get; init; }
+
+	string IAggregate.Type => "avg";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/BoxplotAggregate.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/BoxplotAggregate.g.cs
index 2be67ea4c19..ec37622f85c 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/BoxplotAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/BoxplotAggregate.g.cs
@@ -59,4 +59,6 @@ public sealed partial class BoxplotAggregate : IAggregate
 	public double Upper { get; init; }
 	[JsonInclude, JsonPropertyName("upper_as_string")]
 	public string? UpperAsString { get; init; }
+
+	string IAggregate.Type => "boxplot";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/BucketMetricValueAggregate.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/BucketMetricValueAggregate.g.cs
index 4929e00d636..31def6d1b8a 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/BucketMetricValueAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/BucketMetricValueAggregate.g.cs
@@ -44,4 +44,6 @@ public sealed partial class BucketMetricValueAggregate : IAggregate
 	public double? Value { get; init; }
 	[JsonInclude, JsonPropertyName("value_as_string")]
 	public string? ValueAsString { get; init; }
+
+	string IAggregate.Type => "bucket_metric_value";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/BucketSortAggregation.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/BucketSortAggregation.g.cs
index 93e5a1a5b67..c308c3e9f9b 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/BucketSortAggregation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/BucketSortAggregation.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,70 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Aggregations;
 
+internal sealed partial class BucketSortAggregationConverter : System.Text.Json.Serialization.JsonConverter<BucketSortAggregation>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropFrom = System.Text.Json.JsonEncodedText.Encode("from");
+	private static readonly System.Text.Json.JsonEncodedText PropGapPolicy = System.Text.Json.JsonEncodedText.Encode("gap_policy");
+	private static readonly System.Text.Json.JsonEncodedText PropSize = System.Text.Json.JsonEncodedText.Encode("size");
+	private static readonly System.Text.Json.JsonEncodedText PropSort = System.Text.Json.JsonEncodedText.Encode("sort");
+
+	public override BucketSortAggregation Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<int?> propFrom = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Aggregations.GapPolicy?> propGapPolicy = default;
+		LocalJsonProperty<int?> propSize = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.SortOptions>?> propSort = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propFrom.TryRead(ref reader, options, PropFrom))
+			{
+				continue;
+			}
+
+			if (propGapPolicy.TryRead(ref reader, options, PropGapPolicy))
+			{
+				continue;
+			}
+
+			if (propSize.TryRead(ref reader, options, PropSize))
+			{
+				continue;
+			}
+
+			if (propSort.TryRead(ref reader, options, PropSort, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.SortOptions>?, Elastic.Clients.Elasticsearch.Serverless.SortOptions>)))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new BucketSortAggregation
+		{
+			From = propFrom.Value
+,
+			GapPolicy = propGapPolicy.Value
+,
+			Size = propSize.Value
+,
+			Sort = propSort.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, BucketSortAggregation value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropFrom, value.From);
+		writer.WriteProperty(options, PropGapPolicy, value.GapPolicy);
+		writer.WriteProperty(options, PropSize, value.Size);
+		writer.WriteProperty(options, PropSort, value.Sort, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.SortOptions>?, Elastic.Clients.Elasticsearch.Serverless.SortOptions>));
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(BucketSortAggregationConverter))]
 public sealed partial class BucketSortAggregation
 {
 	/// <summary>
@@ -34,7 +99,6 @@ public sealed partial class BucketSortAggregation
 	/// Buckets in positions prior to <c>from</c> will be truncated.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("from")]
 	public int? From { get; set; }
 
 	/// <summary>
@@ -42,7 +106,6 @@ public sealed partial class BucketSortAggregation
 	/// The policy to apply when gaps are found in the data.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("gap_policy")]
 	public Elastic.Clients.Elasticsearch.Serverless.Aggregations.GapPolicy? GapPolicy { get; set; }
 
 	/// <summary>
@@ -51,7 +114,6 @@ public sealed partial class BucketSortAggregation
 	/// Defaults to all buckets of the parent aggregation.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("size")]
 	public int? Size { get; set; }
 
 	/// <summary>
@@ -59,8 +121,6 @@ public sealed partial class BucketSortAggregation
 	/// The list of fields to sort on.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("sort")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.Serverless.SortOptions))]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.SortOptions>? Sort { get; set; }
 
 	public static implicit operator Elastic.Clients.Elasticsearch.Serverless.Aggregations.Aggregation(BucketSortAggregation bucketSortAggregation) => Elastic.Clients.Elasticsearch.Serverless.Aggregations.Aggregation.BucketSort(bucketSortAggregation);
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/CardinalityAggregate.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/CardinalityAggregate.g.cs
index f6c9cc9a95a..bb70e7d2d43 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/CardinalityAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/CardinalityAggregate.g.cs
@@ -33,4 +33,6 @@ public sealed partial class CardinalityAggregate : IAggregate
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
 	[JsonInclude, JsonPropertyName("value")]
 	public long Value { get; init; }
+
+	string IAggregate.Type => "cardinality";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/ChildrenAggregate.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/ChildrenAggregate.g.cs
index cb007f3ba2d..a73993380b7 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/ChildrenAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/ChildrenAggregate.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,49 +28,60 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Aggregations;
 
-internal sealed partial class ChildrenAggregateConverter : JsonConverter<ChildrenAggregate>
+internal sealed partial class ChildrenAggregateConverter : System.Text.Json.Serialization.JsonConverter<ChildrenAggregate>
 {
-	public override ChildrenAggregate Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropDocCount = System.Text.Json.JsonEncodedText.Encode("doc_count");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+
+	public override ChildrenAggregate Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		long docCount = default;
-		IReadOnlyDictionary<string, object>? meta = default;
-		Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate> propAggregations = default;
+		LocalJsonProperty<long> propDocCount = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, object>?> propMeta = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propDocCount.TryRead(ref reader, options, PropDocCount))
 			{
-				var property = reader.GetString();
-				if (property == "doc_count")
-				{
-					docCount = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "meta")
-				{
-					meta = JsonSerializer.Deserialize<IReadOnlyDictionary<string, object>?>(ref reader, options);
-					continue;
-				}
-
-				if (property.Contains("#"))
-				{
-					additionalProperties ??= new Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate>();
-					AggregateDictionaryConverter.ReadItem(ref reader, options, additionalProperties, property);
-					continue;
-				}
+				continue;
+			}
 
-				throw new JsonException("Unknown property read from JSON.");
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
 			}
+
+			propAggregations ??= new System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate>();
+			Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionaryConverter.ReadItem(ref reader, options, out string key, out Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate value);
+			propAggregations[key] = value;
 		}
 
-		return new ChildrenAggregate { Aggregations = new Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary(additionalProperties), DocCount = docCount, Meta = meta };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ChildrenAggregate
+		{
+			Aggregations = new Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary(propAggregations)
+,
+			DocCount = propDocCount.Value
+,
+			Meta = propMeta.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, ChildrenAggregate value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ChildrenAggregate value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'ChildrenAggregate' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDocCount, value.DocCount);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		if (value.Aggregations is not null)
+		{
+			foreach (var item in value.Aggregations)
+			{
+				Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionaryConverter.WriteItem(writer, options, item.Key, item.Value);
+			}
+		}
+
+		writer.WriteEndObject();
 	}
 }
 
@@ -84,4 +96,6 @@ public sealed partial class ChildrenAggregate : IAggregate
 	public Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary Aggregations { get; init; }
 	public long DocCount { get; init; }
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
+
+	string IAggregate.Type => "children";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/CompositeAggregate.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/CompositeAggregate.g.cs
index 29704ff5e9b..5019c2c5b1c 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/CompositeAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/CompositeAggregate.g.cs
@@ -35,4 +35,6 @@ public sealed partial class CompositeAggregate : IAggregate
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Aggregations.CompositeBucket> Buckets { get; init; }
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
+
+	string IAggregate.Type => "composite";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/CompositeBucket.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/CompositeBucket.g.cs
index 22f264dd557..b8bf9e0bca0 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/CompositeBucket.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/CompositeBucket.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,49 +28,60 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Aggregations;
 
-internal sealed partial class CompositeBucketConverter : JsonConverter<CompositeBucket>
+internal sealed partial class CompositeBucketConverter : System.Text.Json.Serialization.JsonConverter<CompositeBucket>
 {
-	public override CompositeBucket Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropDocCount = System.Text.Json.JsonEncodedText.Encode("doc_count");
+	private static readonly System.Text.Json.JsonEncodedText PropKey = System.Text.Json.JsonEncodedText.Encode("key");
+
+	public override CompositeBucket Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		long docCount = default;
-		IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.FieldValue> key = default;
-		Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate> propAggregations = default;
+		LocalJsonProperty<long> propDocCount = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.FieldValue>> propKey = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propDocCount.TryRead(ref reader, options, PropDocCount))
 			{
-				var property = reader.GetString();
-				if (property == "doc_count")
-				{
-					docCount = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "key")
-				{
-					key = JsonSerializer.Deserialize<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.FieldValue>>(ref reader, options);
-					continue;
-				}
-
-				if (property.Contains("#"))
-				{
-					additionalProperties ??= new Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate>();
-					AggregateDictionaryConverter.ReadItem(ref reader, options, additionalProperties, property);
-					continue;
-				}
+				continue;
+			}
 
-				throw new JsonException("Unknown property read from JSON.");
+			if (propKey.TryRead(ref reader, options, PropKey))
+			{
+				continue;
 			}
+
+			propAggregations ??= new System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate>();
+			Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionaryConverter.ReadItem(ref reader, options, out string key, out Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate value);
+			propAggregations[key] = value;
 		}
 
-		return new CompositeBucket { Aggregations = new Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary(additionalProperties), DocCount = docCount, Key = key };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new CompositeBucket
+		{
+			Aggregations = new Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary(propAggregations)
+,
+			DocCount = propDocCount.Value
+,
+			Key = propKey.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, CompositeBucket value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, CompositeBucket value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'CompositeBucket' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDocCount, value.DocCount);
+		writer.WriteProperty(options, PropKey, value.Key);
+		if (value.Aggregations is not null)
+		{
+			foreach (var item in value.Aggregations)
+			{
+				Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionaryConverter.WriteItem(writer, options, item.Key, item.Value);
+			}
+		}
+
+		writer.WriteEndObject();
 	}
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/CumulativeCardinalityAggregate.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/CumulativeCardinalityAggregate.g.cs
index c0a86ffc1cd..b45677dbc2c 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/CumulativeCardinalityAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/CumulativeCardinalityAggregate.g.cs
@@ -40,4 +40,6 @@ public sealed partial class CumulativeCardinalityAggregate : IAggregate
 	public long Value { get; init; }
 	[JsonInclude, JsonPropertyName("value_as_string")]
 	public string? ValueAsString { get; init; }
+
+	string IAggregate.Type => "simple_long_value";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/DateHistogramAggregate.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/DateHistogramAggregate.g.cs
index 6a9e78363d8..3258ea6df5f 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/DateHistogramAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/DateHistogramAggregate.g.cs
@@ -33,4 +33,6 @@ public sealed partial class DateHistogramAggregate : IAggregate
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Aggregations.DateHistogramBucket> Buckets { get; init; }
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
+
+	string IAggregate.Type => "date_histogram";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/DateHistogramAggregation.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/DateHistogramAggregation.g.cs
index 5abfd93f60d..2b291664d8c 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/DateHistogramAggregation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/DateHistogramAggregation.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,160 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Aggregations;
 
+internal sealed partial class DateHistogramAggregationConverter : System.Text.Json.Serialization.JsonConverter<DateHistogramAggregation>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCalendarInterval = System.Text.Json.JsonEncodedText.Encode("calendar_interval");
+	private static readonly System.Text.Json.JsonEncodedText PropExtendedBounds = System.Text.Json.JsonEncodedText.Encode("extended_bounds");
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropFixedInterval = System.Text.Json.JsonEncodedText.Encode("fixed_interval");
+	private static readonly System.Text.Json.JsonEncodedText PropFormat = System.Text.Json.JsonEncodedText.Encode("format");
+	private static readonly System.Text.Json.JsonEncodedText PropHardBounds = System.Text.Json.JsonEncodedText.Encode("hard_bounds");
+	private static readonly System.Text.Json.JsonEncodedText PropMinDocCount = System.Text.Json.JsonEncodedText.Encode("min_doc_count");
+	private static readonly System.Text.Json.JsonEncodedText PropMissing = System.Text.Json.JsonEncodedText.Encode("missing");
+	private static readonly System.Text.Json.JsonEncodedText PropOffset = System.Text.Json.JsonEncodedText.Encode("offset");
+	private static readonly System.Text.Json.JsonEncodedText PropOrder = System.Text.Json.JsonEncodedText.Encode("order");
+	private static readonly System.Text.Json.JsonEncodedText PropParams = System.Text.Json.JsonEncodedText.Encode("params");
+	private static readonly System.Text.Json.JsonEncodedText PropScript = System.Text.Json.JsonEncodedText.Encode("script");
+	private static readonly System.Text.Json.JsonEncodedText PropTimeZone = System.Text.Json.JsonEncodedText.Encode("time_zone");
+
+	public override DateHistogramAggregation Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Aggregations.CalendarInterval?> propCalendarInterval = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Aggregations.ExtendedBoundsDate?> propExtendedBounds = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Field?> propField = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Duration?> propFixedInterval = default;
+		LocalJsonProperty<string?> propFormat = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Aggregations.ExtendedBoundsDate?> propHardBounds = default;
+		LocalJsonProperty<int?> propMinDocCount = default;
+		LocalJsonProperty<DateTimeOffset?> propMissing = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Duration?> propOffset = default;
+		LocalJsonProperty<ICollection<KeyValuePair<Elastic.Clients.Elasticsearch.Serverless.Field, Elastic.Clients.Elasticsearch.Serverless.SortOrder>>?> propOrder = default;
+		LocalJsonProperty<IDictionary<string, object>?> propParams = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Script?> propScript = default;
+		LocalJsonProperty<string?> propTimeZone = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCalendarInterval.TryRead(ref reader, options, PropCalendarInterval))
+			{
+				continue;
+			}
+
+			if (propExtendedBounds.TryRead(ref reader, options, PropExtendedBounds))
+			{
+				continue;
+			}
+
+			if (propField.TryRead(ref reader, options, PropField))
+			{
+				continue;
+			}
+
+			if (propFixedInterval.TryRead(ref reader, options, PropFixedInterval))
+			{
+				continue;
+			}
+
+			if (propFormat.TryRead(ref reader, options, PropFormat))
+			{
+				continue;
+			}
+
+			if (propHardBounds.TryRead(ref reader, options, PropHardBounds))
+			{
+				continue;
+			}
+
+			if (propMinDocCount.TryRead(ref reader, options, PropMinDocCount))
+			{
+				continue;
+			}
+
+			if (propMissing.TryRead(ref reader, options, PropMissing))
+			{
+				continue;
+			}
+
+			if (propOffset.TryRead(ref reader, options, PropOffset))
+			{
+				continue;
+			}
+
+			if (propOrder.TryRead(ref reader, options, PropOrder, typeof(SingleOrManyMarker<IReadOnlyCollection<KeyValuePair<Elastic.Clients.Elasticsearch.Serverless.Field, Elastic.Clients.Elasticsearch.Serverless.SortOrder>>?, KeyValuePair<Elastic.Clients.Elasticsearch.Serverless.Field, Elastic.Clients.Elasticsearch.Serverless.SortOrder>>)))
+			{
+				continue;
+			}
+
+			if (propParams.TryRead(ref reader, options, PropParams))
+			{
+				continue;
+			}
+
+			if (propScript.TryRead(ref reader, options, PropScript))
+			{
+				continue;
+			}
+
+			if (propTimeZone.TryRead(ref reader, options, PropTimeZone))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DateHistogramAggregation
+		{
+			CalendarInterval = propCalendarInterval.Value
+,
+			ExtendedBounds = propExtendedBounds.Value
+,
+			Field = propField.Value
+,
+			FixedInterval = propFixedInterval.Value
+,
+			Format = propFormat.Value
+,
+			HardBounds = propHardBounds.Value
+,
+			MinDocCount = propMinDocCount.Value
+,
+			Missing = propMissing.Value
+,
+			Offset = propOffset.Value
+,
+			Order = propOrder.Value
+,
+			Params = propParams.Value
+,
+			Script = propScript.Value
+,
+			TimeZone = propTimeZone.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DateHistogramAggregation value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCalendarInterval, value.CalendarInterval);
+		writer.WriteProperty(options, PropExtendedBounds, value.ExtendedBounds);
+		writer.WriteProperty(options, PropField, value.Field);
+		writer.WriteProperty(options, PropFixedInterval, value.FixedInterval);
+		writer.WriteProperty(options, PropFormat, value.Format);
+		writer.WriteProperty(options, PropHardBounds, value.HardBounds);
+		writer.WriteProperty(options, PropMinDocCount, value.MinDocCount);
+		writer.WriteProperty(options, PropMissing, value.Missing);
+		writer.WriteProperty(options, PropOffset, value.Offset);
+		writer.WriteProperty(options, PropOrder, value.Order, typeof(SingleOrManyMarker<IReadOnlyCollection<KeyValuePair<Elastic.Clients.Elasticsearch.Serverless.Field, Elastic.Clients.Elasticsearch.Serverless.SortOrder>>?, KeyValuePair<Elastic.Clients.Elasticsearch.Serverless.Field, Elastic.Clients.Elasticsearch.Serverless.SortOrder>>));
+		writer.WriteProperty(options, PropParams, value.Params);
+		writer.WriteProperty(options, PropScript, value.Script);
+		writer.WriteProperty(options, PropTimeZone, value.TimeZone);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DateHistogramAggregationConverter))]
 public sealed partial class DateHistogramAggregation
 {
 	/// <summary>
@@ -35,7 +190,6 @@ public sealed partial class DateHistogramAggregation
 	/// Can be specified using the unit name, such as <c>month</c>, or as a single unit quantity, such as <c>1M</c>.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("calendar_interval")]
 	public Elastic.Clients.Elasticsearch.Serverless.Aggregations.CalendarInterval? CalendarInterval { get; set; }
 
 	/// <summary>
@@ -43,7 +197,6 @@ public sealed partial class DateHistogramAggregation
 	/// Enables extending the bounds of the histogram beyond the data itself.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("extended_bounds")]
 	public Elastic.Clients.Elasticsearch.Serverless.Aggregations.ExtendedBoundsDate? ExtendedBounds { get; set; }
 
 	/// <summary>
@@ -51,7 +204,6 @@ public sealed partial class DateHistogramAggregation
 	/// The date field whose values are use to build a histogram.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("field")]
 	public Elastic.Clients.Elasticsearch.Serverless.Field? Field { get; set; }
 
 	/// <summary>
@@ -59,7 +211,6 @@ public sealed partial class DateHistogramAggregation
 	/// Fixed intervals: a fixed number of SI units and never deviate, regardless of where they fall on the calendar.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("fixed_interval")]
 	public Elastic.Clients.Elasticsearch.Serverless.Duration? FixedInterval { get; set; }
 
 	/// <summary>
@@ -68,7 +219,6 @@ public sealed partial class DateHistogramAggregation
 	/// If no <c>format</c> is specified, the first date format specified in the field mapping is used.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("format")]
 	public string? Format { get; set; }
 
 	/// <summary>
@@ -76,7 +226,6 @@ public sealed partial class DateHistogramAggregation
 	/// Limits the histogram to specified bounds.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("hard_bounds")]
 	public Elastic.Clients.Elasticsearch.Serverless.Aggregations.ExtendedBoundsDate? HardBounds { get; set; }
 
 	/// <summary>
@@ -85,7 +234,6 @@ public sealed partial class DateHistogramAggregation
 	/// By default, all buckets between the first bucket that matches documents and the last one are returned.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("min_doc_count")]
 	public int? MinDocCount { get; set; }
 
 	/// <summary>
@@ -94,7 +242,6 @@ public sealed partial class DateHistogramAggregation
 	/// By default, documents without a value are ignored.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("missing")]
 	public DateTimeOffset? Missing { get; set; }
 
 	/// <summary>
@@ -102,7 +249,6 @@ public sealed partial class DateHistogramAggregation
 	/// Changes the start value of each bucket by the specified positive (<c>+</c>) or negative offset (<c>-</c>) duration.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("offset")]
 	public Elastic.Clients.Elasticsearch.Serverless.Duration? Offset { get; set; }
 
 	/// <summary>
@@ -110,12 +256,8 @@ public sealed partial class DateHistogramAggregation
 	/// The sort order of the returned buckets.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("order")]
-	[SingleOrManyCollectionConverter(typeof(KeyValuePair<Elastic.Clients.Elasticsearch.Serverless.Field, Elastic.Clients.Elasticsearch.Serverless.SortOrder>))]
 	public ICollection<KeyValuePair<Elastic.Clients.Elasticsearch.Serverless.Field, Elastic.Clients.Elasticsearch.Serverless.SortOrder>>? Order { get; set; }
-	[JsonInclude, JsonPropertyName("params")]
 	public IDictionary<string, object>? Params { get; set; }
-	[JsonInclude, JsonPropertyName("script")]
 	public Elastic.Clients.Elasticsearch.Serverless.Script? Script { get; set; }
 
 	/// <summary>
@@ -124,7 +266,6 @@ public sealed partial class DateHistogramAggregation
 	/// Defaults to Coordinated Universal Time (UTC).
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("time_zone")]
 	public string? TimeZone { get; set; }
 
 	public static implicit operator Elastic.Clients.Elasticsearch.Serverless.Aggregations.Aggregation(DateHistogramAggregation dateHistogramAggregation) => Elastic.Clients.Elasticsearch.Serverless.Aggregations.Aggregation.DateHistogram(dateHistogramAggregation);
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/DateHistogramBucket.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/DateHistogramBucket.g.cs
index 26386f3c977..d61b1de8d97 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/DateHistogramBucket.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/DateHistogramBucket.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,56 +28,70 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Aggregations;
 
-internal sealed partial class DateHistogramBucketConverter : JsonConverter<DateHistogramBucket>
+internal sealed partial class DateHistogramBucketConverter : System.Text.Json.Serialization.JsonConverter<DateHistogramBucket>
 {
-	public override DateHistogramBucket Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropDocCount = System.Text.Json.JsonEncodedText.Encode("doc_count");
+	private static readonly System.Text.Json.JsonEncodedText PropKey = System.Text.Json.JsonEncodedText.Encode("key");
+	private static readonly System.Text.Json.JsonEncodedText PropKeyAsString = System.Text.Json.JsonEncodedText.Encode("key_as_string");
+
+	public override DateHistogramBucket Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		long docCount = default;
-		long key = default;
-		string? keyAsString = default;
-		Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate> propAggregations = default;
+		LocalJsonProperty<long> propDocCount = default;
+		LocalJsonProperty<long> propKey = default;
+		LocalJsonProperty<string?> propKeyAsString = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propDocCount.TryRead(ref reader, options, PropDocCount))
 			{
-				var property = reader.GetString();
-				if (property == "doc_count")
-				{
-					docCount = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "key")
-				{
-					key = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "key_as_string")
-				{
-					keyAsString = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
+				continue;
+			}
 
-				if (property.Contains("#"))
-				{
-					additionalProperties ??= new Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate>();
-					AggregateDictionaryConverter.ReadItem(ref reader, options, additionalProperties, property);
-					continue;
-				}
+			if (propKey.TryRead(ref reader, options, PropKey))
+			{
+				continue;
+			}
 
-				throw new JsonException("Unknown property read from JSON.");
+			if (propKeyAsString.TryRead(ref reader, options, PropKeyAsString))
+			{
+				continue;
 			}
+
+			propAggregations ??= new System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate>();
+			Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionaryConverter.ReadItem(ref reader, options, out string key, out Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate value);
+			propAggregations[key] = value;
 		}
 
-		return new DateHistogramBucket { Aggregations = new Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary(additionalProperties), DocCount = docCount, Key = key, KeyAsString = keyAsString };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DateHistogramBucket
+		{
+			Aggregations = new Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary(propAggregations)
+,
+			DocCount = propDocCount.Value
+,
+			Key = propKey.Value
+,
+			KeyAsString = propKeyAsString.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, DateHistogramBucket value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DateHistogramBucket value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'DateHistogramBucket' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDocCount, value.DocCount);
+		writer.WriteProperty(options, PropKey, value.Key);
+		writer.WriteProperty(options, PropKeyAsString, value.KeyAsString);
+		if (value.Aggregations is not null)
+		{
+			foreach (var item in value.Aggregations)
+			{
+				Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionaryConverter.WriteItem(writer, options, item.Key, item.Value);
+			}
+		}
+
+		writer.WriteEndObject();
 	}
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/DateRangeAggregate.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/DateRangeAggregate.g.cs
index a885c04604d..4ed7beed321 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/DateRangeAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/DateRangeAggregate.g.cs
@@ -39,4 +39,6 @@ public sealed partial class DateRangeAggregate : IAggregate
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Aggregations.RangeBucket> Buckets { get; init; }
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
+
+	string IAggregate.Type => "date_range";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/DerivativeAggregate.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/DerivativeAggregate.g.cs
index d5399747ce3..3a649cca7a3 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/DerivativeAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/DerivativeAggregate.g.cs
@@ -46,4 +46,6 @@ public sealed partial class DerivativeAggregate : IAggregate
 	public double? Value { get; init; }
 	[JsonInclude, JsonPropertyName("value_as_string")]
 	public string? ValueAsString { get; init; }
+
+	string IAggregate.Type => "derivative";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/DoubleTermsAggregate.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/DoubleTermsAggregate.g.cs
index 10bb23a1570..9cae153cfe2 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/DoubleTermsAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/DoubleTermsAggregate.g.cs
@@ -42,4 +42,6 @@ public sealed partial class DoubleTermsAggregate : IAggregate
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
 	[JsonInclude, JsonPropertyName("sum_other_doc_count")]
 	public long? SumOtherDocCount { get; init; }
+
+	string IAggregate.Type => "dterms";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/DoubleTermsBucket.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/DoubleTermsBucket.g.cs
index 5dc845c246a..e520c8bdb86 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/DoubleTermsBucket.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/DoubleTermsBucket.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,63 +28,80 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Aggregations;
 
-internal sealed partial class DoubleTermsBucketConverter : JsonConverter<DoubleTermsBucket>
+internal sealed partial class DoubleTermsBucketConverter : System.Text.Json.Serialization.JsonConverter<DoubleTermsBucket>
 {
-	public override DoubleTermsBucket Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropDocCount = System.Text.Json.JsonEncodedText.Encode("doc_count");
+	private static readonly System.Text.Json.JsonEncodedText PropDocCountErrorUpperBound = System.Text.Json.JsonEncodedText.Encode("doc_count_error_upper_bound");
+	private static readonly System.Text.Json.JsonEncodedText PropKey = System.Text.Json.JsonEncodedText.Encode("key");
+	private static readonly System.Text.Json.JsonEncodedText PropKeyAsString = System.Text.Json.JsonEncodedText.Encode("key_as_string");
+
+	public override DoubleTermsBucket Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		long docCount = default;
-		long? docCountErrorUpperBound = default;
-		double key = default;
-		string? keyAsString = default;
-		Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate> propAggregations = default;
+		LocalJsonProperty<long> propDocCount = default;
+		LocalJsonProperty<long?> propDocCountErrorUpperBound = default;
+		LocalJsonProperty<double> propKey = default;
+		LocalJsonProperty<string?> propKeyAsString = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propDocCount.TryRead(ref reader, options, PropDocCount))
 			{
-				var property = reader.GetString();
-				if (property == "doc_count")
-				{
-					docCount = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "doc_count_error_upper_bound")
-				{
-					docCountErrorUpperBound = JsonSerializer.Deserialize<long?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "key")
-				{
-					key = JsonSerializer.Deserialize<double>(ref reader, options);
-					continue;
-				}
+				continue;
+			}
 
-				if (property == "key_as_string")
-				{
-					keyAsString = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
+			if (propDocCountErrorUpperBound.TryRead(ref reader, options, PropDocCountErrorUpperBound))
+			{
+				continue;
+			}
 
-				if (property.Contains("#"))
-				{
-					additionalProperties ??= new Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate>();
-					AggregateDictionaryConverter.ReadItem(ref reader, options, additionalProperties, property);
-					continue;
-				}
+			if (propKey.TryRead(ref reader, options, PropKey))
+			{
+				continue;
+			}
 
-				throw new JsonException("Unknown property read from JSON.");
+			if (propKeyAsString.TryRead(ref reader, options, PropKeyAsString))
+			{
+				continue;
 			}
+
+			propAggregations ??= new System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate>();
+			Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionaryConverter.ReadItem(ref reader, options, out string key, out Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate value);
+			propAggregations[key] = value;
 		}
 
-		return new DoubleTermsBucket { Aggregations = new Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary(additionalProperties), DocCount = docCount, DocCountErrorUpperBound = docCountErrorUpperBound, Key = key, KeyAsString = keyAsString };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DoubleTermsBucket
+		{
+			Aggregations = new Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary(propAggregations)
+,
+			DocCount = propDocCount.Value
+,
+			DocCountErrorUpperBound = propDocCountErrorUpperBound.Value
+,
+			Key = propKey.Value
+,
+			KeyAsString = propKeyAsString.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, DoubleTermsBucket value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DoubleTermsBucket value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'DoubleTermsBucket' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDocCount, value.DocCount);
+		writer.WriteProperty(options, PropDocCountErrorUpperBound, value.DocCountErrorUpperBound);
+		writer.WriteProperty(options, PropKey, value.Key);
+		writer.WriteProperty(options, PropKeyAsString, value.KeyAsString);
+		if (value.Aggregations is not null)
+		{
+			foreach (var item in value.Aggregations)
+			{
+				Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionaryConverter.WriteItem(writer, options, item.Key, item.Value);
+			}
+		}
+
+		writer.WriteEndObject();
 	}
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/ExtendedStatsAggregate.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/ExtendedStatsAggregate.g.cs
index fedb4c95f79..ce1ce75021d 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/ExtendedStatsAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/ExtendedStatsAggregate.g.cs
@@ -77,4 +77,6 @@ public sealed partial class ExtendedStatsAggregate : IAggregate
 	public double? VarianceSampling { get; init; }
 	[JsonInclude, JsonPropertyName("variance_sampling_as_string")]
 	public string? VarianceSamplingAsString { get; init; }
+
+	string IAggregate.Type => "extended_stats";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/ExtendedStatsBucketAggregate.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/ExtendedStatsBucketAggregate.g.cs
index 2d1e56afb66..4d351f70d71 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/ExtendedStatsBucketAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/ExtendedStatsBucketAggregate.g.cs
@@ -77,4 +77,6 @@ public sealed partial class ExtendedStatsBucketAggregate : IAggregate
 	public double? VarianceSampling { get; init; }
 	[JsonInclude, JsonPropertyName("variance_sampling_as_string")]
 	public string? VarianceSamplingAsString { get; init; }
+
+	string IAggregate.Type => "extended_stats_bucket";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/FilterAggregate.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/FilterAggregate.g.cs
index 1518ef244d1..192a877df58 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/FilterAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/FilterAggregate.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,49 +28,60 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Aggregations;
 
-internal sealed partial class FilterAggregateConverter : JsonConverter<FilterAggregate>
+internal sealed partial class FilterAggregateConverter : System.Text.Json.Serialization.JsonConverter<FilterAggregate>
 {
-	public override FilterAggregate Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropDocCount = System.Text.Json.JsonEncodedText.Encode("doc_count");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+
+	public override FilterAggregate Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		long docCount = default;
-		IReadOnlyDictionary<string, object>? meta = default;
-		Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate> propAggregations = default;
+		LocalJsonProperty<long> propDocCount = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, object>?> propMeta = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propDocCount.TryRead(ref reader, options, PropDocCount))
 			{
-				var property = reader.GetString();
-				if (property == "doc_count")
-				{
-					docCount = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "meta")
-				{
-					meta = JsonSerializer.Deserialize<IReadOnlyDictionary<string, object>?>(ref reader, options);
-					continue;
-				}
-
-				if (property.Contains("#"))
-				{
-					additionalProperties ??= new Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate>();
-					AggregateDictionaryConverter.ReadItem(ref reader, options, additionalProperties, property);
-					continue;
-				}
+				continue;
+			}
 
-				throw new JsonException("Unknown property read from JSON.");
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
 			}
+
+			propAggregations ??= new System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate>();
+			Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionaryConverter.ReadItem(ref reader, options, out string key, out Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate value);
+			propAggregations[key] = value;
 		}
 
-		return new FilterAggregate { Aggregations = new Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary(additionalProperties), DocCount = docCount, Meta = meta };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new FilterAggregate
+		{
+			Aggregations = new Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary(propAggregations)
+,
+			DocCount = propDocCount.Value
+,
+			Meta = propMeta.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, FilterAggregate value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, FilterAggregate value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'FilterAggregate' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDocCount, value.DocCount);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		if (value.Aggregations is not null)
+		{
+			foreach (var item in value.Aggregations)
+			{
+				Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionaryConverter.WriteItem(writer, options, item.Key, item.Value);
+			}
+		}
+
+		writer.WriteEndObject();
 	}
 }
 
@@ -84,4 +96,6 @@ public sealed partial class FilterAggregate : IAggregate
 	public Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary Aggregations { get; init; }
 	public long DocCount { get; init; }
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
+
+	string IAggregate.Type => "filter";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/FiltersAggregate.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/FiltersAggregate.g.cs
index a830d0c0c65..bcd8e5383e4 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/FiltersAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/FiltersAggregate.g.cs
@@ -33,4 +33,6 @@ public sealed partial class FiltersAggregate : IAggregate
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Aggregations.FiltersBucket> Buckets { get; init; }
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
+
+	string IAggregate.Type => "filters";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/FiltersBucket.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/FiltersBucket.g.cs
index 0de13876564..f0f8a467e62 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/FiltersBucket.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/FiltersBucket.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,42 +28,50 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Aggregations;
 
-internal sealed partial class FiltersBucketConverter : JsonConverter<FiltersBucket>
+internal sealed partial class FiltersBucketConverter : System.Text.Json.Serialization.JsonConverter<FiltersBucket>
 {
-	public override FiltersBucket Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropDocCount = System.Text.Json.JsonEncodedText.Encode("doc_count");
+
+	public override FiltersBucket Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		long docCount = default;
-		Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate> propAggregations = default;
+		LocalJsonProperty<long> propDocCount = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propDocCount.TryRead(ref reader, options, PropDocCount))
 			{
-				var property = reader.GetString();
-				if (property == "doc_count")
-				{
-					docCount = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property.Contains("#"))
-				{
-					additionalProperties ??= new Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate>();
-					AggregateDictionaryConverter.ReadItem(ref reader, options, additionalProperties, property);
-					continue;
-				}
-
-				throw new JsonException("Unknown property read from JSON.");
+				continue;
 			}
+
+			propAggregations ??= new System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate>();
+			Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionaryConverter.ReadItem(ref reader, options, out string key, out Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate value);
+			propAggregations[key] = value;
 		}
 
-		return new FiltersBucket { Aggregations = new Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary(additionalProperties), DocCount = docCount };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new FiltersBucket
+		{
+			Aggregations = new Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary(propAggregations)
+,
+			DocCount = propDocCount.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, FiltersBucket value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, FiltersBucket value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'FiltersBucket' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDocCount, value.DocCount);
+		if (value.Aggregations is not null)
+		{
+			foreach (var item in value.Aggregations)
+			{
+				Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionaryConverter.WriteItem(writer, options, item.Key, item.Value);
+			}
+		}
+
+		writer.WriteEndObject();
 	}
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/FrequentItemSetsAggregate.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/FrequentItemSetsAggregate.g.cs
index 10327902268..77f6ef424e2 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/FrequentItemSetsAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/FrequentItemSetsAggregate.g.cs
@@ -33,4 +33,6 @@ public sealed partial class FrequentItemSetsAggregate : IAggregate
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Aggregations.FrequentItemSetsBucket> Buckets { get; init; }
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
+
+	string IAggregate.Type => "frequent_item_sets";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/FrequentItemSetsBucket.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/FrequentItemSetsBucket.g.cs
index 61749981144..7713d42906f 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/FrequentItemSetsBucket.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/FrequentItemSetsBucket.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,56 +28,70 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Aggregations;
 
-internal sealed partial class FrequentItemSetsBucketConverter : JsonConverter<FrequentItemSetsBucket>
+internal sealed partial class FrequentItemSetsBucketConverter : System.Text.Json.Serialization.JsonConverter<FrequentItemSetsBucket>
 {
-	public override FrequentItemSetsBucket Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropDocCount = System.Text.Json.JsonEncodedText.Encode("doc_count");
+	private static readonly System.Text.Json.JsonEncodedText PropKey = System.Text.Json.JsonEncodedText.Encode("key");
+	private static readonly System.Text.Json.JsonEncodedText PropSupport = System.Text.Json.JsonEncodedText.Encode("support");
+
+	public override FrequentItemSetsBucket Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		long docCount = default;
-		IReadOnlyDictionary<Elastic.Clients.Elasticsearch.Serverless.Field, IReadOnlyCollection<string>> key = default;
-		double support = default;
-		Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate> propAggregations = default;
+		LocalJsonProperty<long> propDocCount = default;
+		LocalJsonProperty<IReadOnlyDictionary<Elastic.Clients.Elasticsearch.Serverless.Field, IReadOnlyCollection<string>>> propKey = default;
+		LocalJsonProperty<double> propSupport = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propDocCount.TryRead(ref reader, options, PropDocCount))
 			{
-				var property = reader.GetString();
-				if (property == "doc_count")
-				{
-					docCount = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "key")
-				{
-					key = JsonSerializer.Deserialize<IReadOnlyDictionary<Elastic.Clients.Elasticsearch.Serverless.Field, IReadOnlyCollection<string>>>(ref reader, options);
-					continue;
-				}
-
-				if (property == "support")
-				{
-					support = JsonSerializer.Deserialize<double>(ref reader, options);
-					continue;
-				}
+				continue;
+			}
 
-				if (property.Contains("#"))
-				{
-					additionalProperties ??= new Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate>();
-					AggregateDictionaryConverter.ReadItem(ref reader, options, additionalProperties, property);
-					continue;
-				}
+			if (propKey.TryRead(ref reader, options, PropKey))
+			{
+				continue;
+			}
 
-				throw new JsonException("Unknown property read from JSON.");
+			if (propSupport.TryRead(ref reader, options, PropSupport))
+			{
+				continue;
 			}
+
+			propAggregations ??= new System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate>();
+			Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionaryConverter.ReadItem(ref reader, options, out string key, out Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate value);
+			propAggregations[key] = value;
 		}
 
-		return new FrequentItemSetsBucket { Aggregations = new Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary(additionalProperties), DocCount = docCount, Key = key, Support = support };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new FrequentItemSetsBucket
+		{
+			Aggregations = new Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary(propAggregations)
+,
+			DocCount = propDocCount.Value
+,
+			Key = propKey.Value
+,
+			Support = propSupport.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, FrequentItemSetsBucket value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, FrequentItemSetsBucket value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'FrequentItemSetsBucket' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDocCount, value.DocCount);
+		writer.WriteProperty(options, PropKey, value.Key);
+		writer.WriteProperty(options, PropSupport, value.Support);
+		if (value.Aggregations is not null)
+		{
+			foreach (var item in value.Aggregations)
+			{
+				Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionaryConverter.WriteItem(writer, options, item.Key, item.Value);
+			}
+		}
+
+		writer.WriteEndObject();
 	}
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/GeoBoundsAggregate.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/GeoBoundsAggregate.g.cs
index 45bdf6b6fa1..e53ba7e48c0 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/GeoBoundsAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/GeoBoundsAggregate.g.cs
@@ -33,4 +33,6 @@ public sealed partial class GeoBoundsAggregate : IAggregate
 	public Elastic.Clients.Elasticsearch.Serverless.GeoBounds? Bounds { get; init; }
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
+
+	string IAggregate.Type => "geo_bounds";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/GeoCentroidAggregate.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/GeoCentroidAggregate.g.cs
index 2743788a100..9822229deca 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/GeoCentroidAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/GeoCentroidAggregate.g.cs
@@ -35,4 +35,6 @@ public sealed partial class GeoCentroidAggregate : IAggregate
 	public Elastic.Clients.Elasticsearch.Serverless.GeoLocation? Location { get; init; }
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
+
+	string IAggregate.Type => "geo_centroid";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/GeoDistanceAggregate.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/GeoDistanceAggregate.g.cs
index df2c4d5c0ba..cbe77a3f826 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/GeoDistanceAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/GeoDistanceAggregate.g.cs
@@ -38,4 +38,6 @@ public sealed partial class GeoDistanceAggregate : IAggregate
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Aggregations.RangeBucket> Buckets { get; init; }
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
+
+	string IAggregate.Type => "geo_distance";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/GeoLineAggregate.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/GeoLineAggregate.g.cs
index b2072a2fefa..8939b87c8aa 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/GeoLineAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/GeoLineAggregate.g.cs
@@ -37,4 +37,6 @@ public sealed partial class GeoLineAggregate : IAggregate
 	public object Properties { get; init; }
 	[JsonInclude, JsonPropertyName("type")]
 	public string Type { get; init; }
+
+	string IAggregate.Type => "geo_line";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/GeohashGridAggregate.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/GeohashGridAggregate.g.cs
index 3480803eef0..fd67b6e4fd8 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/GeohashGridAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/GeohashGridAggregate.g.cs
@@ -33,4 +33,6 @@ public sealed partial class GeohashGridAggregate : IAggregate
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Aggregations.GeohashGridBucket> Buckets { get; init; }
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
+
+	string IAggregate.Type => "geohash_grid";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/GeohashGridBucket.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/GeohashGridBucket.g.cs
index 1bb531d814f..36e18867729 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/GeohashGridBucket.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/GeohashGridBucket.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,49 +28,60 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Aggregations;
 
-internal sealed partial class GeohashGridBucketConverter : JsonConverter<GeohashGridBucket>
+internal sealed partial class GeohashGridBucketConverter : System.Text.Json.Serialization.JsonConverter<GeohashGridBucket>
 {
-	public override GeohashGridBucket Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropDocCount = System.Text.Json.JsonEncodedText.Encode("doc_count");
+	private static readonly System.Text.Json.JsonEncodedText PropKey = System.Text.Json.JsonEncodedText.Encode("key");
+
+	public override GeohashGridBucket Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		long docCount = default;
-		string key = default;
-		Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate> propAggregations = default;
+		LocalJsonProperty<long> propDocCount = default;
+		LocalJsonProperty<string> propKey = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propDocCount.TryRead(ref reader, options, PropDocCount))
 			{
-				var property = reader.GetString();
-				if (property == "doc_count")
-				{
-					docCount = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "key")
-				{
-					key = JsonSerializer.Deserialize<string>(ref reader, options);
-					continue;
-				}
-
-				if (property.Contains("#"))
-				{
-					additionalProperties ??= new Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate>();
-					AggregateDictionaryConverter.ReadItem(ref reader, options, additionalProperties, property);
-					continue;
-				}
+				continue;
+			}
 
-				throw new JsonException("Unknown property read from JSON.");
+			if (propKey.TryRead(ref reader, options, PropKey))
+			{
+				continue;
 			}
+
+			propAggregations ??= new System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate>();
+			Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionaryConverter.ReadItem(ref reader, options, out string key, out Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate value);
+			propAggregations[key] = value;
 		}
 
-		return new GeohashGridBucket { Aggregations = new Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary(additionalProperties), DocCount = docCount, Key = key };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GeohashGridBucket
+		{
+			Aggregations = new Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary(propAggregations)
+,
+			DocCount = propDocCount.Value
+,
+			Key = propKey.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, GeohashGridBucket value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GeohashGridBucket value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'GeohashGridBucket' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDocCount, value.DocCount);
+		writer.WriteProperty(options, PropKey, value.Key);
+		if (value.Aggregations is not null)
+		{
+			foreach (var item in value.Aggregations)
+			{
+				Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionaryConverter.WriteItem(writer, options, item.Key, item.Value);
+			}
+		}
+
+		writer.WriteEndObject();
 	}
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/GeohexGridAggregate.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/GeohexGridAggregate.g.cs
index 1667939d82a..6c5668663cd 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/GeohexGridAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/GeohexGridAggregate.g.cs
@@ -33,4 +33,6 @@ public sealed partial class GeohexGridAggregate : IAggregate
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Aggregations.GeohexGridBucket> Buckets { get; init; }
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
+
+	string IAggregate.Type => "geohex_grid";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/GeohexGridBucket.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/GeohexGridBucket.g.cs
index 5878ecf1f79..ad1efd611e3 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/GeohexGridBucket.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/GeohexGridBucket.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,49 +28,60 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Aggregations;
 
-internal sealed partial class GeohexGridBucketConverter : JsonConverter<GeohexGridBucket>
+internal sealed partial class GeohexGridBucketConverter : System.Text.Json.Serialization.JsonConverter<GeohexGridBucket>
 {
-	public override GeohexGridBucket Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropDocCount = System.Text.Json.JsonEncodedText.Encode("doc_count");
+	private static readonly System.Text.Json.JsonEncodedText PropKey = System.Text.Json.JsonEncodedText.Encode("key");
+
+	public override GeohexGridBucket Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		long docCount = default;
-		string key = default;
-		Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate> propAggregations = default;
+		LocalJsonProperty<long> propDocCount = default;
+		LocalJsonProperty<string> propKey = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propDocCount.TryRead(ref reader, options, PropDocCount))
 			{
-				var property = reader.GetString();
-				if (property == "doc_count")
-				{
-					docCount = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "key")
-				{
-					key = JsonSerializer.Deserialize<string>(ref reader, options);
-					continue;
-				}
-
-				if (property.Contains("#"))
-				{
-					additionalProperties ??= new Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate>();
-					AggregateDictionaryConverter.ReadItem(ref reader, options, additionalProperties, property);
-					continue;
-				}
+				continue;
+			}
 
-				throw new JsonException("Unknown property read from JSON.");
+			if (propKey.TryRead(ref reader, options, PropKey))
+			{
+				continue;
 			}
+
+			propAggregations ??= new System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate>();
+			Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionaryConverter.ReadItem(ref reader, options, out string key, out Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate value);
+			propAggregations[key] = value;
 		}
 
-		return new GeohexGridBucket { Aggregations = new Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary(additionalProperties), DocCount = docCount, Key = key };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GeohexGridBucket
+		{
+			Aggregations = new Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary(propAggregations)
+,
+			DocCount = propDocCount.Value
+,
+			Key = propKey.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, GeohexGridBucket value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GeohexGridBucket value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'GeohexGridBucket' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDocCount, value.DocCount);
+		writer.WriteProperty(options, PropKey, value.Key);
+		if (value.Aggregations is not null)
+		{
+			foreach (var item in value.Aggregations)
+			{
+				Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionaryConverter.WriteItem(writer, options, item.Key, item.Value);
+			}
+		}
+
+		writer.WriteEndObject();
 	}
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/GeotileGridAggregate.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/GeotileGridAggregate.g.cs
index 8e6cb1d6d12..c3de1563c32 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/GeotileGridAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/GeotileGridAggregate.g.cs
@@ -33,4 +33,6 @@ public sealed partial class GeotileGridAggregate : IAggregate
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Aggregations.GeotileGridBucket> Buckets { get; init; }
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
+
+	string IAggregate.Type => "geotile_grid";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/GeotileGridBucket.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/GeotileGridBucket.g.cs
index cfcaeda800e..28d0379ca49 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/GeotileGridBucket.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/GeotileGridBucket.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,49 +28,60 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Aggregations;
 
-internal sealed partial class GeotileGridBucketConverter : JsonConverter<GeotileGridBucket>
+internal sealed partial class GeotileGridBucketConverter : System.Text.Json.Serialization.JsonConverter<GeotileGridBucket>
 {
-	public override GeotileGridBucket Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropDocCount = System.Text.Json.JsonEncodedText.Encode("doc_count");
+	private static readonly System.Text.Json.JsonEncodedText PropKey = System.Text.Json.JsonEncodedText.Encode("key");
+
+	public override GeotileGridBucket Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		long docCount = default;
-		string key = default;
-		Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate> propAggregations = default;
+		LocalJsonProperty<long> propDocCount = default;
+		LocalJsonProperty<string> propKey = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propDocCount.TryRead(ref reader, options, PropDocCount))
 			{
-				var property = reader.GetString();
-				if (property == "doc_count")
-				{
-					docCount = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "key")
-				{
-					key = JsonSerializer.Deserialize<string>(ref reader, options);
-					continue;
-				}
-
-				if (property.Contains("#"))
-				{
-					additionalProperties ??= new Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate>();
-					AggregateDictionaryConverter.ReadItem(ref reader, options, additionalProperties, property);
-					continue;
-				}
+				continue;
+			}
 
-				throw new JsonException("Unknown property read from JSON.");
+			if (propKey.TryRead(ref reader, options, PropKey))
+			{
+				continue;
 			}
+
+			propAggregations ??= new System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate>();
+			Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionaryConverter.ReadItem(ref reader, options, out string key, out Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate value);
+			propAggregations[key] = value;
 		}
 
-		return new GeotileGridBucket { Aggregations = new Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary(additionalProperties), DocCount = docCount, Key = key };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GeotileGridBucket
+		{
+			Aggregations = new Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary(propAggregations)
+,
+			DocCount = propDocCount.Value
+,
+			Key = propKey.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, GeotileGridBucket value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GeotileGridBucket value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'GeotileGridBucket' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDocCount, value.DocCount);
+		writer.WriteProperty(options, PropKey, value.Key);
+		if (value.Aggregations is not null)
+		{
+			foreach (var item in value.Aggregations)
+			{
+				Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionaryConverter.WriteItem(writer, options, item.Key, item.Value);
+			}
+		}
+
+		writer.WriteEndObject();
 	}
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/GlobalAggregate.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/GlobalAggregate.g.cs
index d20cbd31f1c..a3cdab2f58c 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/GlobalAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/GlobalAggregate.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,49 +28,60 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Aggregations;
 
-internal sealed partial class GlobalAggregateConverter : JsonConverter<GlobalAggregate>
+internal sealed partial class GlobalAggregateConverter : System.Text.Json.Serialization.JsonConverter<GlobalAggregate>
 {
-	public override GlobalAggregate Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropDocCount = System.Text.Json.JsonEncodedText.Encode("doc_count");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+
+	public override GlobalAggregate Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		long docCount = default;
-		IReadOnlyDictionary<string, object>? meta = default;
-		Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate> propAggregations = default;
+		LocalJsonProperty<long> propDocCount = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, object>?> propMeta = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propDocCount.TryRead(ref reader, options, PropDocCount))
 			{
-				var property = reader.GetString();
-				if (property == "doc_count")
-				{
-					docCount = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "meta")
-				{
-					meta = JsonSerializer.Deserialize<IReadOnlyDictionary<string, object>?>(ref reader, options);
-					continue;
-				}
-
-				if (property.Contains("#"))
-				{
-					additionalProperties ??= new Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate>();
-					AggregateDictionaryConverter.ReadItem(ref reader, options, additionalProperties, property);
-					continue;
-				}
+				continue;
+			}
 
-				throw new JsonException("Unknown property read from JSON.");
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
 			}
+
+			propAggregations ??= new System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate>();
+			Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionaryConverter.ReadItem(ref reader, options, out string key, out Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate value);
+			propAggregations[key] = value;
 		}
 
-		return new GlobalAggregate { Aggregations = new Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary(additionalProperties), DocCount = docCount, Meta = meta };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GlobalAggregate
+		{
+			Aggregations = new Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary(propAggregations)
+,
+			DocCount = propDocCount.Value
+,
+			Meta = propMeta.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, GlobalAggregate value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GlobalAggregate value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'GlobalAggregate' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDocCount, value.DocCount);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		if (value.Aggregations is not null)
+		{
+			foreach (var item in value.Aggregations)
+			{
+				Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionaryConverter.WriteItem(writer, options, item.Key, item.Value);
+			}
+		}
+
+		writer.WriteEndObject();
 	}
 }
 
@@ -84,4 +96,6 @@ public sealed partial class GlobalAggregate : IAggregate
 	public Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary Aggregations { get; init; }
 	public long DocCount { get; init; }
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
+
+	string IAggregate.Type => "global";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/HdrPercentileRanksAggregate.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/HdrPercentileRanksAggregate.g.cs
index 6cc5bdc26df..03221158d13 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/HdrPercentileRanksAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/HdrPercentileRanksAggregate.g.cs
@@ -33,4 +33,6 @@ public sealed partial class HdrPercentileRanksAggregate : IAggregate
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
 	[JsonInclude, JsonPropertyName("values")]
 	public Elastic.Clients.Elasticsearch.Serverless.Aggregations.Percentiles Values { get; init; }
+
+	string IAggregate.Type => "hdr_percentile_ranks";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/HdrPercentilesAggregate.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/HdrPercentilesAggregate.g.cs
index 5da78134c81..f177f279d1c 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/HdrPercentilesAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/HdrPercentilesAggregate.g.cs
@@ -33,4 +33,6 @@ public sealed partial class HdrPercentilesAggregate : IAggregate
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
 	[JsonInclude, JsonPropertyName("values")]
 	public Elastic.Clients.Elasticsearch.Serverless.Aggregations.Percentiles Values { get; init; }
+
+	string IAggregate.Type => "hdr_percentiles";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/HistogramAggregate.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/HistogramAggregate.g.cs
index ca1937cb8c6..432000bd4ba 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/HistogramAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/HistogramAggregate.g.cs
@@ -33,4 +33,6 @@ public sealed partial class HistogramAggregate : IAggregate
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Aggregations.HistogramBucket> Buckets { get; init; }
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
+
+	string IAggregate.Type => "histogram";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/HistogramAggregation.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/HistogramAggregation.g.cs
index 35865ac046e..e2a5ff8bf37 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/HistogramAggregation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/HistogramAggregation.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,130 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Aggregations;
 
+internal sealed partial class HistogramAggregationConverter : System.Text.Json.Serialization.JsonConverter<HistogramAggregation>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropExtendedBounds = System.Text.Json.JsonEncodedText.Encode("extended_bounds");
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropFormat = System.Text.Json.JsonEncodedText.Encode("format");
+	private static readonly System.Text.Json.JsonEncodedText PropHardBounds = System.Text.Json.JsonEncodedText.Encode("hard_bounds");
+	private static readonly System.Text.Json.JsonEncodedText PropInterval = System.Text.Json.JsonEncodedText.Encode("interval");
+	private static readonly System.Text.Json.JsonEncodedText PropMinDocCount = System.Text.Json.JsonEncodedText.Encode("min_doc_count");
+	private static readonly System.Text.Json.JsonEncodedText PropMissing = System.Text.Json.JsonEncodedText.Encode("missing");
+	private static readonly System.Text.Json.JsonEncodedText PropOffset = System.Text.Json.JsonEncodedText.Encode("offset");
+	private static readonly System.Text.Json.JsonEncodedText PropOrder = System.Text.Json.JsonEncodedText.Encode("order");
+	private static readonly System.Text.Json.JsonEncodedText PropScript = System.Text.Json.JsonEncodedText.Encode("script");
+
+	public override HistogramAggregation Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Aggregations.ExtendedBoundsFloat?> propExtendedBounds = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Field?> propField = default;
+		LocalJsonProperty<string?> propFormat = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Aggregations.ExtendedBoundsFloat?> propHardBounds = default;
+		LocalJsonProperty<double?> propInterval = default;
+		LocalJsonProperty<int?> propMinDocCount = default;
+		LocalJsonProperty<double?> propMissing = default;
+		LocalJsonProperty<double?> propOffset = default;
+		LocalJsonProperty<ICollection<KeyValuePair<Elastic.Clients.Elasticsearch.Serverless.Field, Elastic.Clients.Elasticsearch.Serverless.SortOrder>>?> propOrder = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Script?> propScript = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propExtendedBounds.TryRead(ref reader, options, PropExtendedBounds))
+			{
+				continue;
+			}
+
+			if (propField.TryRead(ref reader, options, PropField))
+			{
+				continue;
+			}
+
+			if (propFormat.TryRead(ref reader, options, PropFormat))
+			{
+				continue;
+			}
+
+			if (propHardBounds.TryRead(ref reader, options, PropHardBounds))
+			{
+				continue;
+			}
+
+			if (propInterval.TryRead(ref reader, options, PropInterval))
+			{
+				continue;
+			}
+
+			if (propMinDocCount.TryRead(ref reader, options, PropMinDocCount))
+			{
+				continue;
+			}
+
+			if (propMissing.TryRead(ref reader, options, PropMissing))
+			{
+				continue;
+			}
+
+			if (propOffset.TryRead(ref reader, options, PropOffset))
+			{
+				continue;
+			}
+
+			if (propOrder.TryRead(ref reader, options, PropOrder, typeof(SingleOrManyMarker<IReadOnlyCollection<KeyValuePair<Elastic.Clients.Elasticsearch.Serverless.Field, Elastic.Clients.Elasticsearch.Serverless.SortOrder>>?, KeyValuePair<Elastic.Clients.Elasticsearch.Serverless.Field, Elastic.Clients.Elasticsearch.Serverless.SortOrder>>)))
+			{
+				continue;
+			}
+
+			if (propScript.TryRead(ref reader, options, PropScript))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new HistogramAggregation
+		{
+			ExtendedBounds = propExtendedBounds.Value
+,
+			Field = propField.Value
+,
+			Format = propFormat.Value
+,
+			HardBounds = propHardBounds.Value
+,
+			Interval = propInterval.Value
+,
+			MinDocCount = propMinDocCount.Value
+,
+			Missing = propMissing.Value
+,
+			Offset = propOffset.Value
+,
+			Order = propOrder.Value
+,
+			Script = propScript.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, HistogramAggregation value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropExtendedBounds, value.ExtendedBounds);
+		writer.WriteProperty(options, PropField, value.Field);
+		writer.WriteProperty(options, PropFormat, value.Format);
+		writer.WriteProperty(options, PropHardBounds, value.HardBounds);
+		writer.WriteProperty(options, PropInterval, value.Interval);
+		writer.WriteProperty(options, PropMinDocCount, value.MinDocCount);
+		writer.WriteProperty(options, PropMissing, value.Missing);
+		writer.WriteProperty(options, PropOffset, value.Offset);
+		writer.WriteProperty(options, PropOrder, value.Order, typeof(SingleOrManyMarker<IReadOnlyCollection<KeyValuePair<Elastic.Clients.Elasticsearch.Serverless.Field, Elastic.Clients.Elasticsearch.Serverless.SortOrder>>?, KeyValuePair<Elastic.Clients.Elasticsearch.Serverless.Field, Elastic.Clients.Elasticsearch.Serverless.SortOrder>>));
+		writer.WriteProperty(options, PropScript, value.Script);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(HistogramAggregationConverter))]
 public sealed partial class HistogramAggregation
 {
 	/// <summary>
@@ -34,7 +159,6 @@ public sealed partial class HistogramAggregation
 	/// Enables extending the bounds of the histogram beyond the data itself.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("extended_bounds")]
 	public Elastic.Clients.Elasticsearch.Serverless.Aggregations.ExtendedBoundsFloat? ExtendedBounds { get; set; }
 
 	/// <summary>
@@ -42,9 +166,7 @@ public sealed partial class HistogramAggregation
 	/// The name of the field to aggregate on.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("field")]
 	public Elastic.Clients.Elasticsearch.Serverless.Field? Field { get; set; }
-	[JsonInclude, JsonPropertyName("format")]
 	public string? Format { get; set; }
 
 	/// <summary>
@@ -53,7 +175,6 @@ public sealed partial class HistogramAggregation
 	/// It is particularly useful in the case of open data ranges that can result in a very large number of buckets.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("hard_bounds")]
 	public Elastic.Clients.Elasticsearch.Serverless.Aggregations.ExtendedBoundsFloat? HardBounds { get; set; }
 
 	/// <summary>
@@ -62,7 +183,6 @@ public sealed partial class HistogramAggregation
 	/// Must be a positive decimal.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("interval")]
 	public double? Interval { get; set; }
 
 	/// <summary>
@@ -71,7 +191,6 @@ public sealed partial class HistogramAggregation
 	/// By default, the response will fill gaps in the histogram with empty buckets.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("min_doc_count")]
 	public int? MinDocCount { get; set; }
 
 	/// <summary>
@@ -80,7 +199,6 @@ public sealed partial class HistogramAggregation
 	/// By default, documents without a value are ignored.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("missing")]
 	public double? Missing { get; set; }
 
 	/// <summary>
@@ -89,7 +207,6 @@ public sealed partial class HistogramAggregation
 	/// The bucket boundaries can be shifted by using the <c>offset</c> option.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("offset")]
 	public double? Offset { get; set; }
 
 	/// <summary>
@@ -98,10 +215,7 @@ public sealed partial class HistogramAggregation
 	/// By default, the returned buckets are sorted by their key ascending.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("order")]
-	[SingleOrManyCollectionConverter(typeof(KeyValuePair<Elastic.Clients.Elasticsearch.Serverless.Field, Elastic.Clients.Elasticsearch.Serverless.SortOrder>))]
 	public ICollection<KeyValuePair<Elastic.Clients.Elasticsearch.Serverless.Field, Elastic.Clients.Elasticsearch.Serverless.SortOrder>>? Order { get; set; }
-	[JsonInclude, JsonPropertyName("script")]
 	public Elastic.Clients.Elasticsearch.Serverless.Script? Script { get; set; }
 
 	public static implicit operator Elastic.Clients.Elasticsearch.Serverless.Aggregations.Aggregation(HistogramAggregation histogramAggregation) => Elastic.Clients.Elasticsearch.Serverless.Aggregations.Aggregation.Histogram(histogramAggregation);
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/HistogramBucket.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/HistogramBucket.g.cs
index fe02969739e..6409b1f3072 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/HistogramBucket.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/HistogramBucket.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,56 +28,70 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Aggregations;
 
-internal sealed partial class HistogramBucketConverter : JsonConverter<HistogramBucket>
+internal sealed partial class HistogramBucketConverter : System.Text.Json.Serialization.JsonConverter<HistogramBucket>
 {
-	public override HistogramBucket Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropDocCount = System.Text.Json.JsonEncodedText.Encode("doc_count");
+	private static readonly System.Text.Json.JsonEncodedText PropKey = System.Text.Json.JsonEncodedText.Encode("key");
+	private static readonly System.Text.Json.JsonEncodedText PropKeyAsString = System.Text.Json.JsonEncodedText.Encode("key_as_string");
+
+	public override HistogramBucket Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		long docCount = default;
-		double key = default;
-		string? keyAsString = default;
-		Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate> propAggregations = default;
+		LocalJsonProperty<long> propDocCount = default;
+		LocalJsonProperty<double> propKey = default;
+		LocalJsonProperty<string?> propKeyAsString = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propDocCount.TryRead(ref reader, options, PropDocCount))
 			{
-				var property = reader.GetString();
-				if (property == "doc_count")
-				{
-					docCount = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "key")
-				{
-					key = JsonSerializer.Deserialize<double>(ref reader, options);
-					continue;
-				}
-
-				if (property == "key_as_string")
-				{
-					keyAsString = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
+				continue;
+			}
 
-				if (property.Contains("#"))
-				{
-					additionalProperties ??= new Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate>();
-					AggregateDictionaryConverter.ReadItem(ref reader, options, additionalProperties, property);
-					continue;
-				}
+			if (propKey.TryRead(ref reader, options, PropKey))
+			{
+				continue;
+			}
 
-				throw new JsonException("Unknown property read from JSON.");
+			if (propKeyAsString.TryRead(ref reader, options, PropKeyAsString))
+			{
+				continue;
 			}
+
+			propAggregations ??= new System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate>();
+			Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionaryConverter.ReadItem(ref reader, options, out string key, out Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate value);
+			propAggregations[key] = value;
 		}
 
-		return new HistogramBucket { Aggregations = new Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary(additionalProperties), DocCount = docCount, Key = key, KeyAsString = keyAsString };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new HistogramBucket
+		{
+			Aggregations = new Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary(propAggregations)
+,
+			DocCount = propDocCount.Value
+,
+			Key = propKey.Value
+,
+			KeyAsString = propKeyAsString.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, HistogramBucket value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, HistogramBucket value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'HistogramBucket' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDocCount, value.DocCount);
+		writer.WriteProperty(options, PropKey, value.Key);
+		writer.WriteProperty(options, PropKeyAsString, value.KeyAsString);
+		if (value.Aggregations is not null)
+		{
+			foreach (var item in value.Aggregations)
+			{
+				Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionaryConverter.WriteItem(writer, options, item.Key, item.Value);
+			}
+		}
+
+		writer.WriteEndObject();
 	}
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/InferenceAggregate.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/InferenceAggregate.g.cs
index c181704ab19..c3ed0f75539 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/InferenceAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/InferenceAggregate.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,65 +28,90 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Aggregations;
 
-internal sealed partial class InferenceAggregateConverter : JsonConverter<InferenceAggregate>
+internal sealed partial class InferenceAggregateConverter : System.Text.Json.Serialization.JsonConverter<InferenceAggregate>
 {
-	public override InferenceAggregate Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropData = System.Text.Json.JsonEncodedText.Encode("data");
+	private static readonly System.Text.Json.JsonEncodedText PropFeatureImportance = System.Text.Json.JsonEncodedText.Encode("feature_importance");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropTopClasses = System.Text.Json.JsonEncodedText.Encode("top_classes");
+	private static readonly System.Text.Json.JsonEncodedText PropValue = System.Text.Json.JsonEncodedText.Encode("value");
+	private static readonly System.Text.Json.JsonEncodedText PropWarning = System.Text.Json.JsonEncodedText.Encode("warning");
+
+	public override InferenceAggregate Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Aggregations.InferenceFeatureImportance>? featureImportance = default;
-		IReadOnlyDictionary<string, object>? meta = default;
-		IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Aggregations.InferenceTopClassEntry>? topClasses = default;
-		Elastic.Clients.Elasticsearch.Serverless.FieldValue? value = default;
-		string? warning = default;
-		Dictionary<string, object> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, object> propData = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Aggregations.InferenceFeatureImportance>?> propFeatureImportance = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, object>?> propMeta = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Aggregations.InferenceTopClassEntry>?> propTopClasses = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.FieldValue?> propValue = default;
+		LocalJsonProperty<string?> propWarning = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propFeatureImportance.TryRead(ref reader, options, PropFeatureImportance))
 			{
-				var property = reader.GetString();
-				if (property == "feature_importance")
-				{
-					featureImportance = JsonSerializer.Deserialize<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Aggregations.InferenceFeatureImportance>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "meta")
-				{
-					meta = JsonSerializer.Deserialize<IReadOnlyDictionary<string, object>?>(ref reader, options);
-					continue;
-				}
+				continue;
+			}
 
-				if (property == "top_classes")
-				{
-					topClasses = JsonSerializer.Deserialize<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Aggregations.InferenceTopClassEntry>?>(ref reader, options);
-					continue;
-				}
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
 
-				if (property == "value")
-				{
-					value = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.FieldValue?>(ref reader, options);
-					continue;
-				}
+			if (propTopClasses.TryRead(ref reader, options, PropTopClasses))
+			{
+				continue;
+			}
 
-				if (property == "warning")
-				{
-					warning = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
+			if (propValue.TryRead(ref reader, options, PropValue))
+			{
+				continue;
+			}
 
-				additionalProperties ??= new Dictionary<string, object>();
-				var additionalValue = JsonSerializer.Deserialize<object>(ref reader, options);
-				additionalProperties.Add(property, additionalValue);
+			if (propWarning.TryRead(ref reader, options, PropWarning))
+			{
+				continue;
 			}
+
+			propData ??= new System.Collections.Generic.Dictionary<string, object>();
+			reader.ReadProperty(options, out string key, out object value);
+			propData[key] = value;
 		}
 
-		return new InferenceAggregate { Data = additionalProperties, FeatureImportance = featureImportance, Meta = meta, TopClasses = topClasses, Value = value, Warning = warning };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new InferenceAggregate
+		{
+			Data = propData
+,
+			FeatureImportance = propFeatureImportance.Value
+,
+			Meta = propMeta.Value
+,
+			TopClasses = propTopClasses.Value
+,
+			Value = propValue.Value
+,
+			Warning = propWarning.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, InferenceAggregate value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, InferenceAggregate value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'InferenceAggregate' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropFeatureImportance, value.FeatureImportance);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropTopClasses, value.TopClasses);
+		writer.WriteProperty(options, PropValue, value.Value);
+		writer.WriteProperty(options, PropWarning, value.Warning);
+		if (value.Data is not null)
+		{
+			foreach (var item in value.Data)
+			{
+				writer.WriteProperty(options, item.Key, item.Value);
+			}
+		}
+
+		writer.WriteEndObject();
 	}
 }
 
@@ -103,4 +129,6 @@ public sealed partial class InferenceAggregate : IAggregate
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Aggregations.InferenceTopClassEntry>? TopClasses { get; init; }
 	public Elastic.Clients.Elasticsearch.Serverless.FieldValue? Value { get; init; }
 	public string? Warning { get; init; }
+
+	string IAggregate.Type => "inference";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/InferenceConfig.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/InferenceConfig.g.cs
index e0656593355..e49f5cddb32 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/InferenceConfig.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/InferenceConfig.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -39,12 +40,16 @@ internal InferenceConfig(string variantName, object variant)
 			throw new ArgumentNullException(nameof(variant));
 		if (string.IsNullOrWhiteSpace(variantName))
 			throw new ArgumentException("Variant name must not be empty or whitespace.");
-		VariantName = variantName;
+		VariantType = variantName;
 		Variant = variant;
 	}
 
-	internal object Variant { get; }
-	internal string VariantName { get; }
+	internal InferenceConfig()
+	{
+	}
+
+	public object Variant { get; internal set; }
+	public string VariantType { get; internal set; }
 
 	public static InferenceConfig Classification(Elastic.Clients.Elasticsearch.Serverless.MachineLearning.ClassificationInferenceOptions classificationInferenceOptions) => new InferenceConfig("classification", classificationInferenceOptions);
 	public static InferenceConfig Regression(Elastic.Clients.Elasticsearch.Serverless.MachineLearning.RegressionInferenceOptions regressionInferenceOptions) => new InferenceConfig("regression", regressionInferenceOptions);
@@ -62,67 +67,56 @@ public bool TryGet<T>([NotNullWhen(true)] out T? result) where T : class
 	}
 }
 
-internal sealed partial class InferenceConfigConverter : JsonConverter<InferenceConfig>
+internal sealed partial class InferenceConfigConverter : System.Text.Json.Serialization.JsonConverter<InferenceConfig>
 {
-	public override InferenceConfig Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-		{
-			throw new JsonException("Expected start token.");
-		}
+	private static readonly System.Text.Json.JsonEncodedText VariantClassification = System.Text.Json.JsonEncodedText.Encode("classification");
+	private static readonly System.Text.Json.JsonEncodedText VariantRegression = System.Text.Json.JsonEncodedText.Encode("regression");
 
-		object? variantValue = default;
-		string? variantNameValue = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+	public override InferenceConfig Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		var variantType = string.Empty;
+		object? variant = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
+			if (reader.ValueTextEquals(VariantClassification))
 			{
-				throw new JsonException("Expected a property name token.");
-			}
-
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token representing the name of an Elasticsearch field.");
-			}
-
-			var propertyName = reader.GetString();
-			reader.Read();
-			if (propertyName == "classification")
-			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.ClassificationInferenceOptions?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantClassification.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.ClassificationInferenceOptions?>(options);
 				continue;
 			}
 
-			if (propertyName == "regression")
+			if (reader.ValueTextEquals(VariantRegression))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.RegressionInferenceOptions?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantRegression.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.RegressionInferenceOptions?>(options);
 				continue;
 			}
 
-			throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'InferenceConfig' from the response.");
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		var result = new InferenceConfig(variantNameValue, variantValue);
-		return result;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new InferenceConfig { VariantType = variantType, Variant = variant };
 	}
 
-	public override void Write(Utf8JsonWriter writer, InferenceConfig value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, InferenceConfig value, System.Text.Json.JsonSerializerOptions options)
 	{
 		writer.WriteStartObject();
-		if (value.VariantName is not null && value.Variant is not null)
+		switch (value.VariantType)
 		{
-			writer.WritePropertyName(value.VariantName);
-			switch (value.VariantName)
-			{
-				case "classification":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.ClassificationInferenceOptions>(writer, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.ClassificationInferenceOptions)value.Variant, options);
-					break;
-				case "regression":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.RegressionInferenceOptions>(writer, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.RegressionInferenceOptions)value.Variant, options);
-					break;
-			}
+			case "":
+				break;
+			case "classification":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.ClassificationInferenceOptions?)value.Variant);
+				break;
+			case "regression":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.RegressionInferenceOptions?)value.Variant);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.VariantType}' is not supported for type '{nameof(InferenceConfig)}'.");
 		}
 
 		writer.WriteEndObject();
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/IpPrefixAggregate.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/IpPrefixAggregate.g.cs
index e5cc36e2271..99864e08720 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/IpPrefixAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/IpPrefixAggregate.g.cs
@@ -33,4 +33,6 @@ public sealed partial class IpPrefixAggregate : IAggregate
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Aggregations.IpPrefixBucket> Buckets { get; init; }
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
+
+	string IAggregate.Type => "ip_prefix";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/IpPrefixBucket.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/IpPrefixBucket.g.cs
index 8ad90a71f6b..b0bcd9a5428 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/IpPrefixBucket.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/IpPrefixBucket.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,70 +28,90 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Aggregations;
 
-internal sealed partial class IpPrefixBucketConverter : JsonConverter<IpPrefixBucket>
+internal sealed partial class IpPrefixBucketConverter : System.Text.Json.Serialization.JsonConverter<IpPrefixBucket>
 {
-	public override IpPrefixBucket Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropDocCount = System.Text.Json.JsonEncodedText.Encode("doc_count");
+	private static readonly System.Text.Json.JsonEncodedText PropIsIpv6 = System.Text.Json.JsonEncodedText.Encode("is_ipv6");
+	private static readonly System.Text.Json.JsonEncodedText PropKey = System.Text.Json.JsonEncodedText.Encode("key");
+	private static readonly System.Text.Json.JsonEncodedText PropNetmask = System.Text.Json.JsonEncodedText.Encode("netmask");
+	private static readonly System.Text.Json.JsonEncodedText PropPrefixLength = System.Text.Json.JsonEncodedText.Encode("prefix_length");
+
+	public override IpPrefixBucket Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		long docCount = default;
-		bool isIpv6 = default;
-		string key = default;
-		string? netmask = default;
-		int prefixLength = default;
-		Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate> propAggregations = default;
+		LocalJsonProperty<long> propDocCount = default;
+		LocalJsonProperty<bool> propIsIpv6 = default;
+		LocalJsonProperty<string> propKey = default;
+		LocalJsonProperty<string?> propNetmask = default;
+		LocalJsonProperty<int> propPrefixLength = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propDocCount.TryRead(ref reader, options, PropDocCount))
 			{
-				var property = reader.GetString();
-				if (property == "doc_count")
-				{
-					docCount = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "is_ipv6")
-				{
-					isIpv6 = JsonSerializer.Deserialize<bool>(ref reader, options);
-					continue;
-				}
-
-				if (property == "key")
-				{
-					key = JsonSerializer.Deserialize<string>(ref reader, options);
-					continue;
-				}
+				continue;
+			}
 
-				if (property == "netmask")
-				{
-					netmask = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
+			if (propIsIpv6.TryRead(ref reader, options, PropIsIpv6))
+			{
+				continue;
+			}
 
-				if (property == "prefix_length")
-				{
-					prefixLength = JsonSerializer.Deserialize<int>(ref reader, options);
-					continue;
-				}
+			if (propKey.TryRead(ref reader, options, PropKey))
+			{
+				continue;
+			}
 
-				if (property.Contains("#"))
-				{
-					additionalProperties ??= new Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate>();
-					AggregateDictionaryConverter.ReadItem(ref reader, options, additionalProperties, property);
-					continue;
-				}
+			if (propNetmask.TryRead(ref reader, options, PropNetmask))
+			{
+				continue;
+			}
 
-				throw new JsonException("Unknown property read from JSON.");
+			if (propPrefixLength.TryRead(ref reader, options, PropPrefixLength))
+			{
+				continue;
 			}
+
+			propAggregations ??= new System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate>();
+			Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionaryConverter.ReadItem(ref reader, options, out string key, out Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate value);
+			propAggregations[key] = value;
 		}
 
-		return new IpPrefixBucket { Aggregations = new Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary(additionalProperties), DocCount = docCount, IsIpv6 = isIpv6, Key = key, Netmask = netmask, PrefixLength = prefixLength };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new IpPrefixBucket
+		{
+			Aggregations = new Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary(propAggregations)
+,
+			DocCount = propDocCount.Value
+,
+			IsIpv6 = propIsIpv6.Value
+,
+			Key = propKey.Value
+,
+			Netmask = propNetmask.Value
+,
+			PrefixLength = propPrefixLength.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, IpPrefixBucket value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IpPrefixBucket value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'IpPrefixBucket' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDocCount, value.DocCount);
+		writer.WriteProperty(options, PropIsIpv6, value.IsIpv6);
+		writer.WriteProperty(options, PropKey, value.Key);
+		writer.WriteProperty(options, PropNetmask, value.Netmask);
+		writer.WriteProperty(options, PropPrefixLength, value.PrefixLength);
+		if (value.Aggregations is not null)
+		{
+			foreach (var item in value.Aggregations)
+			{
+				Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionaryConverter.WriteItem(writer, options, item.Key, item.Value);
+			}
+		}
+
+		writer.WriteEndObject();
 	}
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/IpRangeAggregate.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/IpRangeAggregate.g.cs
index 93fe5cb476e..0457c897615 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/IpRangeAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/IpRangeAggregate.g.cs
@@ -33,4 +33,6 @@ public sealed partial class IpRangeAggregate : IAggregate
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Aggregations.IpRangeBucket> Buckets { get; init; }
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
+
+	string IAggregate.Type => "ip_range";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/IpRangeBucket.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/IpRangeBucket.g.cs
index eb63a544bb6..ee26248766a 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/IpRangeBucket.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/IpRangeBucket.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,63 +28,80 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Aggregations;
 
-internal sealed partial class IpRangeBucketConverter : JsonConverter<IpRangeBucket>
+internal sealed partial class IpRangeBucketConverter : System.Text.Json.Serialization.JsonConverter<IpRangeBucket>
 {
-	public override IpRangeBucket Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropDocCount = System.Text.Json.JsonEncodedText.Encode("doc_count");
+	private static readonly System.Text.Json.JsonEncodedText PropFrom = System.Text.Json.JsonEncodedText.Encode("from");
+	private static readonly System.Text.Json.JsonEncodedText PropKey = System.Text.Json.JsonEncodedText.Encode("key");
+	private static readonly System.Text.Json.JsonEncodedText PropTo = System.Text.Json.JsonEncodedText.Encode("to");
+
+	public override IpRangeBucket Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		long docCount = default;
-		string? from = default;
-		string? key = default;
-		string? to = default;
-		Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate> propAggregations = default;
+		LocalJsonProperty<long> propDocCount = default;
+		LocalJsonProperty<string?> propFrom = default;
+		LocalJsonProperty<string?> propKey = default;
+		LocalJsonProperty<string?> propTo = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propDocCount.TryRead(ref reader, options, PropDocCount))
 			{
-				var property = reader.GetString();
-				if (property == "doc_count")
-				{
-					docCount = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "from")
-				{
-					from = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "key")
-				{
-					key = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
+				continue;
+			}
 
-				if (property == "to")
-				{
-					to = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
+			if (propFrom.TryRead(ref reader, options, PropFrom))
+			{
+				continue;
+			}
 
-				if (property.Contains("#"))
-				{
-					additionalProperties ??= new Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate>();
-					AggregateDictionaryConverter.ReadItem(ref reader, options, additionalProperties, property);
-					continue;
-				}
+			if (propKey.TryRead(ref reader, options, PropKey))
+			{
+				continue;
+			}
 
-				throw new JsonException("Unknown property read from JSON.");
+			if (propTo.TryRead(ref reader, options, PropTo))
+			{
+				continue;
 			}
+
+			propAggregations ??= new System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate>();
+			Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionaryConverter.ReadItem(ref reader, options, out string key, out Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate value);
+			propAggregations[key] = value;
 		}
 
-		return new IpRangeBucket { Aggregations = new Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary(additionalProperties), DocCount = docCount, From = from, Key = key, To = to };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new IpRangeBucket
+		{
+			Aggregations = new Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary(propAggregations)
+,
+			DocCount = propDocCount.Value
+,
+			From = propFrom.Value
+,
+			Key = propKey.Value
+,
+			To = propTo.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, IpRangeBucket value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IpRangeBucket value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'IpRangeBucket' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDocCount, value.DocCount);
+		writer.WriteProperty(options, PropFrom, value.From);
+		writer.WriteProperty(options, PropKey, value.Key);
+		writer.WriteProperty(options, PropTo, value.To);
+		if (value.Aggregations is not null)
+		{
+			foreach (var item in value.Aggregations)
+			{
+				Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionaryConverter.WriteItem(writer, options, item.Key, item.Value);
+			}
+		}
+
+		writer.WriteEndObject();
 	}
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/LongRareTermsAggregate.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/LongRareTermsAggregate.g.cs
index f609bb3999b..1d2865b217a 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/LongRareTermsAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/LongRareTermsAggregate.g.cs
@@ -38,4 +38,6 @@ public sealed partial class LongRareTermsAggregate : IAggregate
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Aggregations.LongRareTermsBucket> Buckets { get; init; }
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
+
+	string IAggregate.Type => "lrareterms";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/LongRareTermsBucket.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/LongRareTermsBucket.g.cs
index 97f7fb82c59..2b0c3fc2465 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/LongRareTermsBucket.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/LongRareTermsBucket.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,56 +28,70 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Aggregations;
 
-internal sealed partial class LongRareTermsBucketConverter : JsonConverter<LongRareTermsBucket>
+internal sealed partial class LongRareTermsBucketConverter : System.Text.Json.Serialization.JsonConverter<LongRareTermsBucket>
 {
-	public override LongRareTermsBucket Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropDocCount = System.Text.Json.JsonEncodedText.Encode("doc_count");
+	private static readonly System.Text.Json.JsonEncodedText PropKey = System.Text.Json.JsonEncodedText.Encode("key");
+	private static readonly System.Text.Json.JsonEncodedText PropKeyAsString = System.Text.Json.JsonEncodedText.Encode("key_as_string");
+
+	public override LongRareTermsBucket Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		long docCount = default;
-		long key = default;
-		string? keyAsString = default;
-		Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate> propAggregations = default;
+		LocalJsonProperty<long> propDocCount = default;
+		LocalJsonProperty<long> propKey = default;
+		LocalJsonProperty<string?> propKeyAsString = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propDocCount.TryRead(ref reader, options, PropDocCount))
 			{
-				var property = reader.GetString();
-				if (property == "doc_count")
-				{
-					docCount = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "key")
-				{
-					key = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "key_as_string")
-				{
-					keyAsString = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
+				continue;
+			}
 
-				if (property.Contains("#"))
-				{
-					additionalProperties ??= new Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate>();
-					AggregateDictionaryConverter.ReadItem(ref reader, options, additionalProperties, property);
-					continue;
-				}
+			if (propKey.TryRead(ref reader, options, PropKey))
+			{
+				continue;
+			}
 
-				throw new JsonException("Unknown property read from JSON.");
+			if (propKeyAsString.TryRead(ref reader, options, PropKeyAsString))
+			{
+				continue;
 			}
+
+			propAggregations ??= new System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate>();
+			Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionaryConverter.ReadItem(ref reader, options, out string key, out Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate value);
+			propAggregations[key] = value;
 		}
 
-		return new LongRareTermsBucket { Aggregations = new Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary(additionalProperties), DocCount = docCount, Key = key, KeyAsString = keyAsString };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new LongRareTermsBucket
+		{
+			Aggregations = new Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary(propAggregations)
+,
+			DocCount = propDocCount.Value
+,
+			Key = propKey.Value
+,
+			KeyAsString = propKeyAsString.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, LongRareTermsBucket value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, LongRareTermsBucket value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'LongRareTermsBucket' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDocCount, value.DocCount);
+		writer.WriteProperty(options, PropKey, value.Key);
+		writer.WriteProperty(options, PropKeyAsString, value.KeyAsString);
+		if (value.Aggregations is not null)
+		{
+			foreach (var item in value.Aggregations)
+			{
+				Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionaryConverter.WriteItem(writer, options, item.Key, item.Value);
+			}
+		}
+
+		writer.WriteEndObject();
 	}
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/LongTermsAggregate.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/LongTermsAggregate.g.cs
index b4bfc3acf8f..0d14e75adbf 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/LongTermsAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/LongTermsAggregate.g.cs
@@ -42,4 +42,6 @@ public sealed partial class LongTermsAggregate : IAggregate
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
 	[JsonInclude, JsonPropertyName("sum_other_doc_count")]
 	public long? SumOtherDocCount { get; init; }
+
+	string IAggregate.Type => "lterms";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/LongTermsBucket.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/LongTermsBucket.g.cs
index 6d3ebf56606..88bb02a96eb 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/LongTermsBucket.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/LongTermsBucket.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,63 +28,80 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Aggregations;
 
-internal sealed partial class LongTermsBucketConverter : JsonConverter<LongTermsBucket>
+internal sealed partial class LongTermsBucketConverter : System.Text.Json.Serialization.JsonConverter<LongTermsBucket>
 {
-	public override LongTermsBucket Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropDocCount = System.Text.Json.JsonEncodedText.Encode("doc_count");
+	private static readonly System.Text.Json.JsonEncodedText PropDocCountErrorUpperBound = System.Text.Json.JsonEncodedText.Encode("doc_count_error_upper_bound");
+	private static readonly System.Text.Json.JsonEncodedText PropKey = System.Text.Json.JsonEncodedText.Encode("key");
+	private static readonly System.Text.Json.JsonEncodedText PropKeyAsString = System.Text.Json.JsonEncodedText.Encode("key_as_string");
+
+	public override LongTermsBucket Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		long docCount = default;
-		long? docCountErrorUpperBound = default;
-		long key = default;
-		string? keyAsString = default;
-		Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate> propAggregations = default;
+		LocalJsonProperty<long> propDocCount = default;
+		LocalJsonProperty<long?> propDocCountErrorUpperBound = default;
+		LocalJsonProperty<long> propKey = default;
+		LocalJsonProperty<string?> propKeyAsString = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propDocCount.TryRead(ref reader, options, PropDocCount))
 			{
-				var property = reader.GetString();
-				if (property == "doc_count")
-				{
-					docCount = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "doc_count_error_upper_bound")
-				{
-					docCountErrorUpperBound = JsonSerializer.Deserialize<long?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "key")
-				{
-					key = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
+				continue;
+			}
 
-				if (property == "key_as_string")
-				{
-					keyAsString = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
+			if (propDocCountErrorUpperBound.TryRead(ref reader, options, PropDocCountErrorUpperBound))
+			{
+				continue;
+			}
 
-				if (property.Contains("#"))
-				{
-					additionalProperties ??= new Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate>();
-					AggregateDictionaryConverter.ReadItem(ref reader, options, additionalProperties, property);
-					continue;
-				}
+			if (propKey.TryRead(ref reader, options, PropKey))
+			{
+				continue;
+			}
 
-				throw new JsonException("Unknown property read from JSON.");
+			if (propKeyAsString.TryRead(ref reader, options, PropKeyAsString))
+			{
+				continue;
 			}
+
+			propAggregations ??= new System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate>();
+			Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionaryConverter.ReadItem(ref reader, options, out string key, out Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate value);
+			propAggregations[key] = value;
 		}
 
-		return new LongTermsBucket { Aggregations = new Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary(additionalProperties), DocCount = docCount, DocCountErrorUpperBound = docCountErrorUpperBound, Key = key, KeyAsString = keyAsString };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new LongTermsBucket
+		{
+			Aggregations = new Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary(propAggregations)
+,
+			DocCount = propDocCount.Value
+,
+			DocCountErrorUpperBound = propDocCountErrorUpperBound.Value
+,
+			Key = propKey.Value
+,
+			KeyAsString = propKeyAsString.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, LongTermsBucket value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, LongTermsBucket value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'LongTermsBucket' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDocCount, value.DocCount);
+		writer.WriteProperty(options, PropDocCountErrorUpperBound, value.DocCountErrorUpperBound);
+		writer.WriteProperty(options, PropKey, value.Key);
+		writer.WriteProperty(options, PropKeyAsString, value.KeyAsString);
+		if (value.Aggregations is not null)
+		{
+			foreach (var item in value.Aggregations)
+			{
+				Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionaryConverter.WriteItem(writer, options, item.Key, item.Value);
+			}
+		}
+
+		writer.WriteEndObject();
 	}
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/MatrixStatsAggregate.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/MatrixStatsAggregate.g.cs
index 04992647c72..28c5b63e133 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/MatrixStatsAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/MatrixStatsAggregate.g.cs
@@ -35,4 +35,6 @@ public sealed partial class MatrixStatsAggregate : IAggregate
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Aggregations.MatrixStatsFields>? Fields { get; init; }
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
+
+	string IAggregate.Type => "matrix_stats";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/MatrixStatsAggregation.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/MatrixStatsAggregation.g.cs
index dd596d44720..b329200cb48 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/MatrixStatsAggregation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/MatrixStatsAggregation.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,60 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Aggregations;
 
+internal sealed partial class MatrixStatsAggregationConverter : System.Text.Json.Serialization.JsonConverter<MatrixStatsAggregation>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropMissing = System.Text.Json.JsonEncodedText.Encode("missing");
+	private static readonly System.Text.Json.JsonEncodedText PropMode = System.Text.Json.JsonEncodedText.Encode("mode");
+
+	public override MatrixStatsAggregation Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Fields?> propFields = default;
+		LocalJsonProperty<IDictionary<Elastic.Clients.Elasticsearch.Serverless.Field, double>?> propMissing = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.SortMode?> propMode = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propFields.TryRead(ref reader, options, PropFields, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propMissing.TryRead(ref reader, options, PropMissing))
+			{
+				continue;
+			}
+
+			if (propMode.TryRead(ref reader, options, PropMode))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new MatrixStatsAggregation
+		{
+			Fields = propFields.Value
+,
+			Missing = propMissing.Value
+,
+			Mode = propMode.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, MatrixStatsAggregation value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropFields, value.Fields, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropMissing, value.Missing);
+		writer.WriteProperty(options, PropMode, value.Mode);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(MatrixStatsAggregationConverter))]
 public sealed partial class MatrixStatsAggregation
 {
 	/// <summary>
@@ -34,8 +89,6 @@ public sealed partial class MatrixStatsAggregation
 	/// An array of fields for computing the statistics.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("fields")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Serverless.Fields? Fields { get; set; }
 
 	/// <summary>
@@ -44,7 +97,6 @@ public sealed partial class MatrixStatsAggregation
 	/// By default, documents without a value are ignored.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("missing")]
 	public IDictionary<Elastic.Clients.Elasticsearch.Serverless.Field, double>? Missing { get; set; }
 
 	/// <summary>
@@ -52,7 +104,6 @@ public sealed partial class MatrixStatsAggregation
 	/// Array value the aggregation will use for array or multi-valued fields.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("mode")]
 	public Elastic.Clients.Elasticsearch.Serverless.SortMode? Mode { get; set; }
 
 	public static implicit operator Elastic.Clients.Elasticsearch.Serverless.Aggregations.Aggregation(MatrixStatsAggregation matrixStatsAggregation) => Elastic.Clients.Elasticsearch.Serverless.Aggregations.Aggregation.MatrixStats(matrixStatsAggregation);
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/MatrixStatsFields.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/MatrixStatsFields.g.cs
index 7938ea4a34d..961a1d8f0d7 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/MatrixStatsFields.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/MatrixStatsFields.g.cs
@@ -30,12 +30,10 @@ namespace Elastic.Clients.Elasticsearch.Serverless.Aggregations;
 public sealed partial class MatrixStatsFields
 {
 	[JsonInclude, JsonPropertyName("correlation")]
-	[ReadOnlyFieldDictionaryConverter(typeof(double))]
 	public IReadOnlyDictionary<Elastic.Clients.Elasticsearch.Serverless.Field, double> Correlation { get; init; }
 	[JsonInclude, JsonPropertyName("count")]
 	public long Count { get; init; }
 	[JsonInclude, JsonPropertyName("covariance")]
-	[ReadOnlyFieldDictionaryConverter(typeof(double))]
 	public IReadOnlyDictionary<Elastic.Clients.Elasticsearch.Serverless.Field, double> Covariance { get; init; }
 	[JsonInclude, JsonPropertyName("kurtosis")]
 	public double Kurtosis { get; init; }
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/MaxAggregate.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/MaxAggregate.g.cs
index a17cee15fdd..af01aec9a0d 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/MaxAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/MaxAggregate.g.cs
@@ -42,4 +42,6 @@ public sealed partial class MaxAggregate : IAggregate
 	public double? Value { get; init; }
 	[JsonInclude, JsonPropertyName("value_as_string")]
 	public string? ValueAsString { get; init; }
+
+	string IAggregate.Type => "max";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/MedianAbsoluteDeviationAggregate.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/MedianAbsoluteDeviationAggregate.g.cs
index 572d8d27a3a..35fd9b078ac 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/MedianAbsoluteDeviationAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/MedianAbsoluteDeviationAggregate.g.cs
@@ -42,4 +42,6 @@ public sealed partial class MedianAbsoluteDeviationAggregate : IAggregate
 	public double? Value { get; init; }
 	[JsonInclude, JsonPropertyName("value_as_string")]
 	public string? ValueAsString { get; init; }
+
+	string IAggregate.Type => "median_absolute_deviation";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/MinAggregate.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/MinAggregate.g.cs
index c027bc24cfb..482da34a69a 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/MinAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/MinAggregate.g.cs
@@ -42,4 +42,6 @@ public sealed partial class MinAggregate : IAggregate
 	public double? Value { get; init; }
 	[JsonInclude, JsonPropertyName("value_as_string")]
 	public string? ValueAsString { get; init; }
+
+	string IAggregate.Type => "min";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/MissingAggregate.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/MissingAggregate.g.cs
index 7beb0b402f8..4a21bbafe83 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/MissingAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/MissingAggregate.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,49 +28,60 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Aggregations;
 
-internal sealed partial class MissingAggregateConverter : JsonConverter<MissingAggregate>
+internal sealed partial class MissingAggregateConverter : System.Text.Json.Serialization.JsonConverter<MissingAggregate>
 {
-	public override MissingAggregate Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropDocCount = System.Text.Json.JsonEncodedText.Encode("doc_count");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+
+	public override MissingAggregate Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		long docCount = default;
-		IReadOnlyDictionary<string, object>? meta = default;
-		Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate> propAggregations = default;
+		LocalJsonProperty<long> propDocCount = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, object>?> propMeta = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propDocCount.TryRead(ref reader, options, PropDocCount))
 			{
-				var property = reader.GetString();
-				if (property == "doc_count")
-				{
-					docCount = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "meta")
-				{
-					meta = JsonSerializer.Deserialize<IReadOnlyDictionary<string, object>?>(ref reader, options);
-					continue;
-				}
-
-				if (property.Contains("#"))
-				{
-					additionalProperties ??= new Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate>();
-					AggregateDictionaryConverter.ReadItem(ref reader, options, additionalProperties, property);
-					continue;
-				}
+				continue;
+			}
 
-				throw new JsonException("Unknown property read from JSON.");
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
 			}
+
+			propAggregations ??= new System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate>();
+			Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionaryConverter.ReadItem(ref reader, options, out string key, out Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate value);
+			propAggregations[key] = value;
 		}
 
-		return new MissingAggregate { Aggregations = new Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary(additionalProperties), DocCount = docCount, Meta = meta };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new MissingAggregate
+		{
+			Aggregations = new Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary(propAggregations)
+,
+			DocCount = propDocCount.Value
+,
+			Meta = propMeta.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, MissingAggregate value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, MissingAggregate value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'MissingAggregate' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDocCount, value.DocCount);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		if (value.Aggregations is not null)
+		{
+			foreach (var item in value.Aggregations)
+			{
+				Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionaryConverter.WriteItem(writer, options, item.Key, item.Value);
+			}
+		}
+
+		writer.WriteEndObject();
 	}
 }
 
@@ -84,4 +96,6 @@ public sealed partial class MissingAggregate : IAggregate
 	public Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary Aggregations { get; init; }
 	public long DocCount { get; init; }
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
+
+	string IAggregate.Type => "missing";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/MultiTermsAggregate.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/MultiTermsAggregate.g.cs
index 2cbb83d7203..371a0ab210a 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/MultiTermsAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/MultiTermsAggregate.g.cs
@@ -37,4 +37,6 @@ public sealed partial class MultiTermsAggregate : IAggregate
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
 	[JsonInclude, JsonPropertyName("sum_other_doc_count")]
 	public long? SumOtherDocCount { get; init; }
+
+	string IAggregate.Type => "multi_terms";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/MultiTermsAggregation.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/MultiTermsAggregation.g.cs
index 385bae8dd19..ef1ded8da89 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/MultiTermsAggregation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/MultiTermsAggregation.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,110 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Aggregations;
 
+internal sealed partial class MultiTermsAggregationConverter : System.Text.Json.Serialization.JsonConverter<MultiTermsAggregation>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCollectMode = System.Text.Json.JsonEncodedText.Encode("collect_mode");
+	private static readonly System.Text.Json.JsonEncodedText PropMinDocCount = System.Text.Json.JsonEncodedText.Encode("min_doc_count");
+	private static readonly System.Text.Json.JsonEncodedText PropOrder = System.Text.Json.JsonEncodedText.Encode("order");
+	private static readonly System.Text.Json.JsonEncodedText PropShardMinDocCount = System.Text.Json.JsonEncodedText.Encode("shard_min_doc_count");
+	private static readonly System.Text.Json.JsonEncodedText PropShardSize = System.Text.Json.JsonEncodedText.Encode("shard_size");
+	private static readonly System.Text.Json.JsonEncodedText PropShowTermDocCountError = System.Text.Json.JsonEncodedText.Encode("show_term_doc_count_error");
+	private static readonly System.Text.Json.JsonEncodedText PropSize = System.Text.Json.JsonEncodedText.Encode("size");
+	private static readonly System.Text.Json.JsonEncodedText PropTerms = System.Text.Json.JsonEncodedText.Encode("terms");
+
+	public override MultiTermsAggregation Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Aggregations.TermsAggregationCollectMode?> propCollectMode = default;
+		LocalJsonProperty<long?> propMinDocCount = default;
+		LocalJsonProperty<ICollection<KeyValuePair<Elastic.Clients.Elasticsearch.Serverless.Field, Elastic.Clients.Elasticsearch.Serverless.SortOrder>>?> propOrder = default;
+		LocalJsonProperty<long?> propShardMinDocCount = default;
+		LocalJsonProperty<int?> propShardSize = default;
+		LocalJsonProperty<bool?> propShowTermDocCountError = default;
+		LocalJsonProperty<int?> propSize = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.Aggregations.MultiTermLookup>> propTerms = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCollectMode.TryRead(ref reader, options, PropCollectMode))
+			{
+				continue;
+			}
+
+			if (propMinDocCount.TryRead(ref reader, options, PropMinDocCount))
+			{
+				continue;
+			}
+
+			if (propOrder.TryRead(ref reader, options, PropOrder, typeof(SingleOrManyMarker<IReadOnlyCollection<KeyValuePair<Elastic.Clients.Elasticsearch.Serverless.Field, Elastic.Clients.Elasticsearch.Serverless.SortOrder>>?, KeyValuePair<Elastic.Clients.Elasticsearch.Serverless.Field, Elastic.Clients.Elasticsearch.Serverless.SortOrder>>)))
+			{
+				continue;
+			}
+
+			if (propShardMinDocCount.TryRead(ref reader, options, PropShardMinDocCount))
+			{
+				continue;
+			}
+
+			if (propShardSize.TryRead(ref reader, options, PropShardSize))
+			{
+				continue;
+			}
+
+			if (propShowTermDocCountError.TryRead(ref reader, options, PropShowTermDocCountError))
+			{
+				continue;
+			}
+
+			if (propSize.TryRead(ref reader, options, PropSize))
+			{
+				continue;
+			}
+
+			if (propTerms.TryRead(ref reader, options, PropTerms))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new MultiTermsAggregation
+		{
+			CollectMode = propCollectMode.Value
+,
+			MinDocCount = propMinDocCount.Value
+,
+			Order = propOrder.Value
+,
+			ShardMinDocCount = propShardMinDocCount.Value
+,
+			ShardSize = propShardSize.Value
+,
+			ShowTermDocCountError = propShowTermDocCountError.Value
+,
+			Size = propSize.Value
+,
+			Terms = propTerms.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, MultiTermsAggregation value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCollectMode, value.CollectMode);
+		writer.WriteProperty(options, PropMinDocCount, value.MinDocCount);
+		writer.WriteProperty(options, PropOrder, value.Order, typeof(SingleOrManyMarker<IReadOnlyCollection<KeyValuePair<Elastic.Clients.Elasticsearch.Serverless.Field, Elastic.Clients.Elasticsearch.Serverless.SortOrder>>?, KeyValuePair<Elastic.Clients.Elasticsearch.Serverless.Field, Elastic.Clients.Elasticsearch.Serverless.SortOrder>>));
+		writer.WriteProperty(options, PropShardMinDocCount, value.ShardMinDocCount);
+		writer.WriteProperty(options, PropShardSize, value.ShardSize);
+		writer.WriteProperty(options, PropShowTermDocCountError, value.ShowTermDocCountError);
+		writer.WriteProperty(options, PropSize, value.Size);
+		writer.WriteProperty(options, PropTerms, value.Terms);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(MultiTermsAggregationConverter))]
 public sealed partial class MultiTermsAggregation
 {
 	/// <summary>
@@ -34,7 +139,6 @@ public sealed partial class MultiTermsAggregation
 	/// Specifies the strategy for data collection.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("collect_mode")]
 	public Elastic.Clients.Elasticsearch.Serverless.Aggregations.TermsAggregationCollectMode? CollectMode { get; set; }
 
 	/// <summary>
@@ -42,7 +146,6 @@ public sealed partial class MultiTermsAggregation
 	/// The minimum number of documents in a bucket for it to be returned.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("min_doc_count")]
 	public long? MinDocCount { get; set; }
 
 	/// <summary>
@@ -51,8 +154,6 @@ public sealed partial class MultiTermsAggregation
 	/// Defaults to sorting by descending document count.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("order")]
-	[SingleOrManyCollectionConverter(typeof(KeyValuePair<Elastic.Clients.Elasticsearch.Serverless.Field, Elastic.Clients.Elasticsearch.Serverless.SortOrder>))]
 	public ICollection<KeyValuePair<Elastic.Clients.Elasticsearch.Serverless.Field, Elastic.Clients.Elasticsearch.Serverless.SortOrder>>? Order { get; set; }
 
 	/// <summary>
@@ -60,7 +161,6 @@ public sealed partial class MultiTermsAggregation
 	/// The minimum number of documents in a bucket on each shard for it to be returned.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("shard_min_doc_count")]
 	public long? ShardMinDocCount { get; set; }
 
 	/// <summary>
@@ -69,7 +169,6 @@ public sealed partial class MultiTermsAggregation
 	/// By default, <c>shard_size</c> will be automatically estimated based on the number of shards and the <c>size</c> parameter.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("shard_size")]
 	public int? ShardSize { get; set; }
 
 	/// <summary>
@@ -77,7 +176,6 @@ public sealed partial class MultiTermsAggregation
 	/// Calculates the doc count error on per term basis.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("show_term_doc_count_error")]
 	public bool? ShowTermDocCountError { get; set; }
 
 	/// <summary>
@@ -85,7 +183,6 @@ public sealed partial class MultiTermsAggregation
 	/// The number of term buckets should be returned out of the overall terms list.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("size")]
 	public int? Size { get; set; }
 
 	/// <summary>
@@ -93,7 +190,6 @@ public sealed partial class MultiTermsAggregation
 	/// The field from which to generate sets of terms.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("terms")]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.Aggregations.MultiTermLookup> Terms { get; set; }
 
 	public static implicit operator Elastic.Clients.Elasticsearch.Serverless.Aggregations.Aggregation(MultiTermsAggregation multiTermsAggregation) => Elastic.Clients.Elasticsearch.Serverless.Aggregations.Aggregation.MultiTerms(multiTermsAggregation);
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/MultiTermsBucket.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/MultiTermsBucket.g.cs
index 8ffc914e5ea..17b57856fae 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/MultiTermsBucket.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/MultiTermsBucket.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,63 +28,80 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Aggregations;
 
-internal sealed partial class MultiTermsBucketConverter : JsonConverter<MultiTermsBucket>
+internal sealed partial class MultiTermsBucketConverter : System.Text.Json.Serialization.JsonConverter<MultiTermsBucket>
 {
-	public override MultiTermsBucket Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropDocCount = System.Text.Json.JsonEncodedText.Encode("doc_count");
+	private static readonly System.Text.Json.JsonEncodedText PropDocCountErrorUpperBound = System.Text.Json.JsonEncodedText.Encode("doc_count_error_upper_bound");
+	private static readonly System.Text.Json.JsonEncodedText PropKey = System.Text.Json.JsonEncodedText.Encode("key");
+	private static readonly System.Text.Json.JsonEncodedText PropKeyAsString = System.Text.Json.JsonEncodedText.Encode("key_as_string");
+
+	public override MultiTermsBucket Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		long docCount = default;
-		long? docCountErrorUpperBound = default;
-		IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.FieldValue> key = default;
-		string? keyAsString = default;
-		Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate> propAggregations = default;
+		LocalJsonProperty<long> propDocCount = default;
+		LocalJsonProperty<long?> propDocCountErrorUpperBound = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.FieldValue>> propKey = default;
+		LocalJsonProperty<string?> propKeyAsString = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propDocCount.TryRead(ref reader, options, PropDocCount))
 			{
-				var property = reader.GetString();
-				if (property == "doc_count")
-				{
-					docCount = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "doc_count_error_upper_bound")
-				{
-					docCountErrorUpperBound = JsonSerializer.Deserialize<long?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "key")
-				{
-					key = JsonSerializer.Deserialize<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.FieldValue>>(ref reader, options);
-					continue;
-				}
+				continue;
+			}
 
-				if (property == "key_as_string")
-				{
-					keyAsString = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
+			if (propDocCountErrorUpperBound.TryRead(ref reader, options, PropDocCountErrorUpperBound))
+			{
+				continue;
+			}
 
-				if (property.Contains("#"))
-				{
-					additionalProperties ??= new Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate>();
-					AggregateDictionaryConverter.ReadItem(ref reader, options, additionalProperties, property);
-					continue;
-				}
+			if (propKey.TryRead(ref reader, options, PropKey))
+			{
+				continue;
+			}
 
-				throw new JsonException("Unknown property read from JSON.");
+			if (propKeyAsString.TryRead(ref reader, options, PropKeyAsString))
+			{
+				continue;
 			}
+
+			propAggregations ??= new System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate>();
+			Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionaryConverter.ReadItem(ref reader, options, out string key, out Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate value);
+			propAggregations[key] = value;
 		}
 
-		return new MultiTermsBucket { Aggregations = new Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary(additionalProperties), DocCount = docCount, DocCountErrorUpperBound = docCountErrorUpperBound, Key = key, KeyAsString = keyAsString };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new MultiTermsBucket
+		{
+			Aggregations = new Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary(propAggregations)
+,
+			DocCount = propDocCount.Value
+,
+			DocCountErrorUpperBound = propDocCountErrorUpperBound.Value
+,
+			Key = propKey.Value
+,
+			KeyAsString = propKeyAsString.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, MultiTermsBucket value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, MultiTermsBucket value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'MultiTermsBucket' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDocCount, value.DocCount);
+		writer.WriteProperty(options, PropDocCountErrorUpperBound, value.DocCountErrorUpperBound);
+		writer.WriteProperty(options, PropKey, value.Key);
+		writer.WriteProperty(options, PropKeyAsString, value.KeyAsString);
+		if (value.Aggregations is not null)
+		{
+			foreach (var item in value.Aggregations)
+			{
+				Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionaryConverter.WriteItem(writer, options, item.Key, item.Value);
+			}
+		}
+
+		writer.WriteEndObject();
 	}
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/NestedAggregate.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/NestedAggregate.g.cs
index 2fecd1dea37..6d792beb5d5 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/NestedAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/NestedAggregate.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,49 +28,60 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Aggregations;
 
-internal sealed partial class NestedAggregateConverter : JsonConverter<NestedAggregate>
+internal sealed partial class NestedAggregateConverter : System.Text.Json.Serialization.JsonConverter<NestedAggregate>
 {
-	public override NestedAggregate Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropDocCount = System.Text.Json.JsonEncodedText.Encode("doc_count");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+
+	public override NestedAggregate Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		long docCount = default;
-		IReadOnlyDictionary<string, object>? meta = default;
-		Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate> propAggregations = default;
+		LocalJsonProperty<long> propDocCount = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, object>?> propMeta = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propDocCount.TryRead(ref reader, options, PropDocCount))
 			{
-				var property = reader.GetString();
-				if (property == "doc_count")
-				{
-					docCount = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "meta")
-				{
-					meta = JsonSerializer.Deserialize<IReadOnlyDictionary<string, object>?>(ref reader, options);
-					continue;
-				}
-
-				if (property.Contains("#"))
-				{
-					additionalProperties ??= new Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate>();
-					AggregateDictionaryConverter.ReadItem(ref reader, options, additionalProperties, property);
-					continue;
-				}
+				continue;
+			}
 
-				throw new JsonException("Unknown property read from JSON.");
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
 			}
+
+			propAggregations ??= new System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate>();
+			Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionaryConverter.ReadItem(ref reader, options, out string key, out Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate value);
+			propAggregations[key] = value;
 		}
 
-		return new NestedAggregate { Aggregations = new Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary(additionalProperties), DocCount = docCount, Meta = meta };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new NestedAggregate
+		{
+			Aggregations = new Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary(propAggregations)
+,
+			DocCount = propDocCount.Value
+,
+			Meta = propMeta.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, NestedAggregate value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, NestedAggregate value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'NestedAggregate' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDocCount, value.DocCount);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		if (value.Aggregations is not null)
+		{
+			foreach (var item in value.Aggregations)
+			{
+				Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionaryConverter.WriteItem(writer, options, item.Key, item.Value);
+			}
+		}
+
+		writer.WriteEndObject();
 	}
 }
 
@@ -84,4 +96,6 @@ public sealed partial class NestedAggregate : IAggregate
 	public Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary Aggregations { get; init; }
 	public long DocCount { get; init; }
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
+
+	string IAggregate.Type => "nested";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/ParentAggregate.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/ParentAggregate.g.cs
index c504491ea66..5db48ce90ee 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/ParentAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/ParentAggregate.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,49 +28,60 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Aggregations;
 
-internal sealed partial class ParentAggregateConverter : JsonConverter<ParentAggregate>
+internal sealed partial class ParentAggregateConverter : System.Text.Json.Serialization.JsonConverter<ParentAggregate>
 {
-	public override ParentAggregate Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropDocCount = System.Text.Json.JsonEncodedText.Encode("doc_count");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+
+	public override ParentAggregate Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		long docCount = default;
-		IReadOnlyDictionary<string, object>? meta = default;
-		Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate> propAggregations = default;
+		LocalJsonProperty<long> propDocCount = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, object>?> propMeta = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propDocCount.TryRead(ref reader, options, PropDocCount))
 			{
-				var property = reader.GetString();
-				if (property == "doc_count")
-				{
-					docCount = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "meta")
-				{
-					meta = JsonSerializer.Deserialize<IReadOnlyDictionary<string, object>?>(ref reader, options);
-					continue;
-				}
-
-				if (property.Contains("#"))
-				{
-					additionalProperties ??= new Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate>();
-					AggregateDictionaryConverter.ReadItem(ref reader, options, additionalProperties, property);
-					continue;
-				}
+				continue;
+			}
 
-				throw new JsonException("Unknown property read from JSON.");
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
 			}
+
+			propAggregations ??= new System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate>();
+			Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionaryConverter.ReadItem(ref reader, options, out string key, out Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate value);
+			propAggregations[key] = value;
 		}
 
-		return new ParentAggregate { Aggregations = new Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary(additionalProperties), DocCount = docCount, Meta = meta };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ParentAggregate
+		{
+			Aggregations = new Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary(propAggregations)
+,
+			DocCount = propDocCount.Value
+,
+			Meta = propMeta.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, ParentAggregate value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ParentAggregate value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'ParentAggregate' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDocCount, value.DocCount);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		if (value.Aggregations is not null)
+		{
+			foreach (var item in value.Aggregations)
+			{
+				Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionaryConverter.WriteItem(writer, options, item.Key, item.Value);
+			}
+		}
+
+		writer.WriteEndObject();
 	}
 }
 
@@ -84,4 +96,6 @@ public sealed partial class ParentAggregate : IAggregate
 	public Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary Aggregations { get; init; }
 	public long DocCount { get; init; }
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
+
+	string IAggregate.Type => "parent";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/PercentilesBucketAggregate.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/PercentilesBucketAggregate.g.cs
index e29d1a9a062..c991e237457 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/PercentilesBucketAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/PercentilesBucketAggregate.g.cs
@@ -33,4 +33,6 @@ public sealed partial class PercentilesBucketAggregate : IAggregate
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
 	[JsonInclude, JsonPropertyName("values")]
 	public Elastic.Clients.Elasticsearch.Serverless.Aggregations.Percentiles Values { get; init; }
+
+	string IAggregate.Type => "percentiles_bucket";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/RangeAggregate.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/RangeAggregate.g.cs
index b27d6bb4052..5b1487aeb21 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/RangeAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/RangeAggregate.g.cs
@@ -33,4 +33,6 @@ public sealed partial class RangeAggregate : IAggregate
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Aggregations.RangeBucket> Buckets { get; init; }
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
+
+	string IAggregate.Type => "range";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/RangeBucket.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/RangeBucket.g.cs
index 92d28d6da79..9022a5a047c 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/RangeBucket.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/RangeBucket.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,77 +28,100 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Aggregations;
 
-internal sealed partial class RangeBucketConverter : JsonConverter<RangeBucket>
+internal sealed partial class RangeBucketConverter : System.Text.Json.Serialization.JsonConverter<RangeBucket>
 {
-	public override RangeBucket Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropDocCount = System.Text.Json.JsonEncodedText.Encode("doc_count");
+	private static readonly System.Text.Json.JsonEncodedText PropFrom = System.Text.Json.JsonEncodedText.Encode("from");
+	private static readonly System.Text.Json.JsonEncodedText PropFromAsString = System.Text.Json.JsonEncodedText.Encode("from_as_string");
+	private static readonly System.Text.Json.JsonEncodedText PropKey = System.Text.Json.JsonEncodedText.Encode("key");
+	private static readonly System.Text.Json.JsonEncodedText PropTo = System.Text.Json.JsonEncodedText.Encode("to");
+	private static readonly System.Text.Json.JsonEncodedText PropToAsString = System.Text.Json.JsonEncodedText.Encode("to_as_string");
+
+	public override RangeBucket Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		long docCount = default;
-		double? from = default;
-		string? fromAsString = default;
-		string? key = default;
-		double? to = default;
-		string? toAsString = default;
-		Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate> propAggregations = default;
+		LocalJsonProperty<long> propDocCount = default;
+		LocalJsonProperty<double?> propFrom = default;
+		LocalJsonProperty<string?> propFromAsString = default;
+		LocalJsonProperty<string?> propKey = default;
+		LocalJsonProperty<double?> propTo = default;
+		LocalJsonProperty<string?> propToAsString = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propDocCount.TryRead(ref reader, options, PropDocCount))
+			{
+				continue;
+			}
+
+			if (propFrom.TryRead(ref reader, options, PropFrom))
+			{
+				continue;
+			}
+
+			if (propFromAsString.TryRead(ref reader, options, PropFromAsString))
+			{
+				continue;
+			}
+
+			if (propKey.TryRead(ref reader, options, PropKey))
 			{
-				var property = reader.GetString();
-				if (property == "doc_count")
-				{
-					docCount = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "from")
-				{
-					from = JsonSerializer.Deserialize<double?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "from_as_string")
-				{
-					fromAsString = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "key")
-				{
-					key = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "to")
-				{
-					to = JsonSerializer.Deserialize<double?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "to_as_string")
-				{
-					toAsString = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property.Contains("#"))
-				{
-					additionalProperties ??= new Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate>();
-					AggregateDictionaryConverter.ReadItem(ref reader, options, additionalProperties, property);
-					continue;
-				}
-
-				throw new JsonException("Unknown property read from JSON.");
+				continue;
 			}
+
+			if (propTo.TryRead(ref reader, options, PropTo))
+			{
+				continue;
+			}
+
+			if (propToAsString.TryRead(ref reader, options, PropToAsString))
+			{
+				continue;
+			}
+
+			propAggregations ??= new System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate>();
+			Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionaryConverter.ReadItem(ref reader, options, out string key, out Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate value);
+			propAggregations[key] = value;
 		}
 
-		return new RangeBucket { Aggregations = new Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary(additionalProperties), DocCount = docCount, From = from, FromAsString = fromAsString, Key = key, To = to, ToAsString = toAsString };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new RangeBucket
+		{
+			Aggregations = new Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary(propAggregations)
+,
+			DocCount = propDocCount.Value
+,
+			From = propFrom.Value
+,
+			FromAsString = propFromAsString.Value
+,
+			Key = propKey.Value
+,
+			To = propTo.Value
+,
+			ToAsString = propToAsString.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, RangeBucket value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, RangeBucket value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'RangeBucket' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDocCount, value.DocCount);
+		writer.WriteProperty(options, PropFrom, value.From);
+		writer.WriteProperty(options, PropFromAsString, value.FromAsString);
+		writer.WriteProperty(options, PropKey, value.Key);
+		writer.WriteProperty(options, PropTo, value.To);
+		writer.WriteProperty(options, PropToAsString, value.ToAsString);
+		if (value.Aggregations is not null)
+		{
+			foreach (var item in value.Aggregations)
+			{
+				Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionaryConverter.WriteItem(writer, options, item.Key, item.Value);
+			}
+		}
+
+		writer.WriteEndObject();
 	}
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/RateAggregate.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/RateAggregate.g.cs
index 303bfe634f3..d0aaf95fda9 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/RateAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/RateAggregate.g.cs
@@ -35,4 +35,6 @@ public sealed partial class RateAggregate : IAggregate
 	public double Value { get; init; }
 	[JsonInclude, JsonPropertyName("value_as_string")]
 	public string? ValueAsString { get; init; }
+
+	string IAggregate.Type => "rate";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/ReverseNestedAggregate.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/ReverseNestedAggregate.g.cs
index b4dcfa21b23..733b3ec4ef1 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/ReverseNestedAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/ReverseNestedAggregate.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,49 +28,60 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Aggregations;
 
-internal sealed partial class ReverseNestedAggregateConverter : JsonConverter<ReverseNestedAggregate>
+internal sealed partial class ReverseNestedAggregateConverter : System.Text.Json.Serialization.JsonConverter<ReverseNestedAggregate>
 {
-	public override ReverseNestedAggregate Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropDocCount = System.Text.Json.JsonEncodedText.Encode("doc_count");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+
+	public override ReverseNestedAggregate Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		long docCount = default;
-		IReadOnlyDictionary<string, object>? meta = default;
-		Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate> propAggregations = default;
+		LocalJsonProperty<long> propDocCount = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, object>?> propMeta = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propDocCount.TryRead(ref reader, options, PropDocCount))
 			{
-				var property = reader.GetString();
-				if (property == "doc_count")
-				{
-					docCount = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "meta")
-				{
-					meta = JsonSerializer.Deserialize<IReadOnlyDictionary<string, object>?>(ref reader, options);
-					continue;
-				}
-
-				if (property.Contains("#"))
-				{
-					additionalProperties ??= new Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate>();
-					AggregateDictionaryConverter.ReadItem(ref reader, options, additionalProperties, property);
-					continue;
-				}
+				continue;
+			}
 
-				throw new JsonException("Unknown property read from JSON.");
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
 			}
+
+			propAggregations ??= new System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate>();
+			Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionaryConverter.ReadItem(ref reader, options, out string key, out Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate value);
+			propAggregations[key] = value;
 		}
 
-		return new ReverseNestedAggregate { Aggregations = new Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary(additionalProperties), DocCount = docCount, Meta = meta };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ReverseNestedAggregate
+		{
+			Aggregations = new Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary(propAggregations)
+,
+			DocCount = propDocCount.Value
+,
+			Meta = propMeta.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, ReverseNestedAggregate value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ReverseNestedAggregate value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'ReverseNestedAggregate' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDocCount, value.DocCount);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		if (value.Aggregations is not null)
+		{
+			foreach (var item in value.Aggregations)
+			{
+				Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionaryConverter.WriteItem(writer, options, item.Key, item.Value);
+			}
+		}
+
+		writer.WriteEndObject();
 	}
 }
 
@@ -84,4 +96,6 @@ public sealed partial class ReverseNestedAggregate : IAggregate
 	public Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary Aggregations { get; init; }
 	public long DocCount { get; init; }
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
+
+	string IAggregate.Type => "reverse_nested";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/SamplerAggregate.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/SamplerAggregate.g.cs
index f067ef6d31b..286b733c826 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/SamplerAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/SamplerAggregate.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,49 +28,60 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Aggregations;
 
-internal sealed partial class SamplerAggregateConverter : JsonConverter<SamplerAggregate>
+internal sealed partial class SamplerAggregateConverter : System.Text.Json.Serialization.JsonConverter<SamplerAggregate>
 {
-	public override SamplerAggregate Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropDocCount = System.Text.Json.JsonEncodedText.Encode("doc_count");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+
+	public override SamplerAggregate Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		long docCount = default;
-		IReadOnlyDictionary<string, object>? meta = default;
-		Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate> propAggregations = default;
+		LocalJsonProperty<long> propDocCount = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, object>?> propMeta = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propDocCount.TryRead(ref reader, options, PropDocCount))
 			{
-				var property = reader.GetString();
-				if (property == "doc_count")
-				{
-					docCount = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "meta")
-				{
-					meta = JsonSerializer.Deserialize<IReadOnlyDictionary<string, object>?>(ref reader, options);
-					continue;
-				}
-
-				if (property.Contains("#"))
-				{
-					additionalProperties ??= new Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate>();
-					AggregateDictionaryConverter.ReadItem(ref reader, options, additionalProperties, property);
-					continue;
-				}
+				continue;
+			}
 
-				throw new JsonException("Unknown property read from JSON.");
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
 			}
+
+			propAggregations ??= new System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate>();
+			Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionaryConverter.ReadItem(ref reader, options, out string key, out Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate value);
+			propAggregations[key] = value;
 		}
 
-		return new SamplerAggregate { Aggregations = new Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary(additionalProperties), DocCount = docCount, Meta = meta };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SamplerAggregate
+		{
+			Aggregations = new Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary(propAggregations)
+,
+			DocCount = propDocCount.Value
+,
+			Meta = propMeta.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, SamplerAggregate value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SamplerAggregate value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'SamplerAggregate' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDocCount, value.DocCount);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		if (value.Aggregations is not null)
+		{
+			foreach (var item in value.Aggregations)
+			{
+				Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionaryConverter.WriteItem(writer, options, item.Key, item.Value);
+			}
+		}
+
+		writer.WriteEndObject();
 	}
 }
 
@@ -84,4 +96,6 @@ public sealed partial class SamplerAggregate : IAggregate
 	public Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary Aggregations { get; init; }
 	public long DocCount { get; init; }
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
+
+	string IAggregate.Type => "sampler";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/ScriptedMetricAggregate.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/ScriptedMetricAggregate.g.cs
index 51ddfb89dc8..7e9a7886782 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/ScriptedMetricAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/ScriptedMetricAggregate.g.cs
@@ -33,4 +33,6 @@ public sealed partial class ScriptedMetricAggregate : IAggregate
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
 	[JsonInclude, JsonPropertyName("value")]
 	public object Value { get; init; }
+
+	string IAggregate.Type => "scripted_metric";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/SignificantLongTermsAggregate.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/SignificantLongTermsAggregate.g.cs
index 682a7e49a9e..fab068197a5 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/SignificantLongTermsAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/SignificantLongTermsAggregate.g.cs
@@ -37,4 +37,6 @@ public sealed partial class SignificantLongTermsAggregate : IAggregate
 	public long? DocCount { get; init; }
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
+
+	string IAggregate.Type => "siglterms";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/SignificantLongTermsBucket.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/SignificantLongTermsBucket.g.cs
index b2e0622e3b8..cd28f56e73b 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/SignificantLongTermsBucket.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/SignificantLongTermsBucket.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,70 +28,90 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Aggregations;
 
-internal sealed partial class SignificantLongTermsBucketConverter : JsonConverter<SignificantLongTermsBucket>
+internal sealed partial class SignificantLongTermsBucketConverter : System.Text.Json.Serialization.JsonConverter<SignificantLongTermsBucket>
 {
-	public override SignificantLongTermsBucket Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropBgCount = System.Text.Json.JsonEncodedText.Encode("bg_count");
+	private static readonly System.Text.Json.JsonEncodedText PropDocCount = System.Text.Json.JsonEncodedText.Encode("doc_count");
+	private static readonly System.Text.Json.JsonEncodedText PropKey = System.Text.Json.JsonEncodedText.Encode("key");
+	private static readonly System.Text.Json.JsonEncodedText PropKeyAsString = System.Text.Json.JsonEncodedText.Encode("key_as_string");
+	private static readonly System.Text.Json.JsonEncodedText PropScore = System.Text.Json.JsonEncodedText.Encode("score");
+
+	public override SignificantLongTermsBucket Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		long bgCount = default;
-		long docCount = default;
-		long key = default;
-		string? keyAsString = default;
-		double score = default;
-		Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate> propAggregations = default;
+		LocalJsonProperty<long> propBgCount = default;
+		LocalJsonProperty<long> propDocCount = default;
+		LocalJsonProperty<long> propKey = default;
+		LocalJsonProperty<string?> propKeyAsString = default;
+		LocalJsonProperty<double> propScore = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propBgCount.TryRead(ref reader, options, PropBgCount))
 			{
-				var property = reader.GetString();
-				if (property == "bg_count")
-				{
-					bgCount = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "doc_count")
-				{
-					docCount = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "key")
-				{
-					key = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
+				continue;
+			}
 
-				if (property == "key_as_string")
-				{
-					keyAsString = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
+			if (propDocCount.TryRead(ref reader, options, PropDocCount))
+			{
+				continue;
+			}
 
-				if (property == "score")
-				{
-					score = JsonSerializer.Deserialize<double>(ref reader, options);
-					continue;
-				}
+			if (propKey.TryRead(ref reader, options, PropKey))
+			{
+				continue;
+			}
 
-				if (property.Contains("#"))
-				{
-					additionalProperties ??= new Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate>();
-					AggregateDictionaryConverter.ReadItem(ref reader, options, additionalProperties, property);
-					continue;
-				}
+			if (propKeyAsString.TryRead(ref reader, options, PropKeyAsString))
+			{
+				continue;
+			}
 
-				throw new JsonException("Unknown property read from JSON.");
+			if (propScore.TryRead(ref reader, options, PropScore))
+			{
+				continue;
 			}
+
+			propAggregations ??= new System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate>();
+			Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionaryConverter.ReadItem(ref reader, options, out string key, out Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate value);
+			propAggregations[key] = value;
 		}
 
-		return new SignificantLongTermsBucket { Aggregations = new Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary(additionalProperties), BgCount = bgCount, DocCount = docCount, Key = key, KeyAsString = keyAsString, Score = score };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SignificantLongTermsBucket
+		{
+			Aggregations = new Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary(propAggregations)
+,
+			BgCount = propBgCount.Value
+,
+			DocCount = propDocCount.Value
+,
+			Key = propKey.Value
+,
+			KeyAsString = propKeyAsString.Value
+,
+			Score = propScore.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, SignificantLongTermsBucket value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SignificantLongTermsBucket value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'SignificantLongTermsBucket' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBgCount, value.BgCount);
+		writer.WriteProperty(options, PropDocCount, value.DocCount);
+		writer.WriteProperty(options, PropKey, value.Key);
+		writer.WriteProperty(options, PropKeyAsString, value.KeyAsString);
+		writer.WriteProperty(options, PropScore, value.Score);
+		if (value.Aggregations is not null)
+		{
+			foreach (var item in value.Aggregations)
+			{
+				Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionaryConverter.WriteItem(writer, options, item.Key, item.Value);
+			}
+		}
+
+		writer.WriteEndObject();
 	}
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/SignificantStringTermsAggregate.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/SignificantStringTermsAggregate.g.cs
index 636834cdfd1..631c71aa373 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/SignificantStringTermsAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/SignificantStringTermsAggregate.g.cs
@@ -37,4 +37,6 @@ public sealed partial class SignificantStringTermsAggregate : IAggregate
 	public long? DocCount { get; init; }
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
+
+	string IAggregate.Type => "sigsterms";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/SignificantStringTermsBucket.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/SignificantStringTermsBucket.g.cs
index 4adf4ae4fc4..ce51892965b 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/SignificantStringTermsBucket.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/SignificantStringTermsBucket.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,63 +28,80 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Aggregations;
 
-internal sealed partial class SignificantStringTermsBucketConverter : JsonConverter<SignificantStringTermsBucket>
+internal sealed partial class SignificantStringTermsBucketConverter : System.Text.Json.Serialization.JsonConverter<SignificantStringTermsBucket>
 {
-	public override SignificantStringTermsBucket Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropBgCount = System.Text.Json.JsonEncodedText.Encode("bg_count");
+	private static readonly System.Text.Json.JsonEncodedText PropDocCount = System.Text.Json.JsonEncodedText.Encode("doc_count");
+	private static readonly System.Text.Json.JsonEncodedText PropKey = System.Text.Json.JsonEncodedText.Encode("key");
+	private static readonly System.Text.Json.JsonEncodedText PropScore = System.Text.Json.JsonEncodedText.Encode("score");
+
+	public override SignificantStringTermsBucket Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		long bgCount = default;
-		long docCount = default;
-		string key = default;
-		double score = default;
-		Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate> propAggregations = default;
+		LocalJsonProperty<long> propBgCount = default;
+		LocalJsonProperty<long> propDocCount = default;
+		LocalJsonProperty<string> propKey = default;
+		LocalJsonProperty<double> propScore = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propBgCount.TryRead(ref reader, options, PropBgCount))
 			{
-				var property = reader.GetString();
-				if (property == "bg_count")
-				{
-					bgCount = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "doc_count")
-				{
-					docCount = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "key")
-				{
-					key = JsonSerializer.Deserialize<string>(ref reader, options);
-					continue;
-				}
+				continue;
+			}
 
-				if (property == "score")
-				{
-					score = JsonSerializer.Deserialize<double>(ref reader, options);
-					continue;
-				}
+			if (propDocCount.TryRead(ref reader, options, PropDocCount))
+			{
+				continue;
+			}
 
-				if (property.Contains("#"))
-				{
-					additionalProperties ??= new Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate>();
-					AggregateDictionaryConverter.ReadItem(ref reader, options, additionalProperties, property);
-					continue;
-				}
+			if (propKey.TryRead(ref reader, options, PropKey))
+			{
+				continue;
+			}
 
-				throw new JsonException("Unknown property read from JSON.");
+			if (propScore.TryRead(ref reader, options, PropScore))
+			{
+				continue;
 			}
+
+			propAggregations ??= new System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate>();
+			Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionaryConverter.ReadItem(ref reader, options, out string key, out Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate value);
+			propAggregations[key] = value;
 		}
 
-		return new SignificantStringTermsBucket { Aggregations = new Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary(additionalProperties), BgCount = bgCount, DocCount = docCount, Key = key, Score = score };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SignificantStringTermsBucket
+		{
+			Aggregations = new Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary(propAggregations)
+,
+			BgCount = propBgCount.Value
+,
+			DocCount = propDocCount.Value
+,
+			Key = propKey.Value
+,
+			Score = propScore.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, SignificantStringTermsBucket value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SignificantStringTermsBucket value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'SignificantStringTermsBucket' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBgCount, value.BgCount);
+		writer.WriteProperty(options, PropDocCount, value.DocCount);
+		writer.WriteProperty(options, PropKey, value.Key);
+		writer.WriteProperty(options, PropScore, value.Score);
+		if (value.Aggregations is not null)
+		{
+			foreach (var item in value.Aggregations)
+			{
+				Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionaryConverter.WriteItem(writer, options, item.Key, item.Value);
+			}
+		}
+
+		writer.WriteEndObject();
 	}
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/SignificantTextAggregation.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/SignificantTextAggregation.g.cs
index 3b445cbbdda..a530f0131ea 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/SignificantTextAggregation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/SignificantTextAggregation.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,200 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Aggregations;
 
+internal sealed partial class SignificantTextAggregationConverter : System.Text.Json.Serialization.JsonConverter<SignificantTextAggregation>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropBackgroundFilter = System.Text.Json.JsonEncodedText.Encode("background_filter");
+	private static readonly System.Text.Json.JsonEncodedText PropChiSquare = System.Text.Json.JsonEncodedText.Encode("chi_square");
+	private static readonly System.Text.Json.JsonEncodedText PropExclude = System.Text.Json.JsonEncodedText.Encode("exclude");
+	private static readonly System.Text.Json.JsonEncodedText PropExecutionHint = System.Text.Json.JsonEncodedText.Encode("execution_hint");
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropFilterDuplicateText = System.Text.Json.JsonEncodedText.Encode("filter_duplicate_text");
+	private static readonly System.Text.Json.JsonEncodedText PropGnd = System.Text.Json.JsonEncodedText.Encode("gnd");
+	private static readonly System.Text.Json.JsonEncodedText PropInclude = System.Text.Json.JsonEncodedText.Encode("include");
+	private static readonly System.Text.Json.JsonEncodedText PropJlh = System.Text.Json.JsonEncodedText.Encode("jlh");
+	private static readonly System.Text.Json.JsonEncodedText PropMinDocCount = System.Text.Json.JsonEncodedText.Encode("min_doc_count");
+	private static readonly System.Text.Json.JsonEncodedText PropMutualInformation = System.Text.Json.JsonEncodedText.Encode("mutual_information");
+	private static readonly System.Text.Json.JsonEncodedText PropPercentage = System.Text.Json.JsonEncodedText.Encode("percentage");
+	private static readonly System.Text.Json.JsonEncodedText PropScriptHeuristic = System.Text.Json.JsonEncodedText.Encode("script_heuristic");
+	private static readonly System.Text.Json.JsonEncodedText PropShardMinDocCount = System.Text.Json.JsonEncodedText.Encode("shard_min_doc_count");
+	private static readonly System.Text.Json.JsonEncodedText PropShardSize = System.Text.Json.JsonEncodedText.Encode("shard_size");
+	private static readonly System.Text.Json.JsonEncodedText PropSize = System.Text.Json.JsonEncodedText.Encode("size");
+	private static readonly System.Text.Json.JsonEncodedText PropSourceFields = System.Text.Json.JsonEncodedText.Encode("source_fields");
+
+	public override SignificantTextAggregation Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query?> propBackgroundFilter = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Aggregations.ChiSquareHeuristic?> propChiSquare = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Aggregations.TermsExclude?> propExclude = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Aggregations.TermsAggregationExecutionHint?> propExecutionHint = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Field?> propField = default;
+		LocalJsonProperty<bool?> propFilterDuplicateText = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Aggregations.GoogleNormalizedDistanceHeuristic?> propGnd = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Aggregations.TermsInclude?> propInclude = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.EmptyObject?> propJlh = default;
+		LocalJsonProperty<long?> propMinDocCount = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Aggregations.MutualInformationHeuristic?> propMutualInformation = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Aggregations.PercentageScoreHeuristic?> propPercentage = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Aggregations.ScriptedHeuristic?> propScriptHeuristic = default;
+		LocalJsonProperty<long?> propShardMinDocCount = default;
+		LocalJsonProperty<int?> propShardSize = default;
+		LocalJsonProperty<int?> propSize = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Fields?> propSourceFields = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBackgroundFilter.TryRead(ref reader, options, PropBackgroundFilter))
+			{
+				continue;
+			}
+
+			if (propChiSquare.TryRead(ref reader, options, PropChiSquare))
+			{
+				continue;
+			}
+
+			if (propExclude.TryRead(ref reader, options, PropExclude))
+			{
+				continue;
+			}
+
+			if (propExecutionHint.TryRead(ref reader, options, PropExecutionHint))
+			{
+				continue;
+			}
+
+			if (propField.TryRead(ref reader, options, PropField))
+			{
+				continue;
+			}
+
+			if (propFilterDuplicateText.TryRead(ref reader, options, PropFilterDuplicateText))
+			{
+				continue;
+			}
+
+			if (propGnd.TryRead(ref reader, options, PropGnd))
+			{
+				continue;
+			}
+
+			if (propInclude.TryRead(ref reader, options, PropInclude))
+			{
+				continue;
+			}
+
+			if (propJlh.TryRead(ref reader, options, PropJlh))
+			{
+				continue;
+			}
+
+			if (propMinDocCount.TryRead(ref reader, options, PropMinDocCount))
+			{
+				continue;
+			}
+
+			if (propMutualInformation.TryRead(ref reader, options, PropMutualInformation))
+			{
+				continue;
+			}
+
+			if (propPercentage.TryRead(ref reader, options, PropPercentage))
+			{
+				continue;
+			}
+
+			if (propScriptHeuristic.TryRead(ref reader, options, PropScriptHeuristic))
+			{
+				continue;
+			}
+
+			if (propShardMinDocCount.TryRead(ref reader, options, PropShardMinDocCount))
+			{
+				continue;
+			}
+
+			if (propShardSize.TryRead(ref reader, options, PropShardSize))
+			{
+				continue;
+			}
+
+			if (propSize.TryRead(ref reader, options, PropSize))
+			{
+				continue;
+			}
+
+			if (propSourceFields.TryRead(ref reader, options, PropSourceFields, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SignificantTextAggregation
+		{
+			BackgroundFilter = propBackgroundFilter.Value
+,
+			ChiSquare = propChiSquare.Value
+,
+			Exclude = propExclude.Value
+,
+			ExecutionHint = propExecutionHint.Value
+,
+			Field = propField.Value
+,
+			FilterDuplicateText = propFilterDuplicateText.Value
+,
+			Gnd = propGnd.Value
+,
+			Include = propInclude.Value
+,
+			Jlh = propJlh.Value
+,
+			MinDocCount = propMinDocCount.Value
+,
+			MutualInformation = propMutualInformation.Value
+,
+			Percentage = propPercentage.Value
+,
+			ScriptHeuristic = propScriptHeuristic.Value
+,
+			ShardMinDocCount = propShardMinDocCount.Value
+,
+			ShardSize = propShardSize.Value
+,
+			Size = propSize.Value
+,
+			SourceFields = propSourceFields.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SignificantTextAggregation value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBackgroundFilter, value.BackgroundFilter);
+		writer.WriteProperty(options, PropChiSquare, value.ChiSquare);
+		writer.WriteProperty(options, PropExclude, value.Exclude);
+		writer.WriteProperty(options, PropExecutionHint, value.ExecutionHint);
+		writer.WriteProperty(options, PropField, value.Field);
+		writer.WriteProperty(options, PropFilterDuplicateText, value.FilterDuplicateText);
+		writer.WriteProperty(options, PropGnd, value.Gnd);
+		writer.WriteProperty(options, PropInclude, value.Include);
+		writer.WriteProperty(options, PropJlh, value.Jlh);
+		writer.WriteProperty(options, PropMinDocCount, value.MinDocCount);
+		writer.WriteProperty(options, PropMutualInformation, value.MutualInformation);
+		writer.WriteProperty(options, PropPercentage, value.Percentage);
+		writer.WriteProperty(options, PropScriptHeuristic, value.ScriptHeuristic);
+		writer.WriteProperty(options, PropShardMinDocCount, value.ShardMinDocCount);
+		writer.WriteProperty(options, PropShardSize, value.ShardSize);
+		writer.WriteProperty(options, PropSize, value.Size);
+		writer.WriteProperty(options, PropSourceFields, value.SourceFields, typeof(SingleOrManyFieldsMarker));
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(SignificantTextAggregationConverter))]
 public sealed partial class SignificantTextAggregation
 {
 	/// <summary>
@@ -34,7 +229,6 @@ public sealed partial class SignificantTextAggregation
 	/// A background filter that can be used to focus in on significant terms within a narrower context, instead of the entire index.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("background_filter")]
 	public Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query? BackgroundFilter { get; set; }
 
 	/// <summary>
@@ -42,7 +236,6 @@ public sealed partial class SignificantTextAggregation
 	/// Use Chi square, as described in "Information Retrieval", Manning et al., Chapter 13.5.2, as the significance score.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("chi_square")]
 	public Elastic.Clients.Elasticsearch.Serverless.Aggregations.ChiSquareHeuristic? ChiSquare { get; set; }
 
 	/// <summary>
@@ -50,7 +243,6 @@ public sealed partial class SignificantTextAggregation
 	/// Values to exclude.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("exclude")]
 	public Elastic.Clients.Elasticsearch.Serverless.Aggregations.TermsExclude? Exclude { get; set; }
 
 	/// <summary>
@@ -58,7 +250,6 @@ public sealed partial class SignificantTextAggregation
 	/// Determines whether the aggregation will use field values directly or global ordinals.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("execution_hint")]
 	public Elastic.Clients.Elasticsearch.Serverless.Aggregations.TermsAggregationExecutionHint? ExecutionHint { get; set; }
 
 	/// <summary>
@@ -66,7 +257,6 @@ public sealed partial class SignificantTextAggregation
 	/// The field from which to return significant text.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("field")]
 	public Elastic.Clients.Elasticsearch.Serverless.Field? Field { get; set; }
 
 	/// <summary>
@@ -74,7 +264,6 @@ public sealed partial class SignificantTextAggregation
 	/// Whether to out duplicate text to deal with noisy data.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("filter_duplicate_text")]
 	public bool? FilterDuplicateText { get; set; }
 
 	/// <summary>
@@ -82,7 +271,6 @@ public sealed partial class SignificantTextAggregation
 	/// Use Google normalized distance as described in "The Google Similarity Distance", Cilibrasi and Vitanyi, 2007, as the significance score.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("gnd")]
 	public Elastic.Clients.Elasticsearch.Serverless.Aggregations.GoogleNormalizedDistanceHeuristic? Gnd { get; set; }
 
 	/// <summary>
@@ -90,7 +278,6 @@ public sealed partial class SignificantTextAggregation
 	/// Values to include.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("include")]
 	public Elastic.Clients.Elasticsearch.Serverless.Aggregations.TermsInclude? Include { get; set; }
 
 	/// <summary>
@@ -98,7 +285,6 @@ public sealed partial class SignificantTextAggregation
 	/// Use JLH score as the significance score.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("jlh")]
 	public Elastic.Clients.Elasticsearch.Serverless.EmptyObject? Jlh { get; set; }
 
 	/// <summary>
@@ -106,7 +292,6 @@ public sealed partial class SignificantTextAggregation
 	/// Only return values that are found in more than <c>min_doc_count</c> hits.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("min_doc_count")]
 	public long? MinDocCount { get; set; }
 
 	/// <summary>
@@ -114,7 +299,6 @@ public sealed partial class SignificantTextAggregation
 	/// Use mutual information as described in "Information Retrieval", Manning et al., Chapter 13.5.1, as the significance score.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("mutual_information")]
 	public Elastic.Clients.Elasticsearch.Serverless.Aggregations.MutualInformationHeuristic? MutualInformation { get; set; }
 
 	/// <summary>
@@ -122,7 +306,6 @@ public sealed partial class SignificantTextAggregation
 	/// A simple calculation of the number of documents in the foreground sample with a term divided by the number of documents in the background with the term.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("percentage")]
 	public Elastic.Clients.Elasticsearch.Serverless.Aggregations.PercentageScoreHeuristic? Percentage { get; set; }
 
 	/// <summary>
@@ -130,7 +313,6 @@ public sealed partial class SignificantTextAggregation
 	/// Customized score, implemented via a script.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("script_heuristic")]
 	public Elastic.Clients.Elasticsearch.Serverless.Aggregations.ScriptedHeuristic? ScriptHeuristic { get; set; }
 
 	/// <summary>
@@ -139,7 +321,6 @@ public sealed partial class SignificantTextAggregation
 	/// Values will only be considered if their local shard frequency within the set is higher than the <c>shard_min_doc_count</c>.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("shard_min_doc_count")]
 	public long? ShardMinDocCount { get; set; }
 
 	/// <summary>
@@ -148,7 +329,6 @@ public sealed partial class SignificantTextAggregation
 	/// By default, <c>shard_size</c> will be automatically estimated based on the number of shards and the <c>size</c> parameter.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("shard_size")]
 	public int? ShardSize { get; set; }
 
 	/// <summary>
@@ -156,7 +336,6 @@ public sealed partial class SignificantTextAggregation
 	/// The number of buckets returned out of the overall terms list.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("size")]
 	public int? Size { get; set; }
 
 	/// <summary>
@@ -164,8 +343,6 @@ public sealed partial class SignificantTextAggregation
 	/// Overrides the JSON <c>_source</c> fields from which text will be analyzed.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("source_fields")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Serverless.Fields? SourceFields { get; set; }
 
 	public static implicit operator Elastic.Clients.Elasticsearch.Serverless.Aggregations.Aggregation(SignificantTextAggregation significantTextAggregation) => Elastic.Clients.Elasticsearch.Serverless.Aggregations.Aggregation.SignificantText(significantTextAggregation);
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/SimpleValueAggregate.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/SimpleValueAggregate.g.cs
index 68ac88cf2db..4c8a2e22876 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/SimpleValueAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/SimpleValueAggregate.g.cs
@@ -42,4 +42,6 @@ public sealed partial class SimpleValueAggregate : IAggregate
 	public double? Value { get; init; }
 	[JsonInclude, JsonPropertyName("value_as_string")]
 	public string? ValueAsString { get; init; }
+
+	string IAggregate.Type => "simple_value";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/StatsAggregate.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/StatsAggregate.g.cs
index cd96a122c42..b0bc0dd307b 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/StatsAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/StatsAggregate.g.cs
@@ -55,4 +55,6 @@ public sealed partial class StatsAggregate : IAggregate
 	public double Sum { get; init; }
 	[JsonInclude, JsonPropertyName("sum_as_string")]
 	public string? SumAsString { get; init; }
+
+	string IAggregate.Type => "stats";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/StatsBucketAggregate.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/StatsBucketAggregate.g.cs
index fa25df9afbd..71c61bf663c 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/StatsBucketAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/StatsBucketAggregate.g.cs
@@ -49,4 +49,6 @@ public sealed partial class StatsBucketAggregate : IAggregate
 	public double Sum { get; init; }
 	[JsonInclude, JsonPropertyName("sum_as_string")]
 	public string? SumAsString { get; init; }
+
+	string IAggregate.Type => "stats_bucket";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/StringRareTermsAggregate.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/StringRareTermsAggregate.g.cs
index 04fb7cdb10c..0bd976cf5ff 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/StringRareTermsAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/StringRareTermsAggregate.g.cs
@@ -38,4 +38,6 @@ public sealed partial class StringRareTermsAggregate : IAggregate
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Aggregations.StringRareTermsBucket> Buckets { get; init; }
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
+
+	string IAggregate.Type => "srareterms";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/StringRareTermsBucket.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/StringRareTermsBucket.g.cs
index 1bc02b85d3b..938b81ca357 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/StringRareTermsBucket.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/StringRareTermsBucket.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,49 +28,60 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Aggregations;
 
-internal sealed partial class StringRareTermsBucketConverter : JsonConverter<StringRareTermsBucket>
+internal sealed partial class StringRareTermsBucketConverter : System.Text.Json.Serialization.JsonConverter<StringRareTermsBucket>
 {
-	public override StringRareTermsBucket Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropDocCount = System.Text.Json.JsonEncodedText.Encode("doc_count");
+	private static readonly System.Text.Json.JsonEncodedText PropKey = System.Text.Json.JsonEncodedText.Encode("key");
+
+	public override StringRareTermsBucket Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		long docCount = default;
-		string key = default;
-		Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate> propAggregations = default;
+		LocalJsonProperty<long> propDocCount = default;
+		LocalJsonProperty<string> propKey = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propDocCount.TryRead(ref reader, options, PropDocCount))
 			{
-				var property = reader.GetString();
-				if (property == "doc_count")
-				{
-					docCount = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "key")
-				{
-					key = JsonSerializer.Deserialize<string>(ref reader, options);
-					continue;
-				}
-
-				if (property.Contains("#"))
-				{
-					additionalProperties ??= new Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate>();
-					AggregateDictionaryConverter.ReadItem(ref reader, options, additionalProperties, property);
-					continue;
-				}
+				continue;
+			}
 
-				throw new JsonException("Unknown property read from JSON.");
+			if (propKey.TryRead(ref reader, options, PropKey))
+			{
+				continue;
 			}
+
+			propAggregations ??= new System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate>();
+			Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionaryConverter.ReadItem(ref reader, options, out string key, out Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate value);
+			propAggregations[key] = value;
 		}
 
-		return new StringRareTermsBucket { Aggregations = new Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary(additionalProperties), DocCount = docCount, Key = key };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new StringRareTermsBucket
+		{
+			Aggregations = new Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary(propAggregations)
+,
+			DocCount = propDocCount.Value
+,
+			Key = propKey.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, StringRareTermsBucket value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, StringRareTermsBucket value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'StringRareTermsBucket' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDocCount, value.DocCount);
+		writer.WriteProperty(options, PropKey, value.Key);
+		if (value.Aggregations is not null)
+		{
+			foreach (var item in value.Aggregations)
+			{
+				Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionaryConverter.WriteItem(writer, options, item.Key, item.Value);
+			}
+		}
+
+		writer.WriteEndObject();
 	}
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/StringStatsAggregate.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/StringStatsAggregate.g.cs
index 8fe673d457a..2281f6a59a6 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/StringStatsAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/StringStatsAggregate.g.cs
@@ -49,4 +49,6 @@ public sealed partial class StringStatsAggregate : IAggregate
 	public int? MinLength { get; init; }
 	[JsonInclude, JsonPropertyName("min_length_as_string")]
 	public string? MinLengthAsString { get; init; }
+
+	string IAggregate.Type => "string_stats";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/StringTermsAggregate.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/StringTermsAggregate.g.cs
index 88ae16d8ebf..73bd0dd67c9 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/StringTermsAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/StringTermsAggregate.g.cs
@@ -42,4 +42,6 @@ public sealed partial class StringTermsAggregate : IAggregate
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
 	[JsonInclude, JsonPropertyName("sum_other_doc_count")]
 	public long? SumOtherDocCount { get; init; }
+
+	string IAggregate.Type => "sterms";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/StringTermsBucket.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/StringTermsBucket.g.cs
index 013a4dbbaed..1a7cff7812b 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/StringTermsBucket.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/StringTermsBucket.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,56 +28,70 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Aggregations;
 
-internal sealed partial class StringTermsBucketConverter : JsonConverter<StringTermsBucket>
+internal sealed partial class StringTermsBucketConverter : System.Text.Json.Serialization.JsonConverter<StringTermsBucket>
 {
-	public override StringTermsBucket Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropDocCount = System.Text.Json.JsonEncodedText.Encode("doc_count");
+	private static readonly System.Text.Json.JsonEncodedText PropDocCountErrorUpperBound = System.Text.Json.JsonEncodedText.Encode("doc_count_error_upper_bound");
+	private static readonly System.Text.Json.JsonEncodedText PropKey = System.Text.Json.JsonEncodedText.Encode("key");
+
+	public override StringTermsBucket Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		long docCount = default;
-		long? docCountErrorUpperBound = default;
-		Elastic.Clients.Elasticsearch.Serverless.FieldValue key = default;
-		Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate> propAggregations = default;
+		LocalJsonProperty<long> propDocCount = default;
+		LocalJsonProperty<long?> propDocCountErrorUpperBound = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.FieldValue> propKey = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propDocCount.TryRead(ref reader, options, PropDocCount))
 			{
-				var property = reader.GetString();
-				if (property == "doc_count")
-				{
-					docCount = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "doc_count_error_upper_bound")
-				{
-					docCountErrorUpperBound = JsonSerializer.Deserialize<long?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "key")
-				{
-					key = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.FieldValue>(ref reader, options);
-					continue;
-				}
+				continue;
+			}
 
-				if (property.Contains("#"))
-				{
-					additionalProperties ??= new Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate>();
-					AggregateDictionaryConverter.ReadItem(ref reader, options, additionalProperties, property);
-					continue;
-				}
+			if (propDocCountErrorUpperBound.TryRead(ref reader, options, PropDocCountErrorUpperBound))
+			{
+				continue;
+			}
 
-				throw new JsonException("Unknown property read from JSON.");
+			if (propKey.TryRead(ref reader, options, PropKey))
+			{
+				continue;
 			}
+
+			propAggregations ??= new System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate>();
+			Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionaryConverter.ReadItem(ref reader, options, out string key, out Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate value);
+			propAggregations[key] = value;
 		}
 
-		return new StringTermsBucket { Aggregations = new Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary(additionalProperties), DocCount = docCount, DocCountErrorUpperBound = docCountErrorUpperBound, Key = key };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new StringTermsBucket
+		{
+			Aggregations = new Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary(propAggregations)
+,
+			DocCount = propDocCount.Value
+,
+			DocCountErrorUpperBound = propDocCountErrorUpperBound.Value
+,
+			Key = propKey.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, StringTermsBucket value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, StringTermsBucket value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'StringTermsBucket' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDocCount, value.DocCount);
+		writer.WriteProperty(options, PropDocCountErrorUpperBound, value.DocCountErrorUpperBound);
+		writer.WriteProperty(options, PropKey, value.Key);
+		if (value.Aggregations is not null)
+		{
+			foreach (var item in value.Aggregations)
+			{
+				Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionaryConverter.WriteItem(writer, options, item.Key, item.Value);
+			}
+		}
+
+		writer.WriteEndObject();
 	}
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/SumAggregate.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/SumAggregate.g.cs
index 238d466c9b9..bca49073f72 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/SumAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/SumAggregate.g.cs
@@ -47,4 +47,6 @@ public sealed partial class SumAggregate : IAggregate
 	public double? Value { get; init; }
 	[JsonInclude, JsonPropertyName("value_as_string")]
 	public string? ValueAsString { get; init; }
+
+	string IAggregate.Type => "sum";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/TDigestPercentileRanksAggregate.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/TDigestPercentileRanksAggregate.g.cs
index f17b90e7338..7afc6484399 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/TDigestPercentileRanksAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/TDigestPercentileRanksAggregate.g.cs
@@ -33,4 +33,6 @@ public sealed partial class TDigestPercentileRanksAggregate : IAggregate
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
 	[JsonInclude, JsonPropertyName("values")]
 	public Elastic.Clients.Elasticsearch.Serverless.Aggregations.Percentiles Values { get; init; }
+
+	string IAggregate.Type => "tdigest_percentile_ranks";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/TDigestPercentilesAggregate.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/TDigestPercentilesAggregate.g.cs
index bd47ae63781..231e6c6928f 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/TDigestPercentilesAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/TDigestPercentilesAggregate.g.cs
@@ -33,4 +33,6 @@ public sealed partial class TDigestPercentilesAggregate : IAggregate
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
 	[JsonInclude, JsonPropertyName("values")]
 	public Elastic.Clients.Elasticsearch.Serverless.Aggregations.Percentiles Values { get; init; }
+
+	string IAggregate.Type => "tdigest_percentiles";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/TTestAggregate.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/TTestAggregate.g.cs
index d2c7657b542..f26ef9a9dc2 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/TTestAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/TTestAggregate.g.cs
@@ -35,4 +35,6 @@ public sealed partial class TTestAggregate : IAggregate
 	public double? Value { get; init; }
 	[JsonInclude, JsonPropertyName("value_as_string")]
 	public string? ValueAsString { get; init; }
+
+	string IAggregate.Type => "t_test";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/TermsAggregation.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/TermsAggregation.g.cs
index 84596ba6190..19a4a9177ed 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/TermsAggregation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/TermsAggregation.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,200 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Aggregations;
 
+internal sealed partial class TermsAggregationConverter : System.Text.Json.Serialization.JsonConverter<TermsAggregation>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCollectMode = System.Text.Json.JsonEncodedText.Encode("collect_mode");
+	private static readonly System.Text.Json.JsonEncodedText PropExclude = System.Text.Json.JsonEncodedText.Encode("exclude");
+	private static readonly System.Text.Json.JsonEncodedText PropExecutionHint = System.Text.Json.JsonEncodedText.Encode("execution_hint");
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropFormat = System.Text.Json.JsonEncodedText.Encode("format");
+	private static readonly System.Text.Json.JsonEncodedText PropInclude = System.Text.Json.JsonEncodedText.Encode("include");
+	private static readonly System.Text.Json.JsonEncodedText PropMinDocCount = System.Text.Json.JsonEncodedText.Encode("min_doc_count");
+	private static readonly System.Text.Json.JsonEncodedText PropMissing = System.Text.Json.JsonEncodedText.Encode("missing");
+	private static readonly System.Text.Json.JsonEncodedText PropMissingBucket = System.Text.Json.JsonEncodedText.Encode("missing_bucket");
+	private static readonly System.Text.Json.JsonEncodedText PropMissingOrder = System.Text.Json.JsonEncodedText.Encode("missing_order");
+	private static readonly System.Text.Json.JsonEncodedText PropOrder = System.Text.Json.JsonEncodedText.Encode("order");
+	private static readonly System.Text.Json.JsonEncodedText PropScript = System.Text.Json.JsonEncodedText.Encode("script");
+	private static readonly System.Text.Json.JsonEncodedText PropShardMinDocCount = System.Text.Json.JsonEncodedText.Encode("shard_min_doc_count");
+	private static readonly System.Text.Json.JsonEncodedText PropShardSize = System.Text.Json.JsonEncodedText.Encode("shard_size");
+	private static readonly System.Text.Json.JsonEncodedText PropShowTermDocCountError = System.Text.Json.JsonEncodedText.Encode("show_term_doc_count_error");
+	private static readonly System.Text.Json.JsonEncodedText PropSize = System.Text.Json.JsonEncodedText.Encode("size");
+	private static readonly System.Text.Json.JsonEncodedText PropValueType = System.Text.Json.JsonEncodedText.Encode("value_type");
+
+	public override TermsAggregation Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Aggregations.TermsAggregationCollectMode?> propCollectMode = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Aggregations.TermsExclude?> propExclude = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Aggregations.TermsAggregationExecutionHint?> propExecutionHint = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Field?> propField = default;
+		LocalJsonProperty<string?> propFormat = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Aggregations.TermsInclude?> propInclude = default;
+		LocalJsonProperty<int?> propMinDocCount = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.FieldValue?> propMissing = default;
+		LocalJsonProperty<bool?> propMissingBucket = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Aggregations.MissingOrder?> propMissingOrder = default;
+		LocalJsonProperty<ICollection<KeyValuePair<Elastic.Clients.Elasticsearch.Serverless.Field, Elastic.Clients.Elasticsearch.Serverless.SortOrder>>?> propOrder = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Script?> propScript = default;
+		LocalJsonProperty<long?> propShardMinDocCount = default;
+		LocalJsonProperty<int?> propShardSize = default;
+		LocalJsonProperty<bool?> propShowTermDocCountError = default;
+		LocalJsonProperty<int?> propSize = default;
+		LocalJsonProperty<string?> propValueType = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCollectMode.TryRead(ref reader, options, PropCollectMode))
+			{
+				continue;
+			}
+
+			if (propExclude.TryRead(ref reader, options, PropExclude))
+			{
+				continue;
+			}
+
+			if (propExecutionHint.TryRead(ref reader, options, PropExecutionHint))
+			{
+				continue;
+			}
+
+			if (propField.TryRead(ref reader, options, PropField))
+			{
+				continue;
+			}
+
+			if (propFormat.TryRead(ref reader, options, PropFormat))
+			{
+				continue;
+			}
+
+			if (propInclude.TryRead(ref reader, options, PropInclude))
+			{
+				continue;
+			}
+
+			if (propMinDocCount.TryRead(ref reader, options, PropMinDocCount))
+			{
+				continue;
+			}
+
+			if (propMissing.TryRead(ref reader, options, PropMissing))
+			{
+				continue;
+			}
+
+			if (propMissingBucket.TryRead(ref reader, options, PropMissingBucket))
+			{
+				continue;
+			}
+
+			if (propMissingOrder.TryRead(ref reader, options, PropMissingOrder))
+			{
+				continue;
+			}
+
+			if (propOrder.TryRead(ref reader, options, PropOrder, typeof(SingleOrManyMarker<IReadOnlyCollection<KeyValuePair<Elastic.Clients.Elasticsearch.Serverless.Field, Elastic.Clients.Elasticsearch.Serverless.SortOrder>>?, KeyValuePair<Elastic.Clients.Elasticsearch.Serverless.Field, Elastic.Clients.Elasticsearch.Serverless.SortOrder>>)))
+			{
+				continue;
+			}
+
+			if (propScript.TryRead(ref reader, options, PropScript))
+			{
+				continue;
+			}
+
+			if (propShardMinDocCount.TryRead(ref reader, options, PropShardMinDocCount))
+			{
+				continue;
+			}
+
+			if (propShardSize.TryRead(ref reader, options, PropShardSize))
+			{
+				continue;
+			}
+
+			if (propShowTermDocCountError.TryRead(ref reader, options, PropShowTermDocCountError))
+			{
+				continue;
+			}
+
+			if (propSize.TryRead(ref reader, options, PropSize))
+			{
+				continue;
+			}
+
+			if (propValueType.TryRead(ref reader, options, PropValueType))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new TermsAggregation
+		{
+			CollectMode = propCollectMode.Value
+,
+			Exclude = propExclude.Value
+,
+			ExecutionHint = propExecutionHint.Value
+,
+			Field = propField.Value
+,
+			Format = propFormat.Value
+,
+			Include = propInclude.Value
+,
+			MinDocCount = propMinDocCount.Value
+,
+			Missing = propMissing.Value
+,
+			MissingBucket = propMissingBucket.Value
+,
+			MissingOrder = propMissingOrder.Value
+,
+			Order = propOrder.Value
+,
+			Script = propScript.Value
+,
+			ShardMinDocCount = propShardMinDocCount.Value
+,
+			ShardSize = propShardSize.Value
+,
+			ShowTermDocCountError = propShowTermDocCountError.Value
+,
+			Size = propSize.Value
+,
+			ValueType = propValueType.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, TermsAggregation value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCollectMode, value.CollectMode);
+		writer.WriteProperty(options, PropExclude, value.Exclude);
+		writer.WriteProperty(options, PropExecutionHint, value.ExecutionHint);
+		writer.WriteProperty(options, PropField, value.Field);
+		writer.WriteProperty(options, PropFormat, value.Format);
+		writer.WriteProperty(options, PropInclude, value.Include);
+		writer.WriteProperty(options, PropMinDocCount, value.MinDocCount);
+		writer.WriteProperty(options, PropMissing, value.Missing);
+		writer.WriteProperty(options, PropMissingBucket, value.MissingBucket);
+		writer.WriteProperty(options, PropMissingOrder, value.MissingOrder);
+		writer.WriteProperty(options, PropOrder, value.Order, typeof(SingleOrManyMarker<IReadOnlyCollection<KeyValuePair<Elastic.Clients.Elasticsearch.Serverless.Field, Elastic.Clients.Elasticsearch.Serverless.SortOrder>>?, KeyValuePair<Elastic.Clients.Elasticsearch.Serverless.Field, Elastic.Clients.Elasticsearch.Serverless.SortOrder>>));
+		writer.WriteProperty(options, PropScript, value.Script);
+		writer.WriteProperty(options, PropShardMinDocCount, value.ShardMinDocCount);
+		writer.WriteProperty(options, PropShardSize, value.ShardSize);
+		writer.WriteProperty(options, PropShowTermDocCountError, value.ShowTermDocCountError);
+		writer.WriteProperty(options, PropSize, value.Size);
+		writer.WriteProperty(options, PropValueType, value.ValueType);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(TermsAggregationConverter))]
 public sealed partial class TermsAggregation
 {
 	/// <summary>
@@ -34,7 +229,6 @@ public sealed partial class TermsAggregation
 	/// Determines how child aggregations should be calculated: breadth-first or depth-first.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("collect_mode")]
 	public Elastic.Clients.Elasticsearch.Serverless.Aggregations.TermsAggregationCollectMode? CollectMode { get; set; }
 
 	/// <summary>
@@ -43,7 +237,6 @@ public sealed partial class TermsAggregation
 	/// Accepts regular expressions and partitions.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("exclude")]
 	public Elastic.Clients.Elasticsearch.Serverless.Aggregations.TermsExclude? Exclude { get; set; }
 
 	/// <summary>
@@ -51,7 +244,6 @@ public sealed partial class TermsAggregation
 	/// Determines whether the aggregation will use field values directly or global ordinals.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("execution_hint")]
 	public Elastic.Clients.Elasticsearch.Serverless.Aggregations.TermsAggregationExecutionHint? ExecutionHint { get; set; }
 
 	/// <summary>
@@ -59,9 +251,7 @@ public sealed partial class TermsAggregation
 	/// The field from which to return terms.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("field")]
 	public Elastic.Clients.Elasticsearch.Serverless.Field? Field { get; set; }
-	[JsonInclude, JsonPropertyName("format")]
 	public string? Format { get; set; }
 
 	/// <summary>
@@ -70,7 +260,6 @@ public sealed partial class TermsAggregation
 	/// Accepts regular expressions and partitions.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("include")]
 	public Elastic.Clients.Elasticsearch.Serverless.Aggregations.TermsInclude? Include { get; set; }
 
 	/// <summary>
@@ -78,7 +267,6 @@ public sealed partial class TermsAggregation
 	/// Only return values that are found in more than <c>min_doc_count</c> hits.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("min_doc_count")]
 	public int? MinDocCount { get; set; }
 
 	/// <summary>
@@ -87,11 +275,8 @@ public sealed partial class TermsAggregation
 	/// By default, documents without a value are ignored.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("missing")]
 	public Elastic.Clients.Elasticsearch.Serverless.FieldValue? Missing { get; set; }
-	[JsonInclude, JsonPropertyName("missing_bucket")]
 	public bool? MissingBucket { get; set; }
-	[JsonInclude, JsonPropertyName("missing_order")]
 	public Elastic.Clients.Elasticsearch.Serverless.Aggregations.MissingOrder? MissingOrder { get; set; }
 
 	/// <summary>
@@ -100,10 +285,7 @@ public sealed partial class TermsAggregation
 	/// Defaults to sorting by descending document count.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("order")]
-	[SingleOrManyCollectionConverter(typeof(KeyValuePair<Elastic.Clients.Elasticsearch.Serverless.Field, Elastic.Clients.Elasticsearch.Serverless.SortOrder>))]
 	public ICollection<KeyValuePair<Elastic.Clients.Elasticsearch.Serverless.Field, Elastic.Clients.Elasticsearch.Serverless.SortOrder>>? Order { get; set; }
-	[JsonInclude, JsonPropertyName("script")]
 	public Elastic.Clients.Elasticsearch.Serverless.Script? Script { get; set; }
 
 	/// <summary>
@@ -112,7 +294,6 @@ public sealed partial class TermsAggregation
 	/// Terms will only be considered if their local shard frequency within the set is higher than the <c>shard_min_doc_count</c>.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("shard_min_doc_count")]
 	public long? ShardMinDocCount { get; set; }
 
 	/// <summary>
@@ -121,7 +302,6 @@ public sealed partial class TermsAggregation
 	/// By default, <c>shard_size</c> will be automatically estimated based on the number of shards and the <c>size</c> parameter.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("shard_size")]
 	public int? ShardSize { get; set; }
 
 	/// <summary>
@@ -129,7 +309,6 @@ public sealed partial class TermsAggregation
 	/// Set to <c>true</c> to return the <c>doc_count_error_upper_bound</c>, which is an upper bound to the error on the <c>doc_count</c> returned by each shard.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("show_term_doc_count_error")]
 	public bool? ShowTermDocCountError { get; set; }
 
 	/// <summary>
@@ -137,7 +316,6 @@ public sealed partial class TermsAggregation
 	/// The number of buckets returned out of the overall terms list.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("size")]
 	public int? Size { get; set; }
 
 	/// <summary>
@@ -145,7 +323,6 @@ public sealed partial class TermsAggregation
 	/// Coerced unmapped fields into the specified type.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("value_type")]
 	public string? ValueType { get; set; }
 
 	public static implicit operator Elastic.Clients.Elasticsearch.Serverless.Aggregations.Aggregation(TermsAggregation termsAggregation) => Elastic.Clients.Elasticsearch.Serverless.Aggregations.Aggregation.Terms(termsAggregation);
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/TimeSeriesAggregate.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/TimeSeriesAggregate.g.cs
index 8eeb3961a76..ca634b32b22 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/TimeSeriesAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/TimeSeriesAggregate.g.cs
@@ -33,4 +33,6 @@ public sealed partial class TimeSeriesAggregate : IAggregate
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Aggregations.TimeSeriesBucket> Buckets { get; init; }
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
+
+	string IAggregate.Type => "time_series";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/TimeSeriesBucket.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/TimeSeriesBucket.g.cs
index 920d0906f9c..270e227a798 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/TimeSeriesBucket.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/TimeSeriesBucket.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,49 +28,60 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Aggregations;
 
-internal sealed partial class TimeSeriesBucketConverter : JsonConverter<TimeSeriesBucket>
+internal sealed partial class TimeSeriesBucketConverter : System.Text.Json.Serialization.JsonConverter<TimeSeriesBucket>
 {
-	public override TimeSeriesBucket Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropDocCount = System.Text.Json.JsonEncodedText.Encode("doc_count");
+	private static readonly System.Text.Json.JsonEncodedText PropKey = System.Text.Json.JsonEncodedText.Encode("key");
+
+	public override TimeSeriesBucket Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		long docCount = default;
-		IReadOnlyDictionary<Elastic.Clients.Elasticsearch.Serverless.Field, Elastic.Clients.Elasticsearch.Serverless.FieldValue> key = default;
-		Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate> propAggregations = default;
+		LocalJsonProperty<long> propDocCount = default;
+		LocalJsonProperty<IReadOnlyDictionary<Elastic.Clients.Elasticsearch.Serverless.Field, Elastic.Clients.Elasticsearch.Serverless.FieldValue>> propKey = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propDocCount.TryRead(ref reader, options, PropDocCount))
 			{
-				var property = reader.GetString();
-				if (property == "doc_count")
-				{
-					docCount = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "key")
-				{
-					key = JsonSerializer.Deserialize<IReadOnlyDictionary<Elastic.Clients.Elasticsearch.Serverless.Field, Elastic.Clients.Elasticsearch.Serverless.FieldValue>>(ref reader, options);
-					continue;
-				}
-
-				if (property.Contains("#"))
-				{
-					additionalProperties ??= new Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate>();
-					AggregateDictionaryConverter.ReadItem(ref reader, options, additionalProperties, property);
-					continue;
-				}
+				continue;
+			}
 
-				throw new JsonException("Unknown property read from JSON.");
+			if (propKey.TryRead(ref reader, options, PropKey))
+			{
+				continue;
 			}
+
+			propAggregations ??= new System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate>();
+			Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionaryConverter.ReadItem(ref reader, options, out string key, out Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate value);
+			propAggregations[key] = value;
 		}
 
-		return new TimeSeriesBucket { Aggregations = new Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary(additionalProperties), DocCount = docCount, Key = key };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new TimeSeriesBucket
+		{
+			Aggregations = new Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary(propAggregations)
+,
+			DocCount = propDocCount.Value
+,
+			Key = propKey.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, TimeSeriesBucket value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, TimeSeriesBucket value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'TimeSeriesBucket' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDocCount, value.DocCount);
+		writer.WriteProperty(options, PropKey, value.Key);
+		if (value.Aggregations is not null)
+		{
+			foreach (var item in value.Aggregations)
+			{
+				Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionaryConverter.WriteItem(writer, options, item.Key, item.Value);
+			}
+		}
+
+		writer.WriteEndObject();
 	}
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/TopHitsAggregate.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/TopHitsAggregate.g.cs
index 661c3246f20..59a4bafa9cc 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/TopHitsAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/TopHitsAggregate.g.cs
@@ -33,4 +33,6 @@ public sealed partial class TopHitsAggregate : IAggregate
 	public Elastic.Clients.Elasticsearch.Serverless.Core.Search.HitsMetadata<object> Hits { get; init; }
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
+
+	string IAggregate.Type => "top_hits";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/TopHitsAggregation.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/TopHitsAggregation.g.cs
index e61be0c1116..9075a301c07 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/TopHitsAggregation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/TopHitsAggregation.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,190 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Aggregations;
 
+internal sealed partial class TopHitsAggregationConverter : System.Text.Json.Serialization.JsonConverter<TopHitsAggregation>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropDocvalueFields = System.Text.Json.JsonEncodedText.Encode("docvalue_fields");
+	private static readonly System.Text.Json.JsonEncodedText PropExplain = System.Text.Json.JsonEncodedText.Encode("explain");
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropFrom = System.Text.Json.JsonEncodedText.Encode("from");
+	private static readonly System.Text.Json.JsonEncodedText PropHighlight = System.Text.Json.JsonEncodedText.Encode("highlight");
+	private static readonly System.Text.Json.JsonEncodedText PropMissing = System.Text.Json.JsonEncodedText.Encode("missing");
+	private static readonly System.Text.Json.JsonEncodedText PropScript = System.Text.Json.JsonEncodedText.Encode("script");
+	private static readonly System.Text.Json.JsonEncodedText PropScriptFields = System.Text.Json.JsonEncodedText.Encode("script_fields");
+	private static readonly System.Text.Json.JsonEncodedText PropSeqNoPrimaryTerm = System.Text.Json.JsonEncodedText.Encode("seq_no_primary_term");
+	private static readonly System.Text.Json.JsonEncodedText PropSize = System.Text.Json.JsonEncodedText.Encode("size");
+	private static readonly System.Text.Json.JsonEncodedText PropSort = System.Text.Json.JsonEncodedText.Encode("sort");
+	private static readonly System.Text.Json.JsonEncodedText PropSource = System.Text.Json.JsonEncodedText.Encode("_source");
+	private static readonly System.Text.Json.JsonEncodedText PropStoredFields = System.Text.Json.JsonEncodedText.Encode("stored_fields");
+	private static readonly System.Text.Json.JsonEncodedText PropTrackScores = System.Text.Json.JsonEncodedText.Encode("track_scores");
+	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("version");
+
+	public override TopHitsAggregation Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.FieldAndFormat>?> propDocvalueFields = default;
+		LocalJsonProperty<bool?> propExplain = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Field?> propField = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.FieldAndFormat>?> propFields = default;
+		LocalJsonProperty<int?> propFrom = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Core.Search.Highlight?> propHighlight = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.FieldValue?> propMissing = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Script?> propScript = default;
+		LocalJsonProperty<IDictionary<string, Elastic.Clients.Elasticsearch.Serverless.ScriptField>?> propScriptFields = default;
+		LocalJsonProperty<bool?> propSeqNoPrimaryTerm = default;
+		LocalJsonProperty<int?> propSize = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.SortOptions>?> propSort = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Core.Search.SourceConfig?> propSource = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Fields?> propStoredFields = default;
+		LocalJsonProperty<bool?> propTrackScores = default;
+		LocalJsonProperty<bool?> propVersion = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propDocvalueFields.TryRead(ref reader, options, PropDocvalueFields))
+			{
+				continue;
+			}
+
+			if (propExplain.TryRead(ref reader, options, PropExplain))
+			{
+				continue;
+			}
+
+			if (propField.TryRead(ref reader, options, PropField))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propFrom.TryRead(ref reader, options, PropFrom))
+			{
+				continue;
+			}
+
+			if (propHighlight.TryRead(ref reader, options, PropHighlight))
+			{
+				continue;
+			}
+
+			if (propMissing.TryRead(ref reader, options, PropMissing))
+			{
+				continue;
+			}
+
+			if (propScript.TryRead(ref reader, options, PropScript))
+			{
+				continue;
+			}
+
+			if (propScriptFields.TryRead(ref reader, options, PropScriptFields))
+			{
+				continue;
+			}
+
+			if (propSeqNoPrimaryTerm.TryRead(ref reader, options, PropSeqNoPrimaryTerm))
+			{
+				continue;
+			}
+
+			if (propSize.TryRead(ref reader, options, PropSize))
+			{
+				continue;
+			}
+
+			if (propSort.TryRead(ref reader, options, PropSort, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.SortOptions>?, Elastic.Clients.Elasticsearch.Serverless.SortOptions>)))
+			{
+				continue;
+			}
+
+			if (propSource.TryRead(ref reader, options, PropSource))
+			{
+				continue;
+			}
+
+			if (propStoredFields.TryRead(ref reader, options, PropStoredFields, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propTrackScores.TryRead(ref reader, options, PropTrackScores))
+			{
+				continue;
+			}
+
+			if (propVersion.TryRead(ref reader, options, PropVersion))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new TopHitsAggregation
+		{
+			DocvalueFields = propDocvalueFields.Value
+,
+			Explain = propExplain.Value
+,
+			Field = propField.Value
+,
+			Fields = propFields.Value
+,
+			From = propFrom.Value
+,
+			Highlight = propHighlight.Value
+,
+			Missing = propMissing.Value
+,
+			Script = propScript.Value
+,
+			ScriptFields = propScriptFields.Value
+,
+			SeqNoPrimaryTerm = propSeqNoPrimaryTerm.Value
+,
+			Size = propSize.Value
+,
+			Sort = propSort.Value
+,
+			Source = propSource.Value
+,
+			StoredFields = propStoredFields.Value
+,
+			TrackScores = propTrackScores.Value
+,
+			Version = propVersion.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, TopHitsAggregation value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDocvalueFields, value.DocvalueFields);
+		writer.WriteProperty(options, PropExplain, value.Explain);
+		writer.WriteProperty(options, PropField, value.Field);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropFrom, value.From);
+		writer.WriteProperty(options, PropHighlight, value.Highlight);
+		writer.WriteProperty(options, PropMissing, value.Missing);
+		writer.WriteProperty(options, PropScript, value.Script);
+		writer.WriteProperty(options, PropScriptFields, value.ScriptFields);
+		writer.WriteProperty(options, PropSeqNoPrimaryTerm, value.SeqNoPrimaryTerm);
+		writer.WriteProperty(options, PropSize, value.Size);
+		writer.WriteProperty(options, PropSort, value.Sort, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.SortOptions>?, Elastic.Clients.Elasticsearch.Serverless.SortOptions>));
+		writer.WriteProperty(options, PropSource, value.Source);
+		writer.WriteProperty(options, PropStoredFields, value.StoredFields, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropTrackScores, value.TrackScores);
+		writer.WriteProperty(options, PropVersion, value.Version);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(TopHitsAggregationConverter))]
 public sealed partial class TopHitsAggregation
 {
 	/// <summary>
@@ -34,7 +219,6 @@ public sealed partial class TopHitsAggregation
 	/// Fields for which to return doc values.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("docvalue_fields")]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.FieldAndFormat>? DocvalueFields { get; set; }
 
 	/// <summary>
@@ -42,7 +226,6 @@ public sealed partial class TopHitsAggregation
 	/// If <c>true</c>, returns detailed information about score computation as part of a hit.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("explain")]
 	public bool? Explain { get; set; }
 
 	/// <summary>
@@ -50,7 +233,6 @@ public sealed partial class TopHitsAggregation
 	/// The field on which to run the aggregation.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("field")]
 	public Elastic.Clients.Elasticsearch.Serverless.Field? Field { get; set; }
 
 	/// <summary>
@@ -59,7 +241,6 @@ public sealed partial class TopHitsAggregation
 	/// matching these patterns in the hits.fields property of the response.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("fields")]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.FieldAndFormat>? Fields { get; set; }
 
 	/// <summary>
@@ -67,7 +248,6 @@ public sealed partial class TopHitsAggregation
 	/// Starting document offset.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("from")]
 	public int? From { get; set; }
 
 	/// <summary>
@@ -75,7 +255,6 @@ public sealed partial class TopHitsAggregation
 	/// Specifies the highlighter to use for retrieving highlighted snippets from one or more fields in the search results.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("highlight")]
 	public Elastic.Clients.Elasticsearch.Serverless.Core.Search.Highlight? Highlight { get; set; }
 
 	/// <summary>
@@ -84,9 +263,7 @@ public sealed partial class TopHitsAggregation
 	/// By default, documents without a value are ignored.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("missing")]
 	public Elastic.Clients.Elasticsearch.Serverless.FieldValue? Missing { get; set; }
-	[JsonInclude, JsonPropertyName("script")]
 	public Elastic.Clients.Elasticsearch.Serverless.Script? Script { get; set; }
 
 	/// <summary>
@@ -94,7 +271,6 @@ public sealed partial class TopHitsAggregation
 	/// Returns the result of one or more script evaluations for each hit.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("script_fields")]
 	public IDictionary<string, Elastic.Clients.Elasticsearch.Serverless.ScriptField>? ScriptFields { get; set; }
 
 	/// <summary>
@@ -102,7 +278,6 @@ public sealed partial class TopHitsAggregation
 	/// If <c>true</c>, returns sequence number and primary term of the last modification of each hit.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("seq_no_primary_term")]
 	public bool? SeqNoPrimaryTerm { get; set; }
 
 	/// <summary>
@@ -110,7 +285,6 @@ public sealed partial class TopHitsAggregation
 	/// The maximum number of top matching hits to return per bucket.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("size")]
 	public int? Size { get; set; }
 
 	/// <summary>
@@ -119,8 +293,6 @@ public sealed partial class TopHitsAggregation
 	/// By default, the hits are sorted by the score of the main query.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("sort")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.Serverless.SortOptions))]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.SortOptions>? Sort { get; set; }
 
 	/// <summary>
@@ -128,7 +300,6 @@ public sealed partial class TopHitsAggregation
 	/// Selects the fields of the source that are returned.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("_source")]
 	public Elastic.Clients.Elasticsearch.Serverless.Core.Search.SourceConfig? Source { get; set; }
 
 	/// <summary>
@@ -136,8 +307,6 @@ public sealed partial class TopHitsAggregation
 	/// Returns values for the specified stored fields (fields that use the <c>store</c> mapping option).
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("stored_fields")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Serverless.Fields? StoredFields { get; set; }
 
 	/// <summary>
@@ -145,7 +314,6 @@ public sealed partial class TopHitsAggregation
 	/// If <c>true</c>, calculates and returns document scores, even if the scores are not used for sorting.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("track_scores")]
 	public bool? TrackScores { get; set; }
 
 	/// <summary>
@@ -153,7 +321,6 @@ public sealed partial class TopHitsAggregation
 	/// If <c>true</c>, returns document version as part of a hit.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("version")]
 	public bool? Version { get; set; }
 
 	public static implicit operator Elastic.Clients.Elasticsearch.Serverless.Aggregations.Aggregation(TopHitsAggregation topHitsAggregation) => Elastic.Clients.Elasticsearch.Serverless.Aggregations.Aggregation.TopHits(topHitsAggregation);
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/TopMetricsAggregate.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/TopMetricsAggregate.g.cs
index 196c66f7a93..a4b88814b3e 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/TopMetricsAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/TopMetricsAggregate.g.cs
@@ -33,4 +33,6 @@ public sealed partial class TopMetricsAggregate : IAggregate
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
 	[JsonInclude, JsonPropertyName("top")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Aggregations.TopMetrics> Top { get; init; }
+
+	string IAggregate.Type => "top_metrics";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/TopMetricsAggregation.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/TopMetricsAggregation.g.cs
index 2fbf37981d7..9993e533789 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/TopMetricsAggregation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/TopMetricsAggregation.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,90 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Aggregations;
 
+internal sealed partial class TopMetricsAggregationConverter : System.Text.Json.Serialization.JsonConverter<TopMetricsAggregation>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropMetrics = System.Text.Json.JsonEncodedText.Encode("metrics");
+	private static readonly System.Text.Json.JsonEncodedText PropMissing = System.Text.Json.JsonEncodedText.Encode("missing");
+	private static readonly System.Text.Json.JsonEncodedText PropScript = System.Text.Json.JsonEncodedText.Encode("script");
+	private static readonly System.Text.Json.JsonEncodedText PropSize = System.Text.Json.JsonEncodedText.Encode("size");
+	private static readonly System.Text.Json.JsonEncodedText PropSort = System.Text.Json.JsonEncodedText.Encode("sort");
+
+	public override TopMetricsAggregation Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Field?> propField = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.Aggregations.TopMetricsValue>?> propMetrics = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.FieldValue?> propMissing = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Script?> propScript = default;
+		LocalJsonProperty<int?> propSize = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.SortOptions>?> propSort = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propField.TryRead(ref reader, options, PropField))
+			{
+				continue;
+			}
+
+			if (propMetrics.TryRead(ref reader, options, PropMetrics, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Aggregations.TopMetricsValue>?, Elastic.Clients.Elasticsearch.Serverless.Aggregations.TopMetricsValue>)))
+			{
+				continue;
+			}
+
+			if (propMissing.TryRead(ref reader, options, PropMissing))
+			{
+				continue;
+			}
+
+			if (propScript.TryRead(ref reader, options, PropScript))
+			{
+				continue;
+			}
+
+			if (propSize.TryRead(ref reader, options, PropSize))
+			{
+				continue;
+			}
+
+			if (propSort.TryRead(ref reader, options, PropSort, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.SortOptions>?, Elastic.Clients.Elasticsearch.Serverless.SortOptions>)))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new TopMetricsAggregation
+		{
+			Field = propField.Value
+,
+			Metrics = propMetrics.Value
+,
+			Missing = propMissing.Value
+,
+			Script = propScript.Value
+,
+			Size = propSize.Value
+,
+			Sort = propSort.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, TopMetricsAggregation value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropField, value.Field);
+		writer.WriteProperty(options, PropMetrics, value.Metrics, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Aggregations.TopMetricsValue>?, Elastic.Clients.Elasticsearch.Serverless.Aggregations.TopMetricsValue>));
+		writer.WriteProperty(options, PropMissing, value.Missing);
+		writer.WriteProperty(options, PropScript, value.Script);
+		writer.WriteProperty(options, PropSize, value.Size);
+		writer.WriteProperty(options, PropSort, value.Sort, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.SortOptions>?, Elastic.Clients.Elasticsearch.Serverless.SortOptions>));
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(TopMetricsAggregationConverter))]
 public sealed partial class TopMetricsAggregation
 {
 	/// <summary>
@@ -34,7 +119,6 @@ public sealed partial class TopMetricsAggregation
 	/// The field on which to run the aggregation.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("field")]
 	public Elastic.Clients.Elasticsearch.Serverless.Field? Field { get; set; }
 
 	/// <summary>
@@ -42,8 +126,6 @@ public sealed partial class TopMetricsAggregation
 	/// The fields of the top document to return.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("metrics")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.Serverless.Aggregations.TopMetricsValue))]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.Aggregations.TopMetricsValue>? Metrics { get; set; }
 
 	/// <summary>
@@ -52,9 +134,7 @@ public sealed partial class TopMetricsAggregation
 	/// By default, documents without a value are ignored.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("missing")]
 	public Elastic.Clients.Elasticsearch.Serverless.FieldValue? Missing { get; set; }
-	[JsonInclude, JsonPropertyName("script")]
 	public Elastic.Clients.Elasticsearch.Serverless.Script? Script { get; set; }
 
 	/// <summary>
@@ -62,7 +142,6 @@ public sealed partial class TopMetricsAggregation
 	/// The number of top documents from which to return metrics.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("size")]
 	public int? Size { get; set; }
 
 	/// <summary>
@@ -70,8 +149,6 @@ public sealed partial class TopMetricsAggregation
 	/// The sort order of the documents.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("sort")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.Serverless.SortOptions))]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.SortOptions>? Sort { get; set; }
 
 	public static implicit operator Elastic.Clients.Elasticsearch.Serverless.Aggregations.Aggregation(TopMetricsAggregation topMetricsAggregation) => Elastic.Clients.Elasticsearch.Serverless.Aggregations.Aggregation.TopMetrics(topMetricsAggregation);
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/UnmappedRareTermsAggregate.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/UnmappedRareTermsAggregate.g.cs
index 1c1fbf17411..401d85f19b2 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/UnmappedRareTermsAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/UnmappedRareTermsAggregate.g.cs
@@ -38,4 +38,6 @@ public sealed partial class UnmappedRareTermsAggregate : IAggregate
 	public IReadOnlyCollection<object> Buckets { get; init; }
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
+
+	string IAggregate.Type => "umrareterms";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/UnmappedSamplerAggregate.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/UnmappedSamplerAggregate.g.cs
index 631e5546508..7234ec5eac9 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/UnmappedSamplerAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/UnmappedSamplerAggregate.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,49 +28,60 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Aggregations;
 
-internal sealed partial class UnmappedSamplerAggregateConverter : JsonConverter<UnmappedSamplerAggregate>
+internal sealed partial class UnmappedSamplerAggregateConverter : System.Text.Json.Serialization.JsonConverter<UnmappedSamplerAggregate>
 {
-	public override UnmappedSamplerAggregate Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropDocCount = System.Text.Json.JsonEncodedText.Encode("doc_count");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+
+	public override UnmappedSamplerAggregate Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		long docCount = default;
-		IReadOnlyDictionary<string, object>? meta = default;
-		Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate> propAggregations = default;
+		LocalJsonProperty<long> propDocCount = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, object>?> propMeta = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propDocCount.TryRead(ref reader, options, PropDocCount))
 			{
-				var property = reader.GetString();
-				if (property == "doc_count")
-				{
-					docCount = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "meta")
-				{
-					meta = JsonSerializer.Deserialize<IReadOnlyDictionary<string, object>?>(ref reader, options);
-					continue;
-				}
-
-				if (property.Contains("#"))
-				{
-					additionalProperties ??= new Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate>();
-					AggregateDictionaryConverter.ReadItem(ref reader, options, additionalProperties, property);
-					continue;
-				}
+				continue;
+			}
 
-				throw new JsonException("Unknown property read from JSON.");
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
 			}
+
+			propAggregations ??= new System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate>();
+			Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionaryConverter.ReadItem(ref reader, options, out string key, out Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate value);
+			propAggregations[key] = value;
 		}
 
-		return new UnmappedSamplerAggregate { Aggregations = new Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary(additionalProperties), DocCount = docCount, Meta = meta };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new UnmappedSamplerAggregate
+		{
+			Aggregations = new Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary(propAggregations)
+,
+			DocCount = propDocCount.Value
+,
+			Meta = propMeta.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, UnmappedSamplerAggregate value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, UnmappedSamplerAggregate value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'UnmappedSamplerAggregate' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDocCount, value.DocCount);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		if (value.Aggregations is not null)
+		{
+			foreach (var item in value.Aggregations)
+			{
+				Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionaryConverter.WriteItem(writer, options, item.Key, item.Value);
+			}
+		}
+
+		writer.WriteEndObject();
 	}
 }
 
@@ -84,4 +96,6 @@ public sealed partial class UnmappedSamplerAggregate : IAggregate
 	public Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary Aggregations { get; init; }
 	public long DocCount { get; init; }
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
+
+	string IAggregate.Type => "unmapped_sampler";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/UnmappedSignificantTermsAggregate.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/UnmappedSignificantTermsAggregate.g.cs
index 5d1b5dc369d..be3264a1381 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/UnmappedSignificantTermsAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/UnmappedSignificantTermsAggregate.g.cs
@@ -42,4 +42,6 @@ public sealed partial class UnmappedSignificantTermsAggregate : IAggregate
 	public long? DocCount { get; init; }
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
+
+	string IAggregate.Type => "umsigterms";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/UnmappedTermsAggregate.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/UnmappedTermsAggregate.g.cs
index cc5108caa82..f24bc066ea2 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/UnmappedTermsAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/UnmappedTermsAggregate.g.cs
@@ -42,4 +42,6 @@ public sealed partial class UnmappedTermsAggregate : IAggregate
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
 	[JsonInclude, JsonPropertyName("sum_other_doc_count")]
 	public long? SumOtherDocCount { get; init; }
+
+	string IAggregate.Type => "umterms";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/ValueCountAggregate.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/ValueCountAggregate.g.cs
index c17384089a2..12cbe6c8c86 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/ValueCountAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/ValueCountAggregate.g.cs
@@ -47,4 +47,6 @@ public sealed partial class ValueCountAggregate : IAggregate
 	public double? Value { get; init; }
 	[JsonInclude, JsonPropertyName("value_as_string")]
 	public string? ValueAsString { get; init; }
+
+	string IAggregate.Type => "value_count";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/VariableWidthHistogramAggregate.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/VariableWidthHistogramAggregate.g.cs
index 4007ed3e8a8..3395aca617b 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/VariableWidthHistogramAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/VariableWidthHistogramAggregate.g.cs
@@ -33,4 +33,6 @@ public sealed partial class VariableWidthHistogramAggregate : IAggregate
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Aggregations.VariableWidthHistogramBucket> Buckets { get; init; }
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
+
+	string IAggregate.Type => "variable_width_histogram";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/VariableWidthHistogramBucket.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/VariableWidthHistogramBucket.g.cs
index a088c167857..7c05db98857 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/VariableWidthHistogramBucket.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/VariableWidthHistogramBucket.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,84 +28,110 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Aggregations;
 
-internal sealed partial class VariableWidthHistogramBucketConverter : JsonConverter<VariableWidthHistogramBucket>
+internal sealed partial class VariableWidthHistogramBucketConverter : System.Text.Json.Serialization.JsonConverter<VariableWidthHistogramBucket>
 {
-	public override VariableWidthHistogramBucket Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropDocCount = System.Text.Json.JsonEncodedText.Encode("doc_count");
+	private static readonly System.Text.Json.JsonEncodedText PropKey = System.Text.Json.JsonEncodedText.Encode("key");
+	private static readonly System.Text.Json.JsonEncodedText PropKeyAsString = System.Text.Json.JsonEncodedText.Encode("key_as_string");
+	private static readonly System.Text.Json.JsonEncodedText PropMax = System.Text.Json.JsonEncodedText.Encode("max");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxAsString = System.Text.Json.JsonEncodedText.Encode("max_as_string");
+	private static readonly System.Text.Json.JsonEncodedText PropMin = System.Text.Json.JsonEncodedText.Encode("min");
+	private static readonly System.Text.Json.JsonEncodedText PropMinAsString = System.Text.Json.JsonEncodedText.Encode("min_as_string");
+
+	public override VariableWidthHistogramBucket Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		long docCount = default;
-		double key = default;
-		string? keyAsString = default;
-		double max = default;
-		string? maxAsString = default;
-		double min = default;
-		string? minAsString = default;
-		Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate> propAggregations = default;
+		LocalJsonProperty<long> propDocCount = default;
+		LocalJsonProperty<double> propKey = default;
+		LocalJsonProperty<string?> propKeyAsString = default;
+		LocalJsonProperty<double> propMax = default;
+		LocalJsonProperty<string?> propMaxAsString = default;
+		LocalJsonProperty<double> propMin = default;
+		LocalJsonProperty<string?> propMinAsString = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propDocCount.TryRead(ref reader, options, PropDocCount))
+			{
+				continue;
+			}
+
+			if (propKey.TryRead(ref reader, options, PropKey))
+			{
+				continue;
+			}
+
+			if (propKeyAsString.TryRead(ref reader, options, PropKeyAsString))
+			{
+				continue;
+			}
+
+			if (propMax.TryRead(ref reader, options, PropMax))
+			{
+				continue;
+			}
+
+			if (propMaxAsString.TryRead(ref reader, options, PropMaxAsString))
 			{
-				var property = reader.GetString();
-				if (property == "doc_count")
-				{
-					docCount = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "key")
-				{
-					key = JsonSerializer.Deserialize<double>(ref reader, options);
-					continue;
-				}
-
-				if (property == "key_as_string")
-				{
-					keyAsString = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "max")
-				{
-					max = JsonSerializer.Deserialize<double>(ref reader, options);
-					continue;
-				}
-
-				if (property == "max_as_string")
-				{
-					maxAsString = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "min")
-				{
-					min = JsonSerializer.Deserialize<double>(ref reader, options);
-					continue;
-				}
-
-				if (property == "min_as_string")
-				{
-					minAsString = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property.Contains("#"))
-				{
-					additionalProperties ??= new Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate>();
-					AggregateDictionaryConverter.ReadItem(ref reader, options, additionalProperties, property);
-					continue;
-				}
-
-				throw new JsonException("Unknown property read from JSON.");
+				continue;
 			}
+
+			if (propMin.TryRead(ref reader, options, PropMin))
+			{
+				continue;
+			}
+
+			if (propMinAsString.TryRead(ref reader, options, PropMinAsString))
+			{
+				continue;
+			}
+
+			propAggregations ??= new System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate>();
+			Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionaryConverter.ReadItem(ref reader, options, out string key, out Elastic.Clients.Elasticsearch.Serverless.Aggregations.IAggregate value);
+			propAggregations[key] = value;
 		}
 
-		return new VariableWidthHistogramBucket { Aggregations = new Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary(additionalProperties), DocCount = docCount, Key = key, KeyAsString = keyAsString, Max = max, MaxAsString = maxAsString, Min = min, MinAsString = minAsString };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new VariableWidthHistogramBucket
+		{
+			Aggregations = new Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionary(propAggregations)
+,
+			DocCount = propDocCount.Value
+,
+			Key = propKey.Value
+,
+			KeyAsString = propKeyAsString.Value
+,
+			Max = propMax.Value
+,
+			MaxAsString = propMaxAsString.Value
+,
+			Min = propMin.Value
+,
+			MinAsString = propMinAsString.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, VariableWidthHistogramBucket value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, VariableWidthHistogramBucket value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'VariableWidthHistogramBucket' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDocCount, value.DocCount);
+		writer.WriteProperty(options, PropKey, value.Key);
+		writer.WriteProperty(options, PropKeyAsString, value.KeyAsString);
+		writer.WriteProperty(options, PropMax, value.Max);
+		writer.WriteProperty(options, PropMaxAsString, value.MaxAsString);
+		writer.WriteProperty(options, PropMin, value.Min);
+		writer.WriteProperty(options, PropMinAsString, value.MinAsString);
+		if (value.Aggregations is not null)
+		{
+			foreach (var item in value.Aggregations)
+			{
+				Elastic.Clients.Elasticsearch.Serverless.Aggregations.AggregateDictionaryConverter.WriteItem(writer, options, item.Key, item.Value);
+			}
+		}
+
+		writer.WriteEndObject();
 	}
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/WeightedAverageAggregate.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/WeightedAverageAggregate.g.cs
index e54a85ecb15..99fb01beb5f 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/WeightedAverageAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/WeightedAverageAggregate.g.cs
@@ -47,4 +47,6 @@ public sealed partial class WeightedAverageAggregate : IAggregate
 	public double? Value { get; init; }
 	[JsonInclude, JsonPropertyName("value_as_string")]
 	public string? ValueAsString { get; init; }
+
+	string IAggregate.Type => "weighted_avg";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/Analyzers.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/Analyzers.g.cs
index 6bd7654a3b8..e25cefd2e8a 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/Analyzers.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/Analyzers.g.cs
@@ -19,6 +19,7 @@
 
 using Elastic.Clients.Elasticsearch.Serverless.Core;
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport;
 using System;
@@ -218,289 +219,238 @@ public AnalyzersDescriptor() : base(new Analyzers())
 	public AnalyzersDescriptor Whitespace(string analyzerName, WhitespaceAnalyzer whitespaceAnalyzer) => AssignVariant(analyzerName, whitespaceAnalyzer);
 }
 
-internal sealed partial class AnalyzerInterfaceConverter : JsonConverter<IAnalyzer>
+internal sealed partial class AnalyzerInterfaceConverter : System.Text.Json.Serialization.JsonConverter<IAnalyzer>
 {
-	public override IAnalyzer Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropDiscriminator = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override IAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var copiedReader = reader;
-		string? type = null;
-		using var jsonDoc = JsonDocument.ParseValue(ref copiedReader);
-		if (jsonDoc is not null && jsonDoc.RootElement.TryGetProperty("type", out var readType) && readType.ValueKind == JsonValueKind.String)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		var readerSnapshot = reader;
+		string? discriminator = "custom";
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			type = readType.ToString();
+			if (reader.TryReadProperty(options, PropDiscriminator, ref discriminator))
+			{
+				break;
+			}
+
+			reader.Skip();
 		}
 
-		switch (type)
+		reader = readerSnapshot;
+		return discriminator switch
 		{
-			case "arabic":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.ArabicAnalyzer>(ref reader, options);
-			case "armenian":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.ArmenianAnalyzer>(ref reader, options);
-			case "basque":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.BasqueAnalyzer>(ref reader, options);
-			case "bengali":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.BengaliAnalyzer>(ref reader, options);
-			case "brazilian":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.BrazilianAnalyzer>(ref reader, options);
-			case "bulgarian":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.BulgarianAnalyzer>(ref reader, options);
-			case "catalan":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.CatalanAnalyzer>(ref reader, options);
-			case "chinese":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.ChineseAnalyzer>(ref reader, options);
-			case "cjk":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.CjkAnalyzer>(ref reader, options);
-			case "custom":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.CustomAnalyzer>(ref reader, options);
-			case "czech":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.CzechAnalyzer>(ref reader, options);
-			case "danish":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.DanishAnalyzer>(ref reader, options);
-			case "dutch":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.DutchAnalyzer>(ref reader, options);
-			case "english":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.EnglishAnalyzer>(ref reader, options);
-			case "estonian":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.EstonianAnalyzer>(ref reader, options);
-			case "fingerprint":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.FingerprintAnalyzer>(ref reader, options);
-			case "finnish":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.FinnishAnalyzer>(ref reader, options);
-			case "french":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.FrenchAnalyzer>(ref reader, options);
-			case "galician":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.GalicianAnalyzer>(ref reader, options);
-			case "german":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.GermanAnalyzer>(ref reader, options);
-			case "greek":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.GreekAnalyzer>(ref reader, options);
-			case "hindi":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.HindiAnalyzer>(ref reader, options);
-			case "hungarian":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.HungarianAnalyzer>(ref reader, options);
-			case "icu_analyzer":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.IcuAnalyzer>(ref reader, options);
-			case "indonesian":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.IndonesianAnalyzer>(ref reader, options);
-			case "irish":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.IrishAnalyzer>(ref reader, options);
-			case "italian":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.ItalianAnalyzer>(ref reader, options);
-			case "keyword":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.KeywordAnalyzer>(ref reader, options);
-			case "kuromoji":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.KuromojiAnalyzer>(ref reader, options);
-			case "language":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.LanguageAnalyzer>(ref reader, options);
-			case "latvian":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.LatvianAnalyzer>(ref reader, options);
-			case "lithuanian":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.LithuanianAnalyzer>(ref reader, options);
-			case "nori":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.NoriAnalyzer>(ref reader, options);
-			case "norwegian":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.NorwegianAnalyzer>(ref reader, options);
-			case "pattern":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.PatternAnalyzer>(ref reader, options);
-			case "persian":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.PersianAnalyzer>(ref reader, options);
-			case "portuguese":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.PortugueseAnalyzer>(ref reader, options);
-			case "romanian":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.RomanianAnalyzer>(ref reader, options);
-			case "russian":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.RussianAnalyzer>(ref reader, options);
-			case "serbian":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.SerbianAnalyzer>(ref reader, options);
-			case "simple":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.SimpleAnalyzer>(ref reader, options);
-			case "snowball":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.SnowballAnalyzer>(ref reader, options);
-			case "sorani":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.SoraniAnalyzer>(ref reader, options);
-			case "spanish":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.SpanishAnalyzer>(ref reader, options);
-			case "standard":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.StandardAnalyzer>(ref reader, options);
-			case "stop":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.StopAnalyzer>(ref reader, options);
-			case "swedish":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.SwedishAnalyzer>(ref reader, options);
-			case "thai":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.ThaiAnalyzer>(ref reader, options);
-			case "turkish":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.TurkishAnalyzer>(ref reader, options);
-			case "whitespace":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.WhitespaceAnalyzer>(ref reader, options);
-			default:
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.CustomAnalyzer>(ref reader, options);
-		}
+			"arabic" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.ArabicAnalyzer>(options),
+			"armenian" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.ArmenianAnalyzer>(options),
+			"basque" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.BasqueAnalyzer>(options),
+			"bengali" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.BengaliAnalyzer>(options),
+			"brazilian" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.BrazilianAnalyzer>(options),
+			"bulgarian" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.BulgarianAnalyzer>(options),
+			"catalan" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.CatalanAnalyzer>(options),
+			"chinese" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.ChineseAnalyzer>(options),
+			"cjk" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.CjkAnalyzer>(options),
+			"custom" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.CustomAnalyzer>(options),
+			"czech" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.CzechAnalyzer>(options),
+			"danish" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.DanishAnalyzer>(options),
+			"dutch" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.DutchAnalyzer>(options),
+			"english" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.EnglishAnalyzer>(options),
+			"estonian" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.EstonianAnalyzer>(options),
+			"fingerprint" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.FingerprintAnalyzer>(options),
+			"finnish" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.FinnishAnalyzer>(options),
+			"french" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.FrenchAnalyzer>(options),
+			"galician" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.GalicianAnalyzer>(options),
+			"german" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.GermanAnalyzer>(options),
+			"greek" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.GreekAnalyzer>(options),
+			"hindi" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.HindiAnalyzer>(options),
+			"hungarian" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.HungarianAnalyzer>(options),
+			"icu_analyzer" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.IcuAnalyzer>(options),
+			"indonesian" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.IndonesianAnalyzer>(options),
+			"irish" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.IrishAnalyzer>(options),
+			"italian" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.ItalianAnalyzer>(options),
+			"keyword" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.KeywordAnalyzer>(options),
+			"kuromoji" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.KuromojiAnalyzer>(options),
+			"language" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.LanguageAnalyzer>(options),
+			"latvian" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.LatvianAnalyzer>(options),
+			"lithuanian" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.LithuanianAnalyzer>(options),
+			"nori" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.NoriAnalyzer>(options),
+			"norwegian" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.NorwegianAnalyzer>(options),
+			"pattern" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.PatternAnalyzer>(options),
+			"persian" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.PersianAnalyzer>(options),
+			"portuguese" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.PortugueseAnalyzer>(options),
+			"romanian" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.RomanianAnalyzer>(options),
+			"russian" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.RussianAnalyzer>(options),
+			"serbian" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.SerbianAnalyzer>(options),
+			"simple" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.SimpleAnalyzer>(options),
+			"snowball" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.SnowballAnalyzer>(options),
+			"sorani" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.SoraniAnalyzer>(options),
+			"spanish" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.SpanishAnalyzer>(options),
+			"standard" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.StandardAnalyzer>(options),
+			"stop" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.StopAnalyzer>(options),
+			"swedish" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.SwedishAnalyzer>(options),
+			"thai" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.ThaiAnalyzer>(options),
+			"turkish" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.TurkishAnalyzer>(options),
+			"whitespace" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.WhitespaceAnalyzer>(options),
+			_ => throw new System.Text.Json.JsonException($"Variant '{discriminator}' is not supported for type '{nameof(IAnalyzer)}'.")
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, IAnalyzer value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IAnalyzer value, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (value is null)
-		{
-			writer.WriteNullValue();
-			return;
-		}
-
 		switch (value.Type)
 		{
 			case "arabic":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.ArabicAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.ArabicAnalyzer)value);
+				break;
 			case "armenian":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.ArmenianAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.ArmenianAnalyzer)value);
+				break;
 			case "basque":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.BasqueAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.BasqueAnalyzer)value);
+				break;
 			case "bengali":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.BengaliAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.BengaliAnalyzer)value);
+				break;
 			case "brazilian":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.BrazilianAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.BrazilianAnalyzer)value);
+				break;
 			case "bulgarian":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.BulgarianAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.BulgarianAnalyzer)value);
+				break;
 			case "catalan":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.CatalanAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.CatalanAnalyzer)value);
+				break;
 			case "chinese":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.ChineseAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.ChineseAnalyzer)value);
+				break;
 			case "cjk":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.CjkAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.CjkAnalyzer)value);
+				break;
 			case "custom":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.CustomAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.CustomAnalyzer)value);
+				break;
 			case "czech":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.CzechAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.CzechAnalyzer)value);
+				break;
 			case "danish":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.DanishAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.DanishAnalyzer)value);
+				break;
 			case "dutch":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.DutchAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.DutchAnalyzer)value);
+				break;
 			case "english":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.EnglishAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.EnglishAnalyzer)value);
+				break;
 			case "estonian":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.EstonianAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.EstonianAnalyzer)value);
+				break;
 			case "fingerprint":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.FingerprintAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.FingerprintAnalyzer)value);
+				break;
 			case "finnish":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.FinnishAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.FinnishAnalyzer)value);
+				break;
 			case "french":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.FrenchAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.FrenchAnalyzer)value);
+				break;
 			case "galician":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.GalicianAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.GalicianAnalyzer)value);
+				break;
 			case "german":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.GermanAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.GermanAnalyzer)value);
+				break;
 			case "greek":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.GreekAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.GreekAnalyzer)value);
+				break;
 			case "hindi":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.HindiAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.HindiAnalyzer)value);
+				break;
 			case "hungarian":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.HungarianAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.HungarianAnalyzer)value);
+				break;
 			case "icu_analyzer":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.IcuAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.IcuAnalyzer)value);
+				break;
 			case "indonesian":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.IndonesianAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.IndonesianAnalyzer)value);
+				break;
 			case "irish":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.IrishAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.IrishAnalyzer)value);
+				break;
 			case "italian":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.ItalianAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.ItalianAnalyzer)value);
+				break;
 			case "keyword":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.KeywordAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.KeywordAnalyzer)value);
+				break;
 			case "kuromoji":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.KuromojiAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.KuromojiAnalyzer)value);
+				break;
 			case "language":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.LanguageAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.LanguageAnalyzer)value);
+				break;
 			case "latvian":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.LatvianAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.LatvianAnalyzer)value);
+				break;
 			case "lithuanian":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.LithuanianAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.LithuanianAnalyzer)value);
+				break;
 			case "nori":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.NoriAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.NoriAnalyzer)value);
+				break;
 			case "norwegian":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.NorwegianAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.NorwegianAnalyzer)value);
+				break;
 			case "pattern":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.PatternAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.PatternAnalyzer)value);
+				break;
 			case "persian":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.PersianAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.PersianAnalyzer)value);
+				break;
 			case "portuguese":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.PortugueseAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.PortugueseAnalyzer)value);
+				break;
 			case "romanian":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.RomanianAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.RomanianAnalyzer)value);
+				break;
 			case "russian":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.RussianAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.RussianAnalyzer)value);
+				break;
 			case "serbian":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.SerbianAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.SerbianAnalyzer)value);
+				break;
 			case "simple":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.SimpleAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.SimpleAnalyzer)value);
+				break;
 			case "snowball":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.SnowballAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.SnowballAnalyzer)value);
+				break;
 			case "sorani":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.SoraniAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.SoraniAnalyzer)value);
+				break;
 			case "spanish":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.SpanishAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.SpanishAnalyzer)value);
+				break;
 			case "standard":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.StandardAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.StandardAnalyzer)value);
+				break;
 			case "stop":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.StopAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.StopAnalyzer)value);
+				break;
 			case "swedish":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.SwedishAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.SwedishAnalyzer)value);
+				break;
 			case "thai":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.ThaiAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.ThaiAnalyzer)value);
+				break;
 			case "turkish":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.TurkishAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.TurkishAnalyzer)value);
+				break;
 			case "whitespace":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.WhitespaceAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.WhitespaceAnalyzer)value);
+				break;
 			default:
-				var type = value.GetType();
-				JsonSerializer.Serialize(writer, value, type, options);
-				return;
+				throw new System.Text.Json.JsonException($"Variant '{value.Type}' is not supported for type '{nameof(IAnalyzer)}'.");
 		}
 	}
 }
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/ArabicAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/ArabicAnalyzer.g.cs
index 87783f17690..100c37e77b2 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/ArabicAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/ArabicAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,17 +28,74 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Analysis;
 
+internal sealed partial class ArabicAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<ArabicAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStemExclusion = System.Text.Json.JsonEncodedText.Encode("stem_exclusion");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override ArabicAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propStemExclusion = default;
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStemExclusion.TryRead(ref reader, options, PropStemExclusion))
+			{
+				continue;
+			}
+
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ArabicAnalyzer
+		{
+			StemExclusion = propStemExclusion.Value
+,
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ArabicAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStemExclusion, value.StemExclusion);
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ArabicAnalyzerConverter))]
 public sealed partial class ArabicAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("stem_exclusion")]
 	public ICollection<string>? StemExclusion { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "arabic";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/ArmenianAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/ArmenianAnalyzer.g.cs
index cbbf0f7e7f8..783dfbe06e9 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/ArmenianAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/ArmenianAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,17 +28,74 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Analysis;
 
+internal sealed partial class ArmenianAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<ArmenianAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStemExclusion = System.Text.Json.JsonEncodedText.Encode("stem_exclusion");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override ArmenianAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propStemExclusion = default;
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStemExclusion.TryRead(ref reader, options, PropStemExclusion))
+			{
+				continue;
+			}
+
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ArmenianAnalyzer
+		{
+			StemExclusion = propStemExclusion.Value
+,
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ArmenianAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStemExclusion, value.StemExclusion);
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ArmenianAnalyzerConverter))]
 public sealed partial class ArmenianAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("stem_exclusion")]
 	public ICollection<string>? StemExclusion { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "armenian";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/BasqueAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/BasqueAnalyzer.g.cs
index 7ab1d7efbd0..9800be225e3 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/BasqueAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/BasqueAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,17 +28,74 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Analysis;
 
+internal sealed partial class BasqueAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<BasqueAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStemExclusion = System.Text.Json.JsonEncodedText.Encode("stem_exclusion");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override BasqueAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propStemExclusion = default;
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStemExclusion.TryRead(ref reader, options, PropStemExclusion))
+			{
+				continue;
+			}
+
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new BasqueAnalyzer
+		{
+			StemExclusion = propStemExclusion.Value
+,
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, BasqueAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStemExclusion, value.StemExclusion);
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(BasqueAnalyzerConverter))]
 public sealed partial class BasqueAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("stem_exclusion")]
 	public ICollection<string>? StemExclusion { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "basque";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/BengaliAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/BengaliAnalyzer.g.cs
index 951c03fed86..b1e12355a7b 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/BengaliAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/BengaliAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,17 +28,74 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Analysis;
 
+internal sealed partial class BengaliAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<BengaliAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStemExclusion = System.Text.Json.JsonEncodedText.Encode("stem_exclusion");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override BengaliAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propStemExclusion = default;
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStemExclusion.TryRead(ref reader, options, PropStemExclusion))
+			{
+				continue;
+			}
+
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new BengaliAnalyzer
+		{
+			StemExclusion = propStemExclusion.Value
+,
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, BengaliAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStemExclusion, value.StemExclusion);
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(BengaliAnalyzerConverter))]
 public sealed partial class BengaliAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("stem_exclusion")]
 	public ICollection<string>? StemExclusion { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "bengali";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/BrazilianAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/BrazilianAnalyzer.g.cs
index 1bde324bc93..3fda222d29e 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/BrazilianAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/BrazilianAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,15 +28,63 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Analysis;
 
+internal sealed partial class BrazilianAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<BrazilianAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override BrazilianAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new BrazilianAnalyzer
+		{
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, BrazilianAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(BrazilianAnalyzerConverter))]
 public sealed partial class BrazilianAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "brazilian";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/BulgarianAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/BulgarianAnalyzer.g.cs
index 626ffb4a980..297d0ab96d2 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/BulgarianAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/BulgarianAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,17 +28,74 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Analysis;
 
+internal sealed partial class BulgarianAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<BulgarianAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStemExclusion = System.Text.Json.JsonEncodedText.Encode("stem_exclusion");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override BulgarianAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propStemExclusion = default;
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStemExclusion.TryRead(ref reader, options, PropStemExclusion))
+			{
+				continue;
+			}
+
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new BulgarianAnalyzer
+		{
+			StemExclusion = propStemExclusion.Value
+,
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, BulgarianAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStemExclusion, value.StemExclusion);
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(BulgarianAnalyzerConverter))]
 public sealed partial class BulgarianAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("stem_exclusion")]
 	public ICollection<string>? StemExclusion { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "bulgarian";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/CatalanAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/CatalanAnalyzer.g.cs
index 05bcbee46aa..12dbd76e7e3 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/CatalanAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/CatalanAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,17 +28,74 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Analysis;
 
+internal sealed partial class CatalanAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<CatalanAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStemExclusion = System.Text.Json.JsonEncodedText.Encode("stem_exclusion");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override CatalanAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propStemExclusion = default;
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStemExclusion.TryRead(ref reader, options, PropStemExclusion))
+			{
+				continue;
+			}
+
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new CatalanAnalyzer
+		{
+			StemExclusion = propStemExclusion.Value
+,
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, CatalanAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStemExclusion, value.StemExclusion);
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(CatalanAnalyzerConverter))]
 public sealed partial class CatalanAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("stem_exclusion")]
 	public ICollection<string>? StemExclusion { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "catalan";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/CharFilters.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/CharFilters.g.cs
index 2e369133ca6..f6dcdec9ed1 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/CharFilters.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/CharFilters.g.cs
@@ -19,6 +19,7 @@
 
 using Elastic.Clients.Elasticsearch.Serverless.Core;
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport;
 using System;
@@ -83,65 +84,58 @@ public CharFiltersDescriptor() : base(new CharFilters())
 	public CharFiltersDescriptor PatternReplace(string charFilterName, PatternReplaceCharFilter patternReplaceCharFilter) => AssignVariant(charFilterName, patternReplaceCharFilter);
 }
 
-internal sealed partial class CharFilterInterfaceConverter : JsonConverter<ICharFilter>
+internal sealed partial class CharFilterInterfaceConverter : System.Text.Json.Serialization.JsonConverter<ICharFilter>
 {
-	public override ICharFilter Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropDiscriminator = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override ICharFilter Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var copiedReader = reader;
-		string? type = null;
-		using var jsonDoc = JsonDocument.ParseValue(ref copiedReader);
-		if (jsonDoc is not null && jsonDoc.RootElement.TryGetProperty("type", out var readType) && readType.ValueKind == JsonValueKind.String)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		var readerSnapshot = reader;
+		string? discriminator = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			type = readType.ToString();
+			if (reader.TryReadProperty(options, PropDiscriminator, ref discriminator))
+			{
+				break;
+			}
+
+			reader.Skip();
 		}
 
-		switch (type)
+		reader = readerSnapshot;
+		return discriminator switch
 		{
-			case "html_strip":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.HtmlStripCharFilter>(ref reader, options);
-			case "icu_normalizer":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.IcuNormalizationCharFilter>(ref reader, options);
-			case "kuromoji_iteration_mark":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.KuromojiIterationMarkCharFilter>(ref reader, options);
-			case "mapping":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.MappingCharFilter>(ref reader, options);
-			case "pattern_replace":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.PatternReplaceCharFilter>(ref reader, options);
-			default:
-				ThrowHelper.ThrowUnknownTaggedUnionVariantJsonException(type, typeof(ICharFilter));
-				return null;
-		}
+			"html_strip" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.HtmlStripCharFilter>(options),
+			"icu_normalizer" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.IcuNormalizationCharFilter>(options),
+			"kuromoji_iteration_mark" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.KuromojiIterationMarkCharFilter>(options),
+			"mapping" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.MappingCharFilter>(options),
+			"pattern_replace" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.PatternReplaceCharFilter>(options),
+			_ => throw new System.Text.Json.JsonException($"Variant '{discriminator}' is not supported for type '{nameof(ICharFilter)}'.")
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, ICharFilter value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ICharFilter value, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (value is null)
-		{
-			writer.WriteNullValue();
-			return;
-		}
-
 		switch (value.Type)
 		{
 			case "html_strip":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.HtmlStripCharFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.HtmlStripCharFilter)value);
+				break;
 			case "icu_normalizer":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.IcuNormalizationCharFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.IcuNormalizationCharFilter)value);
+				break;
 			case "kuromoji_iteration_mark":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.KuromojiIterationMarkCharFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.KuromojiIterationMarkCharFilter)value);
+				break;
 			case "mapping":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.MappingCharFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.MappingCharFilter)value);
+				break;
 			case "pattern_replace":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.PatternReplaceCharFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.PatternReplaceCharFilter)value);
+				break;
 			default:
-				var type = value.GetType();
-				JsonSerializer.Serialize(writer, value, type, options);
-				return;
+				throw new System.Text.Json.JsonException($"Variant '{value.Type}' is not supported for type '{nameof(ICharFilter)}'.");
 		}
 	}
 }
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/ChineseAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/ChineseAnalyzer.g.cs
index 346475e7101..46ac7c7fee7 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/ChineseAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/ChineseAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,15 +28,63 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Analysis;
 
+internal sealed partial class ChineseAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<ChineseAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override ChineseAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ChineseAnalyzer
+		{
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ChineseAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ChineseAnalyzerConverter))]
 public sealed partial class ChineseAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "chinese";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/CjkAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/CjkAnalyzer.g.cs
index 3c5155d81ee..827604213d4 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/CjkAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/CjkAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,15 +28,63 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Analysis;
 
+internal sealed partial class CjkAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<CjkAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override CjkAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new CjkAnalyzer
+		{
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, CjkAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(CjkAnalyzerConverter))]
 public sealed partial class CjkAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "cjk";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/CustomAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/CustomAnalyzer.g.cs
index 8032c00b2a2..3f45f93256b 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/CustomAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/CustomAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,22 +28,96 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Analysis;
 
+internal sealed partial class CustomAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<CustomAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCharFilter = System.Text.Json.JsonEncodedText.Encode("char_filter");
+	private static readonly System.Text.Json.JsonEncodedText PropFilter = System.Text.Json.JsonEncodedText.Encode("filter");
+	private static readonly System.Text.Json.JsonEncodedText PropPositionIncrementGap = System.Text.Json.JsonEncodedText.Encode("position_increment_gap");
+	private static readonly System.Text.Json.JsonEncodedText PropPositionOffsetGap = System.Text.Json.JsonEncodedText.Encode("position_offset_gap");
+	private static readonly System.Text.Json.JsonEncodedText PropTokenizer = System.Text.Json.JsonEncodedText.Encode("tokenizer");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override CustomAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propCharFilter = default;
+		LocalJsonProperty<ICollection<string>?> propFilter = default;
+		LocalJsonProperty<int?> propPositionIncrementGap = default;
+		LocalJsonProperty<int?> propPositionOffsetGap = default;
+		LocalJsonProperty<string> propTokenizer = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCharFilter.TryRead(ref reader, options, PropCharFilter, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propFilter.TryRead(ref reader, options, PropFilter, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propPositionIncrementGap.TryRead(ref reader, options, PropPositionIncrementGap))
+			{
+				continue;
+			}
+
+			if (propPositionOffsetGap.TryRead(ref reader, options, PropPositionOffsetGap))
+			{
+				continue;
+			}
+
+			if (propTokenizer.TryRead(ref reader, options, PropTokenizer))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new CustomAnalyzer
+		{
+			CharFilter = propCharFilter.Value
+,
+			Filter = propFilter.Value
+,
+			PositionIncrementGap = propPositionIncrementGap.Value
+,
+			PositionOffsetGap = propPositionOffsetGap.Value
+,
+			Tokenizer = propTokenizer.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, CustomAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCharFilter, value.CharFilter, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropFilter, value.Filter, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropPositionIncrementGap, value.PositionIncrementGap);
+		writer.WriteProperty(options, PropPositionOffsetGap, value.PositionOffsetGap);
+		writer.WriteProperty(options, PropTokenizer, value.Tokenizer);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(CustomAnalyzerConverter))]
 public sealed partial class CustomAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("char_filter")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? CharFilter { get; set; }
-	[JsonInclude, JsonPropertyName("filter")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	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")]
 	public string Type => "custom";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/CzechAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/CzechAnalyzer.g.cs
index 2ab33835403..cf65bcfb93a 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/CzechAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/CzechAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,17 +28,74 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Analysis;
 
+internal sealed partial class CzechAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<CzechAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStemExclusion = System.Text.Json.JsonEncodedText.Encode("stem_exclusion");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override CzechAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propStemExclusion = default;
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStemExclusion.TryRead(ref reader, options, PropStemExclusion))
+			{
+				continue;
+			}
+
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new CzechAnalyzer
+		{
+			StemExclusion = propStemExclusion.Value
+,
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, CzechAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStemExclusion, value.StemExclusion);
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(CzechAnalyzerConverter))]
 public sealed partial class CzechAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("stem_exclusion")]
 	public ICollection<string>? StemExclusion { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "czech";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/DanishAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/DanishAnalyzer.g.cs
index 1a564e5d309..58acdec1254 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/DanishAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/DanishAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,15 +28,63 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Analysis;
 
+internal sealed partial class DanishAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<DanishAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override DanishAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DanishAnalyzer
+		{
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DanishAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DanishAnalyzerConverter))]
 public sealed partial class DanishAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "danish";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/DutchAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/DutchAnalyzer.g.cs
index 988e5393d2c..233044ee209 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/DutchAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/DutchAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,17 +28,74 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Analysis;
 
+internal sealed partial class DutchAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<DutchAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStemExclusion = System.Text.Json.JsonEncodedText.Encode("stem_exclusion");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override DutchAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propStemExclusion = default;
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStemExclusion.TryRead(ref reader, options, PropStemExclusion))
+			{
+				continue;
+			}
+
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DutchAnalyzer
+		{
+			StemExclusion = propStemExclusion.Value
+,
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DutchAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStemExclusion, value.StemExclusion);
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DutchAnalyzerConverter))]
 public sealed partial class DutchAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("stem_exclusion")]
 	public ICollection<string>? StemExclusion { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "dutch";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/EnglishAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/EnglishAnalyzer.g.cs
index f7840444ac6..eb2f1bdc707 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/EnglishAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/EnglishAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,17 +28,74 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Analysis;
 
+internal sealed partial class EnglishAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<EnglishAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStemExclusion = System.Text.Json.JsonEncodedText.Encode("stem_exclusion");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override EnglishAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propStemExclusion = default;
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStemExclusion.TryRead(ref reader, options, PropStemExclusion))
+			{
+				continue;
+			}
+
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new EnglishAnalyzer
+		{
+			StemExclusion = propStemExclusion.Value
+,
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, EnglishAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStemExclusion, value.StemExclusion);
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(EnglishAnalyzerConverter))]
 public sealed partial class EnglishAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("stem_exclusion")]
 	public ICollection<string>? StemExclusion { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "english";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/EstonianAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/EstonianAnalyzer.g.cs
index 33b4a41442b..e30ac706990 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/EstonianAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/EstonianAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,15 +28,63 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Analysis;
 
+internal sealed partial class EstonianAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<EstonianAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override EstonianAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new EstonianAnalyzer
+		{
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, EstonianAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(EstonianAnalyzerConverter))]
 public sealed partial class EstonianAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "estonian";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/FingerprintAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/FingerprintAnalyzer.g.cs
index bb792973a82..d9069d7bb1c 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/FingerprintAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/FingerprintAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,24 +28,108 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Analysis;
 
+internal sealed partial class FingerprintAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<FingerprintAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropMaxOutputSize = System.Text.Json.JsonEncodedText.Encode("max_output_size");
+	private static readonly System.Text.Json.JsonEncodedText PropPreserveOriginal = System.Text.Json.JsonEncodedText.Encode("preserve_original");
+	private static readonly System.Text.Json.JsonEncodedText PropSeparator = System.Text.Json.JsonEncodedText.Encode("separator");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("version");
+
+	public override FingerprintAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<int> propMaxOutputSize = default;
+		LocalJsonProperty<bool> propPreserveOriginal = default;
+		LocalJsonProperty<string> propSeparator = default;
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		LocalJsonProperty<string?> propVersion = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propMaxOutputSize.TryRead(ref reader, options, PropMaxOutputSize))
+			{
+				continue;
+			}
+
+			if (propPreserveOriginal.TryRead(ref reader, options, PropPreserveOriginal))
+			{
+				continue;
+			}
+
+			if (propSeparator.TryRead(ref reader, options, PropSeparator))
+			{
+				continue;
+			}
+
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			if (propVersion.TryRead(ref reader, options, PropVersion))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new FingerprintAnalyzer
+		{
+			MaxOutputSize = propMaxOutputSize.Value
+,
+			PreserveOriginal = propPreserveOriginal.Value
+,
+			Separator = propSeparator.Value
+,
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+,
+			Version = propVersion.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, FingerprintAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropMaxOutputSize, value.MaxOutputSize);
+		writer.WriteProperty(options, PropPreserveOriginal, value.PreserveOriginal);
+		writer.WriteProperty(options, PropSeparator, value.Separator);
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteProperty(options, PropVersion, value.Version);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(FingerprintAnalyzerConverter))]
 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")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "fingerprint";
 
-	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/FinnishAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/FinnishAnalyzer.g.cs
index ac99cc9a655..97e93f1ecec 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/FinnishAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/FinnishAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,17 +28,74 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Analysis;
 
+internal sealed partial class FinnishAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<FinnishAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStemExclusion = System.Text.Json.JsonEncodedText.Encode("stem_exclusion");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override FinnishAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propStemExclusion = default;
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStemExclusion.TryRead(ref reader, options, PropStemExclusion))
+			{
+				continue;
+			}
+
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new FinnishAnalyzer
+		{
+			StemExclusion = propStemExclusion.Value
+,
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, FinnishAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStemExclusion, value.StemExclusion);
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(FinnishAnalyzerConverter))]
 public sealed partial class FinnishAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("stem_exclusion")]
 	public ICollection<string>? StemExclusion { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "finnish";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/FrenchAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/FrenchAnalyzer.g.cs
index f24252dbd45..62e19a0afeb 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/FrenchAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/FrenchAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,17 +28,74 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Analysis;
 
+internal sealed partial class FrenchAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<FrenchAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStemExclusion = System.Text.Json.JsonEncodedText.Encode("stem_exclusion");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override FrenchAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propStemExclusion = default;
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStemExclusion.TryRead(ref reader, options, PropStemExclusion))
+			{
+				continue;
+			}
+
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new FrenchAnalyzer
+		{
+			StemExclusion = propStemExclusion.Value
+,
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, FrenchAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStemExclusion, value.StemExclusion);
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(FrenchAnalyzerConverter))]
 public sealed partial class FrenchAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("stem_exclusion")]
 	public ICollection<string>? StemExclusion { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "french";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/GalicianAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/GalicianAnalyzer.g.cs
index 7d2d6eb67b6..e02cdba8c8c 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/GalicianAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/GalicianAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,17 +28,74 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Analysis;
 
+internal sealed partial class GalicianAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<GalicianAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStemExclusion = System.Text.Json.JsonEncodedText.Encode("stem_exclusion");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override GalicianAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propStemExclusion = default;
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStemExclusion.TryRead(ref reader, options, PropStemExclusion))
+			{
+				continue;
+			}
+
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GalicianAnalyzer
+		{
+			StemExclusion = propStemExclusion.Value
+,
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GalicianAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStemExclusion, value.StemExclusion);
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GalicianAnalyzerConverter))]
 public sealed partial class GalicianAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("stem_exclusion")]
 	public ICollection<string>? StemExclusion { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "galician";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/GermanAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/GermanAnalyzer.g.cs
index 3ac9153d3fb..039321a6971 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/GermanAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/GermanAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,17 +28,74 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Analysis;
 
+internal sealed partial class GermanAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<GermanAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStemExclusion = System.Text.Json.JsonEncodedText.Encode("stem_exclusion");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override GermanAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propStemExclusion = default;
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStemExclusion.TryRead(ref reader, options, PropStemExclusion))
+			{
+				continue;
+			}
+
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GermanAnalyzer
+		{
+			StemExclusion = propStemExclusion.Value
+,
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GermanAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStemExclusion, value.StemExclusion);
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GermanAnalyzerConverter))]
 public sealed partial class GermanAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("stem_exclusion")]
 	public ICollection<string>? StemExclusion { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "german";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/GreekAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/GreekAnalyzer.g.cs
index 2cdd8a4115a..75604c867d6 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/GreekAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/GreekAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,15 +28,63 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Analysis;
 
+internal sealed partial class GreekAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<GreekAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override GreekAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GreekAnalyzer
+		{
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GreekAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GreekAnalyzerConverter))]
 public sealed partial class GreekAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "greek";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/HindiAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/HindiAnalyzer.g.cs
index 0e765e00b40..8b119b6f94c 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/HindiAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/HindiAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,17 +28,74 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Analysis;
 
+internal sealed partial class HindiAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<HindiAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStemExclusion = System.Text.Json.JsonEncodedText.Encode("stem_exclusion");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override HindiAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propStemExclusion = default;
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStemExclusion.TryRead(ref reader, options, PropStemExclusion))
+			{
+				continue;
+			}
+
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new HindiAnalyzer
+		{
+			StemExclusion = propStemExclusion.Value
+,
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, HindiAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStemExclusion, value.StemExclusion);
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(HindiAnalyzerConverter))]
 public sealed partial class HindiAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("stem_exclusion")]
 	public ICollection<string>? StemExclusion { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "hindi";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/HungarianAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/HungarianAnalyzer.g.cs
index a03ae71fec5..aa744892275 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/HungarianAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/HungarianAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,17 +28,74 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Analysis;
 
+internal sealed partial class HungarianAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<HungarianAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStemExclusion = System.Text.Json.JsonEncodedText.Encode("stem_exclusion");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override HungarianAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propStemExclusion = default;
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStemExclusion.TryRead(ref reader, options, PropStemExclusion))
+			{
+				continue;
+			}
+
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new HungarianAnalyzer
+		{
+			StemExclusion = propStemExclusion.Value
+,
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, HungarianAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStemExclusion, value.StemExclusion);
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(HungarianAnalyzerConverter))]
 public sealed partial class HungarianAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("stem_exclusion")]
 	public ICollection<string>? StemExclusion { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "hungarian";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/IndonesianAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/IndonesianAnalyzer.g.cs
index 2d51e30cdad..29c31ae3e4d 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/IndonesianAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/IndonesianAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,17 +28,74 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Analysis;
 
+internal sealed partial class IndonesianAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<IndonesianAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStemExclusion = System.Text.Json.JsonEncodedText.Encode("stem_exclusion");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override IndonesianAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propStemExclusion = default;
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStemExclusion.TryRead(ref reader, options, PropStemExclusion))
+			{
+				continue;
+			}
+
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new IndonesianAnalyzer
+		{
+			StemExclusion = propStemExclusion.Value
+,
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IndonesianAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStemExclusion, value.StemExclusion);
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(IndonesianAnalyzerConverter))]
 public sealed partial class IndonesianAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("stem_exclusion")]
 	public ICollection<string>? StemExclusion { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "indonesian";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/IrishAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/IrishAnalyzer.g.cs
index bc0b931d3ea..9a22f20cf47 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/IrishAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/IrishAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,17 +28,74 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Analysis;
 
+internal sealed partial class IrishAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<IrishAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStemExclusion = System.Text.Json.JsonEncodedText.Encode("stem_exclusion");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override IrishAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propStemExclusion = default;
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStemExclusion.TryRead(ref reader, options, PropStemExclusion))
+			{
+				continue;
+			}
+
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new IrishAnalyzer
+		{
+			StemExclusion = propStemExclusion.Value
+,
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IrishAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStemExclusion, value.StemExclusion);
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(IrishAnalyzerConverter))]
 public sealed partial class IrishAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("stem_exclusion")]
 	public ICollection<string>? StemExclusion { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "irish";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/ItalianAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/ItalianAnalyzer.g.cs
index 6f27eb0afdf..2b38b8e5889 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/ItalianAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/ItalianAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,17 +28,74 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Analysis;
 
+internal sealed partial class ItalianAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<ItalianAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStemExclusion = System.Text.Json.JsonEncodedText.Encode("stem_exclusion");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override ItalianAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propStemExclusion = default;
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStemExclusion.TryRead(ref reader, options, PropStemExclusion))
+			{
+				continue;
+			}
+
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ItalianAnalyzer
+		{
+			StemExclusion = propStemExclusion.Value
+,
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ItalianAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStemExclusion, value.StemExclusion);
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ItalianAnalyzerConverter))]
 public sealed partial class ItalianAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("stem_exclusion")]
 	public ICollection<string>? StemExclusion { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "italian";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/KeywordMarkerTokenFilter.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/KeywordMarkerTokenFilter.g.cs
index 63c98e51412..ee934ff4eb4 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/KeywordMarkerTokenFilter.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/KeywordMarkerTokenFilter.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,22 +28,97 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Analysis;
 
+internal sealed partial class KeywordMarkerTokenFilterConverter : System.Text.Json.Serialization.JsonConverter<KeywordMarkerTokenFilter>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreCase = System.Text.Json.JsonEncodedText.Encode("ignore_case");
+	private static readonly System.Text.Json.JsonEncodedText PropKeywords = System.Text.Json.JsonEncodedText.Encode("keywords");
+	private static readonly System.Text.Json.JsonEncodedText PropKeywordsPath = System.Text.Json.JsonEncodedText.Encode("keywords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropKeywordsPattern = System.Text.Json.JsonEncodedText.Encode("keywords_pattern");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("version");
+
+	public override KeywordMarkerTokenFilter Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool?> propIgnoreCase = default;
+		LocalJsonProperty<ICollection<string>?> propKeywords = default;
+		LocalJsonProperty<string?> propKeywordsPath = default;
+		LocalJsonProperty<string?> propKeywordsPattern = default;
+		LocalJsonProperty<string?> propVersion = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propIgnoreCase.TryRead(ref reader, options, PropIgnoreCase))
+			{
+				continue;
+			}
+
+			if (propKeywords.TryRead(ref reader, options, PropKeywords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propKeywordsPath.TryRead(ref reader, options, PropKeywordsPath))
+			{
+				continue;
+			}
+
+			if (propKeywordsPattern.TryRead(ref reader, options, PropKeywordsPattern))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			if (propVersion.TryRead(ref reader, options, PropVersion))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new KeywordMarkerTokenFilter
+		{
+			IgnoreCase = propIgnoreCase.Value
+,
+			Keywords = propKeywords.Value
+,
+			KeywordsPath = propKeywordsPath.Value
+,
+			KeywordsPattern = propKeywordsPattern.Value
+,
+			Version = propVersion.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, KeywordMarkerTokenFilter value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropIgnoreCase, value.IgnoreCase);
+		writer.WriteProperty(options, PropKeywords, value.Keywords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropKeywordsPath, value.KeywordsPath);
+		writer.WriteProperty(options, PropKeywordsPattern, value.KeywordsPattern);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteProperty(options, PropVersion, value.Version);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(KeywordMarkerTokenFilterConverter))]
 public sealed partial class KeywordMarkerTokenFilter : ITokenFilter
 {
-	[JsonInclude, JsonPropertyName("ignore_case")]
 	public bool? IgnoreCase { get; set; }
-	[JsonInclude, JsonPropertyName("keywords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	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")]
 	public string Type => "keyword_marker";
 
-	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/LanguageAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/LanguageAnalyzer.g.cs
index 0728851d857..f6b5c6cf88b 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/LanguageAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/LanguageAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,22 +28,97 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Analysis;
 
+internal sealed partial class LanguageAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<LanguageAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropLanguage = System.Text.Json.JsonEncodedText.Encode("language");
+	private static readonly System.Text.Json.JsonEncodedText PropStemExclusion = System.Text.Json.JsonEncodedText.Encode("stem_exclusion");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("version");
+
+	public override LanguageAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Analysis.Language> propLanguage = default;
+		LocalJsonProperty<ICollection<string>> propStemExclusion = default;
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		LocalJsonProperty<string?> propVersion = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propLanguage.TryRead(ref reader, options, PropLanguage))
+			{
+				continue;
+			}
+
+			if (propStemExclusion.TryRead(ref reader, options, PropStemExclusion))
+			{
+				continue;
+			}
+
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			if (propVersion.TryRead(ref reader, options, PropVersion))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new LanguageAnalyzer
+		{
+			Language = propLanguage.Value
+,
+			StemExclusion = propStemExclusion.Value
+,
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+,
+			Version = propVersion.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, LanguageAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropLanguage, value.Language);
+		writer.WriteProperty(options, PropStemExclusion, value.StemExclusion);
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteProperty(options, PropVersion, value.Version);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(LanguageAnalyzerConverter))]
 public sealed partial class LanguageAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("language")]
 	public Elastic.Clients.Elasticsearch.Serverless.Analysis.Language Language { get; set; }
-	[JsonInclude, JsonPropertyName("stem_exclusion")]
 	public ICollection<string> StemExclusion { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "language";
 
-	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/LatvianAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/LatvianAnalyzer.g.cs
index a14c5062cbb..e85f04ccc47 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/LatvianAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/LatvianAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,17 +28,74 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Analysis;
 
+internal sealed partial class LatvianAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<LatvianAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStemExclusion = System.Text.Json.JsonEncodedText.Encode("stem_exclusion");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override LatvianAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propStemExclusion = default;
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStemExclusion.TryRead(ref reader, options, PropStemExclusion))
+			{
+				continue;
+			}
+
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new LatvianAnalyzer
+		{
+			StemExclusion = propStemExclusion.Value
+,
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, LatvianAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStemExclusion, value.StemExclusion);
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(LatvianAnalyzerConverter))]
 public sealed partial class LatvianAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("stem_exclusion")]
 	public ICollection<string>? StemExclusion { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "latvian";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/LithuanianAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/LithuanianAnalyzer.g.cs
index b676f04e394..3fb8e3c4812 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/LithuanianAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/LithuanianAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,17 +28,74 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Analysis;
 
+internal sealed partial class LithuanianAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<LithuanianAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStemExclusion = System.Text.Json.JsonEncodedText.Encode("stem_exclusion");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override LithuanianAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propStemExclusion = default;
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStemExclusion.TryRead(ref reader, options, PropStemExclusion))
+			{
+				continue;
+			}
+
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new LithuanianAnalyzer
+		{
+			StemExclusion = propStemExclusion.Value
+,
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, LithuanianAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStemExclusion, value.StemExclusion);
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(LithuanianAnalyzerConverter))]
 public sealed partial class LithuanianAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("stem_exclusion")]
 	public ICollection<string>? StemExclusion { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "lithuanian";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/Normalizers.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/Normalizers.g.cs
index e5111e9b1b4..3843ccc02a8 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/Normalizers.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/Normalizers.g.cs
@@ -19,6 +19,7 @@
 
 using Elastic.Clients.Elasticsearch.Serverless.Core;
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport;
 using System;
@@ -74,49 +75,46 @@ public NormalizersDescriptor() : base(new Normalizers())
 	public NormalizersDescriptor Lowercase(string normalizerName, LowercaseNormalizer lowercaseNormalizer) => AssignVariant(normalizerName, lowercaseNormalizer);
 }
 
-internal sealed partial class NormalizerInterfaceConverter : JsonConverter<INormalizer>
+internal sealed partial class NormalizerInterfaceConverter : System.Text.Json.Serialization.JsonConverter<INormalizer>
 {
-	public override INormalizer Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropDiscriminator = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override INormalizer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var copiedReader = reader;
-		string? type = null;
-		using var jsonDoc = JsonDocument.ParseValue(ref copiedReader);
-		if (jsonDoc is not null && jsonDoc.RootElement.TryGetProperty("type", out var readType) && readType.ValueKind == JsonValueKind.String)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		var readerSnapshot = reader;
+		string? discriminator = "custom";
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			type = readType.ToString();
+			if (reader.TryReadProperty(options, PropDiscriminator, ref discriminator))
+			{
+				break;
+			}
+
+			reader.Skip();
 		}
 
-		switch (type)
+		reader = readerSnapshot;
+		return discriminator switch
 		{
-			case "custom":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.CustomNormalizer>(ref reader, options);
-			case "lowercase":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.LowercaseNormalizer>(ref reader, options);
-			default:
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.CustomNormalizer>(ref reader, options);
-		}
+			"custom" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.CustomNormalizer>(options),
+			"lowercase" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.LowercaseNormalizer>(options),
+			_ => throw new System.Text.Json.JsonException($"Variant '{discriminator}' is not supported for type '{nameof(INormalizer)}'.")
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, INormalizer value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, INormalizer value, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (value is null)
-		{
-			writer.WriteNullValue();
-			return;
-		}
-
 		switch (value.Type)
 		{
 			case "custom":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.CustomNormalizer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.CustomNormalizer)value);
+				break;
 			case "lowercase":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.LowercaseNormalizer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.LowercaseNormalizer)value);
+				break;
 			default:
-				var type = value.GetType();
-				JsonSerializer.Serialize(writer, value, type, options);
-				return;
+				throw new System.Text.Json.JsonException($"Variant '{value.Type}' is not supported for type '{nameof(INormalizer)}'.");
 		}
 	}
 }
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/NorwegianAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/NorwegianAnalyzer.g.cs
index 5b88623985b..7fcfaeeef74 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/NorwegianAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/NorwegianAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,17 +28,74 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Analysis;
 
+internal sealed partial class NorwegianAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<NorwegianAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStemExclusion = System.Text.Json.JsonEncodedText.Encode("stem_exclusion");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override NorwegianAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propStemExclusion = default;
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStemExclusion.TryRead(ref reader, options, PropStemExclusion))
+			{
+				continue;
+			}
+
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new NorwegianAnalyzer
+		{
+			StemExclusion = propStemExclusion.Value
+,
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, NorwegianAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStemExclusion, value.StemExclusion);
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(NorwegianAnalyzerConverter))]
 public sealed partial class NorwegianAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("stem_exclusion")]
 	public ICollection<string>? StemExclusion { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "norwegian";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/PatternAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/PatternAnalyzer.g.cs
index 93bf278a294..a2252105c4a 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/PatternAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/PatternAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,22 +28,97 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Analysis;
 
+internal sealed partial class PatternAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<PatternAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropFlags = System.Text.Json.JsonEncodedText.Encode("flags");
+	private static readonly System.Text.Json.JsonEncodedText PropLowercase = System.Text.Json.JsonEncodedText.Encode("lowercase");
+	private static readonly System.Text.Json.JsonEncodedText PropPattern = System.Text.Json.JsonEncodedText.Encode("pattern");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("version");
+
+	public override PatternAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string?> propFlags = default;
+		LocalJsonProperty<bool?> propLowercase = default;
+		LocalJsonProperty<string> propPattern = default;
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propVersion = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propFlags.TryRead(ref reader, options, PropFlags))
+			{
+				continue;
+			}
+
+			if (propLowercase.TryRead(ref reader, options, PropLowercase))
+			{
+				continue;
+			}
+
+			if (propPattern.TryRead(ref reader, options, PropPattern))
+			{
+				continue;
+			}
+
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			if (propVersion.TryRead(ref reader, options, PropVersion))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PatternAnalyzer
+		{
+			Flags = propFlags.Value
+,
+			Lowercase = propLowercase.Value
+,
+			Pattern = propPattern.Value
+,
+			Stopwords = propStopwords.Value
+,
+			Version = propVersion.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PatternAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropFlags, value.Flags);
+		writer.WriteProperty(options, PropLowercase, value.Lowercase);
+		writer.WriteProperty(options, PropPattern, value.Pattern);
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteProperty(options, PropVersion, value.Version);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PatternAnalyzerConverter))]
 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")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "pattern";
 
-	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/PersianAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/PersianAnalyzer.g.cs
index ea3eaf1c040..1b6a9968e32 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/PersianAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/PersianAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,15 +28,63 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Analysis;
 
+internal sealed partial class PersianAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<PersianAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override PersianAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PersianAnalyzer
+		{
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PersianAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PersianAnalyzerConverter))]
 public sealed partial class PersianAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "persian";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/PhoneticTokenFilter.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/PhoneticTokenFilter.g.cs
index 3a1e45c2e51..8f2a12e6a52 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/PhoneticTokenFilter.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/PhoneticTokenFilter.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,26 +28,119 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Analysis;
 
+internal sealed partial class PhoneticTokenFilterConverter : System.Text.Json.Serialization.JsonConverter<PhoneticTokenFilter>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropEncoder = System.Text.Json.JsonEncodedText.Encode("encoder");
+	private static readonly System.Text.Json.JsonEncodedText PropLanguageset = System.Text.Json.JsonEncodedText.Encode("languageset");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxCodeLen = System.Text.Json.JsonEncodedText.Encode("max_code_len");
+	private static readonly System.Text.Json.JsonEncodedText PropNameType = System.Text.Json.JsonEncodedText.Encode("name_type");
+	private static readonly System.Text.Json.JsonEncodedText PropReplace = System.Text.Json.JsonEncodedText.Encode("replace");
+	private static readonly System.Text.Json.JsonEncodedText PropRuleType = System.Text.Json.JsonEncodedText.Encode("rule_type");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("version");
+
+	public override PhoneticTokenFilter Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Analysis.PhoneticEncoder> propEncoder = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.Analysis.PhoneticLanguage>?> propLanguageset = default;
+		LocalJsonProperty<int?> propMaxCodeLen = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Analysis.PhoneticNameType?> propNameType = default;
+		LocalJsonProperty<bool?> propReplace = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Analysis.PhoneticRuleType?> propRuleType = default;
+		LocalJsonProperty<string?> propVersion = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propEncoder.TryRead(ref reader, options, PropEncoder))
+			{
+				continue;
+			}
+
+			if (propLanguageset.TryRead(ref reader, options, PropLanguageset, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Analysis.PhoneticLanguage>?, Elastic.Clients.Elasticsearch.Serverless.Analysis.PhoneticLanguage>)))
+			{
+				continue;
+			}
+
+			if (propMaxCodeLen.TryRead(ref reader, options, PropMaxCodeLen))
+			{
+				continue;
+			}
+
+			if (propNameType.TryRead(ref reader, options, PropNameType))
+			{
+				continue;
+			}
+
+			if (propReplace.TryRead(ref reader, options, PropReplace))
+			{
+				continue;
+			}
+
+			if (propRuleType.TryRead(ref reader, options, PropRuleType))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			if (propVersion.TryRead(ref reader, options, PropVersion))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PhoneticTokenFilter
+		{
+			Encoder = propEncoder.Value
+,
+			Languageset = propLanguageset.Value
+,
+			MaxCodeLen = propMaxCodeLen.Value
+,
+			NameType = propNameType.Value
+,
+			Replace = propReplace.Value
+,
+			RuleType = propRuleType.Value
+,
+			Version = propVersion.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PhoneticTokenFilter value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropEncoder, value.Encoder);
+		writer.WriteProperty(options, PropLanguageset, value.Languageset, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Analysis.PhoneticLanguage>?, Elastic.Clients.Elasticsearch.Serverless.Analysis.PhoneticLanguage>));
+		writer.WriteProperty(options, PropMaxCodeLen, value.MaxCodeLen);
+		writer.WriteProperty(options, PropNameType, value.NameType);
+		writer.WriteProperty(options, PropReplace, value.Replace);
+		writer.WriteProperty(options, PropRuleType, value.RuleType);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteProperty(options, PropVersion, value.Version);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PhoneticTokenFilterConverter))]
 public sealed partial class PhoneticTokenFilter : ITokenFilter
 {
-	[JsonInclude, JsonPropertyName("encoder")]
 	public Elastic.Clients.Elasticsearch.Serverless.Analysis.PhoneticEncoder Encoder { get; set; }
-	[JsonInclude, JsonPropertyName("languageset")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.PhoneticLanguage))]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.Analysis.PhoneticLanguage>? Languageset { get; set; }
-	[JsonInclude, JsonPropertyName("max_code_len")]
 	public int? MaxCodeLen { get; set; }
-	[JsonInclude, JsonPropertyName("name_type")]
 	public Elastic.Clients.Elasticsearch.Serverless.Analysis.PhoneticNameType? NameType { get; set; }
-	[JsonInclude, JsonPropertyName("replace")]
 	public bool? Replace { get; set; }
-	[JsonInclude, JsonPropertyName("rule_type")]
 	public Elastic.Clients.Elasticsearch.Serverless.Analysis.PhoneticRuleType? RuleType { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "phonetic";
 
-	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/PortugueseAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/PortugueseAnalyzer.g.cs
index 0344ea7173f..934ef0ebd58 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/PortugueseAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/PortugueseAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,17 +28,74 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Analysis;
 
+internal sealed partial class PortugueseAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<PortugueseAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStemExclusion = System.Text.Json.JsonEncodedText.Encode("stem_exclusion");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override PortugueseAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propStemExclusion = default;
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStemExclusion.TryRead(ref reader, options, PropStemExclusion))
+			{
+				continue;
+			}
+
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PortugueseAnalyzer
+		{
+			StemExclusion = propStemExclusion.Value
+,
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PortugueseAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStemExclusion, value.StemExclusion);
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PortugueseAnalyzerConverter))]
 public sealed partial class PortugueseAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("stem_exclusion")]
 	public ICollection<string>? StemExclusion { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "portuguese";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/RomanianAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/RomanianAnalyzer.g.cs
index 37809cd82ef..b3ae3da376e 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/RomanianAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/RomanianAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,17 +28,74 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Analysis;
 
+internal sealed partial class RomanianAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<RomanianAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStemExclusion = System.Text.Json.JsonEncodedText.Encode("stem_exclusion");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override RomanianAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propStemExclusion = default;
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStemExclusion.TryRead(ref reader, options, PropStemExclusion))
+			{
+				continue;
+			}
+
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new RomanianAnalyzer
+		{
+			StemExclusion = propStemExclusion.Value
+,
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, RomanianAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStemExclusion, value.StemExclusion);
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(RomanianAnalyzerConverter))]
 public sealed partial class RomanianAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("stem_exclusion")]
 	public ICollection<string>? StemExclusion { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "romanian";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/RussianAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/RussianAnalyzer.g.cs
index 8547f3c2ad7..827ab688f19 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/RussianAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/RussianAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,17 +28,74 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Analysis;
 
+internal sealed partial class RussianAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<RussianAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStemExclusion = System.Text.Json.JsonEncodedText.Encode("stem_exclusion");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override RussianAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propStemExclusion = default;
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStemExclusion.TryRead(ref reader, options, PropStemExclusion))
+			{
+				continue;
+			}
+
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new RussianAnalyzer
+		{
+			StemExclusion = propStemExclusion.Value
+,
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, RussianAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStemExclusion, value.StemExclusion);
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(RussianAnalyzerConverter))]
 public sealed partial class RussianAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("stem_exclusion")]
 	public ICollection<string>? StemExclusion { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "russian";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/SerbianAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/SerbianAnalyzer.g.cs
index 9e978353e75..76162929c20 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/SerbianAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/SerbianAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,17 +28,74 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Analysis;
 
+internal sealed partial class SerbianAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<SerbianAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStemExclusion = System.Text.Json.JsonEncodedText.Encode("stem_exclusion");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override SerbianAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propStemExclusion = default;
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStemExclusion.TryRead(ref reader, options, PropStemExclusion))
+			{
+				continue;
+			}
+
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SerbianAnalyzer
+		{
+			StemExclusion = propStemExclusion.Value
+,
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SerbianAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStemExclusion, value.StemExclusion);
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(SerbianAnalyzerConverter))]
 public sealed partial class SerbianAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("stem_exclusion")]
 	public ICollection<string>? StemExclusion { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "serbian";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/SnowballAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/SnowballAnalyzer.g.cs
index 98cb613c3b6..7be96fd4cc5 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/SnowballAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/SnowballAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,18 +28,75 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Analysis;
 
+internal sealed partial class SnowballAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<SnowballAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropLanguage = System.Text.Json.JsonEncodedText.Encode("language");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("version");
+
+	public override SnowballAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Analysis.SnowballLanguage> propLanguage = default;
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propVersion = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propLanguage.TryRead(ref reader, options, PropLanguage))
+			{
+				continue;
+			}
+
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			if (propVersion.TryRead(ref reader, options, PropVersion))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SnowballAnalyzer
+		{
+			Language = propLanguage.Value
+,
+			Stopwords = propStopwords.Value
+,
+			Version = propVersion.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SnowballAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropLanguage, value.Language);
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteProperty(options, PropVersion, value.Version);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(SnowballAnalyzerConverter))]
 public sealed partial class SnowballAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("language")]
 	public Elastic.Clients.Elasticsearch.Serverless.Analysis.SnowballLanguage Language { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "snowball";
 
-	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/SoraniAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/SoraniAnalyzer.g.cs
index f96bef1f1c9..7d41a9229ff 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/SoraniAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/SoraniAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,17 +28,74 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Analysis;
 
+internal sealed partial class SoraniAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<SoraniAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStemExclusion = System.Text.Json.JsonEncodedText.Encode("stem_exclusion");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override SoraniAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propStemExclusion = default;
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStemExclusion.TryRead(ref reader, options, PropStemExclusion))
+			{
+				continue;
+			}
+
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SoraniAnalyzer
+		{
+			StemExclusion = propStemExclusion.Value
+,
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SoraniAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStemExclusion, value.StemExclusion);
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(SoraniAnalyzerConverter))]
 public sealed partial class SoraniAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("stem_exclusion")]
 	public ICollection<string>? StemExclusion { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "sorani";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/SpanishAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/SpanishAnalyzer.g.cs
index 7c67c7c246e..02dfe7b0546 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/SpanishAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/SpanishAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,17 +28,74 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Analysis;
 
+internal sealed partial class SpanishAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<SpanishAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStemExclusion = System.Text.Json.JsonEncodedText.Encode("stem_exclusion");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override SpanishAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propStemExclusion = default;
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStemExclusion.TryRead(ref reader, options, PropStemExclusion))
+			{
+				continue;
+			}
+
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SpanishAnalyzer
+		{
+			StemExclusion = propStemExclusion.Value
+,
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SpanishAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStemExclusion, value.StemExclusion);
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(SpanishAnalyzerConverter))]
 public sealed partial class SpanishAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("stem_exclusion")]
 	public ICollection<string>? StemExclusion { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "spanish";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/StandardAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/StandardAnalyzer.g.cs
index e064b2c5e0a..923d0e71892 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/StandardAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/StandardAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,15 +28,63 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Analysis;
 
+internal sealed partial class StandardAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<StandardAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropMaxTokenLength = System.Text.Json.JsonEncodedText.Encode("max_token_length");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override StandardAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<int?> propMaxTokenLength = default;
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propMaxTokenLength.TryRead(ref reader, options, PropMaxTokenLength))
+			{
+				continue;
+			}
+
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new StandardAnalyzer
+		{
+			MaxTokenLength = propMaxTokenLength.Value
+,
+			Stopwords = propStopwords.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, StandardAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropMaxTokenLength, value.MaxTokenLength);
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(StandardAnalyzerConverter))]
 public sealed partial class StandardAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("max_token_length")]
 	public int? MaxTokenLength { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "standard";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/StemmerTokenFilter.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/StemmerTokenFilter.g.cs
index 3803785787e..1cd7d836c80 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/StemmerTokenFilter.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/StemmerTokenFilter.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,52 +28,54 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Analysis;
 
-internal sealed partial class StemmerTokenFilterConverter : JsonConverter<StemmerTokenFilter>
+internal sealed partial class StemmerTokenFilterConverter : System.Text.Json.Serialization.JsonConverter<StemmerTokenFilter>
 {
-	public override StemmerTokenFilter Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropLanguage = System.Text.Json.JsonEncodedText.Encode("language");
+	private static readonly System.Text.Json.JsonEncodedText PropLanguage1 = System.Text.Json.JsonEncodedText.Encode("name");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("version");
+
+	public override StemmerTokenFilter Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		var variant = new StemmerTokenFilter();
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string?> propLanguage = default;
+		LocalJsonProperty<string?> propVersion = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propLanguage.TryRead(ref reader, options, PropLanguage) || propLanguage.TryRead(ref reader, options, PropLanguage1))
 			{
-				var property = reader.GetString();
-				if (property == "language" || property == "name")
-				{
-					variant.Language = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "version")
-				{
-					variant.Version = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
+				continue;
 			}
-		}
 
-		return variant;
-	}
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
 
-	public override void Write(Utf8JsonWriter writer, StemmerTokenFilter value, JsonSerializerOptions options)
-	{
-		writer.WriteStartObject();
-		if (!string.IsNullOrEmpty(value.Language))
-		{
-			writer.WritePropertyName("language");
-			writer.WriteStringValue(value.Language);
+			if (propVersion.TryRead(ref reader, options, PropVersion))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		writer.WritePropertyName("type");
-		writer.WriteStringValue("stemmer");
-		if (!string.IsNullOrEmpty(value.Version))
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new StemmerTokenFilter
 		{
-			writer.WritePropertyName("version");
-			writer.WriteStringValue(value.Version);
-		}
+			Language = propLanguage.Value
+,
+			Version = propVersion.Value
+		};
+	}
 
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, StemmerTokenFilter value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropLanguage, value.Language);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteProperty(options, PropVersion, value.Version);
 		writer.WriteEndObject();
 	}
 }
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/StopAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/StopAnalyzer.g.cs
index 29e73833d84..4cf328ecdd4 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/StopAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/StopAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,18 +28,75 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Analysis;
 
+internal sealed partial class StopAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<StopAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("version");
+
+	public override StopAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		LocalJsonProperty<string?> propVersion = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			if (propVersion.TryRead(ref reader, options, PropVersion))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new StopAnalyzer
+		{
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+,
+			Version = propVersion.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, StopAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteProperty(options, PropVersion, value.Version);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(StopAnalyzerConverter))]
 public sealed partial class StopAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "stop";
 
-	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/StopTokenFilter.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/StopTokenFilter.g.cs
index 59989df0afc..fdca03d0e40 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/StopTokenFilter.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/StopTokenFilter.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,22 +28,97 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Analysis;
 
+internal sealed partial class StopTokenFilterConverter : System.Text.Json.Serialization.JsonConverter<StopTokenFilter>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreCase = System.Text.Json.JsonEncodedText.Encode("ignore_case");
+	private static readonly System.Text.Json.JsonEncodedText PropRemoveTrailing = System.Text.Json.JsonEncodedText.Encode("remove_trailing");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("version");
+
+	public override StopTokenFilter Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool?> propIgnoreCase = default;
+		LocalJsonProperty<bool?> propRemoveTrailing = default;
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		LocalJsonProperty<string?> propVersion = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propIgnoreCase.TryRead(ref reader, options, PropIgnoreCase))
+			{
+				continue;
+			}
+
+			if (propRemoveTrailing.TryRead(ref reader, options, PropRemoveTrailing))
+			{
+				continue;
+			}
+
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			if (propVersion.TryRead(ref reader, options, PropVersion))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new StopTokenFilter
+		{
+			IgnoreCase = propIgnoreCase.Value
+,
+			RemoveTrailing = propRemoveTrailing.Value
+,
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+,
+			Version = propVersion.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, StopTokenFilter value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropIgnoreCase, value.IgnoreCase);
+		writer.WriteProperty(options, PropRemoveTrailing, value.RemoveTrailing);
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteProperty(options, PropVersion, value.Version);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(StopTokenFilterConverter))]
 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")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "stop";
 
-	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/SwedishAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/SwedishAnalyzer.g.cs
index ae01149d2e9..2e80789ca4f 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/SwedishAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/SwedishAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,17 +28,74 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Analysis;
 
+internal sealed partial class SwedishAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<SwedishAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStemExclusion = System.Text.Json.JsonEncodedText.Encode("stem_exclusion");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override SwedishAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propStemExclusion = default;
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStemExclusion.TryRead(ref reader, options, PropStemExclusion))
+			{
+				continue;
+			}
+
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SwedishAnalyzer
+		{
+			StemExclusion = propStemExclusion.Value
+,
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SwedishAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStemExclusion, value.StemExclusion);
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(SwedishAnalyzerConverter))]
 public sealed partial class SwedishAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("stem_exclusion")]
 	public ICollection<string>? StemExclusion { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "swedish";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/ThaiAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/ThaiAnalyzer.g.cs
index bdf26a797f3..049c5edc287 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/ThaiAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/ThaiAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,15 +28,63 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Analysis;
 
+internal sealed partial class ThaiAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<ThaiAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override ThaiAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ThaiAnalyzer
+		{
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ThaiAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ThaiAnalyzerConverter))]
 public sealed partial class ThaiAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "thai";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/TokenFilters.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/TokenFilters.g.cs
index 5d05ae0174c..8ad112ac2cc 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/TokenFilters.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/TokenFilters.g.cs
@@ -19,6 +19,7 @@
 
 using Elastic.Clients.Elasticsearch.Serverless.Core;
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport;
 using System;
@@ -209,275 +210,226 @@ public TokenFiltersDescriptor() : base(new TokenFilters())
 	public TokenFiltersDescriptor WordDelimiter(string tokenFilterName, WordDelimiterTokenFilter wordDelimiterTokenFilter) => AssignVariant(tokenFilterName, wordDelimiterTokenFilter);
 }
 
-internal sealed partial class TokenFilterInterfaceConverter : JsonConverter<ITokenFilter>
+internal sealed partial class TokenFilterInterfaceConverter : System.Text.Json.Serialization.JsonConverter<ITokenFilter>
 {
-	public override ITokenFilter Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropDiscriminator = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override ITokenFilter Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var copiedReader = reader;
-		string? type = null;
-		using var jsonDoc = JsonDocument.ParseValue(ref copiedReader);
-		if (jsonDoc is not null && jsonDoc.RootElement.TryGetProperty("type", out var readType) && readType.ValueKind == JsonValueKind.String)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		var readerSnapshot = reader;
+		string? discriminator = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			type = readType.ToString();
+			if (reader.TryReadProperty(options, PropDiscriminator, ref discriminator))
+			{
+				break;
+			}
+
+			reader.Skip();
 		}
 
-		switch (type)
+		reader = readerSnapshot;
+		return discriminator switch
 		{
-			case "asciifolding":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.AsciiFoldingTokenFilter>(ref reader, options);
-			case "common_grams":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.CommonGramsTokenFilter>(ref reader, options);
-			case "condition":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.ConditionTokenFilter>(ref reader, options);
-			case "delimited_payload":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.DelimitedPayloadTokenFilter>(ref reader, options);
-			case "dictionary_decompounder":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.DictionaryDecompounderTokenFilter>(ref reader, options);
-			case "edge_ngram":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.EdgeNGramTokenFilter>(ref reader, options);
-			case "elision":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.ElisionTokenFilter>(ref reader, options);
-			case "fingerprint":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.FingerprintTokenFilter>(ref reader, options);
-			case "hunspell":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.HunspellTokenFilter>(ref reader, options);
-			case "hyphenation_decompounder":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.HyphenationDecompounderTokenFilter>(ref reader, options);
-			case "icu_collation":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.IcuCollationTokenFilter>(ref reader, options);
-			case "icu_folding":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.IcuFoldingTokenFilter>(ref reader, options);
-			case "icu_normalizer":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.IcuNormalizationTokenFilter>(ref reader, options);
-			case "icu_transform":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.IcuTransformTokenFilter>(ref reader, options);
-			case "keep_types":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.KeepTypesTokenFilter>(ref reader, options);
-			case "keep":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.KeepWordsTokenFilter>(ref reader, options);
-			case "keyword_marker":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.KeywordMarkerTokenFilter>(ref reader, options);
-			case "kstem":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.KStemTokenFilter>(ref reader, options);
-			case "kuromoji_part_of_speech":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.KuromojiPartOfSpeechTokenFilter>(ref reader, options);
-			case "kuromoji_readingform":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.KuromojiReadingFormTokenFilter>(ref reader, options);
-			case "kuromoji_stemmer":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.KuromojiStemmerTokenFilter>(ref reader, options);
-			case "length":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.LengthTokenFilter>(ref reader, options);
-			case "limit":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.LimitTokenCountTokenFilter>(ref reader, options);
-			case "lowercase":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.LowercaseTokenFilter>(ref reader, options);
-			case "multiplexer":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.MultiplexerTokenFilter>(ref reader, options);
-			case "ngram":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.NGramTokenFilter>(ref reader, options);
-			case "nori_part_of_speech":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.NoriPartOfSpeechTokenFilter>(ref reader, options);
-			case "pattern_capture":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.PatternCaptureTokenFilter>(ref reader, options);
-			case "pattern_replace":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.PatternReplaceTokenFilter>(ref reader, options);
-			case "phonetic":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.PhoneticTokenFilter>(ref reader, options);
-			case "porter_stem":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.PorterStemTokenFilter>(ref reader, options);
-			case "predicate_token_filter":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.PredicateTokenFilter>(ref reader, options);
-			case "remove_duplicates":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.RemoveDuplicatesTokenFilter>(ref reader, options);
-			case "reverse":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.ReverseTokenFilter>(ref reader, options);
-			case "shingle":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.ShingleTokenFilter>(ref reader, options);
-			case "snowball":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.SnowballTokenFilter>(ref reader, options);
-			case "stemmer_override":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.StemmerOverrideTokenFilter>(ref reader, options);
-			case "stemmer":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.StemmerTokenFilter>(ref reader, options);
-			case "stop":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.StopTokenFilter>(ref reader, options);
-			case "synonym_graph":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.SynonymGraphTokenFilter>(ref reader, options);
-			case "synonym":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.SynonymTokenFilter>(ref reader, options);
-			case "trim":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.TrimTokenFilter>(ref reader, options);
-			case "truncate":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.TruncateTokenFilter>(ref reader, options);
-			case "unique":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.UniqueTokenFilter>(ref reader, options);
-			case "uppercase":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.UppercaseTokenFilter>(ref reader, options);
-			case "word_delimiter_graph":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.WordDelimiterGraphTokenFilter>(ref reader, options);
-			case "word_delimiter":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.WordDelimiterTokenFilter>(ref reader, options);
-			default:
-				ThrowHelper.ThrowUnknownTaggedUnionVariantJsonException(type, typeof(ITokenFilter));
-				return null;
-		}
+			"asciifolding" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.AsciiFoldingTokenFilter>(options),
+			"common_grams" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.CommonGramsTokenFilter>(options),
+			"condition" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.ConditionTokenFilter>(options),
+			"delimited_payload" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.DelimitedPayloadTokenFilter>(options),
+			"dictionary_decompounder" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.DictionaryDecompounderTokenFilter>(options),
+			"edge_ngram" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.EdgeNGramTokenFilter>(options),
+			"elision" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.ElisionTokenFilter>(options),
+			"fingerprint" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.FingerprintTokenFilter>(options),
+			"hunspell" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.HunspellTokenFilter>(options),
+			"hyphenation_decompounder" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.HyphenationDecompounderTokenFilter>(options),
+			"icu_collation" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.IcuCollationTokenFilter>(options),
+			"icu_folding" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.IcuFoldingTokenFilter>(options),
+			"icu_normalizer" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.IcuNormalizationTokenFilter>(options),
+			"icu_transform" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.IcuTransformTokenFilter>(options),
+			"keep_types" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.KeepTypesTokenFilter>(options),
+			"keep" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.KeepWordsTokenFilter>(options),
+			"keyword_marker" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.KeywordMarkerTokenFilter>(options),
+			"kstem" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.KStemTokenFilter>(options),
+			"kuromoji_part_of_speech" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.KuromojiPartOfSpeechTokenFilter>(options),
+			"kuromoji_readingform" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.KuromojiReadingFormTokenFilter>(options),
+			"kuromoji_stemmer" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.KuromojiStemmerTokenFilter>(options),
+			"length" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.LengthTokenFilter>(options),
+			"limit" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.LimitTokenCountTokenFilter>(options),
+			"lowercase" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.LowercaseTokenFilter>(options),
+			"multiplexer" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.MultiplexerTokenFilter>(options),
+			"ngram" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.NGramTokenFilter>(options),
+			"nori_part_of_speech" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.NoriPartOfSpeechTokenFilter>(options),
+			"pattern_capture" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.PatternCaptureTokenFilter>(options),
+			"pattern_replace" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.PatternReplaceTokenFilter>(options),
+			"phonetic" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.PhoneticTokenFilter>(options),
+			"porter_stem" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.PorterStemTokenFilter>(options),
+			"predicate_token_filter" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.PredicateTokenFilter>(options),
+			"remove_duplicates" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.RemoveDuplicatesTokenFilter>(options),
+			"reverse" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.ReverseTokenFilter>(options),
+			"shingle" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.ShingleTokenFilter>(options),
+			"snowball" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.SnowballTokenFilter>(options),
+			"stemmer_override" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.StemmerOverrideTokenFilter>(options),
+			"stemmer" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.StemmerTokenFilter>(options),
+			"stop" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.StopTokenFilter>(options),
+			"synonym_graph" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.SynonymGraphTokenFilter>(options),
+			"synonym" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.SynonymTokenFilter>(options),
+			"trim" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.TrimTokenFilter>(options),
+			"truncate" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.TruncateTokenFilter>(options),
+			"unique" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.UniqueTokenFilter>(options),
+			"uppercase" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.UppercaseTokenFilter>(options),
+			"word_delimiter_graph" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.WordDelimiterGraphTokenFilter>(options),
+			"word_delimiter" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.WordDelimiterTokenFilter>(options),
+			_ => throw new System.Text.Json.JsonException($"Variant '{discriminator}' is not supported for type '{nameof(ITokenFilter)}'.")
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, ITokenFilter value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ITokenFilter value, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (value is null)
-		{
-			writer.WriteNullValue();
-			return;
-		}
-
 		switch (value.Type)
 		{
 			case "asciifolding":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.AsciiFoldingTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.AsciiFoldingTokenFilter)value);
+				break;
 			case "common_grams":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.CommonGramsTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.CommonGramsTokenFilter)value);
+				break;
 			case "condition":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.ConditionTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.ConditionTokenFilter)value);
+				break;
 			case "delimited_payload":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.DelimitedPayloadTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.DelimitedPayloadTokenFilter)value);
+				break;
 			case "dictionary_decompounder":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.DictionaryDecompounderTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.DictionaryDecompounderTokenFilter)value);
+				break;
 			case "edge_ngram":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.EdgeNGramTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.EdgeNGramTokenFilter)value);
+				break;
 			case "elision":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.ElisionTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.ElisionTokenFilter)value);
+				break;
 			case "fingerprint":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.FingerprintTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.FingerprintTokenFilter)value);
+				break;
 			case "hunspell":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.HunspellTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.HunspellTokenFilter)value);
+				break;
 			case "hyphenation_decompounder":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.HyphenationDecompounderTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.HyphenationDecompounderTokenFilter)value);
+				break;
 			case "icu_collation":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.IcuCollationTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.IcuCollationTokenFilter)value);
+				break;
 			case "icu_folding":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.IcuFoldingTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.IcuFoldingTokenFilter)value);
+				break;
 			case "icu_normalizer":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.IcuNormalizationTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.IcuNormalizationTokenFilter)value);
+				break;
 			case "icu_transform":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.IcuTransformTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.IcuTransformTokenFilter)value);
+				break;
 			case "keep_types":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.KeepTypesTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.KeepTypesTokenFilter)value);
+				break;
 			case "keep":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.KeepWordsTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.KeepWordsTokenFilter)value);
+				break;
 			case "keyword_marker":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.KeywordMarkerTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.KeywordMarkerTokenFilter)value);
+				break;
 			case "kstem":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.KStemTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.KStemTokenFilter)value);
+				break;
 			case "kuromoji_part_of_speech":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.KuromojiPartOfSpeechTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.KuromojiPartOfSpeechTokenFilter)value);
+				break;
 			case "kuromoji_readingform":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.KuromojiReadingFormTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.KuromojiReadingFormTokenFilter)value);
+				break;
 			case "kuromoji_stemmer":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.KuromojiStemmerTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.KuromojiStemmerTokenFilter)value);
+				break;
 			case "length":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.LengthTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.LengthTokenFilter)value);
+				break;
 			case "limit":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.LimitTokenCountTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.LimitTokenCountTokenFilter)value);
+				break;
 			case "lowercase":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.LowercaseTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.LowercaseTokenFilter)value);
+				break;
 			case "multiplexer":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.MultiplexerTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.MultiplexerTokenFilter)value);
+				break;
 			case "ngram":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.NGramTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.NGramTokenFilter)value);
+				break;
 			case "nori_part_of_speech":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.NoriPartOfSpeechTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.NoriPartOfSpeechTokenFilter)value);
+				break;
 			case "pattern_capture":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.PatternCaptureTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.PatternCaptureTokenFilter)value);
+				break;
 			case "pattern_replace":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.PatternReplaceTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.PatternReplaceTokenFilter)value);
+				break;
 			case "phonetic":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.PhoneticTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.PhoneticTokenFilter)value);
+				break;
 			case "porter_stem":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.PorterStemTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.PorterStemTokenFilter)value);
+				break;
 			case "predicate_token_filter":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.PredicateTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.PredicateTokenFilter)value);
+				break;
 			case "remove_duplicates":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.RemoveDuplicatesTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.RemoveDuplicatesTokenFilter)value);
+				break;
 			case "reverse":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.ReverseTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.ReverseTokenFilter)value);
+				break;
 			case "shingle":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.ShingleTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.ShingleTokenFilter)value);
+				break;
 			case "snowball":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.SnowballTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.SnowballTokenFilter)value);
+				break;
 			case "stemmer_override":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.StemmerOverrideTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.StemmerOverrideTokenFilter)value);
+				break;
 			case "stemmer":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.StemmerTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.StemmerTokenFilter)value);
+				break;
 			case "stop":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.StopTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.StopTokenFilter)value);
+				break;
 			case "synonym_graph":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.SynonymGraphTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.SynonymGraphTokenFilter)value);
+				break;
 			case "synonym":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.SynonymTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.SynonymTokenFilter)value);
+				break;
 			case "trim":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.TrimTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.TrimTokenFilter)value);
+				break;
 			case "truncate":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.TruncateTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.TruncateTokenFilter)value);
+				break;
 			case "unique":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.UniqueTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.UniqueTokenFilter)value);
+				break;
 			case "uppercase":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.UppercaseTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.UppercaseTokenFilter)value);
+				break;
 			case "word_delimiter_graph":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.WordDelimiterGraphTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.WordDelimiterGraphTokenFilter)value);
+				break;
 			case "word_delimiter":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.WordDelimiterTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.WordDelimiterTokenFilter)value);
+				break;
 			default:
-				var type = value.GetType();
-				JsonSerializer.Serialize(writer, value, type, options);
-				return;
+				throw new System.Text.Json.JsonException($"Variant '{value.Type}' is not supported for type '{nameof(ITokenFilter)}'.");
 		}
 	}
 }
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/Tokenizers.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/Tokenizers.g.cs
index 0e3c17b8211..70daafe006c 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/Tokenizers.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/Tokenizers.g.cs
@@ -19,6 +19,7 @@
 
 using Elastic.Clients.Elasticsearch.Serverless.Core;
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport;
 using System;
@@ -122,130 +123,110 @@ public TokenizersDescriptor() : base(new Tokenizers())
 	public TokenizersDescriptor Whitespace(string tokenizerName, WhitespaceTokenizer whitespaceTokenizer) => AssignVariant(tokenizerName, whitespaceTokenizer);
 }
 
-internal sealed partial class TokenizerInterfaceConverter : JsonConverter<ITokenizer>
+internal sealed partial class TokenizerInterfaceConverter : System.Text.Json.Serialization.JsonConverter<ITokenizer>
 {
-	public override ITokenizer Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropDiscriminator = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override ITokenizer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var copiedReader = reader;
-		string? type = null;
-		using var jsonDoc = JsonDocument.ParseValue(ref copiedReader);
-		if (jsonDoc is not null && jsonDoc.RootElement.TryGetProperty("type", out var readType) && readType.ValueKind == JsonValueKind.String)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		var readerSnapshot = reader;
+		string? discriminator = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			type = readType.ToString();
+			if (reader.TryReadProperty(options, PropDiscriminator, ref discriminator))
+			{
+				break;
+			}
+
+			reader.Skip();
 		}
 
-		switch (type)
+		reader = readerSnapshot;
+		return discriminator switch
 		{
-			case "char_group":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.CharGroupTokenizer>(ref reader, options);
-			case "classic":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.ClassicTokenizer>(ref reader, options);
-			case "edge_ngram":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.EdgeNGramTokenizer>(ref reader, options);
-			case "icu_tokenizer":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.IcuTokenizer>(ref reader, options);
-			case "keyword":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.KeywordTokenizer>(ref reader, options);
-			case "kuromoji_tokenizer":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.KuromojiTokenizer>(ref reader, options);
-			case "letter":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.LetterTokenizer>(ref reader, options);
-			case "lowercase":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.LowercaseTokenizer>(ref reader, options);
-			case "ngram":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.NGramTokenizer>(ref reader, options);
-			case "nori_tokenizer":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.NoriTokenizer>(ref reader, options);
-			case "path_hierarchy":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.PathHierarchyTokenizer>(ref reader, options);
-			case "pattern":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.PatternTokenizer>(ref reader, options);
-			case "simple_pattern_split":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.SimplePatternSplitTokenizer>(ref reader, options);
-			case "simple_pattern":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.SimplePatternTokenizer>(ref reader, options);
-			case "standard":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.StandardTokenizer>(ref reader, options);
-			case "thai":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.ThaiTokenizer>(ref reader, options);
-			case "uax_url_email":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.UaxEmailUrlTokenizer>(ref reader, options);
-			case "whitespace":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Analysis.WhitespaceTokenizer>(ref reader, options);
-			default:
-				ThrowHelper.ThrowUnknownTaggedUnionVariantJsonException(type, typeof(ITokenizer));
-				return null;
-		}
+			"char_group" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.CharGroupTokenizer>(options),
+			"classic" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.ClassicTokenizer>(options),
+			"edge_ngram" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.EdgeNGramTokenizer>(options),
+			"icu_tokenizer" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.IcuTokenizer>(options),
+			"keyword" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.KeywordTokenizer>(options),
+			"kuromoji_tokenizer" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.KuromojiTokenizer>(options),
+			"letter" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.LetterTokenizer>(options),
+			"lowercase" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.LowercaseTokenizer>(options),
+			"ngram" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.NGramTokenizer>(options),
+			"nori_tokenizer" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.NoriTokenizer>(options),
+			"path_hierarchy" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.PathHierarchyTokenizer>(options),
+			"pattern" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.PatternTokenizer>(options),
+			"simple_pattern_split" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.SimplePatternSplitTokenizer>(options),
+			"simple_pattern" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.SimplePatternTokenizer>(options),
+			"standard" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.StandardTokenizer>(options),
+			"thai" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.ThaiTokenizer>(options),
+			"uax_url_email" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.UaxEmailUrlTokenizer>(options),
+			"whitespace" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Analysis.WhitespaceTokenizer>(options),
+			_ => throw new System.Text.Json.JsonException($"Variant '{discriminator}' is not supported for type '{nameof(ITokenizer)}'.")
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, ITokenizer value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ITokenizer value, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (value is null)
-		{
-			writer.WriteNullValue();
-			return;
-		}
-
 		switch (value.Type)
 		{
 			case "char_group":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.CharGroupTokenizer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.CharGroupTokenizer)value);
+				break;
 			case "classic":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.ClassicTokenizer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.ClassicTokenizer)value);
+				break;
 			case "edge_ngram":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.EdgeNGramTokenizer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.EdgeNGramTokenizer)value);
+				break;
 			case "icu_tokenizer":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.IcuTokenizer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.IcuTokenizer)value);
+				break;
 			case "keyword":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.KeywordTokenizer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.KeywordTokenizer)value);
+				break;
 			case "kuromoji_tokenizer":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.KuromojiTokenizer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.KuromojiTokenizer)value);
+				break;
 			case "letter":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.LetterTokenizer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.LetterTokenizer)value);
+				break;
 			case "lowercase":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.LowercaseTokenizer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.LowercaseTokenizer)value);
+				break;
 			case "ngram":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.NGramTokenizer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.NGramTokenizer)value);
+				break;
 			case "nori_tokenizer":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.NoriTokenizer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.NoriTokenizer)value);
+				break;
 			case "path_hierarchy":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.PathHierarchyTokenizer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.PathHierarchyTokenizer)value);
+				break;
 			case "pattern":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.PatternTokenizer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.PatternTokenizer)value);
+				break;
 			case "simple_pattern_split":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.SimplePatternSplitTokenizer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.SimplePatternSplitTokenizer)value);
+				break;
 			case "simple_pattern":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.SimplePatternTokenizer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.SimplePatternTokenizer)value);
+				break;
 			case "standard":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.StandardTokenizer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.StandardTokenizer)value);
+				break;
 			case "thai":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.ThaiTokenizer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.ThaiTokenizer)value);
+				break;
 			case "uax_url_email":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.UaxEmailUrlTokenizer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.UaxEmailUrlTokenizer)value);
+				break;
 			case "whitespace":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Analysis.WhitespaceTokenizer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Analysis.WhitespaceTokenizer)value);
+				break;
 			default:
-				var type = value.GetType();
-				JsonSerializer.Serialize(writer, value, type, options);
-				return;
+				throw new System.Text.Json.JsonException($"Variant '{value.Type}' is not supported for type '{nameof(ITokenizer)}'.");
 		}
 	}
 }
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/TurkishAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/TurkishAnalyzer.g.cs
index d4a02ced9d7..c45cbabac08 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/TurkishAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Analysis/TurkishAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,17 +28,74 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Analysis;
 
+internal sealed partial class TurkishAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<TurkishAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStemExclusion = System.Text.Json.JsonEncodedText.Encode("stem_exclusion");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override TurkishAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propStemExclusion = default;
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStemExclusion.TryRead(ref reader, options, PropStemExclusion))
+			{
+				continue;
+			}
+
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new TurkishAnalyzer
+		{
+			StemExclusion = propStemExclusion.Value
+,
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, TurkishAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStemExclusion, value.StemExclusion);
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(TurkishAnalyzerConverter))]
 public sealed partial class TurkishAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("stem_exclusion")]
 	public ICollection<string>? StemExclusion { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "turkish";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Cluster/ComponentTemplateSummary.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Cluster/ComponentTemplateSummary.g.cs
index fb48da5840f..f189d30666d 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Cluster/ComponentTemplateSummary.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Cluster/ComponentTemplateSummary.g.cs
@@ -38,7 +38,6 @@ public sealed partial class ComponentTemplateSummary
 	[JsonInclude, JsonPropertyName("_meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
 	[JsonInclude, JsonPropertyName("settings")]
-	[ReadOnlyIndexNameDictionaryConverter(typeof(Elastic.Clients.Elasticsearch.Serverless.IndexManagement.IndexSettings))]
 	public IReadOnlyDictionary<Elastic.Clients.Elasticsearch.Serverless.IndexName, Elastic.Clients.Elasticsearch.Serverless.IndexManagement.IndexSettings>? Settings { get; init; }
 	[JsonInclude, JsonPropertyName("version")]
 	public long? Version { get; init; }
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/CompletionStats.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/CompletionStats.g.cs
index 98ef24f22fe..211bf5dbb8c 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/CompletionStats.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/CompletionStats.g.cs
@@ -30,7 +30,6 @@ namespace Elastic.Clients.Elasticsearch.Serverless;
 public sealed partial class CompletionStats
 {
 	[JsonInclude, JsonPropertyName("fields")]
-	[ReadOnlyFieldDictionaryConverter(typeof(Elastic.Clients.Elasticsearch.Serverless.FieldSizeUsage))]
 	public IReadOnlyDictionary<Elastic.Clients.Elasticsearch.Serverless.Field, Elastic.Clients.Elasticsearch.Serverless.FieldSizeUsage>? Fields { get; init; }
 
 	/// <summary>
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/FieldCaps/FieldCapability.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/FieldCaps/FieldCapability.g.cs
index fb55120aeb0..16ff9892917 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/FieldCaps/FieldCapability.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/FieldCaps/FieldCapability.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,110 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Core.FieldCaps;
 
+internal sealed partial class FieldCapabilityConverter : System.Text.Json.Serialization.JsonConverter<FieldCapability>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAggregatable = System.Text.Json.JsonEncodedText.Encode("aggregatable");
+	private static readonly System.Text.Json.JsonEncodedText PropIndices = System.Text.Json.JsonEncodedText.Encode("indices");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropMetadataField = System.Text.Json.JsonEncodedText.Encode("metadata_field");
+	private static readonly System.Text.Json.JsonEncodedText PropNonAggregatableIndices = System.Text.Json.JsonEncodedText.Encode("non_aggregatable_indices");
+	private static readonly System.Text.Json.JsonEncodedText PropNonSearchableIndices = System.Text.Json.JsonEncodedText.Encode("non_searchable_indices");
+	private static readonly System.Text.Json.JsonEncodedText PropSearchable = System.Text.Json.JsonEncodedText.Encode("searchable");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override FieldCapability Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAggregatable = default;
+		LocalJsonProperty<IReadOnlyCollection<string>?> propIndices = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, object>?> propMeta = default;
+		LocalJsonProperty<bool?> propMetadataField = default;
+		LocalJsonProperty<IReadOnlyCollection<string>?> propNonAggregatableIndices = default;
+		LocalJsonProperty<IReadOnlyCollection<string>?> propNonSearchableIndices = default;
+		LocalJsonProperty<bool> propSearchable = default;
+		LocalJsonProperty<string> propType = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAggregatable.TryRead(ref reader, options, PropAggregatable))
+			{
+				continue;
+			}
+
+			if (propIndices.TryRead(ref reader, options, PropIndices, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propMetadataField.TryRead(ref reader, options, PropMetadataField))
+			{
+				continue;
+			}
+
+			if (propNonAggregatableIndices.TryRead(ref reader, options, PropNonAggregatableIndices, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propNonSearchableIndices.TryRead(ref reader, options, PropNonSearchableIndices, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propSearchable.TryRead(ref reader, options, PropSearchable))
+			{
+				continue;
+			}
+
+			if (propType.TryRead(ref reader, options, PropType))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new FieldCapability
+		{
+			Aggregatable = propAggregatable.Value
+,
+			Indices = propIndices.Value
+,
+			Meta = propMeta.Value
+,
+			MetadataField = propMetadataField.Value
+,
+			NonAggregatableIndices = propNonAggregatableIndices.Value
+,
+			NonSearchableIndices = propNonSearchableIndices.Value
+,
+			Searchable = propSearchable.Value
+,
+			Type = propType.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, FieldCapability value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAggregatable, value.Aggregatable);
+		writer.WriteProperty(options, PropIndices, value.Indices, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropMetadataField, value.MetadataField);
+		writer.WriteProperty(options, PropNonAggregatableIndices, value.NonAggregatableIndices, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropNonSearchableIndices, value.NonSearchableIndices, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropSearchable, value.Searchable);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(FieldCapabilityConverter))]
 public sealed partial class FieldCapability
 {
 	/// <summary>
@@ -34,7 +139,6 @@ public sealed partial class FieldCapability
 	/// Whether this field can be aggregated on all indices.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("aggregatable")]
 	public bool Aggregatable { get; init; }
 
 	/// <summary>
@@ -42,8 +146,6 @@ public sealed partial class FieldCapability
 	/// 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")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public IReadOnlyCollection<string>? Indices { get; init; }
 
 	/// <summary>
@@ -51,7 +153,6 @@ public sealed partial class FieldCapability
 	/// 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>
@@ -59,7 +160,6 @@ public sealed partial class FieldCapability
 	/// Whether this field is registered as a metadata field.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("metadata_field")]
 	public bool? MetadataField { get; init; }
 
 	/// <summary>
@@ -67,8 +167,6 @@ public sealed partial class FieldCapability
 	/// 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")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public IReadOnlyCollection<string>? NonAggregatableIndices { get; init; }
 
 	/// <summary>
@@ -76,8 +174,6 @@ public sealed partial class FieldCapability
 	/// 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")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public IReadOnlyCollection<string>? NonSearchableIndices { get; init; }
 
 	/// <summary>
@@ -85,8 +181,6 @@ public sealed partial class FieldCapability
 	/// Whether this field is indexed for search on all indices.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("searchable")]
 	public bool Searchable { get; init; }
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Get/GetResult.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Get/GetResult.g.cs
index 10c904ab709..555c101d7f9 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Get/GetResult.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Get/GetResult.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,27 +28,157 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Core.Get;
 
+internal sealed partial class GetResultConverter<TDocument> : System.Text.Json.Serialization.JsonConverter<GetResult<TDocument>>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropFound = System.Text.Json.JsonEncodedText.Encode("found");
+	private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("_id");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnored = System.Text.Json.JsonEncodedText.Encode("_ignored");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("_index");
+	private static readonly System.Text.Json.JsonEncodedText PropPrimaryTerm = System.Text.Json.JsonEncodedText.Encode("_primary_term");
+	private static readonly System.Text.Json.JsonEncodedText PropRouting = System.Text.Json.JsonEncodedText.Encode("_routing");
+	private static readonly System.Text.Json.JsonEncodedText PropSeqNo = System.Text.Json.JsonEncodedText.Encode("_seq_no");
+	private static readonly System.Text.Json.JsonEncodedText PropSource = System.Text.Json.JsonEncodedText.Encode("_source");
+	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("_version");
+
+	public override GetResult<TDocument> Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.FieldValues?> propFields = default;
+		LocalJsonProperty<bool> propFound = default;
+		LocalJsonProperty<string> propId = default;
+		LocalJsonProperty<IReadOnlyCollection<string>?> propIgnored = default;
+		LocalJsonProperty<string> propIndex = default;
+		LocalJsonProperty<long?> propPrimaryTerm = default;
+		LocalJsonProperty<string?> propRouting = default;
+		LocalJsonProperty<long?> propSeqNo = default;
+		LocalJsonProperty<TDocument?> propSource = default;
+		LocalJsonProperty<long?> propVersion = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propFound.TryRead(ref reader, options, PropFound))
+			{
+				continue;
+			}
+
+			if (propId.TryRead(ref reader, options, PropId))
+			{
+				continue;
+			}
+
+			if (propIgnored.TryRead(ref reader, options, PropIgnored))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propPrimaryTerm.TryRead(ref reader, options, PropPrimaryTerm))
+			{
+				continue;
+			}
+
+			if (propRouting.TryRead(ref reader, options, PropRouting))
+			{
+				continue;
+			}
+
+			if (propSeqNo.TryRead(ref reader, options, PropSeqNo))
+			{
+				continue;
+			}
+
+			if (propSource.TryRead(ref reader, options, PropSource, typeof(SourceMarker<TDocument?>)))
+			{
+				continue;
+			}
+
+			if (propVersion.TryRead(ref reader, options, PropVersion))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetResult<TDocument>
+		{
+			Fields = propFields.Value
+,
+			Found = propFound.Value
+,
+			Id = propId.Value
+,
+			Ignored = propIgnored.Value
+,
+			Index = propIndex.Value
+,
+			PrimaryTerm = propPrimaryTerm.Value
+,
+			Routing = propRouting.Value
+,
+			SeqNo = propSeqNo.Value
+,
+			Source = propSource.Value
+,
+			Version = propVersion.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetResult<TDocument> value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropFound, value.Found);
+		writer.WriteProperty(options, PropId, value.Id);
+		writer.WriteProperty(options, PropIgnored, value.Ignored);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropPrimaryTerm, value.PrimaryTerm);
+		writer.WriteProperty(options, PropRouting, value.Routing);
+		writer.WriteProperty(options, PropSeqNo, value.SeqNo);
+		writer.WriteProperty(options, PropSource, value.Source, typeof(SourceMarker<TDocument?>));
+		writer.WriteProperty(options, PropVersion, value.Version);
+		writer.WriteEndObject();
+	}
+}
+
+internal sealed partial class GetResultConverterFactory : System.Text.Json.Serialization.JsonConverterFactory
+{
+	public override bool CanConvert(System.Type typeToConvert)
+	{
+		return typeToConvert.IsGenericType && typeToConvert.GetGenericTypeDefinition() == typeof(GetResult<>);
+	}
+
+	public override System.Text.Json.Serialization.JsonConverter CreateConverter(System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		var args = typeToConvert.GetGenericArguments();
+#pragma warning disable IL3050
+		var converter = (System.Text.Json.Serialization.JsonConverter)System.Activator.CreateInstance(typeof(GetResultConverter<>).MakeGenericType(args[0]), System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public, binder: null, args: null, culture: null)!;
+#pragma warning restore IL3050
+		return converter;
+	}
+}
+
+[JsonConverter(typeof(GetResultConverterFactory))]
 public sealed partial class GetResult<TDocument>
 {
-	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Serverless.FieldValues? Fields { get; init; }
-	[JsonInclude, JsonPropertyName("found")]
 	public bool Found { 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("_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.Serverless/_Generated/Types/Core/HealthReport/DiagnosisAffectedResources.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/HealthReport/DiagnosisAffectedResources.g.cs
index 89bfd2d4e2b..a0f872cff3f 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/HealthReport/DiagnosisAffectedResources.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/HealthReport/DiagnosisAffectedResources.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,17 +28,85 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Core.HealthReport;
 
+internal sealed partial class DiagnosisAffectedResourcesConverter : System.Text.Json.Serialization.JsonConverter<DiagnosisAffectedResources>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropFeatureStates = System.Text.Json.JsonEncodedText.Encode("feature_states");
+	private static readonly System.Text.Json.JsonEncodedText PropIndices = System.Text.Json.JsonEncodedText.Encode("indices");
+	private static readonly System.Text.Json.JsonEncodedText PropNodes = System.Text.Json.JsonEncodedText.Encode("nodes");
+	private static readonly System.Text.Json.JsonEncodedText PropSlmPolicies = System.Text.Json.JsonEncodedText.Encode("slm_policies");
+	private static readonly System.Text.Json.JsonEncodedText PropSnapshotRepositories = System.Text.Json.JsonEncodedText.Encode("snapshot_repositories");
+
+	public override DiagnosisAffectedResources Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<string>?> propFeatureStates = default;
+		LocalJsonProperty<IReadOnlyCollection<string>?> propIndices = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Core.HealthReport.IndicatorNode>?> propNodes = default;
+		LocalJsonProperty<IReadOnlyCollection<string>?> propSlmPolicies = default;
+		LocalJsonProperty<IReadOnlyCollection<string>?> propSnapshotRepositories = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propFeatureStates.TryRead(ref reader, options, PropFeatureStates))
+			{
+				continue;
+			}
+
+			if (propIndices.TryRead(ref reader, options, PropIndices, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propNodes.TryRead(ref reader, options, PropNodes))
+			{
+				continue;
+			}
+
+			if (propSlmPolicies.TryRead(ref reader, options, PropSlmPolicies))
+			{
+				continue;
+			}
+
+			if (propSnapshotRepositories.TryRead(ref reader, options, PropSnapshotRepositories))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DiagnosisAffectedResources
+		{
+			FeatureStates = propFeatureStates.Value
+,
+			Indices = propIndices.Value
+,
+			Nodes = propNodes.Value
+,
+			SlmPolicies = propSlmPolicies.Value
+,
+			SnapshotRepositories = propSnapshotRepositories.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DiagnosisAffectedResources value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropFeatureStates, value.FeatureStates);
+		writer.WriteProperty(options, PropIndices, value.Indices, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropNodes, value.Nodes);
+		writer.WriteProperty(options, PropSlmPolicies, value.SlmPolicies);
+		writer.WriteProperty(options, PropSnapshotRepositories, value.SnapshotRepositories);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DiagnosisAffectedResourcesConverter))]
 public sealed partial class DiagnosisAffectedResources
 {
-	[JsonInclude, JsonPropertyName("feature_states")]
 	public IReadOnlyCollection<string>? FeatureStates { get; init; }
-	[JsonInclude, JsonPropertyName("indices")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public IReadOnlyCollection<string>? Indices { get; init; }
-	[JsonInclude, JsonPropertyName("nodes")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Core.HealthReport.IndicatorNode>? Nodes { get; init; }
-	[JsonInclude, JsonPropertyName("slm_policies")]
 	public IReadOnlyCollection<string>? SlmPolicies { get; init; }
-	[JsonInclude, JsonPropertyName("snapshot_repositories")]
 	public IReadOnlyCollection<string>? SnapshotRepositories { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/MGet/MultiGetOperation.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/MGet/MultiGetOperation.g.cs
index 6621f1f9ef0..68dae62f8e7 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/MGet/MultiGetOperation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/MGet/MultiGetOperation.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,100 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Core.MGet;
 
+internal sealed partial class MultiGetOperationConverter : System.Text.Json.Serialization.JsonConverter<MultiGetOperation>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("_id");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("_index");
+	private static readonly System.Text.Json.JsonEncodedText PropRouting = System.Text.Json.JsonEncodedText.Encode("routing");
+	private static readonly System.Text.Json.JsonEncodedText PropSource = System.Text.Json.JsonEncodedText.Encode("_source");
+	private static readonly System.Text.Json.JsonEncodedText PropStoredFields = System.Text.Json.JsonEncodedText.Encode("stored_fields");
+	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("version");
+	private static readonly System.Text.Json.JsonEncodedText PropVersionType = System.Text.Json.JsonEncodedText.Encode("version_type");
+
+	public override MultiGetOperation Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Id> propId = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.IndexName?> propIndex = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Routing?> propRouting = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Core.Search.SourceConfig?> propSource = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Fields?> propStoredFields = default;
+		LocalJsonProperty<long?> propVersion = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.VersionType?> propVersionType = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propId.TryRead(ref reader, options, PropId))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propRouting.TryRead(ref reader, options, PropRouting))
+			{
+				continue;
+			}
+
+			if (propSource.TryRead(ref reader, options, PropSource))
+			{
+				continue;
+			}
+
+			if (propStoredFields.TryRead(ref reader, options, PropStoredFields, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propVersion.TryRead(ref reader, options, PropVersion))
+			{
+				continue;
+			}
+
+			if (propVersionType.TryRead(ref reader, options, PropVersionType))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new MultiGetOperation
+		{
+			Id = propId.Value
+,
+			Index = propIndex.Value
+,
+			Routing = propRouting.Value
+,
+			Source = propSource.Value
+,
+			StoredFields = propStoredFields.Value
+,
+			Version = propVersion.Value
+,
+			VersionType = propVersionType.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, MultiGetOperation value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropId, value.Id);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropRouting, value.Routing);
+		writer.WriteProperty(options, PropSource, value.Source);
+		writer.WriteProperty(options, PropStoredFields, value.StoredFields, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropVersion, value.Version);
+		writer.WriteProperty(options, PropVersionType, value.VersionType);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(MultiGetOperationConverter))]
 public sealed partial class MultiGetOperation
 {
 	/// <summary>
@@ -34,7 +129,6 @@ public sealed partial class MultiGetOperation
 	/// The unique document ID.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("_id")]
 	public Elastic.Clients.Elasticsearch.Serverless.Id Id { get; set; }
 
 	/// <summary>
@@ -42,7 +136,6 @@ public sealed partial class MultiGetOperation
 	/// The index that contains the document.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("_index")]
 	public Elastic.Clients.Elasticsearch.Serverless.IndexName? Index { get; set; }
 
 	/// <summary>
@@ -50,7 +143,6 @@ public sealed partial class MultiGetOperation
 	/// 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.Serverless.Routing? Routing { get; set; }
 
 	/// <summary>
@@ -58,7 +150,6 @@ public sealed partial class MultiGetOperation
 	/// If <c>false</c>, excludes all _source fields.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("_source")]
 	public Elastic.Clients.Elasticsearch.Serverless.Core.Search.SourceConfig? Source { get; set; }
 
 	/// <summary>
@@ -66,12 +157,8 @@ public sealed partial class MultiGetOperation
 	/// The stored fields you want to retrieve.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("stored_fields")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Serverless.Fields? StoredFields { get; set; }
-	[JsonInclude, JsonPropertyName("version")]
 	public long? Version { get; set; }
-	[JsonInclude, JsonPropertyName("version_type")]
 	public Elastic.Clients.Elasticsearch.Serverless.VersionType? VersionType { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/MSearch/MultisearchBody.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/MSearch/MultisearchBody.g.cs
index e3593c503c5..14c9b9c1b3a 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/MSearch/MultisearchBody.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/MSearch/MultisearchBody.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,399 +28,336 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Core.MSearch;
 
-internal sealed partial class MultisearchBodyConverter : JsonConverter<MultisearchBody>
+internal sealed partial class MultisearchBodyConverter : System.Text.Json.Serialization.JsonConverter<MultisearchBody>
 {
-	public override MultisearchBody Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		var variant = new MultisearchBody();
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
-		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations1 = System.Text.Json.JsonEncodedText.Encode("aggs");
+	private static readonly System.Text.Json.JsonEncodedText PropCollapse = System.Text.Json.JsonEncodedText.Encode("collapse");
+	private static readonly System.Text.Json.JsonEncodedText PropDocvalueFields = System.Text.Json.JsonEncodedText.Encode("docvalue_fields");
+	private static readonly System.Text.Json.JsonEncodedText PropExplain = System.Text.Json.JsonEncodedText.Encode("explain");
+	private static readonly System.Text.Json.JsonEncodedText PropExt = System.Text.Json.JsonEncodedText.Encode("ext");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropFrom = System.Text.Json.JsonEncodedText.Encode("from");
+	private static readonly System.Text.Json.JsonEncodedText PropHighlight = System.Text.Json.JsonEncodedText.Encode("highlight");
+	private static readonly System.Text.Json.JsonEncodedText PropIndicesBoost = System.Text.Json.JsonEncodedText.Encode("indices_boost");
+	private static readonly System.Text.Json.JsonEncodedText PropKnn = System.Text.Json.JsonEncodedText.Encode("knn");
+	private static readonly System.Text.Json.JsonEncodedText PropMinScore = System.Text.Json.JsonEncodedText.Encode("min_score");
+	private static readonly System.Text.Json.JsonEncodedText PropPit = System.Text.Json.JsonEncodedText.Encode("pit");
+	private static readonly System.Text.Json.JsonEncodedText PropPostFilter = System.Text.Json.JsonEncodedText.Encode("post_filter");
+	private static readonly System.Text.Json.JsonEncodedText PropProfile = System.Text.Json.JsonEncodedText.Encode("profile");
+	private static readonly System.Text.Json.JsonEncodedText PropQuery = System.Text.Json.JsonEncodedText.Encode("query");
+	private static readonly System.Text.Json.JsonEncodedText PropRescore = System.Text.Json.JsonEncodedText.Encode("rescore");
+	private static readonly System.Text.Json.JsonEncodedText PropRuntimeMappings = System.Text.Json.JsonEncodedText.Encode("runtime_mappings");
+	private static readonly System.Text.Json.JsonEncodedText PropScriptFields = System.Text.Json.JsonEncodedText.Encode("script_fields");
+	private static readonly System.Text.Json.JsonEncodedText PropSearchAfter = System.Text.Json.JsonEncodedText.Encode("search_after");
+	private static readonly System.Text.Json.JsonEncodedText PropSeqNoPrimaryTerm = System.Text.Json.JsonEncodedText.Encode("seq_no_primary_term");
+	private static readonly System.Text.Json.JsonEncodedText PropSize = System.Text.Json.JsonEncodedText.Encode("size");
+	private static readonly System.Text.Json.JsonEncodedText PropSort = System.Text.Json.JsonEncodedText.Encode("sort");
+	private static readonly System.Text.Json.JsonEncodedText PropSource = System.Text.Json.JsonEncodedText.Encode("_source");
+	private static readonly System.Text.Json.JsonEncodedText PropStats = System.Text.Json.JsonEncodedText.Encode("stats");
+	private static readonly System.Text.Json.JsonEncodedText PropStoredFields = System.Text.Json.JsonEncodedText.Encode("stored_fields");
+	private static readonly System.Text.Json.JsonEncodedText PropSuggest = System.Text.Json.JsonEncodedText.Encode("suggest");
+	private static readonly System.Text.Json.JsonEncodedText PropTerminateAfter = System.Text.Json.JsonEncodedText.Encode("terminate_after");
+	private static readonly System.Text.Json.JsonEncodedText PropTimeout = System.Text.Json.JsonEncodedText.Encode("timeout");
+	private static readonly System.Text.Json.JsonEncodedText PropTrackScores = System.Text.Json.JsonEncodedText.Encode("track_scores");
+	private static readonly System.Text.Json.JsonEncodedText PropTrackTotalHits = System.Text.Json.JsonEncodedText.Encode("track_total_hits");
+	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("version");
+
+	public override MultisearchBody Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.Aggregation>?> propAggregations = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Core.Search.FieldCollapse?> propCollapse = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.FieldAndFormat>?> propDocvalueFields = default;
+		LocalJsonProperty<bool?> propExplain = default;
+		LocalJsonProperty<IDictionary<string, object>?> propExt = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.FieldAndFormat>?> propFields = default;
+		LocalJsonProperty<int?> propFrom = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Core.Search.Highlight?> propHighlight = default;
+		LocalJsonProperty<ICollection<IDictionary<Elastic.Clients.Elasticsearch.Serverless.IndexName, double>>?> propIndicesBoost = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.KnnSearch>?> propKnn = default;
+		LocalJsonProperty<double?> propMinScore = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Core.Search.PointInTimeReference?> propPit = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query?> propPostFilter = default;
+		LocalJsonProperty<bool?> propProfile = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query?> propQuery = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.Core.Search.Rescore>?> propRescore = default;
+		LocalJsonProperty<IDictionary<Elastic.Clients.Elasticsearch.Serverless.Field, Elastic.Clients.Elasticsearch.Serverless.Mapping.RuntimeField>?> propRuntimeMappings = default;
+		LocalJsonProperty<IDictionary<string, Elastic.Clients.Elasticsearch.Serverless.ScriptField>?> propScriptFields = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.FieldValue>?> propSearchAfter = default;
+		LocalJsonProperty<bool?> propSeqNoPrimaryTerm = default;
+		LocalJsonProperty<int?> propSize = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.SortOptions>?> propSort = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Core.Search.SourceConfig?> propSource = default;
+		LocalJsonProperty<ICollection<string>?> propStats = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Fields?> propStoredFields = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Core.Search.Suggester?> propSuggest = default;
+		LocalJsonProperty<long?> propTerminateAfter = default;
+		LocalJsonProperty<string?> propTimeout = default;
+		LocalJsonProperty<bool?> propTrackScores = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Core.Search.TrackHits?> propTrackTotalHits = default;
+		LocalJsonProperty<bool?> propVersion = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAggregations.TryRead(ref reader, options, PropAggregations) || propAggregations.TryRead(ref reader, options, PropAggregations1))
 			{
-				var property = reader.GetString();
-				if (property == "aggregations" || property == "aggs")
-				{
-					variant.Aggregations = JsonSerializer.Deserialize<IDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.Aggregation>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "collapse")
-				{
-					variant.Collapse = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Core.Search.FieldCollapse?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "docvalue_fields")
-				{
-					variant.DocvalueFields = JsonSerializer.Deserialize<ICollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.FieldAndFormat>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "explain")
-				{
-					variant.Explain = JsonSerializer.Deserialize<bool?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "ext")
-				{
-					variant.Ext = JsonSerializer.Deserialize<IDictionary<string, object>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "fields")
-				{
-					variant.Fields = JsonSerializer.Deserialize<ICollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.FieldAndFormat>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "from")
-				{
-					variant.From = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "highlight")
-				{
-					variant.Highlight = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Core.Search.Highlight?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "indices_boost")
-				{
-					variant.IndicesBoost = JsonSerializer.Deserialize<ICollection<IDictionary<Elastic.Clients.Elasticsearch.Serverless.IndexName, double>>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "knn")
-				{
-					variant.Knn = SingleOrManySerializationHelper.Deserialize<Elastic.Clients.Elasticsearch.Serverless.KnnSearch>(ref reader, options);
-					continue;
-				}
-
-				if (property == "min_score")
-				{
-					variant.MinScore = JsonSerializer.Deserialize<double?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "pit")
-				{
-					variant.Pit = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Core.Search.PointInTimeReference?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "post_filter")
-				{
-					variant.PostFilter = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "profile")
-				{
-					variant.Profile = JsonSerializer.Deserialize<bool?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "query")
-				{
-					variant.Query = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "rescore")
-				{
-					variant.Rescore = SingleOrManySerializationHelper.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Core.Search.Rescore>(ref reader, options);
-					continue;
-				}
-
-				if (property == "runtime_mappings")
-				{
-					variant.RuntimeMappings = JsonSerializer.Deserialize<IDictionary<Elastic.Clients.Elasticsearch.Serverless.Field, Elastic.Clients.Elasticsearch.Serverless.Mapping.RuntimeField>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "script_fields")
-				{
-					variant.ScriptFields = JsonSerializer.Deserialize<IDictionary<string, Elastic.Clients.Elasticsearch.Serverless.ScriptField>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "search_after")
-				{
-					variant.SearchAfter = JsonSerializer.Deserialize<ICollection<Elastic.Clients.Elasticsearch.Serverless.FieldValue>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "seq_no_primary_term")
-				{
-					variant.SeqNoPrimaryTerm = JsonSerializer.Deserialize<bool?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "size")
-				{
-					variant.Size = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "sort")
-				{
-					variant.Sort = SingleOrManySerializationHelper.Deserialize<Elastic.Clients.Elasticsearch.Serverless.SortOptions>(ref reader, options);
-					continue;
-				}
-
-				if (property == "_source")
-				{
-					variant.Source = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Core.Search.SourceConfig?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "stats")
-				{
-					variant.Stats = JsonSerializer.Deserialize<ICollection<string>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "stored_fields")
-				{
-					reader.Read();
-					variant.StoredFields = new FieldsConverter().Read(ref reader, typeToConvert, options);
-					continue;
-				}
-
-				if (property == "suggest")
-				{
-					variant.Suggest = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Core.Search.Suggester?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "terminate_after")
-				{
-					variant.TerminateAfter = JsonSerializer.Deserialize<long?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "timeout")
-				{
-					variant.Timeout = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "track_scores")
-				{
-					variant.TrackScores = JsonSerializer.Deserialize<bool?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "track_total_hits")
-				{
-					variant.TrackTotalHits = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Core.Search.TrackHits?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "version")
-				{
-					variant.Version = JsonSerializer.Deserialize<bool?>(ref reader, options);
-					continue;
-				}
+				continue;
 			}
-		}
-
-		return variant;
-	}
-
-	public override void Write(Utf8JsonWriter writer, MultisearchBody value, JsonSerializerOptions options)
-	{
-		writer.WriteStartObject();
-		if (value.Aggregations is not null)
-		{
-			writer.WritePropertyName("aggregations");
-			JsonSerializer.Serialize(writer, value.Aggregations, options);
-		}
 
-		if (value.Collapse is not null)
-		{
-			writer.WritePropertyName("collapse");
-			JsonSerializer.Serialize(writer, value.Collapse, options);
-		}
+			if (propCollapse.TryRead(ref reader, options, PropCollapse))
+			{
+				continue;
+			}
 
-		if (value.DocvalueFields is not null)
-		{
-			writer.WritePropertyName("docvalue_fields");
-			JsonSerializer.Serialize(writer, value.DocvalueFields, options);
-		}
+			if (propDocvalueFields.TryRead(ref reader, options, PropDocvalueFields))
+			{
+				continue;
+			}
 
-		if (value.Explain.HasValue)
-		{
-			writer.WritePropertyName("explain");
-			writer.WriteBooleanValue(value.Explain.Value);
-		}
+			if (propExplain.TryRead(ref reader, options, PropExplain))
+			{
+				continue;
+			}
 
-		if (value.Ext is not null)
-		{
-			writer.WritePropertyName("ext");
-			JsonSerializer.Serialize(writer, value.Ext, options);
-		}
+			if (propExt.TryRead(ref reader, options, PropExt))
+			{
+				continue;
+			}
 
-		if (value.Fields is not null)
-		{
-			writer.WritePropertyName("fields");
-			JsonSerializer.Serialize(writer, value.Fields, options);
-		}
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
 
-		if (value.From.HasValue)
-		{
-			writer.WritePropertyName("from");
-			writer.WriteNumberValue(value.From.Value);
-		}
+			if (propFrom.TryRead(ref reader, options, PropFrom))
+			{
+				continue;
+			}
 
-		if (value.Highlight is not null)
-		{
-			writer.WritePropertyName("highlight");
-			JsonSerializer.Serialize(writer, value.Highlight, options);
-		}
+			if (propHighlight.TryRead(ref reader, options, PropHighlight))
+			{
+				continue;
+			}
 
-		if (value.IndicesBoost is not null)
-		{
-			writer.WritePropertyName("indices_boost");
-			JsonSerializer.Serialize(writer, value.IndicesBoost, options);
-		}
+			if (propIndicesBoost.TryRead(ref reader, options, PropIndicesBoost))
+			{
+				continue;
+			}
 
-		if (value.Knn is not null)
-		{
-			writer.WritePropertyName("knn");
-			JsonSerializer.Serialize(writer, value.Knn, options);
-		}
+			if (propKnn.TryRead(ref reader, options, PropKnn, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.KnnSearch>?, Elastic.Clients.Elasticsearch.Serverless.KnnSearch>)))
+			{
+				continue;
+			}
 
-		if (value.MinScore.HasValue)
-		{
-			writer.WritePropertyName("min_score");
-			writer.WriteNumberValue(value.MinScore.Value);
-		}
+			if (propMinScore.TryRead(ref reader, options, PropMinScore))
+			{
+				continue;
+			}
 
-		if (value.Pit is not null)
-		{
-			writer.WritePropertyName("pit");
-			JsonSerializer.Serialize(writer, value.Pit, options);
-		}
+			if (propPit.TryRead(ref reader, options, PropPit))
+			{
+				continue;
+			}
 
-		if (value.PostFilter is not null)
-		{
-			writer.WritePropertyName("post_filter");
-			JsonSerializer.Serialize(writer, value.PostFilter, options);
-		}
+			if (propPostFilter.TryRead(ref reader, options, PropPostFilter))
+			{
+				continue;
+			}
 
-		if (value.Profile.HasValue)
-		{
-			writer.WritePropertyName("profile");
-			writer.WriteBooleanValue(value.Profile.Value);
-		}
+			if (propProfile.TryRead(ref reader, options, PropProfile))
+			{
+				continue;
+			}
 
-		if (value.Query is not null)
-		{
-			writer.WritePropertyName("query");
-			JsonSerializer.Serialize(writer, value.Query, options);
-		}
+			if (propQuery.TryRead(ref reader, options, PropQuery))
+			{
+				continue;
+			}
 
-		if (value.Rescore is not null)
-		{
-			writer.WritePropertyName("rescore");
-			JsonSerializer.Serialize(writer, value.Rescore, options);
-		}
+			if (propRescore.TryRead(ref reader, options, PropRescore, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Core.Search.Rescore>?, Elastic.Clients.Elasticsearch.Serverless.Core.Search.Rescore>)))
+			{
+				continue;
+			}
 
-		if (value.RuntimeMappings is not null)
-		{
-			writer.WritePropertyName("runtime_mappings");
-			JsonSerializer.Serialize(writer, value.RuntimeMappings, options);
-		}
+			if (propRuntimeMappings.TryRead(ref reader, options, PropRuntimeMappings))
+			{
+				continue;
+			}
 
-		if (value.ScriptFields is not null)
-		{
-			writer.WritePropertyName("script_fields");
-			JsonSerializer.Serialize(writer, value.ScriptFields, options);
-		}
+			if (propScriptFields.TryRead(ref reader, options, PropScriptFields))
+			{
+				continue;
+			}
 
-		if (value.SearchAfter is not null)
-		{
-			writer.WritePropertyName("search_after");
-			JsonSerializer.Serialize(writer, value.SearchAfter, options);
-		}
+			if (propSearchAfter.TryRead(ref reader, options, PropSearchAfter))
+			{
+				continue;
+			}
 
-		if (value.SeqNoPrimaryTerm.HasValue)
-		{
-			writer.WritePropertyName("seq_no_primary_term");
-			writer.WriteBooleanValue(value.SeqNoPrimaryTerm.Value);
-		}
+			if (propSeqNoPrimaryTerm.TryRead(ref reader, options, PropSeqNoPrimaryTerm))
+			{
+				continue;
+			}
 
-		if (value.Size.HasValue)
-		{
-			writer.WritePropertyName("size");
-			writer.WriteNumberValue(value.Size.Value);
-		}
+			if (propSize.TryRead(ref reader, options, PropSize))
+			{
+				continue;
+			}
 
-		if (value.Sort is not null)
-		{
-			writer.WritePropertyName("sort");
-			JsonSerializer.Serialize(writer, value.Sort, options);
-		}
+			if (propSort.TryRead(ref reader, options, PropSort, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.SortOptions>?, Elastic.Clients.Elasticsearch.Serverless.SortOptions>)))
+			{
+				continue;
+			}
 
-		if (value.Source is not null)
-		{
-			writer.WritePropertyName("_source");
-			JsonSerializer.Serialize(writer, value.Source, options);
-		}
+			if (propSource.TryRead(ref reader, options, PropSource))
+			{
+				continue;
+			}
 
-		if (value.Stats is not null)
-		{
-			writer.WritePropertyName("stats");
-			JsonSerializer.Serialize(writer, value.Stats, options);
-		}
+			if (propStats.TryRead(ref reader, options, PropStats))
+			{
+				continue;
+			}
 
-		if (value.StoredFields is not null)
-		{
-			writer.WritePropertyName("stored_fields");
-			new FieldsConverter().Write(writer, value.StoredFields, options);
-		}
+			if (propStoredFields.TryRead(ref reader, options, PropStoredFields, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
 
-		if (value.Suggest is not null)
-		{
-			writer.WritePropertyName("suggest");
-			JsonSerializer.Serialize(writer, value.Suggest, options);
-		}
+			if (propSuggest.TryRead(ref reader, options, PropSuggest))
+			{
+				continue;
+			}
 
-		if (value.TerminateAfter.HasValue)
-		{
-			writer.WritePropertyName("terminate_after");
-			writer.WriteNumberValue(value.TerminateAfter.Value);
-		}
+			if (propTerminateAfter.TryRead(ref reader, options, PropTerminateAfter))
+			{
+				continue;
+			}
 
-		if (!string.IsNullOrEmpty(value.Timeout))
-		{
-			writer.WritePropertyName("timeout");
-			writer.WriteStringValue(value.Timeout);
-		}
+			if (propTimeout.TryRead(ref reader, options, PropTimeout))
+			{
+				continue;
+			}
 
-		if (value.TrackScores.HasValue)
-		{
-			writer.WritePropertyName("track_scores");
-			writer.WriteBooleanValue(value.TrackScores.Value);
-		}
+			if (propTrackScores.TryRead(ref reader, options, PropTrackScores))
+			{
+				continue;
+			}
 
-		if (value.TrackTotalHits is not null)
-		{
-			writer.WritePropertyName("track_total_hits");
-			JsonSerializer.Serialize(writer, value.TrackTotalHits, options);
-		}
+			if (propTrackTotalHits.TryRead(ref reader, options, PropTrackTotalHits))
+			{
+				continue;
+			}
 
-		if (value.Version.HasValue)
-		{
-			writer.WritePropertyName("version");
-			writer.WriteBooleanValue(value.Version.Value);
-		}
+			if (propVersion.TryRead(ref reader, options, PropVersion))
+			{
+				continue;
+			}
 
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new MultisearchBody
+		{
+			Aggregations = propAggregations.Value
+,
+			Collapse = propCollapse.Value
+,
+			DocvalueFields = propDocvalueFields.Value
+,
+			Explain = propExplain.Value
+,
+			Ext = propExt.Value
+,
+			Fields = propFields.Value
+,
+			From = propFrom.Value
+,
+			Highlight = propHighlight.Value
+,
+			IndicesBoost = propIndicesBoost.Value
+,
+			Knn = propKnn.Value
+,
+			MinScore = propMinScore.Value
+,
+			Pit = propPit.Value
+,
+			PostFilter = propPostFilter.Value
+,
+			Profile = propProfile.Value
+,
+			Query = propQuery.Value
+,
+			Rescore = propRescore.Value
+,
+			RuntimeMappings = propRuntimeMappings.Value
+,
+			ScriptFields = propScriptFields.Value
+,
+			SearchAfter = propSearchAfter.Value
+,
+			SeqNoPrimaryTerm = propSeqNoPrimaryTerm.Value
+,
+			Size = propSize.Value
+,
+			Sort = propSort.Value
+,
+			Source = propSource.Value
+,
+			Stats = propStats.Value
+,
+			StoredFields = propStoredFields.Value
+,
+			Suggest = propSuggest.Value
+,
+			TerminateAfter = propTerminateAfter.Value
+,
+			Timeout = propTimeout.Value
+,
+			TrackScores = propTrackScores.Value
+,
+			TrackTotalHits = propTrackTotalHits.Value
+,
+			Version = propVersion.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, MultisearchBody value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAggregations, value.Aggregations);
+		writer.WriteProperty(options, PropCollapse, value.Collapse);
+		writer.WriteProperty(options, PropDocvalueFields, value.DocvalueFields);
+		writer.WriteProperty(options, PropExplain, value.Explain);
+		writer.WriteProperty(options, PropExt, value.Ext);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropFrom, value.From);
+		writer.WriteProperty(options, PropHighlight, value.Highlight);
+		writer.WriteProperty(options, PropIndicesBoost, value.IndicesBoost);
+		writer.WriteProperty(options, PropKnn, value.Knn, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.KnnSearch>?, Elastic.Clients.Elasticsearch.Serverless.KnnSearch>));
+		writer.WriteProperty(options, PropMinScore, value.MinScore);
+		writer.WriteProperty(options, PropPit, value.Pit);
+		writer.WriteProperty(options, PropPostFilter, value.PostFilter);
+		writer.WriteProperty(options, PropProfile, value.Profile);
+		writer.WriteProperty(options, PropQuery, value.Query);
+		writer.WriteProperty(options, PropRescore, value.Rescore, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Core.Search.Rescore>?, Elastic.Clients.Elasticsearch.Serverless.Core.Search.Rescore>));
+		writer.WriteProperty(options, PropRuntimeMappings, value.RuntimeMappings);
+		writer.WriteProperty(options, PropScriptFields, value.ScriptFields);
+		writer.WriteProperty(options, PropSearchAfter, value.SearchAfter);
+		writer.WriteProperty(options, PropSeqNoPrimaryTerm, value.SeqNoPrimaryTerm);
+		writer.WriteProperty(options, PropSize, value.Size);
+		writer.WriteProperty(options, PropSort, value.Sort, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.SortOptions>?, Elastic.Clients.Elasticsearch.Serverless.SortOptions>));
+		writer.WriteProperty(options, PropSource, value.Source);
+		writer.WriteProperty(options, PropStats, value.Stats);
+		writer.WriteProperty(options, PropStoredFields, value.StoredFields, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropSuggest, value.Suggest);
+		writer.WriteProperty(options, PropTerminateAfter, value.TerminateAfter);
+		writer.WriteProperty(options, PropTimeout, value.Timeout);
+		writer.WriteProperty(options, PropTrackScores, value.TrackScores);
+		writer.WriteProperty(options, PropTrackTotalHits, value.TrackTotalHits);
+		writer.WriteProperty(options, PropVersion, value.Version);
 		writer.WriteEndObject();
 	}
 }
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/MSearch/MultisearchHeader.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/MSearch/MultisearchHeader.g.cs
index dbff568ba1b..00fb71d5ac7 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/MSearch/MultisearchHeader.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/MSearch/MultisearchHeader.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,35 +28,157 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Core.MSearch;
 
+internal sealed partial class MultisearchHeaderConverter : System.Text.Json.Serialization.JsonConverter<MultisearchHeader>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAllowNoIndices = System.Text.Json.JsonEncodedText.Encode("allow_no_indices");
+	private static readonly System.Text.Json.JsonEncodedText PropAllowPartialSearchResults = System.Text.Json.JsonEncodedText.Encode("allow_partial_search_results");
+	private static readonly System.Text.Json.JsonEncodedText PropCcsMinimizeRoundtrips = System.Text.Json.JsonEncodedText.Encode("ccs_minimize_roundtrips");
+	private static readonly System.Text.Json.JsonEncodedText PropExpandWildcards = System.Text.Json.JsonEncodedText.Encode("expand_wildcards");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreThrottled = System.Text.Json.JsonEncodedText.Encode("ignore_throttled");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreUnavailable = System.Text.Json.JsonEncodedText.Encode("ignore_unavailable");
+	private static readonly System.Text.Json.JsonEncodedText PropIndices = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropPreference = System.Text.Json.JsonEncodedText.Encode("preference");
+	private static readonly System.Text.Json.JsonEncodedText PropRequestCache = System.Text.Json.JsonEncodedText.Encode("request_cache");
+	private static readonly System.Text.Json.JsonEncodedText PropRouting = System.Text.Json.JsonEncodedText.Encode("routing");
+	private static readonly System.Text.Json.JsonEncodedText PropSearchType = System.Text.Json.JsonEncodedText.Encode("search_type");
+
+	public override MultisearchHeader Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool?> propAllowNoIndices = default;
+		LocalJsonProperty<bool?> propAllowPartialSearchResults = default;
+		LocalJsonProperty<bool?> propCcsMinimizeRoundtrips = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.ExpandWildcard>?> propExpandWildcards = default;
+		LocalJsonProperty<bool?> propIgnoreThrottled = default;
+		LocalJsonProperty<bool?> propIgnoreUnavailable = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Indices?> propIndices = default;
+		LocalJsonProperty<string?> propPreference = default;
+		LocalJsonProperty<bool?> propRequestCache = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Routing?> propRouting = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.SearchType?> propSearchType = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAllowNoIndices.TryRead(ref reader, options, PropAllowNoIndices))
+			{
+				continue;
+			}
+
+			if (propAllowPartialSearchResults.TryRead(ref reader, options, PropAllowPartialSearchResults))
+			{
+				continue;
+			}
+
+			if (propCcsMinimizeRoundtrips.TryRead(ref reader, options, PropCcsMinimizeRoundtrips))
+			{
+				continue;
+			}
+
+			if (propExpandWildcards.TryRead(ref reader, options, PropExpandWildcards, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.ExpandWildcard>?, Elastic.Clients.Elasticsearch.Serverless.ExpandWildcard>)))
+			{
+				continue;
+			}
+
+			if (propIgnoreThrottled.TryRead(ref reader, options, PropIgnoreThrottled))
+			{
+				continue;
+			}
+
+			if (propIgnoreUnavailable.TryRead(ref reader, options, PropIgnoreUnavailable))
+			{
+				continue;
+			}
+
+			if (propIndices.TryRead(ref reader, options, PropIndices))
+			{
+				continue;
+			}
+
+			if (propPreference.TryRead(ref reader, options, PropPreference))
+			{
+				continue;
+			}
+
+			if (propRequestCache.TryRead(ref reader, options, PropRequestCache))
+			{
+				continue;
+			}
+
+			if (propRouting.TryRead(ref reader, options, PropRouting))
+			{
+				continue;
+			}
+
+			if (propSearchType.TryRead(ref reader, options, PropSearchType))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new MultisearchHeader
+		{
+			AllowNoIndices = propAllowNoIndices.Value
+,
+			AllowPartialSearchResults = propAllowPartialSearchResults.Value
+,
+			CcsMinimizeRoundtrips = propCcsMinimizeRoundtrips.Value
+,
+			ExpandWildcards = propExpandWildcards.Value
+,
+			IgnoreThrottled = propIgnoreThrottled.Value
+,
+			IgnoreUnavailable = propIgnoreUnavailable.Value
+,
+			Indices = propIndices.Value
+,
+			Preference = propPreference.Value
+,
+			RequestCache = propRequestCache.Value
+,
+			Routing = propRouting.Value
+,
+			SearchType = propSearchType.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, MultisearchHeader value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAllowNoIndices, value.AllowNoIndices);
+		writer.WriteProperty(options, PropAllowPartialSearchResults, value.AllowPartialSearchResults);
+		writer.WriteProperty(options, PropCcsMinimizeRoundtrips, value.CcsMinimizeRoundtrips);
+		writer.WriteProperty(options, PropExpandWildcards, value.ExpandWildcards, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.ExpandWildcard>?, Elastic.Clients.Elasticsearch.Serverless.ExpandWildcard>));
+		writer.WriteProperty(options, PropIgnoreThrottled, value.IgnoreThrottled);
+		writer.WriteProperty(options, PropIgnoreUnavailable, value.IgnoreUnavailable);
+		writer.WriteProperty(options, PropIndices, value.Indices);
+		writer.WriteProperty(options, PropPreference, value.Preference);
+		writer.WriteProperty(options, PropRequestCache, value.RequestCache);
+		writer.WriteProperty(options, PropRouting, value.Routing);
+		writer.WriteProperty(options, PropSearchType, value.SearchType);
+		writer.WriteEndObject();
+	}
+}
+
 /// <summary>
 /// <para>
 /// Contains parameters used to limit or change the subsequent search body request.
 /// </para>
 /// </summary>
+[JsonConverter(typeof(MultisearchHeaderConverter))]
 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")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.Serverless.ExpandWildcard))]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.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.Serverless.Indices? Indices { 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.Serverless.Routing? Routing { get; set; }
-	[JsonInclude, JsonPropertyName("search_type")]
 	public Elastic.Clients.Elasticsearch.Serverless.SearchType? SearchType { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Mtermvectors/MultiTermVectorsOperation.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Mtermvectors/MultiTermVectorsOperation.g.cs
index 1a3667265ba..e241ee14622 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Mtermvectors/MultiTermVectorsOperation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Mtermvectors/MultiTermVectorsOperation.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,160 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Core.Mtermvectors;
 
+internal sealed partial class MultiTermVectorsOperationConverter : System.Text.Json.Serialization.JsonConverter<MultiTermVectorsOperation>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropDoc = System.Text.Json.JsonEncodedText.Encode("doc");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropFieldStatistics = System.Text.Json.JsonEncodedText.Encode("field_statistics");
+	private static readonly System.Text.Json.JsonEncodedText PropFilter = System.Text.Json.JsonEncodedText.Encode("filter");
+	private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("_id");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("_index");
+	private static readonly System.Text.Json.JsonEncodedText PropOffsets = System.Text.Json.JsonEncodedText.Encode("offsets");
+	private static readonly System.Text.Json.JsonEncodedText PropPayloads = System.Text.Json.JsonEncodedText.Encode("payloads");
+	private static readonly System.Text.Json.JsonEncodedText PropPositions = System.Text.Json.JsonEncodedText.Encode("positions");
+	private static readonly System.Text.Json.JsonEncodedText PropRouting = System.Text.Json.JsonEncodedText.Encode("routing");
+	private static readonly System.Text.Json.JsonEncodedText PropTermStatistics = System.Text.Json.JsonEncodedText.Encode("term_statistics");
+	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("version");
+	private static readonly System.Text.Json.JsonEncodedText PropVersionType = System.Text.Json.JsonEncodedText.Encode("version_type");
+
+	public override MultiTermVectorsOperation Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<object?> propDoc = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Fields?> propFields = default;
+		LocalJsonProperty<bool?> propFieldStatistics = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Core.TermVectors.Filter?> propFilter = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Id?> propId = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.IndexName?> propIndex = default;
+		LocalJsonProperty<bool?> propOffsets = default;
+		LocalJsonProperty<bool?> propPayloads = default;
+		LocalJsonProperty<bool?> propPositions = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Routing?> propRouting = default;
+		LocalJsonProperty<bool?> propTermStatistics = default;
+		LocalJsonProperty<long?> propVersion = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.VersionType?> propVersionType = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propDoc.TryRead(ref reader, options, PropDoc))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propFieldStatistics.TryRead(ref reader, options, PropFieldStatistics))
+			{
+				continue;
+			}
+
+			if (propFilter.TryRead(ref reader, options, PropFilter))
+			{
+				continue;
+			}
+
+			if (propId.TryRead(ref reader, options, PropId))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propOffsets.TryRead(ref reader, options, PropOffsets))
+			{
+				continue;
+			}
+
+			if (propPayloads.TryRead(ref reader, options, PropPayloads))
+			{
+				continue;
+			}
+
+			if (propPositions.TryRead(ref reader, options, PropPositions))
+			{
+				continue;
+			}
+
+			if (propRouting.TryRead(ref reader, options, PropRouting))
+			{
+				continue;
+			}
+
+			if (propTermStatistics.TryRead(ref reader, options, PropTermStatistics))
+			{
+				continue;
+			}
+
+			if (propVersion.TryRead(ref reader, options, PropVersion))
+			{
+				continue;
+			}
+
+			if (propVersionType.TryRead(ref reader, options, PropVersionType))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new MultiTermVectorsOperation
+		{
+			Doc = propDoc.Value
+,
+			Fields = propFields.Value
+,
+			FieldStatistics = propFieldStatistics.Value
+,
+			Filter = propFilter.Value
+,
+			Id = propId.Value
+,
+			Index = propIndex.Value
+,
+			Offsets = propOffsets.Value
+,
+			Payloads = propPayloads.Value
+,
+			Positions = propPositions.Value
+,
+			Routing = propRouting.Value
+,
+			TermStatistics = propTermStatistics.Value
+,
+			Version = propVersion.Value
+,
+			VersionType = propVersionType.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, MultiTermVectorsOperation value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDoc, value.Doc);
+		writer.WriteProperty(options, PropFields, value.Fields, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropFieldStatistics, value.FieldStatistics);
+		writer.WriteProperty(options, PropFilter, value.Filter);
+		writer.WriteProperty(options, PropId, value.Id);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropOffsets, value.Offsets);
+		writer.WriteProperty(options, PropPayloads, value.Payloads);
+		writer.WriteProperty(options, PropPositions, value.Positions);
+		writer.WriteProperty(options, PropRouting, value.Routing);
+		writer.WriteProperty(options, PropTermStatistics, value.TermStatistics);
+		writer.WriteProperty(options, PropVersion, value.Version);
+		writer.WriteProperty(options, PropVersionType, value.VersionType);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(MultiTermVectorsOperationConverter))]
 public sealed partial class MultiTermVectorsOperation
 {
 	/// <summary>
@@ -34,7 +189,6 @@ public sealed partial class MultiTermVectorsOperation
 	/// An artificial document (a document not present in the index) for which you want to retrieve term vectors.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("doc")]
 	public object? Doc { get; set; }
 
 	/// <summary>
@@ -43,8 +197,6 @@ public sealed partial class MultiTermVectorsOperation
 	/// Used as the default list unless a specific field list is provided in the <c>completion_fields</c> or <c>fielddata_fields</c> parameters.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("fields")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Serverless.Fields? Fields { get; set; }
 
 	/// <summary>
@@ -52,7 +204,6 @@ public sealed partial class MultiTermVectorsOperation
 	/// If <c>true</c>, the response includes the document count, sum of document frequencies, and sum of total term frequencies.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("field_statistics")]
 	public bool? FieldStatistics { get; set; }
 
 	/// <summary>
@@ -60,7 +211,6 @@ public sealed partial class MultiTermVectorsOperation
 	/// Filter terms based on their tf-idf scores.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("filter")]
 	public Elastic.Clients.Elasticsearch.Serverless.Core.TermVectors.Filter? Filter { get; set; }
 
 	/// <summary>
@@ -68,7 +218,6 @@ public sealed partial class MultiTermVectorsOperation
 	/// The ID of the document.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("_id")]
 	public Elastic.Clients.Elasticsearch.Serverless.Id? Id { get; set; }
 
 	/// <summary>
@@ -76,7 +225,6 @@ public sealed partial class MultiTermVectorsOperation
 	/// The index of the document.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("_index")]
 	public Elastic.Clients.Elasticsearch.Serverless.IndexName? Index { get; set; }
 
 	/// <summary>
@@ -84,7 +232,6 @@ public sealed partial class MultiTermVectorsOperation
 	/// If <c>true</c>, the response includes term offsets.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("offsets")]
 	public bool? Offsets { get; set; }
 
 	/// <summary>
@@ -92,7 +239,6 @@ public sealed partial class MultiTermVectorsOperation
 	/// If <c>true</c>, the response includes term payloads.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("payloads")]
 	public bool? Payloads { get; set; }
 
 	/// <summary>
@@ -100,7 +246,6 @@ public sealed partial class MultiTermVectorsOperation
 	/// If <c>true</c>, the response includes term positions.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("positions")]
 	public bool? Positions { get; set; }
 
 	/// <summary>
@@ -108,7 +253,6 @@ public sealed partial class MultiTermVectorsOperation
 	/// Custom value used to route operations to a specific shard.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("routing")]
 	public Elastic.Clients.Elasticsearch.Serverless.Routing? Routing { get; set; }
 
 	/// <summary>
@@ -116,7 +260,6 @@ public sealed partial class MultiTermVectorsOperation
 	/// If true, the response includes term frequency and document frequency.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("term_statistics")]
 	public bool? TermStatistics { get; set; }
 
 	/// <summary>
@@ -124,7 +267,6 @@ public sealed partial class MultiTermVectorsOperation
 	/// If <c>true</c>, returns the document version as part of a hit.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("version")]
 	public long? Version { get; set; }
 
 	/// <summary>
@@ -132,7 +274,6 @@ public sealed partial class MultiTermVectorsOperation
 	/// Specific version type.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("version_type")]
 	public Elastic.Clients.Elasticsearch.Serverless.VersionType? VersionType { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Mtermvectors/MultiTermVectorsResult.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Mtermvectors/MultiTermVectorsResult.g.cs
index 4f06a813c46..9a1ef2e9bb9 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Mtermvectors/MultiTermVectorsResult.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Mtermvectors/MultiTermVectorsResult.g.cs
@@ -38,7 +38,6 @@ public sealed partial class MultiTermVectorsResult
 	[JsonInclude, JsonPropertyName("_index")]
 	public string Index { get; init; }
 	[JsonInclude, JsonPropertyName("term_vectors")]
-	[ReadOnlyFieldDictionaryConverter(typeof(Elastic.Clients.Elasticsearch.Serverless.Core.TermVectors.TermVector))]
 	public IReadOnlyDictionary<Elastic.Clients.Elasticsearch.Serverless.Field, Elastic.Clients.Elasticsearch.Serverless.Core.TermVectors.TermVector>? TermVectors { get; init; }
 	[JsonInclude, JsonPropertyName("took")]
 	public long? Took { get; init; }
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/RankEval/RankEvalQuery.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/RankEval/RankEvalQuery.g.cs
index d3a94bc1579..61885487b62 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/RankEval/RankEvalQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/RankEval/RankEvalQuery.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,11 +28,63 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Core.RankEval;
 
+internal sealed partial class RankEvalQueryConverter : System.Text.Json.Serialization.JsonConverter<RankEvalQuery>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropQuery = System.Text.Json.JsonEncodedText.Encode("query");
+	private static readonly System.Text.Json.JsonEncodedText PropSize = System.Text.Json.JsonEncodedText.Encode("size");
+
+	public override RankEvalQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		var readerSnapshot = reader;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query> propQuery = default;
+		LocalJsonProperty<int?> propSize = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propQuery.TryRead(ref reader, options, PropQuery))
+			{
+				continue;
+			}
+
+			if (propSize.TryRead(ref reader, options, PropSize))
+			{
+				continue;
+			}
+
+			try
+			{
+				reader = readerSnapshot;
+				var result = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query>(options);
+				return new RankEvalQuery { Query = result };
+			}
+			catch (System.Text.Json.JsonException)
+			{
+				throw;
+			}
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new RankEvalQuery
+		{
+			Query = propQuery.Value
+,
+			Size = propSize.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, RankEvalQuery value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropQuery, value.Query);
+		writer.WriteProperty(options, PropSize, value.Size);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(RankEvalQueryConverter))]
 public sealed partial class RankEvalQuery
 {
-	[JsonInclude, JsonPropertyName("query")]
 	public Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query Query { get; set; }
-	[JsonInclude, JsonPropertyName("size")]
 	public int? Size { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Reindex/Source.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Reindex/Source.g.cs
index 7da14332827..bbac23f2f38 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Reindex/Source.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Reindex/Source.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,110 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Core.Reindex;
 
+internal sealed partial class SourceConverter : System.Text.Json.Serialization.JsonConverter<Source>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropIndices = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropQuery = System.Text.Json.JsonEncodedText.Encode("query");
+	private static readonly System.Text.Json.JsonEncodedText PropRemote = System.Text.Json.JsonEncodedText.Encode("remote");
+	private static readonly System.Text.Json.JsonEncodedText PropRuntimeMappings = System.Text.Json.JsonEncodedText.Encode("runtime_mappings");
+	private static readonly System.Text.Json.JsonEncodedText PropSize = System.Text.Json.JsonEncodedText.Encode("size");
+	private static readonly System.Text.Json.JsonEncodedText PropSlice = System.Text.Json.JsonEncodedText.Encode("slice");
+	private static readonly System.Text.Json.JsonEncodedText PropSort = System.Text.Json.JsonEncodedText.Encode("sort");
+	private static readonly System.Text.Json.JsonEncodedText PropSourceFields = System.Text.Json.JsonEncodedText.Encode("_source");
+
+	public override Source Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Indices> propIndices = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query?> propQuery = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Core.Reindex.RemoteSource?> propRemote = default;
+		LocalJsonProperty<IDictionary<Elastic.Clients.Elasticsearch.Serverless.Field, Elastic.Clients.Elasticsearch.Serverless.Mapping.RuntimeField>?> propRuntimeMappings = default;
+		LocalJsonProperty<int?> propSize = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.SlicedScroll?> propSlice = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.SortOptions>?> propSort = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Fields?> propSourceFields = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propIndices.TryRead(ref reader, options, PropIndices))
+			{
+				continue;
+			}
+
+			if (propQuery.TryRead(ref reader, options, PropQuery))
+			{
+				continue;
+			}
+
+			if (propRemote.TryRead(ref reader, options, PropRemote))
+			{
+				continue;
+			}
+
+			if (propRuntimeMappings.TryRead(ref reader, options, PropRuntimeMappings))
+			{
+				continue;
+			}
+
+			if (propSize.TryRead(ref reader, options, PropSize))
+			{
+				continue;
+			}
+
+			if (propSlice.TryRead(ref reader, options, PropSlice))
+			{
+				continue;
+			}
+
+			if (propSort.TryRead(ref reader, options, PropSort, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.SortOptions>?, Elastic.Clients.Elasticsearch.Serverless.SortOptions>)))
+			{
+				continue;
+			}
+
+			if (propSourceFields.TryRead(ref reader, options, PropSourceFields, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new Source
+		{
+			Indices = propIndices.Value
+,
+			Query = propQuery.Value
+,
+			Remote = propRemote.Value
+,
+			RuntimeMappings = propRuntimeMappings.Value
+,
+			Size = propSize.Value
+,
+			Slice = propSlice.Value
+,
+			Sort = propSort.Value
+,
+			SourceFields = propSourceFields.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, Source value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropIndices, value.Indices);
+		writer.WriteProperty(options, PropQuery, value.Query);
+		writer.WriteProperty(options, PropRemote, value.Remote);
+		writer.WriteProperty(options, PropRuntimeMappings, value.RuntimeMappings);
+		writer.WriteProperty(options, PropSize, value.Size);
+		writer.WriteProperty(options, PropSlice, value.Slice);
+		writer.WriteProperty(options, PropSort, value.Sort, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.SortOptions>?, Elastic.Clients.Elasticsearch.Serverless.SortOptions>));
+		writer.WriteProperty(options, PropSourceFields, value.SourceFields, typeof(SingleOrManyFieldsMarker));
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(SourceConverter))]
 public sealed partial class Source
 {
 	/// <summary>
@@ -35,7 +140,6 @@ public sealed partial class Source
 	/// Accepts a comma-separated list to reindex from multiple sources.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("index")]
 	public Elastic.Clients.Elasticsearch.Serverless.Indices Indices { get; set; }
 
 	/// <summary>
@@ -43,7 +147,6 @@ public sealed partial class Source
 	/// Specifies the documents to reindex using the Query DSL.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("query")]
 	public Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query? Query { get; set; }
 
 	/// <summary>
@@ -51,9 +154,7 @@ public sealed partial class Source
 	/// A remote instance of Elasticsearch that you want to index from.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("remote")]
 	public Elastic.Clients.Elasticsearch.Serverless.Core.Reindex.RemoteSource? Remote { get; set; }
-	[JsonInclude, JsonPropertyName("runtime_mappings")]
 	public IDictionary<Elastic.Clients.Elasticsearch.Serverless.Field, Elastic.Clients.Elasticsearch.Serverless.Mapping.RuntimeField>? RuntimeMappings { get; set; }
 
 	/// <summary>
@@ -62,7 +163,6 @@ public sealed partial class Source
 	/// Use when indexing from remote to ensure that the batches fit within the on-heap buffer, which defaults to a maximum size of 100 MB.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("size")]
 	public int? Size { get; set; }
 
 	/// <summary>
@@ -70,10 +170,7 @@ public sealed partial class Source
 	/// Slice the reindex request manually using the provided slice ID and total number of slices.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("slice")]
 	public Elastic.Clients.Elasticsearch.Serverless.SlicedScroll? Slice { get; set; }
-	[JsonInclude, JsonPropertyName("sort")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.Serverless.SortOptions))]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.SortOptions>? Sort { get; set; }
 
 	/// <summary>
@@ -82,8 +179,6 @@ public sealed partial class Source
 	/// Set to a list to reindex select fields.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("_source")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Serverless.Fields? SourceFields { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Search/CompletionContext.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Search/CompletionContext.g.cs
index 735e528d441..557a06cd333 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Search/CompletionContext.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Search/CompletionContext.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,90 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Core.Search;
 
+internal sealed partial class CompletionContextConverter : System.Text.Json.Serialization.JsonConverter<CompletionContext>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropContext = System.Text.Json.JsonEncodedText.Encode("context");
+	private static readonly System.Text.Json.JsonEncodedText PropNeighbours = System.Text.Json.JsonEncodedText.Encode("neighbours");
+	private static readonly System.Text.Json.JsonEncodedText PropPrecision = System.Text.Json.JsonEncodedText.Encode("precision");
+	private static readonly System.Text.Json.JsonEncodedText PropPrefix = System.Text.Json.JsonEncodedText.Encode("prefix");
+
+	public override CompletionContext Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		var readerSnapshot = reader;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<double?> propBoost = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Core.Search.Context> propContext = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.GeohashPrecision>?> propNeighbours = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.GeohashPrecision?> propPrecision = default;
+		LocalJsonProperty<bool?> propPrefix = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
+
+			if (propContext.TryRead(ref reader, options, PropContext))
+			{
+				continue;
+			}
+
+			if (propNeighbours.TryRead(ref reader, options, PropNeighbours))
+			{
+				continue;
+			}
+
+			if (propPrecision.TryRead(ref reader, options, PropPrecision))
+			{
+				continue;
+			}
+
+			if (propPrefix.TryRead(ref reader, options, PropPrefix))
+			{
+				continue;
+			}
+
+			try
+			{
+				reader = readerSnapshot;
+				var result = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Core.Search.Context>(options);
+				return new CompletionContext { Context = result };
+			}
+			catch (System.Text.Json.JsonException)
+			{
+				throw;
+			}
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new CompletionContext
+		{
+			Boost = propBoost.Value
+,
+			Context = propContext.Value
+,
+			Neighbours = propNeighbours.Value
+,
+			Precision = propPrecision.Value
+,
+			Prefix = propPrefix.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, CompletionContext value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropContext, value.Context);
+		writer.WriteProperty(options, PropNeighbours, value.Neighbours);
+		writer.WriteProperty(options, PropPrecision, value.Precision);
+		writer.WriteProperty(options, PropPrefix, value.Prefix);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(CompletionContextConverter))]
 public sealed partial class CompletionContext
 {
 	/// <summary>
@@ -35,7 +120,6 @@ public sealed partial class CompletionContext
 	/// The score is computed by multiplying the boost with the suggestion weight.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("boost")]
 	public double? Boost { get; set; }
 
 	/// <summary>
@@ -43,7 +127,6 @@ public sealed partial class CompletionContext
 	/// The value of the category to filter/boost on.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("context")]
 	public Elastic.Clients.Elasticsearch.Serverless.Core.Search.Context Context { get; set; }
 
 	/// <summary>
@@ -53,7 +136,6 @@ public sealed partial class CompletionContext
 	/// Defaults to generating neighbors for index time precision level.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("neighbours")]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.GeohashPrecision>? Neighbours { get; set; }
 
 	/// <summary>
@@ -63,7 +145,6 @@ public sealed partial class CompletionContext
 	/// Defaults to index time precision level.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("precision")]
 	public Elastic.Clients.Elasticsearch.Serverless.GeohashPrecision? Precision { get; set; }
 
 	/// <summary>
@@ -71,7 +152,6 @@ public sealed partial class CompletionContext
 	/// Whether the category value should be treated as a prefix or not.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("prefix")]
 	public bool? Prefix { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Search/CompletionSuggest.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Search/CompletionSuggest.g.cs
index 2f3b7b91e4c..9e65a310316 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Search/CompletionSuggest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Search/CompletionSuggest.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,15 +28,93 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Core.Search;
 
+internal sealed partial class CompletionSuggestConverter<TDocument> : System.Text.Json.Serialization.JsonConverter<CompletionSuggest<TDocument>>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropLength = System.Text.Json.JsonEncodedText.Encode("length");
+	private static readonly System.Text.Json.JsonEncodedText PropOffset = System.Text.Json.JsonEncodedText.Encode("offset");
+	private static readonly System.Text.Json.JsonEncodedText PropOptions = System.Text.Json.JsonEncodedText.Encode("options");
+	private static readonly System.Text.Json.JsonEncodedText PropText = System.Text.Json.JsonEncodedText.Encode("text");
+
+	public override CompletionSuggest<TDocument> Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<int> propLength = default;
+		LocalJsonProperty<int> propOffset = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Core.Search.CompletionSuggestOption<TDocument>>> propOptions = default;
+		LocalJsonProperty<string> propText = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propLength.TryRead(ref reader, options, PropLength))
+			{
+				continue;
+			}
+
+			if (propOffset.TryRead(ref reader, options, PropOffset))
+			{
+				continue;
+			}
+
+			if (propOptions.TryRead(ref reader, options, PropOptions, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Core.Search.CompletionSuggestOption<TDocument>>, Elastic.Clients.Elasticsearch.Serverless.Core.Search.CompletionSuggestOption<TDocument>>)))
+			{
+				continue;
+			}
+
+			if (propText.TryRead(ref reader, options, PropText))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new CompletionSuggest<TDocument>
+		{
+			Length = propLength.Value
+,
+			Offset = propOffset.Value
+,
+			Options = propOptions.Value
+,
+			Text = propText.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, CompletionSuggest<TDocument> value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropLength, value.Length);
+		writer.WriteProperty(options, PropOffset, value.Offset);
+		writer.WriteProperty(options, PropOptions, value.Options, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Core.Search.CompletionSuggestOption<TDocument>>, Elastic.Clients.Elasticsearch.Serverless.Core.Search.CompletionSuggestOption<TDocument>>));
+		writer.WriteProperty(options, PropText, value.Text);
+		writer.WriteEndObject();
+	}
+}
+
+internal sealed partial class CompletionSuggestConverterFactory : System.Text.Json.Serialization.JsonConverterFactory
+{
+	public override bool CanConvert(System.Type typeToConvert)
+	{
+		return typeToConvert.IsGenericType && typeToConvert.GetGenericTypeDefinition() == typeof(CompletionSuggest<>);
+	}
+
+	public override System.Text.Json.Serialization.JsonConverter CreateConverter(System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		var args = typeToConvert.GetGenericArguments();
+#pragma warning disable IL3050
+		var converter = (System.Text.Json.Serialization.JsonConverter)System.Activator.CreateInstance(typeof(CompletionSuggestConverter<>).MakeGenericType(args[0]), System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public, binder: null, args: null, culture: null)!;
+#pragma warning restore IL3050
+		return converter;
+	}
+}
+
+[JsonConverter(typeof(CompletionSuggestConverterFactory))]
 public sealed partial class CompletionSuggest<TDocument> : ISuggest
 {
-	[JsonInclude, JsonPropertyName("length")]
 	public int Length { get; init; }
-	[JsonInclude, JsonPropertyName("offset")]
 	public int Offset { get; init; }
-	[JsonInclude, JsonPropertyName("options")]
-	[GenericConverter(typeof(SingleOrManyCollectionConverter<>), unwrap: true)]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Core.Search.CompletionSuggestOption<TDocument>> Options { get; init; }
-	[JsonInclude, JsonPropertyName("text")]
 	public string Text { get; init; }
+
+	string ISuggest.Type => "completion";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Search/CompletionSuggestOption.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Search/CompletionSuggestOption.g.cs
index 822c13b2570..829b9ab9eea 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Search/CompletionSuggestOption.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Search/CompletionSuggestOption.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,27 +28,157 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Core.Search;
 
+internal sealed partial class CompletionSuggestOptionConverter<TDocument> : System.Text.Json.Serialization.JsonConverter<CompletionSuggestOption<TDocument>>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCollateMatch = System.Text.Json.JsonEncodedText.Encode("collate_match");
+	private static readonly System.Text.Json.JsonEncodedText PropContexts = System.Text.Json.JsonEncodedText.Encode("contexts");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("_id");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("_index");
+	private static readonly System.Text.Json.JsonEncodedText PropRouting = System.Text.Json.JsonEncodedText.Encode("_routing");
+	private static readonly System.Text.Json.JsonEncodedText PropScore = System.Text.Json.JsonEncodedText.Encode("score");
+	private static readonly System.Text.Json.JsonEncodedText PropScore0 = System.Text.Json.JsonEncodedText.Encode("_score");
+	private static readonly System.Text.Json.JsonEncodedText PropSource = System.Text.Json.JsonEncodedText.Encode("_source");
+	private static readonly System.Text.Json.JsonEncodedText PropText = System.Text.Json.JsonEncodedText.Encode("text");
+
+	public override CompletionSuggestOption<TDocument> Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool?> propCollateMatch = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Core.Search.Context>>?> propContexts = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, object>?> propFields = default;
+		LocalJsonProperty<string?> propId = default;
+		LocalJsonProperty<string?> propIndex = default;
+		LocalJsonProperty<string?> propRouting = default;
+		LocalJsonProperty<double?> propScore = default;
+		LocalJsonProperty<double?> propScore0 = default;
+		LocalJsonProperty<TDocument?> propSource = default;
+		LocalJsonProperty<string> propText = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCollateMatch.TryRead(ref reader, options, PropCollateMatch))
+			{
+				continue;
+			}
+
+			if (propContexts.TryRead(ref reader, options, PropContexts))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propId.TryRead(ref reader, options, PropId))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propRouting.TryRead(ref reader, options, PropRouting))
+			{
+				continue;
+			}
+
+			if (propScore.TryRead(ref reader, options, PropScore))
+			{
+				continue;
+			}
+
+			if (propScore0.TryRead(ref reader, options, PropScore0))
+			{
+				continue;
+			}
+
+			if (propSource.TryRead(ref reader, options, PropSource, typeof(SourceMarker<TDocument?>)))
+			{
+				continue;
+			}
+
+			if (propText.TryRead(ref reader, options, PropText))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new CompletionSuggestOption<TDocument>
+		{
+			CollateMatch = propCollateMatch.Value
+,
+			Contexts = propContexts.Value
+,
+			Fields = propFields.Value
+,
+			Id = propId.Value
+,
+			Index = propIndex.Value
+,
+			Routing = propRouting.Value
+,
+			Score = propScore.Value
+,
+			Score0 = propScore0.Value
+,
+			Source = propSource.Value
+,
+			Text = propText.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, CompletionSuggestOption<TDocument> value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCollateMatch, value.CollateMatch);
+		writer.WriteProperty(options, PropContexts, value.Contexts);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropId, value.Id);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropRouting, value.Routing);
+		writer.WriteProperty(options, PropScore, value.Score);
+		writer.WriteProperty(options, PropScore0, value.Score0);
+		writer.WriteProperty(options, PropSource, value.Source, typeof(SourceMarker<TDocument?>));
+		writer.WriteProperty(options, PropText, value.Text);
+		writer.WriteEndObject();
+	}
+}
+
+internal sealed partial class CompletionSuggestOptionConverterFactory : System.Text.Json.Serialization.JsonConverterFactory
+{
+	public override bool CanConvert(System.Type typeToConvert)
+	{
+		return typeToConvert.IsGenericType && typeToConvert.GetGenericTypeDefinition() == typeof(CompletionSuggestOption<>);
+	}
+
+	public override System.Text.Json.Serialization.JsonConverter CreateConverter(System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		var args = typeToConvert.GetGenericArguments();
+#pragma warning disable IL3050
+		var converter = (System.Text.Json.Serialization.JsonConverter)System.Activator.CreateInstance(typeof(CompletionSuggestOptionConverter<>).MakeGenericType(args[0]), System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public, binder: null, args: null, culture: null)!;
+#pragma warning restore IL3050
+		return converter;
+	}
+}
+
+[JsonConverter(typeof(CompletionSuggestOptionConverterFactory))]
 public sealed partial class CompletionSuggestOption<TDocument>
 {
-	[JsonInclude, JsonPropertyName("collate_match")]
 	public bool? CollateMatch { get; init; }
-	[JsonInclude, JsonPropertyName("contexts")]
 	public IReadOnlyDictionary<string, IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Core.Search.Context>>? Contexts { get; init; }
-	[JsonInclude, JsonPropertyName("fields")]
 	public IReadOnlyDictionary<string, object>? Fields { get; init; }
-	[JsonInclude, JsonPropertyName("_id")]
 	public string? Id { get; init; }
-	[JsonInclude, JsonPropertyName("_index")]
 	public string? Index { get; init; }
-	[JsonInclude, JsonPropertyName("_routing")]
 	public string? Routing { get; init; }
-	[JsonInclude, JsonPropertyName("score")]
 	public double? Score { get; init; }
-	[JsonInclude, JsonPropertyName("_score")]
 	public double? Score0 { get; init; }
-	[JsonInclude, JsonPropertyName("_source")]
-	[SourceConverter]
 	public TDocument? Source { get; init; }
-	[JsonInclude, JsonPropertyName("text")]
 	public string Text { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Search/FieldCollapse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Search/FieldCollapse.g.cs
index a37f32afbc0..3e7601a0206 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Search/FieldCollapse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Search/FieldCollapse.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,9 +28,72 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Core.Search;
 
+internal sealed partial class FieldCollapseConverter : System.Text.Json.Serialization.JsonConverter<FieldCollapse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCollapse = System.Text.Json.JsonEncodedText.Encode("collapse");
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropInnerHits = System.Text.Json.JsonEncodedText.Encode("inner_hits");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxConcurrentGroupSearches = System.Text.Json.JsonEncodedText.Encode("max_concurrent_group_searches");
+
+	public override FieldCollapse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Core.Search.FieldCollapse?> propCollapse = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Field> propField = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.Core.Search.InnerHits>?> propInnerHits = default;
+		LocalJsonProperty<int?> propMaxConcurrentGroupSearches = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCollapse.TryRead(ref reader, options, PropCollapse))
+			{
+				continue;
+			}
+
+			if (propField.TryRead(ref reader, options, PropField))
+			{
+				continue;
+			}
+
+			if (propInnerHits.TryRead(ref reader, options, PropInnerHits, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Core.Search.InnerHits>?, Elastic.Clients.Elasticsearch.Serverless.Core.Search.InnerHits>)))
+			{
+				continue;
+			}
+
+			if (propMaxConcurrentGroupSearches.TryRead(ref reader, options, PropMaxConcurrentGroupSearches))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new FieldCollapse
+		{
+			Collapse = propCollapse.Value
+,
+			Field = propField.Value
+,
+			InnerHits = propInnerHits.Value
+,
+			MaxConcurrentGroupSearches = propMaxConcurrentGroupSearches.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, FieldCollapse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCollapse, value.Collapse);
+		writer.WriteProperty(options, PropField, value.Field);
+		writer.WriteProperty(options, PropInnerHits, value.InnerHits, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Core.Search.InnerHits>?, Elastic.Clients.Elasticsearch.Serverless.Core.Search.InnerHits>));
+		writer.WriteProperty(options, PropMaxConcurrentGroupSearches, value.MaxConcurrentGroupSearches);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(FieldCollapseConverter))]
 public sealed partial class FieldCollapse
 {
-	[JsonInclude, JsonPropertyName("collapse")]
 	public Elastic.Clients.Elasticsearch.Serverless.Core.Search.FieldCollapse? Collapse { get; set; }
 
 	/// <summary>
@@ -37,7 +101,6 @@ public sealed partial class FieldCollapse
 	/// The field to collapse the result set on
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("field")]
 	public Elastic.Clients.Elasticsearch.Serverless.Field Field { get; set; }
 
 	/// <summary>
@@ -45,8 +108,6 @@ public sealed partial class FieldCollapse
 	/// The number of inner hits and their sort order
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("inner_hits")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.Serverless.Core.Search.InnerHits))]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.Core.Search.InnerHits>? InnerHits { get; set; }
 
 	/// <summary>
@@ -54,7 +115,6 @@ public sealed partial class FieldCollapse
 	/// The number of concurrent requests allowed to retrieve the inner_hits per group
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("max_concurrent_group_searches")]
 	public int? MaxConcurrentGroupSearches { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Search/FieldSuggester.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Search/FieldSuggester.g.cs
index c717dbd72ea..bc0b331ed85 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Search/FieldSuggester.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Search/FieldSuggester.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -39,12 +40,16 @@ internal FieldSuggester(string variantName, object variant)
 			throw new ArgumentNullException(nameof(variant));
 		if (string.IsNullOrWhiteSpace(variantName))
 			throw new ArgumentException("Variant name must not be empty or whitespace.");
-		VariantName = variantName;
+		VariantType = variantName;
 		Variant = variant;
 	}
 
-	internal object Variant { get; }
-	internal string VariantName { get; }
+	internal FieldSuggester()
+	{
+	}
+
+	public object Variant { get; internal set; }
+	public string VariantType { get; internal set; }
 
 	public static FieldSuggester Completion(Elastic.Clients.Elasticsearch.Serverless.Core.Search.CompletionSuggester completionSuggester) => new FieldSuggester("completion", completionSuggester);
 	public static FieldSuggester Phrase(Elastic.Clients.Elasticsearch.Serverless.Core.Search.PhraseSuggester phraseSuggester) => new FieldSuggester("phrase", phraseSuggester);
@@ -88,121 +93,103 @@ public bool TryGet<T>([NotNullWhen(true)] out T? result) where T : class
 	}
 }
 
-internal sealed partial class FieldSuggesterConverter : JsonConverter<FieldSuggester>
+internal sealed partial class FieldSuggesterConverter : System.Text.Json.Serialization.JsonConverter<FieldSuggester>
 {
-	public override FieldSuggester Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropPrefix = System.Text.Json.JsonEncodedText.Encode("prefix");
+	private static readonly System.Text.Json.JsonEncodedText PropRegex = System.Text.Json.JsonEncodedText.Encode("regex");
+	private static readonly System.Text.Json.JsonEncodedText PropText = System.Text.Json.JsonEncodedText.Encode("text");
+	private static readonly System.Text.Json.JsonEncodedText VariantCompletion = System.Text.Json.JsonEncodedText.Encode("completion");
+	private static readonly System.Text.Json.JsonEncodedText VariantPhrase = System.Text.Json.JsonEncodedText.Encode("phrase");
+	private static readonly System.Text.Json.JsonEncodedText VariantTerm = System.Text.Json.JsonEncodedText.Encode("term");
+
+	public override FieldSuggester Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string?> propPrefix = default;
+		LocalJsonProperty<string?> propRegex = default;
+		LocalJsonProperty<string?> propText = default;
+		var variantType = string.Empty;
+		object? variant = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			throw new JsonException("Expected start token.");
-		}
-
-		object? variantValue = default;
-		string? variantNameValue = default;
-		string? prefixValue = default;
-		string? regexValue = default;
-		string? textValue = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
-		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token.");
-			}
-
-			if (reader.TokenType != JsonTokenType.PropertyName)
+			if (propPrefix.TryRead(ref reader, options, PropPrefix))
 			{
-				throw new JsonException("Expected a property name token representing the name of an Elasticsearch field.");
-			}
-
-			var propertyName = reader.GetString();
-			reader.Read();
-			if (propertyName == "prefix")
-			{
-				prefixValue = JsonSerializer.Deserialize<string?>(ref reader, options);
 				continue;
 			}
 
-			if (propertyName == "regex")
+			if (propRegex.TryRead(ref reader, options, PropRegex))
 			{
-				regexValue = JsonSerializer.Deserialize<string?>(ref reader, options);
 				continue;
 			}
 
-			if (propertyName == "text")
+			if (propText.TryRead(ref reader, options, PropText))
 			{
-				textValue = JsonSerializer.Deserialize<string?>(ref reader, options);
 				continue;
 			}
 
-			if (propertyName == "completion")
+			if (reader.ValueTextEquals(VariantCompletion))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Core.Search.CompletionSuggester?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantCompletion.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Core.Search.CompletionSuggester?>(options);
 				continue;
 			}
 
-			if (propertyName == "phrase")
+			if (reader.ValueTextEquals(VariantPhrase))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Core.Search.PhraseSuggester?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantPhrase.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Core.Search.PhraseSuggester?>(options);
 				continue;
 			}
 
-			if (propertyName == "term")
+			if (reader.ValueTextEquals(VariantTerm))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Core.Search.TermSuggester?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantTerm.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Core.Search.TermSuggester?>(options);
 				continue;
 			}
 
-			throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'FieldSuggester' from the response.");
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		var result = new FieldSuggester(variantNameValue, variantValue);
-		result.Prefix = prefixValue;
-		result.Regex = regexValue;
-		result.Text = textValue;
-		return result;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new FieldSuggester
+		{
+			VariantType = variantType,
+			Variant = variant,
+			Prefix = propPrefix.Value
+	,
+			Regex = propRegex.Value
+	,
+			Text = propText.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, FieldSuggester value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, FieldSuggester value, System.Text.Json.JsonSerializerOptions options)
 	{
 		writer.WriteStartObject();
-		if (!string.IsNullOrEmpty(value.Prefix))
+		switch (value.VariantType)
 		{
-			writer.WritePropertyName("prefix");
-			writer.WriteStringValue(value.Prefix);
-		}
-
-		if (!string.IsNullOrEmpty(value.Regex))
-		{
-			writer.WritePropertyName("regex");
-			writer.WriteStringValue(value.Regex);
-		}
-
-		if (!string.IsNullOrEmpty(value.Text))
-		{
-			writer.WritePropertyName("text");
-			writer.WriteStringValue(value.Text);
-		}
-
-		if (value.VariantName is not null && value.Variant is not null)
-		{
-			writer.WritePropertyName(value.VariantName);
-			switch (value.VariantName)
-			{
-				case "completion":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Core.Search.CompletionSuggester>(writer, (Elastic.Clients.Elasticsearch.Serverless.Core.Search.CompletionSuggester)value.Variant, options);
-					break;
-				case "phrase":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Core.Search.PhraseSuggester>(writer, (Elastic.Clients.Elasticsearch.Serverless.Core.Search.PhraseSuggester)value.Variant, options);
-					break;
-				case "term":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Core.Search.TermSuggester>(writer, (Elastic.Clients.Elasticsearch.Serverless.Core.Search.TermSuggester)value.Variant, options);
-					break;
-			}
+			case "":
+				break;
+			case "completion":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Core.Search.CompletionSuggester?)value.Variant);
+				break;
+			case "phrase":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Core.Search.PhraseSuggester?)value.Variant);
+				break;
+			case "term":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Core.Search.TermSuggester?)value.Variant);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.VariantType}' is not supported for type '{nameof(FieldSuggester)}'.");
 		}
 
+		writer.WriteProperty(options, PropPrefix, value.Prefix);
+		writer.WriteProperty(options, PropRegex, value.Regex);
+		writer.WriteProperty(options, PropText, value.Text);
 		writer.WriteEndObject();
 	}
 }
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Search/HighlightField.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Search/HighlightField.g.cs
index 7d5a7e8b08c..473aa62104a 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Search/HighlightField.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Search/HighlightField.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,250 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Core.Search;
 
+internal sealed partial class HighlightFieldConverter : System.Text.Json.Serialization.JsonConverter<HighlightField>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropBoundaryChars = System.Text.Json.JsonEncodedText.Encode("boundary_chars");
+	private static readonly System.Text.Json.JsonEncodedText PropBoundaryMaxScan = System.Text.Json.JsonEncodedText.Encode("boundary_max_scan");
+	private static readonly System.Text.Json.JsonEncodedText PropBoundaryScanner = System.Text.Json.JsonEncodedText.Encode("boundary_scanner");
+	private static readonly System.Text.Json.JsonEncodedText PropBoundaryScannerLocale = System.Text.Json.JsonEncodedText.Encode("boundary_scanner_locale");
+	private static readonly System.Text.Json.JsonEncodedText PropFragmenter = System.Text.Json.JsonEncodedText.Encode("fragmenter");
+	private static readonly System.Text.Json.JsonEncodedText PropFragmentOffset = System.Text.Json.JsonEncodedText.Encode("fragment_offset");
+	private static readonly System.Text.Json.JsonEncodedText PropFragmentSize = System.Text.Json.JsonEncodedText.Encode("fragment_size");
+	private static readonly System.Text.Json.JsonEncodedText PropHighlightFilter = System.Text.Json.JsonEncodedText.Encode("highlight_filter");
+	private static readonly System.Text.Json.JsonEncodedText PropHighlightQuery = System.Text.Json.JsonEncodedText.Encode("highlight_query");
+	private static readonly System.Text.Json.JsonEncodedText PropMatchedFields = System.Text.Json.JsonEncodedText.Encode("matched_fields");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxAnalyzedOffset = System.Text.Json.JsonEncodedText.Encode("max_analyzed_offset");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxFragmentLength = System.Text.Json.JsonEncodedText.Encode("max_fragment_length");
+	private static readonly System.Text.Json.JsonEncodedText PropNoMatchSize = System.Text.Json.JsonEncodedText.Encode("no_match_size");
+	private static readonly System.Text.Json.JsonEncodedText PropNumberOfFragments = System.Text.Json.JsonEncodedText.Encode("number_of_fragments");
+	private static readonly System.Text.Json.JsonEncodedText PropOptions = System.Text.Json.JsonEncodedText.Encode("options");
+	private static readonly System.Text.Json.JsonEncodedText PropOrder = System.Text.Json.JsonEncodedText.Encode("order");
+	private static readonly System.Text.Json.JsonEncodedText PropPhraseLimit = System.Text.Json.JsonEncodedText.Encode("phrase_limit");
+	private static readonly System.Text.Json.JsonEncodedText PropPostTags = System.Text.Json.JsonEncodedText.Encode("post_tags");
+	private static readonly System.Text.Json.JsonEncodedText PropPreTags = System.Text.Json.JsonEncodedText.Encode("pre_tags");
+	private static readonly System.Text.Json.JsonEncodedText PropRequireFieldMatch = System.Text.Json.JsonEncodedText.Encode("require_field_match");
+	private static readonly System.Text.Json.JsonEncodedText PropTagsSchema = System.Text.Json.JsonEncodedText.Encode("tags_schema");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override HighlightField Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string?> propBoundaryChars = default;
+		LocalJsonProperty<int?> propBoundaryMaxScan = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Core.Search.BoundaryScanner?> propBoundaryScanner = default;
+		LocalJsonProperty<string?> propBoundaryScannerLocale = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Core.Search.HighlighterFragmenter?> propFragmenter = default;
+		LocalJsonProperty<int?> propFragmentOffset = default;
+		LocalJsonProperty<int?> propFragmentSize = default;
+		LocalJsonProperty<bool?> propHighlightFilter = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query?> propHighlightQuery = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Fields?> propMatchedFields = default;
+		LocalJsonProperty<int?> propMaxAnalyzedOffset = default;
+		LocalJsonProperty<int?> propMaxFragmentLength = default;
+		LocalJsonProperty<int?> propNoMatchSize = default;
+		LocalJsonProperty<int?> propNumberOfFragments = default;
+		LocalJsonProperty<IDictionary<string, object>?> propOptions = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Core.Search.HighlighterOrder?> propOrder = default;
+		LocalJsonProperty<int?> propPhraseLimit = default;
+		LocalJsonProperty<ICollection<string>?> propPostTags = default;
+		LocalJsonProperty<ICollection<string>?> propPreTags = default;
+		LocalJsonProperty<bool?> propRequireFieldMatch = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Core.Search.HighlighterTagsSchema?> propTagsSchema = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Core.Search.HighlighterType?> propType = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBoundaryChars.TryRead(ref reader, options, PropBoundaryChars))
+			{
+				continue;
+			}
+
+			if (propBoundaryMaxScan.TryRead(ref reader, options, PropBoundaryMaxScan))
+			{
+				continue;
+			}
+
+			if (propBoundaryScanner.TryRead(ref reader, options, PropBoundaryScanner))
+			{
+				continue;
+			}
+
+			if (propBoundaryScannerLocale.TryRead(ref reader, options, PropBoundaryScannerLocale))
+			{
+				continue;
+			}
+
+			if (propFragmenter.TryRead(ref reader, options, PropFragmenter))
+			{
+				continue;
+			}
+
+			if (propFragmentOffset.TryRead(ref reader, options, PropFragmentOffset))
+			{
+				continue;
+			}
+
+			if (propFragmentSize.TryRead(ref reader, options, PropFragmentSize))
+			{
+				continue;
+			}
+
+			if (propHighlightFilter.TryRead(ref reader, options, PropHighlightFilter))
+			{
+				continue;
+			}
+
+			if (propHighlightQuery.TryRead(ref reader, options, PropHighlightQuery))
+			{
+				continue;
+			}
+
+			if (propMatchedFields.TryRead(ref reader, options, PropMatchedFields, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propMaxAnalyzedOffset.TryRead(ref reader, options, PropMaxAnalyzedOffset))
+			{
+				continue;
+			}
+
+			if (propMaxFragmentLength.TryRead(ref reader, options, PropMaxFragmentLength))
+			{
+				continue;
+			}
+
+			if (propNoMatchSize.TryRead(ref reader, options, PropNoMatchSize))
+			{
+				continue;
+			}
+
+			if (propNumberOfFragments.TryRead(ref reader, options, PropNumberOfFragments))
+			{
+				continue;
+			}
+
+			if (propOptions.TryRead(ref reader, options, PropOptions))
+			{
+				continue;
+			}
+
+			if (propOrder.TryRead(ref reader, options, PropOrder))
+			{
+				continue;
+			}
+
+			if (propPhraseLimit.TryRead(ref reader, options, PropPhraseLimit))
+			{
+				continue;
+			}
+
+			if (propPostTags.TryRead(ref reader, options, PropPostTags))
+			{
+				continue;
+			}
+
+			if (propPreTags.TryRead(ref reader, options, PropPreTags))
+			{
+				continue;
+			}
+
+			if (propRequireFieldMatch.TryRead(ref reader, options, PropRequireFieldMatch))
+			{
+				continue;
+			}
+
+			if (propTagsSchema.TryRead(ref reader, options, PropTagsSchema))
+			{
+				continue;
+			}
+
+			if (propType.TryRead(ref reader, options, PropType))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new HighlightField
+		{
+			BoundaryChars = propBoundaryChars.Value
+,
+			BoundaryMaxScan = propBoundaryMaxScan.Value
+,
+			BoundaryScanner = propBoundaryScanner.Value
+,
+			BoundaryScannerLocale = propBoundaryScannerLocale.Value
+,
+			Fragmenter = propFragmenter.Value
+,
+			FragmentOffset = propFragmentOffset.Value
+,
+			FragmentSize = propFragmentSize.Value
+,
+			HighlightFilter = propHighlightFilter.Value
+,
+			HighlightQuery = propHighlightQuery.Value
+,
+			MatchedFields = propMatchedFields.Value
+,
+			MaxAnalyzedOffset = propMaxAnalyzedOffset.Value
+,
+			MaxFragmentLength = propMaxFragmentLength.Value
+,
+			NoMatchSize = propNoMatchSize.Value
+,
+			NumberOfFragments = propNumberOfFragments.Value
+,
+			Options = propOptions.Value
+,
+			Order = propOrder.Value
+,
+			PhraseLimit = propPhraseLimit.Value
+,
+			PostTags = propPostTags.Value
+,
+			PreTags = propPreTags.Value
+,
+			RequireFieldMatch = propRequireFieldMatch.Value
+,
+			TagsSchema = propTagsSchema.Value
+,
+			Type = propType.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, HighlightField value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoundaryChars, value.BoundaryChars);
+		writer.WriteProperty(options, PropBoundaryMaxScan, value.BoundaryMaxScan);
+		writer.WriteProperty(options, PropBoundaryScanner, value.BoundaryScanner);
+		writer.WriteProperty(options, PropBoundaryScannerLocale, value.BoundaryScannerLocale);
+		writer.WriteProperty(options, PropFragmenter, value.Fragmenter);
+		writer.WriteProperty(options, PropFragmentOffset, value.FragmentOffset);
+		writer.WriteProperty(options, PropFragmentSize, value.FragmentSize);
+		writer.WriteProperty(options, PropHighlightFilter, value.HighlightFilter);
+		writer.WriteProperty(options, PropHighlightQuery, value.HighlightQuery);
+		writer.WriteProperty(options, PropMatchedFields, value.MatchedFields, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropMaxAnalyzedOffset, value.MaxAnalyzedOffset);
+		writer.WriteProperty(options, PropMaxFragmentLength, value.MaxFragmentLength);
+		writer.WriteProperty(options, PropNoMatchSize, value.NoMatchSize);
+		writer.WriteProperty(options, PropNumberOfFragments, value.NumberOfFragments);
+		writer.WriteProperty(options, PropOptions, value.Options);
+		writer.WriteProperty(options, PropOrder, value.Order);
+		writer.WriteProperty(options, PropPhraseLimit, value.PhraseLimit);
+		writer.WriteProperty(options, PropPostTags, value.PostTags);
+		writer.WriteProperty(options, PropPreTags, value.PreTags);
+		writer.WriteProperty(options, PropRequireFieldMatch, value.RequireFieldMatch);
+		writer.WriteProperty(options, PropTagsSchema, value.TagsSchema);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(HighlightFieldConverter))]
 public sealed partial class HighlightField
 {
 	/// <summary>
@@ -34,7 +279,6 @@ public sealed partial class HighlightField
 	/// A string that contains each boundary character.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("boundary_chars")]
 	public string? BoundaryChars { get; set; }
 
 	/// <summary>
@@ -42,7 +286,6 @@ public sealed partial class HighlightField
 	/// How far to scan for boundary characters.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("boundary_max_scan")]
 	public int? BoundaryMaxScan { get; set; }
 
 	/// <summary>
@@ -52,7 +295,6 @@ public sealed partial class HighlightField
 	/// Defaults to <c>sentence</c> for the <c>unified</c> highlighter. Defaults to <c>chars</c> for the <c>fvh</c> highlighter.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("boundary_scanner")]
 	public Elastic.Clients.Elasticsearch.Serverless.Core.Search.BoundaryScanner? BoundaryScanner { get; set; }
 
 	/// <summary>
@@ -61,7 +303,6 @@ public sealed partial class HighlightField
 	/// This parameter takes a form of a language tag, for example: <c>"en-US"</c>, <c>"fr-FR"</c>, <c>"ja-JP"</c>.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("boundary_scanner_locale")]
 	public string? BoundaryScannerLocale { get; set; }
 
 	/// <summary>
@@ -70,9 +311,7 @@ public sealed partial class HighlightField
 	/// Only valid for the <c>plain</c> highlighter.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("fragmenter")]
 	public Elastic.Clients.Elasticsearch.Serverless.Core.Search.HighlighterFragmenter? Fragmenter { get; set; }
-	[JsonInclude, JsonPropertyName("fragment_offset")]
 	public int? FragmentOffset { get; set; }
 
 	/// <summary>
@@ -80,9 +319,7 @@ public sealed partial class HighlightField
 	/// The size of the highlighted fragment in characters.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("fragment_size")]
 	public int? FragmentSize { get; set; }
-	[JsonInclude, JsonPropertyName("highlight_filter")]
 	public bool? HighlightFilter { get; set; }
 
 	/// <summary>
@@ -91,10 +328,7 @@ public sealed partial class HighlightField
 	/// This is especially useful if you use a rescore query because those are not taken into account by highlighting by default.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("highlight_query")]
 	public Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query? HighlightQuery { get; set; }
-	[JsonInclude, JsonPropertyName("matched_fields")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Serverless.Fields? MatchedFields { get; set; }
 
 	/// <summary>
@@ -104,9 +338,7 @@ public sealed partial class HighlightField
 	/// The <c>max_analyzed_offset</c> query setting does not override the <c>index.highlight.max_analyzed_offset</c> setting, which prevails when it’s set to lower value than the query setting.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("max_analyzed_offset")]
 	public int? MaxAnalyzedOffset { get; set; }
-	[JsonInclude, JsonPropertyName("max_fragment_length")]
 	public int? MaxFragmentLength { get; set; }
 
 	/// <summary>
@@ -114,7 +346,6 @@ public sealed partial class HighlightField
 	/// The amount of text you want to return from the beginning of the field if there are no matching fragments to highlight.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("no_match_size")]
 	public int? NoMatchSize { get; set; }
 
 	/// <summary>
@@ -126,9 +357,7 @@ public sealed partial class HighlightField
 	/// If <c>number_of_fragments</c> is <c>0</c>, <c>fragment_size</c> is ignored.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("number_of_fragments")]
 	public int? NumberOfFragments { get; set; }
-	[JsonInclude, JsonPropertyName("options")]
 	public IDictionary<string, object>? Options { get; set; }
 
 	/// <summary>
@@ -139,7 +368,6 @@ public sealed partial class HighlightField
 	/// Each highlighter applies its own logic to compute relevancy scores.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("order")]
 	public Elastic.Clients.Elasticsearch.Serverless.Core.Search.HighlighterOrder? Order { get; set; }
 
 	/// <summary>
@@ -150,7 +378,6 @@ public sealed partial class HighlightField
 	/// Only supported by the <c>fvh</c> highlighter.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("phrase_limit")]
 	public int? PhraseLimit { get; set; }
 
 	/// <summary>
@@ -159,7 +386,6 @@ public sealed partial class HighlightField
 	/// By default, highlighted text is wrapped in <c>&lt;em></c> and <c>&lt;/em></c> tags.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("post_tags")]
 	public ICollection<string>? PostTags { get; set; }
 
 	/// <summary>
@@ -168,7 +394,6 @@ public sealed partial class HighlightField
 	/// By default, highlighted text is wrapped in <c>&lt;em></c> and <c>&lt;/em></c> tags.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("pre_tags")]
 	public ICollection<string>? PreTags { get; set; }
 
 	/// <summary>
@@ -177,7 +402,6 @@ public sealed partial class HighlightField
 	/// Set to <c>false</c> to highlight all fields.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("require_field_match")]
 	public bool? RequireFieldMatch { get; set; }
 
 	/// <summary>
@@ -185,9 +409,7 @@ public sealed partial class HighlightField
 	/// Set to <c>styled</c> to use the built-in tag schema.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("tags_schema")]
 	public Elastic.Clients.Elasticsearch.Serverless.Core.Search.HighlighterTagsSchema? TagsSchema { get; set; }
-	[JsonInclude, JsonPropertyName("type")]
 	public Elastic.Clients.Elasticsearch.Serverless.Core.Search.HighlighterType? Type { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Search/Hit.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Search/Hit.g.cs
index 4950958526d..ac78cb4a1f5 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Search/Hit.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Search/Hit.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,47 +28,267 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Core.Search;
 
+internal sealed partial class HitConverter<TDocument> : System.Text.Json.Serialization.JsonConverter<Hit<TDocument>>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropExplanation = System.Text.Json.JsonEncodedText.Encode("_explanation");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropHighlight = System.Text.Json.JsonEncodedText.Encode("highlight");
+	private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("_id");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnored = System.Text.Json.JsonEncodedText.Encode("_ignored");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoredFieldValues = System.Text.Json.JsonEncodedText.Encode("ignored_field_values");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("_index");
+	private static readonly System.Text.Json.JsonEncodedText PropInnerHits = System.Text.Json.JsonEncodedText.Encode("inner_hits");
+	private static readonly System.Text.Json.JsonEncodedText PropMatchedQueries = System.Text.Json.JsonEncodedText.Encode("matched_queries");
+	private static readonly System.Text.Json.JsonEncodedText PropNested = System.Text.Json.JsonEncodedText.Encode("_nested");
+	private static readonly System.Text.Json.JsonEncodedText PropNode = System.Text.Json.JsonEncodedText.Encode("_node");
+	private static readonly System.Text.Json.JsonEncodedText PropPrimaryTerm = System.Text.Json.JsonEncodedText.Encode("_primary_term");
+	private static readonly System.Text.Json.JsonEncodedText PropRank = System.Text.Json.JsonEncodedText.Encode("_rank");
+	private static readonly System.Text.Json.JsonEncodedText PropRouting = System.Text.Json.JsonEncodedText.Encode("_routing");
+	private static readonly System.Text.Json.JsonEncodedText PropScore = System.Text.Json.JsonEncodedText.Encode("_score");
+	private static readonly System.Text.Json.JsonEncodedText PropSeqNo = System.Text.Json.JsonEncodedText.Encode("_seq_no");
+	private static readonly System.Text.Json.JsonEncodedText PropShard = System.Text.Json.JsonEncodedText.Encode("_shard");
+	private static readonly System.Text.Json.JsonEncodedText PropSort = System.Text.Json.JsonEncodedText.Encode("sort");
+	private static readonly System.Text.Json.JsonEncodedText PropSource = System.Text.Json.JsonEncodedText.Encode("_source");
+	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("_version");
+
+	public override Hit<TDocument> Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Core.Explain.Explanation?> propExplanation = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, object>?> propFields = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, IReadOnlyCollection<string>>?> propHighlight = default;
+		LocalJsonProperty<string?> propId = default;
+		LocalJsonProperty<IReadOnlyCollection<string>?> propIgnored = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.FieldValue>>?> propIgnoredFieldValues = default;
+		LocalJsonProperty<string> propIndex = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Core.Search.InnerHitsResult>?> propInnerHits = default;
+		LocalJsonProperty<IReadOnlyCollection<string>?> propMatchedQueries = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Core.Search.NestedIdentity?> propNested = default;
+		LocalJsonProperty<string?> propNode = default;
+		LocalJsonProperty<long?> propPrimaryTerm = default;
+		LocalJsonProperty<int?> propRank = default;
+		LocalJsonProperty<string?> propRouting = default;
+		LocalJsonProperty<double?> propScore = default;
+		LocalJsonProperty<long?> propSeqNo = default;
+		LocalJsonProperty<string?> propShard = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.FieldValue>?> propSort = default;
+		LocalJsonProperty<TDocument?> propSource = default;
+		LocalJsonProperty<long?> propVersion = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propExplanation.TryRead(ref reader, options, PropExplanation))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propHighlight.TryRead(ref reader, options, PropHighlight))
+			{
+				continue;
+			}
+
+			if (propId.TryRead(ref reader, options, PropId))
+			{
+				continue;
+			}
+
+			if (propIgnored.TryRead(ref reader, options, PropIgnored))
+			{
+				continue;
+			}
+
+			if (propIgnoredFieldValues.TryRead(ref reader, options, PropIgnoredFieldValues))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propInnerHits.TryRead(ref reader, options, PropInnerHits))
+			{
+				continue;
+			}
+
+			if (propMatchedQueries.TryRead(ref reader, options, PropMatchedQueries))
+			{
+				continue;
+			}
+
+			if (propNested.TryRead(ref reader, options, PropNested))
+			{
+				continue;
+			}
+
+			if (propNode.TryRead(ref reader, options, PropNode))
+			{
+				continue;
+			}
+
+			if (propPrimaryTerm.TryRead(ref reader, options, PropPrimaryTerm))
+			{
+				continue;
+			}
+
+			if (propRank.TryRead(ref reader, options, PropRank))
+			{
+				continue;
+			}
+
+			if (propRouting.TryRead(ref reader, options, PropRouting))
+			{
+				continue;
+			}
+
+			if (propScore.TryRead(ref reader, options, PropScore))
+			{
+				continue;
+			}
+
+			if (propSeqNo.TryRead(ref reader, options, PropSeqNo))
+			{
+				continue;
+			}
+
+			if (propShard.TryRead(ref reader, options, PropShard))
+			{
+				continue;
+			}
+
+			if (propSort.TryRead(ref reader, options, PropSort))
+			{
+				continue;
+			}
+
+			if (propSource.TryRead(ref reader, options, PropSource, typeof(SourceMarker<TDocument?>)))
+			{
+				continue;
+			}
+
+			if (propVersion.TryRead(ref reader, options, PropVersion))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new Hit<TDocument>
+		{
+			Explanation = propExplanation.Value
+,
+			Fields = propFields.Value
+,
+			Highlight = propHighlight.Value
+,
+			Id = propId.Value
+,
+			Ignored = propIgnored.Value
+,
+			IgnoredFieldValues = propIgnoredFieldValues.Value
+,
+			Index = propIndex.Value
+,
+			InnerHits = propInnerHits.Value
+,
+			MatchedQueries = propMatchedQueries.Value
+,
+			Nested = propNested.Value
+,
+			Node = propNode.Value
+,
+			PrimaryTerm = propPrimaryTerm.Value
+,
+			Rank = propRank.Value
+,
+			Routing = propRouting.Value
+,
+			Score = propScore.Value
+,
+			SeqNo = propSeqNo.Value
+,
+			Shard = propShard.Value
+,
+			Sort = propSort.Value
+,
+			Source = propSource.Value
+,
+			Version = propVersion.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, Hit<TDocument> value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropExplanation, value.Explanation);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropHighlight, value.Highlight);
+		writer.WriteProperty(options, PropId, value.Id);
+		writer.WriteProperty(options, PropIgnored, value.Ignored);
+		writer.WriteProperty(options, PropIgnoredFieldValues, value.IgnoredFieldValues);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropInnerHits, value.InnerHits);
+		writer.WriteProperty(options, PropMatchedQueries, value.MatchedQueries);
+		writer.WriteProperty(options, PropNested, value.Nested);
+		writer.WriteProperty(options, PropNode, value.Node);
+		writer.WriteProperty(options, PropPrimaryTerm, value.PrimaryTerm);
+		writer.WriteProperty(options, PropRank, value.Rank);
+		writer.WriteProperty(options, PropRouting, value.Routing);
+		writer.WriteProperty(options, PropScore, value.Score);
+		writer.WriteProperty(options, PropSeqNo, value.SeqNo);
+		writer.WriteProperty(options, PropShard, value.Shard);
+		writer.WriteProperty(options, PropSort, value.Sort);
+		writer.WriteProperty(options, PropSource, value.Source, typeof(SourceMarker<TDocument?>));
+		writer.WriteProperty(options, PropVersion, value.Version);
+		writer.WriteEndObject();
+	}
+}
+
+internal sealed partial class HitConverterFactory : System.Text.Json.Serialization.JsonConverterFactory
+{
+	public override bool CanConvert(System.Type typeToConvert)
+	{
+		return typeToConvert.IsGenericType && typeToConvert.GetGenericTypeDefinition() == typeof(Hit<>);
+	}
+
+	public override System.Text.Json.Serialization.JsonConverter CreateConverter(System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		var args = typeToConvert.GetGenericArguments();
+#pragma warning disable IL3050
+		var converter = (System.Text.Json.Serialization.JsonConverter)System.Activator.CreateInstance(typeof(HitConverter<>).MakeGenericType(args[0]), System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public, binder: null, args: null, culture: null)!;
+#pragma warning restore IL3050
+		return converter;
+	}
+}
+
+[JsonConverter(typeof(HitConverterFactory))]
 public sealed partial class Hit<TDocument>
 {
-	[JsonInclude, JsonPropertyName("_explanation")]
 	public Elastic.Clients.Elasticsearch.Serverless.Core.Explain.Explanation? Explanation { 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("_id")]
 	public string? Id { get; init; }
-	[JsonInclude, JsonPropertyName("_ignored")]
 	public IReadOnlyCollection<string>? Ignored { get; init; }
-	[JsonInclude, JsonPropertyName("ignored_field_values")]
 	public IReadOnlyDictionary<string, IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.FieldValue>>? IgnoredFieldValues { get; init; }
-	[JsonInclude, JsonPropertyName("_index")]
 	public string Index { get; init; }
-	[JsonInclude, JsonPropertyName("inner_hits")]
 	public IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Core.Search.InnerHitsResult>? InnerHits { get; init; }
-	[JsonInclude, JsonPropertyName("matched_queries")]
 	public IReadOnlyCollection<string>? MatchedQueries { get; init; }
-	[JsonInclude, JsonPropertyName("_nested")]
 	public Elastic.Clients.Elasticsearch.Serverless.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("_rank")]
 	public int? Rank { 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("sort")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.FieldValue>? Sort { 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.Serverless/_Generated/Types/Core/Search/InnerHits.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Search/InnerHits.g.cs
index 614deb15cec..36045357d6f 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Search/InnerHits.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Search/InnerHits.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,16 +28,195 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Core.Search;
 
+internal sealed partial class InnerHitsConverter : System.Text.Json.Serialization.JsonConverter<InnerHits>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCollapse = System.Text.Json.JsonEncodedText.Encode("collapse");
+	private static readonly System.Text.Json.JsonEncodedText PropDocvalueFields = System.Text.Json.JsonEncodedText.Encode("docvalue_fields");
+	private static readonly System.Text.Json.JsonEncodedText PropExplain = System.Text.Json.JsonEncodedText.Encode("explain");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropFrom = System.Text.Json.JsonEncodedText.Encode("from");
+	private static readonly System.Text.Json.JsonEncodedText PropHighlight = System.Text.Json.JsonEncodedText.Encode("highlight");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreUnmapped = System.Text.Json.JsonEncodedText.Encode("ignore_unmapped");
+	private static readonly System.Text.Json.JsonEncodedText PropName = System.Text.Json.JsonEncodedText.Encode("name");
+	private static readonly System.Text.Json.JsonEncodedText PropScriptFields = System.Text.Json.JsonEncodedText.Encode("script_fields");
+	private static readonly System.Text.Json.JsonEncodedText PropSeqNoPrimaryTerm = System.Text.Json.JsonEncodedText.Encode("seq_no_primary_term");
+	private static readonly System.Text.Json.JsonEncodedText PropSize = System.Text.Json.JsonEncodedText.Encode("size");
+	private static readonly System.Text.Json.JsonEncodedText PropSort = System.Text.Json.JsonEncodedText.Encode("sort");
+	private static readonly System.Text.Json.JsonEncodedText PropSource = System.Text.Json.JsonEncodedText.Encode("_source");
+	private static readonly System.Text.Json.JsonEncodedText PropStoredFields = System.Text.Json.JsonEncodedText.Encode("stored_fields");
+	private static readonly System.Text.Json.JsonEncodedText PropTrackScores = System.Text.Json.JsonEncodedText.Encode("track_scores");
+	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("version");
+
+	public override InnerHits Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Core.Search.FieldCollapse?> propCollapse = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.FieldAndFormat>?> propDocvalueFields = default;
+		LocalJsonProperty<bool?> propExplain = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Fields?> propFields = default;
+		LocalJsonProperty<int?> propFrom = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Core.Search.Highlight?> propHighlight = default;
+		LocalJsonProperty<bool?> propIgnoreUnmapped = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Name?> propName = default;
+		LocalJsonProperty<IDictionary<Elastic.Clients.Elasticsearch.Serverless.Field, Elastic.Clients.Elasticsearch.Serverless.ScriptField>?> propScriptFields = default;
+		LocalJsonProperty<bool?> propSeqNoPrimaryTerm = default;
+		LocalJsonProperty<int?> propSize = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.SortOptions>?> propSort = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Core.Search.SourceConfig?> propSource = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Fields?> propStoredFields = default;
+		LocalJsonProperty<bool?> propTrackScores = default;
+		LocalJsonProperty<bool?> propVersion = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCollapse.TryRead(ref reader, options, PropCollapse))
+			{
+				continue;
+			}
+
+			if (propDocvalueFields.TryRead(ref reader, options, PropDocvalueFields))
+			{
+				continue;
+			}
+
+			if (propExplain.TryRead(ref reader, options, PropExplain))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propFrom.TryRead(ref reader, options, PropFrom))
+			{
+				continue;
+			}
+
+			if (propHighlight.TryRead(ref reader, options, PropHighlight))
+			{
+				continue;
+			}
+
+			if (propIgnoreUnmapped.TryRead(ref reader, options, PropIgnoreUnmapped))
+			{
+				continue;
+			}
+
+			if (propName.TryRead(ref reader, options, PropName))
+			{
+				continue;
+			}
+
+			if (propScriptFields.TryRead(ref reader, options, PropScriptFields))
+			{
+				continue;
+			}
+
+			if (propSeqNoPrimaryTerm.TryRead(ref reader, options, PropSeqNoPrimaryTerm))
+			{
+				continue;
+			}
+
+			if (propSize.TryRead(ref reader, options, PropSize))
+			{
+				continue;
+			}
+
+			if (propSort.TryRead(ref reader, options, PropSort, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.SortOptions>?, Elastic.Clients.Elasticsearch.Serverless.SortOptions>)))
+			{
+				continue;
+			}
+
+			if (propSource.TryRead(ref reader, options, PropSource))
+			{
+				continue;
+			}
+
+			if (propStoredFields.TryRead(ref reader, options, PropStoredFields, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propTrackScores.TryRead(ref reader, options, PropTrackScores))
+			{
+				continue;
+			}
+
+			if (propVersion.TryRead(ref reader, options, PropVersion))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new InnerHits
+		{
+			Collapse = propCollapse.Value
+,
+			DocvalueFields = propDocvalueFields.Value
+,
+			Explain = propExplain.Value
+,
+			Fields = propFields.Value
+,
+			From = propFrom.Value
+,
+			Highlight = propHighlight.Value
+,
+			IgnoreUnmapped = propIgnoreUnmapped.Value
+,
+			Name = propName.Value
+,
+			ScriptFields = propScriptFields.Value
+,
+			SeqNoPrimaryTerm = propSeqNoPrimaryTerm.Value
+,
+			Size = propSize.Value
+,
+			Sort = propSort.Value
+,
+			Source = propSource.Value
+,
+			StoredFields = propStoredFields.Value
+,
+			TrackScores = propTrackScores.Value
+,
+			Version = propVersion.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, InnerHits value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCollapse, value.Collapse);
+		writer.WriteProperty(options, PropDocvalueFields, value.DocvalueFields);
+		writer.WriteProperty(options, PropExplain, value.Explain);
+		writer.WriteProperty(options, PropFields, value.Fields, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropFrom, value.From);
+		writer.WriteProperty(options, PropHighlight, value.Highlight);
+		writer.WriteProperty(options, PropIgnoreUnmapped, value.IgnoreUnmapped);
+		writer.WriteProperty(options, PropName, value.Name);
+		writer.WriteProperty(options, PropScriptFields, value.ScriptFields);
+		writer.WriteProperty(options, PropSeqNoPrimaryTerm, value.SeqNoPrimaryTerm);
+		writer.WriteProperty(options, PropSize, value.Size);
+		writer.WriteProperty(options, PropSort, value.Sort, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.SortOptions>?, Elastic.Clients.Elasticsearch.Serverless.SortOptions>));
+		writer.WriteProperty(options, PropSource, value.Source);
+		writer.WriteProperty(options, PropStoredFields, value.StoredFields, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropTrackScores, value.TrackScores);
+		writer.WriteProperty(options, PropVersion, value.Version);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(InnerHitsConverter))]
 public sealed partial class InnerHits
 {
-	[JsonInclude, JsonPropertyName("collapse")]
 	public Elastic.Clients.Elasticsearch.Serverless.Core.Search.FieldCollapse? Collapse { get; set; }
-	[JsonInclude, JsonPropertyName("docvalue_fields")]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.FieldAndFormat>? DocvalueFields { get; set; }
-	[JsonInclude, JsonPropertyName("explain")]
 	public bool? Explain { get; set; }
-	[JsonInclude, JsonPropertyName("fields")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Serverless.Fields? Fields { get; set; }
 
 	/// <summary>
@@ -44,11 +224,8 @@ public sealed partial class InnerHits
 	/// Inner hit starting document offset.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("from")]
 	public int? From { get; set; }
-	[JsonInclude, JsonPropertyName("highlight")]
 	public Elastic.Clients.Elasticsearch.Serverless.Core.Search.Highlight? Highlight { get; set; }
-	[JsonInclude, JsonPropertyName("ignore_unmapped")]
 	public bool? IgnoreUnmapped { get; set; }
 
 	/// <summary>
@@ -57,11 +234,8 @@ public sealed partial class InnerHits
 	/// Useful when a search request contains multiple inner hits.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("name")]
 	public Elastic.Clients.Elasticsearch.Serverless.Name? Name { get; set; }
-	[JsonInclude, JsonPropertyName("script_fields")]
 	public IDictionary<Elastic.Clients.Elasticsearch.Serverless.Field, Elastic.Clients.Elasticsearch.Serverless.ScriptField>? ScriptFields { get; set; }
-	[JsonInclude, JsonPropertyName("seq_no_primary_term")]
 	public bool? SeqNoPrimaryTerm { get; set; }
 
 	/// <summary>
@@ -69,7 +243,6 @@ public sealed partial class InnerHits
 	/// The maximum number of hits to return per <c>inner_hits</c>.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("size")]
 	public int? Size { get; set; }
 
 	/// <summary>
@@ -78,17 +251,10 @@ public sealed partial class InnerHits
 	/// By default, inner hits are sorted by score.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("sort")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.Serverless.SortOptions))]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.SortOptions>? Sort { get; set; }
-	[JsonInclude, JsonPropertyName("_source")]
 	public Elastic.Clients.Elasticsearch.Serverless.Core.Search.SourceConfig? Source { get; set; }
-	[JsonInclude, JsonPropertyName("stored_fields")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Serverless.Fields? StoredFields { get; set; }
-	[JsonInclude, JsonPropertyName("track_scores")]
 	public bool? TrackScores { get; set; }
-	[JsonInclude, JsonPropertyName("version")]
 	public bool? Version { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Search/PhraseSuggest.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Search/PhraseSuggest.g.cs
index 766f2caf43b..b38cb8b4d77 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Search/PhraseSuggest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Search/PhraseSuggest.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,15 +28,76 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Core.Search;
 
+internal sealed partial class PhraseSuggestConverter : System.Text.Json.Serialization.JsonConverter<PhraseSuggest>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropLength = System.Text.Json.JsonEncodedText.Encode("length");
+	private static readonly System.Text.Json.JsonEncodedText PropOffset = System.Text.Json.JsonEncodedText.Encode("offset");
+	private static readonly System.Text.Json.JsonEncodedText PropOptions = System.Text.Json.JsonEncodedText.Encode("options");
+	private static readonly System.Text.Json.JsonEncodedText PropText = System.Text.Json.JsonEncodedText.Encode("text");
+
+	public override PhraseSuggest Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<int> propLength = default;
+		LocalJsonProperty<int> propOffset = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Core.Search.PhraseSuggestOption>> propOptions = default;
+		LocalJsonProperty<string> propText = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propLength.TryRead(ref reader, options, PropLength))
+			{
+				continue;
+			}
+
+			if (propOffset.TryRead(ref reader, options, PropOffset))
+			{
+				continue;
+			}
+
+			if (propOptions.TryRead(ref reader, options, PropOptions, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Core.Search.PhraseSuggestOption>, Elastic.Clients.Elasticsearch.Serverless.Core.Search.PhraseSuggestOption>)))
+			{
+				continue;
+			}
+
+			if (propText.TryRead(ref reader, options, PropText))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PhraseSuggest
+		{
+			Length = propLength.Value
+,
+			Offset = propOffset.Value
+,
+			Options = propOptions.Value
+,
+			Text = propText.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PhraseSuggest value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropLength, value.Length);
+		writer.WriteProperty(options, PropOffset, value.Offset);
+		writer.WriteProperty(options, PropOptions, value.Options, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Core.Search.PhraseSuggestOption>, Elastic.Clients.Elasticsearch.Serverless.Core.Search.PhraseSuggestOption>));
+		writer.WriteProperty(options, PropText, value.Text);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PhraseSuggestConverter))]
 public sealed partial class PhraseSuggest : ISuggest
 {
-	[JsonInclude, JsonPropertyName("length")]
 	public int Length { get; init; }
-	[JsonInclude, JsonPropertyName("offset")]
 	public int Offset { get; init; }
-	[JsonInclude, JsonPropertyName("options")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.Serverless.Core.Search.PhraseSuggestOption))]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Core.Search.PhraseSuggestOption> Options { get; init; }
-	[JsonInclude, JsonPropertyName("text")]
 	public string Text { get; init; }
+
+	string ISuggest.Type => "phrase";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Search/Rescore.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Search/Rescore.g.cs
index a05d61b1266..a8bfc5ba2ac 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Search/Rescore.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Search/Rescore.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -39,12 +40,16 @@ internal Rescore(string variantName, object variant)
 			throw new ArgumentNullException(nameof(variant));
 		if (string.IsNullOrWhiteSpace(variantName))
 			throw new ArgumentException("Variant name must not be empty or whitespace.");
-		VariantName = variantName;
+		VariantType = variantName;
 		Variant = variant;
 	}
 
-	internal object Variant { get; }
-	internal string VariantName { get; }
+	internal Rescore()
+	{
+	}
+
+	public object Variant { get; internal set; }
+	public string VariantType { get; internal set; }
 
 	public static Rescore LearningToRank(Elastic.Clients.Elasticsearch.Serverless.Core.Search.LearningToRank learningToRank) => new Rescore("learning_to_rank", learningToRank);
 	public static Rescore Query(Elastic.Clients.Elasticsearch.Serverless.Core.Search.RescoreQuery rescoreQuery) => new Rescore("query", rescoreQuery);
@@ -65,83 +70,71 @@ public bool TryGet<T>([NotNullWhen(true)] out T? result) where T : class
 	}
 }
 
-internal sealed partial class RescoreConverter : JsonConverter<Rescore>
+internal sealed partial class RescoreConverter : System.Text.Json.Serialization.JsonConverter<Rescore>
 {
-	public override Rescore Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-		{
-			throw new JsonException("Expected start token.");
-		}
+	private static readonly System.Text.Json.JsonEncodedText PropWindowSize = System.Text.Json.JsonEncodedText.Encode("window_size");
+	private static readonly System.Text.Json.JsonEncodedText VariantLearningToRank = System.Text.Json.JsonEncodedText.Encode("learning_to_rank");
+	private static readonly System.Text.Json.JsonEncodedText VariantQuery = System.Text.Json.JsonEncodedText.Encode("query");
 
-		object? variantValue = default;
-		string? variantNameValue = default;
-		int? windowSizeValue = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+	public override Rescore Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<int?> propWindowSize = default;
+		var variantType = string.Empty;
+		object? variant = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token.");
-			}
-
-			if (reader.TokenType != JsonTokenType.PropertyName)
+			if (propWindowSize.TryRead(ref reader, options, PropWindowSize))
 			{
-				throw new JsonException("Expected a property name token representing the name of an Elasticsearch field.");
-			}
-
-			var propertyName = reader.GetString();
-			reader.Read();
-			if (propertyName == "window_size")
-			{
-				windowSizeValue = JsonSerializer.Deserialize<int?>(ref reader, options);
 				continue;
 			}
 
-			if (propertyName == "learning_to_rank")
+			if (reader.ValueTextEquals(VariantLearningToRank))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Core.Search.LearningToRank?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantLearningToRank.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Core.Search.LearningToRank?>(options);
 				continue;
 			}
 
-			if (propertyName == "query")
+			if (reader.ValueTextEquals(VariantQuery))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Core.Search.RescoreQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantQuery.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Core.Search.RescoreQuery?>(options);
 				continue;
 			}
 
-			throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'Rescore' from the response.");
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		var result = new Rescore(variantNameValue, variantValue);
-		result.WindowSize = windowSizeValue;
-		return result;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new Rescore
+		{
+			VariantType = variantType,
+			Variant = variant,
+			WindowSize = propWindowSize.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, Rescore value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, Rescore value, System.Text.Json.JsonSerializerOptions options)
 	{
 		writer.WriteStartObject();
-		if (value.WindowSize.HasValue)
-		{
-			writer.WritePropertyName("window_size");
-			writer.WriteNumberValue(value.WindowSize.Value);
-		}
-
-		if (value.VariantName is not null && value.Variant is not null)
+		switch (value.VariantType)
 		{
-			writer.WritePropertyName(value.VariantName);
-			switch (value.VariantName)
-			{
-				case "learning_to_rank":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Core.Search.LearningToRank>(writer, (Elastic.Clients.Elasticsearch.Serverless.Core.Search.LearningToRank)value.Variant, options);
-					break;
-				case "query":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Core.Search.RescoreQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.Core.Search.RescoreQuery)value.Variant, options);
-					break;
-			}
+			case "":
+				break;
+			case "learning_to_rank":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Core.Search.LearningToRank?)value.Variant);
+				break;
+			case "query":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Core.Search.RescoreQuery?)value.Variant);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.VariantType}' is not supported for type '{nameof(Rescore)}'.");
 		}
 
+		writer.WriteProperty(options, PropWindowSize, value.WindowSize);
 		writer.WriteEndObject();
 	}
 }
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Search/SmoothingModel.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Search/SmoothingModel.g.cs
index f41ccfe7207..32d5f7a5c10 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Search/SmoothingModel.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Search/SmoothingModel.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -39,12 +40,16 @@ internal SmoothingModel(string variantName, object variant)
 			throw new ArgumentNullException(nameof(variant));
 		if (string.IsNullOrWhiteSpace(variantName))
 			throw new ArgumentException("Variant name must not be empty or whitespace.");
-		VariantName = variantName;
+		VariantType = variantName;
 		Variant = variant;
 	}
 
-	internal object Variant { get; }
-	internal string VariantName { get; }
+	internal SmoothingModel()
+	{
+	}
+
+	public object Variant { get; internal set; }
+	public string VariantType { get; internal set; }
 
 	public static SmoothingModel Laplace(Elastic.Clients.Elasticsearch.Serverless.Core.Search.LaplaceSmoothingModel laplaceSmoothingModel) => new SmoothingModel("laplace", laplaceSmoothingModel);
 	public static SmoothingModel LinearInterpolation(Elastic.Clients.Elasticsearch.Serverless.Core.Search.LinearInterpolationSmoothingModel linearInterpolationSmoothingModel) => new SmoothingModel("linear_interpolation", linearInterpolationSmoothingModel);
@@ -63,77 +68,68 @@ public bool TryGet<T>([NotNullWhen(true)] out T? result) where T : class
 	}
 }
 
-internal sealed partial class SmoothingModelConverter : JsonConverter<SmoothingModel>
+internal sealed partial class SmoothingModelConverter : System.Text.Json.Serialization.JsonConverter<SmoothingModel>
 {
-	public override SmoothingModel Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-		{
-			throw new JsonException("Expected start token.");
-		}
+	private static readonly System.Text.Json.JsonEncodedText VariantLaplace = System.Text.Json.JsonEncodedText.Encode("laplace");
+	private static readonly System.Text.Json.JsonEncodedText VariantLinearInterpolation = System.Text.Json.JsonEncodedText.Encode("linear_interpolation");
+	private static readonly System.Text.Json.JsonEncodedText VariantStupidBackoff = System.Text.Json.JsonEncodedText.Encode("stupid_backoff");
 
-		object? variantValue = default;
-		string? variantNameValue = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+	public override SmoothingModel Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		var variantType = string.Empty;
+		object? variant = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
+			if (reader.ValueTextEquals(VariantLaplace))
 			{
-				throw new JsonException("Expected a property name token.");
-			}
-
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token representing the name of an Elasticsearch field.");
-			}
-
-			var propertyName = reader.GetString();
-			reader.Read();
-			if (propertyName == "laplace")
-			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Core.Search.LaplaceSmoothingModel?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantLaplace.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Core.Search.LaplaceSmoothingModel?>(options);
 				continue;
 			}
 
-			if (propertyName == "linear_interpolation")
+			if (reader.ValueTextEquals(VariantLinearInterpolation))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Core.Search.LinearInterpolationSmoothingModel?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantLinearInterpolation.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Core.Search.LinearInterpolationSmoothingModel?>(options);
 				continue;
 			}
 
-			if (propertyName == "stupid_backoff")
+			if (reader.ValueTextEquals(VariantStupidBackoff))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Core.Search.StupidBackoffSmoothingModel?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantStupidBackoff.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Core.Search.StupidBackoffSmoothingModel?>(options);
 				continue;
 			}
 
-			throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'SmoothingModel' from the response.");
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		var result = new SmoothingModel(variantNameValue, variantValue);
-		return result;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SmoothingModel { VariantType = variantType, Variant = variant };
 	}
 
-	public override void Write(Utf8JsonWriter writer, SmoothingModel value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SmoothingModel value, System.Text.Json.JsonSerializerOptions options)
 	{
 		writer.WriteStartObject();
-		if (value.VariantName is not null && value.Variant is not null)
+		switch (value.VariantType)
 		{
-			writer.WritePropertyName(value.VariantName);
-			switch (value.VariantName)
-			{
-				case "laplace":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Core.Search.LaplaceSmoothingModel>(writer, (Elastic.Clients.Elasticsearch.Serverless.Core.Search.LaplaceSmoothingModel)value.Variant, options);
-					break;
-				case "linear_interpolation":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Core.Search.LinearInterpolationSmoothingModel>(writer, (Elastic.Clients.Elasticsearch.Serverless.Core.Search.LinearInterpolationSmoothingModel)value.Variant, options);
-					break;
-				case "stupid_backoff":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Core.Search.StupidBackoffSmoothingModel>(writer, (Elastic.Clients.Elasticsearch.Serverless.Core.Search.StupidBackoffSmoothingModel)value.Variant, options);
-					break;
-			}
+			case "":
+				break;
+			case "laplace":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Core.Search.LaplaceSmoothingModel?)value.Variant);
+				break;
+			case "linear_interpolation":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Core.Search.LinearInterpolationSmoothingModel?)value.Variant);
+				break;
+			case "stupid_backoff":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Core.Search.StupidBackoffSmoothingModel?)value.Variant);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.VariantType}' is not supported for type '{nameof(SmoothingModel)}'.");
 		}
 
 		writer.WriteEndObject();
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Search/SourceFilter.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Search/SourceFilter.g.cs
index 476fc65d917..3fb3f3f7fa9 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Search/SourceFilter.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Search/SourceFilter.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,52 +28,57 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Core.Search;
 
-internal sealed partial class SourceFilterConverter : JsonConverter<SourceFilter>
+internal sealed partial class SourceFilterConverter : System.Text.Json.Serialization.JsonConverter<SourceFilter>
 {
-	public override SourceFilter Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropExcludes = System.Text.Json.JsonEncodedText.Encode("excludes");
+	private static readonly System.Text.Json.JsonEncodedText PropExcludes1 = System.Text.Json.JsonEncodedText.Encode("exclude");
+	private static readonly System.Text.Json.JsonEncodedText PropIncludes = System.Text.Json.JsonEncodedText.Encode("includes");
+	private static readonly System.Text.Json.JsonEncodedText PropIncludes1 = System.Text.Json.JsonEncodedText.Encode("include");
+
+	public override SourceFilter Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		var variant = new SourceFilter();
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		var readerSnapshot = reader;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Fields?> propExcludes = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Fields?> propIncludes = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propExcludes.TryRead(ref reader, options, PropExcludes, typeof(SingleOrManyFieldsMarker)) || propExcludes.TryRead(ref reader, options, PropExcludes1, typeof(SingleOrManyFieldsMarker)))
 			{
-				var property = reader.GetString();
-				if (property == "excludes" || property == "exclude")
-				{
-					reader.Read();
-					variant.Excludes = new FieldsConverter().Read(ref reader, typeToConvert, options);
-					continue;
-				}
-
-				if (property == "includes" || property == "include")
-				{
-					reader.Read();
-					variant.Includes = new FieldsConverter().Read(ref reader, typeToConvert, options);
-					continue;
-				}
+				continue;
 			}
-		}
 
-		return variant;
-	}
+			if (propIncludes.TryRead(ref reader, options, PropIncludes, typeof(SingleOrManyFieldsMarker)) || propIncludes.TryRead(ref reader, options, PropIncludes1, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
 
-	public override void Write(Utf8JsonWriter writer, SourceFilter value, JsonSerializerOptions options)
-	{
-		writer.WriteStartObject();
-		if (value.Excludes is not null)
-		{
-			writer.WritePropertyName("excludes");
-			new FieldsConverter().Write(writer, value.Excludes, options);
+			try
+			{
+				reader = readerSnapshot;
+				var result = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Fields?>(options);
+				return new SourceFilter { Includes = result };
+			}
+			catch (System.Text.Json.JsonException)
+			{
+				throw;
+			}
 		}
 
-		if (value.Includes is not null)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SourceFilter
 		{
-			writer.WritePropertyName("includes");
-			new FieldsConverter().Write(writer, value.Includes, options);
-		}
+			Excludes = propExcludes.Value
+,
+			Includes = propIncludes.Value
+		};
+	}
 
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SourceFilter value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropExcludes, value.Excludes, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropIncludes, value.Includes, typeof(SingleOrManyFieldsMarker));
 		writer.WriteEndObject();
 	}
 }
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Search/SuggestDictionary.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Search/SuggestDictionary.g.cs
index fce42046b43..d24223ecca8 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Search/SuggestDictionary.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Search/SuggestDictionary.g.cs
@@ -19,6 +19,7 @@
 
 using Elastic.Clients.Elasticsearch.Serverless.Core;
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport;
 using System;
@@ -33,9 +34,10 @@ namespace Elastic.Clients.Elasticsearch.Serverless.Core.Search;
 
 public partial interface ISuggest
 {
+	public string? Type { get; }
 }
 
-[GenericConverter(typeof(SuggestDictionaryConverter<>), unwrap: true)]
+[JsonConverter(typeof(SuggestDictionaryConverterFactory))]
 public partial class SuggestDictionary<TDocument> : IsAReadOnlyDictionary<string, IReadOnlyCollection<ISuggest>>
 {
 	public SuggestDictionary(IReadOnlyDictionary<string, IReadOnlyCollection<ISuggest>> backingDictionary) : base(backingDictionary)
@@ -48,61 +50,87 @@ public SuggestDictionary(IReadOnlyDictionary<string, IReadOnlyCollection<ISugges
 	private IReadOnlyCollection<T>? TryGet<T>(string key) where T : class, ISuggest => BackingDictionary.TryGetValue(key, out var value) ? value.Cast<T>().ToArray() : null;
 }
 
-internal sealed partial class SuggestDictionaryConverter<TDocument> : JsonConverter<SuggestDictionary<TDocument>>
+internal sealed partial class SuggestDictionaryConverter<TDocument> : System.Text.Json.Serialization.JsonConverter<SuggestDictionary<TDocument>>
 {
-	public override SuggestDictionary<TDocument> Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	public override SuggestDictionary<TDocument> Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var dictionary = new Dictionary<string, IReadOnlyCollection<ISuggest>>();
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException($"Expected {JsonTokenType.StartObject} but read {reader.TokenType}.");
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		var dictionary = new System.Collections.Generic.Dictionary<string, IReadOnlyCollection<ISuggest>>();
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
-				throw new JsonException($"Expected {JsonTokenType.PropertyName} but read {reader.TokenType}.");
-			var name = reader.GetString();
-			reader.Read();
-			ReadItem(ref reader, options, dictionary, name);
+			ReadItem(ref reader, options, out string name, out IReadOnlyCollection<ISuggest> value);
+			dictionary[name] = value;
 		}
 
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
 		return new SuggestDictionary<TDocument>(dictionary);
 	}
 
-	public override void Write(Utf8JsonWriter writer, SuggestDictionary<TDocument> value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SuggestDictionary<TDocument> value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'SuggestDictionary' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		foreach (var pair in value)
+		{
+			WriteItem(writer, options, pair.Key, pair.Value);
+		}
+
+		writer.WriteEndObject();
 	}
 
-	public static void ReadItem(ref Utf8JsonReader reader, JsonSerializerOptions options, Dictionary<string, IReadOnlyCollection<ISuggest>> dictionary, string name)
+	internal static void ReadItem(ref System.Text.Json.Utf8JsonReader reader, System.Text.Json.JsonSerializerOptions options, out string name, out IReadOnlyCollection<ISuggest> value)
 	{
-		var nameParts = name.Split('#');
-		if (nameParts.Length != 2)
-			throw new JsonException($"Unable to parse typed-key '{name}'.");
-		var type = nameParts[0];
-		switch (type)
+		reader.ReadPropertyName(options, out string key);
+		reader.Read();
+		var parts = key.Split('#');
+		if (parts.Length != 2)
 		{
-			case "completion":
-				{
-					var item = JsonSerializer.Deserialize<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Core.Search.CompletionSuggest<TDocument>>>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "phrase":
-				{
-					var item = JsonSerializer.Deserialize<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Core.Search.PhraseSuggest>>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
+			throw new System.Text.Json.JsonException($"Unable to parse typed-key '{key}' for variant '{nameof(IReadOnlyCollection<ISuggest>)}'.");
+		}
 
-			case "term":
-				{
-					var item = JsonSerializer.Deserialize<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Core.Search.TermSuggest>>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
+		var discriminator = parts[0];
+		name = parts[1];
+		value = discriminator switch
+		{
+			"completion" => reader.ReadValue<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Core.Search.CompletionSuggest<TDocument>>>(options),
+			"phrase" => reader.ReadValue<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Core.Search.PhraseSuggest>>(options),
+			"term" => reader.ReadValue<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Core.Search.TermSuggest>>(options),
+			_ => throw new System.Text.Json.JsonException($"Variant '{discriminator}' is not supported for type '{nameof(IReadOnlyCollection<ISuggest>)}'.")
+		};
+	}
 
+	internal static void WriteItem(System.Text.Json.Utf8JsonWriter writer, System.Text.Json.JsonSerializerOptions options, string name, IReadOnlyCollection<ISuggest> value)
+	{
+		var key = value.First().Type + '#' + name;
+		switch (value)
+		{
+			case IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Core.Search.CompletionSuggest<TDocument>> v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Core.Search.PhraseSuggest> v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Core.Search.TermSuggest> v:
+				writer.WriteProperty(options, key, v);
+				break;
 			default:
-				throw new NotSupportedException($"The tagged variant '{type}' is currently not supported.");
+				throw new System.Text.Json.JsonException($"Variant '{0}' is not supported for type '{nameof(IReadOnlyCollection<ISuggest>)}'.");
 		}
 	}
+}
+
+internal sealed partial class SuggestDictionaryConverterFactory : System.Text.Json.Serialization.JsonConverterFactory
+{
+	public override bool CanConvert(System.Type typeToConvert)
+	{
+		return typeToConvert.IsGenericType && typeToConvert.GetGenericTypeDefinition() == typeof(SuggestDictionary<>);
+	}
+
+	public override System.Text.Json.Serialization.JsonConverter CreateConverter(System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		var args = typeToConvert.GetGenericArguments();
+#pragma warning disable IL3050
+		var converter = (System.Text.Json.Serialization.JsonConverter)System.Activator.CreateInstance(typeof(SuggestDictionaryConverter<>).MakeGenericType(args[0]), System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public, binder: null, args: null, culture: null)!;
+#pragma warning restore IL3050
+		return converter;
+	}
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Search/Suggester.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Search/Suggester.g.cs
index 7f1dbc2d2f9..1fbf0b220e3 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Search/Suggester.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Search/Suggester.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,53 +28,49 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Core.Search;
 
-internal sealed partial class SuggesterConverter : JsonConverter<Suggester>
+internal sealed partial class SuggesterConverter : System.Text.Json.Serialization.JsonConverter<Suggester>
 {
-	public override Suggester Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropSuggesters = System.Text.Json.JsonEncodedText.Encode("suggesters");
+	private static readonly System.Text.Json.JsonEncodedText PropText = System.Text.Json.JsonEncodedText.Encode("text");
+
+	public override Suggester Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		var variant = new Suggester();
-		Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Core.Search.FieldSuggester> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Core.Search.FieldSuggester> propSuggesters = default;
+		LocalJsonProperty<string?> propText = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propText.TryRead(ref reader, options, PropText))
 			{
-				var property = reader.GetString();
-				if (property == "text")
-				{
-					variant.Text = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				additionalProperties ??= new Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Core.Search.FieldSuggester>();
-				var additionalValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Core.Search.FieldSuggester>(ref reader, options);
-				additionalProperties.Add(property, additionalValue);
+				continue;
 			}
+
+			propSuggesters ??= new System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Serverless.Core.Search.FieldSuggester>();
+			reader.ReadProperty(options, out string key, out Elastic.Clients.Elasticsearch.Serverless.Core.Search.FieldSuggester value);
+			propSuggesters[key] = value;
 		}
 
-		variant.Suggesters = additionalProperties;
-		return variant;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new Suggester
+		{
+			Suggesters = propSuggesters
+,
+			Text = propText.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, Suggester value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, Suggester value, System.Text.Json.JsonSerializerOptions options)
 	{
 		writer.WriteStartObject();
+		writer.WriteProperty(options, PropText, value.Text);
 		if (value.Suggesters is not null)
 		{
-			foreach (var additionalProperty in value.Suggesters)
+			foreach (var item in value.Suggesters)
 			{
-				writer.WritePropertyName(additionalProperty.Key);
-				JsonSerializer.Serialize(writer, additionalProperty.Value, options);
+				writer.WriteProperty(options, item.Key, item.Value);
 			}
 		}
 
-		if (!string.IsNullOrEmpty(value.Text))
-		{
-			writer.WritePropertyName("text");
-			writer.WriteStringValue(value.Text);
-		}
-
 		writer.WriteEndObject();
 	}
 }
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Search/TermSuggest.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Search/TermSuggest.g.cs
index 3f8e3ff522c..f56f9eca800 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Search/TermSuggest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Search/TermSuggest.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,15 +28,76 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Core.Search;
 
+internal sealed partial class TermSuggestConverter : System.Text.Json.Serialization.JsonConverter<TermSuggest>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropLength = System.Text.Json.JsonEncodedText.Encode("length");
+	private static readonly System.Text.Json.JsonEncodedText PropOffset = System.Text.Json.JsonEncodedText.Encode("offset");
+	private static readonly System.Text.Json.JsonEncodedText PropOptions = System.Text.Json.JsonEncodedText.Encode("options");
+	private static readonly System.Text.Json.JsonEncodedText PropText = System.Text.Json.JsonEncodedText.Encode("text");
+
+	public override TermSuggest Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<int> propLength = default;
+		LocalJsonProperty<int> propOffset = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Core.Search.TermSuggestOption>> propOptions = default;
+		LocalJsonProperty<string> propText = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propLength.TryRead(ref reader, options, PropLength))
+			{
+				continue;
+			}
+
+			if (propOffset.TryRead(ref reader, options, PropOffset))
+			{
+				continue;
+			}
+
+			if (propOptions.TryRead(ref reader, options, PropOptions, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Core.Search.TermSuggestOption>, Elastic.Clients.Elasticsearch.Serverless.Core.Search.TermSuggestOption>)))
+			{
+				continue;
+			}
+
+			if (propText.TryRead(ref reader, options, PropText))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new TermSuggest
+		{
+			Length = propLength.Value
+,
+			Offset = propOffset.Value
+,
+			Options = propOptions.Value
+,
+			Text = propText.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, TermSuggest value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropLength, value.Length);
+		writer.WriteProperty(options, PropOffset, value.Offset);
+		writer.WriteProperty(options, PropOptions, value.Options, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Core.Search.TermSuggestOption>, Elastic.Clients.Elasticsearch.Serverless.Core.Search.TermSuggestOption>));
+		writer.WriteProperty(options, PropText, value.Text);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(TermSuggestConverter))]
 public sealed partial class TermSuggest : ISuggest
 {
-	[JsonInclude, JsonPropertyName("length")]
 	public int Length { get; init; }
-	[JsonInclude, JsonPropertyName("offset")]
 	public int Offset { get; init; }
-	[JsonInclude, JsonPropertyName("options")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.Serverless.Core.Search.TermSuggestOption))]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Core.Search.TermSuggestOption> Options { get; init; }
-	[JsonInclude, JsonPropertyName("text")]
 	public string Text { get; init; }
+
+	string ISuggest.Type => "term";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enrich/EnrichPolicy.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enrich/EnrichPolicy.g.cs
index fdac64dac40..5500284fe36 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enrich/EnrichPolicy.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enrich/EnrichPolicy.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,20 +28,97 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Enrich;
 
+internal sealed partial class EnrichPolicyConverter : System.Text.Json.Serialization.JsonConverter<EnrichPolicy>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropElasticsearchVersion = System.Text.Json.JsonEncodedText.Encode("elasticsearch_version");
+	private static readonly System.Text.Json.JsonEncodedText PropEnrichFields = System.Text.Json.JsonEncodedText.Encode("enrich_fields");
+	private static readonly System.Text.Json.JsonEncodedText PropIndices = System.Text.Json.JsonEncodedText.Encode("indices");
+	private static readonly System.Text.Json.JsonEncodedText PropMatchField = System.Text.Json.JsonEncodedText.Encode("match_field");
+	private static readonly System.Text.Json.JsonEncodedText PropName = System.Text.Json.JsonEncodedText.Encode("name");
+	private static readonly System.Text.Json.JsonEncodedText PropQuery = System.Text.Json.JsonEncodedText.Encode("query");
+
+	public override EnrichPolicy Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string?> propElasticsearchVersion = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Fields> propEnrichFields = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Indices> propIndices = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Field> propMatchField = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Name?> propName = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query?> propQuery = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propElasticsearchVersion.TryRead(ref reader, options, PropElasticsearchVersion))
+			{
+				continue;
+			}
+
+			if (propEnrichFields.TryRead(ref reader, options, PropEnrichFields, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propIndices.TryRead(ref reader, options, PropIndices))
+			{
+				continue;
+			}
+
+			if (propMatchField.TryRead(ref reader, options, PropMatchField))
+			{
+				continue;
+			}
+
+			if (propName.TryRead(ref reader, options, PropName))
+			{
+				continue;
+			}
+
+			if (propQuery.TryRead(ref reader, options, PropQuery))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new EnrichPolicy
+		{
+			ElasticsearchVersion = propElasticsearchVersion.Value
+,
+			EnrichFields = propEnrichFields.Value
+,
+			Indices = propIndices.Value
+,
+			MatchField = propMatchField.Value
+,
+			Name = propName.Value
+,
+			Query = propQuery.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, EnrichPolicy value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropElasticsearchVersion, value.ElasticsearchVersion);
+		writer.WriteProperty(options, PropEnrichFields, value.EnrichFields, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropIndices, value.Indices);
+		writer.WriteProperty(options, PropMatchField, value.MatchField);
+		writer.WriteProperty(options, PropName, value.Name);
+		writer.WriteProperty(options, PropQuery, value.Query);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(EnrichPolicyConverter))]
 public sealed partial class EnrichPolicy
 {
-	[JsonInclude, JsonPropertyName("elasticsearch_version")]
 	public string? ElasticsearchVersion { get; set; }
-	[JsonInclude, JsonPropertyName("enrich_fields")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Serverless.Fields EnrichFields { get; set; }
-	[JsonInclude, JsonPropertyName("indices")]
 	public Elastic.Clients.Elasticsearch.Serverless.Indices Indices { get; set; }
-	[JsonInclude, JsonPropertyName("match_field")]
 	public Elastic.Clients.Elasticsearch.Serverless.Field MatchField { get; set; }
-	[JsonInclude, JsonPropertyName("name")]
 	public Elastic.Clients.Elasticsearch.Serverless.Name? Name { get; set; }
-	[JsonInclude, JsonPropertyName("query")]
 	public Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query? Query { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.Aggregations.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.Aggregations.g.cs
index a60560bba8e..d155b3767e8 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.Aggregations.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.Aggregations.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Core;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport;
 using System;
@@ -49,74 +50,102 @@ public enum CalendarInterval
 	Day
 }
 
-internal sealed class CalendarIntervalConverter : JsonConverter<CalendarInterval>
+internal sealed partial class CalendarIntervalConverter : System.Text.Json.Serialization.JsonConverter<CalendarInterval>
 {
-	public override CalendarInterval Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberYear = System.Text.Json.JsonEncodedText.Encode("year");
+	private static readonly System.Text.Json.JsonEncodedText MemberYear1 = System.Text.Json.JsonEncodedText.Encode("1y");
+	private static readonly System.Text.Json.JsonEncodedText MemberWeek = System.Text.Json.JsonEncodedText.Encode("week");
+	private static readonly System.Text.Json.JsonEncodedText MemberWeek1 = System.Text.Json.JsonEncodedText.Encode("1w");
+	private static readonly System.Text.Json.JsonEncodedText MemberSecond = System.Text.Json.JsonEncodedText.Encode("second");
+	private static readonly System.Text.Json.JsonEncodedText MemberSecond1 = System.Text.Json.JsonEncodedText.Encode("1s");
+	private static readonly System.Text.Json.JsonEncodedText MemberQuarter = System.Text.Json.JsonEncodedText.Encode("quarter");
+	private static readonly System.Text.Json.JsonEncodedText MemberQuarter1 = System.Text.Json.JsonEncodedText.Encode("1q");
+	private static readonly System.Text.Json.JsonEncodedText MemberMonth = System.Text.Json.JsonEncodedText.Encode("month");
+	private static readonly System.Text.Json.JsonEncodedText MemberMonth1 = System.Text.Json.JsonEncodedText.Encode("1M");
+	private static readonly System.Text.Json.JsonEncodedText MemberMinute = System.Text.Json.JsonEncodedText.Encode("minute");
+	private static readonly System.Text.Json.JsonEncodedText MemberMinute1 = System.Text.Json.JsonEncodedText.Encode("1m");
+	private static readonly System.Text.Json.JsonEncodedText MemberHour = System.Text.Json.JsonEncodedText.Encode("hour");
+	private static readonly System.Text.Json.JsonEncodedText MemberHour1 = System.Text.Json.JsonEncodedText.Encode("1h");
+	private static readonly System.Text.Json.JsonEncodedText MemberDay = System.Text.Json.JsonEncodedText.Encode("day");
+	private static readonly System.Text.Json.JsonEncodedText MemberDay1 = System.Text.Json.JsonEncodedText.Encode("1d");
+
+	public override CalendarInterval Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "year":
-			case "1y":
-				return CalendarInterval.Year;
-			case "week":
-			case "1w":
-				return CalendarInterval.Week;
-			case "second":
-			case "1s":
-				return CalendarInterval.Second;
-			case "quarter":
-			case "1q":
-				return CalendarInterval.Quarter;
-			case "month":
-			case "1M":
-				return CalendarInterval.Month;
-			case "minute":
-			case "1m":
-				return CalendarInterval.Minute;
-			case "hour":
-			case "1h":
-				return CalendarInterval.Hour;
-			case "day":
-			case "1d":
-				return CalendarInterval.Day;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberYear) || reader.ValueTextEquals(MemberYear1))
+		{
+			return CalendarInterval.Year;
+		}
+
+		if (reader.ValueTextEquals(MemberWeek) || reader.ValueTextEquals(MemberWeek1))
+		{
+			return CalendarInterval.Week;
+		}
+
+		if (reader.ValueTextEquals(MemberSecond) || reader.ValueTextEquals(MemberSecond1))
+		{
+			return CalendarInterval.Second;
+		}
+
+		if (reader.ValueTextEquals(MemberQuarter) || reader.ValueTextEquals(MemberQuarter1))
+		{
+			return CalendarInterval.Quarter;
+		}
+
+		if (reader.ValueTextEquals(MemberMonth) || reader.ValueTextEquals(MemberMonth1))
+		{
+			return CalendarInterval.Month;
+		}
+
+		if (reader.ValueTextEquals(MemberMinute) || reader.ValueTextEquals(MemberMinute1))
+		{
+			return CalendarInterval.Minute;
+		}
+
+		if (reader.ValueTextEquals(MemberHour) || reader.ValueTextEquals(MemberHour1))
+		{
+			return CalendarInterval.Hour;
+		}
+
+		if (reader.ValueTextEquals(MemberDay) || reader.ValueTextEquals(MemberDay1))
+		{
+			return CalendarInterval.Day;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(CalendarInterval)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, CalendarInterval value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, CalendarInterval value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case CalendarInterval.Year:
-				writer.WriteStringValue("year");
-				return;
+				writer.WriteStringValue(MemberYear);
+				break;
 			case CalendarInterval.Week:
-				writer.WriteStringValue("week");
-				return;
+				writer.WriteStringValue(MemberWeek);
+				break;
 			case CalendarInterval.Second:
-				writer.WriteStringValue("second");
-				return;
+				writer.WriteStringValue(MemberSecond);
+				break;
 			case CalendarInterval.Quarter:
-				writer.WriteStringValue("quarter");
-				return;
+				writer.WriteStringValue(MemberQuarter);
+				break;
 			case CalendarInterval.Month:
-				writer.WriteStringValue("month");
-				return;
+				writer.WriteStringValue(MemberMonth);
+				break;
 			case CalendarInterval.Minute:
-				writer.WriteStringValue("minute");
-				return;
+				writer.WriteStringValue(MemberMinute);
+				break;
 			case CalendarInterval.Hour:
-				writer.WriteStringValue("hour");
-				return;
+				writer.WriteStringValue(MemberHour);
+				break;
 			case CalendarInterval.Day:
-				writer.WriteStringValue("day");
-				return;
+				writer.WriteStringValue(MemberDay);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(CalendarInterval)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -160,51 +189,67 @@ public enum CardinalityExecutionMode
 	Direct
 }
 
-internal sealed class CardinalityExecutionModeConverter : JsonConverter<CardinalityExecutionMode>
+internal sealed partial class CardinalityExecutionModeConverter : System.Text.Json.Serialization.JsonConverter<CardinalityExecutionMode>
 {
-	public override CardinalityExecutionMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberSegmentOrdinals = System.Text.Json.JsonEncodedText.Encode("segment_ordinals");
+	private static readonly System.Text.Json.JsonEncodedText MemberSaveTimeHeuristic = System.Text.Json.JsonEncodedText.Encode("save_time_heuristic");
+	private static readonly System.Text.Json.JsonEncodedText MemberSaveMemoryHeuristic = System.Text.Json.JsonEncodedText.Encode("save_memory_heuristic");
+	private static readonly System.Text.Json.JsonEncodedText MemberGlobalOrdinals = System.Text.Json.JsonEncodedText.Encode("global_ordinals");
+	private static readonly System.Text.Json.JsonEncodedText MemberDirect = System.Text.Json.JsonEncodedText.Encode("direct");
+
+	public override CardinalityExecutionMode Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "segment_ordinals":
-				return CardinalityExecutionMode.SegmentOrdinals;
-			case "save_time_heuristic":
-				return CardinalityExecutionMode.SaveTimeHeuristic;
-			case "save_memory_heuristic":
-				return CardinalityExecutionMode.SaveMemoryHeuristic;
-			case "global_ordinals":
-				return CardinalityExecutionMode.GlobalOrdinals;
-			case "direct":
-				return CardinalityExecutionMode.Direct;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberSegmentOrdinals))
+		{
+			return CardinalityExecutionMode.SegmentOrdinals;
+		}
+
+		if (reader.ValueTextEquals(MemberSaveTimeHeuristic))
+		{
+			return CardinalityExecutionMode.SaveTimeHeuristic;
+		}
+
+		if (reader.ValueTextEquals(MemberSaveMemoryHeuristic))
+		{
+			return CardinalityExecutionMode.SaveMemoryHeuristic;
+		}
+
+		if (reader.ValueTextEquals(MemberGlobalOrdinals))
+		{
+			return CardinalityExecutionMode.GlobalOrdinals;
+		}
+
+		if (reader.ValueTextEquals(MemberDirect))
+		{
+			return CardinalityExecutionMode.Direct;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(CardinalityExecutionMode)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, CardinalityExecutionMode value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, CardinalityExecutionMode value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case CardinalityExecutionMode.SegmentOrdinals:
-				writer.WriteStringValue("segment_ordinals");
-				return;
+				writer.WriteStringValue(MemberSegmentOrdinals);
+				break;
 			case CardinalityExecutionMode.SaveTimeHeuristic:
-				writer.WriteStringValue("save_time_heuristic");
-				return;
+				writer.WriteStringValue(MemberSaveTimeHeuristic);
+				break;
 			case CardinalityExecutionMode.SaveMemoryHeuristic:
-				writer.WriteStringValue("save_memory_heuristic");
-				return;
+				writer.WriteStringValue(MemberSaveMemoryHeuristic);
+				break;
 			case CardinalityExecutionMode.GlobalOrdinals:
-				writer.WriteStringValue("global_ordinals");
-				return;
+				writer.WriteStringValue(MemberGlobalOrdinals);
+				break;
 			case CardinalityExecutionMode.Direct:
-				writer.WriteStringValue("direct");
-				return;
+				writer.WriteStringValue(MemberDirect);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(CardinalityExecutionMode)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -236,41 +281,49 @@ public enum GapPolicy
 	InsertZeros
 }
 
-internal sealed class GapPolicyConverter : JsonConverter<GapPolicy>
+internal sealed partial class GapPolicyConverter : System.Text.Json.Serialization.JsonConverter<GapPolicy>
 {
-	public override GapPolicy Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberSkip = System.Text.Json.JsonEncodedText.Encode("skip");
+	private static readonly System.Text.Json.JsonEncodedText MemberKeepValues = System.Text.Json.JsonEncodedText.Encode("keep_values");
+	private static readonly System.Text.Json.JsonEncodedText MemberInsertZeros = System.Text.Json.JsonEncodedText.Encode("insert_zeros");
+
+	public override GapPolicy Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberSkip))
+		{
+			return GapPolicy.Skip;
+		}
+
+		if (reader.ValueTextEquals(MemberKeepValues))
 		{
-			case "skip":
-				return GapPolicy.Skip;
-			case "keep_values":
-				return GapPolicy.KeepValues;
-			case "insert_zeros":
-				return GapPolicy.InsertZeros;
+			return GapPolicy.KeepValues;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberInsertZeros))
+		{
+			return GapPolicy.InsertZeros;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(GapPolicy)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, GapPolicy value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GapPolicy value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case GapPolicy.Skip:
-				writer.WriteStringValue("skip");
-				return;
+				writer.WriteStringValue(MemberSkip);
+				break;
 			case GapPolicy.KeepValues:
-				writer.WriteStringValue("keep_values");
-				return;
+				writer.WriteStringValue(MemberKeepValues);
+				break;
 			case GapPolicy.InsertZeros:
-				writer.WriteStringValue("insert_zeros");
-				return;
+				writer.WriteStringValue(MemberInsertZeros);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(GapPolicy)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -291,56 +344,76 @@ public enum MinimumInterval
 	Day
 }
 
-internal sealed class MinimumIntervalConverter : JsonConverter<MinimumInterval>
+internal sealed partial class MinimumIntervalConverter : System.Text.Json.Serialization.JsonConverter<MinimumInterval>
 {
-	public override MinimumInterval Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberYear = System.Text.Json.JsonEncodedText.Encode("year");
+	private static readonly System.Text.Json.JsonEncodedText MemberSecond = System.Text.Json.JsonEncodedText.Encode("second");
+	private static readonly System.Text.Json.JsonEncodedText MemberMonth = System.Text.Json.JsonEncodedText.Encode("month");
+	private static readonly System.Text.Json.JsonEncodedText MemberMinute = System.Text.Json.JsonEncodedText.Encode("minute");
+	private static readonly System.Text.Json.JsonEncodedText MemberHour = System.Text.Json.JsonEncodedText.Encode("hour");
+	private static readonly System.Text.Json.JsonEncodedText MemberDay = System.Text.Json.JsonEncodedText.Encode("day");
+
+	public override MinimumInterval Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "year":
-				return MinimumInterval.Year;
-			case "second":
-				return MinimumInterval.Second;
-			case "month":
-				return MinimumInterval.Month;
-			case "minute":
-				return MinimumInterval.Minute;
-			case "hour":
-				return MinimumInterval.Hour;
-			case "day":
-				return MinimumInterval.Day;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberYear))
+		{
+			return MinimumInterval.Year;
+		}
+
+		if (reader.ValueTextEquals(MemberSecond))
+		{
+			return MinimumInterval.Second;
+		}
+
+		if (reader.ValueTextEquals(MemberMonth))
+		{
+			return MinimumInterval.Month;
+		}
+
+		if (reader.ValueTextEquals(MemberMinute))
+		{
+			return MinimumInterval.Minute;
+		}
+
+		if (reader.ValueTextEquals(MemberHour))
+		{
+			return MinimumInterval.Hour;
+		}
+
+		if (reader.ValueTextEquals(MemberDay))
+		{
+			return MinimumInterval.Day;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(MinimumInterval)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, MinimumInterval value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, MinimumInterval value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case MinimumInterval.Year:
-				writer.WriteStringValue("year");
-				return;
+				writer.WriteStringValue(MemberYear);
+				break;
 			case MinimumInterval.Second:
-				writer.WriteStringValue("second");
-				return;
+				writer.WriteStringValue(MemberSecond);
+				break;
 			case MinimumInterval.Month:
-				writer.WriteStringValue("month");
-				return;
+				writer.WriteStringValue(MemberMonth);
+				break;
 			case MinimumInterval.Minute:
-				writer.WriteStringValue("minute");
-				return;
+				writer.WriteStringValue(MemberMinute);
+				break;
 			case MinimumInterval.Hour:
-				writer.WriteStringValue("hour");
-				return;
+				writer.WriteStringValue(MemberHour);
+				break;
 			case MinimumInterval.Day:
-				writer.WriteStringValue("day");
-				return;
+				writer.WriteStringValue(MemberDay);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(MinimumInterval)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -355,41 +428,49 @@ public enum MissingOrder
 	Default
 }
 
-internal sealed class MissingOrderConverter : JsonConverter<MissingOrder>
+internal sealed partial class MissingOrderConverter : System.Text.Json.Serialization.JsonConverter<MissingOrder>
 {
-	public override MissingOrder Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberLast = System.Text.Json.JsonEncodedText.Encode("last");
+	private static readonly System.Text.Json.JsonEncodedText MemberFirst = System.Text.Json.JsonEncodedText.Encode("first");
+	private static readonly System.Text.Json.JsonEncodedText MemberDefault = System.Text.Json.JsonEncodedText.Encode("default");
+
+	public override MissingOrder Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberLast))
 		{
-			case "last":
-				return MissingOrder.Last;
-			case "first":
-				return MissingOrder.First;
-			case "default":
-				return MissingOrder.Default;
+			return MissingOrder.Last;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberFirst))
+		{
+			return MissingOrder.First;
+		}
+
+		if (reader.ValueTextEquals(MemberDefault))
+		{
+			return MissingOrder.Default;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(MissingOrder)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, MissingOrder value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, MissingOrder value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case MissingOrder.Last:
-				writer.WriteStringValue("last");
-				return;
+				writer.WriteStringValue(MemberLast);
+				break;
 			case MissingOrder.First:
-				writer.WriteStringValue("first");
-				return;
+				writer.WriteStringValue(MemberFirst);
+				break;
 			case MissingOrder.Default:
-				writer.WriteStringValue("default");
-				return;
+				writer.WriteStringValue(MemberDefault);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(MissingOrder)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -440,56 +521,76 @@ public enum NormalizeMethod
 	Mean
 }
 
-internal sealed class NormalizeMethodConverter : JsonConverter<NormalizeMethod>
+internal sealed partial class NormalizeMethodConverter : System.Text.Json.Serialization.JsonConverter<NormalizeMethod>
 {
-	public override NormalizeMethod Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberZScore = System.Text.Json.JsonEncodedText.Encode("z-score");
+	private static readonly System.Text.Json.JsonEncodedText MemberSoftmax = System.Text.Json.JsonEncodedText.Encode("softmax");
+	private static readonly System.Text.Json.JsonEncodedText MemberRescale0100 = System.Text.Json.JsonEncodedText.Encode("rescale_0_100");
+	private static readonly System.Text.Json.JsonEncodedText MemberRescale01 = System.Text.Json.JsonEncodedText.Encode("rescale_0_1");
+	private static readonly System.Text.Json.JsonEncodedText MemberPercentOfSum = System.Text.Json.JsonEncodedText.Encode("percent_of_sum");
+	private static readonly System.Text.Json.JsonEncodedText MemberMean = System.Text.Json.JsonEncodedText.Encode("mean");
+
+	public override NormalizeMethod Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "z-score":
-				return NormalizeMethod.ZScore;
-			case "softmax":
-				return NormalizeMethod.Softmax;
-			case "rescale_0_100":
-				return NormalizeMethod.Rescale0100;
-			case "rescale_0_1":
-				return NormalizeMethod.Rescale01;
-			case "percent_of_sum":
-				return NormalizeMethod.PercentOfSum;
-			case "mean":
-				return NormalizeMethod.Mean;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberZScore))
+		{
+			return NormalizeMethod.ZScore;
+		}
+
+		if (reader.ValueTextEquals(MemberSoftmax))
+		{
+			return NormalizeMethod.Softmax;
+		}
+
+		if (reader.ValueTextEquals(MemberRescale0100))
+		{
+			return NormalizeMethod.Rescale0100;
+		}
+
+		if (reader.ValueTextEquals(MemberRescale01))
+		{
+			return NormalizeMethod.Rescale01;
+		}
+
+		if (reader.ValueTextEquals(MemberPercentOfSum))
+		{
+			return NormalizeMethod.PercentOfSum;
+		}
+
+		if (reader.ValueTextEquals(MemberMean))
+		{
+			return NormalizeMethod.Mean;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(NormalizeMethod)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, NormalizeMethod value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, NormalizeMethod value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case NormalizeMethod.ZScore:
-				writer.WriteStringValue("z-score");
-				return;
+				writer.WriteStringValue(MemberZScore);
+				break;
 			case NormalizeMethod.Softmax:
-				writer.WriteStringValue("softmax");
-				return;
+				writer.WriteStringValue(MemberSoftmax);
+				break;
 			case NormalizeMethod.Rescale0100:
-				writer.WriteStringValue("rescale_0_100");
-				return;
+				writer.WriteStringValue(MemberRescale0100);
+				break;
 			case NormalizeMethod.Rescale01:
-				writer.WriteStringValue("rescale_0_1");
-				return;
+				writer.WriteStringValue(MemberRescale01);
+				break;
 			case NormalizeMethod.PercentOfSum:
-				writer.WriteStringValue("percent_of_sum");
-				return;
+				writer.WriteStringValue(MemberPercentOfSum);
+				break;
 			case NormalizeMethod.Mean:
-				writer.WriteStringValue("mean");
-				return;
+				writer.WriteStringValue(MemberMean);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(NormalizeMethod)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -512,36 +613,40 @@ public enum RateMode
 	Sum
 }
 
-internal sealed class RateModeConverter : JsonConverter<RateMode>
+internal sealed partial class RateModeConverter : System.Text.Json.Serialization.JsonConverter<RateMode>
 {
-	public override RateMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberValueCount = System.Text.Json.JsonEncodedText.Encode("value_count");
+	private static readonly System.Text.Json.JsonEncodedText MemberSum = System.Text.Json.JsonEncodedText.Encode("sum");
+
+	public override RateMode Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberValueCount))
 		{
-			case "value_count":
-				return RateMode.ValueCount;
-			case "sum":
-				return RateMode.Sum;
+			return RateMode.ValueCount;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberSum))
+		{
+			return RateMode.Sum;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(RateMode)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, RateMode value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, RateMode value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case RateMode.ValueCount:
-				writer.WriteStringValue("value_count");
-				return;
+				writer.WriteStringValue(MemberValueCount);
+				break;
 			case RateMode.Sum:
-				writer.WriteStringValue("sum");
-				return;
+				writer.WriteStringValue(MemberSum);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(RateMode)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -571,41 +676,49 @@ public enum SamplerAggregationExecutionHint
 	BytesHash
 }
 
-internal sealed class SamplerAggregationExecutionHintConverter : JsonConverter<SamplerAggregationExecutionHint>
+internal sealed partial class SamplerAggregationExecutionHintConverter : System.Text.Json.Serialization.JsonConverter<SamplerAggregationExecutionHint>
 {
-	public override SamplerAggregationExecutionHint Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberMap = System.Text.Json.JsonEncodedText.Encode("map");
+	private static readonly System.Text.Json.JsonEncodedText MemberGlobalOrdinals = System.Text.Json.JsonEncodedText.Encode("global_ordinals");
+	private static readonly System.Text.Json.JsonEncodedText MemberBytesHash = System.Text.Json.JsonEncodedText.Encode("bytes_hash");
+
+	public override SamplerAggregationExecutionHint Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberMap))
 		{
-			case "map":
-				return SamplerAggregationExecutionHint.Map;
-			case "global_ordinals":
-				return SamplerAggregationExecutionHint.GlobalOrdinals;
-			case "bytes_hash":
-				return SamplerAggregationExecutionHint.BytesHash;
+			return SamplerAggregationExecutionHint.Map;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberGlobalOrdinals))
+		{
+			return SamplerAggregationExecutionHint.GlobalOrdinals;
+		}
+
+		if (reader.ValueTextEquals(MemberBytesHash))
+		{
+			return SamplerAggregationExecutionHint.BytesHash;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(SamplerAggregationExecutionHint)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, SamplerAggregationExecutionHint value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SamplerAggregationExecutionHint value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case SamplerAggregationExecutionHint.Map:
-				writer.WriteStringValue("map");
-				return;
+				writer.WriteStringValue(MemberMap);
+				break;
 			case SamplerAggregationExecutionHint.GlobalOrdinals:
-				writer.WriteStringValue("global_ordinals");
-				return;
+				writer.WriteStringValue(MemberGlobalOrdinals);
+				break;
 			case SamplerAggregationExecutionHint.BytesHash:
-				writer.WriteStringValue("bytes_hash");
-				return;
+				writer.WriteStringValue(MemberBytesHash);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(SamplerAggregationExecutionHint)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -628,36 +741,40 @@ public enum TermsAggregationCollectMode
 	BreadthFirst
 }
 
-internal sealed class TermsAggregationCollectModeConverter : JsonConverter<TermsAggregationCollectMode>
+internal sealed partial class TermsAggregationCollectModeConverter : System.Text.Json.Serialization.JsonConverter<TermsAggregationCollectMode>
 {
-	public override TermsAggregationCollectMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberDepthFirst = System.Text.Json.JsonEncodedText.Encode("depth_first");
+	private static readonly System.Text.Json.JsonEncodedText MemberBreadthFirst = System.Text.Json.JsonEncodedText.Encode("breadth_first");
+
+	public override TermsAggregationCollectMode Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberDepthFirst))
+		{
+			return TermsAggregationCollectMode.DepthFirst;
+		}
+
+		if (reader.ValueTextEquals(MemberBreadthFirst))
 		{
-			case "depth_first":
-				return TermsAggregationCollectMode.DepthFirst;
-			case "breadth_first":
-				return TermsAggregationCollectMode.BreadthFirst;
+			return TermsAggregationCollectMode.BreadthFirst;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(TermsAggregationCollectMode)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, TermsAggregationCollectMode value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, TermsAggregationCollectMode value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case TermsAggregationCollectMode.DepthFirst:
-				writer.WriteStringValue("depth_first");
-				return;
+				writer.WriteStringValue(MemberDepthFirst);
+				break;
 			case TermsAggregationCollectMode.BreadthFirst:
-				writer.WriteStringValue("breadth_first");
-				return;
+				writer.WriteStringValue(MemberBreadthFirst);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(TermsAggregationCollectMode)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -674,46 +791,58 @@ public enum TermsAggregationExecutionHint
 	GlobalOrdinals
 }
 
-internal sealed class TermsAggregationExecutionHintConverter : JsonConverter<TermsAggregationExecutionHint>
+internal sealed partial class TermsAggregationExecutionHintConverter : System.Text.Json.Serialization.JsonConverter<TermsAggregationExecutionHint>
 {
-	public override TermsAggregationExecutionHint Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberMap = System.Text.Json.JsonEncodedText.Encode("map");
+	private static readonly System.Text.Json.JsonEncodedText MemberGlobalOrdinalsLowCardinality = System.Text.Json.JsonEncodedText.Encode("global_ordinals_low_cardinality");
+	private static readonly System.Text.Json.JsonEncodedText MemberGlobalOrdinalsHash = System.Text.Json.JsonEncodedText.Encode("global_ordinals_hash");
+	private static readonly System.Text.Json.JsonEncodedText MemberGlobalOrdinals = System.Text.Json.JsonEncodedText.Encode("global_ordinals");
+
+	public override TermsAggregationExecutionHint Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberMap))
+		{
+			return TermsAggregationExecutionHint.Map;
+		}
+
+		if (reader.ValueTextEquals(MemberGlobalOrdinalsLowCardinality))
+		{
+			return TermsAggregationExecutionHint.GlobalOrdinalsLowCardinality;
+		}
+
+		if (reader.ValueTextEquals(MemberGlobalOrdinalsHash))
+		{
+			return TermsAggregationExecutionHint.GlobalOrdinalsHash;
+		}
+
+		if (reader.ValueTextEquals(MemberGlobalOrdinals))
 		{
-			case "map":
-				return TermsAggregationExecutionHint.Map;
-			case "global_ordinals_low_cardinality":
-				return TermsAggregationExecutionHint.GlobalOrdinalsLowCardinality;
-			case "global_ordinals_hash":
-				return TermsAggregationExecutionHint.GlobalOrdinalsHash;
-			case "global_ordinals":
-				return TermsAggregationExecutionHint.GlobalOrdinals;
+			return TermsAggregationExecutionHint.GlobalOrdinals;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(TermsAggregationExecutionHint)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, TermsAggregationExecutionHint value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, TermsAggregationExecutionHint value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case TermsAggregationExecutionHint.Map:
-				writer.WriteStringValue("map");
-				return;
+				writer.WriteStringValue(MemberMap);
+				break;
 			case TermsAggregationExecutionHint.GlobalOrdinalsLowCardinality:
-				writer.WriteStringValue("global_ordinals_low_cardinality");
-				return;
+				writer.WriteStringValue(MemberGlobalOrdinalsLowCardinality);
+				break;
 			case TermsAggregationExecutionHint.GlobalOrdinalsHash:
-				writer.WriteStringValue("global_ordinals_hash");
-				return;
+				writer.WriteStringValue(MemberGlobalOrdinalsHash);
+				break;
 			case TermsAggregationExecutionHint.GlobalOrdinals:
-				writer.WriteStringValue("global_ordinals");
-				return;
+				writer.WriteStringValue(MemberGlobalOrdinals);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(TermsAggregationExecutionHint)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -743,41 +872,49 @@ public enum TTestType
 	Heteroscedastic
 }
 
-internal sealed class TTestTypeConverter : JsonConverter<TTestType>
+internal sealed partial class TTestTypeConverter : System.Text.Json.Serialization.JsonConverter<TTestType>
 {
-	public override TTestType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberPaired = System.Text.Json.JsonEncodedText.Encode("paired");
+	private static readonly System.Text.Json.JsonEncodedText MemberHomoscedastic = System.Text.Json.JsonEncodedText.Encode("homoscedastic");
+	private static readonly System.Text.Json.JsonEncodedText MemberHeteroscedastic = System.Text.Json.JsonEncodedText.Encode("heteroscedastic");
+
+	public override TTestType Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberPaired))
+		{
+			return TTestType.Paired;
+		}
+
+		if (reader.ValueTextEquals(MemberHomoscedastic))
 		{
-			case "paired":
-				return TTestType.Paired;
-			case "homoscedastic":
-				return TTestType.Homoscedastic;
-			case "heteroscedastic":
-				return TTestType.Heteroscedastic;
+			return TTestType.Homoscedastic;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberHeteroscedastic))
+		{
+			return TTestType.Heteroscedastic;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(TTestType)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, TTestType value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, TTestType value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case TTestType.Paired:
-				writer.WriteStringValue("paired");
-				return;
+				writer.WriteStringValue(MemberPaired);
+				break;
 			case TTestType.Homoscedastic:
-				writer.WriteStringValue("homoscedastic");
-				return;
+				writer.WriteStringValue(MemberHomoscedastic);
+				break;
 			case TTestType.Heteroscedastic:
-				writer.WriteStringValue("heteroscedastic");
-				return;
+				writer.WriteStringValue(MemberHeteroscedastic);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(TTestType)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -806,75 +943,111 @@ public enum ValueType
 	Boolean
 }
 
-internal sealed class ValueTypeConverter : JsonConverter<ValueType>
+internal sealed partial class ValueTypeConverter : System.Text.Json.Serialization.JsonConverter<ValueType>
 {
-	public override ValueType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberString = System.Text.Json.JsonEncodedText.Encode("string");
+	private static readonly System.Text.Json.JsonEncodedText MemberNumeric = System.Text.Json.JsonEncodedText.Encode("numeric");
+	private static readonly System.Text.Json.JsonEncodedText MemberNumber = System.Text.Json.JsonEncodedText.Encode("number");
+	private static readonly System.Text.Json.JsonEncodedText MemberLong = System.Text.Json.JsonEncodedText.Encode("long");
+	private static readonly System.Text.Json.JsonEncodedText MemberIp = System.Text.Json.JsonEncodedText.Encode("ip");
+	private static readonly System.Text.Json.JsonEncodedText MemberGeoPoint = System.Text.Json.JsonEncodedText.Encode("geo_point");
+	private static readonly System.Text.Json.JsonEncodedText MemberDouble = System.Text.Json.JsonEncodedText.Encode("double");
+	private static readonly System.Text.Json.JsonEncodedText MemberDateNanos = System.Text.Json.JsonEncodedText.Encode("date_nanos");
+	private static readonly System.Text.Json.JsonEncodedText MemberDate = System.Text.Json.JsonEncodedText.Encode("date");
+	private static readonly System.Text.Json.JsonEncodedText MemberBoolean = System.Text.Json.JsonEncodedText.Encode("boolean");
+
+	public override ValueType Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "string":
-				return ValueType.String;
-			case "numeric":
-				return ValueType.Numeric;
-			case "number":
-				return ValueType.Number;
-			case "long":
-				return ValueType.Long;
-			case "ip":
-				return ValueType.Ip;
-			case "geo_point":
-				return ValueType.GeoPoint;
-			case "double":
-				return ValueType.Double;
-			case "date_nanos":
-				return ValueType.DateNanos;
-			case "date":
-				return ValueType.Date;
-			case "boolean":
-				return ValueType.Boolean;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberString))
+		{
+			return ValueType.String;
+		}
+
+		if (reader.ValueTextEquals(MemberNumeric))
+		{
+			return ValueType.Numeric;
+		}
+
+		if (reader.ValueTextEquals(MemberNumber))
+		{
+			return ValueType.Number;
+		}
+
+		if (reader.ValueTextEquals(MemberLong))
+		{
+			return ValueType.Long;
+		}
+
+		if (reader.ValueTextEquals(MemberIp))
+		{
+			return ValueType.Ip;
+		}
+
+		if (reader.ValueTextEquals(MemberGeoPoint))
+		{
+			return ValueType.GeoPoint;
+		}
+
+		if (reader.ValueTextEquals(MemberDouble))
+		{
+			return ValueType.Double;
+		}
+
+		if (reader.ValueTextEquals(MemberDateNanos))
+		{
+			return ValueType.DateNanos;
+		}
+
+		if (reader.ValueTextEquals(MemberDate))
+		{
+			return ValueType.Date;
+		}
+
+		if (reader.ValueTextEquals(MemberBoolean))
+		{
+			return ValueType.Boolean;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(ValueType)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, ValueType value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ValueType value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case ValueType.String:
-				writer.WriteStringValue("string");
-				return;
+				writer.WriteStringValue(MemberString);
+				break;
 			case ValueType.Numeric:
-				writer.WriteStringValue("numeric");
-				return;
+				writer.WriteStringValue(MemberNumeric);
+				break;
 			case ValueType.Number:
-				writer.WriteStringValue("number");
-				return;
+				writer.WriteStringValue(MemberNumber);
+				break;
 			case ValueType.Long:
-				writer.WriteStringValue("long");
-				return;
+				writer.WriteStringValue(MemberLong);
+				break;
 			case ValueType.Ip:
-				writer.WriteStringValue("ip");
-				return;
+				writer.WriteStringValue(MemberIp);
+				break;
 			case ValueType.GeoPoint:
-				writer.WriteStringValue("geo_point");
-				return;
+				writer.WriteStringValue(MemberGeoPoint);
+				break;
 			case ValueType.Double:
-				writer.WriteStringValue("double");
-				return;
+				writer.WriteStringValue(MemberDouble);
+				break;
 			case ValueType.DateNanos:
-				writer.WriteStringValue("date_nanos");
-				return;
+				writer.WriteStringValue(MemberDateNanos);
+				break;
 			case ValueType.Date:
-				writer.WriteStringValue("date");
-				return;
+				writer.WriteStringValue(MemberDate);
+				break;
 			case ValueType.Boolean:
-				writer.WriteStringValue("boolean");
-				return;
+				writer.WriteStringValue(MemberBoolean);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(ValueType)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.Analysis.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.Analysis.g.cs
index 3cc97f3f7a2..6e69ac8d730 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.Analysis.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.Analysis.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Core;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport;
 using System;
@@ -39,41 +40,49 @@ public enum DelimitedPayloadEncoding
 	Float
 }
 
-internal sealed class DelimitedPayloadEncodingConverter : JsonConverter<DelimitedPayloadEncoding>
+internal sealed partial class DelimitedPayloadEncodingConverter : System.Text.Json.Serialization.JsonConverter<DelimitedPayloadEncoding>
 {
-	public override DelimitedPayloadEncoding Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberInteger = System.Text.Json.JsonEncodedText.Encode("int");
+	private static readonly System.Text.Json.JsonEncodedText MemberIdentity = System.Text.Json.JsonEncodedText.Encode("identity");
+	private static readonly System.Text.Json.JsonEncodedText MemberFloat = System.Text.Json.JsonEncodedText.Encode("float");
+
+	public override DelimitedPayloadEncoding Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberInteger))
+		{
+			return DelimitedPayloadEncoding.Integer;
+		}
+
+		if (reader.ValueTextEquals(MemberIdentity))
+		{
+			return DelimitedPayloadEncoding.Identity;
+		}
+
+		if (reader.ValueTextEquals(MemberFloat))
 		{
-			case "int":
-				return DelimitedPayloadEncoding.Integer;
-			case "identity":
-				return DelimitedPayloadEncoding.Identity;
-			case "float":
-				return DelimitedPayloadEncoding.Float;
+			return DelimitedPayloadEncoding.Float;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(DelimitedPayloadEncoding)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, DelimitedPayloadEncoding value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DelimitedPayloadEncoding value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case DelimitedPayloadEncoding.Integer:
-				writer.WriteStringValue("int");
-				return;
+				writer.WriteStringValue(MemberInteger);
+				break;
 			case DelimitedPayloadEncoding.Identity:
-				writer.WriteStringValue("identity");
-				return;
+				writer.WriteStringValue(MemberIdentity);
+				break;
 			case DelimitedPayloadEncoding.Float:
-				writer.WriteStringValue("float");
-				return;
+				writer.WriteStringValue(MemberFloat);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(DelimitedPayloadEncoding)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -86,36 +95,40 @@ public enum EdgeNGramSide
 	Back
 }
 
-internal sealed class EdgeNGramSideConverter : JsonConverter<EdgeNGramSide>
+internal sealed partial class EdgeNGramSideConverter : System.Text.Json.Serialization.JsonConverter<EdgeNGramSide>
 {
-	public override EdgeNGramSide Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberFront = System.Text.Json.JsonEncodedText.Encode("front");
+	private static readonly System.Text.Json.JsonEncodedText MemberBack = System.Text.Json.JsonEncodedText.Encode("back");
+
+	public override EdgeNGramSide Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberFront))
+		{
+			return EdgeNGramSide.Front;
+		}
+
+		if (reader.ValueTextEquals(MemberBack))
 		{
-			case "front":
-				return EdgeNGramSide.Front;
-			case "back":
-				return EdgeNGramSide.Back;
+			return EdgeNGramSide.Back;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(EdgeNGramSide)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, EdgeNGramSide value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, EdgeNGramSide value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case EdgeNGramSide.Front:
-				writer.WriteStringValue("front");
-				return;
+				writer.WriteStringValue(MemberFront);
+				break;
 			case EdgeNGramSide.Back:
-				writer.WriteStringValue("back");
-				return;
+				writer.WriteStringValue(MemberBack);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(EdgeNGramSide)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -128,36 +141,40 @@ public enum IcuCollationAlternate
 	NonIgnorable
 }
 
-internal sealed class IcuCollationAlternateConverter : JsonConverter<IcuCollationAlternate>
+internal sealed partial class IcuCollationAlternateConverter : System.Text.Json.Serialization.JsonConverter<IcuCollationAlternate>
 {
-	public override IcuCollationAlternate Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberShifted = System.Text.Json.JsonEncodedText.Encode("shifted");
+	private static readonly System.Text.Json.JsonEncodedText MemberNonIgnorable = System.Text.Json.JsonEncodedText.Encode("non-ignorable");
+
+	public override IcuCollationAlternate Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberShifted))
+		{
+			return IcuCollationAlternate.Shifted;
+		}
+
+		if (reader.ValueTextEquals(MemberNonIgnorable))
 		{
-			case "shifted":
-				return IcuCollationAlternate.Shifted;
-			case "non-ignorable":
-				return IcuCollationAlternate.NonIgnorable;
+			return IcuCollationAlternate.NonIgnorable;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(IcuCollationAlternate)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, IcuCollationAlternate value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IcuCollationAlternate value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case IcuCollationAlternate.Shifted:
-				writer.WriteStringValue("shifted");
-				return;
+				writer.WriteStringValue(MemberShifted);
+				break;
 			case IcuCollationAlternate.NonIgnorable:
-				writer.WriteStringValue("non-ignorable");
-				return;
+				writer.WriteStringValue(MemberNonIgnorable);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(IcuCollationAlternate)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -170,36 +187,40 @@ public enum IcuCollationCaseFirst
 	Lower
 }
 
-internal sealed class IcuCollationCaseFirstConverter : JsonConverter<IcuCollationCaseFirst>
+internal sealed partial class IcuCollationCaseFirstConverter : System.Text.Json.Serialization.JsonConverter<IcuCollationCaseFirst>
 {
-	public override IcuCollationCaseFirst Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberUpper = System.Text.Json.JsonEncodedText.Encode("upper");
+	private static readonly System.Text.Json.JsonEncodedText MemberLower = System.Text.Json.JsonEncodedText.Encode("lower");
+
+	public override IcuCollationCaseFirst Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberUpper))
 		{
-			case "upper":
-				return IcuCollationCaseFirst.Upper;
-			case "lower":
-				return IcuCollationCaseFirst.Lower;
+			return IcuCollationCaseFirst.Upper;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberLower))
+		{
+			return IcuCollationCaseFirst.Lower;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(IcuCollationCaseFirst)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, IcuCollationCaseFirst value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IcuCollationCaseFirst value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case IcuCollationCaseFirst.Upper:
-				writer.WriteStringValue("upper");
-				return;
+				writer.WriteStringValue(MemberUpper);
+				break;
 			case IcuCollationCaseFirst.Lower:
-				writer.WriteStringValue("lower");
-				return;
+				writer.WriteStringValue(MemberLower);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(IcuCollationCaseFirst)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -212,36 +233,40 @@ public enum IcuCollationDecomposition
 	Identical
 }
 
-internal sealed class IcuCollationDecompositionConverter : JsonConverter<IcuCollationDecomposition>
+internal sealed partial class IcuCollationDecompositionConverter : System.Text.Json.Serialization.JsonConverter<IcuCollationDecomposition>
 {
-	public override IcuCollationDecomposition Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberNo = System.Text.Json.JsonEncodedText.Encode("no");
+	private static readonly System.Text.Json.JsonEncodedText MemberIdentical = System.Text.Json.JsonEncodedText.Encode("identical");
+
+	public override IcuCollationDecomposition Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberNo))
+		{
+			return IcuCollationDecomposition.No;
+		}
+
+		if (reader.ValueTextEquals(MemberIdentical))
 		{
-			case "no":
-				return IcuCollationDecomposition.No;
-			case "identical":
-				return IcuCollationDecomposition.Identical;
+			return IcuCollationDecomposition.Identical;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(IcuCollationDecomposition)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, IcuCollationDecomposition value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IcuCollationDecomposition value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case IcuCollationDecomposition.No:
-				writer.WriteStringValue("no");
-				return;
+				writer.WriteStringValue(MemberNo);
+				break;
 			case IcuCollationDecomposition.Identical:
-				writer.WriteStringValue("identical");
-				return;
+				writer.WriteStringValue(MemberIdentical);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(IcuCollationDecomposition)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -260,51 +285,67 @@ public enum IcuCollationStrength
 	Identical
 }
 
-internal sealed class IcuCollationStrengthConverter : JsonConverter<IcuCollationStrength>
+internal sealed partial class IcuCollationStrengthConverter : System.Text.Json.Serialization.JsonConverter<IcuCollationStrength>
 {
-	public override IcuCollationStrength Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberTertiary = System.Text.Json.JsonEncodedText.Encode("tertiary");
+	private static readonly System.Text.Json.JsonEncodedText MemberSecondary = System.Text.Json.JsonEncodedText.Encode("secondary");
+	private static readonly System.Text.Json.JsonEncodedText MemberQuaternary = System.Text.Json.JsonEncodedText.Encode("quaternary");
+	private static readonly System.Text.Json.JsonEncodedText MemberPrimary = System.Text.Json.JsonEncodedText.Encode("primary");
+	private static readonly System.Text.Json.JsonEncodedText MemberIdentical = System.Text.Json.JsonEncodedText.Encode("identical");
+
+	public override IcuCollationStrength Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "tertiary":
-				return IcuCollationStrength.Tertiary;
-			case "secondary":
-				return IcuCollationStrength.Secondary;
-			case "quaternary":
-				return IcuCollationStrength.Quaternary;
-			case "primary":
-				return IcuCollationStrength.Primary;
-			case "identical":
-				return IcuCollationStrength.Identical;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberTertiary))
+		{
+			return IcuCollationStrength.Tertiary;
+		}
+
+		if (reader.ValueTextEquals(MemberSecondary))
+		{
+			return IcuCollationStrength.Secondary;
+		}
+
+		if (reader.ValueTextEquals(MemberQuaternary))
+		{
+			return IcuCollationStrength.Quaternary;
+		}
+
+		if (reader.ValueTextEquals(MemberPrimary))
+		{
+			return IcuCollationStrength.Primary;
+		}
+
+		if (reader.ValueTextEquals(MemberIdentical))
+		{
+			return IcuCollationStrength.Identical;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(IcuCollationStrength)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, IcuCollationStrength value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IcuCollationStrength value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case IcuCollationStrength.Tertiary:
-				writer.WriteStringValue("tertiary");
-				return;
+				writer.WriteStringValue(MemberTertiary);
+				break;
 			case IcuCollationStrength.Secondary:
-				writer.WriteStringValue("secondary");
-				return;
+				writer.WriteStringValue(MemberSecondary);
+				break;
 			case IcuCollationStrength.Quaternary:
-				writer.WriteStringValue("quaternary");
-				return;
+				writer.WriteStringValue(MemberQuaternary);
+				break;
 			case IcuCollationStrength.Primary:
-				writer.WriteStringValue("primary");
-				return;
+				writer.WriteStringValue(MemberPrimary);
+				break;
 			case IcuCollationStrength.Identical:
-				writer.WriteStringValue("identical");
-				return;
+				writer.WriteStringValue(MemberIdentical);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(IcuCollationStrength)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -317,36 +358,40 @@ public enum IcuNormalizationMode
 	Compose
 }
 
-internal sealed class IcuNormalizationModeConverter : JsonConverter<IcuNormalizationMode>
+internal sealed partial class IcuNormalizationModeConverter : System.Text.Json.Serialization.JsonConverter<IcuNormalizationMode>
 {
-	public override IcuNormalizationMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberDecompose = System.Text.Json.JsonEncodedText.Encode("decompose");
+	private static readonly System.Text.Json.JsonEncodedText MemberCompose = System.Text.Json.JsonEncodedText.Encode("compose");
+
+	public override IcuNormalizationMode Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberDecompose))
 		{
-			case "decompose":
-				return IcuNormalizationMode.Decompose;
-			case "compose":
-				return IcuNormalizationMode.Compose;
+			return IcuNormalizationMode.Decompose;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberCompose))
+		{
+			return IcuNormalizationMode.Compose;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(IcuNormalizationMode)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, IcuNormalizationMode value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IcuNormalizationMode value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case IcuNormalizationMode.Decompose:
-				writer.WriteStringValue("decompose");
-				return;
+				writer.WriteStringValue(MemberDecompose);
+				break;
 			case IcuNormalizationMode.Compose:
-				writer.WriteStringValue("compose");
-				return;
+				writer.WriteStringValue(MemberCompose);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(IcuNormalizationMode)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -361,41 +406,49 @@ public enum IcuNormalizationType
 	Nfc
 }
 
-internal sealed class IcuNormalizationTypeConverter : JsonConverter<IcuNormalizationType>
+internal sealed partial class IcuNormalizationTypeConverter : System.Text.Json.Serialization.JsonConverter<IcuNormalizationType>
 {
-	public override IcuNormalizationType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberNfkcCf = System.Text.Json.JsonEncodedText.Encode("nfkc_cf");
+	private static readonly System.Text.Json.JsonEncodedText MemberNfkc = System.Text.Json.JsonEncodedText.Encode("nfkc");
+	private static readonly System.Text.Json.JsonEncodedText MemberNfc = System.Text.Json.JsonEncodedText.Encode("nfc");
+
+	public override IcuNormalizationType Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberNfkcCf))
+		{
+			return IcuNormalizationType.NfkcCf;
+		}
+
+		if (reader.ValueTextEquals(MemberNfkc))
+		{
+			return IcuNormalizationType.Nfkc;
+		}
+
+		if (reader.ValueTextEquals(MemberNfc))
 		{
-			case "nfkc_cf":
-				return IcuNormalizationType.NfkcCf;
-			case "nfkc":
-				return IcuNormalizationType.Nfkc;
-			case "nfc":
-				return IcuNormalizationType.Nfc;
+			return IcuNormalizationType.Nfc;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(IcuNormalizationType)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, IcuNormalizationType value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IcuNormalizationType value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case IcuNormalizationType.NfkcCf:
-				writer.WriteStringValue("nfkc_cf");
-				return;
+				writer.WriteStringValue(MemberNfkcCf);
+				break;
 			case IcuNormalizationType.Nfkc:
-				writer.WriteStringValue("nfkc");
-				return;
+				writer.WriteStringValue(MemberNfkc);
+				break;
 			case IcuNormalizationType.Nfc:
-				writer.WriteStringValue("nfc");
-				return;
+				writer.WriteStringValue(MemberNfc);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(IcuNormalizationType)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -408,36 +461,40 @@ public enum IcuTransformDirection
 	Forward
 }
 
-internal sealed class IcuTransformDirectionConverter : JsonConverter<IcuTransformDirection>
+internal sealed partial class IcuTransformDirectionConverter : System.Text.Json.Serialization.JsonConverter<IcuTransformDirection>
 {
-	public override IcuTransformDirection Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberReverse = System.Text.Json.JsonEncodedText.Encode("reverse");
+	private static readonly System.Text.Json.JsonEncodedText MemberForward = System.Text.Json.JsonEncodedText.Encode("forward");
+
+	public override IcuTransformDirection Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberReverse))
+		{
+			return IcuTransformDirection.Reverse;
+		}
+
+		if (reader.ValueTextEquals(MemberForward))
 		{
-			case "reverse":
-				return IcuTransformDirection.Reverse;
-			case "forward":
-				return IcuTransformDirection.Forward;
+			return IcuTransformDirection.Forward;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(IcuTransformDirection)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, IcuTransformDirection value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IcuTransformDirection value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case IcuTransformDirection.Reverse:
-				writer.WriteStringValue("reverse");
-				return;
+				writer.WriteStringValue(MemberReverse);
+				break;
 			case IcuTransformDirection.Forward:
-				writer.WriteStringValue("forward");
-				return;
+				writer.WriteStringValue(MemberForward);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(IcuTransformDirection)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -450,36 +507,40 @@ public enum KeepTypesMode
 	Exclude
 }
 
-internal sealed class KeepTypesModeConverter : JsonConverter<KeepTypesMode>
+internal sealed partial class KeepTypesModeConverter : System.Text.Json.Serialization.JsonConverter<KeepTypesMode>
 {
-	public override KeepTypesMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberInclude = System.Text.Json.JsonEncodedText.Encode("include");
+	private static readonly System.Text.Json.JsonEncodedText MemberExclude = System.Text.Json.JsonEncodedText.Encode("exclude");
+
+	public override KeepTypesMode Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberInclude))
 		{
-			case "include":
-				return KeepTypesMode.Include;
-			case "exclude":
-				return KeepTypesMode.Exclude;
+			return KeepTypesMode.Include;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberExclude))
+		{
+			return KeepTypesMode.Exclude;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(KeepTypesMode)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, KeepTypesMode value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, KeepTypesMode value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case KeepTypesMode.Include:
-				writer.WriteStringValue("include");
-				return;
+				writer.WriteStringValue(MemberInclude);
+				break;
 			case KeepTypesMode.Exclude:
-				writer.WriteStringValue("exclude");
-				return;
+				writer.WriteStringValue(MemberExclude);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(KeepTypesMode)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -494,41 +555,49 @@ public enum KuromojiTokenizationMode
 	Extended
 }
 
-internal sealed class KuromojiTokenizationModeConverter : JsonConverter<KuromojiTokenizationMode>
+internal sealed partial class KuromojiTokenizationModeConverter : System.Text.Json.Serialization.JsonConverter<KuromojiTokenizationMode>
 {
-	public override KuromojiTokenizationMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberSearch = System.Text.Json.JsonEncodedText.Encode("search");
+	private static readonly System.Text.Json.JsonEncodedText MemberNormal = System.Text.Json.JsonEncodedText.Encode("normal");
+	private static readonly System.Text.Json.JsonEncodedText MemberExtended = System.Text.Json.JsonEncodedText.Encode("extended");
+
+	public override KuromojiTokenizationMode Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberSearch))
 		{
-			case "search":
-				return KuromojiTokenizationMode.Search;
-			case "normal":
-				return KuromojiTokenizationMode.Normal;
-			case "extended":
-				return KuromojiTokenizationMode.Extended;
+			return KuromojiTokenizationMode.Search;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberNormal))
+		{
+			return KuromojiTokenizationMode.Normal;
+		}
+
+		if (reader.ValueTextEquals(MemberExtended))
+		{
+			return KuromojiTokenizationMode.Extended;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(KuromojiTokenizationMode)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, KuromojiTokenizationMode value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, KuromojiTokenizationMode value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case KuromojiTokenizationMode.Search:
-				writer.WriteStringValue("search");
-				return;
+				writer.WriteStringValue(MemberSearch);
+				break;
 			case KuromojiTokenizationMode.Normal:
-				writer.WriteStringValue("normal");
-				return;
+				writer.WriteStringValue(MemberNormal);
+				break;
 			case KuromojiTokenizationMode.Extended:
-				writer.WriteStringValue("extended");
-				return;
+				writer.WriteStringValue(MemberExtended);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(KuromojiTokenizationMode)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -605,196 +674,328 @@ public enum Language
 	Arabic
 }
 
-internal sealed class LanguageConverter : JsonConverter<Language>
+internal sealed partial class LanguageConverter : System.Text.Json.Serialization.JsonConverter<Language>
 {
-	public override Language Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberTurkish = System.Text.Json.JsonEncodedText.Encode("Turkish");
+	private static readonly System.Text.Json.JsonEncodedText MemberThai = System.Text.Json.JsonEncodedText.Encode("Thai");
+	private static readonly System.Text.Json.JsonEncodedText MemberSwedish = System.Text.Json.JsonEncodedText.Encode("Swedish");
+	private static readonly System.Text.Json.JsonEncodedText MemberSpanish = System.Text.Json.JsonEncodedText.Encode("Spanish");
+	private static readonly System.Text.Json.JsonEncodedText MemberSorani = System.Text.Json.JsonEncodedText.Encode("Sorani");
+	private static readonly System.Text.Json.JsonEncodedText MemberRussian = System.Text.Json.JsonEncodedText.Encode("Russian");
+	private static readonly System.Text.Json.JsonEncodedText MemberRomanian = System.Text.Json.JsonEncodedText.Encode("Romanian");
+	private static readonly System.Text.Json.JsonEncodedText MemberPortuguese = System.Text.Json.JsonEncodedText.Encode("Portuguese");
+	private static readonly System.Text.Json.JsonEncodedText MemberPersian = System.Text.Json.JsonEncodedText.Encode("Persian");
+	private static readonly System.Text.Json.JsonEncodedText MemberNorwegian = System.Text.Json.JsonEncodedText.Encode("Norwegian");
+	private static readonly System.Text.Json.JsonEncodedText MemberLatvian = System.Text.Json.JsonEncodedText.Encode("Latvian");
+	private static readonly System.Text.Json.JsonEncodedText MemberItalian = System.Text.Json.JsonEncodedText.Encode("Italian");
+	private static readonly System.Text.Json.JsonEncodedText MemberIrish = System.Text.Json.JsonEncodedText.Encode("Irish");
+	private static readonly System.Text.Json.JsonEncodedText MemberIndonesian = System.Text.Json.JsonEncodedText.Encode("Indonesian");
+	private static readonly System.Text.Json.JsonEncodedText MemberHungarian = System.Text.Json.JsonEncodedText.Encode("Hungarian");
+	private static readonly System.Text.Json.JsonEncodedText MemberHindi = System.Text.Json.JsonEncodedText.Encode("Hindi");
+	private static readonly System.Text.Json.JsonEncodedText MemberGreek = System.Text.Json.JsonEncodedText.Encode("Greek");
+	private static readonly System.Text.Json.JsonEncodedText MemberGerman = System.Text.Json.JsonEncodedText.Encode("German");
+	private static readonly System.Text.Json.JsonEncodedText MemberGalician = System.Text.Json.JsonEncodedText.Encode("Galician");
+	private static readonly System.Text.Json.JsonEncodedText MemberFrench = System.Text.Json.JsonEncodedText.Encode("French");
+	private static readonly System.Text.Json.JsonEncodedText MemberFinnish = System.Text.Json.JsonEncodedText.Encode("Finnish");
+	private static readonly System.Text.Json.JsonEncodedText MemberEstonian = System.Text.Json.JsonEncodedText.Encode("Estonian");
+	private static readonly System.Text.Json.JsonEncodedText MemberEnglish = System.Text.Json.JsonEncodedText.Encode("English");
+	private static readonly System.Text.Json.JsonEncodedText MemberDutch = System.Text.Json.JsonEncodedText.Encode("Dutch");
+	private static readonly System.Text.Json.JsonEncodedText MemberDanish = System.Text.Json.JsonEncodedText.Encode("Danish");
+	private static readonly System.Text.Json.JsonEncodedText MemberCzech = System.Text.Json.JsonEncodedText.Encode("Czech");
+	private static readonly System.Text.Json.JsonEncodedText MemberCjk = System.Text.Json.JsonEncodedText.Encode("Cjk");
+	private static readonly System.Text.Json.JsonEncodedText MemberChinese = System.Text.Json.JsonEncodedText.Encode("Chinese");
+	private static readonly System.Text.Json.JsonEncodedText MemberCatalan = System.Text.Json.JsonEncodedText.Encode("Catalan");
+	private static readonly System.Text.Json.JsonEncodedText MemberBulgarian = System.Text.Json.JsonEncodedText.Encode("Bulgarian");
+	private static readonly System.Text.Json.JsonEncodedText MemberBrazilian = System.Text.Json.JsonEncodedText.Encode("Brazilian");
+	private static readonly System.Text.Json.JsonEncodedText MemberBasque = System.Text.Json.JsonEncodedText.Encode("Basque");
+	private static readonly System.Text.Json.JsonEncodedText MemberArmenian = System.Text.Json.JsonEncodedText.Encode("Armenian");
+	private static readonly System.Text.Json.JsonEncodedText MemberArabic = System.Text.Json.JsonEncodedText.Encode("Arabic");
+
+	public override Language Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "Turkish":
-				return Language.Turkish;
-			case "Thai":
-				return Language.Thai;
-			case "Swedish":
-				return Language.Swedish;
-			case "Spanish":
-				return Language.Spanish;
-			case "Sorani":
-				return Language.Sorani;
-			case "Russian":
-				return Language.Russian;
-			case "Romanian":
-				return Language.Romanian;
-			case "Portuguese":
-				return Language.Portuguese;
-			case "Persian":
-				return Language.Persian;
-			case "Norwegian":
-				return Language.Norwegian;
-			case "Latvian":
-				return Language.Latvian;
-			case "Italian":
-				return Language.Italian;
-			case "Irish":
-				return Language.Irish;
-			case "Indonesian":
-				return Language.Indonesian;
-			case "Hungarian":
-				return Language.Hungarian;
-			case "Hindi":
-				return Language.Hindi;
-			case "Greek":
-				return Language.Greek;
-			case "German":
-				return Language.German;
-			case "Galician":
-				return Language.Galician;
-			case "French":
-				return Language.French;
-			case "Finnish":
-				return Language.Finnish;
-			case "Estonian":
-				return Language.Estonian;
-			case "English":
-				return Language.English;
-			case "Dutch":
-				return Language.Dutch;
-			case "Danish":
-				return Language.Danish;
-			case "Czech":
-				return Language.Czech;
-			case "Cjk":
-				return Language.Cjk;
-			case "Chinese":
-				return Language.Chinese;
-			case "Catalan":
-				return Language.Catalan;
-			case "Bulgarian":
-				return Language.Bulgarian;
-			case "Brazilian":
-				return Language.Brazilian;
-			case "Basque":
-				return Language.Basque;
-			case "Armenian":
-				return Language.Armenian;
-			case "Arabic":
-				return Language.Arabic;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberTurkish))
+		{
+			return Language.Turkish;
+		}
+
+		if (reader.ValueTextEquals(MemberThai))
+		{
+			return Language.Thai;
+		}
+
+		if (reader.ValueTextEquals(MemberSwedish))
+		{
+			return Language.Swedish;
+		}
+
+		if (reader.ValueTextEquals(MemberSpanish))
+		{
+			return Language.Spanish;
+		}
+
+		if (reader.ValueTextEquals(MemberSorani))
+		{
+			return Language.Sorani;
+		}
+
+		if (reader.ValueTextEquals(MemberRussian))
+		{
+			return Language.Russian;
+		}
+
+		if (reader.ValueTextEquals(MemberRomanian))
+		{
+			return Language.Romanian;
+		}
+
+		if (reader.ValueTextEquals(MemberPortuguese))
+		{
+			return Language.Portuguese;
+		}
+
+		if (reader.ValueTextEquals(MemberPersian))
+		{
+			return Language.Persian;
+		}
+
+		if (reader.ValueTextEquals(MemberNorwegian))
+		{
+			return Language.Norwegian;
+		}
+
+		if (reader.ValueTextEquals(MemberLatvian))
+		{
+			return Language.Latvian;
+		}
+
+		if (reader.ValueTextEquals(MemberItalian))
+		{
+			return Language.Italian;
+		}
+
+		if (reader.ValueTextEquals(MemberIrish))
+		{
+			return Language.Irish;
+		}
+
+		if (reader.ValueTextEquals(MemberIndonesian))
+		{
+			return Language.Indonesian;
+		}
+
+		if (reader.ValueTextEquals(MemberHungarian))
+		{
+			return Language.Hungarian;
+		}
+
+		if (reader.ValueTextEquals(MemberHindi))
+		{
+			return Language.Hindi;
+		}
+
+		if (reader.ValueTextEquals(MemberGreek))
+		{
+			return Language.Greek;
+		}
+
+		if (reader.ValueTextEquals(MemberGerman))
+		{
+			return Language.German;
+		}
+
+		if (reader.ValueTextEquals(MemberGalician))
+		{
+			return Language.Galician;
+		}
+
+		if (reader.ValueTextEquals(MemberFrench))
+		{
+			return Language.French;
+		}
+
+		if (reader.ValueTextEquals(MemberFinnish))
+		{
+			return Language.Finnish;
+		}
+
+		if (reader.ValueTextEquals(MemberEstonian))
+		{
+			return Language.Estonian;
+		}
+
+		if (reader.ValueTextEquals(MemberEnglish))
+		{
+			return Language.English;
+		}
+
+		if (reader.ValueTextEquals(MemberDutch))
+		{
+			return Language.Dutch;
+		}
+
+		if (reader.ValueTextEquals(MemberDanish))
+		{
+			return Language.Danish;
+		}
+
+		if (reader.ValueTextEquals(MemberCzech))
+		{
+			return Language.Czech;
+		}
+
+		if (reader.ValueTextEquals(MemberCjk))
+		{
+			return Language.Cjk;
+		}
+
+		if (reader.ValueTextEquals(MemberChinese))
+		{
+			return Language.Chinese;
+		}
+
+		if (reader.ValueTextEquals(MemberCatalan))
+		{
+			return Language.Catalan;
+		}
+
+		if (reader.ValueTextEquals(MemberBulgarian))
+		{
+			return Language.Bulgarian;
+		}
+
+		if (reader.ValueTextEquals(MemberBrazilian))
+		{
+			return Language.Brazilian;
+		}
+
+		if (reader.ValueTextEquals(MemberBasque))
+		{
+			return Language.Basque;
+		}
+
+		if (reader.ValueTextEquals(MemberArmenian))
+		{
+			return Language.Armenian;
+		}
+
+		if (reader.ValueTextEquals(MemberArabic))
+		{
+			return Language.Arabic;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(Language)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, Language value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, Language value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case Language.Turkish:
-				writer.WriteStringValue("Turkish");
-				return;
+				writer.WriteStringValue(MemberTurkish);
+				break;
 			case Language.Thai:
-				writer.WriteStringValue("Thai");
-				return;
+				writer.WriteStringValue(MemberThai);
+				break;
 			case Language.Swedish:
-				writer.WriteStringValue("Swedish");
-				return;
+				writer.WriteStringValue(MemberSwedish);
+				break;
 			case Language.Spanish:
-				writer.WriteStringValue("Spanish");
-				return;
+				writer.WriteStringValue(MemberSpanish);
+				break;
 			case Language.Sorani:
-				writer.WriteStringValue("Sorani");
-				return;
+				writer.WriteStringValue(MemberSorani);
+				break;
 			case Language.Russian:
-				writer.WriteStringValue("Russian");
-				return;
+				writer.WriteStringValue(MemberRussian);
+				break;
 			case Language.Romanian:
-				writer.WriteStringValue("Romanian");
-				return;
+				writer.WriteStringValue(MemberRomanian);
+				break;
 			case Language.Portuguese:
-				writer.WriteStringValue("Portuguese");
-				return;
+				writer.WriteStringValue(MemberPortuguese);
+				break;
 			case Language.Persian:
-				writer.WriteStringValue("Persian");
-				return;
+				writer.WriteStringValue(MemberPersian);
+				break;
 			case Language.Norwegian:
-				writer.WriteStringValue("Norwegian");
-				return;
+				writer.WriteStringValue(MemberNorwegian);
+				break;
 			case Language.Latvian:
-				writer.WriteStringValue("Latvian");
-				return;
+				writer.WriteStringValue(MemberLatvian);
+				break;
 			case Language.Italian:
-				writer.WriteStringValue("Italian");
-				return;
+				writer.WriteStringValue(MemberItalian);
+				break;
 			case Language.Irish:
-				writer.WriteStringValue("Irish");
-				return;
+				writer.WriteStringValue(MemberIrish);
+				break;
 			case Language.Indonesian:
-				writer.WriteStringValue("Indonesian");
-				return;
+				writer.WriteStringValue(MemberIndonesian);
+				break;
 			case Language.Hungarian:
-				writer.WriteStringValue("Hungarian");
-				return;
+				writer.WriteStringValue(MemberHungarian);
+				break;
 			case Language.Hindi:
-				writer.WriteStringValue("Hindi");
-				return;
+				writer.WriteStringValue(MemberHindi);
+				break;
 			case Language.Greek:
-				writer.WriteStringValue("Greek");
-				return;
+				writer.WriteStringValue(MemberGreek);
+				break;
 			case Language.German:
-				writer.WriteStringValue("German");
-				return;
+				writer.WriteStringValue(MemberGerman);
+				break;
 			case Language.Galician:
-				writer.WriteStringValue("Galician");
-				return;
+				writer.WriteStringValue(MemberGalician);
+				break;
 			case Language.French:
-				writer.WriteStringValue("French");
-				return;
+				writer.WriteStringValue(MemberFrench);
+				break;
 			case Language.Finnish:
-				writer.WriteStringValue("Finnish");
-				return;
+				writer.WriteStringValue(MemberFinnish);
+				break;
 			case Language.Estonian:
-				writer.WriteStringValue("Estonian");
-				return;
+				writer.WriteStringValue(MemberEstonian);
+				break;
 			case Language.English:
-				writer.WriteStringValue("English");
-				return;
+				writer.WriteStringValue(MemberEnglish);
+				break;
 			case Language.Dutch:
-				writer.WriteStringValue("Dutch");
-				return;
+				writer.WriteStringValue(MemberDutch);
+				break;
 			case Language.Danish:
-				writer.WriteStringValue("Danish");
-				return;
+				writer.WriteStringValue(MemberDanish);
+				break;
 			case Language.Czech:
-				writer.WriteStringValue("Czech");
-				return;
+				writer.WriteStringValue(MemberCzech);
+				break;
 			case Language.Cjk:
-				writer.WriteStringValue("Cjk");
-				return;
+				writer.WriteStringValue(MemberCjk);
+				break;
 			case Language.Chinese:
-				writer.WriteStringValue("Chinese");
-				return;
+				writer.WriteStringValue(MemberChinese);
+				break;
 			case Language.Catalan:
-				writer.WriteStringValue("Catalan");
-				return;
+				writer.WriteStringValue(MemberCatalan);
+				break;
 			case Language.Bulgarian:
-				writer.WriteStringValue("Bulgarian");
-				return;
+				writer.WriteStringValue(MemberBulgarian);
+				break;
 			case Language.Brazilian:
-				writer.WriteStringValue("Brazilian");
-				return;
+				writer.WriteStringValue(MemberBrazilian);
+				break;
 			case Language.Basque:
-				writer.WriteStringValue("Basque");
-				return;
+				writer.WriteStringValue(MemberBasque);
+				break;
 			case Language.Armenian:
-				writer.WriteStringValue("Armenian");
-				return;
+				writer.WriteStringValue(MemberArmenian);
+				break;
 			case Language.Arabic:
-				writer.WriteStringValue("Arabic");
-				return;
+				writer.WriteStringValue(MemberArabic);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(Language)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -809,41 +1010,49 @@ public enum NoriDecompoundMode
 	Discard
 }
 
-internal sealed class NoriDecompoundModeConverter : JsonConverter<NoriDecompoundMode>
+internal sealed partial class NoriDecompoundModeConverter : System.Text.Json.Serialization.JsonConverter<NoriDecompoundMode>
 {
-	public override NoriDecompoundMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberNone = System.Text.Json.JsonEncodedText.Encode("none");
+	private static readonly System.Text.Json.JsonEncodedText MemberMixed = System.Text.Json.JsonEncodedText.Encode("mixed");
+	private static readonly System.Text.Json.JsonEncodedText MemberDiscard = System.Text.Json.JsonEncodedText.Encode("discard");
+
+	public override NoriDecompoundMode Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberNone))
+		{
+			return NoriDecompoundMode.None;
+		}
+
+		if (reader.ValueTextEquals(MemberMixed))
 		{
-			case "none":
-				return NoriDecompoundMode.None;
-			case "mixed":
-				return NoriDecompoundMode.Mixed;
-			case "discard":
-				return NoriDecompoundMode.Discard;
+			return NoriDecompoundMode.Mixed;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberDiscard))
+		{
+			return NoriDecompoundMode.Discard;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(NoriDecompoundMode)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, NoriDecompoundMode value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, NoriDecompoundMode value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case NoriDecompoundMode.None:
-				writer.WriteStringValue("none");
-				return;
+				writer.WriteStringValue(MemberNone);
+				break;
 			case NoriDecompoundMode.Mixed:
-				writer.WriteStringValue("mixed");
-				return;
+				writer.WriteStringValue(MemberMixed);
+				break;
 			case NoriDecompoundMode.Discard:
-				writer.WriteStringValue("discard");
-				return;
+				writer.WriteStringValue(MemberDiscard);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(NoriDecompoundMode)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -876,86 +1085,130 @@ public enum PhoneticEncoder
 	BeiderMorse
 }
 
-internal sealed class PhoneticEncoderConverter : JsonConverter<PhoneticEncoder>
+internal sealed partial class PhoneticEncoderConverter : System.Text.Json.Serialization.JsonConverter<PhoneticEncoder>
 {
-	public override PhoneticEncoder Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberSoundex = System.Text.Json.JsonEncodedText.Encode("soundex");
+	private static readonly System.Text.Json.JsonEncodedText MemberRefinedSoundex = System.Text.Json.JsonEncodedText.Encode("refined_soundex");
+	private static readonly System.Text.Json.JsonEncodedText MemberNysiis = System.Text.Json.JsonEncodedText.Encode("nysiis");
+	private static readonly System.Text.Json.JsonEncodedText MemberMetaphone = System.Text.Json.JsonEncodedText.Encode("metaphone");
+	private static readonly System.Text.Json.JsonEncodedText MemberKoelnerphonetik = System.Text.Json.JsonEncodedText.Encode("koelnerphonetik");
+	private static readonly System.Text.Json.JsonEncodedText MemberHaasephonetik = System.Text.Json.JsonEncodedText.Encode("haasephonetik");
+	private static readonly System.Text.Json.JsonEncodedText MemberDoubleMetaphone = System.Text.Json.JsonEncodedText.Encode("double_metaphone");
+	private static readonly System.Text.Json.JsonEncodedText MemberDaitchMokotoff = System.Text.Json.JsonEncodedText.Encode("daitch_mokotoff");
+	private static readonly System.Text.Json.JsonEncodedText MemberCologne = System.Text.Json.JsonEncodedText.Encode("cologne");
+	private static readonly System.Text.Json.JsonEncodedText MemberCaverphone2 = System.Text.Json.JsonEncodedText.Encode("caverphone2");
+	private static readonly System.Text.Json.JsonEncodedText MemberCaverphone1 = System.Text.Json.JsonEncodedText.Encode("caverphone1");
+	private static readonly System.Text.Json.JsonEncodedText MemberBeiderMorse = System.Text.Json.JsonEncodedText.Encode("beider_morse");
+
+	public override PhoneticEncoder Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "soundex":
-				return PhoneticEncoder.Soundex;
-			case "refined_soundex":
-				return PhoneticEncoder.RefinedSoundex;
-			case "nysiis":
-				return PhoneticEncoder.Nysiis;
-			case "metaphone":
-				return PhoneticEncoder.Metaphone;
-			case "koelnerphonetik":
-				return PhoneticEncoder.Koelnerphonetik;
-			case "haasephonetik":
-				return PhoneticEncoder.Haasephonetik;
-			case "double_metaphone":
-				return PhoneticEncoder.DoubleMetaphone;
-			case "daitch_mokotoff":
-				return PhoneticEncoder.DaitchMokotoff;
-			case "cologne":
-				return PhoneticEncoder.Cologne;
-			case "caverphone2":
-				return PhoneticEncoder.Caverphone2;
-			case "caverphone1":
-				return PhoneticEncoder.Caverphone1;
-			case "beider_morse":
-				return PhoneticEncoder.BeiderMorse;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberSoundex))
+		{
+			return PhoneticEncoder.Soundex;
+		}
+
+		if (reader.ValueTextEquals(MemberRefinedSoundex))
+		{
+			return PhoneticEncoder.RefinedSoundex;
+		}
+
+		if (reader.ValueTextEquals(MemberNysiis))
+		{
+			return PhoneticEncoder.Nysiis;
+		}
+
+		if (reader.ValueTextEquals(MemberMetaphone))
+		{
+			return PhoneticEncoder.Metaphone;
+		}
+
+		if (reader.ValueTextEquals(MemberKoelnerphonetik))
+		{
+			return PhoneticEncoder.Koelnerphonetik;
+		}
+
+		if (reader.ValueTextEquals(MemberHaasephonetik))
+		{
+			return PhoneticEncoder.Haasephonetik;
+		}
+
+		if (reader.ValueTextEquals(MemberDoubleMetaphone))
+		{
+			return PhoneticEncoder.DoubleMetaphone;
+		}
+
+		if (reader.ValueTextEquals(MemberDaitchMokotoff))
+		{
+			return PhoneticEncoder.DaitchMokotoff;
+		}
+
+		if (reader.ValueTextEquals(MemberCologne))
+		{
+			return PhoneticEncoder.Cologne;
+		}
+
+		if (reader.ValueTextEquals(MemberCaverphone2))
+		{
+			return PhoneticEncoder.Caverphone2;
+		}
+
+		if (reader.ValueTextEquals(MemberCaverphone1))
+		{
+			return PhoneticEncoder.Caverphone1;
+		}
+
+		if (reader.ValueTextEquals(MemberBeiderMorse))
+		{
+			return PhoneticEncoder.BeiderMorse;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(PhoneticEncoder)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, PhoneticEncoder value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PhoneticEncoder value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case PhoneticEncoder.Soundex:
-				writer.WriteStringValue("soundex");
-				return;
+				writer.WriteStringValue(MemberSoundex);
+				break;
 			case PhoneticEncoder.RefinedSoundex:
-				writer.WriteStringValue("refined_soundex");
-				return;
+				writer.WriteStringValue(MemberRefinedSoundex);
+				break;
 			case PhoneticEncoder.Nysiis:
-				writer.WriteStringValue("nysiis");
-				return;
+				writer.WriteStringValue(MemberNysiis);
+				break;
 			case PhoneticEncoder.Metaphone:
-				writer.WriteStringValue("metaphone");
-				return;
+				writer.WriteStringValue(MemberMetaphone);
+				break;
 			case PhoneticEncoder.Koelnerphonetik:
-				writer.WriteStringValue("koelnerphonetik");
-				return;
+				writer.WriteStringValue(MemberKoelnerphonetik);
+				break;
 			case PhoneticEncoder.Haasephonetik:
-				writer.WriteStringValue("haasephonetik");
-				return;
+				writer.WriteStringValue(MemberHaasephonetik);
+				break;
 			case PhoneticEncoder.DoubleMetaphone:
-				writer.WriteStringValue("double_metaphone");
-				return;
+				writer.WriteStringValue(MemberDoubleMetaphone);
+				break;
 			case PhoneticEncoder.DaitchMokotoff:
-				writer.WriteStringValue("daitch_mokotoff");
-				return;
+				writer.WriteStringValue(MemberDaitchMokotoff);
+				break;
 			case PhoneticEncoder.Cologne:
-				writer.WriteStringValue("cologne");
-				return;
+				writer.WriteStringValue(MemberCologne);
+				break;
 			case PhoneticEncoder.Caverphone2:
-				writer.WriteStringValue("caverphone2");
-				return;
+				writer.WriteStringValue(MemberCaverphone2);
+				break;
 			case PhoneticEncoder.Caverphone1:
-				writer.WriteStringValue("caverphone1");
-				return;
+				writer.WriteStringValue(MemberCaverphone1);
+				break;
 			case PhoneticEncoder.BeiderMorse:
-				writer.WriteStringValue("beider_morse");
-				return;
+				writer.WriteStringValue(MemberBeiderMorse);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(PhoneticEncoder)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -988,86 +1241,130 @@ public enum PhoneticLanguage
 	Any
 }
 
-internal sealed class PhoneticLanguageConverter : JsonConverter<PhoneticLanguage>
+internal sealed partial class PhoneticLanguageConverter : System.Text.Json.Serialization.JsonConverter<PhoneticLanguage>
 {
-	public override PhoneticLanguage Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberSpanish = System.Text.Json.JsonEncodedText.Encode("spanish");
+	private static readonly System.Text.Json.JsonEncodedText MemberRussian = System.Text.Json.JsonEncodedText.Encode("russian");
+	private static readonly System.Text.Json.JsonEncodedText MemberRomanian = System.Text.Json.JsonEncodedText.Encode("romanian");
+	private static readonly System.Text.Json.JsonEncodedText MemberPolish = System.Text.Json.JsonEncodedText.Encode("polish");
+	private static readonly System.Text.Json.JsonEncodedText MemberHungarian = System.Text.Json.JsonEncodedText.Encode("hungarian");
+	private static readonly System.Text.Json.JsonEncodedText MemberHebrew = System.Text.Json.JsonEncodedText.Encode("hebrew");
+	private static readonly System.Text.Json.JsonEncodedText MemberGerman = System.Text.Json.JsonEncodedText.Encode("german");
+	private static readonly System.Text.Json.JsonEncodedText MemberFrench = System.Text.Json.JsonEncodedText.Encode("french");
+	private static readonly System.Text.Json.JsonEncodedText MemberEnglish = System.Text.Json.JsonEncodedText.Encode("english");
+	private static readonly System.Text.Json.JsonEncodedText MemberCyrillic = System.Text.Json.JsonEncodedText.Encode("cyrillic");
+	private static readonly System.Text.Json.JsonEncodedText MemberCommon = System.Text.Json.JsonEncodedText.Encode("common");
+	private static readonly System.Text.Json.JsonEncodedText MemberAny = System.Text.Json.JsonEncodedText.Encode("any");
+
+	public override PhoneticLanguage Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "spanish":
-				return PhoneticLanguage.Spanish;
-			case "russian":
-				return PhoneticLanguage.Russian;
-			case "romanian":
-				return PhoneticLanguage.Romanian;
-			case "polish":
-				return PhoneticLanguage.Polish;
-			case "hungarian":
-				return PhoneticLanguage.Hungarian;
-			case "hebrew":
-				return PhoneticLanguage.Hebrew;
-			case "german":
-				return PhoneticLanguage.German;
-			case "french":
-				return PhoneticLanguage.French;
-			case "english":
-				return PhoneticLanguage.English;
-			case "cyrillic":
-				return PhoneticLanguage.Cyrillic;
-			case "common":
-				return PhoneticLanguage.Common;
-			case "any":
-				return PhoneticLanguage.Any;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberSpanish))
+		{
+			return PhoneticLanguage.Spanish;
+		}
+
+		if (reader.ValueTextEquals(MemberRussian))
+		{
+			return PhoneticLanguage.Russian;
+		}
+
+		if (reader.ValueTextEquals(MemberRomanian))
+		{
+			return PhoneticLanguage.Romanian;
+		}
+
+		if (reader.ValueTextEquals(MemberPolish))
+		{
+			return PhoneticLanguage.Polish;
+		}
+
+		if (reader.ValueTextEquals(MemberHungarian))
+		{
+			return PhoneticLanguage.Hungarian;
+		}
+
+		if (reader.ValueTextEquals(MemberHebrew))
+		{
+			return PhoneticLanguage.Hebrew;
+		}
+
+		if (reader.ValueTextEquals(MemberGerman))
+		{
+			return PhoneticLanguage.German;
+		}
+
+		if (reader.ValueTextEquals(MemberFrench))
+		{
+			return PhoneticLanguage.French;
+		}
+
+		if (reader.ValueTextEquals(MemberEnglish))
+		{
+			return PhoneticLanguage.English;
+		}
+
+		if (reader.ValueTextEquals(MemberCyrillic))
+		{
+			return PhoneticLanguage.Cyrillic;
+		}
+
+		if (reader.ValueTextEquals(MemberCommon))
+		{
+			return PhoneticLanguage.Common;
+		}
+
+		if (reader.ValueTextEquals(MemberAny))
+		{
+			return PhoneticLanguage.Any;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(PhoneticLanguage)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, PhoneticLanguage value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PhoneticLanguage value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case PhoneticLanguage.Spanish:
-				writer.WriteStringValue("spanish");
-				return;
+				writer.WriteStringValue(MemberSpanish);
+				break;
 			case PhoneticLanguage.Russian:
-				writer.WriteStringValue("russian");
-				return;
+				writer.WriteStringValue(MemberRussian);
+				break;
 			case PhoneticLanguage.Romanian:
-				writer.WriteStringValue("romanian");
-				return;
+				writer.WriteStringValue(MemberRomanian);
+				break;
 			case PhoneticLanguage.Polish:
-				writer.WriteStringValue("polish");
-				return;
+				writer.WriteStringValue(MemberPolish);
+				break;
 			case PhoneticLanguage.Hungarian:
-				writer.WriteStringValue("hungarian");
-				return;
+				writer.WriteStringValue(MemberHungarian);
+				break;
 			case PhoneticLanguage.Hebrew:
-				writer.WriteStringValue("hebrew");
-				return;
+				writer.WriteStringValue(MemberHebrew);
+				break;
 			case PhoneticLanguage.German:
-				writer.WriteStringValue("german");
-				return;
+				writer.WriteStringValue(MemberGerman);
+				break;
 			case PhoneticLanguage.French:
-				writer.WriteStringValue("french");
-				return;
+				writer.WriteStringValue(MemberFrench);
+				break;
 			case PhoneticLanguage.English:
-				writer.WriteStringValue("english");
-				return;
+				writer.WriteStringValue(MemberEnglish);
+				break;
 			case PhoneticLanguage.Cyrillic:
-				writer.WriteStringValue("cyrillic");
-				return;
+				writer.WriteStringValue(MemberCyrillic);
+				break;
 			case PhoneticLanguage.Common:
-				writer.WriteStringValue("common");
-				return;
+				writer.WriteStringValue(MemberCommon);
+				break;
 			case PhoneticLanguage.Any:
-				writer.WriteStringValue("any");
-				return;
+				writer.WriteStringValue(MemberAny);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(PhoneticLanguage)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -1082,41 +1379,49 @@ public enum PhoneticNameType
 	Ashkenazi
 }
 
-internal sealed class PhoneticNameTypeConverter : JsonConverter<PhoneticNameType>
+internal sealed partial class PhoneticNameTypeConverter : System.Text.Json.Serialization.JsonConverter<PhoneticNameType>
 {
-	public override PhoneticNameType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberSephardic = System.Text.Json.JsonEncodedText.Encode("sephardic");
+	private static readonly System.Text.Json.JsonEncodedText MemberGeneric = System.Text.Json.JsonEncodedText.Encode("generic");
+	private static readonly System.Text.Json.JsonEncodedText MemberAshkenazi = System.Text.Json.JsonEncodedText.Encode("ashkenazi");
+
+	public override PhoneticNameType Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberSephardic))
+		{
+			return PhoneticNameType.Sephardic;
+		}
+
+		if (reader.ValueTextEquals(MemberGeneric))
+		{
+			return PhoneticNameType.Generic;
+		}
+
+		if (reader.ValueTextEquals(MemberAshkenazi))
 		{
-			case "sephardic":
-				return PhoneticNameType.Sephardic;
-			case "generic":
-				return PhoneticNameType.Generic;
-			case "ashkenazi":
-				return PhoneticNameType.Ashkenazi;
+			return PhoneticNameType.Ashkenazi;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(PhoneticNameType)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, PhoneticNameType value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PhoneticNameType value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case PhoneticNameType.Sephardic:
-				writer.WriteStringValue("sephardic");
-				return;
+				writer.WriteStringValue(MemberSephardic);
+				break;
 			case PhoneticNameType.Generic:
-				writer.WriteStringValue("generic");
-				return;
+				writer.WriteStringValue(MemberGeneric);
+				break;
 			case PhoneticNameType.Ashkenazi:
-				writer.WriteStringValue("ashkenazi");
-				return;
+				writer.WriteStringValue(MemberAshkenazi);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(PhoneticNameType)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -1129,36 +1434,40 @@ public enum PhoneticRuleType
 	Approx
 }
 
-internal sealed class PhoneticRuleTypeConverter : JsonConverter<PhoneticRuleType>
+internal sealed partial class PhoneticRuleTypeConverter : System.Text.Json.Serialization.JsonConverter<PhoneticRuleType>
 {
-	public override PhoneticRuleType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberExact = System.Text.Json.JsonEncodedText.Encode("exact");
+	private static readonly System.Text.Json.JsonEncodedText MemberApprox = System.Text.Json.JsonEncodedText.Encode("approx");
+
+	public override PhoneticRuleType Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberExact))
 		{
-			case "exact":
-				return PhoneticRuleType.Exact;
-			case "approx":
-				return PhoneticRuleType.Approx;
+			return PhoneticRuleType.Exact;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberApprox))
+		{
+			return PhoneticRuleType.Approx;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(PhoneticRuleType)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, PhoneticRuleType value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PhoneticRuleType value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case PhoneticRuleType.Exact:
-				writer.WriteStringValue("exact");
-				return;
+				writer.WriteStringValue(MemberExact);
+				break;
 			case PhoneticRuleType.Approx:
-				writer.WriteStringValue("approx");
-				return;
+				writer.WriteStringValue(MemberApprox);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(PhoneticRuleType)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -1211,136 +1520,220 @@ public enum SnowballLanguage
 	Armenian
 }
 
-internal sealed class SnowballLanguageConverter : JsonConverter<SnowballLanguage>
+internal sealed partial class SnowballLanguageConverter : System.Text.Json.Serialization.JsonConverter<SnowballLanguage>
 {
-	public override SnowballLanguage Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberTurkish = System.Text.Json.JsonEncodedText.Encode("Turkish");
+	private static readonly System.Text.Json.JsonEncodedText MemberSwedish = System.Text.Json.JsonEncodedText.Encode("Swedish");
+	private static readonly System.Text.Json.JsonEncodedText MemberSpanish = System.Text.Json.JsonEncodedText.Encode("Spanish");
+	private static readonly System.Text.Json.JsonEncodedText MemberRussian = System.Text.Json.JsonEncodedText.Encode("Russian");
+	private static readonly System.Text.Json.JsonEncodedText MemberRomanian = System.Text.Json.JsonEncodedText.Encode("Romanian");
+	private static readonly System.Text.Json.JsonEncodedText MemberPortuguese = System.Text.Json.JsonEncodedText.Encode("Portuguese");
+	private static readonly System.Text.Json.JsonEncodedText MemberPorter = System.Text.Json.JsonEncodedText.Encode("Porter");
+	private static readonly System.Text.Json.JsonEncodedText MemberNorwegian = System.Text.Json.JsonEncodedText.Encode("Norwegian");
+	private static readonly System.Text.Json.JsonEncodedText MemberLovins = System.Text.Json.JsonEncodedText.Encode("Lovins");
+	private static readonly System.Text.Json.JsonEncodedText MemberKp = System.Text.Json.JsonEncodedText.Encode("Kp");
+	private static readonly System.Text.Json.JsonEncodedText MemberItalian = System.Text.Json.JsonEncodedText.Encode("Italian");
+	private static readonly System.Text.Json.JsonEncodedText MemberHungarian = System.Text.Json.JsonEncodedText.Encode("Hungarian");
+	private static readonly System.Text.Json.JsonEncodedText MemberGerman2 = System.Text.Json.JsonEncodedText.Encode("German2");
+	private static readonly System.Text.Json.JsonEncodedText MemberGerman = System.Text.Json.JsonEncodedText.Encode("German");
+	private static readonly System.Text.Json.JsonEncodedText MemberFrench = System.Text.Json.JsonEncodedText.Encode("French");
+	private static readonly System.Text.Json.JsonEncodedText MemberFinnish = System.Text.Json.JsonEncodedText.Encode("Finnish");
+	private static readonly System.Text.Json.JsonEncodedText MemberEnglish = System.Text.Json.JsonEncodedText.Encode("English");
+	private static readonly System.Text.Json.JsonEncodedText MemberDutch = System.Text.Json.JsonEncodedText.Encode("Dutch");
+	private static readonly System.Text.Json.JsonEncodedText MemberDanish = System.Text.Json.JsonEncodedText.Encode("Danish");
+	private static readonly System.Text.Json.JsonEncodedText MemberCatalan = System.Text.Json.JsonEncodedText.Encode("Catalan");
+	private static readonly System.Text.Json.JsonEncodedText MemberBasque = System.Text.Json.JsonEncodedText.Encode("Basque");
+	private static readonly System.Text.Json.JsonEncodedText MemberArmenian = System.Text.Json.JsonEncodedText.Encode("Armenian");
+
+	public override SnowballLanguage Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "Turkish":
-				return SnowballLanguage.Turkish;
-			case "Swedish":
-				return SnowballLanguage.Swedish;
-			case "Spanish":
-				return SnowballLanguage.Spanish;
-			case "Russian":
-				return SnowballLanguage.Russian;
-			case "Romanian":
-				return SnowballLanguage.Romanian;
-			case "Portuguese":
-				return SnowballLanguage.Portuguese;
-			case "Porter":
-				return SnowballLanguage.Porter;
-			case "Norwegian":
-				return SnowballLanguage.Norwegian;
-			case "Lovins":
-				return SnowballLanguage.Lovins;
-			case "Kp":
-				return SnowballLanguage.Kp;
-			case "Italian":
-				return SnowballLanguage.Italian;
-			case "Hungarian":
-				return SnowballLanguage.Hungarian;
-			case "German2":
-				return SnowballLanguage.German2;
-			case "German":
-				return SnowballLanguage.German;
-			case "French":
-				return SnowballLanguage.French;
-			case "Finnish":
-				return SnowballLanguage.Finnish;
-			case "English":
-				return SnowballLanguage.English;
-			case "Dutch":
-				return SnowballLanguage.Dutch;
-			case "Danish":
-				return SnowballLanguage.Danish;
-			case "Catalan":
-				return SnowballLanguage.Catalan;
-			case "Basque":
-				return SnowballLanguage.Basque;
-			case "Armenian":
-				return SnowballLanguage.Armenian;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberTurkish))
+		{
+			return SnowballLanguage.Turkish;
+		}
+
+		if (reader.ValueTextEquals(MemberSwedish))
+		{
+			return SnowballLanguage.Swedish;
+		}
+
+		if (reader.ValueTextEquals(MemberSpanish))
+		{
+			return SnowballLanguage.Spanish;
+		}
+
+		if (reader.ValueTextEquals(MemberRussian))
+		{
+			return SnowballLanguage.Russian;
+		}
+
+		if (reader.ValueTextEquals(MemberRomanian))
+		{
+			return SnowballLanguage.Romanian;
+		}
+
+		if (reader.ValueTextEquals(MemberPortuguese))
+		{
+			return SnowballLanguage.Portuguese;
+		}
+
+		if (reader.ValueTextEquals(MemberPorter))
+		{
+			return SnowballLanguage.Porter;
+		}
+
+		if (reader.ValueTextEquals(MemberNorwegian))
+		{
+			return SnowballLanguage.Norwegian;
+		}
+
+		if (reader.ValueTextEquals(MemberLovins))
+		{
+			return SnowballLanguage.Lovins;
+		}
+
+		if (reader.ValueTextEquals(MemberKp))
+		{
+			return SnowballLanguage.Kp;
+		}
+
+		if (reader.ValueTextEquals(MemberItalian))
+		{
+			return SnowballLanguage.Italian;
+		}
+
+		if (reader.ValueTextEquals(MemberHungarian))
+		{
+			return SnowballLanguage.Hungarian;
+		}
+
+		if (reader.ValueTextEquals(MemberGerman2))
+		{
+			return SnowballLanguage.German2;
+		}
+
+		if (reader.ValueTextEquals(MemberGerman))
+		{
+			return SnowballLanguage.German;
+		}
+
+		if (reader.ValueTextEquals(MemberFrench))
+		{
+			return SnowballLanguage.French;
+		}
+
+		if (reader.ValueTextEquals(MemberFinnish))
+		{
+			return SnowballLanguage.Finnish;
+		}
+
+		if (reader.ValueTextEquals(MemberEnglish))
+		{
+			return SnowballLanguage.English;
+		}
+
+		if (reader.ValueTextEquals(MemberDutch))
+		{
+			return SnowballLanguage.Dutch;
+		}
+
+		if (reader.ValueTextEquals(MemberDanish))
+		{
+			return SnowballLanguage.Danish;
+		}
+
+		if (reader.ValueTextEquals(MemberCatalan))
+		{
+			return SnowballLanguage.Catalan;
+		}
+
+		if (reader.ValueTextEquals(MemberBasque))
+		{
+			return SnowballLanguage.Basque;
+		}
+
+		if (reader.ValueTextEquals(MemberArmenian))
+		{
+			return SnowballLanguage.Armenian;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(SnowballLanguage)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, SnowballLanguage value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SnowballLanguage value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case SnowballLanguage.Turkish:
-				writer.WriteStringValue("Turkish");
-				return;
+				writer.WriteStringValue(MemberTurkish);
+				break;
 			case SnowballLanguage.Swedish:
-				writer.WriteStringValue("Swedish");
-				return;
+				writer.WriteStringValue(MemberSwedish);
+				break;
 			case SnowballLanguage.Spanish:
-				writer.WriteStringValue("Spanish");
-				return;
+				writer.WriteStringValue(MemberSpanish);
+				break;
 			case SnowballLanguage.Russian:
-				writer.WriteStringValue("Russian");
-				return;
+				writer.WriteStringValue(MemberRussian);
+				break;
 			case SnowballLanguage.Romanian:
-				writer.WriteStringValue("Romanian");
-				return;
+				writer.WriteStringValue(MemberRomanian);
+				break;
 			case SnowballLanguage.Portuguese:
-				writer.WriteStringValue("Portuguese");
-				return;
+				writer.WriteStringValue(MemberPortuguese);
+				break;
 			case SnowballLanguage.Porter:
-				writer.WriteStringValue("Porter");
-				return;
+				writer.WriteStringValue(MemberPorter);
+				break;
 			case SnowballLanguage.Norwegian:
-				writer.WriteStringValue("Norwegian");
-				return;
+				writer.WriteStringValue(MemberNorwegian);
+				break;
 			case SnowballLanguage.Lovins:
-				writer.WriteStringValue("Lovins");
-				return;
+				writer.WriteStringValue(MemberLovins);
+				break;
 			case SnowballLanguage.Kp:
-				writer.WriteStringValue("Kp");
-				return;
+				writer.WriteStringValue(MemberKp);
+				break;
 			case SnowballLanguage.Italian:
-				writer.WriteStringValue("Italian");
-				return;
+				writer.WriteStringValue(MemberItalian);
+				break;
 			case SnowballLanguage.Hungarian:
-				writer.WriteStringValue("Hungarian");
-				return;
+				writer.WriteStringValue(MemberHungarian);
+				break;
 			case SnowballLanguage.German2:
-				writer.WriteStringValue("German2");
-				return;
+				writer.WriteStringValue(MemberGerman2);
+				break;
 			case SnowballLanguage.German:
-				writer.WriteStringValue("German");
-				return;
+				writer.WriteStringValue(MemberGerman);
+				break;
 			case SnowballLanguage.French:
-				writer.WriteStringValue("French");
-				return;
+				writer.WriteStringValue(MemberFrench);
+				break;
 			case SnowballLanguage.Finnish:
-				writer.WriteStringValue("Finnish");
-				return;
+				writer.WriteStringValue(MemberFinnish);
+				break;
 			case SnowballLanguage.English:
-				writer.WriteStringValue("English");
-				return;
+				writer.WriteStringValue(MemberEnglish);
+				break;
 			case SnowballLanguage.Dutch:
-				writer.WriteStringValue("Dutch");
-				return;
+				writer.WriteStringValue(MemberDutch);
+				break;
 			case SnowballLanguage.Danish:
-				writer.WriteStringValue("Danish");
-				return;
+				writer.WriteStringValue(MemberDanish);
+				break;
 			case SnowballLanguage.Catalan:
-				writer.WriteStringValue("Catalan");
-				return;
+				writer.WriteStringValue(MemberCatalan);
+				break;
 			case SnowballLanguage.Basque:
-				writer.WriteStringValue("Basque");
-				return;
+				writer.WriteStringValue(MemberBasque);
+				break;
 			case SnowballLanguage.Armenian:
-				writer.WriteStringValue("Armenian");
-				return;
+				writer.WriteStringValue(MemberArmenian);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(SnowballLanguage)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -1353,36 +1746,40 @@ public enum SynonymFormat
 	Solr
 }
 
-internal sealed class SynonymFormatConverter : JsonConverter<SynonymFormat>
+internal sealed partial class SynonymFormatConverter : System.Text.Json.Serialization.JsonConverter<SynonymFormat>
 {
-	public override SynonymFormat Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberWordnet = System.Text.Json.JsonEncodedText.Encode("wordnet");
+	private static readonly System.Text.Json.JsonEncodedText MemberSolr = System.Text.Json.JsonEncodedText.Encode("solr");
+
+	public override SynonymFormat Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberWordnet))
 		{
-			case "wordnet":
-				return SynonymFormat.Wordnet;
-			case "solr":
-				return SynonymFormat.Solr;
+			return SynonymFormat.Wordnet;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberSolr))
+		{
+			return SynonymFormat.Solr;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(SynonymFormat)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, SynonymFormat value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SynonymFormat value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case SynonymFormat.Wordnet:
-				writer.WriteStringValue("wordnet");
-				return;
+				writer.WriteStringValue(MemberWordnet);
+				break;
 			case SynonymFormat.Solr:
-				writer.WriteStringValue("solr");
-				return;
+				writer.WriteStringValue(MemberSolr);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(SynonymFormat)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -1403,55 +1800,75 @@ public enum TokenChar
 	Custom
 }
 
-internal sealed class TokenCharConverter : JsonConverter<TokenChar>
+internal sealed partial class TokenCharConverter : System.Text.Json.Serialization.JsonConverter<TokenChar>
 {
-	public override TokenChar Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberWhitespace = System.Text.Json.JsonEncodedText.Encode("whitespace");
+	private static readonly System.Text.Json.JsonEncodedText MemberSymbol = System.Text.Json.JsonEncodedText.Encode("symbol");
+	private static readonly System.Text.Json.JsonEncodedText MemberPunctuation = System.Text.Json.JsonEncodedText.Encode("punctuation");
+	private static readonly System.Text.Json.JsonEncodedText MemberLetter = System.Text.Json.JsonEncodedText.Encode("letter");
+	private static readonly System.Text.Json.JsonEncodedText MemberDigit = System.Text.Json.JsonEncodedText.Encode("digit");
+	private static readonly System.Text.Json.JsonEncodedText MemberCustom = System.Text.Json.JsonEncodedText.Encode("custom");
+
+	public override TokenChar Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "whitespace":
-				return TokenChar.Whitespace;
-			case "symbol":
-				return TokenChar.Symbol;
-			case "punctuation":
-				return TokenChar.Punctuation;
-			case "letter":
-				return TokenChar.Letter;
-			case "digit":
-				return TokenChar.Digit;
-			case "custom":
-				return TokenChar.Custom;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberWhitespace))
+		{
+			return TokenChar.Whitespace;
+		}
+
+		if (reader.ValueTextEquals(MemberSymbol))
+		{
+			return TokenChar.Symbol;
+		}
+
+		if (reader.ValueTextEquals(MemberPunctuation))
+		{
+			return TokenChar.Punctuation;
+		}
+
+		if (reader.ValueTextEquals(MemberLetter))
+		{
+			return TokenChar.Letter;
+		}
+
+		if (reader.ValueTextEquals(MemberDigit))
+		{
+			return TokenChar.Digit;
+		}
+
+		if (reader.ValueTextEquals(MemberCustom))
+		{
+			return TokenChar.Custom;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(TokenChar)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, TokenChar value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, TokenChar value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case TokenChar.Whitespace:
-				writer.WriteStringValue("whitespace");
-				return;
+				writer.WriteStringValue(MemberWhitespace);
+				break;
 			case TokenChar.Symbol:
-				writer.WriteStringValue("symbol");
-				return;
+				writer.WriteStringValue(MemberSymbol);
+				break;
 			case TokenChar.Punctuation:
-				writer.WriteStringValue("punctuation");
-				return;
+				writer.WriteStringValue(MemberPunctuation);
+				break;
 			case TokenChar.Letter:
-				writer.WriteStringValue("letter");
-				return;
+				writer.WriteStringValue(MemberLetter);
+				break;
 			case TokenChar.Digit:
-				writer.WriteStringValue("digit");
-				return;
+				writer.WriteStringValue(MemberDigit);
+				break;
 			case TokenChar.Custom:
-				writer.WriteStringValue("custom");
-				return;
+				writer.WriteStringValue(MemberCustom);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(TokenChar)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.Cluster.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.Cluster.g.cs
index 3f580204a26..f9d9026cb40 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.Cluster.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.Cluster.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Core;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport;
 using System;
@@ -41,46 +42,58 @@ public enum AllocationExplainDecision
 	Always
 }
 
-internal sealed class AllocationExplainDecisionConverter : JsonConverter<AllocationExplainDecision>
+internal sealed partial class AllocationExplainDecisionConverter : System.Text.Json.Serialization.JsonConverter<AllocationExplainDecision>
 {
-	public override AllocationExplainDecision Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberYes = System.Text.Json.JsonEncodedText.Encode("YES");
+	private static readonly System.Text.Json.JsonEncodedText MemberThrottle = System.Text.Json.JsonEncodedText.Encode("THROTTLE");
+	private static readonly System.Text.Json.JsonEncodedText MemberNo = System.Text.Json.JsonEncodedText.Encode("NO");
+	private static readonly System.Text.Json.JsonEncodedText MemberAlways = System.Text.Json.JsonEncodedText.Encode("ALWAYS");
+
+	public override AllocationExplainDecision Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberYes))
+		{
+			return AllocationExplainDecision.Yes;
+		}
+
+		if (reader.ValueTextEquals(MemberThrottle))
+		{
+			return AllocationExplainDecision.Throttle;
+		}
+
+		if (reader.ValueTextEquals(MemberNo))
+		{
+			return AllocationExplainDecision.No;
+		}
+
+		if (reader.ValueTextEquals(MemberAlways))
 		{
-			case "YES":
-				return AllocationExplainDecision.Yes;
-			case "THROTTLE":
-				return AllocationExplainDecision.Throttle;
-			case "NO":
-				return AllocationExplainDecision.No;
-			case "ALWAYS":
-				return AllocationExplainDecision.Always;
+			return AllocationExplainDecision.Always;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(AllocationExplainDecision)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, AllocationExplainDecision value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, AllocationExplainDecision value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case AllocationExplainDecision.Yes:
-				writer.WriteStringValue("YES");
-				return;
+				writer.WriteStringValue(MemberYes);
+				break;
 			case AllocationExplainDecision.Throttle:
-				writer.WriteStringValue("THROTTLE");
-				return;
+				writer.WriteStringValue(MemberThrottle);
+				break;
 			case AllocationExplainDecision.No:
-				writer.WriteStringValue("NO");
-				return;
+				writer.WriteStringValue(MemberNo);
+				break;
 			case AllocationExplainDecision.Always:
-				writer.WriteStringValue("ALWAYS");
-				return;
+				writer.WriteStringValue(MemberAlways);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(AllocationExplainDecision)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -105,66 +118,94 @@ public enum Decision
 	AllocationDelayed
 }
 
-internal sealed class DecisionConverter : JsonConverter<Decision>
+internal sealed partial class DecisionConverter : System.Text.Json.Serialization.JsonConverter<Decision>
 {
-	public override Decision Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberYes = System.Text.Json.JsonEncodedText.Encode("yes");
+	private static readonly System.Text.Json.JsonEncodedText MemberWorseBalance = System.Text.Json.JsonEncodedText.Encode("worse_balance");
+	private static readonly System.Text.Json.JsonEncodedText MemberThrottled = System.Text.Json.JsonEncodedText.Encode("throttled");
+	private static readonly System.Text.Json.JsonEncodedText MemberNoValidShardCopy = System.Text.Json.JsonEncodedText.Encode("no_valid_shard_copy");
+	private static readonly System.Text.Json.JsonEncodedText MemberNoAttempt = System.Text.Json.JsonEncodedText.Encode("no_attempt");
+	private static readonly System.Text.Json.JsonEncodedText MemberNo = System.Text.Json.JsonEncodedText.Encode("no");
+	private static readonly System.Text.Json.JsonEncodedText MemberAwaitingInfo = System.Text.Json.JsonEncodedText.Encode("awaiting_info");
+	private static readonly System.Text.Json.JsonEncodedText MemberAllocationDelayed = System.Text.Json.JsonEncodedText.Encode("allocation_delayed");
+
+	public override Decision Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberYes))
+		{
+			return Decision.Yes;
+		}
+
+		if (reader.ValueTextEquals(MemberWorseBalance))
 		{
-			case "yes":
-				return Decision.Yes;
-			case "worse_balance":
-				return Decision.WorseBalance;
-			case "throttled":
-				return Decision.Throttled;
-			case "no_valid_shard_copy":
-				return Decision.NoValidShardCopy;
-			case "no_attempt":
-				return Decision.NoAttempt;
-			case "no":
-				return Decision.No;
-			case "awaiting_info":
-				return Decision.AwaitingInfo;
-			case "allocation_delayed":
-				return Decision.AllocationDelayed;
+			return Decision.WorseBalance;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberThrottled))
+		{
+			return Decision.Throttled;
+		}
+
+		if (reader.ValueTextEquals(MemberNoValidShardCopy))
+		{
+			return Decision.NoValidShardCopy;
+		}
+
+		if (reader.ValueTextEquals(MemberNoAttempt))
+		{
+			return Decision.NoAttempt;
+		}
+
+		if (reader.ValueTextEquals(MemberNo))
+		{
+			return Decision.No;
+		}
+
+		if (reader.ValueTextEquals(MemberAwaitingInfo))
+		{
+			return Decision.AwaitingInfo;
+		}
+
+		if (reader.ValueTextEquals(MemberAllocationDelayed))
+		{
+			return Decision.AllocationDelayed;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(Decision)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, Decision value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, Decision value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case Decision.Yes:
-				writer.WriteStringValue("yes");
-				return;
+				writer.WriteStringValue(MemberYes);
+				break;
 			case Decision.WorseBalance:
-				writer.WriteStringValue("worse_balance");
-				return;
+				writer.WriteStringValue(MemberWorseBalance);
+				break;
 			case Decision.Throttled:
-				writer.WriteStringValue("throttled");
-				return;
+				writer.WriteStringValue(MemberThrottled);
+				break;
 			case Decision.NoValidShardCopy:
-				writer.WriteStringValue("no_valid_shard_copy");
-				return;
+				writer.WriteStringValue(MemberNoValidShardCopy);
+				break;
 			case Decision.NoAttempt:
-				writer.WriteStringValue("no_attempt");
-				return;
+				writer.WriteStringValue(MemberNoAttempt);
+				break;
 			case Decision.No:
-				writer.WriteStringValue("no");
-				return;
+				writer.WriteStringValue(MemberNo);
+				break;
 			case Decision.AwaitingInfo:
-				writer.WriteStringValue("awaiting_info");
-				return;
+				writer.WriteStringValue(MemberAwaitingInfo);
+				break;
 			case Decision.AllocationDelayed:
-				writer.WriteStringValue("allocation_delayed");
-				return;
+				writer.WriteStringValue(MemberAllocationDelayed);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(Decision)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -203,100 +244,156 @@ public enum UnassignedInformationReason
 	AllocationFailed
 }
 
-internal sealed class UnassignedInformationReasonConverter : JsonConverter<UnassignedInformationReason>
+internal sealed partial class UnassignedInformationReasonConverter : System.Text.Json.Serialization.JsonConverter<UnassignedInformationReason>
 {
-	public override UnassignedInformationReason Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberRerouteCancelled = System.Text.Json.JsonEncodedText.Encode("REROUTE_CANCELLED");
+	private static readonly System.Text.Json.JsonEncodedText MemberReplicaAdded = System.Text.Json.JsonEncodedText.Encode("REPLICA_ADDED");
+	private static readonly System.Text.Json.JsonEncodedText MemberReinitialized = System.Text.Json.JsonEncodedText.Encode("REINITIALIZED");
+	private static readonly System.Text.Json.JsonEncodedText MemberReallocatedReplica = System.Text.Json.JsonEncodedText.Encode("REALLOCATED_REPLICA");
+	private static readonly System.Text.Json.JsonEncodedText MemberPrimaryFailed = System.Text.Json.JsonEncodedText.Encode("PRIMARY_FAILED");
+	private static readonly System.Text.Json.JsonEncodedText MemberNodeLeft = System.Text.Json.JsonEncodedText.Encode("NODE_LEFT");
+	private static readonly System.Text.Json.JsonEncodedText MemberNewIndexRestored = System.Text.Json.JsonEncodedText.Encode("NEW_INDEX_RESTORED");
+	private static readonly System.Text.Json.JsonEncodedText MemberManualAllocation = System.Text.Json.JsonEncodedText.Encode("MANUAL_ALLOCATION");
+	private static readonly System.Text.Json.JsonEncodedText MemberIndexReopened = System.Text.Json.JsonEncodedText.Encode("INDEX_REOPENED");
+	private static readonly System.Text.Json.JsonEncodedText MemberIndexCreated = System.Text.Json.JsonEncodedText.Encode("INDEX_CREATED");
+	private static readonly System.Text.Json.JsonEncodedText MemberForcedEmptyPrimary = System.Text.Json.JsonEncodedText.Encode("FORCED_EMPTY_PRIMARY");
+	private static readonly System.Text.Json.JsonEncodedText MemberExistingIndexRestored = System.Text.Json.JsonEncodedText.Encode("EXISTING_INDEX_RESTORED");
+	private static readonly System.Text.Json.JsonEncodedText MemberDanglingIndexImported = System.Text.Json.JsonEncodedText.Encode("DANGLING_INDEX_IMPORTED");
+	private static readonly System.Text.Json.JsonEncodedText MemberClusterRecovered = System.Text.Json.JsonEncodedText.Encode("CLUSTER_RECOVERED");
+	private static readonly System.Text.Json.JsonEncodedText MemberAllocationFailed = System.Text.Json.JsonEncodedText.Encode("ALLOCATION_FAILED");
+
+	public override UnassignedInformationReason Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberRerouteCancelled))
+		{
+			return UnassignedInformationReason.RerouteCancelled;
+		}
+
+		if (reader.ValueTextEquals(MemberReplicaAdded))
+		{
+			return UnassignedInformationReason.ReplicaAdded;
+		}
+
+		if (reader.ValueTextEquals(MemberReinitialized))
+		{
+			return UnassignedInformationReason.Reinitialized;
+		}
+
+		if (reader.ValueTextEquals(MemberReallocatedReplica))
+		{
+			return UnassignedInformationReason.ReallocatedReplica;
+		}
+
+		if (reader.ValueTextEquals(MemberPrimaryFailed))
+		{
+			return UnassignedInformationReason.PrimaryFailed;
+		}
+
+		if (reader.ValueTextEquals(MemberNodeLeft))
+		{
+			return UnassignedInformationReason.NodeLeft;
+		}
+
+		if (reader.ValueTextEquals(MemberNewIndexRestored))
+		{
+			return UnassignedInformationReason.NewIndexRestored;
+		}
+
+		if (reader.ValueTextEquals(MemberManualAllocation))
+		{
+			return UnassignedInformationReason.ManualAllocation;
+		}
+
+		if (reader.ValueTextEquals(MemberIndexReopened))
 		{
-			case "REROUTE_CANCELLED":
-				return UnassignedInformationReason.RerouteCancelled;
-			case "REPLICA_ADDED":
-				return UnassignedInformationReason.ReplicaAdded;
-			case "REINITIALIZED":
-				return UnassignedInformationReason.Reinitialized;
-			case "REALLOCATED_REPLICA":
-				return UnassignedInformationReason.ReallocatedReplica;
-			case "PRIMARY_FAILED":
-				return UnassignedInformationReason.PrimaryFailed;
-			case "NODE_LEFT":
-				return UnassignedInformationReason.NodeLeft;
-			case "NEW_INDEX_RESTORED":
-				return UnassignedInformationReason.NewIndexRestored;
-			case "MANUAL_ALLOCATION":
-				return UnassignedInformationReason.ManualAllocation;
-			case "INDEX_REOPENED":
-				return UnassignedInformationReason.IndexReopened;
-			case "INDEX_CREATED":
-				return UnassignedInformationReason.IndexCreated;
-			case "FORCED_EMPTY_PRIMARY":
-				return UnassignedInformationReason.ForcedEmptyPrimary;
-			case "EXISTING_INDEX_RESTORED":
-				return UnassignedInformationReason.ExistingIndexRestored;
-			case "DANGLING_INDEX_IMPORTED":
-				return UnassignedInformationReason.DanglingIndexImported;
-			case "CLUSTER_RECOVERED":
-				return UnassignedInformationReason.ClusterRecovered;
-			case "ALLOCATION_FAILED":
-				return UnassignedInformationReason.AllocationFailed;
+			return UnassignedInformationReason.IndexReopened;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberIndexCreated))
+		{
+			return UnassignedInformationReason.IndexCreated;
+		}
+
+		if (reader.ValueTextEquals(MemberForcedEmptyPrimary))
+		{
+			return UnassignedInformationReason.ForcedEmptyPrimary;
+		}
+
+		if (reader.ValueTextEquals(MemberExistingIndexRestored))
+		{
+			return UnassignedInformationReason.ExistingIndexRestored;
+		}
+
+		if (reader.ValueTextEquals(MemberDanglingIndexImported))
+		{
+			return UnassignedInformationReason.DanglingIndexImported;
+		}
+
+		if (reader.ValueTextEquals(MemberClusterRecovered))
+		{
+			return UnassignedInformationReason.ClusterRecovered;
+		}
+
+		if (reader.ValueTextEquals(MemberAllocationFailed))
+		{
+			return UnassignedInformationReason.AllocationFailed;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(UnassignedInformationReason)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, UnassignedInformationReason value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, UnassignedInformationReason value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case UnassignedInformationReason.RerouteCancelled:
-				writer.WriteStringValue("REROUTE_CANCELLED");
-				return;
+				writer.WriteStringValue(MemberRerouteCancelled);
+				break;
 			case UnassignedInformationReason.ReplicaAdded:
-				writer.WriteStringValue("REPLICA_ADDED");
-				return;
+				writer.WriteStringValue(MemberReplicaAdded);
+				break;
 			case UnassignedInformationReason.Reinitialized:
-				writer.WriteStringValue("REINITIALIZED");
-				return;
+				writer.WriteStringValue(MemberReinitialized);
+				break;
 			case UnassignedInformationReason.ReallocatedReplica:
-				writer.WriteStringValue("REALLOCATED_REPLICA");
-				return;
+				writer.WriteStringValue(MemberReallocatedReplica);
+				break;
 			case UnassignedInformationReason.PrimaryFailed:
-				writer.WriteStringValue("PRIMARY_FAILED");
-				return;
+				writer.WriteStringValue(MemberPrimaryFailed);
+				break;
 			case UnassignedInformationReason.NodeLeft:
-				writer.WriteStringValue("NODE_LEFT");
-				return;
+				writer.WriteStringValue(MemberNodeLeft);
+				break;
 			case UnassignedInformationReason.NewIndexRestored:
-				writer.WriteStringValue("NEW_INDEX_RESTORED");
-				return;
+				writer.WriteStringValue(MemberNewIndexRestored);
+				break;
 			case UnassignedInformationReason.ManualAllocation:
-				writer.WriteStringValue("MANUAL_ALLOCATION");
-				return;
+				writer.WriteStringValue(MemberManualAllocation);
+				break;
 			case UnassignedInformationReason.IndexReopened:
-				writer.WriteStringValue("INDEX_REOPENED");
-				return;
+				writer.WriteStringValue(MemberIndexReopened);
+				break;
 			case UnassignedInformationReason.IndexCreated:
-				writer.WriteStringValue("INDEX_CREATED");
-				return;
+				writer.WriteStringValue(MemberIndexCreated);
+				break;
 			case UnassignedInformationReason.ForcedEmptyPrimary:
-				writer.WriteStringValue("FORCED_EMPTY_PRIMARY");
-				return;
+				writer.WriteStringValue(MemberForcedEmptyPrimary);
+				break;
 			case UnassignedInformationReason.ExistingIndexRestored:
-				writer.WriteStringValue("EXISTING_INDEX_RESTORED");
-				return;
+				writer.WriteStringValue(MemberExistingIndexRestored);
+				break;
 			case UnassignedInformationReason.DanglingIndexImported:
-				writer.WriteStringValue("DANGLING_INDEX_IMPORTED");
-				return;
+				writer.WriteStringValue(MemberDanglingIndexImported);
+				break;
 			case UnassignedInformationReason.ClusterRecovered:
-				writer.WriteStringValue("CLUSTER_RECOVERED");
-				return;
+				writer.WriteStringValue(MemberClusterRecovered);
+				break;
 			case UnassignedInformationReason.AllocationFailed:
-				writer.WriteStringValue("ALLOCATION_FAILED");
-				return;
+				writer.WriteStringValue(MemberAllocationFailed);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(UnassignedInformationReason)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.Core.HealthReport.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.Core.HealthReport.g.cs
index 8752f1368d9..661588984fd 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.Core.HealthReport.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.Core.HealthReport.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Core;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport;
 using System;
@@ -41,46 +42,58 @@ public enum ImpactArea
 	Backup
 }
 
-internal sealed class ImpactAreaConverter : JsonConverter<ImpactArea>
+internal sealed partial class ImpactAreaConverter : System.Text.Json.Serialization.JsonConverter<ImpactArea>
 {
-	public override ImpactArea Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberSearch = System.Text.Json.JsonEncodedText.Encode("search");
+	private static readonly System.Text.Json.JsonEncodedText MemberIngest = System.Text.Json.JsonEncodedText.Encode("ingest");
+	private static readonly System.Text.Json.JsonEncodedText MemberDeploymentManagement = System.Text.Json.JsonEncodedText.Encode("deployment_management");
+	private static readonly System.Text.Json.JsonEncodedText MemberBackup = System.Text.Json.JsonEncodedText.Encode("backup");
+
+	public override ImpactArea Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberSearch))
+		{
+			return ImpactArea.Search;
+		}
+
+		if (reader.ValueTextEquals(MemberIngest))
 		{
-			case "search":
-				return ImpactArea.Search;
-			case "ingest":
-				return ImpactArea.Ingest;
-			case "deployment_management":
-				return ImpactArea.DeploymentManagement;
-			case "backup":
-				return ImpactArea.Backup;
+			return ImpactArea.Ingest;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberDeploymentManagement))
+		{
+			return ImpactArea.DeploymentManagement;
+		}
+
+		if (reader.ValueTextEquals(MemberBackup))
+		{
+			return ImpactArea.Backup;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(ImpactArea)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, ImpactArea value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ImpactArea value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case ImpactArea.Search:
-				writer.WriteStringValue("search");
-				return;
+				writer.WriteStringValue(MemberSearch);
+				break;
 			case ImpactArea.Ingest:
-				writer.WriteStringValue("ingest");
-				return;
+				writer.WriteStringValue(MemberIngest);
+				break;
 			case ImpactArea.DeploymentManagement:
-				writer.WriteStringValue("deployment_management");
-				return;
+				writer.WriteStringValue(MemberDeploymentManagement);
+				break;
 			case ImpactArea.Backup:
-				writer.WriteStringValue("backup");
-				return;
+				writer.WriteStringValue(MemberBackup);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(ImpactArea)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -97,45 +110,57 @@ public enum IndicatorHealthStatus
 	Green
 }
 
-internal sealed class IndicatorHealthStatusConverter : JsonConverter<IndicatorHealthStatus>
+internal sealed partial class IndicatorHealthStatusConverter : System.Text.Json.Serialization.JsonConverter<IndicatorHealthStatus>
 {
-	public override IndicatorHealthStatus Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberYellow = System.Text.Json.JsonEncodedText.Encode("yellow");
+	private static readonly System.Text.Json.JsonEncodedText MemberUnknown = System.Text.Json.JsonEncodedText.Encode("unknown");
+	private static readonly System.Text.Json.JsonEncodedText MemberRed = System.Text.Json.JsonEncodedText.Encode("red");
+	private static readonly System.Text.Json.JsonEncodedText MemberGreen = System.Text.Json.JsonEncodedText.Encode("green");
+
+	public override IndicatorHealthStatus Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberYellow))
+		{
+			return IndicatorHealthStatus.Yellow;
+		}
+
+		if (reader.ValueTextEquals(MemberUnknown))
 		{
-			case "yellow":
-				return IndicatorHealthStatus.Yellow;
-			case "unknown":
-				return IndicatorHealthStatus.Unknown;
-			case "red":
-				return IndicatorHealthStatus.Red;
-			case "green":
-				return IndicatorHealthStatus.Green;
+			return IndicatorHealthStatus.Unknown;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberRed))
+		{
+			return IndicatorHealthStatus.Red;
+		}
+
+		if (reader.ValueTextEquals(MemberGreen))
+		{
+			return IndicatorHealthStatus.Green;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(IndicatorHealthStatus)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, IndicatorHealthStatus value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IndicatorHealthStatus value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case IndicatorHealthStatus.Yellow:
-				writer.WriteStringValue("yellow");
-				return;
+				writer.WriteStringValue(MemberYellow);
+				break;
 			case IndicatorHealthStatus.Unknown:
-				writer.WriteStringValue("unknown");
-				return;
+				writer.WriteStringValue(MemberUnknown);
+				break;
 			case IndicatorHealthStatus.Red:
-				writer.WriteStringValue("red");
-				return;
+				writer.WriteStringValue(MemberRed);
+				break;
 			case IndicatorHealthStatus.Green:
-				writer.WriteStringValue("green");
-				return;
+				writer.WriteStringValue(MemberGreen);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(IndicatorHealthStatus)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.Core.Search.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.Core.Search.g.cs
index 733910adc3f..53a0310ce1c 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.Core.Search.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.Core.Search.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Core;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport;
 using System;
@@ -60,41 +61,49 @@ public enum BoundaryScanner
 	Chars
 }
 
-internal sealed class BoundaryScannerConverter : JsonConverter<BoundaryScanner>
+internal sealed partial class BoundaryScannerConverter : System.Text.Json.Serialization.JsonConverter<BoundaryScanner>
 {
-	public override BoundaryScanner Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberWord = System.Text.Json.JsonEncodedText.Encode("word");
+	private static readonly System.Text.Json.JsonEncodedText MemberSentence = System.Text.Json.JsonEncodedText.Encode("sentence");
+	private static readonly System.Text.Json.JsonEncodedText MemberChars = System.Text.Json.JsonEncodedText.Encode("chars");
+
+	public override BoundaryScanner Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberWord))
 		{
-			case "word":
-				return BoundaryScanner.Word;
-			case "sentence":
-				return BoundaryScanner.Sentence;
-			case "chars":
-				return BoundaryScanner.Chars;
+			return BoundaryScanner.Word;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberSentence))
+		{
+			return BoundaryScanner.Sentence;
+		}
+
+		if (reader.ValueTextEquals(MemberChars))
+		{
+			return BoundaryScanner.Chars;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(BoundaryScanner)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, BoundaryScanner value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, BoundaryScanner value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case BoundaryScanner.Word:
-				writer.WriteStringValue("word");
-				return;
+				writer.WriteStringValue(MemberWord);
+				break;
 			case BoundaryScanner.Sentence:
-				writer.WriteStringValue("sentence");
-				return;
+				writer.WriteStringValue(MemberSentence);
+				break;
 			case BoundaryScanner.Chars:
-				writer.WriteStringValue("chars");
-				return;
+				writer.WriteStringValue(MemberChars);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(BoundaryScanner)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -107,36 +116,40 @@ public enum HighlighterEncoder
 	Default
 }
 
-internal sealed class HighlighterEncoderConverter : JsonConverter<HighlighterEncoder>
+internal sealed partial class HighlighterEncoderConverter : System.Text.Json.Serialization.JsonConverter<HighlighterEncoder>
 {
-	public override HighlighterEncoder Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberHtml = System.Text.Json.JsonEncodedText.Encode("html");
+	private static readonly System.Text.Json.JsonEncodedText MemberDefault = System.Text.Json.JsonEncodedText.Encode("default");
+
+	public override HighlighterEncoder Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberHtml))
 		{
-			case "html":
-				return HighlighterEncoder.Html;
-			case "default":
-				return HighlighterEncoder.Default;
+			return HighlighterEncoder.Html;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberDefault))
+		{
+			return HighlighterEncoder.Default;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(HighlighterEncoder)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, HighlighterEncoder value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, HighlighterEncoder value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case HighlighterEncoder.Html:
-				writer.WriteStringValue("html");
-				return;
+				writer.WriteStringValue(MemberHtml);
+				break;
 			case HighlighterEncoder.Default:
-				writer.WriteStringValue("default");
-				return;
+				writer.WriteStringValue(MemberDefault);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(HighlighterEncoder)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -149,36 +162,40 @@ public enum HighlighterFragmenter
 	Simple
 }
 
-internal sealed class HighlighterFragmenterConverter : JsonConverter<HighlighterFragmenter>
+internal sealed partial class HighlighterFragmenterConverter : System.Text.Json.Serialization.JsonConverter<HighlighterFragmenter>
 {
-	public override HighlighterFragmenter Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberSpan = System.Text.Json.JsonEncodedText.Encode("span");
+	private static readonly System.Text.Json.JsonEncodedText MemberSimple = System.Text.Json.JsonEncodedText.Encode("simple");
+
+	public override HighlighterFragmenter Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberSpan))
+		{
+			return HighlighterFragmenter.Span;
+		}
+
+		if (reader.ValueTextEquals(MemberSimple))
 		{
-			case "span":
-				return HighlighterFragmenter.Span;
-			case "simple":
-				return HighlighterFragmenter.Simple;
+			return HighlighterFragmenter.Simple;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(HighlighterFragmenter)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, HighlighterFragmenter value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, HighlighterFragmenter value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case HighlighterFragmenter.Span:
-				writer.WriteStringValue("span");
-				return;
+				writer.WriteStringValue(MemberSpan);
+				break;
 			case HighlighterFragmenter.Simple:
-				writer.WriteStringValue("simple");
-				return;
+				writer.WriteStringValue(MemberSimple);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(HighlighterFragmenter)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -189,31 +206,31 @@ public enum HighlighterOrder
 	Score
 }
 
-internal sealed class HighlighterOrderConverter : JsonConverter<HighlighterOrder>
+internal sealed partial class HighlighterOrderConverter : System.Text.Json.Serialization.JsonConverter<HighlighterOrder>
 {
-	public override HighlighterOrder Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberScore = System.Text.Json.JsonEncodedText.Encode("score");
+
+	public override HighlighterOrder Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberScore))
 		{
-			case "score":
-				return HighlighterOrder.Score;
+			return HighlighterOrder.Score;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(HighlighterOrder)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, HighlighterOrder value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, HighlighterOrder value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case HighlighterOrder.Score:
-				writer.WriteStringValue("score");
-				return;
+				writer.WriteStringValue(MemberScore);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(HighlighterOrder)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -224,31 +241,31 @@ public enum HighlighterTagsSchema
 	Styled
 }
 
-internal sealed class HighlighterTagsSchemaConverter : JsonConverter<HighlighterTagsSchema>
+internal sealed partial class HighlighterTagsSchemaConverter : System.Text.Json.Serialization.JsonConverter<HighlighterTagsSchema>
 {
-	public override HighlighterTagsSchema Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberStyled = System.Text.Json.JsonEncodedText.Encode("styled");
+
+	public override HighlighterTagsSchema Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberStyled))
 		{
-			case "styled":
-				return HighlighterTagsSchema.Styled;
+			return HighlighterTagsSchema.Styled;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(HighlighterTagsSchema)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, HighlighterTagsSchema value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, HighlighterTagsSchema value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case HighlighterTagsSchema.Styled:
-				writer.WriteStringValue("styled");
-				return;
+				writer.WriteStringValue(MemberStyled);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(HighlighterTagsSchema)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -256,9 +273,11 @@ public override void Write(Utf8JsonWriter writer, HighlighterTagsSchema value, J
 public readonly partial struct HighlighterType : IEnumStruct<HighlighterType>
 {
 	public HighlighterType(string value) => Value = value;
-
+#if NET7_0_OR_GREATER
+	static HighlighterType IEnumStruct<HighlighterType>.Create(string value) => value;
+#else
 	HighlighterType IEnumStruct<HighlighterType>.Create(string value) => value;
-
+#endif
 	public readonly string Value { get; }
 
 	/// <summary>
@@ -336,51 +355,67 @@ public enum ScoreMode
 	Avg
 }
 
-internal sealed class ScoreModeConverter : JsonConverter<ScoreMode>
+internal sealed partial class ScoreModeConverter : System.Text.Json.Serialization.JsonConverter<ScoreMode>
 {
-	public override ScoreMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberTotal = System.Text.Json.JsonEncodedText.Encode("total");
+	private static readonly System.Text.Json.JsonEncodedText MemberMultiply = System.Text.Json.JsonEncodedText.Encode("multiply");
+	private static readonly System.Text.Json.JsonEncodedText MemberMin = System.Text.Json.JsonEncodedText.Encode("min");
+	private static readonly System.Text.Json.JsonEncodedText MemberMax = System.Text.Json.JsonEncodedText.Encode("max");
+	private static readonly System.Text.Json.JsonEncodedText MemberAvg = System.Text.Json.JsonEncodedText.Encode("avg");
+
+	public override ScoreMode Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "total":
-				return ScoreMode.Total;
-			case "multiply":
-				return ScoreMode.Multiply;
-			case "min":
-				return ScoreMode.Min;
-			case "max":
-				return ScoreMode.Max;
-			case "avg":
-				return ScoreMode.Avg;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberTotal))
+		{
+			return ScoreMode.Total;
+		}
+
+		if (reader.ValueTextEquals(MemberMultiply))
+		{
+			return ScoreMode.Multiply;
+		}
+
+		if (reader.ValueTextEquals(MemberMin))
+		{
+			return ScoreMode.Min;
+		}
+
+		if (reader.ValueTextEquals(MemberMax))
+		{
+			return ScoreMode.Max;
+		}
+
+		if (reader.ValueTextEquals(MemberAvg))
+		{
+			return ScoreMode.Avg;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(ScoreMode)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, ScoreMode value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ScoreMode value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case ScoreMode.Total:
-				writer.WriteStringValue("total");
-				return;
+				writer.WriteStringValue(MemberTotal);
+				break;
 			case ScoreMode.Multiply:
-				writer.WriteStringValue("multiply");
-				return;
+				writer.WriteStringValue(MemberMultiply);
+				break;
 			case ScoreMode.Min:
-				writer.WriteStringValue("min");
-				return;
+				writer.WriteStringValue(MemberMin);
+				break;
 			case ScoreMode.Max:
-				writer.WriteStringValue("max");
-				return;
+				writer.WriteStringValue(MemberMax);
+				break;
 			case ScoreMode.Avg:
-				writer.WriteStringValue("avg");
-				return;
+				writer.WriteStringValue(MemberAvg);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(ScoreMode)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -424,51 +459,67 @@ public enum StringDistance
 	DamerauLevenshtein
 }
 
-internal sealed class StringDistanceConverter : JsonConverter<StringDistance>
+internal sealed partial class StringDistanceConverter : System.Text.Json.Serialization.JsonConverter<StringDistance>
 {
-	public override StringDistance Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberNgram = System.Text.Json.JsonEncodedText.Encode("ngram");
+	private static readonly System.Text.Json.JsonEncodedText MemberLevenshtein = System.Text.Json.JsonEncodedText.Encode("levenshtein");
+	private static readonly System.Text.Json.JsonEncodedText MemberJaroWinkler = System.Text.Json.JsonEncodedText.Encode("jaro_winkler");
+	private static readonly System.Text.Json.JsonEncodedText MemberInternal = System.Text.Json.JsonEncodedText.Encode("internal");
+	private static readonly System.Text.Json.JsonEncodedText MemberDamerauLevenshtein = System.Text.Json.JsonEncodedText.Encode("damerau_levenshtein");
+
+	public override StringDistance Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "ngram":
-				return StringDistance.Ngram;
-			case "levenshtein":
-				return StringDistance.Levenshtein;
-			case "jaro_winkler":
-				return StringDistance.JaroWinkler;
-			case "internal":
-				return StringDistance.Internal;
-			case "damerau_levenshtein":
-				return StringDistance.DamerauLevenshtein;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberNgram))
+		{
+			return StringDistance.Ngram;
+		}
+
+		if (reader.ValueTextEquals(MemberLevenshtein))
+		{
+			return StringDistance.Levenshtein;
+		}
+
+		if (reader.ValueTextEquals(MemberJaroWinkler))
+		{
+			return StringDistance.JaroWinkler;
+		}
+
+		if (reader.ValueTextEquals(MemberInternal))
+		{
+			return StringDistance.Internal;
+		}
+
+		if (reader.ValueTextEquals(MemberDamerauLevenshtein))
+		{
+			return StringDistance.DamerauLevenshtein;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(StringDistance)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, StringDistance value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, StringDistance value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case StringDistance.Ngram:
-				writer.WriteStringValue("ngram");
-				return;
+				writer.WriteStringValue(MemberNgram);
+				break;
 			case StringDistance.Levenshtein:
-				writer.WriteStringValue("levenshtein");
-				return;
+				writer.WriteStringValue(MemberLevenshtein);
+				break;
 			case StringDistance.JaroWinkler:
-				writer.WriteStringValue("jaro_winkler");
-				return;
+				writer.WriteStringValue(MemberJaroWinkler);
+				break;
 			case StringDistance.Internal:
-				writer.WriteStringValue("internal");
-				return;
+				writer.WriteStringValue(MemberInternal);
+				break;
 			case StringDistance.DamerauLevenshtein:
-				writer.WriteStringValue("damerau_levenshtein");
-				return;
+				writer.WriteStringValue(MemberDamerauLevenshtein);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(StringDistance)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -491,36 +542,40 @@ public enum SuggestSort
 	Frequency
 }
 
-internal sealed class SuggestSortConverter : JsonConverter<SuggestSort>
+internal sealed partial class SuggestSortConverter : System.Text.Json.Serialization.JsonConverter<SuggestSort>
 {
-	public override SuggestSort Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberScore = System.Text.Json.JsonEncodedText.Encode("score");
+	private static readonly System.Text.Json.JsonEncodedText MemberFrequency = System.Text.Json.JsonEncodedText.Encode("frequency");
+
+	public override SuggestSort Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberScore))
 		{
-			case "score":
-				return SuggestSort.Score;
-			case "frequency":
-				return SuggestSort.Frequency;
+			return SuggestSort.Score;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberFrequency))
+		{
+			return SuggestSort.Frequency;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(SuggestSort)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, SuggestSort value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SuggestSort value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case SuggestSort.Score:
-				writer.WriteStringValue("score");
-				return;
+				writer.WriteStringValue(MemberScore);
+				break;
 			case SuggestSort.Frequency:
-				writer.WriteStringValue("frequency");
-				return;
+				writer.WriteStringValue(MemberFrequency);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(SuggestSort)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -543,35 +598,39 @@ public enum TotalHitsRelation
 	Eq
 }
 
-internal sealed class TotalHitsRelationConverter : JsonConverter<TotalHitsRelation>
+internal sealed partial class TotalHitsRelationConverter : System.Text.Json.Serialization.JsonConverter<TotalHitsRelation>
 {
-	public override TotalHitsRelation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberGte = System.Text.Json.JsonEncodedText.Encode("gte");
+	private static readonly System.Text.Json.JsonEncodedText MemberEq = System.Text.Json.JsonEncodedText.Encode("eq");
+
+	public override TotalHitsRelation Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberGte))
 		{
-			case "gte":
-				return TotalHitsRelation.Gte;
-			case "eq":
-				return TotalHitsRelation.Eq;
+			return TotalHitsRelation.Gte;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberEq))
+		{
+			return TotalHitsRelation.Eq;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(TotalHitsRelation)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, TotalHitsRelation value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, TotalHitsRelation value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case TotalHitsRelation.Gte:
-				writer.WriteStringValue("gte");
-				return;
+				writer.WriteStringValue(MemberGte);
+				break;
 			case TotalHitsRelation.Eq:
-				writer.WriteStringValue("eq");
-				return;
+				writer.WriteStringValue(MemberEq);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(TotalHitsRelation)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.Core.SearchMvt.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.Core.SearchMvt.g.cs
index 9570d6fe1ff..30cdf80b82d 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.Core.SearchMvt.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.Core.SearchMvt.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Core;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport;
 using System;
@@ -37,36 +38,40 @@ public enum GridAggregationType
 	Geohex
 }
 
-internal sealed class GridAggregationTypeConverter : JsonConverter<GridAggregationType>
+internal sealed partial class GridAggregationTypeConverter : System.Text.Json.Serialization.JsonConverter<GridAggregationType>
 {
-	public override GridAggregationType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberGeotile = System.Text.Json.JsonEncodedText.Encode("geotile");
+	private static readonly System.Text.Json.JsonEncodedText MemberGeohex = System.Text.Json.JsonEncodedText.Encode("geohex");
+
+	public override GridAggregationType Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberGeotile))
+		{
+			return GridAggregationType.Geotile;
+		}
+
+		if (reader.ValueTextEquals(MemberGeohex))
 		{
-			case "geotile":
-				return GridAggregationType.Geotile;
-			case "geohex":
-				return GridAggregationType.Geohex;
+			return GridAggregationType.Geohex;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(GridAggregationType)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, GridAggregationType value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GridAggregationType value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case GridAggregationType.Geotile:
-				writer.WriteStringValue("geotile");
-				return;
+				writer.WriteStringValue(MemberGeotile);
+				break;
 			case GridAggregationType.Geohex:
-				writer.WriteStringValue("geohex");
-				return;
+				writer.WriteStringValue(MemberGeohex);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(GridAggregationType)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -81,40 +86,48 @@ public enum GridType
 	Centroid
 }
 
-internal sealed class GridTypeConverter : JsonConverter<GridType>
+internal sealed partial class GridTypeConverter : System.Text.Json.Serialization.JsonConverter<GridType>
 {
-	public override GridType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberPoint = System.Text.Json.JsonEncodedText.Encode("point");
+	private static readonly System.Text.Json.JsonEncodedText MemberGrid = System.Text.Json.JsonEncodedText.Encode("grid");
+	private static readonly System.Text.Json.JsonEncodedText MemberCentroid = System.Text.Json.JsonEncodedText.Encode("centroid");
+
+	public override GridType Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberPoint))
 		{
-			case "point":
-				return GridType.Point;
-			case "grid":
-				return GridType.Grid;
-			case "centroid":
-				return GridType.Centroid;
+			return GridType.Point;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberGrid))
+		{
+			return GridType.Grid;
+		}
+
+		if (reader.ValueTextEquals(MemberCentroid))
+		{
+			return GridType.Centroid;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(GridType)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, GridType value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GridType value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case GridType.Point:
-				writer.WriteStringValue("point");
-				return;
+				writer.WriteStringValue(MemberPoint);
+				break;
 			case GridType.Grid:
-				writer.WriteStringValue("grid");
-				return;
+				writer.WriteStringValue(MemberGrid);
+				break;
 			case GridType.Centroid:
-				writer.WriteStringValue("centroid");
-				return;
+				writer.WriteStringValue(MemberCentroid);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(GridType)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.Enrich.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.Enrich.g.cs
index ae03d3ffb09..53679c53667 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.Enrich.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.Enrich.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Core;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport;
 using System;
@@ -41,46 +42,58 @@ public enum EnrichPolicyPhase
 	Complete
 }
 
-internal sealed class EnrichPolicyPhaseConverter : JsonConverter<EnrichPolicyPhase>
+internal sealed partial class EnrichPolicyPhaseConverter : System.Text.Json.Serialization.JsonConverter<EnrichPolicyPhase>
 {
-	public override EnrichPolicyPhase Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberScheduled = System.Text.Json.JsonEncodedText.Encode("SCHEDULED");
+	private static readonly System.Text.Json.JsonEncodedText MemberRunning = System.Text.Json.JsonEncodedText.Encode("RUNNING");
+	private static readonly System.Text.Json.JsonEncodedText MemberFailed = System.Text.Json.JsonEncodedText.Encode("FAILED");
+	private static readonly System.Text.Json.JsonEncodedText MemberComplete = System.Text.Json.JsonEncodedText.Encode("COMPLETE");
+
+	public override EnrichPolicyPhase Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberScheduled))
+		{
+			return EnrichPolicyPhase.Scheduled;
+		}
+
+		if (reader.ValueTextEquals(MemberRunning))
+		{
+			return EnrichPolicyPhase.Running;
+		}
+
+		if (reader.ValueTextEquals(MemberFailed))
+		{
+			return EnrichPolicyPhase.Failed;
+		}
+
+		if (reader.ValueTextEquals(MemberComplete))
 		{
-			case "SCHEDULED":
-				return EnrichPolicyPhase.Scheduled;
-			case "RUNNING":
-				return EnrichPolicyPhase.Running;
-			case "FAILED":
-				return EnrichPolicyPhase.Failed;
-			case "COMPLETE":
-				return EnrichPolicyPhase.Complete;
+			return EnrichPolicyPhase.Complete;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(EnrichPolicyPhase)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, EnrichPolicyPhase value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, EnrichPolicyPhase value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case EnrichPolicyPhase.Scheduled:
-				writer.WriteStringValue("SCHEDULED");
-				return;
+				writer.WriteStringValue(MemberScheduled);
+				break;
 			case EnrichPolicyPhase.Running:
-				writer.WriteStringValue("RUNNING");
-				return;
+				writer.WriteStringValue(MemberRunning);
+				break;
 			case EnrichPolicyPhase.Failed:
-				writer.WriteStringValue("FAILED");
-				return;
+				writer.WriteStringValue(MemberFailed);
+				break;
 			case EnrichPolicyPhase.Complete:
-				writer.WriteStringValue("COMPLETE");
-				return;
+				writer.WriteStringValue(MemberComplete);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(EnrichPolicyPhase)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -95,40 +108,48 @@ public enum PolicyType
 	GeoMatch
 }
 
-internal sealed class PolicyTypeConverter : JsonConverter<PolicyType>
+internal sealed partial class PolicyTypeConverter : System.Text.Json.Serialization.JsonConverter<PolicyType>
 {
-	public override PolicyType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberRange = System.Text.Json.JsonEncodedText.Encode("range");
+	private static readonly System.Text.Json.JsonEncodedText MemberMatch = System.Text.Json.JsonEncodedText.Encode("match");
+	private static readonly System.Text.Json.JsonEncodedText MemberGeoMatch = System.Text.Json.JsonEncodedText.Encode("geo_match");
+
+	public override PolicyType Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberRange))
+		{
+			return PolicyType.Range;
+		}
+
+		if (reader.ValueTextEquals(MemberMatch))
 		{
-			case "range":
-				return PolicyType.Range;
-			case "match":
-				return PolicyType.Match;
-			case "geo_match":
-				return PolicyType.GeoMatch;
+			return PolicyType.Match;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberGeoMatch))
+		{
+			return PolicyType.GeoMatch;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(PolicyType)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, PolicyType value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PolicyType value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case PolicyType.Range:
-				writer.WriteStringValue("range");
-				return;
+				writer.WriteStringValue(MemberRange);
+				break;
 			case PolicyType.Match:
-				writer.WriteStringValue("match");
-				return;
+				writer.WriteStringValue(MemberMatch);
+				break;
 			case PolicyType.GeoMatch:
-				writer.WriteStringValue("geo_match");
-				return;
+				writer.WriteStringValue(MemberGeoMatch);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(PolicyType)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.Eql.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.Eql.g.cs
index 75e0ada4a0f..0ebb896afa7 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.Eql.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.Eql.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Core;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport;
 using System;
@@ -47,35 +48,39 @@ public enum ResultPosition
 	Head
 }
 
-internal sealed class ResultPositionConverter : JsonConverter<ResultPosition>
+internal sealed partial class ResultPositionConverter : System.Text.Json.Serialization.JsonConverter<ResultPosition>
 {
-	public override ResultPosition Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberTail = System.Text.Json.JsonEncodedText.Encode("tail");
+	private static readonly System.Text.Json.JsonEncodedText MemberHead = System.Text.Json.JsonEncodedText.Encode("head");
+
+	public override ResultPosition Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberTail))
 		{
-			case "tail":
-				return ResultPosition.Tail;
-			case "head":
-				return ResultPosition.Head;
+			return ResultPosition.Tail;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberHead))
+		{
+			return ResultPosition.Head;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(ResultPosition)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, ResultPosition value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ResultPosition value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case ResultPosition.Tail:
-				writer.WriteStringValue("tail");
-				return;
+				writer.WriteStringValue(MemberTail);
+				break;
 			case ResultPosition.Head:
-				writer.WriteStringValue("head");
-				return;
+				writer.WriteStringValue(MemberHead);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(ResultPosition)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.Esql.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.Esql.g.cs
index 9f3b55c714b..3994b367cca 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.Esql.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.Esql.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Core;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport;
 using System;
@@ -49,65 +50,93 @@ public enum EsqlFormat
 	Arrow
 }
 
-internal sealed class EsqlFormatConverter : JsonConverter<EsqlFormat>
+internal sealed partial class EsqlFormatConverter : System.Text.Json.Serialization.JsonConverter<EsqlFormat>
 {
-	public override EsqlFormat Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberYaml = System.Text.Json.JsonEncodedText.Encode("yaml");
+	private static readonly System.Text.Json.JsonEncodedText MemberTxt = System.Text.Json.JsonEncodedText.Encode("txt");
+	private static readonly System.Text.Json.JsonEncodedText MemberTsv = System.Text.Json.JsonEncodedText.Encode("tsv");
+	private static readonly System.Text.Json.JsonEncodedText MemberSmile = System.Text.Json.JsonEncodedText.Encode("smile");
+	private static readonly System.Text.Json.JsonEncodedText MemberJson = System.Text.Json.JsonEncodedText.Encode("json");
+	private static readonly System.Text.Json.JsonEncodedText MemberCsv = System.Text.Json.JsonEncodedText.Encode("csv");
+	private static readonly System.Text.Json.JsonEncodedText MemberCbor = System.Text.Json.JsonEncodedText.Encode("cbor");
+	private static readonly System.Text.Json.JsonEncodedText MemberArrow = System.Text.Json.JsonEncodedText.Encode("arrow");
+
+	public override EsqlFormat Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberYaml))
+		{
+			return EsqlFormat.Yaml;
+		}
+
+		if (reader.ValueTextEquals(MemberTxt))
+		{
+			return EsqlFormat.Txt;
+		}
+
+		if (reader.ValueTextEquals(MemberTsv))
+		{
+			return EsqlFormat.Tsv;
+		}
+
+		if (reader.ValueTextEquals(MemberSmile))
 		{
-			case "yaml":
-				return EsqlFormat.Yaml;
-			case "txt":
-				return EsqlFormat.Txt;
-			case "tsv":
-				return EsqlFormat.Tsv;
-			case "smile":
-				return EsqlFormat.Smile;
-			case "json":
-				return EsqlFormat.Json;
-			case "csv":
-				return EsqlFormat.Csv;
-			case "cbor":
-				return EsqlFormat.Cbor;
-			case "arrow":
-				return EsqlFormat.Arrow;
+			return EsqlFormat.Smile;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberJson))
+		{
+			return EsqlFormat.Json;
+		}
+
+		if (reader.ValueTextEquals(MemberCsv))
+		{
+			return EsqlFormat.Csv;
+		}
+
+		if (reader.ValueTextEquals(MemberCbor))
+		{
+			return EsqlFormat.Cbor;
+		}
+
+		if (reader.ValueTextEquals(MemberArrow))
+		{
+			return EsqlFormat.Arrow;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(EsqlFormat)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, EsqlFormat value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, EsqlFormat value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case EsqlFormat.Yaml:
-				writer.WriteStringValue("yaml");
-				return;
+				writer.WriteStringValue(MemberYaml);
+				break;
 			case EsqlFormat.Txt:
-				writer.WriteStringValue("txt");
-				return;
+				writer.WriteStringValue(MemberTxt);
+				break;
 			case EsqlFormat.Tsv:
-				writer.WriteStringValue("tsv");
-				return;
+				writer.WriteStringValue(MemberTsv);
+				break;
 			case EsqlFormat.Smile:
-				writer.WriteStringValue("smile");
-				return;
+				writer.WriteStringValue(MemberSmile);
+				break;
 			case EsqlFormat.Json:
-				writer.WriteStringValue("json");
-				return;
+				writer.WriteStringValue(MemberJson);
+				break;
 			case EsqlFormat.Csv:
-				writer.WriteStringValue("csv");
-				return;
+				writer.WriteStringValue(MemberCsv);
+				break;
 			case EsqlFormat.Cbor:
-				writer.WriteStringValue("cbor");
-				return;
+				writer.WriteStringValue(MemberCbor);
+				break;
 			case EsqlFormat.Arrow:
-				writer.WriteStringValue("arrow");
-				return;
+				writer.WriteStringValue(MemberArrow);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(EsqlFormat)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.IndexManagement.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.IndexManagement.g.cs
index 8c629226390..8c9686f8685 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.IndexManagement.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.IndexManagement.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Core;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport;
 using System;
@@ -39,41 +40,49 @@ public enum Feature
 	Aliases
 }
 
-internal sealed class FeatureConverter : JsonConverter<Feature>
+internal sealed partial class FeatureConverter : System.Text.Json.Serialization.JsonConverter<Feature>
 {
-	public override Feature Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberSettings = System.Text.Json.JsonEncodedText.Encode("settings");
+	private static readonly System.Text.Json.JsonEncodedText MemberMappings = System.Text.Json.JsonEncodedText.Encode("mappings");
+	private static readonly System.Text.Json.JsonEncodedText MemberAliases = System.Text.Json.JsonEncodedText.Encode("aliases");
+
+	public override Feature Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberSettings))
+		{
+			return Feature.Settings;
+		}
+
+		if (reader.ValueTextEquals(MemberMappings))
+		{
+			return Feature.Mappings;
+		}
+
+		if (reader.ValueTextEquals(MemberAliases))
 		{
-			case "settings":
-				return Feature.Settings;
-			case "mappings":
-				return Feature.Mappings;
-			case "aliases":
-				return Feature.Aliases;
+			return Feature.Aliases;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(Feature)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, Feature value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, Feature value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case Feature.Settings:
-				writer.WriteStringValue("settings");
-				return;
+				writer.WriteStringValue(MemberSettings);
+				break;
 			case Feature.Mappings:
-				writer.WriteStringValue("mappings");
-				return;
+				writer.WriteStringValue(MemberMappings);
+				break;
 			case Feature.Aliases:
-				writer.WriteStringValue("aliases");
-				return;
+				writer.WriteStringValue(MemberAliases);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(Feature)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -88,41 +97,49 @@ public enum IndexCheckOnStartup
 	Checksum
 }
 
-internal sealed class IndexCheckOnStartupConverter : JsonConverter<IndexCheckOnStartup>
+internal sealed partial class IndexCheckOnStartupConverter : System.Text.Json.Serialization.JsonConverter<IndexCheckOnStartup>
 {
-	public override IndexCheckOnStartup Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberTrue = System.Text.Json.JsonEncodedText.Encode("true");
+	private static readonly System.Text.Json.JsonEncodedText MemberFalse = System.Text.Json.JsonEncodedText.Encode("false");
+	private static readonly System.Text.Json.JsonEncodedText MemberChecksum = System.Text.Json.JsonEncodedText.Encode("checksum");
+
+	public override IndexCheckOnStartup Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberTrue))
+		{
+			return IndexCheckOnStartup.True;
+		}
+
+		if (reader.ValueTextEquals(MemberFalse))
 		{
-			case "true":
-				return IndexCheckOnStartup.True;
-			case "false":
-				return IndexCheckOnStartup.False;
-			case "checksum":
-				return IndexCheckOnStartup.Checksum;
+			return IndexCheckOnStartup.False;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberChecksum))
+		{
+			return IndexCheckOnStartup.Checksum;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(IndexCheckOnStartup)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, IndexCheckOnStartup value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IndexCheckOnStartup value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case IndexCheckOnStartup.True:
-				writer.WriteStringValue("true");
-				return;
+				writer.WriteStringValue(MemberTrue);
+				break;
 			case IndexCheckOnStartup.False:
-				writer.WriteStringValue("false");
-				return;
+				writer.WriteStringValue(MemberFalse);
+				break;
 			case IndexCheckOnStartup.Checksum:
-				writer.WriteStringValue("checksum");
-				return;
+				writer.WriteStringValue(MemberChecksum);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(IndexCheckOnStartup)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -135,36 +152,40 @@ public enum IndexMetadataState
 	Close
 }
 
-internal sealed class IndexMetadataStateConverter : JsonConverter<IndexMetadataState>
+internal sealed partial class IndexMetadataStateConverter : System.Text.Json.Serialization.JsonConverter<IndexMetadataState>
 {
-	public override IndexMetadataState Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberOpen = System.Text.Json.JsonEncodedText.Encode("open");
+	private static readonly System.Text.Json.JsonEncodedText MemberClose = System.Text.Json.JsonEncodedText.Encode("close");
+
+	public override IndexMetadataState Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberOpen))
 		{
-			case "open":
-				return IndexMetadataState.Open;
-			case "close":
-				return IndexMetadataState.Close;
+			return IndexMetadataState.Open;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberClose))
+		{
+			return IndexMetadataState.Close;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(IndexMetadataState)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, IndexMetadataState value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IndexMetadataState value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case IndexMetadataState.Open:
-				writer.WriteStringValue("open");
-				return;
+				writer.WriteStringValue(MemberOpen);
+				break;
 			case IndexMetadataState.Close:
-				writer.WriteStringValue("close");
-				return;
+				writer.WriteStringValue(MemberClose);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(IndexMetadataState)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -181,46 +202,58 @@ public enum IndexRoutingAllocationOptions
 	All
 }
 
-internal sealed class IndexRoutingAllocationOptionsConverter : JsonConverter<IndexRoutingAllocationOptions>
+internal sealed partial class IndexRoutingAllocationOptionsConverter : System.Text.Json.Serialization.JsonConverter<IndexRoutingAllocationOptions>
 {
-	public override IndexRoutingAllocationOptions Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberPrimaries = System.Text.Json.JsonEncodedText.Encode("primaries");
+	private static readonly System.Text.Json.JsonEncodedText MemberNone = System.Text.Json.JsonEncodedText.Encode("none");
+	private static readonly System.Text.Json.JsonEncodedText MemberNewPrimaries = System.Text.Json.JsonEncodedText.Encode("new_primaries");
+	private static readonly System.Text.Json.JsonEncodedText MemberAll = System.Text.Json.JsonEncodedText.Encode("all");
+
+	public override IndexRoutingAllocationOptions Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberPrimaries))
 		{
-			case "primaries":
-				return IndexRoutingAllocationOptions.Primaries;
-			case "none":
-				return IndexRoutingAllocationOptions.None;
-			case "new_primaries":
-				return IndexRoutingAllocationOptions.NewPrimaries;
-			case "all":
-				return IndexRoutingAllocationOptions.All;
+			return IndexRoutingAllocationOptions.Primaries;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberNone))
+		{
+			return IndexRoutingAllocationOptions.None;
+		}
+
+		if (reader.ValueTextEquals(MemberNewPrimaries))
+		{
+			return IndexRoutingAllocationOptions.NewPrimaries;
+		}
+
+		if (reader.ValueTextEquals(MemberAll))
+		{
+			return IndexRoutingAllocationOptions.All;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(IndexRoutingAllocationOptions)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, IndexRoutingAllocationOptions value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IndexRoutingAllocationOptions value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case IndexRoutingAllocationOptions.Primaries:
-				writer.WriteStringValue("primaries");
-				return;
+				writer.WriteStringValue(MemberPrimaries);
+				break;
 			case IndexRoutingAllocationOptions.None:
-				writer.WriteStringValue("none");
-				return;
+				writer.WriteStringValue(MemberNone);
+				break;
 			case IndexRoutingAllocationOptions.NewPrimaries:
-				writer.WriteStringValue("new_primaries");
-				return;
+				writer.WriteStringValue(MemberNewPrimaries);
+				break;
 			case IndexRoutingAllocationOptions.All:
-				writer.WriteStringValue("all");
-				return;
+				writer.WriteStringValue(MemberAll);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(IndexRoutingAllocationOptions)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -237,46 +270,58 @@ public enum IndexRoutingRebalanceOptions
 	All
 }
 
-internal sealed class IndexRoutingRebalanceOptionsConverter : JsonConverter<IndexRoutingRebalanceOptions>
+internal sealed partial class IndexRoutingRebalanceOptionsConverter : System.Text.Json.Serialization.JsonConverter<IndexRoutingRebalanceOptions>
 {
-	public override IndexRoutingRebalanceOptions Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberReplicas = System.Text.Json.JsonEncodedText.Encode("replicas");
+	private static readonly System.Text.Json.JsonEncodedText MemberPrimaries = System.Text.Json.JsonEncodedText.Encode("primaries");
+	private static readonly System.Text.Json.JsonEncodedText MemberNone = System.Text.Json.JsonEncodedText.Encode("none");
+	private static readonly System.Text.Json.JsonEncodedText MemberAll = System.Text.Json.JsonEncodedText.Encode("all");
+
+	public override IndexRoutingRebalanceOptions Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberReplicas))
+		{
+			return IndexRoutingRebalanceOptions.Replicas;
+		}
+
+		if (reader.ValueTextEquals(MemberPrimaries))
+		{
+			return IndexRoutingRebalanceOptions.Primaries;
+		}
+
+		if (reader.ValueTextEquals(MemberNone))
 		{
-			case "replicas":
-				return IndexRoutingRebalanceOptions.Replicas;
-			case "primaries":
-				return IndexRoutingRebalanceOptions.Primaries;
-			case "none":
-				return IndexRoutingRebalanceOptions.None;
-			case "all":
-				return IndexRoutingRebalanceOptions.All;
+			return IndexRoutingRebalanceOptions.None;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberAll))
+		{
+			return IndexRoutingRebalanceOptions.All;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(IndexRoutingRebalanceOptions)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, IndexRoutingRebalanceOptions value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IndexRoutingRebalanceOptions value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case IndexRoutingRebalanceOptions.Replicas:
-				writer.WriteStringValue("replicas");
-				return;
+				writer.WriteStringValue(MemberReplicas);
+				break;
 			case IndexRoutingRebalanceOptions.Primaries:
-				writer.WriteStringValue("primaries");
-				return;
+				writer.WriteStringValue(MemberPrimaries);
+				break;
 			case IndexRoutingRebalanceOptions.None:
-				writer.WriteStringValue("none");
-				return;
+				writer.WriteStringValue(MemberNone);
+				break;
 			case IndexRoutingRebalanceOptions.All:
-				writer.WriteStringValue("all");
-				return;
+				writer.WriteStringValue(MemberAll);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(IndexRoutingRebalanceOptions)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -291,41 +336,49 @@ public enum ManagedBy
 	Datastream
 }
 
-internal sealed class ManagedByConverter : JsonConverter<ManagedBy>
+internal sealed partial class ManagedByConverter : System.Text.Json.Serialization.JsonConverter<ManagedBy>
 {
-	public override ManagedBy Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberUnmanaged = System.Text.Json.JsonEncodedText.Encode("Unmanaged");
+	private static readonly System.Text.Json.JsonEncodedText MemberIlm = System.Text.Json.JsonEncodedText.Encode("Index Lifecycle Management");
+	private static readonly System.Text.Json.JsonEncodedText MemberDatastream = System.Text.Json.JsonEncodedText.Encode("Data stream lifecycle");
+
+	public override ManagedBy Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberUnmanaged))
 		{
-			case "Unmanaged":
-				return ManagedBy.Unmanaged;
-			case "Index Lifecycle Management":
-				return ManagedBy.Ilm;
-			case "Data stream lifecycle":
-				return ManagedBy.Datastream;
+			return ManagedBy.Unmanaged;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberIlm))
+		{
+			return ManagedBy.Ilm;
+		}
+
+		if (reader.ValueTextEquals(MemberDatastream))
+		{
+			return ManagedBy.Datastream;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(ManagedBy)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, ManagedBy value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ManagedBy value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case ManagedBy.Unmanaged:
-				writer.WriteStringValue("Unmanaged");
-				return;
+				writer.WriteStringValue(MemberUnmanaged);
+				break;
 			case ManagedBy.Ilm:
-				writer.WriteStringValue("Index Lifecycle Management");
-				return;
+				writer.WriteStringValue(MemberIlm);
+				break;
 			case ManagedBy.Datastream:
-				writer.WriteStringValue("Data stream lifecycle");
-				return;
+				writer.WriteStringValue(MemberDatastream);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(ManagedBy)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -338,36 +391,40 @@ public enum NumericFielddataFormat
 	Array
 }
 
-internal sealed class NumericFielddataFormatConverter : JsonConverter<NumericFielddataFormat>
+internal sealed partial class NumericFielddataFormatConverter : System.Text.Json.Serialization.JsonConverter<NumericFielddataFormat>
 {
-	public override NumericFielddataFormat Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberDisabled = System.Text.Json.JsonEncodedText.Encode("disabled");
+	private static readonly System.Text.Json.JsonEncodedText MemberArray = System.Text.Json.JsonEncodedText.Encode("array");
+
+	public override NumericFielddataFormat Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberDisabled))
 		{
-			case "disabled":
-				return NumericFielddataFormat.Disabled;
-			case "array":
-				return NumericFielddataFormat.Array;
+			return NumericFielddataFormat.Disabled;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberArray))
+		{
+			return NumericFielddataFormat.Array;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(NumericFielddataFormat)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, NumericFielddataFormat value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, NumericFielddataFormat value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case NumericFielddataFormat.Disabled:
-				writer.WriteStringValue("disabled");
-				return;
+				writer.WriteStringValue(MemberDisabled);
+				break;
 			case NumericFielddataFormat.Array:
-				writer.WriteStringValue("array");
-				return;
+				writer.WriteStringValue(MemberArray);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(NumericFielddataFormat)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -380,36 +437,40 @@ public enum SegmentSortMissing
 	First
 }
 
-internal sealed class SegmentSortMissingConverter : JsonConverter<SegmentSortMissing>
+internal sealed partial class SegmentSortMissingConverter : System.Text.Json.Serialization.JsonConverter<SegmentSortMissing>
 {
-	public override SegmentSortMissing Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberLast = System.Text.Json.JsonEncodedText.Encode("_last");
+	private static readonly System.Text.Json.JsonEncodedText MemberFirst = System.Text.Json.JsonEncodedText.Encode("_first");
+
+	public override SegmentSortMissing Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberLast))
+		{
+			return SegmentSortMissing.Last;
+		}
+
+		if (reader.ValueTextEquals(MemberFirst))
 		{
-			case "_last":
-				return SegmentSortMissing.Last;
-			case "_first":
-				return SegmentSortMissing.First;
+			return SegmentSortMissing.First;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(SegmentSortMissing)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, SegmentSortMissing value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SegmentSortMissing value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case SegmentSortMissing.Last:
-				writer.WriteStringValue("_last");
-				return;
+				writer.WriteStringValue(MemberLast);
+				break;
 			case SegmentSortMissing.First:
-				writer.WriteStringValue("_first");
-				return;
+				writer.WriteStringValue(MemberFirst);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(SegmentSortMissing)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -422,38 +483,42 @@ public enum SegmentSortMode
 	Max
 }
 
-internal sealed class SegmentSortModeConverter : JsonConverter<SegmentSortMode>
+internal sealed partial class SegmentSortModeConverter : System.Text.Json.Serialization.JsonConverter<SegmentSortMode>
 {
-	public override SegmentSortMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberMin = System.Text.Json.JsonEncodedText.Encode("min");
+	private static readonly System.Text.Json.JsonEncodedText MemberMin1 = System.Text.Json.JsonEncodedText.Encode("MIN");
+	private static readonly System.Text.Json.JsonEncodedText MemberMax = System.Text.Json.JsonEncodedText.Encode("max");
+	private static readonly System.Text.Json.JsonEncodedText MemberMax1 = System.Text.Json.JsonEncodedText.Encode("MAX");
+
+	public override SegmentSortMode Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberMin) || reader.ValueTextEquals(MemberMin1))
 		{
-			case "min":
-			case "MIN":
-				return SegmentSortMode.Min;
-			case "max":
-			case "MAX":
-				return SegmentSortMode.Max;
+			return SegmentSortMode.Min;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberMax) || reader.ValueTextEquals(MemberMax1))
+		{
+			return SegmentSortMode.Max;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(SegmentSortMode)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, SegmentSortMode value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SegmentSortMode value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case SegmentSortMode.Min:
-				writer.WriteStringValue("min");
-				return;
+				writer.WriteStringValue(MemberMin);
+				break;
 			case SegmentSortMode.Max:
-				writer.WriteStringValue("max");
-				return;
+				writer.WriteStringValue(MemberMax);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(SegmentSortMode)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -466,38 +531,42 @@ public enum SegmentSortOrder
 	Asc
 }
 
-internal sealed class SegmentSortOrderConverter : JsonConverter<SegmentSortOrder>
+internal sealed partial class SegmentSortOrderConverter : System.Text.Json.Serialization.JsonConverter<SegmentSortOrder>
 {
-	public override SegmentSortOrder Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberDesc = System.Text.Json.JsonEncodedText.Encode("desc");
+	private static readonly System.Text.Json.JsonEncodedText MemberDesc1 = System.Text.Json.JsonEncodedText.Encode("DESC");
+	private static readonly System.Text.Json.JsonEncodedText MemberAsc = System.Text.Json.JsonEncodedText.Encode("asc");
+	private static readonly System.Text.Json.JsonEncodedText MemberAsc1 = System.Text.Json.JsonEncodedText.Encode("ASC");
+
+	public override SegmentSortOrder Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberDesc) || reader.ValueTextEquals(MemberDesc1))
 		{
-			case "desc":
-			case "DESC":
-				return SegmentSortOrder.Desc;
-			case "asc":
-			case "ASC":
-				return SegmentSortOrder.Asc;
+			return SegmentSortOrder.Desc;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberAsc) || reader.ValueTextEquals(MemberAsc1))
+		{
+			return SegmentSortOrder.Asc;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(SegmentSortOrder)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, SegmentSortOrder value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SegmentSortOrder value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case SegmentSortOrder.Desc:
-				writer.WriteStringValue("desc");
-				return;
+				writer.WriteStringValue(MemberDesc);
+				break;
 			case SegmentSortOrder.Asc:
-				writer.WriteStringValue("asc");
-				return;
+				writer.WriteStringValue(MemberAsc);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(SegmentSortOrder)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -514,46 +583,58 @@ public enum ShardRoutingState
 	Initializing
 }
 
-internal sealed class ShardRoutingStateConverter : JsonConverter<ShardRoutingState>
+internal sealed partial class ShardRoutingStateConverter : System.Text.Json.Serialization.JsonConverter<ShardRoutingState>
 {
-	public override ShardRoutingState Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberUnassigned = System.Text.Json.JsonEncodedText.Encode("UNASSIGNED");
+	private static readonly System.Text.Json.JsonEncodedText MemberStarted = System.Text.Json.JsonEncodedText.Encode("STARTED");
+	private static readonly System.Text.Json.JsonEncodedText MemberRelocating = System.Text.Json.JsonEncodedText.Encode("RELOCATING");
+	private static readonly System.Text.Json.JsonEncodedText MemberInitializing = System.Text.Json.JsonEncodedText.Encode("INITIALIZING");
+
+	public override ShardRoutingState Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberUnassigned))
+		{
+			return ShardRoutingState.Unassigned;
+		}
+
+		if (reader.ValueTextEquals(MemberStarted))
+		{
+			return ShardRoutingState.Started;
+		}
+
+		if (reader.ValueTextEquals(MemberRelocating))
 		{
-			case "UNASSIGNED":
-				return ShardRoutingState.Unassigned;
-			case "STARTED":
-				return ShardRoutingState.Started;
-			case "RELOCATING":
-				return ShardRoutingState.Relocating;
-			case "INITIALIZING":
-				return ShardRoutingState.Initializing;
+			return ShardRoutingState.Relocating;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberInitializing))
+		{
+			return ShardRoutingState.Initializing;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(ShardRoutingState)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, ShardRoutingState value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ShardRoutingState value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case ShardRoutingState.Unassigned:
-				writer.WriteStringValue("UNASSIGNED");
-				return;
+				writer.WriteStringValue(MemberUnassigned);
+				break;
 			case ShardRoutingState.Started:
-				writer.WriteStringValue("STARTED");
-				return;
+				writer.WriteStringValue(MemberStarted);
+				break;
 			case ShardRoutingState.Relocating:
-				writer.WriteStringValue("RELOCATING");
-				return;
+				writer.WriteStringValue(MemberRelocating);
+				break;
 			case ShardRoutingState.Initializing:
-				writer.WriteStringValue("INITIALIZING");
-				return;
+				writer.WriteStringValue(MemberInitializing);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(ShardRoutingState)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -561,9 +642,11 @@ public override void Write(Utf8JsonWriter writer, ShardRoutingState value, JsonS
 public readonly partial struct StorageType : IEnumStruct<StorageType>
 {
 	public StorageType(string value) => Value = value;
-
+#if NET7_0_OR_GREATER
+	static StorageType IEnumStruct<StorageType>.Create(string value) => value;
+#else
 	StorageType IEnumStruct<StorageType>.Create(string value) => value;
-
+#endif
 	public readonly string Value { get; }
 
 	/// <summary>
@@ -636,37 +719,41 @@ public enum TranslogDurability
 	Async
 }
 
-internal sealed class TranslogDurabilityConverter : JsonConverter<TranslogDurability>
+internal sealed partial class TranslogDurabilityConverter : System.Text.Json.Serialization.JsonConverter<TranslogDurability>
 {
-	public override TranslogDurability Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberRequest = System.Text.Json.JsonEncodedText.Encode("request");
+	private static readonly System.Text.Json.JsonEncodedText MemberRequest1 = System.Text.Json.JsonEncodedText.Encode("REQUEST");
+	private static readonly System.Text.Json.JsonEncodedText MemberAsync = System.Text.Json.JsonEncodedText.Encode("async");
+	private static readonly System.Text.Json.JsonEncodedText MemberAsync1 = System.Text.Json.JsonEncodedText.Encode("ASYNC");
+
+	public override TranslogDurability Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberRequest) || reader.ValueTextEquals(MemberRequest1))
 		{
-			case "request":
-			case "REQUEST":
-				return TranslogDurability.Request;
-			case "async":
-			case "ASYNC":
-				return TranslogDurability.Async;
+			return TranslogDurability.Request;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberAsync) || reader.ValueTextEquals(MemberAsync1))
+		{
+			return TranslogDurability.Async;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(TranslogDurability)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, TranslogDurability value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, TranslogDurability value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case TranslogDurability.Request:
-				writer.WriteStringValue("request");
-				return;
+				writer.WriteStringValue(MemberRequest);
+				break;
 			case TranslogDurability.Async:
-				writer.WriteStringValue("async");
-				return;
+				writer.WriteStringValue(MemberAsync);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(TranslogDurability)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.Inference.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.Inference.g.cs
index 2a4deee6213..753f6bc1fb7 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.Inference.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.Inference.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Core;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport;
 using System;
@@ -41,45 +42,57 @@ public enum TaskType
 	Completion
 }
 
-internal sealed class TaskTypeConverter : JsonConverter<TaskType>
+internal sealed partial class TaskTypeConverter : System.Text.Json.Serialization.JsonConverter<TaskType>
 {
-	public override TaskType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberTextEmbedding = System.Text.Json.JsonEncodedText.Encode("text_embedding");
+	private static readonly System.Text.Json.JsonEncodedText MemberSparseEmbedding = System.Text.Json.JsonEncodedText.Encode("sparse_embedding");
+	private static readonly System.Text.Json.JsonEncodedText MemberRerank = System.Text.Json.JsonEncodedText.Encode("rerank");
+	private static readonly System.Text.Json.JsonEncodedText MemberCompletion = System.Text.Json.JsonEncodedText.Encode("completion");
+
+	public override TaskType Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberTextEmbedding))
+		{
+			return TaskType.TextEmbedding;
+		}
+
+		if (reader.ValueTextEquals(MemberSparseEmbedding))
 		{
-			case "text_embedding":
-				return TaskType.TextEmbedding;
-			case "sparse_embedding":
-				return TaskType.SparseEmbedding;
-			case "rerank":
-				return TaskType.Rerank;
-			case "completion":
-				return TaskType.Completion;
+			return TaskType.SparseEmbedding;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberRerank))
+		{
+			return TaskType.Rerank;
+		}
+
+		if (reader.ValueTextEquals(MemberCompletion))
+		{
+			return TaskType.Completion;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(TaskType)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, TaskType value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, TaskType value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case TaskType.TextEmbedding:
-				writer.WriteStringValue("text_embedding");
-				return;
+				writer.WriteStringValue(MemberTextEmbedding);
+				break;
 			case TaskType.SparseEmbedding:
-				writer.WriteStringValue("sparse_embedding");
-				return;
+				writer.WriteStringValue(MemberSparseEmbedding);
+				break;
 			case TaskType.Rerank:
-				writer.WriteStringValue("rerank");
-				return;
+				writer.WriteStringValue(MemberRerank);
+				break;
 			case TaskType.Completion:
-				writer.WriteStringValue("completion");
-				return;
+				writer.WriteStringValue(MemberCompletion);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(TaskType)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.Ingest.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.Ingest.g.cs
index 81ceefaf2ce..7c47962d9f8 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.Ingest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.Ingest.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Core;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport;
 using System;
@@ -49,66 +50,94 @@ public enum ConvertType
 	Auto
 }
 
-internal sealed class ConvertTypeConverter : JsonConverter<ConvertType>
+internal sealed partial class ConvertTypeConverter : System.Text.Json.Serialization.JsonConverter<ConvertType>
 {
-	public override ConvertType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberString = System.Text.Json.JsonEncodedText.Encode("string");
+	private static readonly System.Text.Json.JsonEncodedText MemberLong = System.Text.Json.JsonEncodedText.Encode("long");
+	private static readonly System.Text.Json.JsonEncodedText MemberIp = System.Text.Json.JsonEncodedText.Encode("ip");
+	private static readonly System.Text.Json.JsonEncodedText MemberInteger = System.Text.Json.JsonEncodedText.Encode("integer");
+	private static readonly System.Text.Json.JsonEncodedText MemberFloat = System.Text.Json.JsonEncodedText.Encode("float");
+	private static readonly System.Text.Json.JsonEncodedText MemberDouble = System.Text.Json.JsonEncodedText.Encode("double");
+	private static readonly System.Text.Json.JsonEncodedText MemberBoolean = System.Text.Json.JsonEncodedText.Encode("boolean");
+	private static readonly System.Text.Json.JsonEncodedText MemberAuto = System.Text.Json.JsonEncodedText.Encode("auto");
+
+	public override ConvertType Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "string":
-				return ConvertType.String;
-			case "long":
-				return ConvertType.Long;
-			case "ip":
-				return ConvertType.Ip;
-			case "integer":
-				return ConvertType.Integer;
-			case "float":
-				return ConvertType.Float;
-			case "double":
-				return ConvertType.Double;
-			case "boolean":
-				return ConvertType.Boolean;
-			case "auto":
-				return ConvertType.Auto;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberString))
+		{
+			return ConvertType.String;
+		}
+
+		if (reader.ValueTextEquals(MemberLong))
+		{
+			return ConvertType.Long;
+		}
+
+		if (reader.ValueTextEquals(MemberIp))
+		{
+			return ConvertType.Ip;
+		}
+
+		if (reader.ValueTextEquals(MemberInteger))
+		{
+			return ConvertType.Integer;
+		}
+
+		if (reader.ValueTextEquals(MemberFloat))
+		{
+			return ConvertType.Float;
+		}
+
+		if (reader.ValueTextEquals(MemberDouble))
+		{
+			return ConvertType.Double;
+		}
+
+		if (reader.ValueTextEquals(MemberBoolean))
+		{
+			return ConvertType.Boolean;
+		}
+
+		if (reader.ValueTextEquals(MemberAuto))
+		{
+			return ConvertType.Auto;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(ConvertType)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, ConvertType value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ConvertType value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case ConvertType.String:
-				writer.WriteStringValue("string");
-				return;
+				writer.WriteStringValue(MemberString);
+				break;
 			case ConvertType.Long:
-				writer.WriteStringValue("long");
-				return;
+				writer.WriteStringValue(MemberLong);
+				break;
 			case ConvertType.Ip:
-				writer.WriteStringValue("ip");
-				return;
+				writer.WriteStringValue(MemberIp);
+				break;
 			case ConvertType.Integer:
-				writer.WriteStringValue("integer");
-				return;
+				writer.WriteStringValue(MemberInteger);
+				break;
 			case ConvertType.Float:
-				writer.WriteStringValue("float");
-				return;
+				writer.WriteStringValue(MemberFloat);
+				break;
 			case ConvertType.Double:
-				writer.WriteStringValue("double");
-				return;
+				writer.WriteStringValue(MemberDouble);
+				break;
 			case ConvertType.Boolean:
-				writer.WriteStringValue("boolean");
-				return;
+				writer.WriteStringValue(MemberBoolean);
+				break;
 			case ConvertType.Auto:
-				writer.WriteStringValue("auto");
-				return;
+				writer.WriteStringValue(MemberAuto);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(ConvertType)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -127,51 +156,67 @@ public enum FingerprintDigest
 	Md5
 }
 
-internal sealed class FingerprintDigestConverter : JsonConverter<FingerprintDigest>
+internal sealed partial class FingerprintDigestConverter : System.Text.Json.Serialization.JsonConverter<FingerprintDigest>
 {
-	public override FingerprintDigest Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberSha512 = System.Text.Json.JsonEncodedText.Encode("SHA-512");
+	private static readonly System.Text.Json.JsonEncodedText MemberSha256 = System.Text.Json.JsonEncodedText.Encode("SHA-256");
+	private static readonly System.Text.Json.JsonEncodedText MemberSha1 = System.Text.Json.JsonEncodedText.Encode("SHA-1");
+	private static readonly System.Text.Json.JsonEncodedText MemberMurmurhash3 = System.Text.Json.JsonEncodedText.Encode("MurmurHash3");
+	private static readonly System.Text.Json.JsonEncodedText MemberMd5 = System.Text.Json.JsonEncodedText.Encode("MD5");
+
+	public override FingerprintDigest Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "SHA-512":
-				return FingerprintDigest.Sha512;
-			case "SHA-256":
-				return FingerprintDigest.Sha256;
-			case "SHA-1":
-				return FingerprintDigest.Sha1;
-			case "MurmurHash3":
-				return FingerprintDigest.Murmurhash3;
-			case "MD5":
-				return FingerprintDigest.Md5;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberSha512))
+		{
+			return FingerprintDigest.Sha512;
+		}
+
+		if (reader.ValueTextEquals(MemberSha256))
+		{
+			return FingerprintDigest.Sha256;
+		}
+
+		if (reader.ValueTextEquals(MemberSha1))
+		{
+			return FingerprintDigest.Sha1;
+		}
+
+		if (reader.ValueTextEquals(MemberMurmurhash3))
+		{
+			return FingerprintDigest.Murmurhash3;
+		}
+
+		if (reader.ValueTextEquals(MemberMd5))
+		{
+			return FingerprintDigest.Md5;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(FingerprintDigest)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, FingerprintDigest value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, FingerprintDigest value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case FingerprintDigest.Sha512:
-				writer.WriteStringValue("SHA-512");
-				return;
+				writer.WriteStringValue(MemberSha512);
+				break;
 			case FingerprintDigest.Sha256:
-				writer.WriteStringValue("SHA-256");
-				return;
+				writer.WriteStringValue(MemberSha256);
+				break;
 			case FingerprintDigest.Sha1:
-				writer.WriteStringValue("SHA-1");
-				return;
+				writer.WriteStringValue(MemberSha1);
+				break;
 			case FingerprintDigest.Murmurhash3:
-				writer.WriteStringValue("MurmurHash3");
-				return;
+				writer.WriteStringValue(MemberMurmurhash3);
+				break;
 			case FingerprintDigest.Md5:
-				writer.WriteStringValue("MD5");
-				return;
+				writer.WriteStringValue(MemberMd5);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(FingerprintDigest)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -184,36 +229,40 @@ public enum GeoGridTargetFormat
 	Geojson
 }
 
-internal sealed class GeoGridTargetFormatConverter : JsonConverter<GeoGridTargetFormat>
+internal sealed partial class GeoGridTargetFormatConverter : System.Text.Json.Serialization.JsonConverter<GeoGridTargetFormat>
 {
-	public override GeoGridTargetFormat Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberWkt = System.Text.Json.JsonEncodedText.Encode("wkt");
+	private static readonly System.Text.Json.JsonEncodedText MemberGeojson = System.Text.Json.JsonEncodedText.Encode("geojson");
+
+	public override GeoGridTargetFormat Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberWkt))
+		{
+			return GeoGridTargetFormat.Wkt;
+		}
+
+		if (reader.ValueTextEquals(MemberGeojson))
 		{
-			case "wkt":
-				return GeoGridTargetFormat.Wkt;
-			case "geojson":
-				return GeoGridTargetFormat.Geojson;
+			return GeoGridTargetFormat.Geojson;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(GeoGridTargetFormat)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, GeoGridTargetFormat value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GeoGridTargetFormat value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case GeoGridTargetFormat.Wkt:
-				writer.WriteStringValue("wkt");
-				return;
+				writer.WriteStringValue(MemberWkt);
+				break;
 			case GeoGridTargetFormat.Geojson:
-				writer.WriteStringValue("geojson");
-				return;
+				writer.WriteStringValue(MemberGeojson);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(GeoGridTargetFormat)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -228,41 +277,49 @@ public enum GeoGridTileType
 	Geohash
 }
 
-internal sealed class GeoGridTileTypeConverter : JsonConverter<GeoGridTileType>
+internal sealed partial class GeoGridTileTypeConverter : System.Text.Json.Serialization.JsonConverter<GeoGridTileType>
 {
-	public override GeoGridTileType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberGeotile = System.Text.Json.JsonEncodedText.Encode("geotile");
+	private static readonly System.Text.Json.JsonEncodedText MemberGeohex = System.Text.Json.JsonEncodedText.Encode("geohex");
+	private static readonly System.Text.Json.JsonEncodedText MemberGeohash = System.Text.Json.JsonEncodedText.Encode("geohash");
+
+	public override GeoGridTileType Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberGeotile))
 		{
-			case "geotile":
-				return GeoGridTileType.Geotile;
-			case "geohex":
-				return GeoGridTileType.Geohex;
-			case "geohash":
-				return GeoGridTileType.Geohash;
+			return GeoGridTileType.Geotile;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberGeohex))
+		{
+			return GeoGridTileType.Geohex;
+		}
+
+		if (reader.ValueTextEquals(MemberGeohash))
+		{
+			return GeoGridTileType.Geohash;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(GeoGridTileType)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, GeoGridTileType value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GeoGridTileType value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case GeoGridTileType.Geotile:
-				writer.WriteStringValue("geotile");
-				return;
+				writer.WriteStringValue(MemberGeotile);
+				break;
 			case GeoGridTileType.Geohex:
-				writer.WriteStringValue("geohex");
-				return;
+				writer.WriteStringValue(MemberGeohex);
+				break;
 			case GeoGridTileType.Geohash:
-				writer.WriteStringValue("geohash");
-				return;
+				writer.WriteStringValue(MemberGeohash);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(GeoGridTileType)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -285,36 +342,40 @@ public enum JsonProcessorConflictStrategy
 	Merge
 }
 
-internal sealed class JsonProcessorConflictStrategyConverter : JsonConverter<JsonProcessorConflictStrategy>
+internal sealed partial class JsonProcessorConflictStrategyConverter : System.Text.Json.Serialization.JsonConverter<JsonProcessorConflictStrategy>
 {
-	public override JsonProcessorConflictStrategy Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberReplace = System.Text.Json.JsonEncodedText.Encode("replace");
+	private static readonly System.Text.Json.JsonEncodedText MemberMerge = System.Text.Json.JsonEncodedText.Encode("merge");
+
+	public override JsonProcessorConflictStrategy Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberReplace))
+		{
+			return JsonProcessorConflictStrategy.Replace;
+		}
+
+		if (reader.ValueTextEquals(MemberMerge))
 		{
-			case "replace":
-				return JsonProcessorConflictStrategy.Replace;
-			case "merge":
-				return JsonProcessorConflictStrategy.Merge;
+			return JsonProcessorConflictStrategy.Merge;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(JsonProcessorConflictStrategy)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, JsonProcessorConflictStrategy value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, JsonProcessorConflictStrategy value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case JsonProcessorConflictStrategy.Replace:
-				writer.WriteStringValue("replace");
-				return;
+				writer.WriteStringValue(MemberReplace);
+				break;
 			case JsonProcessorConflictStrategy.Merge:
-				writer.WriteStringValue("merge");
-				return;
+				writer.WriteStringValue(MemberMerge);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(JsonProcessorConflictStrategy)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -327,36 +388,40 @@ public enum ShapeType
 	GeoShape
 }
 
-internal sealed class ShapeTypeConverter : JsonConverter<ShapeType>
+internal sealed partial class ShapeTypeConverter : System.Text.Json.Serialization.JsonConverter<ShapeType>
 {
-	public override ShapeType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberShape = System.Text.Json.JsonEncodedText.Encode("shape");
+	private static readonly System.Text.Json.JsonEncodedText MemberGeoShape = System.Text.Json.JsonEncodedText.Encode("geo_shape");
+
+	public override ShapeType Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberShape))
 		{
-			case "shape":
-				return ShapeType.Shape;
-			case "geo_shape":
-				return ShapeType.GeoShape;
+			return ShapeType.Shape;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberGeoShape))
+		{
+			return ShapeType.GeoShape;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(ShapeType)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, ShapeType value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ShapeType value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case ShapeType.Shape:
-				writer.WriteStringValue("shape");
-				return;
+				writer.WriteStringValue(MemberShape);
+				break;
 			case ShapeType.GeoShape:
-				writer.WriteStringValue("geo_shape");
-				return;
+				writer.WriteStringValue(MemberGeoShape);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(ShapeType)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -375,50 +440,66 @@ public enum UserAgentProperty
 	Device
 }
 
-internal sealed class UserAgentPropertyConverter : JsonConverter<UserAgentProperty>
+internal sealed partial class UserAgentPropertyConverter : System.Text.Json.Serialization.JsonConverter<UserAgentProperty>
 {
-	public override UserAgentProperty Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberVersion = System.Text.Json.JsonEncodedText.Encode("version");
+	private static readonly System.Text.Json.JsonEncodedText MemberOs = System.Text.Json.JsonEncodedText.Encode("os");
+	private static readonly System.Text.Json.JsonEncodedText MemberOriginal = System.Text.Json.JsonEncodedText.Encode("original");
+	private static readonly System.Text.Json.JsonEncodedText MemberName = System.Text.Json.JsonEncodedText.Encode("name");
+	private static readonly System.Text.Json.JsonEncodedText MemberDevice = System.Text.Json.JsonEncodedText.Encode("device");
+
+	public override UserAgentProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "version":
-				return UserAgentProperty.Version;
-			case "os":
-				return UserAgentProperty.Os;
-			case "original":
-				return UserAgentProperty.Original;
-			case "name":
-				return UserAgentProperty.Name;
-			case "device":
-				return UserAgentProperty.Device;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberVersion))
+		{
+			return UserAgentProperty.Version;
+		}
+
+		if (reader.ValueTextEquals(MemberOs))
+		{
+			return UserAgentProperty.Os;
+		}
+
+		if (reader.ValueTextEquals(MemberOriginal))
+		{
+			return UserAgentProperty.Original;
+		}
+
+		if (reader.ValueTextEquals(MemberName))
+		{
+			return UserAgentProperty.Name;
+		}
+
+		if (reader.ValueTextEquals(MemberDevice))
+		{
+			return UserAgentProperty.Device;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(UserAgentProperty)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, UserAgentProperty value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, UserAgentProperty value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case UserAgentProperty.Version:
-				writer.WriteStringValue("version");
-				return;
+				writer.WriteStringValue(MemberVersion);
+				break;
 			case UserAgentProperty.Os:
-				writer.WriteStringValue("os");
-				return;
+				writer.WriteStringValue(MemberOs);
+				break;
 			case UserAgentProperty.Original:
-				writer.WriteStringValue("original");
-				return;
+				writer.WriteStringValue(MemberOriginal);
+				break;
 			case UserAgentProperty.Name:
-				writer.WriteStringValue("name");
-				return;
+				writer.WriteStringValue(MemberName);
+				break;
 			case UserAgentProperty.Device:
-				writer.WriteStringValue("device");
-				return;
+				writer.WriteStringValue(MemberDevice);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(UserAgentProperty)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.LicenseManagement.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.LicenseManagement.g.cs
index 70a028f6e76..327cfee06d4 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.LicenseManagement.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.LicenseManagement.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Core;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport;
 using System;
@@ -41,46 +42,58 @@ public enum LicenseStatus
 	Active
 }
 
-internal sealed class LicenseStatusConverter : JsonConverter<LicenseStatus>
+internal sealed partial class LicenseStatusConverter : System.Text.Json.Serialization.JsonConverter<LicenseStatus>
 {
-	public override LicenseStatus Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberValid = System.Text.Json.JsonEncodedText.Encode("valid");
+	private static readonly System.Text.Json.JsonEncodedText MemberInvalid = System.Text.Json.JsonEncodedText.Encode("invalid");
+	private static readonly System.Text.Json.JsonEncodedText MemberExpired = System.Text.Json.JsonEncodedText.Encode("expired");
+	private static readonly System.Text.Json.JsonEncodedText MemberActive = System.Text.Json.JsonEncodedText.Encode("active");
+
+	public override LicenseStatus Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberValid))
+		{
+			return LicenseStatus.Valid;
+		}
+
+		if (reader.ValueTextEquals(MemberInvalid))
+		{
+			return LicenseStatus.Invalid;
+		}
+
+		if (reader.ValueTextEquals(MemberExpired))
+		{
+			return LicenseStatus.Expired;
+		}
+
+		if (reader.ValueTextEquals(MemberActive))
 		{
-			case "valid":
-				return LicenseStatus.Valid;
-			case "invalid":
-				return LicenseStatus.Invalid;
-			case "expired":
-				return LicenseStatus.Expired;
-			case "active":
-				return LicenseStatus.Active;
+			return LicenseStatus.Active;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(LicenseStatus)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, LicenseStatus value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, LicenseStatus value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case LicenseStatus.Valid:
-				writer.WriteStringValue("valid");
-				return;
+				writer.WriteStringValue(MemberValid);
+				break;
 			case LicenseStatus.Invalid:
-				writer.WriteStringValue("invalid");
-				return;
+				writer.WriteStringValue(MemberInvalid);
+				break;
 			case LicenseStatus.Expired:
-				writer.WriteStringValue("expired");
-				return;
+				writer.WriteStringValue(MemberExpired);
+				break;
 			case LicenseStatus.Active:
-				writer.WriteStringValue("active");
-				return;
+				writer.WriteStringValue(MemberActive);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(LicenseStatus)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -107,70 +120,102 @@ public enum LicenseType
 	Basic
 }
 
-internal sealed class LicenseTypeConverter : JsonConverter<LicenseType>
+internal sealed partial class LicenseTypeConverter : System.Text.Json.Serialization.JsonConverter<LicenseType>
 {
-	public override LicenseType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberTrial = System.Text.Json.JsonEncodedText.Encode("trial");
+	private static readonly System.Text.Json.JsonEncodedText MemberStandard = System.Text.Json.JsonEncodedText.Encode("standard");
+	private static readonly System.Text.Json.JsonEncodedText MemberSilver = System.Text.Json.JsonEncodedText.Encode("silver");
+	private static readonly System.Text.Json.JsonEncodedText MemberPlatinum = System.Text.Json.JsonEncodedText.Encode("platinum");
+	private static readonly System.Text.Json.JsonEncodedText MemberMissing = System.Text.Json.JsonEncodedText.Encode("missing");
+	private static readonly System.Text.Json.JsonEncodedText MemberGold = System.Text.Json.JsonEncodedText.Encode("gold");
+	private static readonly System.Text.Json.JsonEncodedText MemberEnterprise = System.Text.Json.JsonEncodedText.Encode("enterprise");
+	private static readonly System.Text.Json.JsonEncodedText MemberDev = System.Text.Json.JsonEncodedText.Encode("dev");
+	private static readonly System.Text.Json.JsonEncodedText MemberBasic = System.Text.Json.JsonEncodedText.Encode("basic");
+
+	public override LicenseType Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberTrial))
+		{
+			return LicenseType.Trial;
+		}
+
+		if (reader.ValueTextEquals(MemberStandard))
 		{
-			case "trial":
-				return LicenseType.Trial;
-			case "standard":
-				return LicenseType.Standard;
-			case "silver":
-				return LicenseType.Silver;
-			case "platinum":
-				return LicenseType.Platinum;
-			case "missing":
-				return LicenseType.Missing;
-			case "gold":
-				return LicenseType.Gold;
-			case "enterprise":
-				return LicenseType.Enterprise;
-			case "dev":
-				return LicenseType.Dev;
-			case "basic":
-				return LicenseType.Basic;
+			return LicenseType.Standard;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberSilver))
+		{
+			return LicenseType.Silver;
+		}
+
+		if (reader.ValueTextEquals(MemberPlatinum))
+		{
+			return LicenseType.Platinum;
+		}
+
+		if (reader.ValueTextEquals(MemberMissing))
+		{
+			return LicenseType.Missing;
+		}
+
+		if (reader.ValueTextEquals(MemberGold))
+		{
+			return LicenseType.Gold;
+		}
+
+		if (reader.ValueTextEquals(MemberEnterprise))
+		{
+			return LicenseType.Enterprise;
+		}
+
+		if (reader.ValueTextEquals(MemberDev))
+		{
+			return LicenseType.Dev;
+		}
+
+		if (reader.ValueTextEquals(MemberBasic))
+		{
+			return LicenseType.Basic;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(LicenseType)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, LicenseType value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, LicenseType value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case LicenseType.Trial:
-				writer.WriteStringValue("trial");
-				return;
+				writer.WriteStringValue(MemberTrial);
+				break;
 			case LicenseType.Standard:
-				writer.WriteStringValue("standard");
-				return;
+				writer.WriteStringValue(MemberStandard);
+				break;
 			case LicenseType.Silver:
-				writer.WriteStringValue("silver");
-				return;
+				writer.WriteStringValue(MemberSilver);
+				break;
 			case LicenseType.Platinum:
-				writer.WriteStringValue("platinum");
-				return;
+				writer.WriteStringValue(MemberPlatinum);
+				break;
 			case LicenseType.Missing:
-				writer.WriteStringValue("missing");
-				return;
+				writer.WriteStringValue(MemberMissing);
+				break;
 			case LicenseType.Gold:
-				writer.WriteStringValue("gold");
-				return;
+				writer.WriteStringValue(MemberGold);
+				break;
 			case LicenseType.Enterprise:
-				writer.WriteStringValue("enterprise");
-				return;
+				writer.WriteStringValue(MemberEnterprise);
+				break;
 			case LicenseType.Dev:
-				writer.WriteStringValue("dev");
-				return;
+				writer.WriteStringValue(MemberDev);
+				break;
 			case LicenseType.Basic:
-				writer.WriteStringValue("basic");
-				return;
+				writer.WriteStringValue(MemberBasic);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(LicenseType)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.MachineLearning.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.MachineLearning.g.cs
index 31515f05fd6..d6d15e1eca9 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.MachineLearning.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.MachineLearning.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Core;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport;
 using System;
@@ -41,46 +42,58 @@ public enum AppliesTo
 	Actual
 }
 
-internal sealed class AppliesToConverter : JsonConverter<AppliesTo>
+internal sealed partial class AppliesToConverter : System.Text.Json.Serialization.JsonConverter<AppliesTo>
 {
-	public override AppliesTo Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberTypical = System.Text.Json.JsonEncodedText.Encode("typical");
+	private static readonly System.Text.Json.JsonEncodedText MemberTime = System.Text.Json.JsonEncodedText.Encode("time");
+	private static readonly System.Text.Json.JsonEncodedText MemberDiffFromTypical = System.Text.Json.JsonEncodedText.Encode("diff_from_typical");
+	private static readonly System.Text.Json.JsonEncodedText MemberActual = System.Text.Json.JsonEncodedText.Encode("actual");
+
+	public override AppliesTo Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberTypical))
+		{
+			return AppliesTo.Typical;
+		}
+
+		if (reader.ValueTextEquals(MemberTime))
+		{
+			return AppliesTo.Time;
+		}
+
+		if (reader.ValueTextEquals(MemberDiffFromTypical))
 		{
-			case "typical":
-				return AppliesTo.Typical;
-			case "time":
-				return AppliesTo.Time;
-			case "diff_from_typical":
-				return AppliesTo.DiffFromTypical;
-			case "actual":
-				return AppliesTo.Actual;
+			return AppliesTo.DiffFromTypical;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberActual))
+		{
+			return AppliesTo.Actual;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(AppliesTo)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, AppliesTo value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, AppliesTo value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case AppliesTo.Typical:
-				writer.WriteStringValue("typical");
-				return;
+				writer.WriteStringValue(MemberTypical);
+				break;
 			case AppliesTo.Time:
-				writer.WriteStringValue("time");
-				return;
+				writer.WriteStringValue(MemberTime);
+				break;
 			case AppliesTo.DiffFromTypical:
-				writer.WriteStringValue("diff_from_typical");
-				return;
+				writer.WriteStringValue(MemberDiffFromTypical);
+				break;
 			case AppliesTo.Actual:
-				writer.WriteStringValue("actual");
-				return;
+				writer.WriteStringValue(MemberActual);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(AppliesTo)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -93,36 +106,40 @@ public enum CategorizationStatus
 	Ok
 }
 
-internal sealed class CategorizationStatusConverter : JsonConverter<CategorizationStatus>
+internal sealed partial class CategorizationStatusConverter : System.Text.Json.Serialization.JsonConverter<CategorizationStatus>
 {
-	public override CategorizationStatus Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberWarn = System.Text.Json.JsonEncodedText.Encode("warn");
+	private static readonly System.Text.Json.JsonEncodedText MemberOk = System.Text.Json.JsonEncodedText.Encode("ok");
+
+	public override CategorizationStatus Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberWarn))
+		{
+			return CategorizationStatus.Warn;
+		}
+
+		if (reader.ValueTextEquals(MemberOk))
 		{
-			case "warn":
-				return CategorizationStatus.Warn;
-			case "ok":
-				return CategorizationStatus.Ok;
+			return CategorizationStatus.Ok;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(CategorizationStatus)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, CategorizationStatus value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, CategorizationStatus value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case CategorizationStatus.Warn:
-				writer.WriteStringValue("warn");
-				return;
+				writer.WriteStringValue(MemberWarn);
+				break;
 			case CategorizationStatus.Ok:
-				writer.WriteStringValue("ok");
-				return;
+				writer.WriteStringValue(MemberOk);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(CategorizationStatus)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -137,41 +154,49 @@ public enum ChunkingMode
 	Auto
 }
 
-internal sealed class ChunkingModeConverter : JsonConverter<ChunkingMode>
+internal sealed partial class ChunkingModeConverter : System.Text.Json.Serialization.JsonConverter<ChunkingMode>
 {
-	public override ChunkingMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberOff = System.Text.Json.JsonEncodedText.Encode("off");
+	private static readonly System.Text.Json.JsonEncodedText MemberManual = System.Text.Json.JsonEncodedText.Encode("manual");
+	private static readonly System.Text.Json.JsonEncodedText MemberAuto = System.Text.Json.JsonEncodedText.Encode("auto");
+
+	public override ChunkingMode Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberOff))
+		{
+			return ChunkingMode.Off;
+		}
+
+		if (reader.ValueTextEquals(MemberManual))
 		{
-			case "off":
-				return ChunkingMode.Off;
-			case "manual":
-				return ChunkingMode.Manual;
-			case "auto":
-				return ChunkingMode.Auto;
+			return ChunkingMode.Manual;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberAuto))
+		{
+			return ChunkingMode.Auto;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(ChunkingMode)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, ChunkingMode value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ChunkingMode value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case ChunkingMode.Off:
-				writer.WriteStringValue("off");
-				return;
+				writer.WriteStringValue(MemberOff);
+				break;
 			case ChunkingMode.Manual:
-				writer.WriteStringValue("manual");
-				return;
+				writer.WriteStringValue(MemberManual);
+				break;
 			case ChunkingMode.Auto:
-				writer.WriteStringValue("auto");
-				return;
+				writer.WriteStringValue(MemberAuto);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(ChunkingMode)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -188,46 +213,58 @@ public enum ConditionOperator
 	Gt
 }
 
-internal sealed class ConditionOperatorConverter : JsonConverter<ConditionOperator>
+internal sealed partial class ConditionOperatorConverter : System.Text.Json.Serialization.JsonConverter<ConditionOperator>
 {
-	public override ConditionOperator Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberLte = System.Text.Json.JsonEncodedText.Encode("lte");
+	private static readonly System.Text.Json.JsonEncodedText MemberLt = System.Text.Json.JsonEncodedText.Encode("lt");
+	private static readonly System.Text.Json.JsonEncodedText MemberGte = System.Text.Json.JsonEncodedText.Encode("gte");
+	private static readonly System.Text.Json.JsonEncodedText MemberGt = System.Text.Json.JsonEncodedText.Encode("gt");
+
+	public override ConditionOperator Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberLte))
 		{
-			case "lte":
-				return ConditionOperator.Lte;
-			case "lt":
-				return ConditionOperator.Lt;
-			case "gte":
-				return ConditionOperator.Gte;
-			case "gt":
-				return ConditionOperator.Gt;
+			return ConditionOperator.Lte;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberLt))
+		{
+			return ConditionOperator.Lt;
+		}
+
+		if (reader.ValueTextEquals(MemberGte))
+		{
+			return ConditionOperator.Gte;
+		}
+
+		if (reader.ValueTextEquals(MemberGt))
+		{
+			return ConditionOperator.Gt;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(ConditionOperator)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, ConditionOperator value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ConditionOperator value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case ConditionOperator.Lte:
-				writer.WriteStringValue("lte");
-				return;
+				writer.WriteStringValue(MemberLte);
+				break;
 			case ConditionOperator.Lt:
-				writer.WriteStringValue("lt");
-				return;
+				writer.WriteStringValue(MemberLt);
+				break;
 			case ConditionOperator.Gte:
-				writer.WriteStringValue("gte");
-				return;
+				writer.WriteStringValue(MemberGte);
+				break;
 			case ConditionOperator.Gt:
-				writer.WriteStringValue("gt");
-				return;
+				writer.WriteStringValue(MemberGt);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(ConditionOperator)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -244,46 +281,58 @@ public enum DatafeedState
 	Started
 }
 
-internal sealed class DatafeedStateConverter : JsonConverter<DatafeedState>
+internal sealed partial class DatafeedStateConverter : System.Text.Json.Serialization.JsonConverter<DatafeedState>
 {
-	public override DatafeedState Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberStopping = System.Text.Json.JsonEncodedText.Encode("stopping");
+	private static readonly System.Text.Json.JsonEncodedText MemberStopped = System.Text.Json.JsonEncodedText.Encode("stopped");
+	private static readonly System.Text.Json.JsonEncodedText MemberStarting = System.Text.Json.JsonEncodedText.Encode("starting");
+	private static readonly System.Text.Json.JsonEncodedText MemberStarted = System.Text.Json.JsonEncodedText.Encode("started");
+
+	public override DatafeedState Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberStopping))
+		{
+			return DatafeedState.Stopping;
+		}
+
+		if (reader.ValueTextEquals(MemberStopped))
 		{
-			case "stopping":
-				return DatafeedState.Stopping;
-			case "stopped":
-				return DatafeedState.Stopped;
-			case "starting":
-				return DatafeedState.Starting;
-			case "started":
-				return DatafeedState.Started;
+			return DatafeedState.Stopped;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberStarting))
+		{
+			return DatafeedState.Starting;
+		}
+
+		if (reader.ValueTextEquals(MemberStarted))
+		{
+			return DatafeedState.Started;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(DatafeedState)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, DatafeedState value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DatafeedState value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case DatafeedState.Stopping:
-				writer.WriteStringValue("stopping");
-				return;
+				writer.WriteStringValue(MemberStopping);
+				break;
 			case DatafeedState.Stopped:
-				writer.WriteStringValue("stopped");
-				return;
+				writer.WriteStringValue(MemberStopped);
+				break;
 			case DatafeedState.Starting:
-				writer.WriteStringValue("starting");
-				return;
+				writer.WriteStringValue(MemberStarting);
+				break;
 			case DatafeedState.Started:
-				writer.WriteStringValue("started");
-				return;
+				writer.WriteStringValue(MemberStarted);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(DatafeedState)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -302,51 +351,67 @@ public enum DataframeState
 	Failed
 }
 
-internal sealed class DataframeStateConverter : JsonConverter<DataframeState>
+internal sealed partial class DataframeStateConverter : System.Text.Json.Serialization.JsonConverter<DataframeState>
 {
-	public override DataframeState Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberStopping = System.Text.Json.JsonEncodedText.Encode("stopping");
+	private static readonly System.Text.Json.JsonEncodedText MemberStopped = System.Text.Json.JsonEncodedText.Encode("stopped");
+	private static readonly System.Text.Json.JsonEncodedText MemberStarting = System.Text.Json.JsonEncodedText.Encode("starting");
+	private static readonly System.Text.Json.JsonEncodedText MemberStarted = System.Text.Json.JsonEncodedText.Encode("started");
+	private static readonly System.Text.Json.JsonEncodedText MemberFailed = System.Text.Json.JsonEncodedText.Encode("failed");
+
+	public override DataframeState Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "stopping":
-				return DataframeState.Stopping;
-			case "stopped":
-				return DataframeState.Stopped;
-			case "starting":
-				return DataframeState.Starting;
-			case "started":
-				return DataframeState.Started;
-			case "failed":
-				return DataframeState.Failed;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberStopping))
+		{
+			return DataframeState.Stopping;
+		}
+
+		if (reader.ValueTextEquals(MemberStopped))
+		{
+			return DataframeState.Stopped;
+		}
+
+		if (reader.ValueTextEquals(MemberStarting))
+		{
+			return DataframeState.Starting;
+		}
+
+		if (reader.ValueTextEquals(MemberStarted))
+		{
+			return DataframeState.Started;
+		}
+
+		if (reader.ValueTextEquals(MemberFailed))
+		{
+			return DataframeState.Failed;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(DataframeState)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, DataframeState value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DataframeState value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case DataframeState.Stopping:
-				writer.WriteStringValue("stopping");
-				return;
+				writer.WriteStringValue(MemberStopping);
+				break;
 			case DataframeState.Stopped:
-				writer.WriteStringValue("stopped");
-				return;
+				writer.WriteStringValue(MemberStopped);
+				break;
 			case DataframeState.Starting:
-				writer.WriteStringValue("starting");
-				return;
+				writer.WriteStringValue(MemberStarting);
+				break;
 			case DataframeState.Started:
-				writer.WriteStringValue("started");
-				return;
+				writer.WriteStringValue(MemberStarted);
+				break;
 			case DataframeState.Failed:
-				writer.WriteStringValue("failed");
-				return;
+				writer.WriteStringValue(MemberFailed);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(DataframeState)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -376,41 +441,49 @@ public enum DeploymentAllocationState
 	FullyAllocated
 }
 
-internal sealed class DeploymentAllocationStateConverter : JsonConverter<DeploymentAllocationState>
+internal sealed partial class DeploymentAllocationStateConverter : System.Text.Json.Serialization.JsonConverter<DeploymentAllocationState>
 {
-	public override DeploymentAllocationState Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberStarting = System.Text.Json.JsonEncodedText.Encode("starting");
+	private static readonly System.Text.Json.JsonEncodedText MemberStarted = System.Text.Json.JsonEncodedText.Encode("started");
+	private static readonly System.Text.Json.JsonEncodedText MemberFullyAllocated = System.Text.Json.JsonEncodedText.Encode("fully_allocated");
+
+	public override DeploymentAllocationState Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberStarting))
 		{
-			case "starting":
-				return DeploymentAllocationState.Starting;
-			case "started":
-				return DeploymentAllocationState.Started;
-			case "fully_allocated":
-				return DeploymentAllocationState.FullyAllocated;
+			return DeploymentAllocationState.Starting;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberStarted))
+		{
+			return DeploymentAllocationState.Started;
+		}
+
+		if (reader.ValueTextEquals(MemberFullyAllocated))
+		{
+			return DeploymentAllocationState.FullyAllocated;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(DeploymentAllocationState)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, DeploymentAllocationState value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeploymentAllocationState value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case DeploymentAllocationState.Starting:
-				writer.WriteStringValue("starting");
-				return;
+				writer.WriteStringValue(MemberStarting);
+				break;
 			case DeploymentAllocationState.Started:
-				writer.WriteStringValue("started");
-				return;
+				writer.WriteStringValue(MemberStarted);
+				break;
 			case DeploymentAllocationState.FullyAllocated:
-				writer.WriteStringValue("fully_allocated");
-				return;
+				writer.WriteStringValue(MemberFullyAllocated);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(DeploymentAllocationState)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -447,46 +520,58 @@ public enum DeploymentAssignmentState
 	Failed
 }
 
-internal sealed class DeploymentAssignmentStateConverter : JsonConverter<DeploymentAssignmentState>
+internal sealed partial class DeploymentAssignmentStateConverter : System.Text.Json.Serialization.JsonConverter<DeploymentAssignmentState>
 {
-	public override DeploymentAssignmentState Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberStopping = System.Text.Json.JsonEncodedText.Encode("stopping");
+	private static readonly System.Text.Json.JsonEncodedText MemberStarting = System.Text.Json.JsonEncodedText.Encode("starting");
+	private static readonly System.Text.Json.JsonEncodedText MemberStarted = System.Text.Json.JsonEncodedText.Encode("started");
+	private static readonly System.Text.Json.JsonEncodedText MemberFailed = System.Text.Json.JsonEncodedText.Encode("failed");
+
+	public override DeploymentAssignmentState Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberStopping))
+		{
+			return DeploymentAssignmentState.Stopping;
+		}
+
+		if (reader.ValueTextEquals(MemberStarting))
+		{
+			return DeploymentAssignmentState.Starting;
+		}
+
+		if (reader.ValueTextEquals(MemberStarted))
 		{
-			case "stopping":
-				return DeploymentAssignmentState.Stopping;
-			case "starting":
-				return DeploymentAssignmentState.Starting;
-			case "started":
-				return DeploymentAssignmentState.Started;
-			case "failed":
-				return DeploymentAssignmentState.Failed;
+			return DeploymentAssignmentState.Started;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberFailed))
+		{
+			return DeploymentAssignmentState.Failed;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(DeploymentAssignmentState)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, DeploymentAssignmentState value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeploymentAssignmentState value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case DeploymentAssignmentState.Stopping:
-				writer.WriteStringValue("stopping");
-				return;
+				writer.WriteStringValue(MemberStopping);
+				break;
 			case DeploymentAssignmentState.Starting:
-				writer.WriteStringValue("starting");
-				return;
+				writer.WriteStringValue(MemberStarting);
+				break;
 			case DeploymentAssignmentState.Started:
-				writer.WriteStringValue("started");
-				return;
+				writer.WriteStringValue(MemberStarted);
+				break;
 			case DeploymentAssignmentState.Failed:
-				writer.WriteStringValue("failed");
-				return;
+				writer.WriteStringValue(MemberFailed);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(DeploymentAssignmentState)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -503,46 +588,58 @@ public enum ExcludeFrequent
 	All
 }
 
-internal sealed class ExcludeFrequentConverter : JsonConverter<ExcludeFrequent>
+internal sealed partial class ExcludeFrequentConverter : System.Text.Json.Serialization.JsonConverter<ExcludeFrequent>
 {
-	public override ExcludeFrequent Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberOver = System.Text.Json.JsonEncodedText.Encode("over");
+	private static readonly System.Text.Json.JsonEncodedText MemberNone = System.Text.Json.JsonEncodedText.Encode("none");
+	private static readonly System.Text.Json.JsonEncodedText MemberBy = System.Text.Json.JsonEncodedText.Encode("by");
+	private static readonly System.Text.Json.JsonEncodedText MemberAll = System.Text.Json.JsonEncodedText.Encode("all");
+
+	public override ExcludeFrequent Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberOver))
+		{
+			return ExcludeFrequent.Over;
+		}
+
+		if (reader.ValueTextEquals(MemberNone))
+		{
+			return ExcludeFrequent.None;
+		}
+
+		if (reader.ValueTextEquals(MemberBy))
 		{
-			case "over":
-				return ExcludeFrequent.Over;
-			case "none":
-				return ExcludeFrequent.None;
-			case "by":
-				return ExcludeFrequent.By;
-			case "all":
-				return ExcludeFrequent.All;
+			return ExcludeFrequent.By;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberAll))
+		{
+			return ExcludeFrequent.All;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(ExcludeFrequent)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, ExcludeFrequent value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ExcludeFrequent value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case ExcludeFrequent.Over:
-				writer.WriteStringValue("over");
-				return;
+				writer.WriteStringValue(MemberOver);
+				break;
 			case ExcludeFrequent.None:
-				writer.WriteStringValue("none");
-				return;
+				writer.WriteStringValue(MemberNone);
+				break;
 			case ExcludeFrequent.By:
-				writer.WriteStringValue("by");
-				return;
+				writer.WriteStringValue(MemberBy);
+				break;
 			case ExcludeFrequent.All:
-				writer.WriteStringValue("all");
-				return;
+				writer.WriteStringValue(MemberAll);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(ExcludeFrequent)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -555,36 +652,40 @@ public enum FilterType
 	Exclude
 }
 
-internal sealed class FilterTypeConverter : JsonConverter<FilterType>
+internal sealed partial class FilterTypeConverter : System.Text.Json.Serialization.JsonConverter<FilterType>
 {
-	public override FilterType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberInclude = System.Text.Json.JsonEncodedText.Encode("include");
+	private static readonly System.Text.Json.JsonEncodedText MemberExclude = System.Text.Json.JsonEncodedText.Encode("exclude");
+
+	public override FilterType Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberInclude))
+		{
+			return FilterType.Include;
+		}
+
+		if (reader.ValueTextEquals(MemberExclude))
 		{
-			case "include":
-				return FilterType.Include;
-			case "exclude":
-				return FilterType.Exclude;
+			return FilterType.Exclude;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(FilterType)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, FilterType value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, FilterType value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case FilterType.Include:
-				writer.WriteStringValue("include");
-				return;
+				writer.WriteStringValue(MemberInclude);
+				break;
 			case FilterType.Exclude:
-				writer.WriteStringValue("exclude");
-				return;
+				writer.WriteStringValue(MemberExclude);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(FilterType)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -633,51 +734,67 @@ public enum Include
 	Definition
 }
 
-internal sealed class IncludeConverter : JsonConverter<Include>
+internal sealed partial class IncludeConverter : System.Text.Json.Serialization.JsonConverter<Include>
 {
-	public override Include Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberTotalFeatureImportance = System.Text.Json.JsonEncodedText.Encode("total_feature_importance");
+	private static readonly System.Text.Json.JsonEncodedText MemberHyperparameters = System.Text.Json.JsonEncodedText.Encode("hyperparameters");
+	private static readonly System.Text.Json.JsonEncodedText MemberFeatureImportanceBaseline = System.Text.Json.JsonEncodedText.Encode("feature_importance_baseline");
+	private static readonly System.Text.Json.JsonEncodedText MemberDefinitionStatus = System.Text.Json.JsonEncodedText.Encode("definition_status");
+	private static readonly System.Text.Json.JsonEncodedText MemberDefinition = System.Text.Json.JsonEncodedText.Encode("definition");
+
+	public override Include Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "total_feature_importance":
-				return Include.TotalFeatureImportance;
-			case "hyperparameters":
-				return Include.Hyperparameters;
-			case "feature_importance_baseline":
-				return Include.FeatureImportanceBaseline;
-			case "definition_status":
-				return Include.DefinitionStatus;
-			case "definition":
-				return Include.Definition;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberTotalFeatureImportance))
+		{
+			return Include.TotalFeatureImportance;
+		}
+
+		if (reader.ValueTextEquals(MemberHyperparameters))
+		{
+			return Include.Hyperparameters;
+		}
+
+		if (reader.ValueTextEquals(MemberFeatureImportanceBaseline))
+		{
+			return Include.FeatureImportanceBaseline;
+		}
+
+		if (reader.ValueTextEquals(MemberDefinitionStatus))
+		{
+			return Include.DefinitionStatus;
+		}
+
+		if (reader.ValueTextEquals(MemberDefinition))
+		{
+			return Include.Definition;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(Include)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, Include value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, Include value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case Include.TotalFeatureImportance:
-				writer.WriteStringValue("total_feature_importance");
-				return;
+				writer.WriteStringValue(MemberTotalFeatureImportance);
+				break;
 			case Include.Hyperparameters:
-				writer.WriteStringValue("hyperparameters");
-				return;
+				writer.WriteStringValue(MemberHyperparameters);
+				break;
 			case Include.FeatureImportanceBaseline:
-				writer.WriteStringValue("feature_importance_baseline");
-				return;
+				writer.WriteStringValue(MemberFeatureImportanceBaseline);
+				break;
 			case Include.DefinitionStatus:
-				writer.WriteStringValue("definition_status");
-				return;
+				writer.WriteStringValue(MemberDefinitionStatus);
+				break;
 			case Include.Definition:
-				writer.WriteStringValue("definition");
-				return;
+				writer.WriteStringValue(MemberDefinition);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(Include)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -692,41 +809,49 @@ public enum JobBlockedReason
 	Delete
 }
 
-internal sealed class JobBlockedReasonConverter : JsonConverter<JobBlockedReason>
+internal sealed partial class JobBlockedReasonConverter : System.Text.Json.Serialization.JsonConverter<JobBlockedReason>
 {
-	public override JobBlockedReason Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberRevert = System.Text.Json.JsonEncodedText.Encode("revert");
+	private static readonly System.Text.Json.JsonEncodedText MemberReset = System.Text.Json.JsonEncodedText.Encode("reset");
+	private static readonly System.Text.Json.JsonEncodedText MemberDelete = System.Text.Json.JsonEncodedText.Encode("delete");
+
+	public override JobBlockedReason Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberRevert))
 		{
-			case "revert":
-				return JobBlockedReason.Revert;
-			case "reset":
-				return JobBlockedReason.Reset;
-			case "delete":
-				return JobBlockedReason.Delete;
+			return JobBlockedReason.Revert;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberReset))
+		{
+			return JobBlockedReason.Reset;
+		}
+
+		if (reader.ValueTextEquals(MemberDelete))
+		{
+			return JobBlockedReason.Delete;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(JobBlockedReason)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, JobBlockedReason value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, JobBlockedReason value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case JobBlockedReason.Revert:
-				writer.WriteStringValue("revert");
-				return;
+				writer.WriteStringValue(MemberRevert);
+				break;
 			case JobBlockedReason.Reset:
-				writer.WriteStringValue("reset");
-				return;
+				writer.WriteStringValue(MemberReset);
+				break;
 			case JobBlockedReason.Delete:
-				writer.WriteStringValue("delete");
-				return;
+				writer.WriteStringValue(MemberDelete);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(JobBlockedReason)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -773,51 +898,67 @@ public enum JobState
 	Closed
 }
 
-internal sealed class JobStateConverter : JsonConverter<JobState>
+internal sealed partial class JobStateConverter : System.Text.Json.Serialization.JsonConverter<JobState>
 {
-	public override JobState Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberOpening = System.Text.Json.JsonEncodedText.Encode("opening");
+	private static readonly System.Text.Json.JsonEncodedText MemberOpened = System.Text.Json.JsonEncodedText.Encode("opened");
+	private static readonly System.Text.Json.JsonEncodedText MemberFailed = System.Text.Json.JsonEncodedText.Encode("failed");
+	private static readonly System.Text.Json.JsonEncodedText MemberClosing = System.Text.Json.JsonEncodedText.Encode("closing");
+	private static readonly System.Text.Json.JsonEncodedText MemberClosed = System.Text.Json.JsonEncodedText.Encode("closed");
+
+	public override JobState Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "opening":
-				return JobState.Opening;
-			case "opened":
-				return JobState.Opened;
-			case "failed":
-				return JobState.Failed;
-			case "closing":
-				return JobState.Closing;
-			case "closed":
-				return JobState.Closed;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberOpening))
+		{
+			return JobState.Opening;
+		}
+
+		if (reader.ValueTextEquals(MemberOpened))
+		{
+			return JobState.Opened;
+		}
+
+		if (reader.ValueTextEquals(MemberFailed))
+		{
+			return JobState.Failed;
+		}
+
+		if (reader.ValueTextEquals(MemberClosing))
+		{
+			return JobState.Closing;
+		}
+
+		if (reader.ValueTextEquals(MemberClosed))
+		{
+			return JobState.Closed;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(JobState)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, JobState value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, JobState value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case JobState.Opening:
-				writer.WriteStringValue("opening");
-				return;
+				writer.WriteStringValue(MemberOpening);
+				break;
 			case JobState.Opened:
-				writer.WriteStringValue("opened");
-				return;
+				writer.WriteStringValue(MemberOpened);
+				break;
 			case JobState.Failed:
-				writer.WriteStringValue("failed");
-				return;
+				writer.WriteStringValue(MemberFailed);
+				break;
 			case JobState.Closing:
-				writer.WriteStringValue("closing");
-				return;
+				writer.WriteStringValue(MemberClosing);
+				break;
 			case JobState.Closed:
-				writer.WriteStringValue("closed");
-				return;
+				writer.WriteStringValue(MemberClosed);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(JobState)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -832,41 +973,49 @@ public enum MemoryStatus
 	HardLimit
 }
 
-internal sealed class MemoryStatusConverter : JsonConverter<MemoryStatus>
+internal sealed partial class MemoryStatusConverter : System.Text.Json.Serialization.JsonConverter<MemoryStatus>
 {
-	public override MemoryStatus Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberSoftLimit = System.Text.Json.JsonEncodedText.Encode("soft_limit");
+	private static readonly System.Text.Json.JsonEncodedText MemberOk = System.Text.Json.JsonEncodedText.Encode("ok");
+	private static readonly System.Text.Json.JsonEncodedText MemberHardLimit = System.Text.Json.JsonEncodedText.Encode("hard_limit");
+
+	public override MemoryStatus Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberSoftLimit))
+		{
+			return MemoryStatus.SoftLimit;
+		}
+
+		if (reader.ValueTextEquals(MemberOk))
+		{
+			return MemoryStatus.Ok;
+		}
+
+		if (reader.ValueTextEquals(MemberHardLimit))
 		{
-			case "soft_limit":
-				return MemoryStatus.SoftLimit;
-			case "ok":
-				return MemoryStatus.Ok;
-			case "hard_limit":
-				return MemoryStatus.HardLimit;
+			return MemoryStatus.HardLimit;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(MemoryStatus)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, MemoryStatus value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, MemoryStatus value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case MemoryStatus.SoftLimit:
-				writer.WriteStringValue("soft_limit");
-				return;
+				writer.WriteStringValue(MemberSoftLimit);
+				break;
 			case MemoryStatus.Ok:
-				writer.WriteStringValue("ok");
-				return;
+				writer.WriteStringValue(MemberOk);
+				break;
 			case MemoryStatus.HardLimit:
-				writer.WriteStringValue("hard_limit");
-				return;
+				writer.WriteStringValue(MemberHardLimit);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(MemoryStatus)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -910,51 +1059,67 @@ public enum RoutingState
 	Failed
 }
 
-internal sealed class RoutingStateConverter : JsonConverter<RoutingState>
+internal sealed partial class RoutingStateConverter : System.Text.Json.Serialization.JsonConverter<RoutingState>
 {
-	public override RoutingState Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberStopping = System.Text.Json.JsonEncodedText.Encode("stopping");
+	private static readonly System.Text.Json.JsonEncodedText MemberStopped = System.Text.Json.JsonEncodedText.Encode("stopped");
+	private static readonly System.Text.Json.JsonEncodedText MemberStarting = System.Text.Json.JsonEncodedText.Encode("starting");
+	private static readonly System.Text.Json.JsonEncodedText MemberStarted = System.Text.Json.JsonEncodedText.Encode("started");
+	private static readonly System.Text.Json.JsonEncodedText MemberFailed = System.Text.Json.JsonEncodedText.Encode("failed");
+
+	public override RoutingState Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "stopping":
-				return RoutingState.Stopping;
-			case "stopped":
-				return RoutingState.Stopped;
-			case "starting":
-				return RoutingState.Starting;
-			case "started":
-				return RoutingState.Started;
-			case "failed":
-				return RoutingState.Failed;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberStopping))
+		{
+			return RoutingState.Stopping;
+		}
+
+		if (reader.ValueTextEquals(MemberStopped))
+		{
+			return RoutingState.Stopped;
+		}
+
+		if (reader.ValueTextEquals(MemberStarting))
+		{
+			return RoutingState.Starting;
+		}
+
+		if (reader.ValueTextEquals(MemberStarted))
+		{
+			return RoutingState.Started;
+		}
+
+		if (reader.ValueTextEquals(MemberFailed))
+		{
+			return RoutingState.Failed;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(RoutingState)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, RoutingState value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, RoutingState value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case RoutingState.Stopping:
-				writer.WriteStringValue("stopping");
-				return;
+				writer.WriteStringValue(MemberStopping);
+				break;
 			case RoutingState.Stopped:
-				writer.WriteStringValue("stopped");
-				return;
+				writer.WriteStringValue(MemberStopped);
+				break;
 			case RoutingState.Starting:
-				writer.WriteStringValue("starting");
-				return;
+				writer.WriteStringValue(MemberStarting);
+				break;
 			case RoutingState.Started:
-				writer.WriteStringValue("started");
-				return;
+				writer.WriteStringValue(MemberStarted);
+				break;
 			case RoutingState.Failed:
-				writer.WriteStringValue("failed");
-				return;
+				writer.WriteStringValue(MemberFailed);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(RoutingState)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -977,36 +1142,40 @@ public enum RuleAction
 	SkipModelUpdate
 }
 
-internal sealed class RuleActionConverter : JsonConverter<RuleAction>
+internal sealed partial class RuleActionConverter : System.Text.Json.Serialization.JsonConverter<RuleAction>
 {
-	public override RuleAction Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberSkipResult = System.Text.Json.JsonEncodedText.Encode("skip_result");
+	private static readonly System.Text.Json.JsonEncodedText MemberSkipModelUpdate = System.Text.Json.JsonEncodedText.Encode("skip_model_update");
+
+	public override RuleAction Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberSkipResult))
+		{
+			return RuleAction.SkipResult;
+		}
+
+		if (reader.ValueTextEquals(MemberSkipModelUpdate))
 		{
-			case "skip_result":
-				return RuleAction.SkipResult;
-			case "skip_model_update":
-				return RuleAction.SkipModelUpdate;
+			return RuleAction.SkipModelUpdate;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(RuleAction)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, RuleAction value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, RuleAction value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case RuleAction.SkipResult:
-				writer.WriteStringValue("skip_result");
-				return;
+				writer.WriteStringValue(MemberSkipResult);
+				break;
 			case RuleAction.SkipModelUpdate:
-				writer.WriteStringValue("skip_model_update");
-				return;
+				writer.WriteStringValue(MemberSkipModelUpdate);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(RuleAction)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -1023,46 +1192,58 @@ public enum SnapshotUpgradeState
 	Failed
 }
 
-internal sealed class SnapshotUpgradeStateConverter : JsonConverter<SnapshotUpgradeState>
+internal sealed partial class SnapshotUpgradeStateConverter : System.Text.Json.Serialization.JsonConverter<SnapshotUpgradeState>
 {
-	public override SnapshotUpgradeState Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberStopped = System.Text.Json.JsonEncodedText.Encode("stopped");
+	private static readonly System.Text.Json.JsonEncodedText MemberSavingNewState = System.Text.Json.JsonEncodedText.Encode("saving_new_state");
+	private static readonly System.Text.Json.JsonEncodedText MemberLoadingOldState = System.Text.Json.JsonEncodedText.Encode("loading_old_state");
+	private static readonly System.Text.Json.JsonEncodedText MemberFailed = System.Text.Json.JsonEncodedText.Encode("failed");
+
+	public override SnapshotUpgradeState Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberStopped))
+		{
+			return SnapshotUpgradeState.Stopped;
+		}
+
+		if (reader.ValueTextEquals(MemberSavingNewState))
+		{
+			return SnapshotUpgradeState.SavingNewState;
+		}
+
+		if (reader.ValueTextEquals(MemberLoadingOldState))
 		{
-			case "stopped":
-				return SnapshotUpgradeState.Stopped;
-			case "saving_new_state":
-				return SnapshotUpgradeState.SavingNewState;
-			case "loading_old_state":
-				return SnapshotUpgradeState.LoadingOldState;
-			case "failed":
-				return SnapshotUpgradeState.Failed;
+			return SnapshotUpgradeState.LoadingOldState;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberFailed))
+		{
+			return SnapshotUpgradeState.Failed;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(SnapshotUpgradeState)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, SnapshotUpgradeState value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SnapshotUpgradeState value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case SnapshotUpgradeState.Stopped:
-				writer.WriteStringValue("stopped");
-				return;
+				writer.WriteStringValue(MemberStopped);
+				break;
 			case SnapshotUpgradeState.SavingNewState:
-				writer.WriteStringValue("saving_new_state");
-				return;
+				writer.WriteStringValue(MemberSavingNewState);
+				break;
 			case SnapshotUpgradeState.LoadingOldState:
-				writer.WriteStringValue("loading_old_state");
-				return;
+				writer.WriteStringValue(MemberLoadingOldState);
+				break;
 			case SnapshotUpgradeState.Failed:
-				writer.WriteStringValue("failed");
-				return;
+				writer.WriteStringValue(MemberFailed);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(SnapshotUpgradeState)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -1077,41 +1258,49 @@ public enum TokenizationTruncate
 	First
 }
 
-internal sealed class TokenizationTruncateConverter : JsonConverter<TokenizationTruncate>
+internal sealed partial class TokenizationTruncateConverter : System.Text.Json.Serialization.JsonConverter<TokenizationTruncate>
 {
-	public override TokenizationTruncate Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberSecond = System.Text.Json.JsonEncodedText.Encode("second");
+	private static readonly System.Text.Json.JsonEncodedText MemberNone = System.Text.Json.JsonEncodedText.Encode("none");
+	private static readonly System.Text.Json.JsonEncodedText MemberFirst = System.Text.Json.JsonEncodedText.Encode("first");
+
+	public override TokenizationTruncate Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberSecond))
 		{
-			case "second":
-				return TokenizationTruncate.Second;
-			case "none":
-				return TokenizationTruncate.None;
-			case "first":
-				return TokenizationTruncate.First;
+			return TokenizationTruncate.Second;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberNone))
+		{
+			return TokenizationTruncate.None;
+		}
+
+		if (reader.ValueTextEquals(MemberFirst))
+		{
+			return TokenizationTruncate.First;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(TokenizationTruncate)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, TokenizationTruncate value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, TokenizationTruncate value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case TokenizationTruncate.Second:
-				writer.WriteStringValue("second");
-				return;
+				writer.WriteStringValue(MemberSecond);
+				break;
 			case TokenizationTruncate.None:
-				writer.WriteStringValue("none");
-				return;
+				writer.WriteStringValue(MemberNone);
+				break;
 			case TokenizationTruncate.First:
-				writer.WriteStringValue("first");
-				return;
+				writer.WriteStringValue(MemberFirst);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(TokenizationTruncate)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -1142,41 +1331,49 @@ public enum TrainedModelType
 	LangIdent
 }
 
-internal sealed class TrainedModelTypeConverter : JsonConverter<TrainedModelType>
+internal sealed partial class TrainedModelTypeConverter : System.Text.Json.Serialization.JsonConverter<TrainedModelType>
 {
-	public override TrainedModelType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberTreeEnsemble = System.Text.Json.JsonEncodedText.Encode("tree_ensemble");
+	private static readonly System.Text.Json.JsonEncodedText MemberPytorch = System.Text.Json.JsonEncodedText.Encode("pytorch");
+	private static readonly System.Text.Json.JsonEncodedText MemberLangIdent = System.Text.Json.JsonEncodedText.Encode("lang_ident");
+
+	public override TrainedModelType Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberTreeEnsemble))
 		{
-			case "tree_ensemble":
-				return TrainedModelType.TreeEnsemble;
-			case "pytorch":
-				return TrainedModelType.Pytorch;
-			case "lang_ident":
-				return TrainedModelType.LangIdent;
+			return TrainedModelType.TreeEnsemble;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberPytorch))
+		{
+			return TrainedModelType.Pytorch;
+		}
+
+		if (reader.ValueTextEquals(MemberLangIdent))
+		{
+			return TrainedModelType.LangIdent;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(TrainedModelType)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, TrainedModelType value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, TrainedModelType value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case TrainedModelType.TreeEnsemble:
-				writer.WriteStringValue("tree_ensemble");
-				return;
+				writer.WriteStringValue(MemberTreeEnsemble);
+				break;
 			case TrainedModelType.Pytorch:
-				writer.WriteStringValue("pytorch");
-				return;
+				writer.WriteStringValue(MemberPytorch);
+				break;
 			case TrainedModelType.LangIdent:
-				writer.WriteStringValue("lang_ident");
-				return;
+				writer.WriteStringValue(MemberLangIdent);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(TrainedModelType)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -1189,35 +1386,39 @@ public enum TrainingPriority
 	Low
 }
 
-internal sealed class TrainingPriorityConverter : JsonConverter<TrainingPriority>
+internal sealed partial class TrainingPriorityConverter : System.Text.Json.Serialization.JsonConverter<TrainingPriority>
 {
-	public override TrainingPriority Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberNormal = System.Text.Json.JsonEncodedText.Encode("normal");
+	private static readonly System.Text.Json.JsonEncodedText MemberLow = System.Text.Json.JsonEncodedText.Encode("low");
+
+	public override TrainingPriority Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberNormal))
+		{
+			return TrainingPriority.Normal;
+		}
+
+		if (reader.ValueTextEquals(MemberLow))
 		{
-			case "normal":
-				return TrainingPriority.Normal;
-			case "low":
-				return TrainingPriority.Low;
+			return TrainingPriority.Low;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(TrainingPriority)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, TrainingPriority value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, TrainingPriority value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case TrainingPriority.Normal:
-				writer.WriteStringValue("normal");
-				return;
+				writer.WriteStringValue(MemberNormal);
+				break;
 			case TrainingPriority.Low:
-				writer.WriteStringValue("low");
-				return;
+				writer.WriteStringValue(MemberLow);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(TrainingPriority)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.Mapping.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.Mapping.g.cs
index 35464a20739..1686b54f0fe 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.Mapping.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.Mapping.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Core;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport;
 using System;
@@ -58,41 +59,49 @@ public enum DenseVectorElementType
 	Bit
 }
 
-internal sealed class DenseVectorElementTypeConverter : JsonConverter<DenseVectorElementType>
+internal sealed partial class DenseVectorElementTypeConverter : System.Text.Json.Serialization.JsonConverter<DenseVectorElementType>
 {
-	public override DenseVectorElementType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberFloat = System.Text.Json.JsonEncodedText.Encode("float");
+	private static readonly System.Text.Json.JsonEncodedText MemberByte = System.Text.Json.JsonEncodedText.Encode("byte");
+	private static readonly System.Text.Json.JsonEncodedText MemberBit = System.Text.Json.JsonEncodedText.Encode("bit");
+
+	public override DenseVectorElementType Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberFloat))
+		{
+			return DenseVectorElementType.Float;
+		}
+
+		if (reader.ValueTextEquals(MemberByte))
+		{
+			return DenseVectorElementType.Byte;
+		}
+
+		if (reader.ValueTextEquals(MemberBit))
 		{
-			case "float":
-				return DenseVectorElementType.Float;
-			case "byte":
-				return DenseVectorElementType.Byte;
-			case "bit":
-				return DenseVectorElementType.Bit;
+			return DenseVectorElementType.Bit;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(DenseVectorElementType)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, DenseVectorElementType value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DenseVectorElementType value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case DenseVectorElementType.Float:
-				writer.WriteStringValue("float");
-				return;
+				writer.WriteStringValue(MemberFloat);
+				break;
 			case DenseVectorElementType.Byte:
-				writer.WriteStringValue("byte");
-				return;
+				writer.WriteStringValue(MemberByte);
+				break;
 			case DenseVectorElementType.Bit:
-				writer.WriteStringValue("bit");
-				return;
+				writer.WriteStringValue(MemberBit);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(DenseVectorElementType)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -153,56 +162,76 @@ public enum DenseVectorIndexOptionsType
 	Flat
 }
 
-internal sealed class DenseVectorIndexOptionsTypeConverter : JsonConverter<DenseVectorIndexOptionsType>
+internal sealed partial class DenseVectorIndexOptionsTypeConverter : System.Text.Json.Serialization.JsonConverter<DenseVectorIndexOptionsType>
 {
-	public override DenseVectorIndexOptionsType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberInt8Hnsw = System.Text.Json.JsonEncodedText.Encode("int8_hnsw");
+	private static readonly System.Text.Json.JsonEncodedText MemberInt8Flat = System.Text.Json.JsonEncodedText.Encode("int8_flat");
+	private static readonly System.Text.Json.JsonEncodedText MemberInt4Hnsw = System.Text.Json.JsonEncodedText.Encode("int4_hnsw");
+	private static readonly System.Text.Json.JsonEncodedText MemberInt4Flat = System.Text.Json.JsonEncodedText.Encode("int4_flat");
+	private static readonly System.Text.Json.JsonEncodedText MemberHnsw = System.Text.Json.JsonEncodedText.Encode("hnsw");
+	private static readonly System.Text.Json.JsonEncodedText MemberFlat = System.Text.Json.JsonEncodedText.Encode("flat");
+
+	public override DenseVectorIndexOptionsType Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "int8_hnsw":
-				return DenseVectorIndexOptionsType.Int8Hnsw;
-			case "int8_flat":
-				return DenseVectorIndexOptionsType.Int8Flat;
-			case "int4_hnsw":
-				return DenseVectorIndexOptionsType.Int4Hnsw;
-			case "int4_flat":
-				return DenseVectorIndexOptionsType.Int4Flat;
-			case "hnsw":
-				return DenseVectorIndexOptionsType.Hnsw;
-			case "flat":
-				return DenseVectorIndexOptionsType.Flat;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberInt8Hnsw))
+		{
+			return DenseVectorIndexOptionsType.Int8Hnsw;
+		}
+
+		if (reader.ValueTextEquals(MemberInt8Flat))
+		{
+			return DenseVectorIndexOptionsType.Int8Flat;
+		}
+
+		if (reader.ValueTextEquals(MemberInt4Hnsw))
+		{
+			return DenseVectorIndexOptionsType.Int4Hnsw;
+		}
+
+		if (reader.ValueTextEquals(MemberInt4Flat))
+		{
+			return DenseVectorIndexOptionsType.Int4Flat;
+		}
+
+		if (reader.ValueTextEquals(MemberHnsw))
+		{
+			return DenseVectorIndexOptionsType.Hnsw;
+		}
+
+		if (reader.ValueTextEquals(MemberFlat))
+		{
+			return DenseVectorIndexOptionsType.Flat;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(DenseVectorIndexOptionsType)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, DenseVectorIndexOptionsType value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DenseVectorIndexOptionsType value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case DenseVectorIndexOptionsType.Int8Hnsw:
-				writer.WriteStringValue("int8_hnsw");
-				return;
+				writer.WriteStringValue(MemberInt8Hnsw);
+				break;
 			case DenseVectorIndexOptionsType.Int8Flat:
-				writer.WriteStringValue("int8_flat");
-				return;
+				writer.WriteStringValue(MemberInt8Flat);
+				break;
 			case DenseVectorIndexOptionsType.Int4Hnsw:
-				writer.WriteStringValue("int4_hnsw");
-				return;
+				writer.WriteStringValue(MemberInt4Hnsw);
+				break;
 			case DenseVectorIndexOptionsType.Int4Flat:
-				writer.WriteStringValue("int4_flat");
-				return;
+				writer.WriteStringValue(MemberInt4Flat);
+				break;
 			case DenseVectorIndexOptionsType.Hnsw:
-				writer.WriteStringValue("hnsw");
-				return;
+				writer.WriteStringValue(MemberHnsw);
+				break;
 			case DenseVectorIndexOptionsType.Flat:
-				writer.WriteStringValue("flat");
-				return;
+				writer.WriteStringValue(MemberFlat);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(DenseVectorIndexOptionsType)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -277,46 +306,58 @@ public enum DenseVectorSimilarity
 	Cosine
 }
 
-internal sealed class DenseVectorSimilarityConverter : JsonConverter<DenseVectorSimilarity>
+internal sealed partial class DenseVectorSimilarityConverter : System.Text.Json.Serialization.JsonConverter<DenseVectorSimilarity>
 {
-	public override DenseVectorSimilarity Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberMaxInnerProduct = System.Text.Json.JsonEncodedText.Encode("max_inner_product");
+	private static readonly System.Text.Json.JsonEncodedText MemberL2Norm = System.Text.Json.JsonEncodedText.Encode("l2_norm");
+	private static readonly System.Text.Json.JsonEncodedText MemberDotProduct = System.Text.Json.JsonEncodedText.Encode("dot_product");
+	private static readonly System.Text.Json.JsonEncodedText MemberCosine = System.Text.Json.JsonEncodedText.Encode("cosine");
+
+	public override DenseVectorSimilarity Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberMaxInnerProduct))
 		{
-			case "max_inner_product":
-				return DenseVectorSimilarity.MaxInnerProduct;
-			case "l2_norm":
-				return DenseVectorSimilarity.L2Norm;
-			case "dot_product":
-				return DenseVectorSimilarity.DotProduct;
-			case "cosine":
-				return DenseVectorSimilarity.Cosine;
+			return DenseVectorSimilarity.MaxInnerProduct;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberL2Norm))
+		{
+			return DenseVectorSimilarity.L2Norm;
+		}
+
+		if (reader.ValueTextEquals(MemberDotProduct))
+		{
+			return DenseVectorSimilarity.DotProduct;
+		}
+
+		if (reader.ValueTextEquals(MemberCosine))
+		{
+			return DenseVectorSimilarity.Cosine;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(DenseVectorSimilarity)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, DenseVectorSimilarity value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DenseVectorSimilarity value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case DenseVectorSimilarity.MaxInnerProduct:
-				writer.WriteStringValue("max_inner_product");
-				return;
+				writer.WriteStringValue(MemberMaxInnerProduct);
+				break;
 			case DenseVectorSimilarity.L2Norm:
-				writer.WriteStringValue("l2_norm");
-				return;
+				writer.WriteStringValue(MemberL2Norm);
+				break;
 			case DenseVectorSimilarity.DotProduct:
-				writer.WriteStringValue("dot_product");
-				return;
+				writer.WriteStringValue(MemberDotProduct);
+				break;
 			case DenseVectorSimilarity.Cosine:
-				writer.WriteStringValue("cosine");
-				return;
+				writer.WriteStringValue(MemberCosine);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(DenseVectorSimilarity)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -333,46 +374,58 @@ public enum DynamicMapping
 	False
 }
 
-internal sealed class DynamicMappingConverter : JsonConverter<DynamicMapping>
+internal sealed partial class DynamicMappingConverter : System.Text.Json.Serialization.JsonConverter<DynamicMapping>
 {
-	public override DynamicMapping Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberTrue = System.Text.Json.JsonEncodedText.Encode("true");
+	private static readonly System.Text.Json.JsonEncodedText MemberStrict = System.Text.Json.JsonEncodedText.Encode("strict");
+	private static readonly System.Text.Json.JsonEncodedText MemberRuntime = System.Text.Json.JsonEncodedText.Encode("runtime");
+	private static readonly System.Text.Json.JsonEncodedText MemberFalse = System.Text.Json.JsonEncodedText.Encode("false");
+
+	public override DynamicMapping Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberTrue))
+		{
+			return DynamicMapping.True;
+		}
+
+		if (reader.ValueTextEquals(MemberStrict))
+		{
+			return DynamicMapping.Strict;
+		}
+
+		if (reader.ValueTextEquals(MemberRuntime))
+		{
+			return DynamicMapping.Runtime;
+		}
+
+		if (reader.ValueTextEquals(MemberFalse))
 		{
-			case "true":
-				return DynamicMapping.True;
-			case "strict":
-				return DynamicMapping.Strict;
-			case "runtime":
-				return DynamicMapping.Runtime;
-			case "false":
-				return DynamicMapping.False;
+			return DynamicMapping.False;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(DynamicMapping)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, DynamicMapping value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DynamicMapping value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case DynamicMapping.True:
-				writer.WriteStringValue("true");
-				return;
+				writer.WriteStringValue(MemberTrue);
+				break;
 			case DynamicMapping.Strict:
-				writer.WriteStringValue("strict");
-				return;
+				writer.WriteStringValue(MemberStrict);
+				break;
 			case DynamicMapping.Runtime:
-				writer.WriteStringValue("runtime");
-				return;
+				writer.WriteStringValue(MemberRuntime);
+				break;
 			case DynamicMapping.False:
-				writer.WriteStringValue("false");
-				return;
+				writer.WriteStringValue(MemberFalse);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(DynamicMapping)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -475,261 +528,445 @@ public enum FieldType
 	AggregateMetricDouble
 }
 
-internal sealed class FieldTypeConverter : JsonConverter<FieldType>
+internal sealed partial class FieldTypeConverter : System.Text.Json.Serialization.JsonConverter<FieldType>
 {
-	public override FieldType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberVersion = System.Text.Json.JsonEncodedText.Encode("version");
+	private static readonly System.Text.Json.JsonEncodedText MemberTokenCount = System.Text.Json.JsonEncodedText.Encode("token_count");
+	private static readonly System.Text.Json.JsonEncodedText MemberText = System.Text.Json.JsonEncodedText.Encode("text");
+	private static readonly System.Text.Json.JsonEncodedText MemberSparseVector = System.Text.Json.JsonEncodedText.Encode("sparse_vector");
+	private static readonly System.Text.Json.JsonEncodedText MemberShort = System.Text.Json.JsonEncodedText.Encode("short");
+	private static readonly System.Text.Json.JsonEncodedText MemberShape = System.Text.Json.JsonEncodedText.Encode("shape");
+	private static readonly System.Text.Json.JsonEncodedText MemberSemanticText = System.Text.Json.JsonEncodedText.Encode("semantic_text");
+	private static readonly System.Text.Json.JsonEncodedText MemberSearchAsYouType = System.Text.Json.JsonEncodedText.Encode("search_as_you_type");
+	private static readonly System.Text.Json.JsonEncodedText MemberScaledFloat = System.Text.Json.JsonEncodedText.Encode("scaled_float");
+	private static readonly System.Text.Json.JsonEncodedText MemberRankFeatures = System.Text.Json.JsonEncodedText.Encode("rank_features");
+	private static readonly System.Text.Json.JsonEncodedText MemberRankFeature = System.Text.Json.JsonEncodedText.Encode("rank_feature");
+	private static readonly System.Text.Json.JsonEncodedText MemberPercolator = System.Text.Json.JsonEncodedText.Encode("percolator");
+	private static readonly System.Text.Json.JsonEncodedText MemberPassthrough = System.Text.Json.JsonEncodedText.Encode("passthrough");
+	private static readonly System.Text.Json.JsonEncodedText MemberObject = System.Text.Json.JsonEncodedText.Encode("object");
+	private static readonly System.Text.Json.JsonEncodedText MemberNone = System.Text.Json.JsonEncodedText.Encode("none");
+	private static readonly System.Text.Json.JsonEncodedText MemberNested = System.Text.Json.JsonEncodedText.Encode("nested");
+	private static readonly System.Text.Json.JsonEncodedText MemberMurmur3 = System.Text.Json.JsonEncodedText.Encode("murmur3");
+	private static readonly System.Text.Json.JsonEncodedText MemberMatchOnlyText = System.Text.Json.JsonEncodedText.Encode("match_only_text");
+	private static readonly System.Text.Json.JsonEncodedText MemberLongRange = System.Text.Json.JsonEncodedText.Encode("long_range");
+	private static readonly System.Text.Json.JsonEncodedText MemberLong = System.Text.Json.JsonEncodedText.Encode("long");
+	private static readonly System.Text.Json.JsonEncodedText MemberKeyword = System.Text.Json.JsonEncodedText.Encode("keyword");
+	private static readonly System.Text.Json.JsonEncodedText MemberJoin = System.Text.Json.JsonEncodedText.Encode("join");
+	private static readonly System.Text.Json.JsonEncodedText MemberIpRange = System.Text.Json.JsonEncodedText.Encode("ip_range");
+	private static readonly System.Text.Json.JsonEncodedText MemberIp = System.Text.Json.JsonEncodedText.Encode("ip");
+	private static readonly System.Text.Json.JsonEncodedText MemberIntegerRange = System.Text.Json.JsonEncodedText.Encode("integer_range");
+	private static readonly System.Text.Json.JsonEncodedText MemberInteger = System.Text.Json.JsonEncodedText.Encode("integer");
+	private static readonly System.Text.Json.JsonEncodedText MemberIcuCollationKeyword = System.Text.Json.JsonEncodedText.Encode("icu_collation_keyword");
+	private static readonly System.Text.Json.JsonEncodedText MemberHistogram = System.Text.Json.JsonEncodedText.Encode("histogram");
+	private static readonly System.Text.Json.JsonEncodedText MemberHalfFloat = System.Text.Json.JsonEncodedText.Encode("half_float");
+	private static readonly System.Text.Json.JsonEncodedText MemberGeoShape = System.Text.Json.JsonEncodedText.Encode("geo_shape");
+	private static readonly System.Text.Json.JsonEncodedText MemberGeoPoint = System.Text.Json.JsonEncodedText.Encode("geo_point");
+	private static readonly System.Text.Json.JsonEncodedText MemberFloatRange = System.Text.Json.JsonEncodedText.Encode("float_range");
+	private static readonly System.Text.Json.JsonEncodedText MemberFloat = System.Text.Json.JsonEncodedText.Encode("float");
+	private static readonly System.Text.Json.JsonEncodedText MemberFlattened = System.Text.Json.JsonEncodedText.Encode("flattened");
+	private static readonly System.Text.Json.JsonEncodedText MemberDoubleRange = System.Text.Json.JsonEncodedText.Encode("double_range");
+	private static readonly System.Text.Json.JsonEncodedText MemberDouble = System.Text.Json.JsonEncodedText.Encode("double");
+	private static readonly System.Text.Json.JsonEncodedText MemberDenseVector = System.Text.Json.JsonEncodedText.Encode("dense_vector");
+	private static readonly System.Text.Json.JsonEncodedText MemberDateRange = System.Text.Json.JsonEncodedText.Encode("date_range");
+	private static readonly System.Text.Json.JsonEncodedText MemberDateNanos = System.Text.Json.JsonEncodedText.Encode("date_nanos");
+	private static readonly System.Text.Json.JsonEncodedText MemberDate = System.Text.Json.JsonEncodedText.Encode("date");
+	private static readonly System.Text.Json.JsonEncodedText MemberConstantKeyword = System.Text.Json.JsonEncodedText.Encode("constant_keyword");
+	private static readonly System.Text.Json.JsonEncodedText MemberCompletion = System.Text.Json.JsonEncodedText.Encode("completion");
+	private static readonly System.Text.Json.JsonEncodedText MemberByte = System.Text.Json.JsonEncodedText.Encode("byte");
+	private static readonly System.Text.Json.JsonEncodedText MemberBoolean = System.Text.Json.JsonEncodedText.Encode("boolean");
+	private static readonly System.Text.Json.JsonEncodedText MemberBinary = System.Text.Json.JsonEncodedText.Encode("binary");
+	private static readonly System.Text.Json.JsonEncodedText MemberAlias = System.Text.Json.JsonEncodedText.Encode("alias");
+	private static readonly System.Text.Json.JsonEncodedText MemberAggregateMetricDouble = System.Text.Json.JsonEncodedText.Encode("aggregate_metric_double");
+
+	public override FieldType Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "version":
-				return FieldType.Version;
-			case "token_count":
-				return FieldType.TokenCount;
-			case "text":
-				return FieldType.Text;
-			case "sparse_vector":
-				return FieldType.SparseVector;
-			case "short":
-				return FieldType.Short;
-			case "shape":
-				return FieldType.Shape;
-			case "semantic_text":
-				return FieldType.SemanticText;
-			case "search_as_you_type":
-				return FieldType.SearchAsYouType;
-			case "scaled_float":
-				return FieldType.ScaledFloat;
-			case "rank_features":
-				return FieldType.RankFeatures;
-			case "rank_feature":
-				return FieldType.RankFeature;
-			case "percolator":
-				return FieldType.Percolator;
-			case "passthrough":
-				return FieldType.Passthrough;
-			case "object":
-				return FieldType.Object;
-			case "none":
-				return FieldType.None;
-			case "nested":
-				return FieldType.Nested;
-			case "murmur3":
-				return FieldType.Murmur3;
-			case "match_only_text":
-				return FieldType.MatchOnlyText;
-			case "long_range":
-				return FieldType.LongRange;
-			case "long":
-				return FieldType.Long;
-			case "keyword":
-				return FieldType.Keyword;
-			case "join":
-				return FieldType.Join;
-			case "ip_range":
-				return FieldType.IpRange;
-			case "ip":
-				return FieldType.Ip;
-			case "integer_range":
-				return FieldType.IntegerRange;
-			case "integer":
-				return FieldType.Integer;
-			case "icu_collation_keyword":
-				return FieldType.IcuCollationKeyword;
-			case "histogram":
-				return FieldType.Histogram;
-			case "half_float":
-				return FieldType.HalfFloat;
-			case "geo_shape":
-				return FieldType.GeoShape;
-			case "geo_point":
-				return FieldType.GeoPoint;
-			case "float_range":
-				return FieldType.FloatRange;
-			case "float":
-				return FieldType.Float;
-			case "flattened":
-				return FieldType.Flattened;
-			case "double_range":
-				return FieldType.DoubleRange;
-			case "double":
-				return FieldType.Double;
-			case "dense_vector":
-				return FieldType.DenseVector;
-			case "date_range":
-				return FieldType.DateRange;
-			case "date_nanos":
-				return FieldType.DateNanos;
-			case "date":
-				return FieldType.Date;
-			case "constant_keyword":
-				return FieldType.ConstantKeyword;
-			case "completion":
-				return FieldType.Completion;
-			case "byte":
-				return FieldType.Byte;
-			case "boolean":
-				return FieldType.Boolean;
-			case "binary":
-				return FieldType.Binary;
-			case "alias":
-				return FieldType.Alias;
-			case "aggregate_metric_double":
-				return FieldType.AggregateMetricDouble;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberVersion))
+		{
+			return FieldType.Version;
+		}
+
+		if (reader.ValueTextEquals(MemberTokenCount))
+		{
+			return FieldType.TokenCount;
+		}
+
+		if (reader.ValueTextEquals(MemberText))
+		{
+			return FieldType.Text;
+		}
+
+		if (reader.ValueTextEquals(MemberSparseVector))
+		{
+			return FieldType.SparseVector;
+		}
+
+		if (reader.ValueTextEquals(MemberShort))
+		{
+			return FieldType.Short;
+		}
+
+		if (reader.ValueTextEquals(MemberShape))
+		{
+			return FieldType.Shape;
+		}
+
+		if (reader.ValueTextEquals(MemberSemanticText))
+		{
+			return FieldType.SemanticText;
+		}
+
+		if (reader.ValueTextEquals(MemberSearchAsYouType))
+		{
+			return FieldType.SearchAsYouType;
+		}
+
+		if (reader.ValueTextEquals(MemberScaledFloat))
+		{
+			return FieldType.ScaledFloat;
+		}
+
+		if (reader.ValueTextEquals(MemberRankFeatures))
+		{
+			return FieldType.RankFeatures;
+		}
+
+		if (reader.ValueTextEquals(MemberRankFeature))
+		{
+			return FieldType.RankFeature;
+		}
+
+		if (reader.ValueTextEquals(MemberPercolator))
+		{
+			return FieldType.Percolator;
+		}
+
+		if (reader.ValueTextEquals(MemberPassthrough))
+		{
+			return FieldType.Passthrough;
+		}
+
+		if (reader.ValueTextEquals(MemberObject))
+		{
+			return FieldType.Object;
+		}
+
+		if (reader.ValueTextEquals(MemberNone))
+		{
+			return FieldType.None;
+		}
+
+		if (reader.ValueTextEquals(MemberNested))
+		{
+			return FieldType.Nested;
+		}
+
+		if (reader.ValueTextEquals(MemberMurmur3))
+		{
+			return FieldType.Murmur3;
+		}
+
+		if (reader.ValueTextEquals(MemberMatchOnlyText))
+		{
+			return FieldType.MatchOnlyText;
+		}
+
+		if (reader.ValueTextEquals(MemberLongRange))
+		{
+			return FieldType.LongRange;
+		}
+
+		if (reader.ValueTextEquals(MemberLong))
+		{
+			return FieldType.Long;
+		}
+
+		if (reader.ValueTextEquals(MemberKeyword))
+		{
+			return FieldType.Keyword;
+		}
+
+		if (reader.ValueTextEquals(MemberJoin))
+		{
+			return FieldType.Join;
+		}
+
+		if (reader.ValueTextEquals(MemberIpRange))
+		{
+			return FieldType.IpRange;
+		}
+
+		if (reader.ValueTextEquals(MemberIp))
+		{
+			return FieldType.Ip;
+		}
+
+		if (reader.ValueTextEquals(MemberIntegerRange))
+		{
+			return FieldType.IntegerRange;
+		}
+
+		if (reader.ValueTextEquals(MemberInteger))
+		{
+			return FieldType.Integer;
+		}
+
+		if (reader.ValueTextEquals(MemberIcuCollationKeyword))
+		{
+			return FieldType.IcuCollationKeyword;
+		}
+
+		if (reader.ValueTextEquals(MemberHistogram))
+		{
+			return FieldType.Histogram;
+		}
+
+		if (reader.ValueTextEquals(MemberHalfFloat))
+		{
+			return FieldType.HalfFloat;
+		}
+
+		if (reader.ValueTextEquals(MemberGeoShape))
+		{
+			return FieldType.GeoShape;
+		}
+
+		if (reader.ValueTextEquals(MemberGeoPoint))
+		{
+			return FieldType.GeoPoint;
+		}
+
+		if (reader.ValueTextEquals(MemberFloatRange))
+		{
+			return FieldType.FloatRange;
+		}
+
+		if (reader.ValueTextEquals(MemberFloat))
+		{
+			return FieldType.Float;
+		}
+
+		if (reader.ValueTextEquals(MemberFlattened))
+		{
+			return FieldType.Flattened;
+		}
+
+		if (reader.ValueTextEquals(MemberDoubleRange))
+		{
+			return FieldType.DoubleRange;
+		}
+
+		if (reader.ValueTextEquals(MemberDouble))
+		{
+			return FieldType.Double;
+		}
+
+		if (reader.ValueTextEquals(MemberDenseVector))
+		{
+			return FieldType.DenseVector;
+		}
+
+		if (reader.ValueTextEquals(MemberDateRange))
+		{
+			return FieldType.DateRange;
+		}
+
+		if (reader.ValueTextEquals(MemberDateNanos))
+		{
+			return FieldType.DateNanos;
+		}
+
+		if (reader.ValueTextEquals(MemberDate))
+		{
+			return FieldType.Date;
+		}
+
+		if (reader.ValueTextEquals(MemberConstantKeyword))
+		{
+			return FieldType.ConstantKeyword;
+		}
+
+		if (reader.ValueTextEquals(MemberCompletion))
+		{
+			return FieldType.Completion;
+		}
+
+		if (reader.ValueTextEquals(MemberByte))
+		{
+			return FieldType.Byte;
+		}
+
+		if (reader.ValueTextEquals(MemberBoolean))
+		{
+			return FieldType.Boolean;
+		}
+
+		if (reader.ValueTextEquals(MemberBinary))
+		{
+			return FieldType.Binary;
+		}
+
+		if (reader.ValueTextEquals(MemberAlias))
+		{
+			return FieldType.Alias;
+		}
+
+		if (reader.ValueTextEquals(MemberAggregateMetricDouble))
+		{
+			return FieldType.AggregateMetricDouble;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(FieldType)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, FieldType value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, FieldType value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case FieldType.Version:
-				writer.WriteStringValue("version");
-				return;
+				writer.WriteStringValue(MemberVersion);
+				break;
 			case FieldType.TokenCount:
-				writer.WriteStringValue("token_count");
-				return;
+				writer.WriteStringValue(MemberTokenCount);
+				break;
 			case FieldType.Text:
-				writer.WriteStringValue("text");
-				return;
+				writer.WriteStringValue(MemberText);
+				break;
 			case FieldType.SparseVector:
-				writer.WriteStringValue("sparse_vector");
-				return;
+				writer.WriteStringValue(MemberSparseVector);
+				break;
 			case FieldType.Short:
-				writer.WriteStringValue("short");
-				return;
+				writer.WriteStringValue(MemberShort);
+				break;
 			case FieldType.Shape:
-				writer.WriteStringValue("shape");
-				return;
+				writer.WriteStringValue(MemberShape);
+				break;
 			case FieldType.SemanticText:
-				writer.WriteStringValue("semantic_text");
-				return;
+				writer.WriteStringValue(MemberSemanticText);
+				break;
 			case FieldType.SearchAsYouType:
-				writer.WriteStringValue("search_as_you_type");
-				return;
+				writer.WriteStringValue(MemberSearchAsYouType);
+				break;
 			case FieldType.ScaledFloat:
-				writer.WriteStringValue("scaled_float");
-				return;
+				writer.WriteStringValue(MemberScaledFloat);
+				break;
 			case FieldType.RankFeatures:
-				writer.WriteStringValue("rank_features");
-				return;
+				writer.WriteStringValue(MemberRankFeatures);
+				break;
 			case FieldType.RankFeature:
-				writer.WriteStringValue("rank_feature");
-				return;
+				writer.WriteStringValue(MemberRankFeature);
+				break;
 			case FieldType.Percolator:
-				writer.WriteStringValue("percolator");
-				return;
+				writer.WriteStringValue(MemberPercolator);
+				break;
 			case FieldType.Passthrough:
-				writer.WriteStringValue("passthrough");
-				return;
+				writer.WriteStringValue(MemberPassthrough);
+				break;
 			case FieldType.Object:
-				writer.WriteStringValue("object");
-				return;
+				writer.WriteStringValue(MemberObject);
+				break;
 			case FieldType.None:
-				writer.WriteStringValue("none");
-				return;
+				writer.WriteStringValue(MemberNone);
+				break;
 			case FieldType.Nested:
-				writer.WriteStringValue("nested");
-				return;
+				writer.WriteStringValue(MemberNested);
+				break;
 			case FieldType.Murmur3:
-				writer.WriteStringValue("murmur3");
-				return;
+				writer.WriteStringValue(MemberMurmur3);
+				break;
 			case FieldType.MatchOnlyText:
-				writer.WriteStringValue("match_only_text");
-				return;
+				writer.WriteStringValue(MemberMatchOnlyText);
+				break;
 			case FieldType.LongRange:
-				writer.WriteStringValue("long_range");
-				return;
+				writer.WriteStringValue(MemberLongRange);
+				break;
 			case FieldType.Long:
-				writer.WriteStringValue("long");
-				return;
+				writer.WriteStringValue(MemberLong);
+				break;
 			case FieldType.Keyword:
-				writer.WriteStringValue("keyword");
-				return;
+				writer.WriteStringValue(MemberKeyword);
+				break;
 			case FieldType.Join:
-				writer.WriteStringValue("join");
-				return;
+				writer.WriteStringValue(MemberJoin);
+				break;
 			case FieldType.IpRange:
-				writer.WriteStringValue("ip_range");
-				return;
+				writer.WriteStringValue(MemberIpRange);
+				break;
 			case FieldType.Ip:
-				writer.WriteStringValue("ip");
-				return;
+				writer.WriteStringValue(MemberIp);
+				break;
 			case FieldType.IntegerRange:
-				writer.WriteStringValue("integer_range");
-				return;
+				writer.WriteStringValue(MemberIntegerRange);
+				break;
 			case FieldType.Integer:
-				writer.WriteStringValue("integer");
-				return;
+				writer.WriteStringValue(MemberInteger);
+				break;
 			case FieldType.IcuCollationKeyword:
-				writer.WriteStringValue("icu_collation_keyword");
-				return;
+				writer.WriteStringValue(MemberIcuCollationKeyword);
+				break;
 			case FieldType.Histogram:
-				writer.WriteStringValue("histogram");
-				return;
+				writer.WriteStringValue(MemberHistogram);
+				break;
 			case FieldType.HalfFloat:
-				writer.WriteStringValue("half_float");
-				return;
+				writer.WriteStringValue(MemberHalfFloat);
+				break;
 			case FieldType.GeoShape:
-				writer.WriteStringValue("geo_shape");
-				return;
+				writer.WriteStringValue(MemberGeoShape);
+				break;
 			case FieldType.GeoPoint:
-				writer.WriteStringValue("geo_point");
-				return;
+				writer.WriteStringValue(MemberGeoPoint);
+				break;
 			case FieldType.FloatRange:
-				writer.WriteStringValue("float_range");
-				return;
+				writer.WriteStringValue(MemberFloatRange);
+				break;
 			case FieldType.Float:
-				writer.WriteStringValue("float");
-				return;
+				writer.WriteStringValue(MemberFloat);
+				break;
 			case FieldType.Flattened:
-				writer.WriteStringValue("flattened");
-				return;
+				writer.WriteStringValue(MemberFlattened);
+				break;
 			case FieldType.DoubleRange:
-				writer.WriteStringValue("double_range");
-				return;
+				writer.WriteStringValue(MemberDoubleRange);
+				break;
 			case FieldType.Double:
-				writer.WriteStringValue("double");
-				return;
+				writer.WriteStringValue(MemberDouble);
+				break;
 			case FieldType.DenseVector:
-				writer.WriteStringValue("dense_vector");
-				return;
+				writer.WriteStringValue(MemberDenseVector);
+				break;
 			case FieldType.DateRange:
-				writer.WriteStringValue("date_range");
-				return;
+				writer.WriteStringValue(MemberDateRange);
+				break;
 			case FieldType.DateNanos:
-				writer.WriteStringValue("date_nanos");
-				return;
+				writer.WriteStringValue(MemberDateNanos);
+				break;
 			case FieldType.Date:
-				writer.WriteStringValue("date");
-				return;
+				writer.WriteStringValue(MemberDate);
+				break;
 			case FieldType.ConstantKeyword:
-				writer.WriteStringValue("constant_keyword");
-				return;
+				writer.WriteStringValue(MemberConstantKeyword);
+				break;
 			case FieldType.Completion:
-				writer.WriteStringValue("completion");
-				return;
+				writer.WriteStringValue(MemberCompletion);
+				break;
 			case FieldType.Byte:
-				writer.WriteStringValue("byte");
-				return;
+				writer.WriteStringValue(MemberByte);
+				break;
 			case FieldType.Boolean:
-				writer.WriteStringValue("boolean");
-				return;
+				writer.WriteStringValue(MemberBoolean);
+				break;
 			case FieldType.Binary:
-				writer.WriteStringValue("binary");
-				return;
+				writer.WriteStringValue(MemberBinary);
+				break;
 			case FieldType.Alias:
-				writer.WriteStringValue("alias");
-				return;
+				writer.WriteStringValue(MemberAlias);
+				break;
 			case FieldType.AggregateMetricDouble:
-				writer.WriteStringValue("aggregate_metric_double");
-				return;
+				writer.WriteStringValue(MemberAggregateMetricDouble);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(FieldType)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -742,42 +979,46 @@ public enum GeoOrientation
 	Left
 }
 
-internal sealed class GeoOrientationConverter : JsonConverter<GeoOrientation>
+internal sealed partial class GeoOrientationConverter : System.Text.Json.Serialization.JsonConverter<GeoOrientation>
 {
-	public override GeoOrientation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberRight = System.Text.Json.JsonEncodedText.Encode("right");
+	private static readonly System.Text.Json.JsonEncodedText MemberRight1 = System.Text.Json.JsonEncodedText.Encode("RIGHT");
+	private static readonly System.Text.Json.JsonEncodedText MemberRight2 = System.Text.Json.JsonEncodedText.Encode("counterclockwise");
+	private static readonly System.Text.Json.JsonEncodedText MemberRight3 = System.Text.Json.JsonEncodedText.Encode("ccw");
+	private static readonly System.Text.Json.JsonEncodedText MemberLeft = System.Text.Json.JsonEncodedText.Encode("left");
+	private static readonly System.Text.Json.JsonEncodedText MemberLeft1 = System.Text.Json.JsonEncodedText.Encode("LEFT");
+	private static readonly System.Text.Json.JsonEncodedText MemberLeft2 = System.Text.Json.JsonEncodedText.Encode("clockwise");
+	private static readonly System.Text.Json.JsonEncodedText MemberLeft3 = System.Text.Json.JsonEncodedText.Encode("cw");
+
+	public override GeoOrientation Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "right":
-			case "RIGHT":
-			case "counterclockwise":
-			case "ccw":
-				return GeoOrientation.Right;
-			case "left":
-			case "LEFT":
-			case "clockwise":
-			case "cw":
-				return GeoOrientation.Left;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberRight) || reader.ValueTextEquals(MemberRight1) || reader.ValueTextEquals(MemberRight2) || reader.ValueTextEquals(MemberRight3))
+		{
+			return GeoOrientation.Right;
+		}
+
+		if (reader.ValueTextEquals(MemberLeft) || reader.ValueTextEquals(MemberLeft1) || reader.ValueTextEquals(MemberLeft2) || reader.ValueTextEquals(MemberLeft3))
+		{
+			return GeoOrientation.Left;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(GeoOrientation)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, GeoOrientation value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GeoOrientation value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case GeoOrientation.Right:
-				writer.WriteStringValue("right");
-				return;
+				writer.WriteStringValue(MemberRight);
+				break;
 			case GeoOrientation.Left:
-				writer.WriteStringValue("left");
-				return;
+				writer.WriteStringValue(MemberLeft);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(GeoOrientation)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -790,36 +1031,40 @@ public enum GeoStrategy
 	Recursive
 }
 
-internal sealed class GeoStrategyConverter : JsonConverter<GeoStrategy>
+internal sealed partial class GeoStrategyConverter : System.Text.Json.Serialization.JsonConverter<GeoStrategy>
 {
-	public override GeoStrategy Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberTerm = System.Text.Json.JsonEncodedText.Encode("term");
+	private static readonly System.Text.Json.JsonEncodedText MemberRecursive = System.Text.Json.JsonEncodedText.Encode("recursive");
+
+	public override GeoStrategy Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberTerm))
 		{
-			case "term":
-				return GeoStrategy.Term;
-			case "recursive":
-				return GeoStrategy.Recursive;
+			return GeoStrategy.Term;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberRecursive))
+		{
+			return GeoStrategy.Recursive;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(GeoStrategy)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, GeoStrategy value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GeoStrategy value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case GeoStrategy.Term:
-				writer.WriteStringValue("term");
-				return;
+				writer.WriteStringValue(MemberTerm);
+				break;
 			case GeoStrategy.Recursive:
-				writer.WriteStringValue("recursive");
-				return;
+				writer.WriteStringValue(MemberRecursive);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(GeoStrategy)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -836,46 +1081,58 @@ public enum IndexOptions
 	Docs
 }
 
-internal sealed class IndexOptionsConverter : JsonConverter<IndexOptions>
+internal sealed partial class IndexOptionsConverter : System.Text.Json.Serialization.JsonConverter<IndexOptions>
 {
-	public override IndexOptions Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberPositions = System.Text.Json.JsonEncodedText.Encode("positions");
+	private static readonly System.Text.Json.JsonEncodedText MemberOffsets = System.Text.Json.JsonEncodedText.Encode("offsets");
+	private static readonly System.Text.Json.JsonEncodedText MemberFreqs = System.Text.Json.JsonEncodedText.Encode("freqs");
+	private static readonly System.Text.Json.JsonEncodedText MemberDocs = System.Text.Json.JsonEncodedText.Encode("docs");
+
+	public override IndexOptions Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberPositions))
+		{
+			return IndexOptions.Positions;
+		}
+
+		if (reader.ValueTextEquals(MemberOffsets))
 		{
-			case "positions":
-				return IndexOptions.Positions;
-			case "offsets":
-				return IndexOptions.Offsets;
-			case "freqs":
-				return IndexOptions.Freqs;
-			case "docs":
-				return IndexOptions.Docs;
+			return IndexOptions.Offsets;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberFreqs))
+		{
+			return IndexOptions.Freqs;
+		}
+
+		if (reader.ValueTextEquals(MemberDocs))
+		{
+			return IndexOptions.Docs;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(IndexOptions)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, IndexOptions value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IndexOptions value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case IndexOptions.Positions:
-				writer.WriteStringValue("positions");
-				return;
+				writer.WriteStringValue(MemberPositions);
+				break;
 			case IndexOptions.Offsets:
-				writer.WriteStringValue("offsets");
-				return;
+				writer.WriteStringValue(MemberOffsets);
+				break;
 			case IndexOptions.Freqs:
-				writer.WriteStringValue("freqs");
-				return;
+				writer.WriteStringValue(MemberFreqs);
+				break;
 			case IndexOptions.Docs:
-				writer.WriteStringValue("docs");
-				return;
+				writer.WriteStringValue(MemberDocs);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(IndexOptions)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -888,36 +1145,40 @@ public enum MatchType
 	Regex
 }
 
-internal sealed class MatchTypeConverter : JsonConverter<MatchType>
+internal sealed partial class MatchTypeConverter : System.Text.Json.Serialization.JsonConverter<MatchType>
 {
-	public override MatchType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberSimple = System.Text.Json.JsonEncodedText.Encode("simple");
+	private static readonly System.Text.Json.JsonEncodedText MemberRegex = System.Text.Json.JsonEncodedText.Encode("regex");
+
+	public override MatchType Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberSimple))
+		{
+			return MatchType.Simple;
+		}
+
+		if (reader.ValueTextEquals(MemberRegex))
 		{
-			case "simple":
-				return MatchType.Simple;
-			case "regex":
-				return MatchType.Regex;
+			return MatchType.Regex;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(MatchType)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, MatchType value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, MatchType value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case MatchType.Simple:
-				writer.WriteStringValue("simple");
-				return;
+				writer.WriteStringValue(MemberSimple);
+				break;
 			case MatchType.Regex:
-				writer.WriteStringValue("regex");
-				return;
+				writer.WriteStringValue(MemberRegex);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(MatchType)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -930,36 +1191,40 @@ public enum OnScriptError
 	Continue
 }
 
-internal sealed class OnScriptErrorConverter : JsonConverter<OnScriptError>
+internal sealed partial class OnScriptErrorConverter : System.Text.Json.Serialization.JsonConverter<OnScriptError>
 {
-	public override OnScriptError Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberFail = System.Text.Json.JsonEncodedText.Encode("fail");
+	private static readonly System.Text.Json.JsonEncodedText MemberContinue = System.Text.Json.JsonEncodedText.Encode("continue");
+
+	public override OnScriptError Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberFail))
 		{
-			case "fail":
-				return OnScriptError.Fail;
-			case "continue":
-				return OnScriptError.Continue;
+			return OnScriptError.Fail;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberContinue))
+		{
+			return OnScriptError.Continue;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(OnScriptError)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, OnScriptError value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, OnScriptError value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case OnScriptError.Fail:
-				writer.WriteStringValue("fail");
-				return;
+				writer.WriteStringValue(MemberFail);
+				break;
 			case OnScriptError.Continue:
-				writer.WriteStringValue("continue");
-				return;
+				writer.WriteStringValue(MemberContinue);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(OnScriptError)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -986,71 +1251,103 @@ public enum RuntimeFieldType
 	Boolean
 }
 
-internal sealed class RuntimeFieldTypeConverter : JsonConverter<RuntimeFieldType>
+internal sealed partial class RuntimeFieldTypeConverter : System.Text.Json.Serialization.JsonConverter<RuntimeFieldType>
 {
-	public override RuntimeFieldType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberLookup = System.Text.Json.JsonEncodedText.Encode("lookup");
+	private static readonly System.Text.Json.JsonEncodedText MemberLong = System.Text.Json.JsonEncodedText.Encode("long");
+	private static readonly System.Text.Json.JsonEncodedText MemberKeyword = System.Text.Json.JsonEncodedText.Encode("keyword");
+	private static readonly System.Text.Json.JsonEncodedText MemberIp = System.Text.Json.JsonEncodedText.Encode("ip");
+	private static readonly System.Text.Json.JsonEncodedText MemberGeoPoint = System.Text.Json.JsonEncodedText.Encode("geo_point");
+	private static readonly System.Text.Json.JsonEncodedText MemberDouble = System.Text.Json.JsonEncodedText.Encode("double");
+	private static readonly System.Text.Json.JsonEncodedText MemberDate = System.Text.Json.JsonEncodedText.Encode("date");
+	private static readonly System.Text.Json.JsonEncodedText MemberComposite = System.Text.Json.JsonEncodedText.Encode("composite");
+	private static readonly System.Text.Json.JsonEncodedText MemberBoolean = System.Text.Json.JsonEncodedText.Encode("boolean");
+
+	public override RuntimeFieldType Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "lookup":
-				return RuntimeFieldType.Lookup;
-			case "long":
-				return RuntimeFieldType.Long;
-			case "keyword":
-				return RuntimeFieldType.Keyword;
-			case "ip":
-				return RuntimeFieldType.Ip;
-			case "geo_point":
-				return RuntimeFieldType.GeoPoint;
-			case "double":
-				return RuntimeFieldType.Double;
-			case "date":
-				return RuntimeFieldType.Date;
-			case "composite":
-				return RuntimeFieldType.Composite;
-			case "boolean":
-				return RuntimeFieldType.Boolean;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberLookup))
+		{
+			return RuntimeFieldType.Lookup;
+		}
+
+		if (reader.ValueTextEquals(MemberLong))
+		{
+			return RuntimeFieldType.Long;
+		}
+
+		if (reader.ValueTextEquals(MemberKeyword))
+		{
+			return RuntimeFieldType.Keyword;
+		}
+
+		if (reader.ValueTextEquals(MemberIp))
+		{
+			return RuntimeFieldType.Ip;
+		}
+
+		if (reader.ValueTextEquals(MemberGeoPoint))
+		{
+			return RuntimeFieldType.GeoPoint;
+		}
+
+		if (reader.ValueTextEquals(MemberDouble))
+		{
+			return RuntimeFieldType.Double;
+		}
+
+		if (reader.ValueTextEquals(MemberDate))
+		{
+			return RuntimeFieldType.Date;
+		}
+
+		if (reader.ValueTextEquals(MemberComposite))
+		{
+			return RuntimeFieldType.Composite;
+		}
+
+		if (reader.ValueTextEquals(MemberBoolean))
+		{
+			return RuntimeFieldType.Boolean;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(RuntimeFieldType)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, RuntimeFieldType value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, RuntimeFieldType value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case RuntimeFieldType.Lookup:
-				writer.WriteStringValue("lookup");
-				return;
+				writer.WriteStringValue(MemberLookup);
+				break;
 			case RuntimeFieldType.Long:
-				writer.WriteStringValue("long");
-				return;
+				writer.WriteStringValue(MemberLong);
+				break;
 			case RuntimeFieldType.Keyword:
-				writer.WriteStringValue("keyword");
-				return;
+				writer.WriteStringValue(MemberKeyword);
+				break;
 			case RuntimeFieldType.Ip:
-				writer.WriteStringValue("ip");
-				return;
+				writer.WriteStringValue(MemberIp);
+				break;
 			case RuntimeFieldType.GeoPoint:
-				writer.WriteStringValue("geo_point");
-				return;
+				writer.WriteStringValue(MemberGeoPoint);
+				break;
 			case RuntimeFieldType.Double:
-				writer.WriteStringValue("double");
-				return;
+				writer.WriteStringValue(MemberDouble);
+				break;
 			case RuntimeFieldType.Date:
-				writer.WriteStringValue("date");
-				return;
+				writer.WriteStringValue(MemberDate);
+				break;
 			case RuntimeFieldType.Composite:
-				writer.WriteStringValue("composite");
-				return;
+				writer.WriteStringValue(MemberComposite);
+				break;
 			case RuntimeFieldType.Boolean:
-				writer.WriteStringValue("boolean");
-				return;
+				writer.WriteStringValue(MemberBoolean);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(RuntimeFieldType)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -1071,41 +1368,49 @@ public enum SourceFieldMode
 	Disabled
 }
 
-internal sealed class SourceFieldModeConverter : JsonConverter<SourceFieldMode>
+internal sealed partial class SourceFieldModeConverter : System.Text.Json.Serialization.JsonConverter<SourceFieldMode>
 {
-	public override SourceFieldMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberSynthetic = System.Text.Json.JsonEncodedText.Encode("synthetic");
+	private static readonly System.Text.Json.JsonEncodedText MemberStored = System.Text.Json.JsonEncodedText.Encode("stored");
+	private static readonly System.Text.Json.JsonEncodedText MemberDisabled = System.Text.Json.JsonEncodedText.Encode("disabled");
+
+	public override SourceFieldMode Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberSynthetic))
 		{
-			case "synthetic":
-				return SourceFieldMode.Synthetic;
-			case "stored":
-				return SourceFieldMode.Stored;
-			case "disabled":
-				return SourceFieldMode.Disabled;
+			return SourceFieldMode.Synthetic;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberStored))
+		{
+			return SourceFieldMode.Stored;
+		}
+
+		if (reader.ValueTextEquals(MemberDisabled))
+		{
+			return SourceFieldMode.Disabled;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(SourceFieldMode)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, SourceFieldMode value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SourceFieldMode value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case SourceFieldMode.Synthetic:
-				writer.WriteStringValue("synthetic");
-				return;
+				writer.WriteStringValue(MemberSynthetic);
+				break;
 			case SourceFieldMode.Stored:
-				writer.WriteStringValue("stored");
-				return;
+				writer.WriteStringValue(MemberStored);
+				break;
 			case SourceFieldMode.Disabled:
-				writer.WriteStringValue("disabled");
-				return;
+				writer.WriteStringValue(MemberDisabled);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(SourceFieldMode)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -1128,61 +1433,85 @@ public enum TermVectorOption
 	No
 }
 
-internal sealed class TermVectorOptionConverter : JsonConverter<TermVectorOption>
+internal sealed partial class TermVectorOptionConverter : System.Text.Json.Serialization.JsonConverter<TermVectorOption>
 {
-	public override TermVectorOption Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberYes = System.Text.Json.JsonEncodedText.Encode("yes");
+	private static readonly System.Text.Json.JsonEncodedText MemberWithPositionsPayloads = System.Text.Json.JsonEncodedText.Encode("with_positions_payloads");
+	private static readonly System.Text.Json.JsonEncodedText MemberWithPositionsOffsetsPayloads = System.Text.Json.JsonEncodedText.Encode("with_positions_offsets_payloads");
+	private static readonly System.Text.Json.JsonEncodedText MemberWithPositionsOffsets = System.Text.Json.JsonEncodedText.Encode("with_positions_offsets");
+	private static readonly System.Text.Json.JsonEncodedText MemberWithPositions = System.Text.Json.JsonEncodedText.Encode("with_positions");
+	private static readonly System.Text.Json.JsonEncodedText MemberWithOffsets = System.Text.Json.JsonEncodedText.Encode("with_offsets");
+	private static readonly System.Text.Json.JsonEncodedText MemberNo = System.Text.Json.JsonEncodedText.Encode("no");
+
+	public override TermVectorOption Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "yes":
-				return TermVectorOption.Yes;
-			case "with_positions_payloads":
-				return TermVectorOption.WithPositionsPayloads;
-			case "with_positions_offsets_payloads":
-				return TermVectorOption.WithPositionsOffsetsPayloads;
-			case "with_positions_offsets":
-				return TermVectorOption.WithPositionsOffsets;
-			case "with_positions":
-				return TermVectorOption.WithPositions;
-			case "with_offsets":
-				return TermVectorOption.WithOffsets;
-			case "no":
-				return TermVectorOption.No;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberYes))
+		{
+			return TermVectorOption.Yes;
+		}
+
+		if (reader.ValueTextEquals(MemberWithPositionsPayloads))
+		{
+			return TermVectorOption.WithPositionsPayloads;
+		}
+
+		if (reader.ValueTextEquals(MemberWithPositionsOffsetsPayloads))
+		{
+			return TermVectorOption.WithPositionsOffsetsPayloads;
+		}
+
+		if (reader.ValueTextEquals(MemberWithPositionsOffsets))
+		{
+			return TermVectorOption.WithPositionsOffsets;
+		}
+
+		if (reader.ValueTextEquals(MemberWithPositions))
+		{
+			return TermVectorOption.WithPositions;
+		}
+
+		if (reader.ValueTextEquals(MemberWithOffsets))
+		{
+			return TermVectorOption.WithOffsets;
+		}
+
+		if (reader.ValueTextEquals(MemberNo))
+		{
+			return TermVectorOption.No;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(TermVectorOption)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, TermVectorOption value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, TermVectorOption value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case TermVectorOption.Yes:
-				writer.WriteStringValue("yes");
-				return;
+				writer.WriteStringValue(MemberYes);
+				break;
 			case TermVectorOption.WithPositionsPayloads:
-				writer.WriteStringValue("with_positions_payloads");
-				return;
+				writer.WriteStringValue(MemberWithPositionsPayloads);
+				break;
 			case TermVectorOption.WithPositionsOffsetsPayloads:
-				writer.WriteStringValue("with_positions_offsets_payloads");
-				return;
+				writer.WriteStringValue(MemberWithPositionsOffsetsPayloads);
+				break;
 			case TermVectorOption.WithPositionsOffsets:
-				writer.WriteStringValue("with_positions_offsets");
-				return;
+				writer.WriteStringValue(MemberWithPositionsOffsets);
+				break;
 			case TermVectorOption.WithPositions:
-				writer.WriteStringValue("with_positions");
-				return;
+				writer.WriteStringValue(MemberWithPositions);
+				break;
 			case TermVectorOption.WithOffsets:
-				writer.WriteStringValue("with_offsets");
-				return;
+				writer.WriteStringValue(MemberWithOffsets);
+				break;
 			case TermVectorOption.No:
-				writer.WriteStringValue("no");
-				return;
+				writer.WriteStringValue(MemberNo);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(TermVectorOption)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -1201,50 +1530,66 @@ public enum TimeSeriesMetricType
 	Counter
 }
 
-internal sealed class TimeSeriesMetricTypeConverter : JsonConverter<TimeSeriesMetricType>
+internal sealed partial class TimeSeriesMetricTypeConverter : System.Text.Json.Serialization.JsonConverter<TimeSeriesMetricType>
 {
-	public override TimeSeriesMetricType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberSummary = System.Text.Json.JsonEncodedText.Encode("summary");
+	private static readonly System.Text.Json.JsonEncodedText MemberPosition = System.Text.Json.JsonEncodedText.Encode("position");
+	private static readonly System.Text.Json.JsonEncodedText MemberHistogram = System.Text.Json.JsonEncodedText.Encode("histogram");
+	private static readonly System.Text.Json.JsonEncodedText MemberGauge = System.Text.Json.JsonEncodedText.Encode("gauge");
+	private static readonly System.Text.Json.JsonEncodedText MemberCounter = System.Text.Json.JsonEncodedText.Encode("counter");
+
+	public override TimeSeriesMetricType Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "summary":
-				return TimeSeriesMetricType.Summary;
-			case "position":
-				return TimeSeriesMetricType.Position;
-			case "histogram":
-				return TimeSeriesMetricType.Histogram;
-			case "gauge":
-				return TimeSeriesMetricType.Gauge;
-			case "counter":
-				return TimeSeriesMetricType.Counter;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberSummary))
+		{
+			return TimeSeriesMetricType.Summary;
+		}
+
+		if (reader.ValueTextEquals(MemberPosition))
+		{
+			return TimeSeriesMetricType.Position;
+		}
+
+		if (reader.ValueTextEquals(MemberHistogram))
+		{
+			return TimeSeriesMetricType.Histogram;
+		}
+
+		if (reader.ValueTextEquals(MemberGauge))
+		{
+			return TimeSeriesMetricType.Gauge;
+		}
+
+		if (reader.ValueTextEquals(MemberCounter))
+		{
+			return TimeSeriesMetricType.Counter;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(TimeSeriesMetricType)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, TimeSeriesMetricType value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, TimeSeriesMetricType value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case TimeSeriesMetricType.Summary:
-				writer.WriteStringValue("summary");
-				return;
+				writer.WriteStringValue(MemberSummary);
+				break;
 			case TimeSeriesMetricType.Position:
-				writer.WriteStringValue("position");
-				return;
+				writer.WriteStringValue(MemberPosition);
+				break;
 			case TimeSeriesMetricType.Histogram:
-				writer.WriteStringValue("histogram");
-				return;
+				writer.WriteStringValue(MemberHistogram);
+				break;
 			case TimeSeriesMetricType.Gauge:
-				writer.WriteStringValue("gauge");
-				return;
+				writer.WriteStringValue(MemberGauge);
+				break;
 			case TimeSeriesMetricType.Counter:
-				writer.WriteStringValue("counter");
-				return;
+				writer.WriteStringValue(MemberCounter);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(TimeSeriesMetricType)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.NoNamespace.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.NoNamespace.g.cs
index d44b52c36e8..532bae42b35 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.NoNamespace.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.NoNamespace.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Core;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport;
 using System;
@@ -43,51 +44,67 @@ public enum ClusterInfoTarget
 	All
 }
 
-internal sealed class ClusterInfoTargetConverter : JsonConverter<ClusterInfoTarget>
+internal sealed partial class ClusterInfoTargetConverter : System.Text.Json.Serialization.JsonConverter<ClusterInfoTarget>
 {
-	public override ClusterInfoTarget Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberThreadPool = System.Text.Json.JsonEncodedText.Encode("thread_pool");
+	private static readonly System.Text.Json.JsonEncodedText MemberScript = System.Text.Json.JsonEncodedText.Encode("script");
+	private static readonly System.Text.Json.JsonEncodedText MemberIngest = System.Text.Json.JsonEncodedText.Encode("ingest");
+	private static readonly System.Text.Json.JsonEncodedText MemberHttp = System.Text.Json.JsonEncodedText.Encode("http");
+	private static readonly System.Text.Json.JsonEncodedText MemberAll = System.Text.Json.JsonEncodedText.Encode("_all");
+
+	public override ClusterInfoTarget Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "thread_pool":
-				return ClusterInfoTarget.ThreadPool;
-			case "script":
-				return ClusterInfoTarget.Script;
-			case "ingest":
-				return ClusterInfoTarget.Ingest;
-			case "http":
-				return ClusterInfoTarget.Http;
-			case "_all":
-				return ClusterInfoTarget.All;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberThreadPool))
+		{
+			return ClusterInfoTarget.ThreadPool;
+		}
+
+		if (reader.ValueTextEquals(MemberScript))
+		{
+			return ClusterInfoTarget.Script;
+		}
+
+		if (reader.ValueTextEquals(MemberIngest))
+		{
+			return ClusterInfoTarget.Ingest;
+		}
+
+		if (reader.ValueTextEquals(MemberHttp))
+		{
+			return ClusterInfoTarget.Http;
+		}
+
+		if (reader.ValueTextEquals(MemberAll))
+		{
+			return ClusterInfoTarget.All;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(ClusterInfoTarget)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, ClusterInfoTarget value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ClusterInfoTarget value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case ClusterInfoTarget.ThreadPool:
-				writer.WriteStringValue("thread_pool");
-				return;
+				writer.WriteStringValue(MemberThreadPool);
+				break;
 			case ClusterInfoTarget.Script:
-				writer.WriteStringValue("script");
-				return;
+				writer.WriteStringValue(MemberScript);
+				break;
 			case ClusterInfoTarget.Ingest:
-				writer.WriteStringValue("ingest");
-				return;
+				writer.WriteStringValue(MemberIngest);
+				break;
 			case ClusterInfoTarget.Http:
-				writer.WriteStringValue("http");
-				return;
+				writer.WriteStringValue(MemberHttp);
+				break;
 			case ClusterInfoTarget.All:
-				writer.WriteStringValue("_all");
-				return;
+				writer.WriteStringValue(MemberAll);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(ClusterInfoTarget)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -106,51 +123,67 @@ public enum ClusterSearchStatus
 	Failed
 }
 
-internal sealed class ClusterSearchStatusConverter : JsonConverter<ClusterSearchStatus>
+internal sealed partial class ClusterSearchStatusConverter : System.Text.Json.Serialization.JsonConverter<ClusterSearchStatus>
 {
-	public override ClusterSearchStatus Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberSuccessful = System.Text.Json.JsonEncodedText.Encode("successful");
+	private static readonly System.Text.Json.JsonEncodedText MemberSkipped = System.Text.Json.JsonEncodedText.Encode("skipped");
+	private static readonly System.Text.Json.JsonEncodedText MemberRunning = System.Text.Json.JsonEncodedText.Encode("running");
+	private static readonly System.Text.Json.JsonEncodedText MemberPartial = System.Text.Json.JsonEncodedText.Encode("partial");
+	private static readonly System.Text.Json.JsonEncodedText MemberFailed = System.Text.Json.JsonEncodedText.Encode("failed");
+
+	public override ClusterSearchStatus Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "successful":
-				return ClusterSearchStatus.Successful;
-			case "skipped":
-				return ClusterSearchStatus.Skipped;
-			case "running":
-				return ClusterSearchStatus.Running;
-			case "partial":
-				return ClusterSearchStatus.Partial;
-			case "failed":
-				return ClusterSearchStatus.Failed;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberSuccessful))
+		{
+			return ClusterSearchStatus.Successful;
+		}
+
+		if (reader.ValueTextEquals(MemberSkipped))
+		{
+			return ClusterSearchStatus.Skipped;
+		}
+
+		if (reader.ValueTextEquals(MemberRunning))
+		{
+			return ClusterSearchStatus.Running;
+		}
+
+		if (reader.ValueTextEquals(MemberPartial))
+		{
+			return ClusterSearchStatus.Partial;
+		}
+
+		if (reader.ValueTextEquals(MemberFailed))
+		{
+			return ClusterSearchStatus.Failed;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(ClusterSearchStatus)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, ClusterSearchStatus value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ClusterSearchStatus value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case ClusterSearchStatus.Successful:
-				writer.WriteStringValue("successful");
-				return;
+				writer.WriteStringValue(MemberSuccessful);
+				break;
 			case ClusterSearchStatus.Skipped:
-				writer.WriteStringValue("skipped");
-				return;
+				writer.WriteStringValue(MemberSkipped);
+				break;
 			case ClusterSearchStatus.Running:
-				writer.WriteStringValue("running");
-				return;
+				writer.WriteStringValue(MemberRunning);
+				break;
 			case ClusterSearchStatus.Partial:
-				writer.WriteStringValue("partial");
-				return;
+				writer.WriteStringValue(MemberPartial);
+				break;
 			case ClusterSearchStatus.Failed:
-				writer.WriteStringValue("failed");
-				return;
+				writer.WriteStringValue(MemberFailed);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(ClusterSearchStatus)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -173,36 +206,40 @@ public enum Conflicts
 	Abort
 }
 
-internal sealed class ConflictsConverter : JsonConverter<Conflicts>
+internal sealed partial class ConflictsConverter : System.Text.Json.Serialization.JsonConverter<Conflicts>
 {
-	public override Conflicts Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberProceed = System.Text.Json.JsonEncodedText.Encode("proceed");
+	private static readonly System.Text.Json.JsonEncodedText MemberAbort = System.Text.Json.JsonEncodedText.Encode("abort");
+
+	public override Conflicts Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberProceed))
+		{
+			return Conflicts.Proceed;
+		}
+
+		if (reader.ValueTextEquals(MemberAbort))
 		{
-			case "proceed":
-				return Conflicts.Proceed;
-			case "abort":
-				return Conflicts.Abort;
+			return Conflicts.Abort;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(Conflicts)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, Conflicts value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, Conflicts value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case Conflicts.Proceed:
-				writer.WriteStringValue("proceed");
-				return;
+				writer.WriteStringValue(MemberProceed);
+				break;
 			case Conflicts.Abort:
-				writer.WriteStringValue("abort");
-				return;
+				writer.WriteStringValue(MemberAbort);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(Conflicts)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -217,41 +254,49 @@ public enum DFIIndependenceMeasure
 	Chisquared
 }
 
-internal sealed class DFIIndependenceMeasureConverter : JsonConverter<DFIIndependenceMeasure>
+internal sealed partial class DFIIndependenceMeasureConverter : System.Text.Json.Serialization.JsonConverter<DFIIndependenceMeasure>
 {
-	public override DFIIndependenceMeasure Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberStandardized = System.Text.Json.JsonEncodedText.Encode("standardized");
+	private static readonly System.Text.Json.JsonEncodedText MemberSaturated = System.Text.Json.JsonEncodedText.Encode("saturated");
+	private static readonly System.Text.Json.JsonEncodedText MemberChisquared = System.Text.Json.JsonEncodedText.Encode("chisquared");
+
+	public override DFIIndependenceMeasure Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberStandardized))
+		{
+			return DFIIndependenceMeasure.Standardized;
+		}
+
+		if (reader.ValueTextEquals(MemberSaturated))
+		{
+			return DFIIndependenceMeasure.Saturated;
+		}
+
+		if (reader.ValueTextEquals(MemberChisquared))
 		{
-			case "standardized":
-				return DFIIndependenceMeasure.Standardized;
-			case "saturated":
-				return DFIIndependenceMeasure.Saturated;
-			case "chisquared":
-				return DFIIndependenceMeasure.Chisquared;
+			return DFIIndependenceMeasure.Chisquared;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(DFIIndependenceMeasure)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, DFIIndependenceMeasure value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DFIIndependenceMeasure value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case DFIIndependenceMeasure.Standardized:
-				writer.WriteStringValue("standardized");
-				return;
+				writer.WriteStringValue(MemberStandardized);
+				break;
 			case DFIIndependenceMeasure.Saturated:
-				writer.WriteStringValue("saturated");
-				return;
+				writer.WriteStringValue(MemberSaturated);
+				break;
 			case DFIIndependenceMeasure.Chisquared:
-				writer.WriteStringValue("chisquared");
-				return;
+				writer.WriteStringValue(MemberChisquared);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(DFIIndependenceMeasure)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -266,41 +311,49 @@ public enum DFRAfterEffect
 	b
 }
 
-internal sealed class DFRAfterEffectConverter : JsonConverter<DFRAfterEffect>
+internal sealed partial class DFRAfterEffectConverter : System.Text.Json.Serialization.JsonConverter<DFRAfterEffect>
 {
-	public override DFRAfterEffect Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberNo = System.Text.Json.JsonEncodedText.Encode("no");
+	private static readonly System.Text.Json.JsonEncodedText Memberl = System.Text.Json.JsonEncodedText.Encode("l");
+	private static readonly System.Text.Json.JsonEncodedText Memberb = System.Text.Json.JsonEncodedText.Encode("b");
+
+	public override DFRAfterEffect Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberNo))
 		{
-			case "no":
-				return DFRAfterEffect.No;
-			case "l":
-				return DFRAfterEffect.l;
-			case "b":
-				return DFRAfterEffect.b;
+			return DFRAfterEffect.No;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(Memberl))
+		{
+			return DFRAfterEffect.l;
+		}
+
+		if (reader.ValueTextEquals(Memberb))
+		{
+			return DFRAfterEffect.b;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(DFRAfterEffect)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, DFRAfterEffect value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DFRAfterEffect value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case DFRAfterEffect.No:
-				writer.WriteStringValue("no");
-				return;
+				writer.WriteStringValue(MemberNo);
+				break;
 			case DFRAfterEffect.l:
-				writer.WriteStringValue("l");
-				return;
+				writer.WriteStringValue(Memberl);
+				break;
 			case DFRAfterEffect.b:
-				writer.WriteStringValue("b");
-				return;
+				writer.WriteStringValue(Memberb);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(DFRAfterEffect)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -323,61 +376,85 @@ public enum DFRBasicModel
 	Be
 }
 
-internal sealed class DFRBasicModelConverter : JsonConverter<DFRBasicModel>
+internal sealed partial class DFRBasicModelConverter : System.Text.Json.Serialization.JsonConverter<DFRBasicModel>
 {
-	public override DFRBasicModel Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText Memberp = System.Text.Json.JsonEncodedText.Encode("p");
+	private static readonly System.Text.Json.JsonEncodedText MemberIne = System.Text.Json.JsonEncodedText.Encode("ine");
+	private static readonly System.Text.Json.JsonEncodedText MemberIn = System.Text.Json.JsonEncodedText.Encode("in");
+	private static readonly System.Text.Json.JsonEncodedText MemberIf = System.Text.Json.JsonEncodedText.Encode("if");
+	private static readonly System.Text.Json.JsonEncodedText Memberg = System.Text.Json.JsonEncodedText.Encode("g");
+	private static readonly System.Text.Json.JsonEncodedText Memberd = System.Text.Json.JsonEncodedText.Encode("d");
+	private static readonly System.Text.Json.JsonEncodedText MemberBe = System.Text.Json.JsonEncodedText.Encode("be");
+
+	public override DFRBasicModel Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "p":
-				return DFRBasicModel.p;
-			case "ine":
-				return DFRBasicModel.Ine;
-			case "in":
-				return DFRBasicModel.In;
-			case "if":
-				return DFRBasicModel.If;
-			case "g":
-				return DFRBasicModel.g;
-			case "d":
-				return DFRBasicModel.d;
-			case "be":
-				return DFRBasicModel.Be;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(Memberp))
+		{
+			return DFRBasicModel.p;
+		}
+
+		if (reader.ValueTextEquals(MemberIne))
+		{
+			return DFRBasicModel.Ine;
+		}
+
+		if (reader.ValueTextEquals(MemberIn))
+		{
+			return DFRBasicModel.In;
+		}
+
+		if (reader.ValueTextEquals(MemberIf))
+		{
+			return DFRBasicModel.If;
+		}
+
+		if (reader.ValueTextEquals(Memberg))
+		{
+			return DFRBasicModel.g;
+		}
+
+		if (reader.ValueTextEquals(Memberd))
+		{
+			return DFRBasicModel.d;
+		}
+
+		if (reader.ValueTextEquals(MemberBe))
+		{
+			return DFRBasicModel.Be;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(DFRBasicModel)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, DFRBasicModel value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DFRBasicModel value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case DFRBasicModel.p:
-				writer.WriteStringValue("p");
-				return;
+				writer.WriteStringValue(Memberp);
+				break;
 			case DFRBasicModel.Ine:
-				writer.WriteStringValue("ine");
-				return;
+				writer.WriteStringValue(MemberIne);
+				break;
 			case DFRBasicModel.In:
-				writer.WriteStringValue("in");
-				return;
+				writer.WriteStringValue(MemberIn);
+				break;
 			case DFRBasicModel.If:
-				writer.WriteStringValue("if");
-				return;
+				writer.WriteStringValue(MemberIf);
+				break;
 			case DFRBasicModel.g:
-				writer.WriteStringValue("g");
-				return;
+				writer.WriteStringValue(Memberg);
+				break;
 			case DFRBasicModel.d:
-				writer.WriteStringValue("d");
-				return;
+				writer.WriteStringValue(Memberd);
+				break;
 			case DFRBasicModel.Be:
-				writer.WriteStringValue("be");
-				return;
+				writer.WriteStringValue(MemberBe);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(DFRBasicModel)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -404,71 +481,103 @@ public enum DistanceUnit
 	Centimeters
 }
 
-internal sealed class DistanceUnitConverter : JsonConverter<DistanceUnit>
+internal sealed partial class DistanceUnitConverter : System.Text.Json.Serialization.JsonConverter<DistanceUnit>
 {
-	public override DistanceUnit Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberYards = System.Text.Json.JsonEncodedText.Encode("yd");
+	private static readonly System.Text.Json.JsonEncodedText MemberNauticMiles = System.Text.Json.JsonEncodedText.Encode("nmi");
+	private static readonly System.Text.Json.JsonEncodedText MemberMillimeters = System.Text.Json.JsonEncodedText.Encode("mm");
+	private static readonly System.Text.Json.JsonEncodedText MemberMiles = System.Text.Json.JsonEncodedText.Encode("mi");
+	private static readonly System.Text.Json.JsonEncodedText MemberMeters = System.Text.Json.JsonEncodedText.Encode("m");
+	private static readonly System.Text.Json.JsonEncodedText MemberKilometers = System.Text.Json.JsonEncodedText.Encode("km");
+	private static readonly System.Text.Json.JsonEncodedText MemberInches = System.Text.Json.JsonEncodedText.Encode("in");
+	private static readonly System.Text.Json.JsonEncodedText MemberFeet = System.Text.Json.JsonEncodedText.Encode("ft");
+	private static readonly System.Text.Json.JsonEncodedText MemberCentimeters = System.Text.Json.JsonEncodedText.Encode("cm");
+
+	public override DistanceUnit Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "yd":
-				return DistanceUnit.Yards;
-			case "nmi":
-				return DistanceUnit.NauticMiles;
-			case "mm":
-				return DistanceUnit.Millimeters;
-			case "mi":
-				return DistanceUnit.Miles;
-			case "m":
-				return DistanceUnit.Meters;
-			case "km":
-				return DistanceUnit.Kilometers;
-			case "in":
-				return DistanceUnit.Inches;
-			case "ft":
-				return DistanceUnit.Feet;
-			case "cm":
-				return DistanceUnit.Centimeters;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberYards))
+		{
+			return DistanceUnit.Yards;
+		}
+
+		if (reader.ValueTextEquals(MemberNauticMiles))
+		{
+			return DistanceUnit.NauticMiles;
+		}
+
+		if (reader.ValueTextEquals(MemberMillimeters))
+		{
+			return DistanceUnit.Millimeters;
+		}
+
+		if (reader.ValueTextEquals(MemberMiles))
+		{
+			return DistanceUnit.Miles;
+		}
+
+		if (reader.ValueTextEquals(MemberMeters))
+		{
+			return DistanceUnit.Meters;
+		}
+
+		if (reader.ValueTextEquals(MemberKilometers))
+		{
+			return DistanceUnit.Kilometers;
+		}
+
+		if (reader.ValueTextEquals(MemberInches))
+		{
+			return DistanceUnit.Inches;
+		}
+
+		if (reader.ValueTextEquals(MemberFeet))
+		{
+			return DistanceUnit.Feet;
+		}
+
+		if (reader.ValueTextEquals(MemberCentimeters))
+		{
+			return DistanceUnit.Centimeters;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(DistanceUnit)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, DistanceUnit value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DistanceUnit value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case DistanceUnit.Yards:
-				writer.WriteStringValue("yd");
-				return;
+				writer.WriteStringValue(MemberYards);
+				break;
 			case DistanceUnit.NauticMiles:
-				writer.WriteStringValue("nmi");
-				return;
+				writer.WriteStringValue(MemberNauticMiles);
+				break;
 			case DistanceUnit.Millimeters:
-				writer.WriteStringValue("mm");
-				return;
+				writer.WriteStringValue(MemberMillimeters);
+				break;
 			case DistanceUnit.Miles:
-				writer.WriteStringValue("mi");
-				return;
+				writer.WriteStringValue(MemberMiles);
+				break;
 			case DistanceUnit.Meters:
-				writer.WriteStringValue("m");
-				return;
+				writer.WriteStringValue(MemberMeters);
+				break;
 			case DistanceUnit.Kilometers:
-				writer.WriteStringValue("km");
-				return;
+				writer.WriteStringValue(MemberKilometers);
+				break;
 			case DistanceUnit.Inches:
-				writer.WriteStringValue("in");
-				return;
+				writer.WriteStringValue(MemberInches);
+				break;
 			case DistanceUnit.Feet:
-				writer.WriteStringValue("ft");
-				return;
+				writer.WriteStringValue(MemberFeet);
+				break;
 			case DistanceUnit.Centimeters:
-				writer.WriteStringValue("cm");
-				return;
+				writer.WriteStringValue(MemberCentimeters);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(DistanceUnit)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -512,51 +621,67 @@ public enum ExpandWildcard
 	All
 }
 
-internal sealed class ExpandWildcardConverter : JsonConverter<ExpandWildcard>
+internal sealed partial class ExpandWildcardConverter : System.Text.Json.Serialization.JsonConverter<ExpandWildcard>
 {
-	public override ExpandWildcard Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberOpen = System.Text.Json.JsonEncodedText.Encode("open");
+	private static readonly System.Text.Json.JsonEncodedText MemberNone = System.Text.Json.JsonEncodedText.Encode("none");
+	private static readonly System.Text.Json.JsonEncodedText MemberHidden = System.Text.Json.JsonEncodedText.Encode("hidden");
+	private static readonly System.Text.Json.JsonEncodedText MemberClosed = System.Text.Json.JsonEncodedText.Encode("closed");
+	private static readonly System.Text.Json.JsonEncodedText MemberAll = System.Text.Json.JsonEncodedText.Encode("all");
+
+	public override ExpandWildcard Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "open":
-				return ExpandWildcard.Open;
-			case "none":
-				return ExpandWildcard.None;
-			case "hidden":
-				return ExpandWildcard.Hidden;
-			case "closed":
-				return ExpandWildcard.Closed;
-			case "all":
-				return ExpandWildcard.All;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberOpen))
+		{
+			return ExpandWildcard.Open;
+		}
+
+		if (reader.ValueTextEquals(MemberNone))
+		{
+			return ExpandWildcard.None;
+		}
+
+		if (reader.ValueTextEquals(MemberHidden))
+		{
+			return ExpandWildcard.Hidden;
+		}
+
+		if (reader.ValueTextEquals(MemberClosed))
+		{
+			return ExpandWildcard.Closed;
+		}
+
+		if (reader.ValueTextEquals(MemberAll))
+		{
+			return ExpandWildcard.All;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(ExpandWildcard)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, ExpandWildcard value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ExpandWildcard value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case ExpandWildcard.Open:
-				writer.WriteStringValue("open");
-				return;
+				writer.WriteStringValue(MemberOpen);
+				break;
 			case ExpandWildcard.None:
-				writer.WriteStringValue("none");
-				return;
+				writer.WriteStringValue(MemberNone);
+				break;
 			case ExpandWildcard.Hidden:
-				writer.WriteStringValue("hidden");
-				return;
+				writer.WriteStringValue(MemberHidden);
+				break;
 			case ExpandWildcard.Closed:
-				writer.WriteStringValue("closed");
-				return;
+				writer.WriteStringValue(MemberClosed);
+				break;
 			case ExpandWildcard.All:
-				writer.WriteStringValue("all");
-				return;
+				writer.WriteStringValue(MemberAll);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(ExpandWildcard)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -573,46 +698,58 @@ public enum FieldSortNumericType
 	Date
 }
 
-internal sealed class FieldSortNumericTypeConverter : JsonConverter<FieldSortNumericType>
+internal sealed partial class FieldSortNumericTypeConverter : System.Text.Json.Serialization.JsonConverter<FieldSortNumericType>
 {
-	public override FieldSortNumericType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberLong = System.Text.Json.JsonEncodedText.Encode("long");
+	private static readonly System.Text.Json.JsonEncodedText MemberDouble = System.Text.Json.JsonEncodedText.Encode("double");
+	private static readonly System.Text.Json.JsonEncodedText MemberDateNanos = System.Text.Json.JsonEncodedText.Encode("date_nanos");
+	private static readonly System.Text.Json.JsonEncodedText MemberDate = System.Text.Json.JsonEncodedText.Encode("date");
+
+	public override FieldSortNumericType Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberLong))
+		{
+			return FieldSortNumericType.Long;
+		}
+
+		if (reader.ValueTextEquals(MemberDouble))
+		{
+			return FieldSortNumericType.Double;
+		}
+
+		if (reader.ValueTextEquals(MemberDateNanos))
 		{
-			case "long":
-				return FieldSortNumericType.Long;
-			case "double":
-				return FieldSortNumericType.Double;
-			case "date_nanos":
-				return FieldSortNumericType.DateNanos;
-			case "date":
-				return FieldSortNumericType.Date;
+			return FieldSortNumericType.DateNanos;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberDate))
+		{
+			return FieldSortNumericType.Date;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(FieldSortNumericType)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, FieldSortNumericType value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, FieldSortNumericType value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case FieldSortNumericType.Long:
-				writer.WriteStringValue("long");
-				return;
+				writer.WriteStringValue(MemberLong);
+				break;
 			case FieldSortNumericType.Double:
-				writer.WriteStringValue("double");
-				return;
+				writer.WriteStringValue(MemberDouble);
+				break;
 			case FieldSortNumericType.DateNanos:
-				writer.WriteStringValue("date_nanos");
-				return;
+				writer.WriteStringValue(MemberDateNanos);
+				break;
 			case FieldSortNumericType.Date:
-				writer.WriteStringValue("date");
-				return;
+				writer.WriteStringValue(MemberDate);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(FieldSortNumericType)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -635,36 +772,40 @@ public enum GeoDistanceType
 	Arc
 }
 
-internal sealed class GeoDistanceTypeConverter : JsonConverter<GeoDistanceType>
+internal sealed partial class GeoDistanceTypeConverter : System.Text.Json.Serialization.JsonConverter<GeoDistanceType>
 {
-	public override GeoDistanceType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberPlane = System.Text.Json.JsonEncodedText.Encode("plane");
+	private static readonly System.Text.Json.JsonEncodedText MemberArc = System.Text.Json.JsonEncodedText.Encode("arc");
+
+	public override GeoDistanceType Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberPlane))
+		{
+			return GeoDistanceType.Plane;
+		}
+
+		if (reader.ValueTextEquals(MemberArc))
 		{
-			case "plane":
-				return GeoDistanceType.Plane;
-			case "arc":
-				return GeoDistanceType.Arc;
+			return GeoDistanceType.Arc;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(GeoDistanceType)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, GeoDistanceType value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GeoDistanceType value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case GeoDistanceType.Plane:
-				writer.WriteStringValue("plane");
-				return;
+				writer.WriteStringValue(MemberPlane);
+				break;
 			case GeoDistanceType.Arc:
-				writer.WriteStringValue("arc");
-				return;
+				writer.WriteStringValue(MemberArc);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(GeoDistanceType)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -702,46 +843,58 @@ public enum GeoShapeRelation
 	Contains
 }
 
-internal sealed class GeoShapeRelationConverter : JsonConverter<GeoShapeRelation>
+internal sealed partial class GeoShapeRelationConverter : System.Text.Json.Serialization.JsonConverter<GeoShapeRelation>
 {
-	public override GeoShapeRelation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberWithin = System.Text.Json.JsonEncodedText.Encode("within");
+	private static readonly System.Text.Json.JsonEncodedText MemberIntersects = System.Text.Json.JsonEncodedText.Encode("intersects");
+	private static readonly System.Text.Json.JsonEncodedText MemberDisjoint = System.Text.Json.JsonEncodedText.Encode("disjoint");
+	private static readonly System.Text.Json.JsonEncodedText MemberContains = System.Text.Json.JsonEncodedText.Encode("contains");
+
+	public override GeoShapeRelation Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberWithin))
+		{
+			return GeoShapeRelation.Within;
+		}
+
+		if (reader.ValueTextEquals(MemberIntersects))
 		{
-			case "within":
-				return GeoShapeRelation.Within;
-			case "intersects":
-				return GeoShapeRelation.Intersects;
-			case "disjoint":
-				return GeoShapeRelation.Disjoint;
-			case "contains":
-				return GeoShapeRelation.Contains;
+			return GeoShapeRelation.Intersects;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberDisjoint))
+		{
+			return GeoShapeRelation.Disjoint;
+		}
+
+		if (reader.ValueTextEquals(MemberContains))
+		{
+			return GeoShapeRelation.Contains;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(GeoShapeRelation)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, GeoShapeRelation value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GeoShapeRelation value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case GeoShapeRelation.Within:
-				writer.WriteStringValue("within");
-				return;
+				writer.WriteStringValue(MemberWithin);
+				break;
 			case GeoShapeRelation.Intersects:
-				writer.WriteStringValue("intersects");
-				return;
+				writer.WriteStringValue(MemberIntersects);
+				break;
 			case GeoShapeRelation.Disjoint:
-				writer.WriteStringValue("disjoint");
-				return;
+				writer.WriteStringValue(MemberDisjoint);
+				break;
 			case GeoShapeRelation.Contains:
-				writer.WriteStringValue("contains");
-				return;
+				writer.WriteStringValue(MemberContains);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(GeoShapeRelation)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -771,44 +924,52 @@ public enum HealthStatus
 	Green
 }
 
-internal sealed class HealthStatusConverter : JsonConverter<HealthStatus>
+internal sealed partial class HealthStatusConverter : System.Text.Json.Serialization.JsonConverter<HealthStatus>
 {
-	public override HealthStatus Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberYellow = System.Text.Json.JsonEncodedText.Encode("yellow");
+	private static readonly System.Text.Json.JsonEncodedText MemberYellow1 = System.Text.Json.JsonEncodedText.Encode("YELLOW");
+	private static readonly System.Text.Json.JsonEncodedText MemberRed = System.Text.Json.JsonEncodedText.Encode("red");
+	private static readonly System.Text.Json.JsonEncodedText MemberRed1 = System.Text.Json.JsonEncodedText.Encode("RED");
+	private static readonly System.Text.Json.JsonEncodedText MemberGreen = System.Text.Json.JsonEncodedText.Encode("green");
+	private static readonly System.Text.Json.JsonEncodedText MemberGreen1 = System.Text.Json.JsonEncodedText.Encode("GREEN");
+
+	public override HealthStatus Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "yellow":
-			case "YELLOW":
-				return HealthStatus.Yellow;
-			case "red":
-			case "RED":
-				return HealthStatus.Red;
-			case "green":
-			case "GREEN":
-				return HealthStatus.Green;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberYellow) || reader.ValueTextEquals(MemberYellow1))
+		{
+			return HealthStatus.Yellow;
+		}
+
+		if (reader.ValueTextEquals(MemberRed) || reader.ValueTextEquals(MemberRed1))
+		{
+			return HealthStatus.Red;
+		}
+
+		if (reader.ValueTextEquals(MemberGreen) || reader.ValueTextEquals(MemberGreen1))
+		{
+			return HealthStatus.Green;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(HealthStatus)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, HealthStatus value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, HealthStatus value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case HealthStatus.Yellow:
-				writer.WriteStringValue("yellow");
-				return;
+				writer.WriteStringValue(MemberYellow);
+				break;
 			case HealthStatus.Red:
-				writer.WriteStringValue("red");
-				return;
+				writer.WriteStringValue(MemberRed);
+				break;
 			case HealthStatus.Green:
-				writer.WriteStringValue("green");
-				return;
+				writer.WriteStringValue(MemberGreen);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(HealthStatus)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -821,36 +982,40 @@ public enum IBDistribution
 	Ll
 }
 
-internal sealed class IBDistributionConverter : JsonConverter<IBDistribution>
+internal sealed partial class IBDistributionConverter : System.Text.Json.Serialization.JsonConverter<IBDistribution>
 {
-	public override IBDistribution Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberSpl = System.Text.Json.JsonEncodedText.Encode("spl");
+	private static readonly System.Text.Json.JsonEncodedText MemberLl = System.Text.Json.JsonEncodedText.Encode("ll");
+
+	public override IBDistribution Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberSpl))
 		{
-			case "spl":
-				return IBDistribution.Spl;
-			case "ll":
-				return IBDistribution.Ll;
+			return IBDistribution.Spl;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberLl))
+		{
+			return IBDistribution.Ll;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(IBDistribution)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, IBDistribution value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IBDistribution value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case IBDistribution.Spl:
-				writer.WriteStringValue("spl");
-				return;
+				writer.WriteStringValue(MemberSpl);
+				break;
 			case IBDistribution.Ll:
-				writer.WriteStringValue("ll");
-				return;
+				writer.WriteStringValue(MemberLl);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(IBDistribution)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -863,36 +1028,40 @@ public enum IBLambda
 	Df
 }
 
-internal sealed class IBLambdaConverter : JsonConverter<IBLambda>
+internal sealed partial class IBLambdaConverter : System.Text.Json.Serialization.JsonConverter<IBLambda>
 {
-	public override IBLambda Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberTtf = System.Text.Json.JsonEncodedText.Encode("ttf");
+	private static readonly System.Text.Json.JsonEncodedText MemberDf = System.Text.Json.JsonEncodedText.Encode("df");
+
+	public override IBLambda Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberTtf))
 		{
-			case "ttf":
-				return IBLambda.Ttf;
-			case "df":
-				return IBLambda.Df;
+			return IBLambda.Ttf;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberDf))
+		{
+			return IBLambda.Df;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(IBLambda)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, IBLambda value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IBLambda value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case IBLambda.Ttf:
-				writer.WriteStringValue("ttf");
-				return;
+				writer.WriteStringValue(MemberTtf);
+				break;
 			case IBLambda.Df:
-				writer.WriteStringValue("df");
-				return;
+				writer.WriteStringValue(MemberDf);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(IBLambda)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -907,41 +1076,49 @@ public enum Level
 	Cluster
 }
 
-internal sealed class LevelConverter : JsonConverter<Level>
+internal sealed partial class LevelConverter : System.Text.Json.Serialization.JsonConverter<Level>
 {
-	public override Level Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberShards = System.Text.Json.JsonEncodedText.Encode("shards");
+	private static readonly System.Text.Json.JsonEncodedText MemberIndices = System.Text.Json.JsonEncodedText.Encode("indices");
+	private static readonly System.Text.Json.JsonEncodedText MemberCluster = System.Text.Json.JsonEncodedText.Encode("cluster");
+
+	public override Level Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberShards))
+		{
+			return Level.Shards;
+		}
+
+		if (reader.ValueTextEquals(MemberIndices))
+		{
+			return Level.Indices;
+		}
+
+		if (reader.ValueTextEquals(MemberCluster))
 		{
-			case "shards":
-				return Level.Shards;
-			case "indices":
-				return Level.Indices;
-			case "cluster":
-				return Level.Cluster;
+			return Level.Cluster;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(Level)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, Level value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, Level value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case Level.Shards:
-				writer.WriteStringValue("shards");
-				return;
+				writer.WriteStringValue(MemberShards);
+				break;
 			case Level.Indices:
-				writer.WriteStringValue("indices");
-				return;
+				writer.WriteStringValue(MemberIndices);
+				break;
 			case Level.Cluster:
-				writer.WriteStringValue("cluster");
-				return;
+				writer.WriteStringValue(MemberCluster);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(Level)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -956,41 +1133,49 @@ public enum LifecycleOperationMode
 	Running
 }
 
-internal sealed class LifecycleOperationModeConverter : JsonConverter<LifecycleOperationMode>
+internal sealed partial class LifecycleOperationModeConverter : System.Text.Json.Serialization.JsonConverter<LifecycleOperationMode>
 {
-	public override LifecycleOperationMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberStopping = System.Text.Json.JsonEncodedText.Encode("STOPPING");
+	private static readonly System.Text.Json.JsonEncodedText MemberStopped = System.Text.Json.JsonEncodedText.Encode("STOPPED");
+	private static readonly System.Text.Json.JsonEncodedText MemberRunning = System.Text.Json.JsonEncodedText.Encode("RUNNING");
+
+	public override LifecycleOperationMode Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberStopping))
 		{
-			case "STOPPING":
-				return LifecycleOperationMode.Stopping;
-			case "STOPPED":
-				return LifecycleOperationMode.Stopped;
-			case "RUNNING":
-				return LifecycleOperationMode.Running;
+			return LifecycleOperationMode.Stopping;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberStopped))
+		{
+			return LifecycleOperationMode.Stopped;
+		}
+
+		if (reader.ValueTextEquals(MemberRunning))
+		{
+			return LifecycleOperationMode.Running;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(LifecycleOperationMode)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, LifecycleOperationMode value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, LifecycleOperationMode value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case LifecycleOperationMode.Stopping:
-				writer.WriteStringValue("STOPPING");
-				return;
+				writer.WriteStringValue(MemberStopping);
+				break;
 			case LifecycleOperationMode.Stopped:
-				writer.WriteStringValue("STOPPED");
-				return;
+				writer.WriteStringValue(MemberStopped);
+				break;
 			case LifecycleOperationMode.Running:
-				writer.WriteStringValue("RUNNING");
-				return;
+				writer.WriteStringValue(MemberRunning);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(LifecycleOperationMode)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -1027,96 +1212,148 @@ public enum NodeRole
 	Client
 }
 
-internal sealed class NodeRoleConverter : JsonConverter<NodeRole>
+internal sealed partial class NodeRoleConverter : System.Text.Json.Serialization.JsonConverter<NodeRole>
 {
-	public override NodeRole Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberVotingOnly = System.Text.Json.JsonEncodedText.Encode("voting_only");
+	private static readonly System.Text.Json.JsonEncodedText MemberTransform = System.Text.Json.JsonEncodedText.Encode("transform");
+	private static readonly System.Text.Json.JsonEncodedText MemberRemoteClusterClient = System.Text.Json.JsonEncodedText.Encode("remote_cluster_client");
+	private static readonly System.Text.Json.JsonEncodedText MemberMl = System.Text.Json.JsonEncodedText.Encode("ml");
+	private static readonly System.Text.Json.JsonEncodedText MemberMaster = System.Text.Json.JsonEncodedText.Encode("master");
+	private static readonly System.Text.Json.JsonEncodedText MemberIngest = System.Text.Json.JsonEncodedText.Encode("ingest");
+	private static readonly System.Text.Json.JsonEncodedText MemberDataWarm = System.Text.Json.JsonEncodedText.Encode("data_warm");
+	private static readonly System.Text.Json.JsonEncodedText MemberDataHot = System.Text.Json.JsonEncodedText.Encode("data_hot");
+	private static readonly System.Text.Json.JsonEncodedText MemberDataFrozen = System.Text.Json.JsonEncodedText.Encode("data_frozen");
+	private static readonly System.Text.Json.JsonEncodedText MemberDataContent = System.Text.Json.JsonEncodedText.Encode("data_content");
+	private static readonly System.Text.Json.JsonEncodedText MemberDataCold = System.Text.Json.JsonEncodedText.Encode("data_cold");
+	private static readonly System.Text.Json.JsonEncodedText MemberData = System.Text.Json.JsonEncodedText.Encode("data");
+	private static readonly System.Text.Json.JsonEncodedText MemberCoordinatingOnly = System.Text.Json.JsonEncodedText.Encode("coordinating_only");
+	private static readonly System.Text.Json.JsonEncodedText MemberClient = System.Text.Json.JsonEncodedText.Encode("client");
+
+	public override NodeRole Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "voting_only":
-				return NodeRole.VotingOnly;
-			case "transform":
-				return NodeRole.Transform;
-			case "remote_cluster_client":
-				return NodeRole.RemoteClusterClient;
-			case "ml":
-				return NodeRole.Ml;
-			case "master":
-				return NodeRole.Master;
-			case "ingest":
-				return NodeRole.Ingest;
-			case "data_warm":
-				return NodeRole.DataWarm;
-			case "data_hot":
-				return NodeRole.DataHot;
-			case "data_frozen":
-				return NodeRole.DataFrozen;
-			case "data_content":
-				return NodeRole.DataContent;
-			case "data_cold":
-				return NodeRole.DataCold;
-			case "data":
-				return NodeRole.Data;
-			case "coordinating_only":
-				return NodeRole.CoordinatingOnly;
-			case "client":
-				return NodeRole.Client;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberVotingOnly))
+		{
+			return NodeRole.VotingOnly;
+		}
+
+		if (reader.ValueTextEquals(MemberTransform))
+		{
+			return NodeRole.Transform;
+		}
+
+		if (reader.ValueTextEquals(MemberRemoteClusterClient))
+		{
+			return NodeRole.RemoteClusterClient;
+		}
+
+		if (reader.ValueTextEquals(MemberMl))
+		{
+			return NodeRole.Ml;
+		}
+
+		if (reader.ValueTextEquals(MemberMaster))
+		{
+			return NodeRole.Master;
+		}
+
+		if (reader.ValueTextEquals(MemberIngest))
+		{
+			return NodeRole.Ingest;
+		}
+
+		if (reader.ValueTextEquals(MemberDataWarm))
+		{
+			return NodeRole.DataWarm;
+		}
+
+		if (reader.ValueTextEquals(MemberDataHot))
+		{
+			return NodeRole.DataHot;
+		}
+
+		if (reader.ValueTextEquals(MemberDataFrozen))
+		{
+			return NodeRole.DataFrozen;
+		}
+
+		if (reader.ValueTextEquals(MemberDataContent))
+		{
+			return NodeRole.DataContent;
+		}
+
+		if (reader.ValueTextEquals(MemberDataCold))
+		{
+			return NodeRole.DataCold;
+		}
+
+		if (reader.ValueTextEquals(MemberData))
+		{
+			return NodeRole.Data;
+		}
+
+		if (reader.ValueTextEquals(MemberCoordinatingOnly))
+		{
+			return NodeRole.CoordinatingOnly;
+		}
+
+		if (reader.ValueTextEquals(MemberClient))
+		{
+			return NodeRole.Client;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(NodeRole)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, NodeRole value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, NodeRole value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case NodeRole.VotingOnly:
-				writer.WriteStringValue("voting_only");
-				return;
+				writer.WriteStringValue(MemberVotingOnly);
+				break;
 			case NodeRole.Transform:
-				writer.WriteStringValue("transform");
-				return;
+				writer.WriteStringValue(MemberTransform);
+				break;
 			case NodeRole.RemoteClusterClient:
-				writer.WriteStringValue("remote_cluster_client");
-				return;
+				writer.WriteStringValue(MemberRemoteClusterClient);
+				break;
 			case NodeRole.Ml:
-				writer.WriteStringValue("ml");
-				return;
+				writer.WriteStringValue(MemberMl);
+				break;
 			case NodeRole.Master:
-				writer.WriteStringValue("master");
-				return;
+				writer.WriteStringValue(MemberMaster);
+				break;
 			case NodeRole.Ingest:
-				writer.WriteStringValue("ingest");
-				return;
+				writer.WriteStringValue(MemberIngest);
+				break;
 			case NodeRole.DataWarm:
-				writer.WriteStringValue("data_warm");
-				return;
+				writer.WriteStringValue(MemberDataWarm);
+				break;
 			case NodeRole.DataHot:
-				writer.WriteStringValue("data_hot");
-				return;
+				writer.WriteStringValue(MemberDataHot);
+				break;
 			case NodeRole.DataFrozen:
-				writer.WriteStringValue("data_frozen");
-				return;
+				writer.WriteStringValue(MemberDataFrozen);
+				break;
 			case NodeRole.DataContent:
-				writer.WriteStringValue("data_content");
-				return;
+				writer.WriteStringValue(MemberDataContent);
+				break;
 			case NodeRole.DataCold:
-				writer.WriteStringValue("data_cold");
-				return;
+				writer.WriteStringValue(MemberDataCold);
+				break;
 			case NodeRole.Data:
-				writer.WriteStringValue("data");
-				return;
+				writer.WriteStringValue(MemberData);
+				break;
 			case NodeRole.CoordinatingOnly:
-				writer.WriteStringValue("coordinating_only");
-				return;
+				writer.WriteStringValue(MemberCoordinatingOnly);
+				break;
 			case NodeRole.Client:
-				writer.WriteStringValue("client");
-				return;
+				writer.WriteStringValue(MemberClient);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(NodeRole)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -1135,51 +1372,67 @@ public enum Normalization
 	H1
 }
 
-internal sealed class NormalizationConverter : JsonConverter<Normalization>
+internal sealed partial class NormalizationConverter : System.Text.Json.Serialization.JsonConverter<Normalization>
 {
-	public override Normalization Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText Memberz = System.Text.Json.JsonEncodedText.Encode("z");
+	private static readonly System.Text.Json.JsonEncodedText MemberNo = System.Text.Json.JsonEncodedText.Encode("no");
+	private static readonly System.Text.Json.JsonEncodedText MemberH3 = System.Text.Json.JsonEncodedText.Encode("h3");
+	private static readonly System.Text.Json.JsonEncodedText MemberH2 = System.Text.Json.JsonEncodedText.Encode("h2");
+	private static readonly System.Text.Json.JsonEncodedText MemberH1 = System.Text.Json.JsonEncodedText.Encode("h1");
+
+	public override Normalization Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "z":
-				return Normalization.z;
-			case "no":
-				return Normalization.No;
-			case "h3":
-				return Normalization.H3;
-			case "h2":
-				return Normalization.H2;
-			case "h1":
-				return Normalization.H1;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(Memberz))
+		{
+			return Normalization.z;
+		}
+
+		if (reader.ValueTextEquals(MemberNo))
+		{
+			return Normalization.No;
+		}
+
+		if (reader.ValueTextEquals(MemberH3))
+		{
+			return Normalization.H3;
+		}
+
+		if (reader.ValueTextEquals(MemberH2))
+		{
+			return Normalization.H2;
+		}
+
+		if (reader.ValueTextEquals(MemberH1))
+		{
+			return Normalization.H1;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(Normalization)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, Normalization value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, Normalization value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case Normalization.z:
-				writer.WriteStringValue("z");
-				return;
+				writer.WriteStringValue(Memberz);
+				break;
 			case Normalization.No:
-				writer.WriteStringValue("no");
-				return;
+				writer.WriteStringValue(MemberNo);
+				break;
 			case Normalization.H3:
-				writer.WriteStringValue("h3");
-				return;
+				writer.WriteStringValue(MemberH3);
+				break;
 			case Normalization.H2:
-				writer.WriteStringValue("h2");
-				return;
+				writer.WriteStringValue(MemberH2);
+				break;
 			case Normalization.H1:
-				writer.WriteStringValue("h1");
-				return;
+				writer.WriteStringValue(MemberH1);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(Normalization)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -1198,51 +1451,67 @@ public enum Result
 	Created
 }
 
-internal sealed class ResultConverter : JsonConverter<Result>
+internal sealed partial class ResultConverter : System.Text.Json.Serialization.JsonConverter<Result>
 {
-	public override Result Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberUpdated = System.Text.Json.JsonEncodedText.Encode("updated");
+	private static readonly System.Text.Json.JsonEncodedText MemberNotFound = System.Text.Json.JsonEncodedText.Encode("not_found");
+	private static readonly System.Text.Json.JsonEncodedText MemberNoOp = System.Text.Json.JsonEncodedText.Encode("noop");
+	private static readonly System.Text.Json.JsonEncodedText MemberDeleted = System.Text.Json.JsonEncodedText.Encode("deleted");
+	private static readonly System.Text.Json.JsonEncodedText MemberCreated = System.Text.Json.JsonEncodedText.Encode("created");
+
+	public override Result Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "updated":
-				return Result.Updated;
-			case "not_found":
-				return Result.NotFound;
-			case "noop":
-				return Result.NoOp;
-			case "deleted":
-				return Result.Deleted;
-			case "created":
-				return Result.Created;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberUpdated))
+		{
+			return Result.Updated;
+		}
+
+		if (reader.ValueTextEquals(MemberNotFound))
+		{
+			return Result.NotFound;
+		}
+
+		if (reader.ValueTextEquals(MemberNoOp))
+		{
+			return Result.NoOp;
+		}
+
+		if (reader.ValueTextEquals(MemberDeleted))
+		{
+			return Result.Deleted;
+		}
+
+		if (reader.ValueTextEquals(MemberCreated))
+		{
+			return Result.Created;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(Result)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, Result value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, Result value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case Result.Updated:
-				writer.WriteStringValue("updated");
-				return;
+				writer.WriteStringValue(MemberUpdated);
+				break;
 			case Result.NotFound:
-				writer.WriteStringValue("not_found");
-				return;
+				writer.WriteStringValue(MemberNotFound);
+				break;
 			case Result.NoOp:
-				writer.WriteStringValue("noop");
-				return;
+				writer.WriteStringValue(MemberNoOp);
+				break;
 			case Result.Deleted:
-				writer.WriteStringValue("deleted");
-				return;
+				writer.WriteStringValue(MemberDeleted);
+				break;
 			case Result.Created:
-				writer.WriteStringValue("created");
-				return;
+				writer.WriteStringValue(MemberCreated);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(Result)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -1250,9 +1519,11 @@ public override void Write(Utf8JsonWriter writer, Result value, JsonSerializerOp
 public readonly partial struct ScriptLanguage : IEnumStruct<ScriptLanguage>
 {
 	public ScriptLanguage(string value) => Value = value;
-
+#if NET7_0_OR_GREATER
+	static ScriptLanguage IEnumStruct<ScriptLanguage>.Create(string value) => value;
+#else
 	ScriptLanguage IEnumStruct<ScriptLanguage>.Create(string value) => value;
-
+#endif
 	public readonly string Value { get; }
 
 	/// <summary>
@@ -1307,41 +1578,49 @@ public enum ScriptSortType
 	Number
 }
 
-internal sealed class ScriptSortTypeConverter : JsonConverter<ScriptSortType>
+internal sealed partial class ScriptSortTypeConverter : System.Text.Json.Serialization.JsonConverter<ScriptSortType>
 {
-	public override ScriptSortType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberVersion = System.Text.Json.JsonEncodedText.Encode("version");
+	private static readonly System.Text.Json.JsonEncodedText MemberString = System.Text.Json.JsonEncodedText.Encode("string");
+	private static readonly System.Text.Json.JsonEncodedText MemberNumber = System.Text.Json.JsonEncodedText.Encode("number");
+
+	public override ScriptSortType Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberVersion))
+		{
+			return ScriptSortType.Version;
+		}
+
+		if (reader.ValueTextEquals(MemberString))
+		{
+			return ScriptSortType.String;
+		}
+
+		if (reader.ValueTextEquals(MemberNumber))
 		{
-			case "version":
-				return ScriptSortType.Version;
-			case "string":
-				return ScriptSortType.String;
-			case "number":
-				return ScriptSortType.Number;
+			return ScriptSortType.Number;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(ScriptSortType)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, ScriptSortType value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ScriptSortType value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case ScriptSortType.Version:
-				writer.WriteStringValue("version");
-				return;
+				writer.WriteStringValue(MemberVersion);
+				break;
 			case ScriptSortType.String:
-				writer.WriteStringValue("string");
-				return;
+				writer.WriteStringValue(MemberString);
+				break;
 			case ScriptSortType.Number:
-				writer.WriteStringValue("number");
-				return;
+				writer.WriteStringValue(MemberNumber);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(ScriptSortType)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -1364,36 +1643,40 @@ public enum SearchType
 	DfsQueryThenFetch
 }
 
-internal sealed class SearchTypeConverter : JsonConverter<SearchType>
+internal sealed partial class SearchTypeConverter : System.Text.Json.Serialization.JsonConverter<SearchType>
 {
-	public override SearchType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberQueryThenFetch = System.Text.Json.JsonEncodedText.Encode("query_then_fetch");
+	private static readonly System.Text.Json.JsonEncodedText MemberDfsQueryThenFetch = System.Text.Json.JsonEncodedText.Encode("dfs_query_then_fetch");
+
+	public override SearchType Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberQueryThenFetch))
 		{
-			case "query_then_fetch":
-				return SearchType.QueryThenFetch;
-			case "dfs_query_then_fetch":
-				return SearchType.DfsQueryThenFetch;
+			return SearchType.QueryThenFetch;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberDfsQueryThenFetch))
+		{
+			return SearchType.DfsQueryThenFetch;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(SearchType)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, SearchType value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SearchType value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case SearchType.QueryThenFetch:
-				writer.WriteStringValue("query_then_fetch");
-				return;
+				writer.WriteStringValue(MemberQueryThenFetch);
+				break;
 			case SearchType.DfsQueryThenFetch:
-				writer.WriteStringValue("dfs_query_then_fetch");
-				return;
+				writer.WriteStringValue(MemberDfsQueryThenFetch);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(SearchType)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -1409,31 +1692,31 @@ public enum SlicesCalculation
 	Auto
 }
 
-internal sealed class SlicesCalculationConverter : JsonConverter<SlicesCalculation>
+internal sealed partial class SlicesCalculationConverter : System.Text.Json.Serialization.JsonConverter<SlicesCalculation>
 {
-	public override SlicesCalculation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberAuto = System.Text.Json.JsonEncodedText.Encode("auto");
+
+	public override SlicesCalculation Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberAuto))
 		{
-			case "auto":
-				return SlicesCalculation.Auto;
+			return SlicesCalculation.Auto;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(SlicesCalculation)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, SlicesCalculation value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SlicesCalculation value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case SlicesCalculation.Auto:
-				writer.WriteStringValue("auto");
-				return;
+				writer.WriteStringValue(MemberAuto);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(SlicesCalculation)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -1452,51 +1735,67 @@ public enum SortMode
 	Avg
 }
 
-internal sealed class SortModeConverter : JsonConverter<SortMode>
+internal sealed partial class SortModeConverter : System.Text.Json.Serialization.JsonConverter<SortMode>
 {
-	public override SortMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberSum = System.Text.Json.JsonEncodedText.Encode("sum");
+	private static readonly System.Text.Json.JsonEncodedText MemberMin = System.Text.Json.JsonEncodedText.Encode("min");
+	private static readonly System.Text.Json.JsonEncodedText MemberMedian = System.Text.Json.JsonEncodedText.Encode("median");
+	private static readonly System.Text.Json.JsonEncodedText MemberMax = System.Text.Json.JsonEncodedText.Encode("max");
+	private static readonly System.Text.Json.JsonEncodedText MemberAvg = System.Text.Json.JsonEncodedText.Encode("avg");
+
+	public override SortMode Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "sum":
-				return SortMode.Sum;
-			case "min":
-				return SortMode.Min;
-			case "median":
-				return SortMode.Median;
-			case "max":
-				return SortMode.Max;
-			case "avg":
-				return SortMode.Avg;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberSum))
+		{
+			return SortMode.Sum;
+		}
+
+		if (reader.ValueTextEquals(MemberMin))
+		{
+			return SortMode.Min;
+		}
+
+		if (reader.ValueTextEquals(MemberMedian))
+		{
+			return SortMode.Median;
+		}
+
+		if (reader.ValueTextEquals(MemberMax))
+		{
+			return SortMode.Max;
+		}
+
+		if (reader.ValueTextEquals(MemberAvg))
+		{
+			return SortMode.Avg;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(SortMode)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, SortMode value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SortMode value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case SortMode.Sum:
-				writer.WriteStringValue("sum");
-				return;
+				writer.WriteStringValue(MemberSum);
+				break;
 			case SortMode.Min:
-				writer.WriteStringValue("min");
-				return;
+				writer.WriteStringValue(MemberMin);
+				break;
 			case SortMode.Median:
-				writer.WriteStringValue("median");
-				return;
+				writer.WriteStringValue(MemberMedian);
+				break;
 			case SortMode.Max:
-				writer.WriteStringValue("max");
-				return;
+				writer.WriteStringValue(MemberMax);
+				break;
 			case SortMode.Avg:
-				writer.WriteStringValue("avg");
-				return;
+				writer.WriteStringValue(MemberAvg);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(SortMode)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -1519,36 +1818,40 @@ public enum SortOrder
 	Asc
 }
 
-internal sealed class SortOrderConverter : JsonConverter<SortOrder>
+internal sealed partial class SortOrderConverter : System.Text.Json.Serialization.JsonConverter<SortOrder>
 {
-	public override SortOrder Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberDesc = System.Text.Json.JsonEncodedText.Encode("desc");
+	private static readonly System.Text.Json.JsonEncodedText MemberAsc = System.Text.Json.JsonEncodedText.Encode("asc");
+
+	public override SortOrder Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberDesc))
+		{
+			return SortOrder.Desc;
+		}
+
+		if (reader.ValueTextEquals(MemberAsc))
 		{
-			case "desc":
-				return SortOrder.Desc;
-			case "asc":
-				return SortOrder.Asc;
+			return SortOrder.Asc;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(SortOrder)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, SortOrder value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SortOrder value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case SortOrder.Desc:
-				writer.WriteStringValue("desc");
-				return;
+				writer.WriteStringValue(MemberDesc);
+				break;
 			case SortOrder.Asc:
-				writer.WriteStringValue("asc");
-				return;
+				writer.WriteStringValue(MemberAsc);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(SortOrder)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -1578,41 +1881,49 @@ public enum SuggestMode
 	Always
 }
 
-internal sealed class SuggestModeConverter : JsonConverter<SuggestMode>
+internal sealed partial class SuggestModeConverter : System.Text.Json.Serialization.JsonConverter<SuggestMode>
 {
-	public override SuggestMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberPopular = System.Text.Json.JsonEncodedText.Encode("popular");
+	private static readonly System.Text.Json.JsonEncodedText MemberMissing = System.Text.Json.JsonEncodedText.Encode("missing");
+	private static readonly System.Text.Json.JsonEncodedText MemberAlways = System.Text.Json.JsonEncodedText.Encode("always");
+
+	public override SuggestMode Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberPopular))
+		{
+			return SuggestMode.Popular;
+		}
+
+		if (reader.ValueTextEquals(MemberMissing))
+		{
+			return SuggestMode.Missing;
+		}
+
+		if (reader.ValueTextEquals(MemberAlways))
 		{
-			case "popular":
-				return SuggestMode.Popular;
-			case "missing":
-				return SuggestMode.Missing;
-			case "always":
-				return SuggestMode.Always;
+			return SuggestMode.Always;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(SuggestMode)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, SuggestMode value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SuggestMode value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case SuggestMode.Popular:
-				writer.WriteStringValue("popular");
-				return;
+				writer.WriteStringValue(MemberPopular);
+				break;
 			case SuggestMode.Missing:
-				writer.WriteStringValue("missing");
-				return;
+				writer.WriteStringValue(MemberMissing);
+				break;
 			case SuggestMode.Always:
-				writer.WriteStringValue("always");
-				return;
+				writer.WriteStringValue(MemberAlways);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(SuggestMode)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -1631,51 +1942,67 @@ public enum ThreadType
 	Block
 }
 
-internal sealed class ThreadTypeConverter : JsonConverter<ThreadType>
+internal sealed partial class ThreadTypeConverter : System.Text.Json.Serialization.JsonConverter<ThreadType>
 {
-	public override ThreadType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberWait = System.Text.Json.JsonEncodedText.Encode("wait");
+	private static readonly System.Text.Json.JsonEncodedText MemberMem = System.Text.Json.JsonEncodedText.Encode("mem");
+	private static readonly System.Text.Json.JsonEncodedText MemberGpu = System.Text.Json.JsonEncodedText.Encode("gpu");
+	private static readonly System.Text.Json.JsonEncodedText MemberCpu = System.Text.Json.JsonEncodedText.Encode("cpu");
+	private static readonly System.Text.Json.JsonEncodedText MemberBlock = System.Text.Json.JsonEncodedText.Encode("block");
+
+	public override ThreadType Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "wait":
-				return ThreadType.Wait;
-			case "mem":
-				return ThreadType.Mem;
-			case "gpu":
-				return ThreadType.Gpu;
-			case "cpu":
-				return ThreadType.Cpu;
-			case "block":
-				return ThreadType.Block;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberWait))
+		{
+			return ThreadType.Wait;
+		}
+
+		if (reader.ValueTextEquals(MemberMem))
+		{
+			return ThreadType.Mem;
+		}
+
+		if (reader.ValueTextEquals(MemberGpu))
+		{
+			return ThreadType.Gpu;
+		}
+
+		if (reader.ValueTextEquals(MemberCpu))
+		{
+			return ThreadType.Cpu;
+		}
+
+		if (reader.ValueTextEquals(MemberBlock))
+		{
+			return ThreadType.Block;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(ThreadType)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, ThreadType value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ThreadType value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case ThreadType.Wait:
-				writer.WriteStringValue("wait");
-				return;
+				writer.WriteStringValue(MemberWait);
+				break;
 			case ThreadType.Mem:
-				writer.WriteStringValue("mem");
-				return;
+				writer.WriteStringValue(MemberMem);
+				break;
 			case ThreadType.Gpu:
-				writer.WriteStringValue("gpu");
-				return;
+				writer.WriteStringValue(MemberGpu);
+				break;
 			case ThreadType.Cpu:
-				writer.WriteStringValue("cpu");
-				return;
+				writer.WriteStringValue(MemberCpu);
+				break;
 			case ThreadType.Block:
-				writer.WriteStringValue("block");
-				return;
+				writer.WriteStringValue(MemberBlock);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(ThreadType)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -1698,61 +2025,85 @@ public enum TimeUnit
 	Days
 }
 
-internal sealed class TimeUnitConverter : JsonConverter<TimeUnit>
+internal sealed partial class TimeUnitConverter : System.Text.Json.Serialization.JsonConverter<TimeUnit>
 {
-	public override TimeUnit Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberSeconds = System.Text.Json.JsonEncodedText.Encode("s");
+	private static readonly System.Text.Json.JsonEncodedText MemberNanoseconds = System.Text.Json.JsonEncodedText.Encode("nanos");
+	private static readonly System.Text.Json.JsonEncodedText MemberMinutes = System.Text.Json.JsonEncodedText.Encode("m");
+	private static readonly System.Text.Json.JsonEncodedText MemberMilliseconds = System.Text.Json.JsonEncodedText.Encode("ms");
+	private static readonly System.Text.Json.JsonEncodedText MemberMicroseconds = System.Text.Json.JsonEncodedText.Encode("micros");
+	private static readonly System.Text.Json.JsonEncodedText MemberHours = System.Text.Json.JsonEncodedText.Encode("h");
+	private static readonly System.Text.Json.JsonEncodedText MemberDays = System.Text.Json.JsonEncodedText.Encode("d");
+
+	public override TimeUnit Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "s":
-				return TimeUnit.Seconds;
-			case "nanos":
-				return TimeUnit.Nanoseconds;
-			case "m":
-				return TimeUnit.Minutes;
-			case "ms":
-				return TimeUnit.Milliseconds;
-			case "micros":
-				return TimeUnit.Microseconds;
-			case "h":
-				return TimeUnit.Hours;
-			case "d":
-				return TimeUnit.Days;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberSeconds))
+		{
+			return TimeUnit.Seconds;
+		}
+
+		if (reader.ValueTextEquals(MemberNanoseconds))
+		{
+			return TimeUnit.Nanoseconds;
+		}
+
+		if (reader.ValueTextEquals(MemberMinutes))
+		{
+			return TimeUnit.Minutes;
+		}
+
+		if (reader.ValueTextEquals(MemberMilliseconds))
+		{
+			return TimeUnit.Milliseconds;
+		}
+
+		if (reader.ValueTextEquals(MemberMicroseconds))
+		{
+			return TimeUnit.Microseconds;
+		}
+
+		if (reader.ValueTextEquals(MemberHours))
+		{
+			return TimeUnit.Hours;
+		}
+
+		if (reader.ValueTextEquals(MemberDays))
+		{
+			return TimeUnit.Days;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(TimeUnit)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, TimeUnit value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, TimeUnit value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case TimeUnit.Seconds:
-				writer.WriteStringValue("s");
-				return;
+				writer.WriteStringValue(MemberSeconds);
+				break;
 			case TimeUnit.Nanoseconds:
-				writer.WriteStringValue("nanos");
-				return;
+				writer.WriteStringValue(MemberNanoseconds);
+				break;
 			case TimeUnit.Minutes:
-				writer.WriteStringValue("m");
-				return;
+				writer.WriteStringValue(MemberMinutes);
+				break;
 			case TimeUnit.Milliseconds:
-				writer.WriteStringValue("ms");
-				return;
+				writer.WriteStringValue(MemberMilliseconds);
+				break;
 			case TimeUnit.Microseconds:
-				writer.WriteStringValue("micros");
-				return;
+				writer.WriteStringValue(MemberMicroseconds);
+				break;
 			case TimeUnit.Hours:
-				writer.WriteStringValue("h");
-				return;
+				writer.WriteStringValue(MemberHours);
+				break;
 			case TimeUnit.Days:
-				writer.WriteStringValue("d");
-				return;
+				writer.WriteStringValue(MemberDays);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(TimeUnit)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -1786,46 +2137,58 @@ public enum VersionType
 	External
 }
 
-internal sealed class VersionTypeConverter : JsonConverter<VersionType>
+internal sealed partial class VersionTypeConverter : System.Text.Json.Serialization.JsonConverter<VersionType>
 {
-	public override VersionType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberInternal = System.Text.Json.JsonEncodedText.Encode("internal");
+	private static readonly System.Text.Json.JsonEncodedText MemberForce = System.Text.Json.JsonEncodedText.Encode("force");
+	private static readonly System.Text.Json.JsonEncodedText MemberExternalGte = System.Text.Json.JsonEncodedText.Encode("external_gte");
+	private static readonly System.Text.Json.JsonEncodedText MemberExternal = System.Text.Json.JsonEncodedText.Encode("external");
+
+	public override VersionType Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberInternal))
+		{
+			return VersionType.Internal;
+		}
+
+		if (reader.ValueTextEquals(MemberForce))
+		{
+			return VersionType.Force;
+		}
+
+		if (reader.ValueTextEquals(MemberExternalGte))
 		{
-			case "internal":
-				return VersionType.Internal;
-			case "force":
-				return VersionType.Force;
-			case "external_gte":
-				return VersionType.ExternalGte;
-			case "external":
-				return VersionType.External;
+			return VersionType.ExternalGte;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberExternal))
+		{
+			return VersionType.External;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(VersionType)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, VersionType value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, VersionType value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case VersionType.Internal:
-				writer.WriteStringValue("internal");
-				return;
+				writer.WriteStringValue(MemberInternal);
+				break;
 			case VersionType.Force:
-				writer.WriteStringValue("force");
-				return;
+				writer.WriteStringValue(MemberForce);
+				break;
 			case VersionType.ExternalGte:
-				writer.WriteStringValue("external_gte");
-				return;
+				writer.WriteStringValue(MemberExternalGte);
+				break;
 			case VersionType.External:
-				writer.WriteStringValue("external");
-				return;
+				writer.WriteStringValue(MemberExternal);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(VersionType)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -1846,55 +2209,75 @@ public enum WaitForEvents
 	High
 }
 
-internal sealed class WaitForEventsConverter : JsonConverter<WaitForEvents>
+internal sealed partial class WaitForEventsConverter : System.Text.Json.Serialization.JsonConverter<WaitForEvents>
 {
-	public override WaitForEvents Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberUrgent = System.Text.Json.JsonEncodedText.Encode("urgent");
+	private static readonly System.Text.Json.JsonEncodedText MemberNormal = System.Text.Json.JsonEncodedText.Encode("normal");
+	private static readonly System.Text.Json.JsonEncodedText MemberLow = System.Text.Json.JsonEncodedText.Encode("low");
+	private static readonly System.Text.Json.JsonEncodedText MemberLanguid = System.Text.Json.JsonEncodedText.Encode("languid");
+	private static readonly System.Text.Json.JsonEncodedText MemberImmediate = System.Text.Json.JsonEncodedText.Encode("immediate");
+	private static readonly System.Text.Json.JsonEncodedText MemberHigh = System.Text.Json.JsonEncodedText.Encode("high");
+
+	public override WaitForEvents Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "urgent":
-				return WaitForEvents.Urgent;
-			case "normal":
-				return WaitForEvents.Normal;
-			case "low":
-				return WaitForEvents.Low;
-			case "languid":
-				return WaitForEvents.Languid;
-			case "immediate":
-				return WaitForEvents.Immediate;
-			case "high":
-				return WaitForEvents.High;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberUrgent))
+		{
+			return WaitForEvents.Urgent;
+		}
+
+		if (reader.ValueTextEquals(MemberNormal))
+		{
+			return WaitForEvents.Normal;
+		}
+
+		if (reader.ValueTextEquals(MemberLow))
+		{
+			return WaitForEvents.Low;
+		}
+
+		if (reader.ValueTextEquals(MemberLanguid))
+		{
+			return WaitForEvents.Languid;
+		}
+
+		if (reader.ValueTextEquals(MemberImmediate))
+		{
+			return WaitForEvents.Immediate;
+		}
+
+		if (reader.ValueTextEquals(MemberHigh))
+		{
+			return WaitForEvents.High;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(WaitForEvents)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, WaitForEvents value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, WaitForEvents value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case WaitForEvents.Urgent:
-				writer.WriteStringValue("urgent");
-				return;
+				writer.WriteStringValue(MemberUrgent);
+				break;
 			case WaitForEvents.Normal:
-				writer.WriteStringValue("normal");
-				return;
+				writer.WriteStringValue(MemberNormal);
+				break;
 			case WaitForEvents.Low:
-				writer.WriteStringValue("low");
-				return;
+				writer.WriteStringValue(MemberLow);
+				break;
 			case WaitForEvents.Languid:
-				writer.WriteStringValue("languid");
-				return;
+				writer.WriteStringValue(MemberLanguid);
+				break;
 			case WaitForEvents.Immediate:
-				writer.WriteStringValue("immediate");
-				return;
+				writer.WriteStringValue(MemberImmediate);
+				break;
 			case WaitForEvents.High:
-				writer.WriteStringValue("high");
-				return;
+				writer.WriteStringValue(MemberHigh);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(WaitForEvents)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.QueryDsl.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.QueryDsl.g.cs
index e5e98a0d91a..2dff5b4f356 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.QueryDsl.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.QueryDsl.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Core;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport;
 using System;
@@ -43,51 +44,67 @@ public enum ChildScoreMode
 	Avg
 }
 
-internal sealed class ChildScoreModeConverter : JsonConverter<ChildScoreMode>
+internal sealed partial class ChildScoreModeConverter : System.Text.Json.Serialization.JsonConverter<ChildScoreMode>
 {
-	public override ChildScoreMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberSum = System.Text.Json.JsonEncodedText.Encode("sum");
+	private static readonly System.Text.Json.JsonEncodedText MemberNone = System.Text.Json.JsonEncodedText.Encode("none");
+	private static readonly System.Text.Json.JsonEncodedText MemberMin = System.Text.Json.JsonEncodedText.Encode("min");
+	private static readonly System.Text.Json.JsonEncodedText MemberMax = System.Text.Json.JsonEncodedText.Encode("max");
+	private static readonly System.Text.Json.JsonEncodedText MemberAvg = System.Text.Json.JsonEncodedText.Encode("avg");
+
+	public override ChildScoreMode Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "sum":
-				return ChildScoreMode.Sum;
-			case "none":
-				return ChildScoreMode.None;
-			case "min":
-				return ChildScoreMode.Min;
-			case "max":
-				return ChildScoreMode.Max;
-			case "avg":
-				return ChildScoreMode.Avg;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberSum))
+		{
+			return ChildScoreMode.Sum;
+		}
+
+		if (reader.ValueTextEquals(MemberNone))
+		{
+			return ChildScoreMode.None;
+		}
+
+		if (reader.ValueTextEquals(MemberMin))
+		{
+			return ChildScoreMode.Min;
+		}
+
+		if (reader.ValueTextEquals(MemberMax))
+		{
+			return ChildScoreMode.Max;
+		}
+
+		if (reader.ValueTextEquals(MemberAvg))
+		{
+			return ChildScoreMode.Avg;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(ChildScoreMode)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, ChildScoreMode value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ChildScoreMode value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case ChildScoreMode.Sum:
-				writer.WriteStringValue("sum");
-				return;
+				writer.WriteStringValue(MemberSum);
+				break;
 			case ChildScoreMode.None:
-				writer.WriteStringValue("none");
-				return;
+				writer.WriteStringValue(MemberNone);
+				break;
 			case ChildScoreMode.Min:
-				writer.WriteStringValue("min");
-				return;
+				writer.WriteStringValue(MemberMin);
+				break;
 			case ChildScoreMode.Max:
-				writer.WriteStringValue("max");
-				return;
+				writer.WriteStringValue(MemberMax);
+				break;
 			case ChildScoreMode.Avg:
-				writer.WriteStringValue("avg");
-				return;
+				writer.WriteStringValue(MemberAvg);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(ChildScoreMode)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -100,36 +117,40 @@ public enum CombinedFieldsOperator
 	And
 }
 
-internal sealed class CombinedFieldsOperatorConverter : JsonConverter<CombinedFieldsOperator>
+internal sealed partial class CombinedFieldsOperatorConverter : System.Text.Json.Serialization.JsonConverter<CombinedFieldsOperator>
 {
-	public override CombinedFieldsOperator Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberOr = System.Text.Json.JsonEncodedText.Encode("or");
+	private static readonly System.Text.Json.JsonEncodedText MemberAnd = System.Text.Json.JsonEncodedText.Encode("and");
+
+	public override CombinedFieldsOperator Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberOr))
+		{
+			return CombinedFieldsOperator.Or;
+		}
+
+		if (reader.ValueTextEquals(MemberAnd))
 		{
-			case "or":
-				return CombinedFieldsOperator.Or;
-			case "and":
-				return CombinedFieldsOperator.And;
+			return CombinedFieldsOperator.And;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(CombinedFieldsOperator)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, CombinedFieldsOperator value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, CombinedFieldsOperator value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case CombinedFieldsOperator.Or:
-				writer.WriteStringValue("or");
-				return;
+				writer.WriteStringValue(MemberOr);
+				break;
 			case CombinedFieldsOperator.And:
-				writer.WriteStringValue("and");
-				return;
+				writer.WriteStringValue(MemberAnd);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(CombinedFieldsOperator)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -152,36 +173,40 @@ public enum CombinedFieldsZeroTerms
 	All
 }
 
-internal sealed class CombinedFieldsZeroTermsConverter : JsonConverter<CombinedFieldsZeroTerms>
+internal sealed partial class CombinedFieldsZeroTermsConverter : System.Text.Json.Serialization.JsonConverter<CombinedFieldsZeroTerms>
 {
-	public override CombinedFieldsZeroTerms Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberNone = System.Text.Json.JsonEncodedText.Encode("none");
+	private static readonly System.Text.Json.JsonEncodedText MemberAll = System.Text.Json.JsonEncodedText.Encode("all");
+
+	public override CombinedFieldsZeroTerms Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberNone))
+		{
+			return CombinedFieldsZeroTerms.None;
+		}
+
+		if (reader.ValueTextEquals(MemberAll))
 		{
-			case "none":
-				return CombinedFieldsZeroTerms.None;
-			case "all":
-				return CombinedFieldsZeroTerms.All;
+			return CombinedFieldsZeroTerms.All;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(CombinedFieldsZeroTerms)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, CombinedFieldsZeroTerms value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, CombinedFieldsZeroTerms value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case CombinedFieldsZeroTerms.None:
-				writer.WriteStringValue("none");
-				return;
+				writer.WriteStringValue(MemberNone);
+				break;
 			case CombinedFieldsZeroTerms.All:
-				writer.WriteStringValue("all");
-				return;
+				writer.WriteStringValue(MemberAll);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(CombinedFieldsZeroTerms)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -262,76 +287,112 @@ public enum FieldValueFactorModifier
 	Ln
 }
 
-internal sealed class FieldValueFactorModifierConverter : JsonConverter<FieldValueFactorModifier>
+internal sealed partial class FieldValueFactorModifierConverter : System.Text.Json.Serialization.JsonConverter<FieldValueFactorModifier>
 {
-	public override FieldValueFactorModifier Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberSquare = System.Text.Json.JsonEncodedText.Encode("square");
+	private static readonly System.Text.Json.JsonEncodedText MemberSqrt = System.Text.Json.JsonEncodedText.Encode("sqrt");
+	private static readonly System.Text.Json.JsonEncodedText MemberReciprocal = System.Text.Json.JsonEncodedText.Encode("reciprocal");
+	private static readonly System.Text.Json.JsonEncodedText MemberNone = System.Text.Json.JsonEncodedText.Encode("none");
+	private static readonly System.Text.Json.JsonEncodedText MemberLog2p = System.Text.Json.JsonEncodedText.Encode("log2p");
+	private static readonly System.Text.Json.JsonEncodedText MemberLog1p = System.Text.Json.JsonEncodedText.Encode("log1p");
+	private static readonly System.Text.Json.JsonEncodedText MemberLog = System.Text.Json.JsonEncodedText.Encode("log");
+	private static readonly System.Text.Json.JsonEncodedText MemberLn2p = System.Text.Json.JsonEncodedText.Encode("ln2p");
+	private static readonly System.Text.Json.JsonEncodedText MemberLn1p = System.Text.Json.JsonEncodedText.Encode("ln1p");
+	private static readonly System.Text.Json.JsonEncodedText MemberLn = System.Text.Json.JsonEncodedText.Encode("ln");
+
+	public override FieldValueFactorModifier Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "square":
-				return FieldValueFactorModifier.Square;
-			case "sqrt":
-				return FieldValueFactorModifier.Sqrt;
-			case "reciprocal":
-				return FieldValueFactorModifier.Reciprocal;
-			case "none":
-				return FieldValueFactorModifier.None;
-			case "log2p":
-				return FieldValueFactorModifier.Log2p;
-			case "log1p":
-				return FieldValueFactorModifier.Log1p;
-			case "log":
-				return FieldValueFactorModifier.Log;
-			case "ln2p":
-				return FieldValueFactorModifier.Ln2p;
-			case "ln1p":
-				return FieldValueFactorModifier.Ln1p;
-			case "ln":
-				return FieldValueFactorModifier.Ln;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberSquare))
+		{
+			return FieldValueFactorModifier.Square;
+		}
+
+		if (reader.ValueTextEquals(MemberSqrt))
+		{
+			return FieldValueFactorModifier.Sqrt;
+		}
+
+		if (reader.ValueTextEquals(MemberReciprocal))
+		{
+			return FieldValueFactorModifier.Reciprocal;
+		}
+
+		if (reader.ValueTextEquals(MemberNone))
+		{
+			return FieldValueFactorModifier.None;
+		}
+
+		if (reader.ValueTextEquals(MemberLog2p))
+		{
+			return FieldValueFactorModifier.Log2p;
+		}
+
+		if (reader.ValueTextEquals(MemberLog1p))
+		{
+			return FieldValueFactorModifier.Log1p;
+		}
+
+		if (reader.ValueTextEquals(MemberLog))
+		{
+			return FieldValueFactorModifier.Log;
+		}
+
+		if (reader.ValueTextEquals(MemberLn2p))
+		{
+			return FieldValueFactorModifier.Ln2p;
+		}
+
+		if (reader.ValueTextEquals(MemberLn1p))
+		{
+			return FieldValueFactorModifier.Ln1p;
+		}
+
+		if (reader.ValueTextEquals(MemberLn))
+		{
+			return FieldValueFactorModifier.Ln;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(FieldValueFactorModifier)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, FieldValueFactorModifier value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, FieldValueFactorModifier value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case FieldValueFactorModifier.Square:
-				writer.WriteStringValue("square");
-				return;
+				writer.WriteStringValue(MemberSquare);
+				break;
 			case FieldValueFactorModifier.Sqrt:
-				writer.WriteStringValue("sqrt");
-				return;
+				writer.WriteStringValue(MemberSqrt);
+				break;
 			case FieldValueFactorModifier.Reciprocal:
-				writer.WriteStringValue("reciprocal");
-				return;
+				writer.WriteStringValue(MemberReciprocal);
+				break;
 			case FieldValueFactorModifier.None:
-				writer.WriteStringValue("none");
-				return;
+				writer.WriteStringValue(MemberNone);
+				break;
 			case FieldValueFactorModifier.Log2p:
-				writer.WriteStringValue("log2p");
-				return;
+				writer.WriteStringValue(MemberLog2p);
+				break;
 			case FieldValueFactorModifier.Log1p:
-				writer.WriteStringValue("log1p");
-				return;
+				writer.WriteStringValue(MemberLog1p);
+				break;
 			case FieldValueFactorModifier.Log:
-				writer.WriteStringValue("log");
-				return;
+				writer.WriteStringValue(MemberLog);
+				break;
 			case FieldValueFactorModifier.Ln2p:
-				writer.WriteStringValue("ln2p");
-				return;
+				writer.WriteStringValue(MemberLn2p);
+				break;
 			case FieldValueFactorModifier.Ln1p:
-				writer.WriteStringValue("ln1p");
-				return;
+				writer.WriteStringValue(MemberLn1p);
+				break;
 			case FieldValueFactorModifier.Ln:
-				writer.WriteStringValue("ln");
-				return;
+				writer.WriteStringValue(MemberLn);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(FieldValueFactorModifier)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -383,56 +444,76 @@ public enum FunctionBoostMode
 	Avg
 }
 
-internal sealed class FunctionBoostModeConverter : JsonConverter<FunctionBoostMode>
+internal sealed partial class FunctionBoostModeConverter : System.Text.Json.Serialization.JsonConverter<FunctionBoostMode>
 {
-	public override FunctionBoostMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberSum = System.Text.Json.JsonEncodedText.Encode("sum");
+	private static readonly System.Text.Json.JsonEncodedText MemberReplace = System.Text.Json.JsonEncodedText.Encode("replace");
+	private static readonly System.Text.Json.JsonEncodedText MemberMultiply = System.Text.Json.JsonEncodedText.Encode("multiply");
+	private static readonly System.Text.Json.JsonEncodedText MemberMin = System.Text.Json.JsonEncodedText.Encode("min");
+	private static readonly System.Text.Json.JsonEncodedText MemberMax = System.Text.Json.JsonEncodedText.Encode("max");
+	private static readonly System.Text.Json.JsonEncodedText MemberAvg = System.Text.Json.JsonEncodedText.Encode("avg");
+
+	public override FunctionBoostMode Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "sum":
-				return FunctionBoostMode.Sum;
-			case "replace":
-				return FunctionBoostMode.Replace;
-			case "multiply":
-				return FunctionBoostMode.Multiply;
-			case "min":
-				return FunctionBoostMode.Min;
-			case "max":
-				return FunctionBoostMode.Max;
-			case "avg":
-				return FunctionBoostMode.Avg;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberSum))
+		{
+			return FunctionBoostMode.Sum;
+		}
+
+		if (reader.ValueTextEquals(MemberReplace))
+		{
+			return FunctionBoostMode.Replace;
+		}
+
+		if (reader.ValueTextEquals(MemberMultiply))
+		{
+			return FunctionBoostMode.Multiply;
+		}
+
+		if (reader.ValueTextEquals(MemberMin))
+		{
+			return FunctionBoostMode.Min;
+		}
+
+		if (reader.ValueTextEquals(MemberMax))
+		{
+			return FunctionBoostMode.Max;
+		}
+
+		if (reader.ValueTextEquals(MemberAvg))
+		{
+			return FunctionBoostMode.Avg;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(FunctionBoostMode)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, FunctionBoostMode value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, FunctionBoostMode value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case FunctionBoostMode.Sum:
-				writer.WriteStringValue("sum");
-				return;
+				writer.WriteStringValue(MemberSum);
+				break;
 			case FunctionBoostMode.Replace:
-				writer.WriteStringValue("replace");
-				return;
+				writer.WriteStringValue(MemberReplace);
+				break;
 			case FunctionBoostMode.Multiply:
-				writer.WriteStringValue("multiply");
-				return;
+				writer.WriteStringValue(MemberMultiply);
+				break;
 			case FunctionBoostMode.Min:
-				writer.WriteStringValue("min");
-				return;
+				writer.WriteStringValue(MemberMin);
+				break;
 			case FunctionBoostMode.Max:
-				writer.WriteStringValue("max");
-				return;
+				writer.WriteStringValue(MemberMax);
+				break;
 			case FunctionBoostMode.Avg:
-				writer.WriteStringValue("avg");
-				return;
+				writer.WriteStringValue(MemberAvg);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(FunctionBoostMode)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -483,56 +564,76 @@ public enum FunctionScoreMode
 	Avg
 }
 
-internal sealed class FunctionScoreModeConverter : JsonConverter<FunctionScoreMode>
+internal sealed partial class FunctionScoreModeConverter : System.Text.Json.Serialization.JsonConverter<FunctionScoreMode>
 {
-	public override FunctionScoreMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberSum = System.Text.Json.JsonEncodedText.Encode("sum");
+	private static readonly System.Text.Json.JsonEncodedText MemberMultiply = System.Text.Json.JsonEncodedText.Encode("multiply");
+	private static readonly System.Text.Json.JsonEncodedText MemberMin = System.Text.Json.JsonEncodedText.Encode("min");
+	private static readonly System.Text.Json.JsonEncodedText MemberMax = System.Text.Json.JsonEncodedText.Encode("max");
+	private static readonly System.Text.Json.JsonEncodedText MemberFirst = System.Text.Json.JsonEncodedText.Encode("first");
+	private static readonly System.Text.Json.JsonEncodedText MemberAvg = System.Text.Json.JsonEncodedText.Encode("avg");
+
+	public override FunctionScoreMode Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "sum":
-				return FunctionScoreMode.Sum;
-			case "multiply":
-				return FunctionScoreMode.Multiply;
-			case "min":
-				return FunctionScoreMode.Min;
-			case "max":
-				return FunctionScoreMode.Max;
-			case "first":
-				return FunctionScoreMode.First;
-			case "avg":
-				return FunctionScoreMode.Avg;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberSum))
+		{
+			return FunctionScoreMode.Sum;
+		}
+
+		if (reader.ValueTextEquals(MemberMultiply))
+		{
+			return FunctionScoreMode.Multiply;
+		}
+
+		if (reader.ValueTextEquals(MemberMin))
+		{
+			return FunctionScoreMode.Min;
+		}
+
+		if (reader.ValueTextEquals(MemberMax))
+		{
+			return FunctionScoreMode.Max;
+		}
+
+		if (reader.ValueTextEquals(MemberFirst))
+		{
+			return FunctionScoreMode.First;
+		}
+
+		if (reader.ValueTextEquals(MemberAvg))
+		{
+			return FunctionScoreMode.Avg;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(FunctionScoreMode)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, FunctionScoreMode value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, FunctionScoreMode value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case FunctionScoreMode.Sum:
-				writer.WriteStringValue("sum");
-				return;
+				writer.WriteStringValue(MemberSum);
+				break;
 			case FunctionScoreMode.Multiply:
-				writer.WriteStringValue("multiply");
-				return;
+				writer.WriteStringValue(MemberMultiply);
+				break;
 			case FunctionScoreMode.Min:
-				writer.WriteStringValue("min");
-				return;
+				writer.WriteStringValue(MemberMin);
+				break;
 			case FunctionScoreMode.Max:
-				writer.WriteStringValue("max");
-				return;
+				writer.WriteStringValue(MemberMax);
+				break;
 			case FunctionScoreMode.First:
-				writer.WriteStringValue("first");
-				return;
+				writer.WriteStringValue(MemberFirst);
+				break;
 			case FunctionScoreMode.Avg:
-				writer.WriteStringValue("avg");
-				return;
+				writer.WriteStringValue(MemberAvg);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(FunctionScoreMode)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -557,41 +658,49 @@ public enum GeoValidationMethod
 	Coerce
 }
 
-internal sealed class GeoValidationMethodConverter : JsonConverter<GeoValidationMethod>
+internal sealed partial class GeoValidationMethodConverter : System.Text.Json.Serialization.JsonConverter<GeoValidationMethod>
 {
-	public override GeoValidationMethod Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberStrict = System.Text.Json.JsonEncodedText.Encode("strict");
+	private static readonly System.Text.Json.JsonEncodedText MemberIgnoreMalformed = System.Text.Json.JsonEncodedText.Encode("ignore_malformed");
+	private static readonly System.Text.Json.JsonEncodedText MemberCoerce = System.Text.Json.JsonEncodedText.Encode("coerce");
+
+	public override GeoValidationMethod Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberStrict))
+		{
+			return GeoValidationMethod.Strict;
+		}
+
+		if (reader.ValueTextEquals(MemberIgnoreMalformed))
 		{
-			case "strict":
-				return GeoValidationMethod.Strict;
-			case "ignore_malformed":
-				return GeoValidationMethod.IgnoreMalformed;
-			case "coerce":
-				return GeoValidationMethod.Coerce;
+			return GeoValidationMethod.IgnoreMalformed;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberCoerce))
+		{
+			return GeoValidationMethod.Coerce;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(GeoValidationMethod)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, GeoValidationMethod value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GeoValidationMethod value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case GeoValidationMethod.Strict:
-				writer.WriteStringValue("strict");
-				return;
+				writer.WriteStringValue(MemberStrict);
+				break;
 			case GeoValidationMethod.IgnoreMalformed:
-				writer.WriteStringValue("ignore_malformed");
-				return;
+				writer.WriteStringValue(MemberIgnoreMalformed);
+				break;
 			case GeoValidationMethod.Coerce:
-				writer.WriteStringValue("coerce");
-				return;
+				writer.WriteStringValue(MemberCoerce);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(GeoValidationMethod)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -628,46 +737,58 @@ public enum MultiValueMode
 	Avg
 }
 
-internal sealed class MultiValueModeConverter : JsonConverter<MultiValueMode>
+internal sealed partial class MultiValueModeConverter : System.Text.Json.Serialization.JsonConverter<MultiValueMode>
 {
-	public override MultiValueMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberSum = System.Text.Json.JsonEncodedText.Encode("sum");
+	private static readonly System.Text.Json.JsonEncodedText MemberMin = System.Text.Json.JsonEncodedText.Encode("min");
+	private static readonly System.Text.Json.JsonEncodedText MemberMax = System.Text.Json.JsonEncodedText.Encode("max");
+	private static readonly System.Text.Json.JsonEncodedText MemberAvg = System.Text.Json.JsonEncodedText.Encode("avg");
+
+	public override MultiValueMode Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberSum))
+		{
+			return MultiValueMode.Sum;
+		}
+
+		if (reader.ValueTextEquals(MemberMin))
+		{
+			return MultiValueMode.Min;
+		}
+
+		if (reader.ValueTextEquals(MemberMax))
+		{
+			return MultiValueMode.Max;
+		}
+
+		if (reader.ValueTextEquals(MemberAvg))
 		{
-			case "sum":
-				return MultiValueMode.Sum;
-			case "min":
-				return MultiValueMode.Min;
-			case "max":
-				return MultiValueMode.Max;
-			case "avg":
-				return MultiValueMode.Avg;
+			return MultiValueMode.Avg;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(MultiValueMode)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, MultiValueMode value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, MultiValueMode value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case MultiValueMode.Sum:
-				writer.WriteStringValue("sum");
-				return;
+				writer.WriteStringValue(MemberSum);
+				break;
 			case MultiValueMode.Min:
-				writer.WriteStringValue("min");
-				return;
+				writer.WriteStringValue(MemberMin);
+				break;
 			case MultiValueMode.Max:
-				writer.WriteStringValue("max");
-				return;
+				writer.WriteStringValue(MemberMax);
+				break;
 			case MultiValueMode.Avg:
-				writer.WriteStringValue("avg");
-				return;
+				writer.WriteStringValue(MemberAvg);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(MultiValueMode)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -680,38 +801,42 @@ public enum Operator
 	And
 }
 
-internal sealed class OperatorConverter : JsonConverter<Operator>
+internal sealed partial class OperatorConverter : System.Text.Json.Serialization.JsonConverter<Operator>
 {
-	public override Operator Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberOr = System.Text.Json.JsonEncodedText.Encode("or");
+	private static readonly System.Text.Json.JsonEncodedText MemberOr1 = System.Text.Json.JsonEncodedText.Encode("OR");
+	private static readonly System.Text.Json.JsonEncodedText MemberAnd = System.Text.Json.JsonEncodedText.Encode("and");
+	private static readonly System.Text.Json.JsonEncodedText MemberAnd1 = System.Text.Json.JsonEncodedText.Encode("AND");
+
+	public override Operator Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberOr) || reader.ValueTextEquals(MemberOr1))
+		{
+			return Operator.Or;
+		}
+
+		if (reader.ValueTextEquals(MemberAnd) || reader.ValueTextEquals(MemberAnd1))
 		{
-			case "or":
-			case "OR":
-				return Operator.Or;
-			case "and":
-			case "AND":
-				return Operator.And;
+			return Operator.And;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(Operator)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, Operator value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, Operator value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case Operator.Or:
-				writer.WriteStringValue("or");
-				return;
+				writer.WriteStringValue(MemberOr);
+				break;
 			case Operator.And:
-				writer.WriteStringValue("and");
-				return;
+				writer.WriteStringValue(MemberAnd);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(Operator)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -741,41 +866,49 @@ public enum RangeRelation
 	Contains
 }
 
-internal sealed class RangeRelationConverter : JsonConverter<RangeRelation>
+internal sealed partial class RangeRelationConverter : System.Text.Json.Serialization.JsonConverter<RangeRelation>
 {
-	public override RangeRelation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberWithin = System.Text.Json.JsonEncodedText.Encode("within");
+	private static readonly System.Text.Json.JsonEncodedText MemberIntersects = System.Text.Json.JsonEncodedText.Encode("intersects");
+	private static readonly System.Text.Json.JsonEncodedText MemberContains = System.Text.Json.JsonEncodedText.Encode("contains");
+
+	public override RangeRelation Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberWithin))
+		{
+			return RangeRelation.Within;
+		}
+
+		if (reader.ValueTextEquals(MemberIntersects))
 		{
-			case "within":
-				return RangeRelation.Within;
-			case "intersects":
-				return RangeRelation.Intersects;
-			case "contains":
-				return RangeRelation.Contains;
+			return RangeRelation.Intersects;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberContains))
+		{
+			return RangeRelation.Contains;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(RangeRelation)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, RangeRelation value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, RangeRelation value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case RangeRelation.Within:
-				writer.WriteStringValue("within");
-				return;
+				writer.WriteStringValue(MemberWithin);
+				break;
 			case RangeRelation.Intersects:
-				writer.WriteStringValue("intersects");
-				return;
+				writer.WriteStringValue(MemberIntersects);
+				break;
 			case RangeRelation.Contains:
-				writer.WriteStringValue("contains");
-				return;
+				writer.WriteStringValue(MemberContains);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(RangeRelation)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -1008,56 +1141,76 @@ public enum TextQueryType
 	BestFields
 }
 
-internal sealed class TextQueryTypeConverter : JsonConverter<TextQueryType>
+internal sealed partial class TextQueryTypeConverter : System.Text.Json.Serialization.JsonConverter<TextQueryType>
 {
-	public override TextQueryType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberPhrasePrefix = System.Text.Json.JsonEncodedText.Encode("phrase_prefix");
+	private static readonly System.Text.Json.JsonEncodedText MemberPhrase = System.Text.Json.JsonEncodedText.Encode("phrase");
+	private static readonly System.Text.Json.JsonEncodedText MemberMostFields = System.Text.Json.JsonEncodedText.Encode("most_fields");
+	private static readonly System.Text.Json.JsonEncodedText MemberCrossFields = System.Text.Json.JsonEncodedText.Encode("cross_fields");
+	private static readonly System.Text.Json.JsonEncodedText MemberBoolPrefix = System.Text.Json.JsonEncodedText.Encode("bool_prefix");
+	private static readonly System.Text.Json.JsonEncodedText MemberBestFields = System.Text.Json.JsonEncodedText.Encode("best_fields");
+
+	public override TextQueryType Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "phrase_prefix":
-				return TextQueryType.PhrasePrefix;
-			case "phrase":
-				return TextQueryType.Phrase;
-			case "most_fields":
-				return TextQueryType.MostFields;
-			case "cross_fields":
-				return TextQueryType.CrossFields;
-			case "bool_prefix":
-				return TextQueryType.BoolPrefix;
-			case "best_fields":
-				return TextQueryType.BestFields;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberPhrasePrefix))
+		{
+			return TextQueryType.PhrasePrefix;
+		}
+
+		if (reader.ValueTextEquals(MemberPhrase))
+		{
+			return TextQueryType.Phrase;
+		}
+
+		if (reader.ValueTextEquals(MemberMostFields))
+		{
+			return TextQueryType.MostFields;
+		}
+
+		if (reader.ValueTextEquals(MemberCrossFields))
+		{
+			return TextQueryType.CrossFields;
+		}
+
+		if (reader.ValueTextEquals(MemberBoolPrefix))
+		{
+			return TextQueryType.BoolPrefix;
+		}
+
+		if (reader.ValueTextEquals(MemberBestFields))
+		{
+			return TextQueryType.BestFields;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(TextQueryType)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, TextQueryType value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, TextQueryType value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case TextQueryType.PhrasePrefix:
-				writer.WriteStringValue("phrase_prefix");
-				return;
+				writer.WriteStringValue(MemberPhrasePrefix);
+				break;
 			case TextQueryType.Phrase:
-				writer.WriteStringValue("phrase");
-				return;
+				writer.WriteStringValue(MemberPhrase);
+				break;
 			case TextQueryType.MostFields:
-				writer.WriteStringValue("most_fields");
-				return;
+				writer.WriteStringValue(MemberMostFields);
+				break;
 			case TextQueryType.CrossFields:
-				writer.WriteStringValue("cross_fields");
-				return;
+				writer.WriteStringValue(MemberCrossFields);
+				break;
 			case TextQueryType.BoolPrefix:
-				writer.WriteStringValue("bool_prefix");
-				return;
+				writer.WriteStringValue(MemberBoolPrefix);
+				break;
 			case TextQueryType.BestFields:
-				writer.WriteStringValue("best_fields");
-				return;
+				writer.WriteStringValue(MemberBestFields);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(TextQueryType)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -1080,35 +1233,39 @@ public enum ZeroTermsQuery
 	All
 }
 
-internal sealed class ZeroTermsQueryConverter : JsonConverter<ZeroTermsQuery>
+internal sealed partial class ZeroTermsQueryConverter : System.Text.Json.Serialization.JsonConverter<ZeroTermsQuery>
 {
-	public override ZeroTermsQuery Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberNone = System.Text.Json.JsonEncodedText.Encode("none");
+	private static readonly System.Text.Json.JsonEncodedText MemberAll = System.Text.Json.JsonEncodedText.Encode("all");
+
+	public override ZeroTermsQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberNone))
 		{
-			case "none":
-				return ZeroTermsQuery.None;
-			case "all":
-				return ZeroTermsQuery.All;
+			return ZeroTermsQuery.None;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberAll))
+		{
+			return ZeroTermsQuery.All;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(ZeroTermsQuery)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, ZeroTermsQuery value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ZeroTermsQuery value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case ZeroTermsQuery.None:
-				writer.WriteStringValue("none");
-				return;
+				writer.WriteStringValue(MemberNone);
+				break;
 			case ZeroTermsQuery.All:
-				writer.WriteStringValue("all");
-				return;
+				writer.WriteStringValue(MemberAll);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(ZeroTermsQuery)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.QueryRules.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.QueryRules.g.cs
index a363213625d..bb60d19a30a 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.QueryRules.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.QueryRules.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Core;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport;
 using System;
@@ -57,86 +58,130 @@ public enum QueryRuleCriteriaType
 	Always
 }
 
-internal sealed class QueryRuleCriteriaTypeConverter : JsonConverter<QueryRuleCriteriaType>
+internal sealed partial class QueryRuleCriteriaTypeConverter : System.Text.Json.Serialization.JsonConverter<QueryRuleCriteriaType>
 {
-	public override QueryRuleCriteriaType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberSuffix = System.Text.Json.JsonEncodedText.Encode("suffix");
+	private static readonly System.Text.Json.JsonEncodedText MemberPrefix = System.Text.Json.JsonEncodedText.Encode("prefix");
+	private static readonly System.Text.Json.JsonEncodedText MemberLte = System.Text.Json.JsonEncodedText.Encode("lte");
+	private static readonly System.Text.Json.JsonEncodedText MemberLt = System.Text.Json.JsonEncodedText.Encode("lt");
+	private static readonly System.Text.Json.JsonEncodedText MemberGte = System.Text.Json.JsonEncodedText.Encode("gte");
+	private static readonly System.Text.Json.JsonEncodedText MemberGt = System.Text.Json.JsonEncodedText.Encode("gt");
+	private static readonly System.Text.Json.JsonEncodedText MemberGlobal = System.Text.Json.JsonEncodedText.Encode("global");
+	private static readonly System.Text.Json.JsonEncodedText MemberFuzzy = System.Text.Json.JsonEncodedText.Encode("fuzzy");
+	private static readonly System.Text.Json.JsonEncodedText MemberExactFuzzy = System.Text.Json.JsonEncodedText.Encode("exact_fuzzy");
+	private static readonly System.Text.Json.JsonEncodedText MemberExact = System.Text.Json.JsonEncodedText.Encode("exact");
+	private static readonly System.Text.Json.JsonEncodedText MemberContains = System.Text.Json.JsonEncodedText.Encode("contains");
+	private static readonly System.Text.Json.JsonEncodedText MemberAlways = System.Text.Json.JsonEncodedText.Encode("always");
+
+	public override QueryRuleCriteriaType Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "suffix":
-				return QueryRuleCriteriaType.Suffix;
-			case "prefix":
-				return QueryRuleCriteriaType.Prefix;
-			case "lte":
-				return QueryRuleCriteriaType.Lte;
-			case "lt":
-				return QueryRuleCriteriaType.Lt;
-			case "gte":
-				return QueryRuleCriteriaType.Gte;
-			case "gt":
-				return QueryRuleCriteriaType.Gt;
-			case "global":
-				return QueryRuleCriteriaType.Global;
-			case "fuzzy":
-				return QueryRuleCriteriaType.Fuzzy;
-			case "exact_fuzzy":
-				return QueryRuleCriteriaType.ExactFuzzy;
-			case "exact":
-				return QueryRuleCriteriaType.Exact;
-			case "contains":
-				return QueryRuleCriteriaType.Contains;
-			case "always":
-				return QueryRuleCriteriaType.Always;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberSuffix))
+		{
+			return QueryRuleCriteriaType.Suffix;
+		}
+
+		if (reader.ValueTextEquals(MemberPrefix))
+		{
+			return QueryRuleCriteriaType.Prefix;
+		}
+
+		if (reader.ValueTextEquals(MemberLte))
+		{
+			return QueryRuleCriteriaType.Lte;
+		}
+
+		if (reader.ValueTextEquals(MemberLt))
+		{
+			return QueryRuleCriteriaType.Lt;
+		}
+
+		if (reader.ValueTextEquals(MemberGte))
+		{
+			return QueryRuleCriteriaType.Gte;
+		}
+
+		if (reader.ValueTextEquals(MemberGt))
+		{
+			return QueryRuleCriteriaType.Gt;
+		}
+
+		if (reader.ValueTextEquals(MemberGlobal))
+		{
+			return QueryRuleCriteriaType.Global;
+		}
+
+		if (reader.ValueTextEquals(MemberFuzzy))
+		{
+			return QueryRuleCriteriaType.Fuzzy;
+		}
+
+		if (reader.ValueTextEquals(MemberExactFuzzy))
+		{
+			return QueryRuleCriteriaType.ExactFuzzy;
+		}
+
+		if (reader.ValueTextEquals(MemberExact))
+		{
+			return QueryRuleCriteriaType.Exact;
+		}
+
+		if (reader.ValueTextEquals(MemberContains))
+		{
+			return QueryRuleCriteriaType.Contains;
+		}
+
+		if (reader.ValueTextEquals(MemberAlways))
+		{
+			return QueryRuleCriteriaType.Always;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(QueryRuleCriteriaType)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, QueryRuleCriteriaType value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, QueryRuleCriteriaType value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case QueryRuleCriteriaType.Suffix:
-				writer.WriteStringValue("suffix");
-				return;
+				writer.WriteStringValue(MemberSuffix);
+				break;
 			case QueryRuleCriteriaType.Prefix:
-				writer.WriteStringValue("prefix");
-				return;
+				writer.WriteStringValue(MemberPrefix);
+				break;
 			case QueryRuleCriteriaType.Lte:
-				writer.WriteStringValue("lte");
-				return;
+				writer.WriteStringValue(MemberLte);
+				break;
 			case QueryRuleCriteriaType.Lt:
-				writer.WriteStringValue("lt");
-				return;
+				writer.WriteStringValue(MemberLt);
+				break;
 			case QueryRuleCriteriaType.Gte:
-				writer.WriteStringValue("gte");
-				return;
+				writer.WriteStringValue(MemberGte);
+				break;
 			case QueryRuleCriteriaType.Gt:
-				writer.WriteStringValue("gt");
-				return;
+				writer.WriteStringValue(MemberGt);
+				break;
 			case QueryRuleCriteriaType.Global:
-				writer.WriteStringValue("global");
-				return;
+				writer.WriteStringValue(MemberGlobal);
+				break;
 			case QueryRuleCriteriaType.Fuzzy:
-				writer.WriteStringValue("fuzzy");
-				return;
+				writer.WriteStringValue(MemberFuzzy);
+				break;
 			case QueryRuleCriteriaType.ExactFuzzy:
-				writer.WriteStringValue("exact_fuzzy");
-				return;
+				writer.WriteStringValue(MemberExactFuzzy);
+				break;
 			case QueryRuleCriteriaType.Exact:
-				writer.WriteStringValue("exact");
-				return;
+				writer.WriteStringValue(MemberExact);
+				break;
 			case QueryRuleCriteriaType.Contains:
-				writer.WriteStringValue("contains");
-				return;
+				writer.WriteStringValue(MemberContains);
+				break;
 			case QueryRuleCriteriaType.Always:
-				writer.WriteStringValue("always");
-				return;
+				writer.WriteStringValue(MemberAlways);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(QueryRuleCriteriaType)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -149,35 +194,39 @@ public enum QueryRuleType
 	Exclude
 }
 
-internal sealed class QueryRuleTypeConverter : JsonConverter<QueryRuleType>
+internal sealed partial class QueryRuleTypeConverter : System.Text.Json.Serialization.JsonConverter<QueryRuleType>
 {
-	public override QueryRuleType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberPinned = System.Text.Json.JsonEncodedText.Encode("pinned");
+	private static readonly System.Text.Json.JsonEncodedText MemberExclude = System.Text.Json.JsonEncodedText.Encode("exclude");
+
+	public override QueryRuleType Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberPinned))
 		{
-			case "pinned":
-				return QueryRuleType.Pinned;
-			case "exclude":
-				return QueryRuleType.Exclude;
+			return QueryRuleType.Pinned;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberExclude))
+		{
+			return QueryRuleType.Exclude;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(QueryRuleType)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, QueryRuleType value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, QueryRuleType value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case QueryRuleType.Pinned:
-				writer.WriteStringValue("pinned");
-				return;
+				writer.WriteStringValue(MemberPinned);
+				break;
 			case QueryRuleType.Exclude:
-				writer.WriteStringValue("exclude");
-				return;
+				writer.WriteStringValue(MemberExclude);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(QueryRuleType)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.Security.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.Security.g.cs
index bd9dce49136..470f24f2d02 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.Security.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.Security.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Core;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport;
 using System;
@@ -41,46 +42,58 @@ public enum AccessTokenGrantType
 	ClientCredentials
 }
 
-internal sealed class AccessTokenGrantTypeConverter : JsonConverter<AccessTokenGrantType>
+internal sealed partial class AccessTokenGrantTypeConverter : System.Text.Json.Serialization.JsonConverter<AccessTokenGrantType>
 {
-	public override AccessTokenGrantType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberRefreshToken = System.Text.Json.JsonEncodedText.Encode("refresh_token");
+	private static readonly System.Text.Json.JsonEncodedText MemberPassword = System.Text.Json.JsonEncodedText.Encode("password");
+	private static readonly System.Text.Json.JsonEncodedText MemberKerberos = System.Text.Json.JsonEncodedText.Encode("_kerberos");
+	private static readonly System.Text.Json.JsonEncodedText MemberClientCredentials = System.Text.Json.JsonEncodedText.Encode("client_credentials");
+
+	public override AccessTokenGrantType Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberRefreshToken))
+		{
+			return AccessTokenGrantType.RefreshToken;
+		}
+
+		if (reader.ValueTextEquals(MemberPassword))
+		{
+			return AccessTokenGrantType.Password;
+		}
+
+		if (reader.ValueTextEquals(MemberKerberos))
+		{
+			return AccessTokenGrantType.Kerberos;
+		}
+
+		if (reader.ValueTextEquals(MemberClientCredentials))
 		{
-			case "refresh_token":
-				return AccessTokenGrantType.RefreshToken;
-			case "password":
-				return AccessTokenGrantType.Password;
-			case "_kerberos":
-				return AccessTokenGrantType.Kerberos;
-			case "client_credentials":
-				return AccessTokenGrantType.ClientCredentials;
+			return AccessTokenGrantType.ClientCredentials;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(AccessTokenGrantType)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, AccessTokenGrantType value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, AccessTokenGrantType value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case AccessTokenGrantType.RefreshToken:
-				writer.WriteStringValue("refresh_token");
-				return;
+				writer.WriteStringValue(MemberRefreshToken);
+				break;
 			case AccessTokenGrantType.Password:
-				writer.WriteStringValue("password");
-				return;
+				writer.WriteStringValue(MemberPassword);
+				break;
 			case AccessTokenGrantType.Kerberos:
-				writer.WriteStringValue("_kerberos");
-				return;
+				writer.WriteStringValue(MemberKerberos);
+				break;
 			case AccessTokenGrantType.ClientCredentials:
-				writer.WriteStringValue("client_credentials");
-				return;
+				writer.WriteStringValue(MemberClientCredentials);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(AccessTokenGrantType)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -93,36 +106,40 @@ public enum ApiKeyGrantType
 	AccessToken
 }
 
-internal sealed class ApiKeyGrantTypeConverter : JsonConverter<ApiKeyGrantType>
+internal sealed partial class ApiKeyGrantTypeConverter : System.Text.Json.Serialization.JsonConverter<ApiKeyGrantType>
 {
-	public override ApiKeyGrantType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberPassword = System.Text.Json.JsonEncodedText.Encode("password");
+	private static readonly System.Text.Json.JsonEncodedText MemberAccessToken = System.Text.Json.JsonEncodedText.Encode("access_token");
+
+	public override ApiKeyGrantType Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberPassword))
+		{
+			return ApiKeyGrantType.Password;
+		}
+
+		if (reader.ValueTextEquals(MemberAccessToken))
 		{
-			case "password":
-				return ApiKeyGrantType.Password;
-			case "access_token":
-				return ApiKeyGrantType.AccessToken;
+			return ApiKeyGrantType.AccessToken;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(ApiKeyGrantType)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, ApiKeyGrantType value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ApiKeyGrantType value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case ApiKeyGrantType.Password:
-				writer.WriteStringValue("password");
-				return;
+				writer.WriteStringValue(MemberPassword);
+				break;
 			case ApiKeyGrantType.AccessToken:
-				writer.WriteStringValue("access_token");
-				return;
+				writer.WriteStringValue(MemberAccessToken);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(ApiKeyGrantType)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -135,36 +152,40 @@ public enum ApiKeyType
 	CrossCluster
 }
 
-internal sealed class ApiKeyTypeConverter : JsonConverter<ApiKeyType>
+internal sealed partial class ApiKeyTypeConverter : System.Text.Json.Serialization.JsonConverter<ApiKeyType>
 {
-	public override ApiKeyType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberRest = System.Text.Json.JsonEncodedText.Encode("rest");
+	private static readonly System.Text.Json.JsonEncodedText MemberCrossCluster = System.Text.Json.JsonEncodedText.Encode("cross_cluster");
+
+	public override ApiKeyType Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberRest))
 		{
-			case "rest":
-				return ApiKeyType.Rest;
-			case "cross_cluster":
-				return ApiKeyType.CrossCluster;
+			return ApiKeyType.Rest;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberCrossCluster))
+		{
+			return ApiKeyType.CrossCluster;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(ApiKeyType)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, ApiKeyType value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ApiKeyType value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case ApiKeyType.Rest:
-				writer.WriteStringValue("rest");
-				return;
+				writer.WriteStringValue(MemberRest);
+				break;
 			case ApiKeyType.CrossCluster:
-				writer.WriteStringValue("cross_cluster");
-				return;
+				writer.WriteStringValue(MemberCrossCluster);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(ApiKeyType)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -172,9 +193,11 @@ public override void Write(Utf8JsonWriter writer, ApiKeyType value, JsonSerializ
 public readonly partial struct ClusterPrivilege : IEnumStruct<ClusterPrivilege>
 {
 	public ClusterPrivilege(string value) => Value = value;
-
+#if NET7_0_OR_GREATER
+	static ClusterPrivilege IEnumStruct<ClusterPrivilege>.Create(string value) => value;
+#else
 	ClusterPrivilege IEnumStruct<ClusterPrivilege>.Create(string value) => value;
-
+#endif
 	public readonly string Value { get; }
 	public static ClusterPrivilege ReadSecurity { get; } = new ClusterPrivilege("read_security");
 	public static ClusterPrivilege ReadPipeline { get; } = new ClusterPrivilege("read_pipeline");
@@ -236,36 +259,40 @@ public enum GrantType
 	AccessToken
 }
 
-internal sealed class GrantTypeConverter : JsonConverter<GrantType>
+internal sealed partial class GrantTypeConverter : System.Text.Json.Serialization.JsonConverter<GrantType>
 {
-	public override GrantType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberPassword = System.Text.Json.JsonEncodedText.Encode("password");
+	private static readonly System.Text.Json.JsonEncodedText MemberAccessToken = System.Text.Json.JsonEncodedText.Encode("access_token");
+
+	public override GrantType Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberPassword))
 		{
-			case "password":
-				return GrantType.Password;
-			case "access_token":
-				return GrantType.AccessToken;
+			return GrantType.Password;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberAccessToken))
+		{
+			return GrantType.AccessToken;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(GrantType)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, GrantType value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GrantType value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case GrantType.Password:
-				writer.WriteStringValue("password");
-				return;
+				writer.WriteStringValue(MemberPassword);
+				break;
 			case GrantType.AccessToken:
-				writer.WriteStringValue("access_token");
-				return;
+				writer.WriteStringValue(MemberAccessToken);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(GrantType)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -273,9 +300,11 @@ public override void Write(Utf8JsonWriter writer, GrantType value, JsonSerialize
 public readonly partial struct IndexPrivilege : IEnumStruct<IndexPrivilege>
 {
 	public IndexPrivilege(string value) => Value = value;
-
+#if NET7_0_OR_GREATER
+	static IndexPrivilege IEnumStruct<IndexPrivilege>.Create(string value) => value;
+#else
 	IndexPrivilege IEnumStruct<IndexPrivilege>.Create(string value) => value;
-
+#endif
 	public readonly string Value { get; }
 	public static IndexPrivilege Write { get; } = new IndexPrivilege("write");
 	public static IndexPrivilege ViewIndexMetadata { get; } = new IndexPrivilege("view_index_metadata");
@@ -311,9 +340,11 @@ public override void Write(Utf8JsonWriter writer, GrantType value, JsonSerialize
 public readonly partial struct RestrictionWorkflow : IEnumStruct<RestrictionWorkflow>
 {
 	public RestrictionWorkflow(string value) => Value = value;
-
+#if NET7_0_OR_GREATER
+	static RestrictionWorkflow IEnumStruct<RestrictionWorkflow>.Create(string value) => value;
+#else
 	RestrictionWorkflow IEnumStruct<RestrictionWorkflow>.Create(string value) => value;
-
+#endif
 	public readonly string Value { get; }
 	public static RestrictionWorkflow SearchApplicationQuery { get; } = new RestrictionWorkflow("search_application_query");
 
@@ -339,35 +370,39 @@ public enum TemplateFormat
 	Json
 }
 
-internal sealed class TemplateFormatConverter : JsonConverter<TemplateFormat>
+internal sealed partial class TemplateFormatConverter : System.Text.Json.Serialization.JsonConverter<TemplateFormat>
 {
-	public override TemplateFormat Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberString = System.Text.Json.JsonEncodedText.Encode("string");
+	private static readonly System.Text.Json.JsonEncodedText MemberJson = System.Text.Json.JsonEncodedText.Encode("json");
+
+	public override TemplateFormat Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberString))
 		{
-			case "string":
-				return TemplateFormat.String;
-			case "json":
-				return TemplateFormat.Json;
+			return TemplateFormat.String;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberJson))
+		{
+			return TemplateFormat.Json;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(TemplateFormat)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, TemplateFormat value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, TemplateFormat value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case TemplateFormat.String:
-				writer.WriteStringValue("string");
-				return;
+				writer.WriteStringValue(MemberString);
+				break;
 			case TemplateFormat.Json:
-				writer.WriteStringValue("json");
-				return;
+				writer.WriteStringValue(MemberJson);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(TemplateFormat)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.Snapshot.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.Snapshot.g.cs
index 13f40008017..4dbd4f963ef 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.Snapshot.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.Snapshot.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Core;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport;
 using System;
@@ -68,51 +69,67 @@ public enum ShardsStatsStage
 	Done
 }
 
-internal sealed class ShardsStatsStageConverter : JsonConverter<ShardsStatsStage>
+internal sealed partial class ShardsStatsStageConverter : System.Text.Json.Serialization.JsonConverter<ShardsStatsStage>
 {
-	public override ShardsStatsStage Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberStarted = System.Text.Json.JsonEncodedText.Encode("STARTED");
+	private static readonly System.Text.Json.JsonEncodedText MemberInit = System.Text.Json.JsonEncodedText.Encode("INIT");
+	private static readonly System.Text.Json.JsonEncodedText MemberFinalize = System.Text.Json.JsonEncodedText.Encode("FINALIZE");
+	private static readonly System.Text.Json.JsonEncodedText MemberFailure = System.Text.Json.JsonEncodedText.Encode("FAILURE");
+	private static readonly System.Text.Json.JsonEncodedText MemberDone = System.Text.Json.JsonEncodedText.Encode("DONE");
+
+	public override ShardsStatsStage Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberStarted))
 		{
-			case "STARTED":
-				return ShardsStatsStage.Started;
-			case "INIT":
-				return ShardsStatsStage.Init;
-			case "FINALIZE":
-				return ShardsStatsStage.Finalize;
-			case "FAILURE":
-				return ShardsStatsStage.Failure;
-			case "DONE":
-				return ShardsStatsStage.Done;
+			return ShardsStatsStage.Started;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberInit))
+		{
+			return ShardsStatsStage.Init;
+		}
+
+		if (reader.ValueTextEquals(MemberFinalize))
+		{
+			return ShardsStatsStage.Finalize;
+		}
+
+		if (reader.ValueTextEquals(MemberFailure))
+		{
+			return ShardsStatsStage.Failure;
+		}
+
+		if (reader.ValueTextEquals(MemberDone))
+		{
+			return ShardsStatsStage.Done;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(ShardsStatsStage)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, ShardsStatsStage value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ShardsStatsStage value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case ShardsStatsStage.Started:
-				writer.WriteStringValue("STARTED");
-				return;
+				writer.WriteStringValue(MemberStarted);
+				break;
 			case ShardsStatsStage.Init:
-				writer.WriteStringValue("INIT");
-				return;
+				writer.WriteStringValue(MemberInit);
+				break;
 			case ShardsStatsStage.Finalize:
-				writer.WriteStringValue("FINALIZE");
-				return;
+				writer.WriteStringValue(MemberFinalize);
+				break;
 			case ShardsStatsStage.Failure:
-				writer.WriteStringValue("FAILURE");
-				return;
+				writer.WriteStringValue(MemberFailure);
+				break;
 			case ShardsStatsStage.Done:
-				writer.WriteStringValue("DONE");
-				return;
+				writer.WriteStringValue(MemberDone);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(ShardsStatsStage)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -135,60 +152,84 @@ public enum SnapshotSort
 	Duration
 }
 
-internal sealed class SnapshotSortConverter : JsonConverter<SnapshotSort>
+internal sealed partial class SnapshotSortConverter : System.Text.Json.Serialization.JsonConverter<SnapshotSort>
 {
-	public override SnapshotSort Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberStartTime = System.Text.Json.JsonEncodedText.Encode("start_time");
+	private static readonly System.Text.Json.JsonEncodedText MemberShardCount = System.Text.Json.JsonEncodedText.Encode("shard_count");
+	private static readonly System.Text.Json.JsonEncodedText MemberRepository = System.Text.Json.JsonEncodedText.Encode("repository");
+	private static readonly System.Text.Json.JsonEncodedText MemberName = System.Text.Json.JsonEncodedText.Encode("name");
+	private static readonly System.Text.Json.JsonEncodedText MemberIndexCount = System.Text.Json.JsonEncodedText.Encode("index_count");
+	private static readonly System.Text.Json.JsonEncodedText MemberFailedShardCount = System.Text.Json.JsonEncodedText.Encode("failed_shard_count");
+	private static readonly System.Text.Json.JsonEncodedText MemberDuration = System.Text.Json.JsonEncodedText.Encode("duration");
+
+	public override SnapshotSort Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberStartTime))
+		{
+			return SnapshotSort.StartTime;
+		}
+
+		if (reader.ValueTextEquals(MemberShardCount))
 		{
-			case "start_time":
-				return SnapshotSort.StartTime;
-			case "shard_count":
-				return SnapshotSort.ShardCount;
-			case "repository":
-				return SnapshotSort.Repository;
-			case "name":
-				return SnapshotSort.Name;
-			case "index_count":
-				return SnapshotSort.IndexCount;
-			case "failed_shard_count":
-				return SnapshotSort.FailedShardCount;
-			case "duration":
-				return SnapshotSort.Duration;
+			return SnapshotSort.ShardCount;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberRepository))
+		{
+			return SnapshotSort.Repository;
+		}
+
+		if (reader.ValueTextEquals(MemberName))
+		{
+			return SnapshotSort.Name;
+		}
+
+		if (reader.ValueTextEquals(MemberIndexCount))
+		{
+			return SnapshotSort.IndexCount;
+		}
+
+		if (reader.ValueTextEquals(MemberFailedShardCount))
+		{
+			return SnapshotSort.FailedShardCount;
+		}
+
+		if (reader.ValueTextEquals(MemberDuration))
+		{
+			return SnapshotSort.Duration;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(SnapshotSort)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, SnapshotSort value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SnapshotSort value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case SnapshotSort.StartTime:
-				writer.WriteStringValue("start_time");
-				return;
+				writer.WriteStringValue(MemberStartTime);
+				break;
 			case SnapshotSort.ShardCount:
-				writer.WriteStringValue("shard_count");
-				return;
+				writer.WriteStringValue(MemberShardCount);
+				break;
 			case SnapshotSort.Repository:
-				writer.WriteStringValue("repository");
-				return;
+				writer.WriteStringValue(MemberRepository);
+				break;
 			case SnapshotSort.Name:
-				writer.WriteStringValue("name");
-				return;
+				writer.WriteStringValue(MemberName);
+				break;
 			case SnapshotSort.IndexCount:
-				writer.WriteStringValue("index_count");
-				return;
+				writer.WriteStringValue(MemberIndexCount);
+				break;
 			case SnapshotSort.FailedShardCount:
-				writer.WriteStringValue("failed_shard_count");
-				return;
+				writer.WriteStringValue(MemberFailedShardCount);
+				break;
 			case SnapshotSort.Duration:
-				writer.WriteStringValue("duration");
-				return;
+				writer.WriteStringValue(MemberDuration);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(SnapshotSort)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.Sql.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.Sql.g.cs
index 4cdbebbc92a..7d25ce373ba 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.Sql.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.Sql.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Core;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport;
 using System;
@@ -47,60 +48,84 @@ public enum SqlFormat
 	Cbor
 }
 
-internal sealed class SqlFormatConverter : JsonConverter<SqlFormat>
+internal sealed partial class SqlFormatConverter : System.Text.Json.Serialization.JsonConverter<SqlFormat>
 {
-	public override SqlFormat Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberYaml = System.Text.Json.JsonEncodedText.Encode("yaml");
+	private static readonly System.Text.Json.JsonEncodedText MemberTxt = System.Text.Json.JsonEncodedText.Encode("txt");
+	private static readonly System.Text.Json.JsonEncodedText MemberTsv = System.Text.Json.JsonEncodedText.Encode("tsv");
+	private static readonly System.Text.Json.JsonEncodedText MemberSmile = System.Text.Json.JsonEncodedText.Encode("smile");
+	private static readonly System.Text.Json.JsonEncodedText MemberJson = System.Text.Json.JsonEncodedText.Encode("json");
+	private static readonly System.Text.Json.JsonEncodedText MemberCsv = System.Text.Json.JsonEncodedText.Encode("csv");
+	private static readonly System.Text.Json.JsonEncodedText MemberCbor = System.Text.Json.JsonEncodedText.Encode("cbor");
+
+	public override SqlFormat Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberYaml))
+		{
+			return SqlFormat.Yaml;
+		}
+
+		if (reader.ValueTextEquals(MemberTxt))
+		{
+			return SqlFormat.Txt;
+		}
+
+		if (reader.ValueTextEquals(MemberTsv))
+		{
+			return SqlFormat.Tsv;
+		}
+
+		if (reader.ValueTextEquals(MemberSmile))
 		{
-			case "yaml":
-				return SqlFormat.Yaml;
-			case "txt":
-				return SqlFormat.Txt;
-			case "tsv":
-				return SqlFormat.Tsv;
-			case "smile":
-				return SqlFormat.Smile;
-			case "json":
-				return SqlFormat.Json;
-			case "csv":
-				return SqlFormat.Csv;
-			case "cbor":
-				return SqlFormat.Cbor;
+			return SqlFormat.Smile;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberJson))
+		{
+			return SqlFormat.Json;
+		}
+
+		if (reader.ValueTextEquals(MemberCsv))
+		{
+			return SqlFormat.Csv;
+		}
+
+		if (reader.ValueTextEquals(MemberCbor))
+		{
+			return SqlFormat.Cbor;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(SqlFormat)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, SqlFormat value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SqlFormat value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case SqlFormat.Yaml:
-				writer.WriteStringValue("yaml");
-				return;
+				writer.WriteStringValue(MemberYaml);
+				break;
 			case SqlFormat.Txt:
-				writer.WriteStringValue("txt");
-				return;
+				writer.WriteStringValue(MemberTxt);
+				break;
 			case SqlFormat.Tsv:
-				writer.WriteStringValue("tsv");
-				return;
+				writer.WriteStringValue(MemberTsv);
+				break;
 			case SqlFormat.Smile:
-				writer.WriteStringValue("smile");
-				return;
+				writer.WriteStringValue(MemberSmile);
+				break;
 			case SqlFormat.Json:
-				writer.WriteStringValue("json");
-				return;
+				writer.WriteStringValue(MemberJson);
+				break;
 			case SqlFormat.Csv:
-				writer.WriteStringValue("csv");
-				return;
+				writer.WriteStringValue(MemberCsv);
+				break;
 			case SqlFormat.Cbor:
-				writer.WriteStringValue("cbor");
-				return;
+				writer.WriteStringValue(MemberCbor);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(SqlFormat)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.Watcher.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.Watcher.g.cs
index 9a877190686..8f04bba5394 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.Watcher.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.Watcher.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Core;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport;
 using System;
@@ -41,45 +42,57 @@ public enum ActionStatusOptions
 	Failure
 }
 
-internal sealed class ActionStatusOptionsConverter : JsonConverter<ActionStatusOptions>
+internal sealed partial class ActionStatusOptionsConverter : System.Text.Json.Serialization.JsonConverter<ActionStatusOptions>
 {
-	public override ActionStatusOptions Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberThrottled = System.Text.Json.JsonEncodedText.Encode("throttled");
+	private static readonly System.Text.Json.JsonEncodedText MemberSuccess = System.Text.Json.JsonEncodedText.Encode("success");
+	private static readonly System.Text.Json.JsonEncodedText MemberSimulated = System.Text.Json.JsonEncodedText.Encode("simulated");
+	private static readonly System.Text.Json.JsonEncodedText MemberFailure = System.Text.Json.JsonEncodedText.Encode("failure");
+
+	public override ActionStatusOptions Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberThrottled))
+		{
+			return ActionStatusOptions.Throttled;
+		}
+
+		if (reader.ValueTextEquals(MemberSuccess))
 		{
-			case "throttled":
-				return ActionStatusOptions.Throttled;
-			case "success":
-				return ActionStatusOptions.Success;
-			case "simulated":
-				return ActionStatusOptions.Simulated;
-			case "failure":
-				return ActionStatusOptions.Failure;
+			return ActionStatusOptions.Success;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberSimulated))
+		{
+			return ActionStatusOptions.Simulated;
+		}
+
+		if (reader.ValueTextEquals(MemberFailure))
+		{
+			return ActionStatusOptions.Failure;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(ActionStatusOptions)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, ActionStatusOptions value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ActionStatusOptions value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case ActionStatusOptions.Throttled:
-				writer.WriteStringValue("throttled");
-				return;
+				writer.WriteStringValue(MemberThrottled);
+				break;
 			case ActionStatusOptions.Success:
-				writer.WriteStringValue("success");
-				return;
+				writer.WriteStringValue(MemberSuccess);
+				break;
 			case ActionStatusOptions.Simulated:
-				writer.WriteStringValue("simulated");
-				return;
+				writer.WriteStringValue(MemberSimulated);
+				break;
 			case ActionStatusOptions.Failure:
-				writer.WriteStringValue("failure");
-				return;
+				writer.WriteStringValue(MemberFailure);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(ActionStatusOptions)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.Xpack.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.Xpack.g.cs
index e217b5508b1..d6913a30a4b 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.Xpack.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enums/Enums.Xpack.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Core;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport;
 using System;
@@ -39,40 +40,48 @@ public enum XPackCategory
 	Build
 }
 
-internal sealed class XPackCategoryConverter : JsonConverter<XPackCategory>
+internal sealed partial class XPackCategoryConverter : System.Text.Json.Serialization.JsonConverter<XPackCategory>
 {
-	public override XPackCategory Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberLicense = System.Text.Json.JsonEncodedText.Encode("license");
+	private static readonly System.Text.Json.JsonEncodedText MemberFeatures = System.Text.Json.JsonEncodedText.Encode("features");
+	private static readonly System.Text.Json.JsonEncodedText MemberBuild = System.Text.Json.JsonEncodedText.Encode("build");
+
+	public override XPackCategory Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberLicense))
+		{
+			return XPackCategory.License;
+		}
+
+		if (reader.ValueTextEquals(MemberFeatures))
 		{
-			case "license":
-				return XPackCategory.License;
-			case "features":
-				return XPackCategory.Features;
-			case "build":
-				return XPackCategory.Build;
+			return XPackCategory.Features;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberBuild))
+		{
+			return XPackCategory.Build;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(XPackCategory)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, XPackCategory value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, XPackCategory value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case XPackCategory.License:
-				writer.WriteStringValue("license");
-				return;
+				writer.WriteStringValue(MemberLicense);
+				break;
 			case XPackCategory.Features:
-				writer.WriteStringValue("features");
-				return;
+				writer.WriteStringValue(MemberFeatures);
+				break;
 			case XPackCategory.Build:
-				writer.WriteStringValue("build");
-				return;
+				writer.WriteStringValue(MemberBuild);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(XPackCategory)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Eql/HitsEvent.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Eql/HitsEvent.g.cs
index 5614df40669..4abd24d6c98 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Eql/HitsEvent.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Eql/HitsEvent.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,10 +28,99 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Eql;
 
+internal sealed partial class HitsEventConverter<TEvent> : System.Text.Json.Serialization.JsonConverter<HitsEvent<TEvent>>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("_id");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("_index");
+	private static readonly System.Text.Json.JsonEncodedText PropMissing = System.Text.Json.JsonEncodedText.Encode("missing");
+	private static readonly System.Text.Json.JsonEncodedText PropSource = System.Text.Json.JsonEncodedText.Encode("_source");
+
+	public override HitsEvent<TEvent> Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyDictionary<Elastic.Clients.Elasticsearch.Serverless.Field, IReadOnlyCollection<object>>?> propFields = default;
+		LocalJsonProperty<string> propId = default;
+		LocalJsonProperty<string> propIndex = default;
+		LocalJsonProperty<bool?> propMissing = default;
+		LocalJsonProperty<TEvent> propSource = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propId.TryRead(ref reader, options, PropId))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propMissing.TryRead(ref reader, options, PropMissing))
+			{
+				continue;
+			}
+
+			if (propSource.TryRead(ref reader, options, PropSource, typeof(SourceMarker<TEvent>)))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new HitsEvent<TEvent>
+		{
+			Fields = propFields.Value
+,
+			Id = propId.Value
+,
+			Index = propIndex.Value
+,
+			Missing = propMissing.Value
+,
+			Source = propSource.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, HitsEvent<TEvent> value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropId, value.Id);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropMissing, value.Missing);
+		writer.WriteProperty(options, PropSource, value.Source, typeof(SourceMarker<TEvent>));
+		writer.WriteEndObject();
+	}
+}
+
+internal sealed partial class HitsEventConverterFactory : System.Text.Json.Serialization.JsonConverterFactory
+{
+	public override bool CanConvert(System.Type typeToConvert)
+	{
+		return typeToConvert.IsGenericType && typeToConvert.GetGenericTypeDefinition() == typeof(HitsEvent<>);
+	}
+
+	public override System.Text.Json.Serialization.JsonConverter CreateConverter(System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		var args = typeToConvert.GetGenericArguments();
+#pragma warning disable IL3050
+		var converter = (System.Text.Json.Serialization.JsonConverter)System.Activator.CreateInstance(typeof(HitsEventConverter<>).MakeGenericType(args[0]), System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public, binder: null, args: null, culture: null)!;
+#pragma warning restore IL3050
+		return converter;
+	}
+}
+
+[JsonConverter(typeof(HitsEventConverterFactory))]
 public sealed partial class HitsEvent<TEvent>
 {
-	[JsonInclude, JsonPropertyName("fields")]
-	[ReadOnlyFieldDictionaryConverter(typeof(IReadOnlyCollection<object>))]
 	public IReadOnlyDictionary<Elastic.Clients.Elasticsearch.Serverless.Field, IReadOnlyCollection<object>>? Fields { get; init; }
 
 	/// <summary>
@@ -38,7 +128,6 @@ public sealed partial class HitsEvent<TEvent>
 	/// Unique identifier for the event. This ID is only unique within the index.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("_id")]
 	public string Id { get; init; }
 
 	/// <summary>
@@ -46,7 +135,6 @@ public sealed partial class HitsEvent<TEvent>
 	/// Name of the index containing the event.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("_index")]
 	public string Index { get; init; }
 
 	/// <summary>
@@ -54,7 +142,6 @@ public sealed partial class HitsEvent<TEvent>
 	/// Set to <c>true</c> for events in a timespan-constrained sequence that do not meet a given condition.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("missing")]
 	public bool? Missing { get; init; }
 
 	/// <summary>
@@ -62,7 +149,5 @@ public sealed partial class HitsEvent<TEvent>
 	/// Original JSON body passed for the event at index time.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("_source")]
-	[SourceConverter]
 	public TEvent Source { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/ErrorCause.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/ErrorCause.g.cs
index f5aa3c93f05..e060d3df459 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/ErrorCause.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/ErrorCause.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,72 +28,100 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless;
 
-internal sealed partial class ErrorCauseConverter : JsonConverter<ErrorCause>
+internal sealed partial class ErrorCauseConverter : System.Text.Json.Serialization.JsonConverter<ErrorCause>
 {
-	public override ErrorCause Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropMetadata = System.Text.Json.JsonEncodedText.Encode("metadata");
+	private static readonly System.Text.Json.JsonEncodedText PropCausedBy = System.Text.Json.JsonEncodedText.Encode("caused_by");
+	private static readonly System.Text.Json.JsonEncodedText PropReason = System.Text.Json.JsonEncodedText.Encode("reason");
+	private static readonly System.Text.Json.JsonEncodedText PropRootCause = System.Text.Json.JsonEncodedText.Encode("root_cause");
+	private static readonly System.Text.Json.JsonEncodedText PropStackTrace = System.Text.Json.JsonEncodedText.Encode("stack_trace");
+	private static readonly System.Text.Json.JsonEncodedText PropSuppressed = System.Text.Json.JsonEncodedText.Encode("suppressed");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override ErrorCause Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		Elastic.Clients.Elasticsearch.Serverless.ErrorCause? causedBy = default;
-		string? reason = default;
-		IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.ErrorCause>? rootCause = default;
-		string? stackTrace = default;
-		IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.ErrorCause>? suppressed = default;
-		string type = default;
-		Dictionary<string, object> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, object> propMetadata = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.ErrorCause?> propCausedBy = default;
+		LocalJsonProperty<string?> propReason = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.ErrorCause>?> propRootCause = default;
+		LocalJsonProperty<string?> propStackTrace = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.ErrorCause>?> propSuppressed = default;
+		LocalJsonProperty<string> propType = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propCausedBy.TryRead(ref reader, options, PropCausedBy))
 			{
-				var property = reader.GetString();
-				if (property == "caused_by")
-				{
-					causedBy = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.ErrorCause?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "reason")
-				{
-					reason = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "root_cause")
-				{
-					rootCause = JsonSerializer.Deserialize<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.ErrorCause>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "stack_trace")
-				{
-					stackTrace = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "suppressed")
-				{
-					suppressed = JsonSerializer.Deserialize<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.ErrorCause>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "type")
-				{
-					type = JsonSerializer.Deserialize<string>(ref reader, options);
-					continue;
-				}
-
-				additionalProperties ??= new Dictionary<string, object>();
-				var additionalValue = JsonSerializer.Deserialize<object>(ref reader, options);
-				additionalProperties.Add(property, additionalValue);
+				continue;
 			}
+
+			if (propReason.TryRead(ref reader, options, PropReason))
+			{
+				continue;
+			}
+
+			if (propRootCause.TryRead(ref reader, options, PropRootCause))
+			{
+				continue;
+			}
+
+			if (propStackTrace.TryRead(ref reader, options, PropStackTrace))
+			{
+				continue;
+			}
+
+			if (propSuppressed.TryRead(ref reader, options, PropSuppressed))
+			{
+				continue;
+			}
+
+			if (propType.TryRead(ref reader, options, PropType))
+			{
+				continue;
+			}
+
+			propMetadata ??= new System.Collections.Generic.Dictionary<string, object>();
+			reader.ReadProperty(options, out string key, out object value);
+			propMetadata[key] = value;
 		}
 
-		return new ErrorCause { CausedBy = causedBy, Metadata = additionalProperties, Reason = reason, RootCause = rootCause, StackTrace = stackTrace, Suppressed = suppressed, Type = type };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ErrorCause
+		{
+			Metadata = propMetadata
+,
+			CausedBy = propCausedBy.Value
+,
+			Reason = propReason.Value
+,
+			RootCause = propRootCause.Value
+,
+			StackTrace = propStackTrace.Value
+,
+			Suppressed = propSuppressed.Value
+,
+			Type = propType.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, ErrorCause value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ErrorCause value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'ErrorCause' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCausedBy, value.CausedBy);
+		writer.WriteProperty(options, PropReason, value.Reason);
+		writer.WriteProperty(options, PropRootCause, value.RootCause);
+		writer.WriteProperty(options, PropStackTrace, value.StackTrace);
+		writer.WriteProperty(options, PropSuppressed, value.Suppressed);
+		writer.WriteProperty(options, PropType, value.Type);
+		if (value.Metadata is not null)
+		{
+			foreach (var item in value.Metadata)
+			{
+				writer.WriteProperty(options, item.Key, item.Value);
+			}
+		}
+
+		writer.WriteEndObject();
 	}
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/FieldSort.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/FieldSort.g.cs
index 430fc042c4c..93e97ccb97f 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/FieldSort.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/FieldSort.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,21 +28,114 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless;
 
+internal sealed partial class FieldSortConverter : System.Text.Json.Serialization.JsonConverter<FieldSort>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropFormat = System.Text.Json.JsonEncodedText.Encode("format");
+	private static readonly System.Text.Json.JsonEncodedText PropMissing = System.Text.Json.JsonEncodedText.Encode("missing");
+	private static readonly System.Text.Json.JsonEncodedText PropMode = System.Text.Json.JsonEncodedText.Encode("mode");
+	private static readonly System.Text.Json.JsonEncodedText PropNested = System.Text.Json.JsonEncodedText.Encode("nested");
+	private static readonly System.Text.Json.JsonEncodedText PropNumericType = System.Text.Json.JsonEncodedText.Encode("numeric_type");
+	private static readonly System.Text.Json.JsonEncodedText PropOrder = System.Text.Json.JsonEncodedText.Encode("order");
+	private static readonly System.Text.Json.JsonEncodedText PropUnmappedType = System.Text.Json.JsonEncodedText.Encode("unmapped_type");
+
+	public override FieldSort Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		if (reader.TokenType is not System.Text.Json.JsonTokenType.StartObject)
+		{
+			var value = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.SortOrder?>(options);
+			return new FieldSort { Order = value };
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string?> propFormat = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.FieldValue?> propMissing = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.SortMode?> propMode = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.NestedSortValue?> propNested = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.FieldSortNumericType?> propNumericType = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.SortOrder?> propOrder = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.FieldType?> propUnmappedType = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propFormat.TryRead(ref reader, options, PropFormat))
+			{
+				continue;
+			}
+
+			if (propMissing.TryRead(ref reader, options, PropMissing))
+			{
+				continue;
+			}
+
+			if (propMode.TryRead(ref reader, options, PropMode))
+			{
+				continue;
+			}
+
+			if (propNested.TryRead(ref reader, options, PropNested))
+			{
+				continue;
+			}
+
+			if (propNumericType.TryRead(ref reader, options, PropNumericType))
+			{
+				continue;
+			}
+
+			if (propOrder.TryRead(ref reader, options, PropOrder))
+			{
+				continue;
+			}
+
+			if (propUnmappedType.TryRead(ref reader, options, PropUnmappedType))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new FieldSort
+		{
+			Format = propFormat.Value
+,
+			Missing = propMissing.Value
+,
+			Mode = propMode.Value
+,
+			Nested = propNested.Value
+,
+			NumericType = propNumericType.Value
+,
+			Order = propOrder.Value
+,
+			UnmappedType = propUnmappedType.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, FieldSort value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropFormat, value.Format);
+		writer.WriteProperty(options, PropMissing, value.Missing);
+		writer.WriteProperty(options, PropMode, value.Mode);
+		writer.WriteProperty(options, PropNested, value.Nested);
+		writer.WriteProperty(options, PropNumericType, value.NumericType);
+		writer.WriteProperty(options, PropOrder, value.Order);
+		writer.WriteProperty(options, PropUnmappedType, value.UnmappedType);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(FieldSortConverter))]
 public sealed partial class FieldSort
 {
-	[JsonInclude, JsonPropertyName("format")]
 	public string? Format { get; set; }
-	[JsonInclude, JsonPropertyName("missing")]
 	public Elastic.Clients.Elasticsearch.Serverless.FieldValue? Missing { get; set; }
-	[JsonInclude, JsonPropertyName("mode")]
 	public Elastic.Clients.Elasticsearch.Serverless.SortMode? Mode { get; set; }
-	[JsonInclude, JsonPropertyName("nested")]
 	public Elastic.Clients.Elasticsearch.Serverless.NestedSortValue? Nested { get; set; }
-	[JsonInclude, JsonPropertyName("numeric_type")]
 	public Elastic.Clients.Elasticsearch.Serverless.FieldSortNumericType? NumericType { get; set; }
-	[JsonInclude, JsonPropertyName("order")]
 	public Elastic.Clients.Elasticsearch.Serverless.SortOrder? Order { get; set; }
-	[JsonInclude, JsonPropertyName("unmapped_type")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.FieldType? UnmappedType { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/FielddataStats.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/FielddataStats.g.cs
index 56985a0b49d..4fefb32c52c 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/FielddataStats.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/FielddataStats.g.cs
@@ -32,7 +32,6 @@ public sealed partial class FielddataStats
 	[JsonInclude, JsonPropertyName("evictions")]
 	public long? Evictions { get; init; }
 	[JsonInclude, JsonPropertyName("fields")]
-	[ReadOnlyFieldDictionaryConverter(typeof(Elastic.Clients.Elasticsearch.Serverless.FieldMemoryUsage))]
 	public IReadOnlyDictionary<Elastic.Clients.Elasticsearch.Serverless.Field, Elastic.Clients.Elasticsearch.Serverless.FieldMemoryUsage>? Fields { get; init; }
 	[JsonInclude, JsonPropertyName("memory_size")]
 	public Elastic.Clients.Elasticsearch.Serverless.ByteSize? MemorySize { get; init; }
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/GeoDistanceSort.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/GeoDistanceSort.g.cs
index a691a7efc98..be18de4a947 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/GeoDistanceSort.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/GeoDistanceSort.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,114 +28,95 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless;
 
-internal sealed partial class GeoDistanceSortConverter : JsonConverter<GeoDistanceSort>
+internal sealed partial class GeoDistanceSortConverter : System.Text.Json.Serialization.JsonConverter<GeoDistanceSort>
 {
-	public override GeoDistanceSort Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropLocation = System.Text.Json.JsonEncodedText.Encode("location");
+	private static readonly System.Text.Json.JsonEncodedText PropDistanceType = System.Text.Json.JsonEncodedText.Encode("distance_type");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreUnmapped = System.Text.Json.JsonEncodedText.Encode("ignore_unmapped");
+	private static readonly System.Text.Json.JsonEncodedText PropMode = System.Text.Json.JsonEncodedText.Encode("mode");
+	private static readonly System.Text.Json.JsonEncodedText PropNested = System.Text.Json.JsonEncodedText.Encode("nested");
+	private static readonly System.Text.Json.JsonEncodedText PropOrder = System.Text.Json.JsonEncodedText.Encode("order");
+	private static readonly System.Text.Json.JsonEncodedText PropUnit = System.Text.Json.JsonEncodedText.Encode("unit");
+
+	public override GeoDistanceSort Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		var variant = new GeoDistanceSort();
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Field> propField = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.GeoLocation>> propLocation = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.GeoDistanceType?> propDistanceType = default;
+		LocalJsonProperty<bool?> propIgnoreUnmapped = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.SortMode?> propMode = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.NestedSortValue?> propNested = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.SortOrder?> propOrder = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.DistanceUnit?> propUnit = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propDistanceType.TryRead(ref reader, options, PropDistanceType))
 			{
-				var property = reader.GetString();
-				if (property == "distance_type")
-				{
-					variant.DistanceType = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.GeoDistanceType?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "ignore_unmapped")
-				{
-					variant.IgnoreUnmapped = JsonSerializer.Deserialize<bool?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "mode")
-				{
-					variant.Mode = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.SortMode?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "nested")
-				{
-					variant.Nested = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.NestedSortValue?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "order")
-				{
-					variant.Order = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.SortOrder?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "unit")
-				{
-					variant.Unit = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.DistanceUnit?>(ref reader, options);
-					continue;
-				}
-
-				variant.Field = property;
-				reader.Read();
-				variant.Location = JsonSerializer.Deserialize<ICollection<Elastic.Clients.Elasticsearch.Serverless.GeoLocation>>(ref reader, options);
+				continue;
 			}
-		}
-
-		return variant;
-	}
 
-	public override void Write(Utf8JsonWriter writer, GeoDistanceSort value, JsonSerializerOptions options)
-	{
-		writer.WriteStartObject();
-		if (value.Field is not null && value.Location is not null)
-		{
-			if (!options.TryGetClientSettings(out var settings))
+			if (propIgnoreUnmapped.TryRead(ref reader, options, PropIgnoreUnmapped))
 			{
-				ThrowHelper.ThrowJsonExceptionForMissingSettings();
+				continue;
 			}
 
-			var propertyName = settings.Inferrer.Field(value.Field);
-			writer.WritePropertyName(propertyName);
-			JsonSerializer.Serialize(writer, value.Location, options);
-		}
-
-		if (value.DistanceType is not null)
-		{
-			writer.WritePropertyName("distance_type");
-			JsonSerializer.Serialize(writer, value.DistanceType, options);
-		}
+			if (propMode.TryRead(ref reader, options, PropMode))
+			{
+				continue;
+			}
 
-		if (value.IgnoreUnmapped.HasValue)
-		{
-			writer.WritePropertyName("ignore_unmapped");
-			writer.WriteBooleanValue(value.IgnoreUnmapped.Value);
-		}
+			if (propNested.TryRead(ref reader, options, PropNested))
+			{
+				continue;
+			}
 
-		if (value.Mode is not null)
-		{
-			writer.WritePropertyName("mode");
-			JsonSerializer.Serialize(writer, value.Mode, options);
-		}
+			if (propOrder.TryRead(ref reader, options, PropOrder))
+			{
+				continue;
+			}
 
-		if (value.Nested is not null)
-		{
-			writer.WritePropertyName("nested");
-			JsonSerializer.Serialize(writer, value.Nested, options);
-		}
+			if (propUnit.TryRead(ref reader, options, PropUnit))
+			{
+				continue;
+			}
 
-		if (value.Order is not null)
-		{
-			writer.WritePropertyName("order");
-			JsonSerializer.Serialize(writer, value.Order, options);
+			propField.Initialized = propLocation.Initialized = true;
+			reader.ReadProperty(options, out propField.Value, out propLocation.Value, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.GeoLocation>, Elastic.Clients.Elasticsearch.Serverless.GeoLocation>));
 		}
 
-		if (value.Unit is not null)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GeoDistanceSort
 		{
-			writer.WritePropertyName("unit");
-			JsonSerializer.Serialize(writer, value.Unit, options);
-		}
+			Field = propField.Value
+,
+			Location = propLocation.Value
+,
+			DistanceType = propDistanceType.Value
+,
+			IgnoreUnmapped = propIgnoreUnmapped.Value
+,
+			Mode = propMode.Value
+,
+			Nested = propNested.Value
+,
+			Order = propOrder.Value
+,
+			Unit = propUnit.Value
+		};
+	}
 
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GeoDistanceSort value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDistanceType, value.DistanceType);
+		writer.WriteProperty(options, PropIgnoreUnmapped, value.IgnoreUnmapped);
+		writer.WriteProperty(options, PropMode, value.Mode);
+		writer.WriteProperty(options, PropNested, value.Nested);
+		writer.WriteProperty(options, PropOrder, value.Order);
+		writer.WriteProperty(options, PropUnit, value.Unit);
+		writer.WriteProperty(options, value.Field, value.Location, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.GeoLocation>, Elastic.Clients.Elasticsearch.Serverless.GeoLocation>));
 		writer.WriteEndObject();
 	}
 }
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/IndexManagement/AddAction.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/IndexManagement/AddAction.g.cs
index b7b1346d94b..4079f861104 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/IndexManagement/AddAction.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/IndexManagement/AddAction.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,140 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.IndexManagement;
 
+internal sealed partial class AddActionConverter : System.Text.Json.Serialization.JsonConverter<AddAction>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAlias = System.Text.Json.JsonEncodedText.Encode("alias");
+	private static readonly System.Text.Json.JsonEncodedText PropAliases = System.Text.Json.JsonEncodedText.Encode("aliases");
+	private static readonly System.Text.Json.JsonEncodedText PropFilter = System.Text.Json.JsonEncodedText.Encode("filter");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropIndexRouting = System.Text.Json.JsonEncodedText.Encode("index_routing");
+	private static readonly System.Text.Json.JsonEncodedText PropIndices = System.Text.Json.JsonEncodedText.Encode("indices");
+	private static readonly System.Text.Json.JsonEncodedText PropIsHidden = System.Text.Json.JsonEncodedText.Encode("is_hidden");
+	private static readonly System.Text.Json.JsonEncodedText PropIsWriteIndex = System.Text.Json.JsonEncodedText.Encode("is_write_index");
+	private static readonly System.Text.Json.JsonEncodedText PropMustExist = System.Text.Json.JsonEncodedText.Encode("must_exist");
+	private static readonly System.Text.Json.JsonEncodedText PropRouting = System.Text.Json.JsonEncodedText.Encode("routing");
+	private static readonly System.Text.Json.JsonEncodedText PropSearchRouting = System.Text.Json.JsonEncodedText.Encode("search_routing");
+
+	public override AddAction Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.IndexAlias?> propAlias = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.IndexAlias>?> propAliases = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query?> propFilter = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.IndexName?> propIndex = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Routing?> propIndexRouting = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Indices?> propIndices = default;
+		LocalJsonProperty<bool?> propIsHidden = default;
+		LocalJsonProperty<bool?> propIsWriteIndex = default;
+		LocalJsonProperty<bool?> propMustExist = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Routing?> propRouting = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Routing?> propSearchRouting = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAlias.TryRead(ref reader, options, PropAlias))
+			{
+				continue;
+			}
+
+			if (propAliases.TryRead(ref reader, options, PropAliases, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.IndexAlias>?, Elastic.Clients.Elasticsearch.Serverless.IndexAlias>)))
+			{
+				continue;
+			}
+
+			if (propFilter.TryRead(ref reader, options, PropFilter))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propIndexRouting.TryRead(ref reader, options, PropIndexRouting))
+			{
+				continue;
+			}
+
+			if (propIndices.TryRead(ref reader, options, PropIndices))
+			{
+				continue;
+			}
+
+			if (propIsHidden.TryRead(ref reader, options, PropIsHidden))
+			{
+				continue;
+			}
+
+			if (propIsWriteIndex.TryRead(ref reader, options, PropIsWriteIndex))
+			{
+				continue;
+			}
+
+			if (propMustExist.TryRead(ref reader, options, PropMustExist))
+			{
+				continue;
+			}
+
+			if (propRouting.TryRead(ref reader, options, PropRouting))
+			{
+				continue;
+			}
+
+			if (propSearchRouting.TryRead(ref reader, options, PropSearchRouting))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new AddAction
+		{
+			Alias = propAlias.Value
+,
+			Aliases = propAliases.Value
+,
+			Filter = propFilter.Value
+,
+			Index = propIndex.Value
+,
+			IndexRouting = propIndexRouting.Value
+,
+			Indices = propIndices.Value
+,
+			IsHidden = propIsHidden.Value
+,
+			IsWriteIndex = propIsWriteIndex.Value
+,
+			MustExist = propMustExist.Value
+,
+			Routing = propRouting.Value
+,
+			SearchRouting = propSearchRouting.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, AddAction value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAlias, value.Alias);
+		writer.WriteProperty(options, PropAliases, value.Aliases, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.IndexAlias>?, Elastic.Clients.Elasticsearch.Serverless.IndexAlias>));
+		writer.WriteProperty(options, PropFilter, value.Filter);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropIndexRouting, value.IndexRouting);
+		writer.WriteProperty(options, PropIndices, value.Indices);
+		writer.WriteProperty(options, PropIsHidden, value.IsHidden);
+		writer.WriteProperty(options, PropIsWriteIndex, value.IsWriteIndex);
+		writer.WriteProperty(options, PropMustExist, value.MustExist);
+		writer.WriteProperty(options, PropRouting, value.Routing);
+		writer.WriteProperty(options, PropSearchRouting, value.SearchRouting);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(AddActionConverter))]
 public sealed partial class AddAction
 {
 	/// <summary>
@@ -35,7 +170,6 @@ public sealed partial class AddAction
 	/// Index alias names support date math.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("alias")]
 	public Elastic.Clients.Elasticsearch.Serverless.IndexAlias? Alias { get; set; }
 
 	/// <summary>
@@ -44,8 +178,6 @@ public sealed partial class AddAction
 	/// Index alias names support date math.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("aliases")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.Serverless.IndexAlias))]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.IndexAlias>? Aliases { get; set; }
 
 	/// <summary>
@@ -53,7 +185,6 @@ public sealed partial class AddAction
 	/// Query used to limit documents the alias can access.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("filter")]
 	public Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query? Filter { get; set; }
 
 	/// <summary>
@@ -62,7 +193,6 @@ public sealed partial class AddAction
 	/// Supports wildcards (<c>*</c>).
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("index")]
 	public Elastic.Clients.Elasticsearch.Serverless.IndexName? Index { get; set; }
 
 	/// <summary>
@@ -72,7 +202,6 @@ public sealed partial class AddAction
 	/// Data stream aliases don’t support this parameter.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("index_routing")]
 	public Elastic.Clients.Elasticsearch.Serverless.Routing? IndexRouting { get; set; }
 
 	/// <summary>
@@ -81,7 +210,6 @@ public sealed partial class AddAction
 	/// Supports wildcards (<c>*</c>).
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("indices")]
 	public Elastic.Clients.Elasticsearch.Serverless.Indices? Indices { get; set; }
 
 	/// <summary>
@@ -89,7 +217,6 @@ public sealed partial class AddAction
 	/// If <c>true</c>, the alias is hidden.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("is_hidden")]
 	public bool? IsHidden { get; set; }
 
 	/// <summary>
@@ -97,7 +224,6 @@ public sealed partial class AddAction
 	/// If <c>true</c>, sets the write index or data stream for the alias.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("is_write_index")]
 	public bool? IsWriteIndex { get; set; }
 
 	/// <summary>
@@ -105,7 +231,6 @@ public sealed partial class AddAction
 	/// If <c>true</c>, the alias must exist to perform the action.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("must_exist")]
 	public bool? MustExist { get; set; }
 
 	/// <summary>
@@ -114,7 +239,6 @@ public sealed partial class AddAction
 	/// Data stream aliases don’t support this parameter.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("routing")]
 	public Elastic.Clients.Elasticsearch.Serverless.Routing? Routing { get; set; }
 
 	/// <summary>
@@ -124,7 +248,6 @@ public sealed partial class AddAction
 	/// Data stream aliases don’t support this parameter.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("search_routing")]
 	public Elastic.Clients.Elasticsearch.Serverless.Routing? SearchRouting { get; set; }
 
 	public static implicit operator Elastic.Clients.Elasticsearch.Serverless.IndexManagement.IndexUpdateAliasesAction(AddAction addAction) => Elastic.Clients.Elasticsearch.Serverless.IndexManagement.IndexUpdateAliasesAction.Add(addAction);
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/IndexManagement/ExplainAnalyzeToken.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/IndexManagement/ExplainAnalyzeToken.g.cs
index 9d6ab4edf40..d92e87abe52 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/IndexManagement/ExplainAnalyzeToken.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/IndexManagement/ExplainAnalyzeToken.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,93 +28,130 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.IndexManagement;
 
-internal sealed partial class ExplainAnalyzeTokenConverter : JsonConverter<ExplainAnalyzeToken>
+internal sealed partial class ExplainAnalyzeTokenConverter : System.Text.Json.Serialization.JsonConverter<ExplainAnalyzeToken>
 {
-	public override ExplainAnalyzeToken Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAttributes = System.Text.Json.JsonEncodedText.Encode("attributes");
+	private static readonly System.Text.Json.JsonEncodedText PropBytes = System.Text.Json.JsonEncodedText.Encode("bytes");
+	private static readonly System.Text.Json.JsonEncodedText PropEndOffset = System.Text.Json.JsonEncodedText.Encode("end_offset");
+	private static readonly System.Text.Json.JsonEncodedText PropKeyword = System.Text.Json.JsonEncodedText.Encode("keyword");
+	private static readonly System.Text.Json.JsonEncodedText PropPosition = System.Text.Json.JsonEncodedText.Encode("position");
+	private static readonly System.Text.Json.JsonEncodedText PropPositionlength = System.Text.Json.JsonEncodedText.Encode("positionLength");
+	private static readonly System.Text.Json.JsonEncodedText PropStartOffset = System.Text.Json.JsonEncodedText.Encode("start_offset");
+	private static readonly System.Text.Json.JsonEncodedText PropTermfrequency = System.Text.Json.JsonEncodedText.Encode("termFrequency");
+	private static readonly System.Text.Json.JsonEncodedText PropToken = System.Text.Json.JsonEncodedText.Encode("token");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override ExplainAnalyzeToken Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		string bytes = default;
-		long endOffset = default;
-		bool? keyword = default;
-		long position = default;
-		long positionlength = default;
-		long startOffset = default;
-		long termfrequency = default;
-		string token = default;
-		string type = default;
-		Dictionary<string, object> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, object> propAttributes = default;
+		LocalJsonProperty<string> propBytes = default;
+		LocalJsonProperty<long> propEndOffset = default;
+		LocalJsonProperty<bool?> propKeyword = default;
+		LocalJsonProperty<long> propPosition = default;
+		LocalJsonProperty<long> propPositionlength = default;
+		LocalJsonProperty<long> propStartOffset = default;
+		LocalJsonProperty<long> propTermfrequency = default;
+		LocalJsonProperty<string> propToken = default;
+		LocalJsonProperty<string> propType = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propBytes.TryRead(ref reader, options, PropBytes))
 			{
-				var property = reader.GetString();
-				if (property == "bytes")
-				{
-					bytes = JsonSerializer.Deserialize<string>(ref reader, options);
-					continue;
-				}
-
-				if (property == "end_offset")
-				{
-					endOffset = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "keyword")
-				{
-					keyword = JsonSerializer.Deserialize<bool?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "position")
-				{
-					position = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "positionLength")
-				{
-					positionlength = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "start_offset")
-				{
-					startOffset = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "termFrequency")
-				{
-					termfrequency = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "token")
-				{
-					token = JsonSerializer.Deserialize<string>(ref reader, options);
-					continue;
-				}
-
-				if (property == "type")
-				{
-					type = JsonSerializer.Deserialize<string>(ref reader, options);
-					continue;
-				}
-
-				additionalProperties ??= new Dictionary<string, object>();
-				var additionalValue = JsonSerializer.Deserialize<object>(ref reader, options);
-				additionalProperties.Add(property, additionalValue);
+				continue;
 			}
+
+			if (propEndOffset.TryRead(ref reader, options, PropEndOffset))
+			{
+				continue;
+			}
+
+			if (propKeyword.TryRead(ref reader, options, PropKeyword))
+			{
+				continue;
+			}
+
+			if (propPosition.TryRead(ref reader, options, PropPosition))
+			{
+				continue;
+			}
+
+			if (propPositionlength.TryRead(ref reader, options, PropPositionlength))
+			{
+				continue;
+			}
+
+			if (propStartOffset.TryRead(ref reader, options, PropStartOffset))
+			{
+				continue;
+			}
+
+			if (propTermfrequency.TryRead(ref reader, options, PropTermfrequency))
+			{
+				continue;
+			}
+
+			if (propToken.TryRead(ref reader, options, PropToken))
+			{
+				continue;
+			}
+
+			if (propType.TryRead(ref reader, options, PropType))
+			{
+				continue;
+			}
+
+			propAttributes ??= new System.Collections.Generic.Dictionary<string, object>();
+			reader.ReadProperty(options, out string key, out object value);
+			propAttributes[key] = value;
 		}
 
-		return new ExplainAnalyzeToken { Attributes = additionalProperties, Bytes = bytes, EndOffset = endOffset, Keyword = keyword, Position = position, Positionlength = positionlength, StartOffset = startOffset, Termfrequency = termfrequency, Token = token, Type = type };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ExplainAnalyzeToken
+		{
+			Attributes = propAttributes
+,
+			Bytes = propBytes.Value
+,
+			EndOffset = propEndOffset.Value
+,
+			Keyword = propKeyword.Value
+,
+			Position = propPosition.Value
+,
+			Positionlength = propPositionlength.Value
+,
+			StartOffset = propStartOffset.Value
+,
+			Termfrequency = propTermfrequency.Value
+,
+			Token = propToken.Value
+,
+			Type = propType.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, ExplainAnalyzeToken value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ExplainAnalyzeToken value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'ExplainAnalyzeToken' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBytes, value.Bytes);
+		writer.WriteProperty(options, PropEndOffset, value.EndOffset);
+		writer.WriteProperty(options, PropKeyword, value.Keyword);
+		writer.WriteProperty(options, PropPosition, value.Position);
+		writer.WriteProperty(options, PropPositionlength, value.Positionlength);
+		writer.WriteProperty(options, PropStartOffset, value.StartOffset);
+		writer.WriteProperty(options, PropTermfrequency, value.Termfrequency);
+		writer.WriteProperty(options, PropToken, value.Token);
+		writer.WriteProperty(options, PropType, value.Type);
+		if (value.Attributes is not null)
+		{
+			foreach (var item in value.Attributes)
+			{
+				writer.WriteProperty(options, item.Key, item.Value);
+			}
+		}
+
+		writer.WriteEndObject();
 	}
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/IndexManagement/IndexModifyDataStreamAction.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/IndexManagement/IndexModifyDataStreamAction.g.cs
index 1ae8a45a42f..b207890b479 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/IndexManagement/IndexModifyDataStreamAction.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/IndexManagement/IndexModifyDataStreamAction.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -39,12 +40,16 @@ internal IndexModifyDataStreamAction(string variantName, object variant)
 			throw new ArgumentNullException(nameof(variant));
 		if (string.IsNullOrWhiteSpace(variantName))
 			throw new ArgumentException("Variant name must not be empty or whitespace.");
-		VariantName = variantName;
+		VariantType = variantName;
 		Variant = variant;
 	}
 
-	internal object Variant { get; }
-	internal string VariantName { get; }
+	internal IndexModifyDataStreamAction()
+	{
+	}
+
+	public object Variant { get; internal set; }
+	public string VariantType { get; internal set; }
 
 	public static IndexModifyDataStreamAction AddBackingIndex(Elastic.Clients.Elasticsearch.Serverless.IndexManagement.IndexAndDataStreamAction indexAndDataStreamAction) => new IndexModifyDataStreamAction("add_backing_index", indexAndDataStreamAction);
 	public static IndexModifyDataStreamAction RemoveBackingIndex(Elastic.Clients.Elasticsearch.Serverless.IndexManagement.IndexAndDataStreamAction indexAndDataStreamAction) => new IndexModifyDataStreamAction("remove_backing_index", indexAndDataStreamAction);
@@ -62,67 +67,56 @@ public bool TryGet<T>([NotNullWhen(true)] out T? result) where T : class
 	}
 }
 
-internal sealed partial class IndexModifyDataStreamActionConverter : JsonConverter<IndexModifyDataStreamAction>
+internal sealed partial class IndexModifyDataStreamActionConverter : System.Text.Json.Serialization.JsonConverter<IndexModifyDataStreamAction>
 {
-	public override IndexModifyDataStreamAction Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-		{
-			throw new JsonException("Expected start token.");
-		}
+	private static readonly System.Text.Json.JsonEncodedText VariantAddBackingIndex = System.Text.Json.JsonEncodedText.Encode("add_backing_index");
+	private static readonly System.Text.Json.JsonEncodedText VariantRemoveBackingIndex = System.Text.Json.JsonEncodedText.Encode("remove_backing_index");
 
-		object? variantValue = default;
-		string? variantNameValue = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+	public override IndexModifyDataStreamAction Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		var variantType = string.Empty;
+		object? variant = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
+			if (reader.ValueTextEquals(VariantAddBackingIndex))
 			{
-				throw new JsonException("Expected a property name token.");
-			}
-
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token representing the name of an Elasticsearch field.");
-			}
-
-			var propertyName = reader.GetString();
-			reader.Read();
-			if (propertyName == "add_backing_index")
-			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.IndexAndDataStreamAction?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantAddBackingIndex.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.IndexAndDataStreamAction?>(options);
 				continue;
 			}
 
-			if (propertyName == "remove_backing_index")
+			if (reader.ValueTextEquals(VariantRemoveBackingIndex))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.IndexAndDataStreamAction?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantRemoveBackingIndex.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.IndexAndDataStreamAction?>(options);
 				continue;
 			}
 
-			throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'IndexModifyDataStreamAction' from the response.");
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		var result = new IndexModifyDataStreamAction(variantNameValue, variantValue);
-		return result;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new IndexModifyDataStreamAction { VariantType = variantType, Variant = variant };
 	}
 
-	public override void Write(Utf8JsonWriter writer, IndexModifyDataStreamAction value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IndexModifyDataStreamAction value, System.Text.Json.JsonSerializerOptions options)
 	{
 		writer.WriteStartObject();
-		if (value.VariantName is not null && value.Variant is not null)
+		switch (value.VariantType)
 		{
-			writer.WritePropertyName(value.VariantName);
-			switch (value.VariantName)
-			{
-				case "add_backing_index":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.IndexAndDataStreamAction>(writer, (Elastic.Clients.Elasticsearch.Serverless.IndexManagement.IndexAndDataStreamAction)value.Variant, options);
-					break;
-				case "remove_backing_index":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.IndexAndDataStreamAction>(writer, (Elastic.Clients.Elasticsearch.Serverless.IndexManagement.IndexAndDataStreamAction)value.Variant, options);
-					break;
-			}
+			case "":
+				break;
+			case "add_backing_index":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.IndexManagement.IndexAndDataStreamAction?)value.Variant);
+				break;
+			case "remove_backing_index":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.IndexManagement.IndexAndDataStreamAction?)value.Variant);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.VariantType}' is not supported for type '{nameof(IndexModifyDataStreamAction)}'.");
 		}
 
 		writer.WriteEndObject();
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/IndexManagement/IndexSegmentSort.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/IndexManagement/IndexSegmentSort.g.cs
index 3aedc9a4378..b0aea168367 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/IndexManagement/IndexSegmentSort.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/IndexManagement/IndexSegmentSort.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,19 +28,75 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.IndexManagement;
 
+internal sealed partial class IndexSegmentSortConverter : System.Text.Json.Serialization.JsonConverter<IndexSegmentSort>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropMissing = System.Text.Json.JsonEncodedText.Encode("missing");
+	private static readonly System.Text.Json.JsonEncodedText PropMode = System.Text.Json.JsonEncodedText.Encode("mode");
+	private static readonly System.Text.Json.JsonEncodedText PropOrder = System.Text.Json.JsonEncodedText.Encode("order");
+
+	public override IndexSegmentSort Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Fields?> propField = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.SegmentSortMissing>?> propMissing = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.SegmentSortMode>?> propMode = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.SegmentSortOrder>?> propOrder = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propField.TryRead(ref reader, options, PropField, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propMissing.TryRead(ref reader, options, PropMissing, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.SegmentSortMissing>?, Elastic.Clients.Elasticsearch.Serverless.IndexManagement.SegmentSortMissing>)))
+			{
+				continue;
+			}
+
+			if (propMode.TryRead(ref reader, options, PropMode, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.SegmentSortMode>?, Elastic.Clients.Elasticsearch.Serverless.IndexManagement.SegmentSortMode>)))
+			{
+				continue;
+			}
+
+			if (propOrder.TryRead(ref reader, options, PropOrder, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.SegmentSortOrder>?, Elastic.Clients.Elasticsearch.Serverless.IndexManagement.SegmentSortOrder>)))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new IndexSegmentSort
+		{
+			Field = propField.Value
+,
+			Missing = propMissing.Value
+,
+			Mode = propMode.Value
+,
+			Order = propOrder.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IndexSegmentSort value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropField, value.Field, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropMissing, value.Missing, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.SegmentSortMissing>?, Elastic.Clients.Elasticsearch.Serverless.IndexManagement.SegmentSortMissing>));
+		writer.WriteProperty(options, PropMode, value.Mode, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.SegmentSortMode>?, Elastic.Clients.Elasticsearch.Serverless.IndexManagement.SegmentSortMode>));
+		writer.WriteProperty(options, PropOrder, value.Order, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.SegmentSortOrder>?, Elastic.Clients.Elasticsearch.Serverless.IndexManagement.SegmentSortOrder>));
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(IndexSegmentSortConverter))]
 public sealed partial class IndexSegmentSort
 {
-	[JsonInclude, JsonPropertyName("field")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Serverless.Fields? Field { get; set; }
-	[JsonInclude, JsonPropertyName("missing")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.Serverless.IndexManagement.SegmentSortMissing))]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.SegmentSortMissing>? Missing { get; set; }
-	[JsonInclude, JsonPropertyName("mode")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.Serverless.IndexManagement.SegmentSortMode))]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.SegmentSortMode>? Mode { get; set; }
-	[JsonInclude, JsonPropertyName("order")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.Serverless.IndexManagement.SegmentSortOrder))]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.SegmentSortOrder>? Order { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/IndexManagement/IndexSettings.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/IndexManagement/IndexSettings.g.cs
index ef149859971..39fcfb8f01a 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/IndexManagement/IndexSettings.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/IndexManagement/IndexSettings.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,711 +28,597 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.IndexManagement;
 
-internal sealed partial class IndexSettingsConverter : JsonConverter<IndexSettings>
+internal sealed partial class IndexSettingsConverter : System.Text.Json.Serialization.JsonConverter<IndexSettings>
 {
-	public override IndexSettings Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		var variant = new IndexSettings();
-		Dictionary<string, object> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
-		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+	private static readonly System.Text.Json.JsonEncodedText PropOtherSettings = System.Text.Json.JsonEncodedText.Encode("other_settings");
+	private static readonly System.Text.Json.JsonEncodedText PropAnalysis = System.Text.Json.JsonEncodedText.Encode("analysis");
+	private static readonly System.Text.Json.JsonEncodedText PropAnalyze = System.Text.Json.JsonEncodedText.Encode("analyze");
+	private static readonly System.Text.Json.JsonEncodedText PropAutoExpandReplicas = System.Text.Json.JsonEncodedText.Encode("auto_expand_replicas");
+	private static readonly System.Text.Json.JsonEncodedText PropBlocks = System.Text.Json.JsonEncodedText.Encode("blocks");
+	private static readonly System.Text.Json.JsonEncodedText PropCheckOnStartup = System.Text.Json.JsonEncodedText.Encode("check_on_startup");
+	private static readonly System.Text.Json.JsonEncodedText PropCodec = System.Text.Json.JsonEncodedText.Encode("codec");
+	private static readonly System.Text.Json.JsonEncodedText PropCreationDate = System.Text.Json.JsonEncodedText.Encode("creation_date");
+	private static readonly System.Text.Json.JsonEncodedText PropCreationDateString = System.Text.Json.JsonEncodedText.Encode("creation_date_string");
+	private static readonly System.Text.Json.JsonEncodedText PropDefaultPipeline = System.Text.Json.JsonEncodedText.Encode("default_pipeline");
+	private static readonly System.Text.Json.JsonEncodedText PropFinalPipeline = System.Text.Json.JsonEncodedText.Encode("final_pipeline");
+	private static readonly System.Text.Json.JsonEncodedText PropFormat = System.Text.Json.JsonEncodedText.Encode("format");
+	private static readonly System.Text.Json.JsonEncodedText PropGcDeletes = System.Text.Json.JsonEncodedText.Encode("gc_deletes");
+	private static readonly System.Text.Json.JsonEncodedText PropHidden = System.Text.Json.JsonEncodedText.Encode("hidden");
+	private static readonly System.Text.Json.JsonEncodedText PropHighlight = System.Text.Json.JsonEncodedText.Encode("highlight");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropIndexingPressure = System.Text.Json.JsonEncodedText.Encode("indexing_pressure");
+	private static readonly System.Text.Json.JsonEncodedText PropIndexingSlowlog = System.Text.Json.JsonEncodedText.Encode("indexing.slowlog");
+	private static readonly System.Text.Json.JsonEncodedText PropLifecycle = System.Text.Json.JsonEncodedText.Encode("lifecycle");
+	private static readonly System.Text.Json.JsonEncodedText PropLoadFixedBitsetFiltersEagerly = System.Text.Json.JsonEncodedText.Encode("load_fixed_bitset_filters_eagerly");
+	private static readonly System.Text.Json.JsonEncodedText PropMapping = System.Text.Json.JsonEncodedText.Encode("mapping");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxDocvalueFieldsSearch = System.Text.Json.JsonEncodedText.Encode("max_docvalue_fields_search");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxInnerResultWindow = System.Text.Json.JsonEncodedText.Encode("max_inner_result_window");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxNgramDiff = System.Text.Json.JsonEncodedText.Encode("max_ngram_diff");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxRefreshListeners = System.Text.Json.JsonEncodedText.Encode("max_refresh_listeners");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxRegexLength = System.Text.Json.JsonEncodedText.Encode("max_regex_length");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxRescoreWindow = System.Text.Json.JsonEncodedText.Encode("max_rescore_window");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxResultWindow = System.Text.Json.JsonEncodedText.Encode("max_result_window");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxScriptFields = System.Text.Json.JsonEncodedText.Encode("max_script_fields");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxShingleDiff = System.Text.Json.JsonEncodedText.Encode("max_shingle_diff");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxSlicesPerScroll = System.Text.Json.JsonEncodedText.Encode("max_slices_per_scroll");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxTermsCount = System.Text.Json.JsonEncodedText.Encode("max_terms_count");
+	private static readonly System.Text.Json.JsonEncodedText PropMerge = System.Text.Json.JsonEncodedText.Encode("merge");
+	private static readonly System.Text.Json.JsonEncodedText PropMode = System.Text.Json.JsonEncodedText.Encode("mode");
+	private static readonly System.Text.Json.JsonEncodedText PropNumberOfReplicas = System.Text.Json.JsonEncodedText.Encode("number_of_replicas");
+	private static readonly System.Text.Json.JsonEncodedText PropNumberOfRoutingShards = System.Text.Json.JsonEncodedText.Encode("number_of_routing_shards");
+	private static readonly System.Text.Json.JsonEncodedText PropNumberOfShards = System.Text.Json.JsonEncodedText.Encode("number_of_shards");
+	private static readonly System.Text.Json.JsonEncodedText PropPriority = System.Text.Json.JsonEncodedText.Encode("priority");
+	private static readonly System.Text.Json.JsonEncodedText PropProvidedName = System.Text.Json.JsonEncodedText.Encode("provided_name");
+	private static readonly System.Text.Json.JsonEncodedText PropQueries = System.Text.Json.JsonEncodedText.Encode("queries");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryString = System.Text.Json.JsonEncodedText.Encode("query_string");
+	private static readonly System.Text.Json.JsonEncodedText PropRefreshInterval = System.Text.Json.JsonEncodedText.Encode("refresh_interval");
+	private static readonly System.Text.Json.JsonEncodedText PropRouting = System.Text.Json.JsonEncodedText.Encode("routing");
+	private static readonly System.Text.Json.JsonEncodedText PropRoutingPartitionSize = System.Text.Json.JsonEncodedText.Encode("routing_partition_size");
+	private static readonly System.Text.Json.JsonEncodedText PropRoutingPath = System.Text.Json.JsonEncodedText.Encode("routing_path");
+	private static readonly System.Text.Json.JsonEncodedText PropSearch = System.Text.Json.JsonEncodedText.Encode("search");
+	private static readonly System.Text.Json.JsonEncodedText PropSettings = System.Text.Json.JsonEncodedText.Encode("settings");
+	private static readonly System.Text.Json.JsonEncodedText PropSimilarity = System.Text.Json.JsonEncodedText.Encode("similarity");
+	private static readonly System.Text.Json.JsonEncodedText PropSoftDeletes = System.Text.Json.JsonEncodedText.Encode("soft_deletes");
+	private static readonly System.Text.Json.JsonEncodedText PropSort = System.Text.Json.JsonEncodedText.Encode("sort");
+	private static readonly System.Text.Json.JsonEncodedText PropStore = System.Text.Json.JsonEncodedText.Encode("store");
+	private static readonly System.Text.Json.JsonEncodedText PropTimeSeries = System.Text.Json.JsonEncodedText.Encode("time_series");
+	private static readonly System.Text.Json.JsonEncodedText PropTopMetricsMaxSize = System.Text.Json.JsonEncodedText.Encode("top_metrics_max_size");
+	private static readonly System.Text.Json.JsonEncodedText PropTranslog = System.Text.Json.JsonEncodedText.Encode("translog");
+	private static readonly System.Text.Json.JsonEncodedText PropUuid = System.Text.Json.JsonEncodedText.Encode("uuid");
+	private static readonly System.Text.Json.JsonEncodedText PropVerifiedBeforeClose = System.Text.Json.JsonEncodedText.Encode("verified_before_close");
+	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("version");
+
+	public override IndexSettings Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, object> propOtherSettings = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.IndexSettingsAnalysis?> propAnalysis = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.SettingsAnalyze?> propAnalyze = default;
+		LocalJsonProperty<string?> propAutoExpandReplicas = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.IndexSettingBlocks?> propBlocks = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.IndexCheckOnStartup?> propCheckOnStartup = default;
+		LocalJsonProperty<string?> propCodec = default;
+		LocalJsonProperty<long?> propCreationDate = default;
+		LocalJsonProperty<DateTimeOffset?> propCreationDateString = default;
+		LocalJsonProperty<string?> propDefaultPipeline = default;
+		LocalJsonProperty<string?> propFinalPipeline = default;
+		LocalJsonProperty<object?> propFormat = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Duration?> propGcDeletes = default;
+		LocalJsonProperty<object?> propHidden = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.SettingsHighlight?> propHighlight = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.IndexSettings?> propIndex = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.IndexingPressure?> propIndexingPressure = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.IndexingSlowlogSettings?> propIndexingSlowlog = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.IndexSettingsLifecycle?> propLifecycle = default;
+		LocalJsonProperty<bool?> propLoadFixedBitsetFiltersEagerly = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.MappingLimitSettings?> propMapping = default;
+		LocalJsonProperty<int?> propMaxDocvalueFieldsSearch = default;
+		LocalJsonProperty<int?> propMaxInnerResultWindow = default;
+		LocalJsonProperty<int?> propMaxNgramDiff = default;
+		LocalJsonProperty<int?> propMaxRefreshListeners = default;
+		LocalJsonProperty<int?> propMaxRegexLength = default;
+		LocalJsonProperty<int?> propMaxRescoreWindow = default;
+		LocalJsonProperty<int?> propMaxResultWindow = default;
+		LocalJsonProperty<int?> propMaxScriptFields = default;
+		LocalJsonProperty<int?> propMaxShingleDiff = default;
+		LocalJsonProperty<int?> propMaxSlicesPerScroll = default;
+		LocalJsonProperty<int?> propMaxTermsCount = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.Merge?> propMerge = default;
+		LocalJsonProperty<string?> propMode = default;
+		LocalJsonProperty<object?> propNumberOfReplicas = default;
+		LocalJsonProperty<int?> propNumberOfRoutingShards = default;
+		LocalJsonProperty<object?> propNumberOfShards = default;
+		LocalJsonProperty<object?> propPriority = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Name?> propProvidedName = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.Queries?> propQueries = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.SettingsQueryString?> propQueryString = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Duration?> propRefreshInterval = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.IndexRouting?> propRouting = default;
+		LocalJsonProperty<int?> propRoutingPartitionSize = default;
+		LocalJsonProperty<ICollection<string>?> propRoutingPath = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.SettingsSearch?> propSearch = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.IndexSettings?> propSettings = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.SettingsSimilarities?> propSimilarity = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.SoftDeletes?> propSoftDeletes = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.IndexSegmentSort?> propSort = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.Storage?> propStore = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.IndexSettingsTimeSeries?> propTimeSeries = default;
+		LocalJsonProperty<int?> propTopMetricsMaxSize = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.Translog?> propTranslog = default;
+		LocalJsonProperty<string?> propUuid = default;
+		LocalJsonProperty<object?> propVerifiedBeforeClose = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.IndexVersioning?> propVersion = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAnalysis.TryRead(ref reader, options, PropAnalysis))
 			{
-				var property = reader.GetString();
-				if (property == "analysis")
-				{
-					variant.Analysis = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.IndexSettingsAnalysis?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "analyze")
-				{
-					variant.Analyze = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.SettingsAnalyze?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "auto_expand_replicas")
-				{
-					variant.AutoExpandReplicas = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "blocks")
-				{
-					variant.Blocks = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.IndexSettingBlocks?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "check_on_startup")
-				{
-					variant.CheckOnStartup = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.IndexCheckOnStartup?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "codec")
-				{
-					variant.Codec = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "creation_date")
-				{
-					variant.CreationDate = JsonSerializer.Deserialize<long?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "creation_date_string")
-				{
-					variant.CreationDateString = JsonSerializer.Deserialize<DateTimeOffset?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "default_pipeline")
-				{
-					variant.DefaultPipeline = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "final_pipeline")
-				{
-					variant.FinalPipeline = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "format")
-				{
-					variant.Format = JsonSerializer.Deserialize<object?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "gc_deletes")
-				{
-					variant.GcDeletes = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Duration?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "hidden")
-				{
-					variant.Hidden = JsonSerializer.Deserialize<object?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "highlight")
-				{
-					variant.Highlight = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.SettingsHighlight?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "index")
-				{
-					variant.Index = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.IndexSettings?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "indexing_pressure")
-				{
-					variant.IndexingPressure = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.IndexingPressure?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "indexing.slowlog")
-				{
-					variant.IndexingSlowlog = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.IndexingSlowlogSettings?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "lifecycle")
-				{
-					variant.Lifecycle = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.IndexSettingsLifecycle?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "load_fixed_bitset_filters_eagerly")
-				{
-					variant.LoadFixedBitsetFiltersEagerly = JsonSerializer.Deserialize<bool?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "mapping")
-				{
-					variant.Mapping = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.MappingLimitSettings?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "max_docvalue_fields_search")
-				{
-					variant.MaxDocvalueFieldsSearch = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "max_inner_result_window")
-				{
-					variant.MaxInnerResultWindow = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "max_ngram_diff")
-				{
-					variant.MaxNgramDiff = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "max_refresh_listeners")
-				{
-					variant.MaxRefreshListeners = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "max_regex_length")
-				{
-					variant.MaxRegexLength = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "max_rescore_window")
-				{
-					variant.MaxRescoreWindow = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "max_result_window")
-				{
-					variant.MaxResultWindow = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "max_script_fields")
-				{
-					variant.MaxScriptFields = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "max_shingle_diff")
-				{
-					variant.MaxShingleDiff = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "max_slices_per_scroll")
-				{
-					variant.MaxSlicesPerScroll = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "max_terms_count")
-				{
-					variant.MaxTermsCount = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "merge")
-				{
-					variant.Merge = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.Merge?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "mode")
-				{
-					variant.Mode = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "number_of_replicas")
-				{
-					variant.NumberOfReplicas = JsonSerializer.Deserialize<object?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "number_of_routing_shards")
-				{
-					variant.NumberOfRoutingShards = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "number_of_shards")
-				{
-					variant.NumberOfShards = JsonSerializer.Deserialize<object?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "priority")
-				{
-					variant.Priority = JsonSerializer.Deserialize<object?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "provided_name")
-				{
-					variant.ProvidedName = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Name?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "queries")
-				{
-					variant.Queries = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.Queries?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "query_string")
-				{
-					variant.QueryString = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.SettingsQueryString?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "refresh_interval")
-				{
-					variant.RefreshInterval = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Duration?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "routing")
-				{
-					variant.Routing = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.IndexRouting?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "routing_partition_size")
-				{
-					variant.RoutingPartitionSize = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "routing_path")
-				{
-					variant.RoutingPath = SingleOrManySerializationHelper.Deserialize<string>(ref reader, options);
-					continue;
-				}
-
-				if (property == "search")
-				{
-					variant.Search = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.SettingsSearch?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "settings")
-				{
-					variant.Settings = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.IndexSettings?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "similarity")
-				{
-					variant.Similarity = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.SettingsSimilarities?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "soft_deletes")
-				{
-					variant.SoftDeletes = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.SoftDeletes?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "sort")
-				{
-					variant.Sort = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.IndexSegmentSort?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "store")
-				{
-					variant.Store = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.Storage?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "time_series")
-				{
-					variant.TimeSeries = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.IndexSettingsTimeSeries?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "top_metrics_max_size")
-				{
-					variant.TopMetricsMaxSize = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "translog")
-				{
-					variant.Translog = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.Translog?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "uuid")
-				{
-					variant.Uuid = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "verified_before_close")
-				{
-					variant.VerifiedBeforeClose = JsonSerializer.Deserialize<object?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "version")
-				{
-					variant.Version = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.IndexVersioning?>(ref reader, options);
-					continue;
-				}
-
-				additionalProperties ??= new Dictionary<string, object>();
-				var additionalValue = JsonSerializer.Deserialize<object>(ref reader, options);
-				additionalProperties.Add(property, additionalValue);
+				continue;
 			}
-		}
-
-		variant.OtherSettings = additionalProperties;
-		return variant;
-	}
 
-	public override void Write(Utf8JsonWriter writer, IndexSettings value, JsonSerializerOptions options)
-	{
-		writer.WriteStartObject();
-		if (value.OtherSettings is not null)
-		{
-			foreach (var additionalProperty in value.OtherSettings)
+			if (propAnalyze.TryRead(ref reader, options, PropAnalyze))
 			{
-				writer.WritePropertyName(additionalProperty.Key);
-				JsonSerializer.Serialize(writer, additionalProperty.Value, options);
+				continue;
 			}
-		}
 
-		if (value.Analysis is not null)
-		{
-			writer.WritePropertyName("analysis");
-			JsonSerializer.Serialize(writer, value.Analysis, options);
-		}
-
-		if (value.Analyze is not null)
-		{
-			writer.WritePropertyName("analyze");
-			JsonSerializer.Serialize(writer, value.Analyze, options);
-		}
+			if (propAutoExpandReplicas.TryRead(ref reader, options, PropAutoExpandReplicas))
+			{
+				continue;
+			}
 
-		if (!string.IsNullOrEmpty(value.AutoExpandReplicas))
-		{
-			writer.WritePropertyName("auto_expand_replicas");
-			writer.WriteStringValue(value.AutoExpandReplicas);
-		}
+			if (propBlocks.TryRead(ref reader, options, PropBlocks))
+			{
+				continue;
+			}
 
-		if (value.Blocks is not null)
-		{
-			writer.WritePropertyName("blocks");
-			JsonSerializer.Serialize(writer, value.Blocks, options);
-		}
+			if (propCheckOnStartup.TryRead(ref reader, options, PropCheckOnStartup))
+			{
+				continue;
+			}
 
-		if (value.CheckOnStartup is not null)
-		{
-			writer.WritePropertyName("check_on_startup");
-			JsonSerializer.Serialize(writer, value.CheckOnStartup, options);
-		}
+			if (propCodec.TryRead(ref reader, options, PropCodec))
+			{
+				continue;
+			}
 
-		if (!string.IsNullOrEmpty(value.Codec))
-		{
-			writer.WritePropertyName("codec");
-			writer.WriteStringValue(value.Codec);
-		}
+			if (propCreationDate.TryRead(ref reader, options, PropCreationDate))
+			{
+				continue;
+			}
 
-		if (value.CreationDate.HasValue)
-		{
-			writer.WritePropertyName("creation_date");
-			writer.WriteNumberValue(value.CreationDate.Value);
-		}
+			if (propCreationDateString.TryRead(ref reader, options, PropCreationDateString))
+			{
+				continue;
+			}
 
-		if (value.CreationDateString is not null)
-		{
-			writer.WritePropertyName("creation_date_string");
-			JsonSerializer.Serialize(writer, value.CreationDateString, options);
-		}
+			if (propDefaultPipeline.TryRead(ref reader, options, PropDefaultPipeline))
+			{
+				continue;
+			}
 
-		if (!string.IsNullOrEmpty(value.DefaultPipeline))
-		{
-			writer.WritePropertyName("default_pipeline");
-			writer.WriteStringValue(value.DefaultPipeline);
-		}
+			if (propFinalPipeline.TryRead(ref reader, options, PropFinalPipeline))
+			{
+				continue;
+			}
 
-		if (!string.IsNullOrEmpty(value.FinalPipeline))
-		{
-			writer.WritePropertyName("final_pipeline");
-			writer.WriteStringValue(value.FinalPipeline);
-		}
+			if (propFormat.TryRead(ref reader, options, PropFormat))
+			{
+				continue;
+			}
 
-		if (value.Format is not null)
-		{
-			writer.WritePropertyName("format");
-			JsonSerializer.Serialize(writer, value.Format, options);
-		}
+			if (propGcDeletes.TryRead(ref reader, options, PropGcDeletes))
+			{
+				continue;
+			}
 
-		if (value.GcDeletes is not null)
-		{
-			writer.WritePropertyName("gc_deletes");
-			JsonSerializer.Serialize(writer, value.GcDeletes, options);
-		}
+			if (propHidden.TryRead(ref reader, options, PropHidden))
+			{
+				continue;
+			}
 
-		if (value.Hidden is not null)
-		{
-			writer.WritePropertyName("hidden");
-			JsonSerializer.Serialize(writer, value.Hidden, options);
-		}
+			if (propHighlight.TryRead(ref reader, options, PropHighlight))
+			{
+				continue;
+			}
 
-		if (value.Highlight is not null)
-		{
-			writer.WritePropertyName("highlight");
-			JsonSerializer.Serialize(writer, value.Highlight, options);
-		}
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
 
-		if (value.Index is not null)
-		{
-			writer.WritePropertyName("index");
-			JsonSerializer.Serialize(writer, value.Index, options);
-		}
+			if (propIndexingPressure.TryRead(ref reader, options, PropIndexingPressure))
+			{
+				continue;
+			}
 
-		if (value.IndexingPressure is not null)
-		{
-			writer.WritePropertyName("indexing_pressure");
-			JsonSerializer.Serialize(writer, value.IndexingPressure, options);
-		}
+			if (propIndexingSlowlog.TryRead(ref reader, options, PropIndexingSlowlog))
+			{
+				continue;
+			}
 
-		if (value.IndexingSlowlog is not null)
-		{
-			writer.WritePropertyName("indexing.slowlog");
-			JsonSerializer.Serialize(writer, value.IndexingSlowlog, options);
-		}
+			if (propLifecycle.TryRead(ref reader, options, PropLifecycle))
+			{
+				continue;
+			}
 
-		if (value.Lifecycle is not null)
-		{
-			writer.WritePropertyName("lifecycle");
-			JsonSerializer.Serialize(writer, value.Lifecycle, options);
-		}
+			if (propLoadFixedBitsetFiltersEagerly.TryRead(ref reader, options, PropLoadFixedBitsetFiltersEagerly))
+			{
+				continue;
+			}
 
-		if (value.LoadFixedBitsetFiltersEagerly.HasValue)
-		{
-			writer.WritePropertyName("load_fixed_bitset_filters_eagerly");
-			writer.WriteBooleanValue(value.LoadFixedBitsetFiltersEagerly.Value);
-		}
+			if (propMapping.TryRead(ref reader, options, PropMapping))
+			{
+				continue;
+			}
 
-		if (value.Mapping is not null)
-		{
-			writer.WritePropertyName("mapping");
-			JsonSerializer.Serialize(writer, value.Mapping, options);
-		}
+			if (propMaxDocvalueFieldsSearch.TryRead(ref reader, options, PropMaxDocvalueFieldsSearch))
+			{
+				continue;
+			}
 
-		if (value.MaxDocvalueFieldsSearch.HasValue)
-		{
-			writer.WritePropertyName("max_docvalue_fields_search");
-			writer.WriteNumberValue(value.MaxDocvalueFieldsSearch.Value);
-		}
+			if (propMaxInnerResultWindow.TryRead(ref reader, options, PropMaxInnerResultWindow))
+			{
+				continue;
+			}
 
-		if (value.MaxInnerResultWindow.HasValue)
-		{
-			writer.WritePropertyName("max_inner_result_window");
-			writer.WriteNumberValue(value.MaxInnerResultWindow.Value);
-		}
+			if (propMaxNgramDiff.TryRead(ref reader, options, PropMaxNgramDiff))
+			{
+				continue;
+			}
 
-		if (value.MaxNgramDiff.HasValue)
-		{
-			writer.WritePropertyName("max_ngram_diff");
-			writer.WriteNumberValue(value.MaxNgramDiff.Value);
-		}
+			if (propMaxRefreshListeners.TryRead(ref reader, options, PropMaxRefreshListeners))
+			{
+				continue;
+			}
 
-		if (value.MaxRefreshListeners.HasValue)
-		{
-			writer.WritePropertyName("max_refresh_listeners");
-			writer.WriteNumberValue(value.MaxRefreshListeners.Value);
-		}
+			if (propMaxRegexLength.TryRead(ref reader, options, PropMaxRegexLength))
+			{
+				continue;
+			}
 
-		if (value.MaxRegexLength.HasValue)
-		{
-			writer.WritePropertyName("max_regex_length");
-			writer.WriteNumberValue(value.MaxRegexLength.Value);
-		}
+			if (propMaxRescoreWindow.TryRead(ref reader, options, PropMaxRescoreWindow))
+			{
+				continue;
+			}
 
-		if (value.MaxRescoreWindow.HasValue)
-		{
-			writer.WritePropertyName("max_rescore_window");
-			writer.WriteNumberValue(value.MaxRescoreWindow.Value);
-		}
+			if (propMaxResultWindow.TryRead(ref reader, options, PropMaxResultWindow))
+			{
+				continue;
+			}
 
-		if (value.MaxResultWindow.HasValue)
-		{
-			writer.WritePropertyName("max_result_window");
-			writer.WriteNumberValue(value.MaxResultWindow.Value);
-		}
+			if (propMaxScriptFields.TryRead(ref reader, options, PropMaxScriptFields))
+			{
+				continue;
+			}
 
-		if (value.MaxScriptFields.HasValue)
-		{
-			writer.WritePropertyName("max_script_fields");
-			writer.WriteNumberValue(value.MaxScriptFields.Value);
-		}
+			if (propMaxShingleDiff.TryRead(ref reader, options, PropMaxShingleDiff))
+			{
+				continue;
+			}
 
-		if (value.MaxShingleDiff.HasValue)
-		{
-			writer.WritePropertyName("max_shingle_diff");
-			writer.WriteNumberValue(value.MaxShingleDiff.Value);
-		}
+			if (propMaxSlicesPerScroll.TryRead(ref reader, options, PropMaxSlicesPerScroll))
+			{
+				continue;
+			}
 
-		if (value.MaxSlicesPerScroll.HasValue)
-		{
-			writer.WritePropertyName("max_slices_per_scroll");
-			writer.WriteNumberValue(value.MaxSlicesPerScroll.Value);
-		}
+			if (propMaxTermsCount.TryRead(ref reader, options, PropMaxTermsCount))
+			{
+				continue;
+			}
 
-		if (value.MaxTermsCount.HasValue)
-		{
-			writer.WritePropertyName("max_terms_count");
-			writer.WriteNumberValue(value.MaxTermsCount.Value);
-		}
+			if (propMerge.TryRead(ref reader, options, PropMerge))
+			{
+				continue;
+			}
 
-		if (value.Merge is not null)
-		{
-			writer.WritePropertyName("merge");
-			JsonSerializer.Serialize(writer, value.Merge, options);
-		}
+			if (propMode.TryRead(ref reader, options, PropMode))
+			{
+				continue;
+			}
 
-		if (!string.IsNullOrEmpty(value.Mode))
-		{
-			writer.WritePropertyName("mode");
-			writer.WriteStringValue(value.Mode);
-		}
+			if (propNumberOfReplicas.TryRead(ref reader, options, PropNumberOfReplicas))
+			{
+				continue;
+			}
 
-		if (value.NumberOfReplicas is not null)
-		{
-			writer.WritePropertyName("number_of_replicas");
-			JsonSerializer.Serialize(writer, value.NumberOfReplicas, options);
-		}
+			if (propNumberOfRoutingShards.TryRead(ref reader, options, PropNumberOfRoutingShards))
+			{
+				continue;
+			}
 
-		if (value.NumberOfRoutingShards.HasValue)
-		{
-			writer.WritePropertyName("number_of_routing_shards");
-			writer.WriteNumberValue(value.NumberOfRoutingShards.Value);
-		}
+			if (propNumberOfShards.TryRead(ref reader, options, PropNumberOfShards))
+			{
+				continue;
+			}
 
-		if (value.NumberOfShards is not null)
-		{
-			writer.WritePropertyName("number_of_shards");
-			JsonSerializer.Serialize(writer, value.NumberOfShards, options);
-		}
+			if (propPriority.TryRead(ref reader, options, PropPriority))
+			{
+				continue;
+			}
 
-		if (value.Priority is not null)
-		{
-			writer.WritePropertyName("priority");
-			JsonSerializer.Serialize(writer, value.Priority, options);
-		}
+			if (propProvidedName.TryRead(ref reader, options, PropProvidedName))
+			{
+				continue;
+			}
 
-		if (value.ProvidedName is not null)
-		{
-			writer.WritePropertyName("provided_name");
-			JsonSerializer.Serialize(writer, value.ProvidedName, options);
-		}
+			if (propQueries.TryRead(ref reader, options, PropQueries))
+			{
+				continue;
+			}
 
-		if (value.Queries is not null)
-		{
-			writer.WritePropertyName("queries");
-			JsonSerializer.Serialize(writer, value.Queries, options);
-		}
+			if (propQueryString.TryRead(ref reader, options, PropQueryString))
+			{
+				continue;
+			}
 
-		if (value.QueryString is not null)
-		{
-			writer.WritePropertyName("query_string");
-			JsonSerializer.Serialize(writer, value.QueryString, options);
-		}
+			if (propRefreshInterval.TryRead(ref reader, options, PropRefreshInterval))
+			{
+				continue;
+			}
 
-		if (value.RefreshInterval is not null)
-		{
-			writer.WritePropertyName("refresh_interval");
-			JsonSerializer.Serialize(writer, value.RefreshInterval, options);
-		}
+			if (propRouting.TryRead(ref reader, options, PropRouting))
+			{
+				continue;
+			}
 
-		if (value.Routing is not null)
-		{
-			writer.WritePropertyName("routing");
-			JsonSerializer.Serialize(writer, value.Routing, options);
-		}
+			if (propRoutingPartitionSize.TryRead(ref reader, options, PropRoutingPartitionSize))
+			{
+				continue;
+			}
 
-		if (value.RoutingPartitionSize.HasValue)
-		{
-			writer.WritePropertyName("routing_partition_size");
-			writer.WriteNumberValue(value.RoutingPartitionSize.Value);
-		}
+			if (propRoutingPath.TryRead(ref reader, options, PropRoutingPath, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
 
-		if (value.RoutingPath is not null)
-		{
-			writer.WritePropertyName("routing_path");
-			JsonSerializer.Serialize(writer, value.RoutingPath, options);
-		}
+			if (propSearch.TryRead(ref reader, options, PropSearch))
+			{
+				continue;
+			}
 
-		if (value.Search is not null)
-		{
-			writer.WritePropertyName("search");
-			JsonSerializer.Serialize(writer, value.Search, options);
-		}
+			if (propSettings.TryRead(ref reader, options, PropSettings))
+			{
+				continue;
+			}
 
-		if (value.Settings is not null)
-		{
-			writer.WritePropertyName("settings");
-			JsonSerializer.Serialize(writer, value.Settings, options);
-		}
+			if (propSimilarity.TryRead(ref reader, options, PropSimilarity))
+			{
+				continue;
+			}
 
-		if (value.Similarity is not null)
-		{
-			writer.WritePropertyName("similarity");
-			JsonSerializer.Serialize(writer, value.Similarity, options);
-		}
+			if (propSoftDeletes.TryRead(ref reader, options, PropSoftDeletes))
+			{
+				continue;
+			}
 
-		if (value.SoftDeletes is not null)
-		{
-			writer.WritePropertyName("soft_deletes");
-			JsonSerializer.Serialize(writer, value.SoftDeletes, options);
-		}
+			if (propSort.TryRead(ref reader, options, PropSort))
+			{
+				continue;
+			}
 
-		if (value.Sort is not null)
-		{
-			writer.WritePropertyName("sort");
-			JsonSerializer.Serialize(writer, value.Sort, options);
-		}
+			if (propStore.TryRead(ref reader, options, PropStore))
+			{
+				continue;
+			}
 
-		if (value.Store is not null)
-		{
-			writer.WritePropertyName("store");
-			JsonSerializer.Serialize(writer, value.Store, options);
-		}
+			if (propTimeSeries.TryRead(ref reader, options, PropTimeSeries))
+			{
+				continue;
+			}
 
-		if (value.TimeSeries is not null)
-		{
-			writer.WritePropertyName("time_series");
-			JsonSerializer.Serialize(writer, value.TimeSeries, options);
-		}
+			if (propTopMetricsMaxSize.TryRead(ref reader, options, PropTopMetricsMaxSize))
+			{
+				continue;
+			}
 
-		if (value.TopMetricsMaxSize.HasValue)
-		{
-			writer.WritePropertyName("top_metrics_max_size");
-			writer.WriteNumberValue(value.TopMetricsMaxSize.Value);
-		}
+			if (propTranslog.TryRead(ref reader, options, PropTranslog))
+			{
+				continue;
+			}
 
-		if (value.Translog is not null)
-		{
-			writer.WritePropertyName("translog");
-			JsonSerializer.Serialize(writer, value.Translog, options);
-		}
+			if (propUuid.TryRead(ref reader, options, PropUuid))
+			{
+				continue;
+			}
 
-		if (!string.IsNullOrEmpty(value.Uuid))
-		{
-			writer.WritePropertyName("uuid");
-			writer.WriteStringValue(value.Uuid);
-		}
+			if (propVerifiedBeforeClose.TryRead(ref reader, options, PropVerifiedBeforeClose))
+			{
+				continue;
+			}
 
-		if (value.VerifiedBeforeClose is not null)
-		{
-			writer.WritePropertyName("verified_before_close");
-			JsonSerializer.Serialize(writer, value.VerifiedBeforeClose, options);
-		}
+			if (propVersion.TryRead(ref reader, options, PropVersion))
+			{
+				continue;
+			}
 
-		if (value.Version is not null)
+			propOtherSettings ??= new System.Collections.Generic.Dictionary<string, object>();
+			reader.ReadProperty(options, out string key, out object value);
+			propOtherSettings[key] = value;
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new IndexSettings
+		{
+			OtherSettings = propOtherSettings
+,
+			Analysis = propAnalysis.Value
+,
+			Analyze = propAnalyze.Value
+,
+			AutoExpandReplicas = propAutoExpandReplicas.Value
+,
+			Blocks = propBlocks.Value
+,
+			CheckOnStartup = propCheckOnStartup.Value
+,
+			Codec = propCodec.Value
+,
+			CreationDate = propCreationDate.Value
+,
+			CreationDateString = propCreationDateString.Value
+,
+			DefaultPipeline = propDefaultPipeline.Value
+,
+			FinalPipeline = propFinalPipeline.Value
+,
+			Format = propFormat.Value
+,
+			GcDeletes = propGcDeletes.Value
+,
+			Hidden = propHidden.Value
+,
+			Highlight = propHighlight.Value
+,
+			Index = propIndex.Value
+,
+			IndexingPressure = propIndexingPressure.Value
+,
+			IndexingSlowlog = propIndexingSlowlog.Value
+,
+			Lifecycle = propLifecycle.Value
+,
+			LoadFixedBitsetFiltersEagerly = propLoadFixedBitsetFiltersEagerly.Value
+,
+			Mapping = propMapping.Value
+,
+			MaxDocvalueFieldsSearch = propMaxDocvalueFieldsSearch.Value
+,
+			MaxInnerResultWindow = propMaxInnerResultWindow.Value
+,
+			MaxNgramDiff = propMaxNgramDiff.Value
+,
+			MaxRefreshListeners = propMaxRefreshListeners.Value
+,
+			MaxRegexLength = propMaxRegexLength.Value
+,
+			MaxRescoreWindow = propMaxRescoreWindow.Value
+,
+			MaxResultWindow = propMaxResultWindow.Value
+,
+			MaxScriptFields = propMaxScriptFields.Value
+,
+			MaxShingleDiff = propMaxShingleDiff.Value
+,
+			MaxSlicesPerScroll = propMaxSlicesPerScroll.Value
+,
+			MaxTermsCount = propMaxTermsCount.Value
+,
+			Merge = propMerge.Value
+,
+			Mode = propMode.Value
+,
+			NumberOfReplicas = propNumberOfReplicas.Value
+,
+			NumberOfRoutingShards = propNumberOfRoutingShards.Value
+,
+			NumberOfShards = propNumberOfShards.Value
+,
+			Priority = propPriority.Value
+,
+			ProvidedName = propProvidedName.Value
+,
+			Queries = propQueries.Value
+,
+			QueryString = propQueryString.Value
+,
+			RefreshInterval = propRefreshInterval.Value
+,
+			Routing = propRouting.Value
+,
+			RoutingPartitionSize = propRoutingPartitionSize.Value
+,
+			RoutingPath = propRoutingPath.Value
+,
+			Search = propSearch.Value
+,
+			Settings = propSettings.Value
+,
+			Similarity = propSimilarity.Value
+,
+			SoftDeletes = propSoftDeletes.Value
+,
+			Sort = propSort.Value
+,
+			Store = propStore.Value
+,
+			TimeSeries = propTimeSeries.Value
+,
+			TopMetricsMaxSize = propTopMetricsMaxSize.Value
+,
+			Translog = propTranslog.Value
+,
+			Uuid = propUuid.Value
+,
+			VerifiedBeforeClose = propVerifiedBeforeClose.Value
+,
+			Version = propVersion.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IndexSettings value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAnalysis, value.Analysis);
+		writer.WriteProperty(options, PropAnalyze, value.Analyze);
+		writer.WriteProperty(options, PropAutoExpandReplicas, value.AutoExpandReplicas);
+		writer.WriteProperty(options, PropBlocks, value.Blocks);
+		writer.WriteProperty(options, PropCheckOnStartup, value.CheckOnStartup);
+		writer.WriteProperty(options, PropCodec, value.Codec);
+		writer.WriteProperty(options, PropCreationDate, value.CreationDate);
+		writer.WriteProperty(options, PropCreationDateString, value.CreationDateString);
+		writer.WriteProperty(options, PropDefaultPipeline, value.DefaultPipeline);
+		writer.WriteProperty(options, PropFinalPipeline, value.FinalPipeline);
+		writer.WriteProperty(options, PropFormat, value.Format);
+		writer.WriteProperty(options, PropGcDeletes, value.GcDeletes);
+		writer.WriteProperty(options, PropHidden, value.Hidden);
+		writer.WriteProperty(options, PropHighlight, value.Highlight);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropIndexingPressure, value.IndexingPressure);
+		writer.WriteProperty(options, PropIndexingSlowlog, value.IndexingSlowlog);
+		writer.WriteProperty(options, PropLifecycle, value.Lifecycle);
+		writer.WriteProperty(options, PropLoadFixedBitsetFiltersEagerly, value.LoadFixedBitsetFiltersEagerly);
+		writer.WriteProperty(options, PropMapping, value.Mapping);
+		writer.WriteProperty(options, PropMaxDocvalueFieldsSearch, value.MaxDocvalueFieldsSearch);
+		writer.WriteProperty(options, PropMaxInnerResultWindow, value.MaxInnerResultWindow);
+		writer.WriteProperty(options, PropMaxNgramDiff, value.MaxNgramDiff);
+		writer.WriteProperty(options, PropMaxRefreshListeners, value.MaxRefreshListeners);
+		writer.WriteProperty(options, PropMaxRegexLength, value.MaxRegexLength);
+		writer.WriteProperty(options, PropMaxRescoreWindow, value.MaxRescoreWindow);
+		writer.WriteProperty(options, PropMaxResultWindow, value.MaxResultWindow);
+		writer.WriteProperty(options, PropMaxScriptFields, value.MaxScriptFields);
+		writer.WriteProperty(options, PropMaxShingleDiff, value.MaxShingleDiff);
+		writer.WriteProperty(options, PropMaxSlicesPerScroll, value.MaxSlicesPerScroll);
+		writer.WriteProperty(options, PropMaxTermsCount, value.MaxTermsCount);
+		writer.WriteProperty(options, PropMerge, value.Merge);
+		writer.WriteProperty(options, PropMode, value.Mode);
+		writer.WriteProperty(options, PropNumberOfReplicas, value.NumberOfReplicas);
+		writer.WriteProperty(options, PropNumberOfRoutingShards, value.NumberOfRoutingShards);
+		writer.WriteProperty(options, PropNumberOfShards, value.NumberOfShards);
+		writer.WriteProperty(options, PropPriority, value.Priority);
+		writer.WriteProperty(options, PropProvidedName, value.ProvidedName);
+		writer.WriteProperty(options, PropQueries, value.Queries);
+		writer.WriteProperty(options, PropQueryString, value.QueryString);
+		writer.WriteProperty(options, PropRefreshInterval, value.RefreshInterval);
+		writer.WriteProperty(options, PropRouting, value.Routing);
+		writer.WriteProperty(options, PropRoutingPartitionSize, value.RoutingPartitionSize);
+		writer.WriteProperty(options, PropRoutingPath, value.RoutingPath, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropSearch, value.Search);
+		writer.WriteProperty(options, PropSettings, value.Settings);
+		writer.WriteProperty(options, PropSimilarity, value.Similarity);
+		writer.WriteProperty(options, PropSoftDeletes, value.SoftDeletes);
+		writer.WriteProperty(options, PropSort, value.Sort);
+		writer.WriteProperty(options, PropStore, value.Store);
+		writer.WriteProperty(options, PropTimeSeries, value.TimeSeries);
+		writer.WriteProperty(options, PropTopMetricsMaxSize, value.TopMetricsMaxSize);
+		writer.WriteProperty(options, PropTranslog, value.Translog);
+		writer.WriteProperty(options, PropUuid, value.Uuid);
+		writer.WriteProperty(options, PropVerifiedBeforeClose, value.VerifiedBeforeClose);
+		writer.WriteProperty(options, PropVersion, value.Version);
+		if (value.OtherSettings is not null)
 		{
-			writer.WritePropertyName("version");
-			JsonSerializer.Serialize(writer, value.Version, options);
+			foreach (var item in value.OtherSettings)
+			{
+				writer.WriteProperty(options, item.Key, item.Value);
+			}
 		}
 
 		writer.WriteEndObject();
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/IndexManagement/IndexTemplate.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/IndexManagement/IndexTemplate.g.cs
index 69e9ad496be..57bc6e728fa 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/IndexManagement/IndexTemplate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/IndexManagement/IndexTemplate.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,9 +28,132 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.IndexManagement;
 
+internal sealed partial class IndexTemplateConverter : System.Text.Json.Serialization.JsonConverter<IndexTemplate>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAllowAutoCreate = System.Text.Json.JsonEncodedText.Encode("allow_auto_create");
+	private static readonly System.Text.Json.JsonEncodedText PropComposedOf = System.Text.Json.JsonEncodedText.Encode("composed_of");
+	private static readonly System.Text.Json.JsonEncodedText PropDataStream = System.Text.Json.JsonEncodedText.Encode("data_stream");
+	private static readonly System.Text.Json.JsonEncodedText PropDeprecated = System.Text.Json.JsonEncodedText.Encode("deprecated");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreMissingComponentTemplates = System.Text.Json.JsonEncodedText.Encode("ignore_missing_component_templates");
+	private static readonly System.Text.Json.JsonEncodedText PropIndexPatterns = System.Text.Json.JsonEncodedText.Encode("index_patterns");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("_meta");
+	private static readonly System.Text.Json.JsonEncodedText PropPriority = System.Text.Json.JsonEncodedText.Encode("priority");
+	private static readonly System.Text.Json.JsonEncodedText PropTemplate = System.Text.Json.JsonEncodedText.Encode("template");
+	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("version");
+
+	public override IndexTemplate Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool?> propAllowAutoCreate = default;
+		LocalJsonProperty<IReadOnlyCollection<string>> propComposedOf = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.IndexTemplateDataStreamConfiguration?> propDataStream = default;
+		LocalJsonProperty<bool?> propDeprecated = default;
+		LocalJsonProperty<IReadOnlyCollection<string>?> propIgnoreMissingComponentTemplates = default;
+		LocalJsonProperty<IReadOnlyCollection<string>> propIndexPatterns = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, object>?> propMeta = default;
+		LocalJsonProperty<long?> propPriority = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.IndexTemplateSummary?> propTemplate = default;
+		LocalJsonProperty<long?> propVersion = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAllowAutoCreate.TryRead(ref reader, options, PropAllowAutoCreate))
+			{
+				continue;
+			}
+
+			if (propComposedOf.TryRead(ref reader, options, PropComposedOf))
+			{
+				continue;
+			}
+
+			if (propDataStream.TryRead(ref reader, options, PropDataStream))
+			{
+				continue;
+			}
+
+			if (propDeprecated.TryRead(ref reader, options, PropDeprecated))
+			{
+				continue;
+			}
+
+			if (propIgnoreMissingComponentTemplates.TryRead(ref reader, options, PropIgnoreMissingComponentTemplates, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propIndexPatterns.TryRead(ref reader, options, PropIndexPatterns, typeof(SingleOrManyMarker<IReadOnlyCollection<string>, string>)))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propPriority.TryRead(ref reader, options, PropPriority))
+			{
+				continue;
+			}
+
+			if (propTemplate.TryRead(ref reader, options, PropTemplate))
+			{
+				continue;
+			}
+
+			if (propVersion.TryRead(ref reader, options, PropVersion))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new IndexTemplate
+		{
+			AllowAutoCreate = propAllowAutoCreate.Value
+,
+			ComposedOf = propComposedOf.Value
+,
+			DataStream = propDataStream.Value
+,
+			Deprecated = propDeprecated.Value
+,
+			IgnoreMissingComponentTemplates = propIgnoreMissingComponentTemplates.Value
+,
+			IndexPatterns = propIndexPatterns.Value
+,
+			Meta = propMeta.Value
+,
+			Priority = propPriority.Value
+,
+			Template = propTemplate.Value
+,
+			Version = propVersion.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IndexTemplate value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAllowAutoCreate, value.AllowAutoCreate);
+		writer.WriteProperty(options, PropComposedOf, value.ComposedOf);
+		writer.WriteProperty(options, PropDataStream, value.DataStream);
+		writer.WriteProperty(options, PropDeprecated, value.Deprecated);
+		writer.WriteProperty(options, PropIgnoreMissingComponentTemplates, value.IgnoreMissingComponentTemplates, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropIndexPatterns, value.IndexPatterns, typeof(SingleOrManyMarker<IReadOnlyCollection<string>, string>));
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropPriority, value.Priority);
+		writer.WriteProperty(options, PropTemplate, value.Template);
+		writer.WriteProperty(options, PropVersion, value.Version);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(IndexTemplateConverter))]
 public sealed partial class IndexTemplate
 {
-	[JsonInclude, JsonPropertyName("allow_auto_create")]
 	public bool? AllowAutoCreate { get; init; }
 
 	/// <summary>
@@ -38,7 +162,6 @@ public sealed partial class IndexTemplate
 	/// Component templates are merged in the order specified, meaning that the last component template specified has the highest precedence.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("composed_of")]
 	public IReadOnlyCollection<string> ComposedOf { get; init; }
 
 	/// <summary>
@@ -48,7 +171,6 @@ public sealed partial class IndexTemplate
 	/// Data streams require a matching index template with a <c>data_stream</c> object.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("data_stream")]
 	public Elastic.Clients.Elasticsearch.Serverless.IndexManagement.IndexTemplateDataStreamConfiguration? DataStream { get; init; }
 
 	/// <summary>
@@ -58,7 +180,6 @@ public sealed partial class IndexTemplate
 	/// Elasticsearch will emit a deprecation warning.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("deprecated")]
 	public bool? Deprecated { get; init; }
 
 	/// <summary>
@@ -66,8 +187,6 @@ public sealed partial class IndexTemplate
 	/// A list of component template names that are allowed to be absent.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("ignore_missing_component_templates")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public IReadOnlyCollection<string>? IgnoreMissingComponentTemplates { get; init; }
 
 	/// <summary>
@@ -75,8 +194,6 @@ public sealed partial class IndexTemplate
 	/// Name of the index template.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("index_patterns")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public IReadOnlyCollection<string> IndexPatterns { get; init; }
 
 	/// <summary>
@@ -85,7 +202,6 @@ public sealed partial class IndexTemplate
 	/// This map is not automatically generated by Elasticsearch.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("_meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
 
 	/// <summary>
@@ -96,7 +212,6 @@ public sealed partial class IndexTemplate
 	/// This number is not automatically generated by Elasticsearch.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("priority")]
 	public long? Priority { get; init; }
 
 	/// <summary>
@@ -105,7 +220,6 @@ public sealed partial class IndexTemplate
 	/// It may optionally include an <c>aliases</c>, <c>mappings</c>, or <c>settings</c> configuration.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("template")]
 	public Elastic.Clients.Elasticsearch.Serverless.IndexManagement.IndexTemplateSummary? Template { get; init; }
 
 	/// <summary>
@@ -114,6 +228,5 @@ public sealed partial class IndexTemplate
 	/// This number is not automatically generated by Elasticsearch.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("version")]
 	public long? Version { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/IndexManagement/IndexTemplateSummary.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/IndexManagement/IndexTemplateSummary.g.cs
index a13a65df15f..f5eabcb0122 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/IndexManagement/IndexTemplateSummary.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/IndexManagement/IndexTemplateSummary.g.cs
@@ -38,7 +38,6 @@ public sealed partial class IndexTemplateSummary
 	/// </para>
 	/// </summary>
 	[JsonInclude, JsonPropertyName("aliases")]
-	[ReadOnlyIndexNameDictionaryConverter(typeof(Elastic.Clients.Elasticsearch.Serverless.IndexManagement.Alias))]
 	public IReadOnlyDictionary<Elastic.Clients.Elasticsearch.Serverless.IndexName, Elastic.Clients.Elasticsearch.Serverless.IndexManagement.Alias>? Aliases { get; init; }
 	[JsonInclude, JsonPropertyName("lifecycle")]
 	public Elastic.Clients.Elasticsearch.Serverless.IndexManagement.DataStreamLifecycleWithRollover? Lifecycle { get; init; }
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/IndexManagement/IndexUpdateAliasesAction.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/IndexManagement/IndexUpdateAliasesAction.g.cs
index 009836d7915..f014287edc2 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/IndexManagement/IndexUpdateAliasesAction.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/IndexManagement/IndexUpdateAliasesAction.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -39,12 +40,16 @@ internal IndexUpdateAliasesAction(string variantName, object variant)
 			throw new ArgumentNullException(nameof(variant));
 		if (string.IsNullOrWhiteSpace(variantName))
 			throw new ArgumentException("Variant name must not be empty or whitespace.");
-		VariantName = variantName;
+		VariantType = variantName;
 		Variant = variant;
 	}
 
-	internal object Variant { get; }
-	internal string VariantName { get; }
+	internal IndexUpdateAliasesAction()
+	{
+	}
+
+	public object Variant { get; internal set; }
+	public string VariantType { get; internal set; }
 
 	public static IndexUpdateAliasesAction Add(Elastic.Clients.Elasticsearch.Serverless.IndexManagement.AddAction addAction) => new IndexUpdateAliasesAction("add", addAction);
 	public static IndexUpdateAliasesAction Remove(Elastic.Clients.Elasticsearch.Serverless.IndexManagement.RemoveAction removeAction) => new IndexUpdateAliasesAction("remove", removeAction);
@@ -63,77 +68,68 @@ public bool TryGet<T>([NotNullWhen(true)] out T? result) where T : class
 	}
 }
 
-internal sealed partial class IndexUpdateAliasesActionConverter : JsonConverter<IndexUpdateAliasesAction>
+internal sealed partial class IndexUpdateAliasesActionConverter : System.Text.Json.Serialization.JsonConverter<IndexUpdateAliasesAction>
 {
-	public override IndexUpdateAliasesAction Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-		{
-			throw new JsonException("Expected start token.");
-		}
+	private static readonly System.Text.Json.JsonEncodedText VariantAdd = System.Text.Json.JsonEncodedText.Encode("add");
+	private static readonly System.Text.Json.JsonEncodedText VariantRemove = System.Text.Json.JsonEncodedText.Encode("remove");
+	private static readonly System.Text.Json.JsonEncodedText VariantRemoveIndex = System.Text.Json.JsonEncodedText.Encode("remove_index");
 
-		object? variantValue = default;
-		string? variantNameValue = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+	public override IndexUpdateAliasesAction Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		var variantType = string.Empty;
+		object? variant = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
+			if (reader.ValueTextEquals(VariantAdd))
 			{
-				throw new JsonException("Expected a property name token.");
-			}
-
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token representing the name of an Elasticsearch field.");
-			}
-
-			var propertyName = reader.GetString();
-			reader.Read();
-			if (propertyName == "add")
-			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.AddAction?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantAdd.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.AddAction?>(options);
 				continue;
 			}
 
-			if (propertyName == "remove")
+			if (reader.ValueTextEquals(VariantRemove))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.RemoveAction?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantRemove.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.RemoveAction?>(options);
 				continue;
 			}
 
-			if (propertyName == "remove_index")
+			if (reader.ValueTextEquals(VariantRemoveIndex))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.RemoveIndexAction?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantRemoveIndex.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.RemoveIndexAction?>(options);
 				continue;
 			}
 
-			throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'IndexUpdateAliasesAction' from the response.");
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		var result = new IndexUpdateAliasesAction(variantNameValue, variantValue);
-		return result;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new IndexUpdateAliasesAction { VariantType = variantType, Variant = variant };
 	}
 
-	public override void Write(Utf8JsonWriter writer, IndexUpdateAliasesAction value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IndexUpdateAliasesAction value, System.Text.Json.JsonSerializerOptions options)
 	{
 		writer.WriteStartObject();
-		if (value.VariantName is not null && value.Variant is not null)
+		switch (value.VariantType)
 		{
-			writer.WritePropertyName(value.VariantName);
-			switch (value.VariantName)
-			{
-				case "add":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.AddAction>(writer, (Elastic.Clients.Elasticsearch.Serverless.IndexManagement.AddAction)value.Variant, options);
-					break;
-				case "remove":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.RemoveAction>(writer, (Elastic.Clients.Elasticsearch.Serverless.IndexManagement.RemoveAction)value.Variant, options);
-					break;
-				case "remove_index":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.RemoveIndexAction>(writer, (Elastic.Clients.Elasticsearch.Serverless.IndexManagement.RemoveIndexAction)value.Variant, options);
-					break;
-			}
+			case "":
+				break;
+			case "add":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.IndexManagement.AddAction?)value.Variant);
+				break;
+			case "remove":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.IndexManagement.RemoveAction?)value.Variant);
+				break;
+			case "remove_index":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.IndexManagement.RemoveIndexAction?)value.Variant);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.VariantType}' is not supported for type '{nameof(IndexUpdateAliasesAction)}'.");
 		}
 
 		writer.WriteEndObject();
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/IndexManagement/RemoveAction.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/IndexManagement/RemoveAction.g.cs
index 580051e8000..4919f429184 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/IndexManagement/RemoveAction.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/IndexManagement/RemoveAction.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,80 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.IndexManagement;
 
+internal sealed partial class RemoveActionConverter : System.Text.Json.Serialization.JsonConverter<RemoveAction>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAlias = System.Text.Json.JsonEncodedText.Encode("alias");
+	private static readonly System.Text.Json.JsonEncodedText PropAliases = System.Text.Json.JsonEncodedText.Encode("aliases");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropIndices = System.Text.Json.JsonEncodedText.Encode("indices");
+	private static readonly System.Text.Json.JsonEncodedText PropMustExist = System.Text.Json.JsonEncodedText.Encode("must_exist");
+
+	public override RemoveAction Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.IndexAlias?> propAlias = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.IndexAlias>?> propAliases = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.IndexName?> propIndex = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Indices?> propIndices = default;
+		LocalJsonProperty<bool?> propMustExist = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAlias.TryRead(ref reader, options, PropAlias))
+			{
+				continue;
+			}
+
+			if (propAliases.TryRead(ref reader, options, PropAliases, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.IndexAlias>?, Elastic.Clients.Elasticsearch.Serverless.IndexAlias>)))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propIndices.TryRead(ref reader, options, PropIndices))
+			{
+				continue;
+			}
+
+			if (propMustExist.TryRead(ref reader, options, PropMustExist))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new RemoveAction
+		{
+			Alias = propAlias.Value
+,
+			Aliases = propAliases.Value
+,
+			Index = propIndex.Value
+,
+			Indices = propIndices.Value
+,
+			MustExist = propMustExist.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, RemoveAction value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAlias, value.Alias);
+		writer.WriteProperty(options, PropAliases, value.Aliases, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.IndexAlias>?, Elastic.Clients.Elasticsearch.Serverless.IndexAlias>));
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropIndices, value.Indices);
+		writer.WriteProperty(options, PropMustExist, value.MustExist);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(RemoveActionConverter))]
 public sealed partial class RemoveAction
 {
 	/// <summary>
@@ -35,7 +110,6 @@ public sealed partial class RemoveAction
 	/// Index alias names support date math.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("alias")]
 	public Elastic.Clients.Elasticsearch.Serverless.IndexAlias? Alias { get; set; }
 
 	/// <summary>
@@ -44,8 +118,6 @@ public sealed partial class RemoveAction
 	/// Index alias names support date math.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("aliases")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.Serverless.IndexAlias))]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.IndexAlias>? Aliases { get; set; }
 
 	/// <summary>
@@ -54,7 +126,6 @@ public sealed partial class RemoveAction
 	/// Supports wildcards (<c>*</c>).
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("index")]
 	public Elastic.Clients.Elasticsearch.Serverless.IndexName? Index { get; set; }
 
 	/// <summary>
@@ -63,7 +134,6 @@ public sealed partial class RemoveAction
 	/// Supports wildcards (<c>*</c>).
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("indices")]
 	public Elastic.Clients.Elasticsearch.Serverless.Indices? Indices { get; set; }
 
 	/// <summary>
@@ -71,7 +141,6 @@ public sealed partial class RemoveAction
 	/// If <c>true</c>, the alias must exist to perform the action.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("must_exist")]
 	public bool? MustExist { get; set; }
 
 	public static implicit operator Elastic.Clients.Elasticsearch.Serverless.IndexManagement.IndexUpdateAliasesAction(RemoveAction removeAction) => Elastic.Clients.Elasticsearch.Serverless.IndexManagement.IndexUpdateAliasesAction.Remove(removeAction);
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/IndexManagement/ResolveIndexAliasItem.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/IndexManagement/ResolveIndexAliasItem.g.cs
index 593daf169b4..ca65afa67fb 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/IndexManagement/ResolveIndexAliasItem.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/IndexManagement/ResolveIndexAliasItem.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,11 +28,52 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.IndexManagement;
 
+internal sealed partial class ResolveIndexAliasItemConverter : System.Text.Json.Serialization.JsonConverter<ResolveIndexAliasItem>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropIndices = System.Text.Json.JsonEncodedText.Encode("indices");
+	private static readonly System.Text.Json.JsonEncodedText PropName = System.Text.Json.JsonEncodedText.Encode("name");
+
+	public override ResolveIndexAliasItem Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<string>> propIndices = default;
+		LocalJsonProperty<string> propName = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propIndices.TryRead(ref reader, options, PropIndices, typeof(SingleOrManyMarker<IReadOnlyCollection<string>, string>)))
+			{
+				continue;
+			}
+
+			if (propName.TryRead(ref reader, options, PropName))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ResolveIndexAliasItem
+		{
+			Indices = propIndices.Value
+,
+			Name = propName.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ResolveIndexAliasItem value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropIndices, value.Indices, typeof(SingleOrManyMarker<IReadOnlyCollection<string>, string>));
+		writer.WriteProperty(options, PropName, value.Name);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ResolveIndexAliasItemConverter))]
 public sealed partial class ResolveIndexAliasItem
 {
-	[JsonInclude, JsonPropertyName("indices")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public IReadOnlyCollection<string> Indices { get; init; }
-	[JsonInclude, JsonPropertyName("name")]
 	public string Name { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/IndexManagement/ResolveIndexDataStreamsItem.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/IndexManagement/ResolveIndexDataStreamsItem.g.cs
index 5d6e1cd7c74..c4052c9f93f 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/IndexManagement/ResolveIndexDataStreamsItem.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/IndexManagement/ResolveIndexDataStreamsItem.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,13 +28,63 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.IndexManagement;
 
+internal sealed partial class ResolveIndexDataStreamsItemConverter : System.Text.Json.Serialization.JsonConverter<ResolveIndexDataStreamsItem>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropBackingIndices = System.Text.Json.JsonEncodedText.Encode("backing_indices");
+	private static readonly System.Text.Json.JsonEncodedText PropName = System.Text.Json.JsonEncodedText.Encode("name");
+	private static readonly System.Text.Json.JsonEncodedText PropTimestampField = System.Text.Json.JsonEncodedText.Encode("timestamp_field");
+
+	public override ResolveIndexDataStreamsItem Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<string>> propBackingIndices = default;
+		LocalJsonProperty<string> propName = default;
+		LocalJsonProperty<string> propTimestampField = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBackingIndices.TryRead(ref reader, options, PropBackingIndices, typeof(SingleOrManyMarker<IReadOnlyCollection<string>, string>)))
+			{
+				continue;
+			}
+
+			if (propName.TryRead(ref reader, options, PropName))
+			{
+				continue;
+			}
+
+			if (propTimestampField.TryRead(ref reader, options, PropTimestampField))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ResolveIndexDataStreamsItem
+		{
+			BackingIndices = propBackingIndices.Value
+,
+			Name = propName.Value
+,
+			TimestampField = propTimestampField.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ResolveIndexDataStreamsItem value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBackingIndices, value.BackingIndices, typeof(SingleOrManyMarker<IReadOnlyCollection<string>, string>));
+		writer.WriteProperty(options, PropName, value.Name);
+		writer.WriteProperty(options, PropTimestampField, value.TimestampField);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ResolveIndexDataStreamsItemConverter))]
 public sealed partial class ResolveIndexDataStreamsItem
 {
-	[JsonInclude, JsonPropertyName("backing_indices")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public IReadOnlyCollection<string> BackingIndices { get; init; }
-	[JsonInclude, JsonPropertyName("name")]
 	public string Name { get; init; }
-	[JsonInclude, JsonPropertyName("timestamp_field")]
 	public string TimestampField { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/IndexManagement/SettingsSimilarities.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/IndexManagement/SettingsSimilarities.g.cs
index bbbc27724bc..f1ec3c9c85e 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/IndexManagement/SettingsSimilarities.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/IndexManagement/SettingsSimilarities.g.cs
@@ -19,6 +19,7 @@
 
 using Elastic.Clients.Elasticsearch.Serverless.Core;
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport;
 using System;
@@ -92,80 +93,70 @@ public SettingsSimilaritiesDescriptor() : base(new SettingsSimilarities())
 	public SettingsSimilaritiesDescriptor Scripted(string settingsSimilarityName, SettingsSimilarityScripted settingsSimilarityScripted) => AssignVariant(settingsSimilarityName, settingsSimilarityScripted);
 }
 
-internal sealed partial class SettingsSimilarityInterfaceConverter : JsonConverter<ISettingsSimilarity>
+internal sealed partial class SettingsSimilarityInterfaceConverter : System.Text.Json.Serialization.JsonConverter<ISettingsSimilarity>
 {
-	public override ISettingsSimilarity Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropDiscriminator = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override ISettingsSimilarity Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var copiedReader = reader;
-		string? type = null;
-		using var jsonDoc = JsonDocument.ParseValue(ref copiedReader);
-		if (jsonDoc is not null && jsonDoc.RootElement.TryGetProperty("type", out var readType) && readType.ValueKind == JsonValueKind.String)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		var readerSnapshot = reader;
+		string? discriminator = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			type = readType.ToString();
+			if (reader.TryReadProperty(options, PropDiscriminator, ref discriminator))
+			{
+				break;
+			}
+
+			reader.Skip();
 		}
 
-		switch (type)
+		reader = readerSnapshot;
+		return discriminator switch
 		{
-			case "BM25":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.SettingsSimilarityBm25>(ref reader, options);
-			case "boolean":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.SettingsSimilarityBoolean>(ref reader, options);
-			case "DFI":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.SettingsSimilarityDfi>(ref reader, options);
-			case "DFR":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.SettingsSimilarityDfr>(ref reader, options);
-			case "IB":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.SettingsSimilarityIb>(ref reader, options);
-			case "LMDirichlet":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.SettingsSimilarityLmd>(ref reader, options);
-			case "LMJelinekMercer":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.SettingsSimilarityLmj>(ref reader, options);
-			case "scripted":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.SettingsSimilarityScripted>(ref reader, options);
-			default:
-				ThrowHelper.ThrowUnknownTaggedUnionVariantJsonException(type, typeof(ISettingsSimilarity));
-				return null;
-		}
+			"BM25" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.SettingsSimilarityBm25>(options),
+			"boolean" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.SettingsSimilarityBoolean>(options),
+			"DFI" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.SettingsSimilarityDfi>(options),
+			"DFR" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.SettingsSimilarityDfr>(options),
+			"IB" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.SettingsSimilarityIb>(options),
+			"LMDirichlet" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.SettingsSimilarityLmd>(options),
+			"LMJelinekMercer" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.SettingsSimilarityLmj>(options),
+			"scripted" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.SettingsSimilarityScripted>(options),
+			_ => throw new System.Text.Json.JsonException($"Variant '{discriminator}' is not supported for type '{nameof(ISettingsSimilarity)}'.")
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, ISettingsSimilarity value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ISettingsSimilarity value, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (value is null)
-		{
-			writer.WriteNullValue();
-			return;
-		}
-
 		switch (value.Type)
 		{
 			case "BM25":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.IndexManagement.SettingsSimilarityBm25), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.IndexManagement.SettingsSimilarityBm25)value);
+				break;
 			case "boolean":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.IndexManagement.SettingsSimilarityBoolean), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.IndexManagement.SettingsSimilarityBoolean)value);
+				break;
 			case "DFI":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.IndexManagement.SettingsSimilarityDfi), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.IndexManagement.SettingsSimilarityDfi)value);
+				break;
 			case "DFR":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.IndexManagement.SettingsSimilarityDfr), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.IndexManagement.SettingsSimilarityDfr)value);
+				break;
 			case "IB":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.IndexManagement.SettingsSimilarityIb), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.IndexManagement.SettingsSimilarityIb)value);
+				break;
 			case "LMDirichlet":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.IndexManagement.SettingsSimilarityLmd), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.IndexManagement.SettingsSimilarityLmd)value);
+				break;
 			case "LMJelinekMercer":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.IndexManagement.SettingsSimilarityLmj), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.IndexManagement.SettingsSimilarityLmj)value);
+				break;
 			case "scripted":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.IndexManagement.SettingsSimilarityScripted), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.IndexManagement.SettingsSimilarityScripted)value);
+				break;
 			default:
-				var type = value.GetType();
-				JsonSerializer.Serialize(writer, value, type, options);
-				return;
+				throw new System.Text.Json.JsonException($"Variant '{value.Type}' is not supported for type '{nameof(ISettingsSimilarity)}'.");
 		}
 	}
 }
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/IndexManagement/ShardStats.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/IndexManagement/ShardStats.g.cs
index ff095a57b5e..6f7c6b33963 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/IndexManagement/ShardStats.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/IndexManagement/ShardStats.g.cs
@@ -72,7 +72,6 @@ public sealed partial class ShardStats
 	[JsonInclude, JsonPropertyName("shard_path")]
 	public Elastic.Clients.Elasticsearch.Serverless.IndexManagement.ShardPath? ShardPath { get; init; }
 	[JsonInclude, JsonPropertyName("shards")]
-	[ReadOnlyIndexNameDictionaryConverter(typeof(object))]
 	public IReadOnlyDictionary<Elastic.Clients.Elasticsearch.Serverless.IndexName, object>? Shards { get; init; }
 	[JsonInclude, JsonPropertyName("shard_stats")]
 	public Elastic.Clients.Elasticsearch.Serverless.IndexManagement.ShardsTotalStats? ShardStats2 { get; init; }
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/IndexManagement/Template.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/IndexManagement/Template.g.cs
index d5eee844bc2..48094ed76a9 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/IndexManagement/Template.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/IndexManagement/Template.g.cs
@@ -30,7 +30,6 @@ namespace Elastic.Clients.Elasticsearch.Serverless.IndexManagement;
 public sealed partial class Template
 {
 	[JsonInclude, JsonPropertyName("aliases")]
-	[ReadOnlyIndexNameDictionaryConverter(typeof(Elastic.Clients.Elasticsearch.Serverless.IndexManagement.Alias))]
 	public IReadOnlyDictionary<Elastic.Clients.Elasticsearch.Serverless.IndexName, Elastic.Clients.Elasticsearch.Serverless.IndexManagement.Alias> Aliases { get; init; }
 	[JsonInclude, JsonPropertyName("mappings")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.TypeMapping Mappings { get; init; }
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/IndicesOptions.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/IndicesOptions.g.cs
index a71d5c87c47..2f4f8bf58c9 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/IndicesOptions.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/IndicesOptions.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,12 +28,76 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless;
 
+internal sealed partial class IndicesOptionsConverter : System.Text.Json.Serialization.JsonConverter<IndicesOptions>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAllowNoIndices = System.Text.Json.JsonEncodedText.Encode("allow_no_indices");
+	private static readonly System.Text.Json.JsonEncodedText PropExpandWildcards = System.Text.Json.JsonEncodedText.Encode("expand_wildcards");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreThrottled = System.Text.Json.JsonEncodedText.Encode("ignore_throttled");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreUnavailable = System.Text.Json.JsonEncodedText.Encode("ignore_unavailable");
+
+	public override IndicesOptions Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool?> propAllowNoIndices = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.ExpandWildcard>?> propExpandWildcards = default;
+		LocalJsonProperty<bool?> propIgnoreThrottled = default;
+		LocalJsonProperty<bool?> propIgnoreUnavailable = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAllowNoIndices.TryRead(ref reader, options, PropAllowNoIndices))
+			{
+				continue;
+			}
+
+			if (propExpandWildcards.TryRead(ref reader, options, PropExpandWildcards, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.ExpandWildcard>?, Elastic.Clients.Elasticsearch.Serverless.ExpandWildcard>)))
+			{
+				continue;
+			}
+
+			if (propIgnoreThrottled.TryRead(ref reader, options, PropIgnoreThrottled))
+			{
+				continue;
+			}
+
+			if (propIgnoreUnavailable.TryRead(ref reader, options, PropIgnoreUnavailable))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new IndicesOptions
+		{
+			AllowNoIndices = propAllowNoIndices.Value
+,
+			ExpandWildcards = propExpandWildcards.Value
+,
+			IgnoreThrottled = propIgnoreThrottled.Value
+,
+			IgnoreUnavailable = propIgnoreUnavailable.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IndicesOptions value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAllowNoIndices, value.AllowNoIndices);
+		writer.WriteProperty(options, PropExpandWildcards, value.ExpandWildcards, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.ExpandWildcard>?, Elastic.Clients.Elasticsearch.Serverless.ExpandWildcard>));
+		writer.WriteProperty(options, PropIgnoreThrottled, value.IgnoreThrottled);
+		writer.WriteProperty(options, PropIgnoreUnavailable, value.IgnoreUnavailable);
+		writer.WriteEndObject();
+	}
+}
+
 /// <summary>
 /// <para>
 /// Controls how to deal with unavailable concrete indices (closed or missing), how wildcard expressions are expanded
 /// to actual indices (all, closed or open indices) and how to deal with wildcard expressions that resolve to no indices.
 /// </para>
 /// </summary>
+[JsonConverter(typeof(IndicesOptionsConverter))]
 public sealed partial class IndicesOptions
 {
 	/// <summary>
@@ -42,7 +107,6 @@ public sealed partial class IndicesOptions
 	/// a request targeting <c>foo*,bar*</c> returns an error if an index starts with <c>foo</c> but no index starts with <c>bar</c>.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("allow_no_indices")]
 	public bool? AllowNoIndices { get; set; }
 
 	/// <summary>
@@ -52,8 +116,6 @@ public sealed partial class IndicesOptions
 	/// such as <c>open,hidden</c>.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("expand_wildcards")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.Serverless.ExpandWildcard))]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.ExpandWildcard>? ExpandWildcards { get; set; }
 
 	/// <summary>
@@ -61,7 +123,6 @@ public sealed partial class IndicesOptions
 	/// If true, concrete, expanded or aliased indices are ignored when frozen.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("ignore_throttled")]
 	public bool? IgnoreThrottled { get; set; }
 
 	/// <summary>
@@ -69,7 +130,6 @@ public sealed partial class IndicesOptions
 	/// If true, missing or closed indices are not included in the response.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("ignore_unavailable")]
 	public bool? IgnoreUnavailable { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Ingest/AppendProcessor.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Ingest/AppendProcessor.g.cs
index d90d96e78bf..5829abeab3c 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Ingest/AppendProcessor.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Ingest/AppendProcessor.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,110 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Ingest;
 
+internal sealed partial class AppendProcessorConverter : System.Text.Json.Serialization.JsonConverter<AppendProcessor>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAllowDuplicates = System.Text.Json.JsonEncodedText.Encode("allow_duplicates");
+	private static readonly System.Text.Json.JsonEncodedText PropDescription = System.Text.Json.JsonEncodedText.Encode("description");
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropIf = System.Text.Json.JsonEncodedText.Encode("if");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreFailure = System.Text.Json.JsonEncodedText.Encode("ignore_failure");
+	private static readonly System.Text.Json.JsonEncodedText PropOnFailure = System.Text.Json.JsonEncodedText.Encode("on_failure");
+	private static readonly System.Text.Json.JsonEncodedText PropTag = System.Text.Json.JsonEncodedText.Encode("tag");
+	private static readonly System.Text.Json.JsonEncodedText PropValue = System.Text.Json.JsonEncodedText.Encode("value");
+
+	public override AppendProcessor Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool?> propAllowDuplicates = default;
+		LocalJsonProperty<string?> propDescription = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Field> propField = default;
+		LocalJsonProperty<string?> propIf = default;
+		LocalJsonProperty<bool?> propIgnoreFailure = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.Ingest.Processor>?> propOnFailure = default;
+		LocalJsonProperty<string?> propTag = default;
+		LocalJsonProperty<ICollection<object>> propValue = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAllowDuplicates.TryRead(ref reader, options, PropAllowDuplicates))
+			{
+				continue;
+			}
+
+			if (propDescription.TryRead(ref reader, options, PropDescription))
+			{
+				continue;
+			}
+
+			if (propField.TryRead(ref reader, options, PropField))
+			{
+				continue;
+			}
+
+			if (propIf.TryRead(ref reader, options, PropIf))
+			{
+				continue;
+			}
+
+			if (propIgnoreFailure.TryRead(ref reader, options, PropIgnoreFailure))
+			{
+				continue;
+			}
+
+			if (propOnFailure.TryRead(ref reader, options, PropOnFailure))
+			{
+				continue;
+			}
+
+			if (propTag.TryRead(ref reader, options, PropTag))
+			{
+				continue;
+			}
+
+			if (propValue.TryRead(ref reader, options, PropValue, typeof(SingleOrManyMarker<IReadOnlyCollection<object>, object>)))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new AppendProcessor
+		{
+			AllowDuplicates = propAllowDuplicates.Value
+,
+			Description = propDescription.Value
+,
+			Field = propField.Value
+,
+			If = propIf.Value
+,
+			IgnoreFailure = propIgnoreFailure.Value
+,
+			OnFailure = propOnFailure.Value
+,
+			Tag = propTag.Value
+,
+			Value = propValue.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, AppendProcessor value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAllowDuplicates, value.AllowDuplicates);
+		writer.WriteProperty(options, PropDescription, value.Description);
+		writer.WriteProperty(options, PropField, value.Field);
+		writer.WriteProperty(options, PropIf, value.If);
+		writer.WriteProperty(options, PropIgnoreFailure, value.IgnoreFailure);
+		writer.WriteProperty(options, PropOnFailure, value.OnFailure);
+		writer.WriteProperty(options, PropTag, value.Tag);
+		writer.WriteProperty(options, PropValue, value.Value, typeof(SingleOrManyMarker<IReadOnlyCollection<object>, object>));
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(AppendProcessorConverter))]
 public sealed partial class AppendProcessor
 {
 	/// <summary>
@@ -34,7 +139,6 @@ public sealed partial class AppendProcessor
 	/// If <c>false</c>, the processor does not append values already present in the field.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("allow_duplicates")]
 	public bool? AllowDuplicates { get; set; }
 
 	/// <summary>
@@ -43,7 +147,6 @@ public sealed partial class AppendProcessor
 	/// Useful for describing the purpose of the processor or its configuration.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("description")]
 	public string? Description { get; set; }
 
 	/// <summary>
@@ -52,7 +155,6 @@ public sealed partial class AppendProcessor
 	/// Supports template snippets.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("field")]
 	public Elastic.Clients.Elasticsearch.Serverless.Field Field { get; set; }
 
 	/// <summary>
@@ -60,7 +162,6 @@ public sealed partial class AppendProcessor
 	/// Conditionally execute the processor.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("if")]
 	public string? If { get; set; }
 
 	/// <summary>
@@ -68,7 +169,6 @@ public sealed partial class AppendProcessor
 	/// Ignore failures for the processor.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("ignore_failure")]
 	public bool? IgnoreFailure { get; set; }
 
 	/// <summary>
@@ -76,7 +176,6 @@ public sealed partial class AppendProcessor
 	/// Handle failures for the processor.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("on_failure")]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.Ingest.Processor>? OnFailure { get; set; }
 
 	/// <summary>
@@ -85,7 +184,6 @@ public sealed partial class AppendProcessor
 	/// Useful for debugging and metrics.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("tag")]
 	public string? Tag { get; set; }
 
 	/// <summary>
@@ -93,8 +191,6 @@ public sealed partial class AppendProcessor
 	/// The value to be appended. Supports template snippets.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("value")]
-	[SingleOrManyCollectionConverter(typeof(object))]
 	public ICollection<object> Value { get; set; }
 
 	public static implicit operator Elastic.Clients.Elasticsearch.Serverless.Ingest.Processor(AppendProcessor appendProcessor) => Elastic.Clients.Elasticsearch.Serverless.Ingest.Processor.Append(appendProcessor);
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Ingest/CsvProcessor.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Ingest/CsvProcessor.g.cs
index 697cf8aa26e..ff7c4a417b0 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Ingest/CsvProcessor.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Ingest/CsvProcessor.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,150 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Ingest;
 
+internal sealed partial class CsvProcessorConverter : System.Text.Json.Serialization.JsonConverter<CsvProcessor>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropDescription = System.Text.Json.JsonEncodedText.Encode("description");
+	private static readonly System.Text.Json.JsonEncodedText PropEmptyValue = System.Text.Json.JsonEncodedText.Encode("empty_value");
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropIf = System.Text.Json.JsonEncodedText.Encode("if");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreFailure = System.Text.Json.JsonEncodedText.Encode("ignore_failure");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreMissing = System.Text.Json.JsonEncodedText.Encode("ignore_missing");
+	private static readonly System.Text.Json.JsonEncodedText PropOnFailure = System.Text.Json.JsonEncodedText.Encode("on_failure");
+	private static readonly System.Text.Json.JsonEncodedText PropQuote = System.Text.Json.JsonEncodedText.Encode("quote");
+	private static readonly System.Text.Json.JsonEncodedText PropSeparator = System.Text.Json.JsonEncodedText.Encode("separator");
+	private static readonly System.Text.Json.JsonEncodedText PropTag = System.Text.Json.JsonEncodedText.Encode("tag");
+	private static readonly System.Text.Json.JsonEncodedText PropTargetFields = System.Text.Json.JsonEncodedText.Encode("target_fields");
+	private static readonly System.Text.Json.JsonEncodedText PropTrim = System.Text.Json.JsonEncodedText.Encode("trim");
+
+	public override CsvProcessor Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string?> propDescription = default;
+		LocalJsonProperty<object?> propEmptyValue = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Field> propField = default;
+		LocalJsonProperty<string?> propIf = default;
+		LocalJsonProperty<bool?> propIgnoreFailure = default;
+		LocalJsonProperty<bool?> propIgnoreMissing = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.Ingest.Processor>?> propOnFailure = default;
+		LocalJsonProperty<string?> propQuote = default;
+		LocalJsonProperty<string?> propSeparator = default;
+		LocalJsonProperty<string?> propTag = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Fields> propTargetFields = default;
+		LocalJsonProperty<bool?> propTrim = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propDescription.TryRead(ref reader, options, PropDescription))
+			{
+				continue;
+			}
+
+			if (propEmptyValue.TryRead(ref reader, options, PropEmptyValue))
+			{
+				continue;
+			}
+
+			if (propField.TryRead(ref reader, options, PropField))
+			{
+				continue;
+			}
+
+			if (propIf.TryRead(ref reader, options, PropIf))
+			{
+				continue;
+			}
+
+			if (propIgnoreFailure.TryRead(ref reader, options, PropIgnoreFailure))
+			{
+				continue;
+			}
+
+			if (propIgnoreMissing.TryRead(ref reader, options, PropIgnoreMissing))
+			{
+				continue;
+			}
+
+			if (propOnFailure.TryRead(ref reader, options, PropOnFailure))
+			{
+				continue;
+			}
+
+			if (propQuote.TryRead(ref reader, options, PropQuote))
+			{
+				continue;
+			}
+
+			if (propSeparator.TryRead(ref reader, options, PropSeparator))
+			{
+				continue;
+			}
+
+			if (propTag.TryRead(ref reader, options, PropTag))
+			{
+				continue;
+			}
+
+			if (propTargetFields.TryRead(ref reader, options, PropTargetFields, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propTrim.TryRead(ref reader, options, PropTrim))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new CsvProcessor
+		{
+			Description = propDescription.Value
+,
+			EmptyValue = propEmptyValue.Value
+,
+			Field = propField.Value
+,
+			If = propIf.Value
+,
+			IgnoreFailure = propIgnoreFailure.Value
+,
+			IgnoreMissing = propIgnoreMissing.Value
+,
+			OnFailure = propOnFailure.Value
+,
+			Quote = propQuote.Value
+,
+			Separator = propSeparator.Value
+,
+			Tag = propTag.Value
+,
+			TargetFields = propTargetFields.Value
+,
+			Trim = propTrim.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, CsvProcessor value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDescription, value.Description);
+		writer.WriteProperty(options, PropEmptyValue, value.EmptyValue);
+		writer.WriteProperty(options, PropField, value.Field);
+		writer.WriteProperty(options, PropIf, value.If);
+		writer.WriteProperty(options, PropIgnoreFailure, value.IgnoreFailure);
+		writer.WriteProperty(options, PropIgnoreMissing, value.IgnoreMissing);
+		writer.WriteProperty(options, PropOnFailure, value.OnFailure);
+		writer.WriteProperty(options, PropQuote, value.Quote);
+		writer.WriteProperty(options, PropSeparator, value.Separator);
+		writer.WriteProperty(options, PropTag, value.Tag);
+		writer.WriteProperty(options, PropTargetFields, value.TargetFields, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropTrim, value.Trim);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(CsvProcessorConverter))]
 public sealed partial class CsvProcessor
 {
 	/// <summary>
@@ -35,7 +180,6 @@ public sealed partial class CsvProcessor
 	/// Useful for describing the purpose of the processor or its configuration.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("description")]
 	public string? Description { get; set; }
 
 	/// <summary>
@@ -45,7 +189,6 @@ public sealed partial class CsvProcessor
 	/// An empty field is one with no value (2 consecutive separators) or empty quotes (<c>""</c>).
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("empty_value")]
 	public object? EmptyValue { get; set; }
 
 	/// <summary>
@@ -53,7 +196,6 @@ public sealed partial class CsvProcessor
 	/// The field to extract data from.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("field")]
 	public Elastic.Clients.Elasticsearch.Serverless.Field Field { get; set; }
 
 	/// <summary>
@@ -61,7 +203,6 @@ public sealed partial class CsvProcessor
 	/// Conditionally execute the processor.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("if")]
 	public string? If { get; set; }
 
 	/// <summary>
@@ -69,7 +210,6 @@ public sealed partial class CsvProcessor
 	/// Ignore failures for the processor.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("ignore_failure")]
 	public bool? IgnoreFailure { get; set; }
 
 	/// <summary>
@@ -77,7 +217,6 @@ public sealed partial class CsvProcessor
 	/// If <c>true</c> and <c>field</c> does not exist, the processor quietly exits without modifying the document.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("ignore_missing")]
 	public bool? IgnoreMissing { get; set; }
 
 	/// <summary>
@@ -85,7 +224,6 @@ public sealed partial class CsvProcessor
 	/// Handle failures for the processor.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("on_failure")]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.Ingest.Processor>? OnFailure { get; set; }
 
 	/// <summary>
@@ -93,7 +231,6 @@ public sealed partial class CsvProcessor
 	/// Quote used in CSV, has to be single character string.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("quote")]
 	public string? Quote { get; set; }
 
 	/// <summary>
@@ -101,7 +238,6 @@ public sealed partial class CsvProcessor
 	/// Separator used in CSV, has to be single character string.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("separator")]
 	public string? Separator { get; set; }
 
 	/// <summary>
@@ -110,7 +246,6 @@ public sealed partial class CsvProcessor
 	/// Useful for debugging and metrics.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("tag")]
 	public string? Tag { get; set; }
 
 	/// <summary>
@@ -118,8 +253,6 @@ public sealed partial class CsvProcessor
 	/// The array of fields to assign extracted values to.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("target_fields")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Serverless.Fields TargetFields { get; set; }
 
 	/// <summary>
@@ -127,7 +260,6 @@ public sealed partial class CsvProcessor
 	/// Trim whitespaces in unquoted fields.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("trim")]
 	public bool? Trim { get; set; }
 
 	public static implicit operator Elastic.Clients.Elasticsearch.Serverless.Ingest.Processor(CsvProcessor csvProcessor) => Elastic.Clients.Elasticsearch.Serverless.Ingest.Processor.Csv(csvProcessor);
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Ingest/DatabaseConfiguration.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Ingest/DatabaseConfiguration.g.cs
index bbe957c526a..fc9a847336e 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Ingest/DatabaseConfiguration.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Ingest/DatabaseConfiguration.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -46,12 +47,16 @@ internal DatabaseConfiguration(string variantName, object variant)
 			throw new ArgumentNullException(nameof(variant));
 		if (string.IsNullOrWhiteSpace(variantName))
 			throw new ArgumentException("Variant name must not be empty or whitespace.");
-		VariantName = variantName;
+		VariantType = variantName;
 		Variant = variant;
 	}
 
-	internal object Variant { get; }
-	internal string VariantName { get; }
+	internal DatabaseConfiguration()
+	{
+	}
+
+	public object Variant { get; internal set; }
+	public string VariantType { get; internal set; }
 
 	public static DatabaseConfiguration Ipinfo(Elastic.Clients.Elasticsearch.Serverless.Ingest.Ipinfo ipinfo) => new DatabaseConfiguration("ipinfo", ipinfo);
 	public static DatabaseConfiguration Maxmind(Elastic.Clients.Elasticsearch.Serverless.Ingest.Maxmind maxmind) => new DatabaseConfiguration("maxmind", maxmind);
@@ -77,83 +82,71 @@ public bool TryGet<T>([NotNullWhen(true)] out T? result) where T : class
 	}
 }
 
-internal sealed partial class DatabaseConfigurationConverter : JsonConverter<DatabaseConfiguration>
+internal sealed partial class DatabaseConfigurationConverter : System.Text.Json.Serialization.JsonConverter<DatabaseConfiguration>
 {
-	public override DatabaseConfiguration Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-		{
-			throw new JsonException("Expected start token.");
-		}
+	private static readonly System.Text.Json.JsonEncodedText PropName = System.Text.Json.JsonEncodedText.Encode("name");
+	private static readonly System.Text.Json.JsonEncodedText VariantIpinfo = System.Text.Json.JsonEncodedText.Encode("ipinfo");
+	private static readonly System.Text.Json.JsonEncodedText VariantMaxmind = System.Text.Json.JsonEncodedText.Encode("maxmind");
 
-		object? variantValue = default;
-		string? variantNameValue = default;
-		Elastic.Clients.Elasticsearch.Serverless.Name nameValue = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+	public override DatabaseConfiguration Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Name> propName = default;
+		var variantType = string.Empty;
+		object? variant = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token.");
-			}
-
-			if (reader.TokenType != JsonTokenType.PropertyName)
+			if (propName.TryRead(ref reader, options, PropName))
 			{
-				throw new JsonException("Expected a property name token representing the name of an Elasticsearch field.");
-			}
-
-			var propertyName = reader.GetString();
-			reader.Read();
-			if (propertyName == "name")
-			{
-				nameValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Name>(ref reader, options);
 				continue;
 			}
 
-			if (propertyName == "ipinfo")
+			if (reader.ValueTextEquals(VariantIpinfo))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.Ipinfo?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantIpinfo.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Ingest.Ipinfo?>(options);
 				continue;
 			}
 
-			if (propertyName == "maxmind")
+			if (reader.ValueTextEquals(VariantMaxmind))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.Maxmind?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantMaxmind.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Ingest.Maxmind?>(options);
 				continue;
 			}
 
-			throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'DatabaseConfiguration' from the response.");
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		var result = new DatabaseConfiguration(variantNameValue, variantValue);
-		result.Name = nameValue;
-		return result;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DatabaseConfiguration
+		{
+			VariantType = variantType,
+			Variant = variant,
+			Name = propName.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, DatabaseConfiguration value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DatabaseConfiguration value, System.Text.Json.JsonSerializerOptions options)
 	{
 		writer.WriteStartObject();
-		if (value.Name is not null)
-		{
-			writer.WritePropertyName("name");
-			JsonSerializer.Serialize(writer, value.Name, options);
-		}
-
-		if (value.VariantName is not null && value.Variant is not null)
+		switch (value.VariantType)
 		{
-			writer.WritePropertyName(value.VariantName);
-			switch (value.VariantName)
-			{
-				case "ipinfo":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.Ipinfo>(writer, (Elastic.Clients.Elasticsearch.Serverless.Ingest.Ipinfo)value.Variant, options);
-					break;
-				case "maxmind":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.Maxmind>(writer, (Elastic.Clients.Elasticsearch.Serverless.Ingest.Maxmind)value.Variant, options);
-					break;
-			}
+			case "":
+				break;
+			case "ipinfo":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Ingest.Ipinfo?)value.Variant);
+				break;
+			case "maxmind":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Ingest.Maxmind?)value.Variant);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.VariantType}' is not supported for type '{nameof(DatabaseConfiguration)}'.");
 		}
 
+		writer.WriteProperty(options, PropName, value.Name);
 		writer.WriteEndObject();
 	}
 }
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Ingest/DatabaseConfigurationFull.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Ingest/DatabaseConfigurationFull.g.cs
index 74ed0662918..db01604b5b3 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Ingest/DatabaseConfigurationFull.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Ingest/DatabaseConfigurationFull.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -39,12 +40,16 @@ internal DatabaseConfigurationFull(string variantName, object variant)
 			throw new ArgumentNullException(nameof(variant));
 		if (string.IsNullOrWhiteSpace(variantName))
 			throw new ArgumentException("Variant name must not be empty or whitespace.");
-		VariantName = variantName;
+		VariantType = variantName;
 		Variant = variant;
 	}
 
-	internal object Variant { get; }
-	internal string VariantName { get; }
+	internal DatabaseConfigurationFull()
+	{
+	}
+
+	public object Variant { get; internal set; }
+	public string VariantType { get; internal set; }
 
 	public static DatabaseConfigurationFull Ipinfo(Elastic.Clients.Elasticsearch.Serverless.Ingest.Ipinfo ipinfo) => new DatabaseConfigurationFull("ipinfo", ipinfo);
 	public static DatabaseConfigurationFull Local(Elastic.Clients.Elasticsearch.Serverless.Ingest.Local local) => new DatabaseConfigurationFull("local", local);
@@ -72,103 +77,95 @@ public bool TryGet<T>([NotNullWhen(true)] out T? result) where T : class
 	}
 }
 
-internal sealed partial class DatabaseConfigurationFullConverter : JsonConverter<DatabaseConfigurationFull>
+internal sealed partial class DatabaseConfigurationFullConverter : System.Text.Json.Serialization.JsonConverter<DatabaseConfigurationFull>
 {
-	public override DatabaseConfigurationFull Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-		{
-			throw new JsonException("Expected start token.");
-		}
+	private static readonly System.Text.Json.JsonEncodedText PropName = System.Text.Json.JsonEncodedText.Encode("name");
+	private static readonly System.Text.Json.JsonEncodedText VariantIpinfo = System.Text.Json.JsonEncodedText.Encode("ipinfo");
+	private static readonly System.Text.Json.JsonEncodedText VariantLocal = System.Text.Json.JsonEncodedText.Encode("local");
+	private static readonly System.Text.Json.JsonEncodedText VariantMaxmind = System.Text.Json.JsonEncodedText.Encode("maxmind");
+	private static readonly System.Text.Json.JsonEncodedText VariantWeb = System.Text.Json.JsonEncodedText.Encode("web");
 
-		object? variantValue = default;
-		string? variantNameValue = default;
-		string nameValue = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+	public override DatabaseConfigurationFull Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propName = default;
+		var variantType = string.Empty;
+		object? variant = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token.");
-			}
-
-			if (reader.TokenType != JsonTokenType.PropertyName)
+			if (propName.TryRead(ref reader, options, PropName))
 			{
-				throw new JsonException("Expected a property name token representing the name of an Elasticsearch field.");
-			}
-
-			var propertyName = reader.GetString();
-			reader.Read();
-			if (propertyName == "name")
-			{
-				nameValue = JsonSerializer.Deserialize<string>(ref reader, options);
 				continue;
 			}
 
-			if (propertyName == "ipinfo")
+			if (reader.ValueTextEquals(VariantIpinfo))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.Ipinfo?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantIpinfo.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Ingest.Ipinfo?>(options);
 				continue;
 			}
 
-			if (propertyName == "local")
+			if (reader.ValueTextEquals(VariantLocal))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.Local?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantLocal.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Ingest.Local?>(options);
 				continue;
 			}
 
-			if (propertyName == "maxmind")
+			if (reader.ValueTextEquals(VariantMaxmind))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.Maxmind?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantMaxmind.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Ingest.Maxmind?>(options);
 				continue;
 			}
 
-			if (propertyName == "web")
+			if (reader.ValueTextEquals(VariantWeb))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.Web?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantWeb.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Ingest.Web?>(options);
 				continue;
 			}
 
-			throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'DatabaseConfigurationFull' from the response.");
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		var result = new DatabaseConfigurationFull(variantNameValue, variantValue);
-		result.Name = nameValue;
-		return result;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DatabaseConfigurationFull
+		{
+			VariantType = variantType,
+			Variant = variant,
+			Name = propName.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, DatabaseConfigurationFull value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DatabaseConfigurationFull value, System.Text.Json.JsonSerializerOptions options)
 	{
 		writer.WriteStartObject();
-		if (!string.IsNullOrEmpty(value.Name))
-		{
-			writer.WritePropertyName("name");
-			writer.WriteStringValue(value.Name);
-		}
-
-		if (value.VariantName is not null && value.Variant is not null)
+		switch (value.VariantType)
 		{
-			writer.WritePropertyName(value.VariantName);
-			switch (value.VariantName)
-			{
-				case "ipinfo":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.Ipinfo>(writer, (Elastic.Clients.Elasticsearch.Serverless.Ingest.Ipinfo)value.Variant, options);
-					break;
-				case "local":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.Local>(writer, (Elastic.Clients.Elasticsearch.Serverless.Ingest.Local)value.Variant, options);
-					break;
-				case "maxmind":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.Maxmind>(writer, (Elastic.Clients.Elasticsearch.Serverless.Ingest.Maxmind)value.Variant, options);
-					break;
-				case "web":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.Web>(writer, (Elastic.Clients.Elasticsearch.Serverless.Ingest.Web)value.Variant, options);
-					break;
-			}
+			case "":
+				break;
+			case "ipinfo":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Ingest.Ipinfo?)value.Variant);
+				break;
+			case "local":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Ingest.Local?)value.Variant);
+				break;
+			case "maxmind":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Ingest.Maxmind?)value.Variant);
+				break;
+			case "web":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Ingest.Web?)value.Variant);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.VariantType}' is not supported for type '{nameof(DatabaseConfigurationFull)}'.");
 		}
 
+		writer.WriteProperty(options, PropName, value.Name);
 		writer.WriteEndObject();
 	}
 }
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Ingest/DocumentSimulation.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Ingest/DocumentSimulation.g.cs
index 3a91b937cf8..f4e28239b03 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Ingest/DocumentSimulation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Ingest/DocumentSimulation.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,79 +28,110 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Ingest;
 
-internal sealed partial class DocumentSimulationConverter : JsonConverter<DocumentSimulation>
+internal sealed partial class DocumentSimulationConverter : System.Text.Json.Serialization.JsonConverter<DocumentSimulation>
 {
-	public override DocumentSimulation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropMetadata = System.Text.Json.JsonEncodedText.Encode("metadata");
+	private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("_id");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("_index");
+	private static readonly System.Text.Json.JsonEncodedText PropIngest = System.Text.Json.JsonEncodedText.Encode("_ingest");
+	private static readonly System.Text.Json.JsonEncodedText PropRouting = System.Text.Json.JsonEncodedText.Encode("_routing");
+	private static readonly System.Text.Json.JsonEncodedText PropSource = System.Text.Json.JsonEncodedText.Encode("_source");
+	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("_version");
+	private static readonly System.Text.Json.JsonEncodedText PropVersionType = System.Text.Json.JsonEncodedText.Encode("_version_type");
+
+	public override DocumentSimulation Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		string id = default;
-		string index = default;
-		Elastic.Clients.Elasticsearch.Serverless.Ingest.Ingest ingest = default;
-		string? routing = default;
-		IReadOnlyDictionary<string, object> source = default;
-		long? version = default;
-		Elastic.Clients.Elasticsearch.Serverless.VersionType? versionType = default;
-		Dictionary<string, string> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, string> propMetadata = default;
+		LocalJsonProperty<string> propId = default;
+		LocalJsonProperty<string> propIndex = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Ingest.Ingest> propIngest = default;
+		LocalJsonProperty<string?> propRouting = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, object>> propSource = default;
+		LocalJsonProperty<long?> propVersion = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.VersionType?> propVersionType = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propId.TryRead(ref reader, options, PropId))
 			{
-				var property = reader.GetString();
-				if (property == "_id")
-				{
-					id = JsonSerializer.Deserialize<string>(ref reader, options);
-					continue;
-				}
-
-				if (property == "_index")
-				{
-					index = JsonSerializer.Deserialize<string>(ref reader, options);
-					continue;
-				}
-
-				if (property == "_ingest")
-				{
-					ingest = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.Ingest>(ref reader, options);
-					continue;
-				}
-
-				if (property == "_routing")
-				{
-					routing = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "_source")
-				{
-					source = JsonSerializer.Deserialize<IReadOnlyDictionary<string, object>>(ref reader, options);
-					continue;
-				}
-
-				if (property == "_version")
-				{
-					version = JsonSerializer.Deserialize<long?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "_version_type")
-				{
-					versionType = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.VersionType?>(ref reader, options);
-					continue;
-				}
-
-				additionalProperties ??= new Dictionary<string, string>();
-				var additionalValue = JsonSerializer.Deserialize<string>(ref reader, options);
-				additionalProperties.Add(property, additionalValue);
+				continue;
 			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propIngest.TryRead(ref reader, options, PropIngest))
+			{
+				continue;
+			}
+
+			if (propRouting.TryRead(ref reader, options, PropRouting))
+			{
+				continue;
+			}
+
+			if (propSource.TryRead(ref reader, options, PropSource))
+			{
+				continue;
+			}
+
+			if (propVersion.TryRead(ref reader, options, PropVersion))
+			{
+				continue;
+			}
+
+			if (propVersionType.TryRead(ref reader, options, PropVersionType))
+			{
+				continue;
+			}
+
+			propMetadata ??= new System.Collections.Generic.Dictionary<string, string>();
+			reader.ReadProperty(options, out string key, out string value);
+			propMetadata[key] = value;
 		}
 
-		return new DocumentSimulation { Id = id, Index = index, Ingest = ingest, Metadata = additionalProperties, Routing = routing, Source = source, Version = version, VersionType = versionType };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DocumentSimulation
+		{
+			Metadata = propMetadata
+,
+			Id = propId.Value
+,
+			Index = propIndex.Value
+,
+			Ingest = propIngest.Value
+,
+			Routing = propRouting.Value
+,
+			Source = propSource.Value
+,
+			Version = propVersion.Value
+,
+			VersionType = propVersionType.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, DocumentSimulation value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DocumentSimulation value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'DocumentSimulation' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropId, value.Id);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropIngest, value.Ingest);
+		writer.WriteProperty(options, PropRouting, value.Routing);
+		writer.WriteProperty(options, PropSource, value.Source);
+		writer.WriteProperty(options, PropVersion, value.Version);
+		writer.WriteProperty(options, PropVersionType, value.VersionType);
+		if (value.Metadata is not null)
+		{
+			foreach (var item in value.Metadata)
+			{
+				writer.WriteProperty(options, item.Key, item.Value);
+			}
+		}
+
+		writer.WriteEndObject();
 	}
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Ingest/FingerprintProcessor.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Ingest/FingerprintProcessor.g.cs
index 810dbfa3704..a7fd647052e 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Ingest/FingerprintProcessor.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Ingest/FingerprintProcessor.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,130 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Ingest;
 
+internal sealed partial class FingerprintProcessorConverter : System.Text.Json.Serialization.JsonConverter<FingerprintProcessor>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropDescription = System.Text.Json.JsonEncodedText.Encode("description");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropIf = System.Text.Json.JsonEncodedText.Encode("if");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreFailure = System.Text.Json.JsonEncodedText.Encode("ignore_failure");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreMissing = System.Text.Json.JsonEncodedText.Encode("ignore_missing");
+	private static readonly System.Text.Json.JsonEncodedText PropMethod = System.Text.Json.JsonEncodedText.Encode("method");
+	private static readonly System.Text.Json.JsonEncodedText PropOnFailure = System.Text.Json.JsonEncodedText.Encode("on_failure");
+	private static readonly System.Text.Json.JsonEncodedText PropSalt = System.Text.Json.JsonEncodedText.Encode("salt");
+	private static readonly System.Text.Json.JsonEncodedText PropTag = System.Text.Json.JsonEncodedText.Encode("tag");
+	private static readonly System.Text.Json.JsonEncodedText PropTargetField = System.Text.Json.JsonEncodedText.Encode("target_field");
+
+	public override FingerprintProcessor Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string?> propDescription = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Fields> propFields = default;
+		LocalJsonProperty<string?> propIf = default;
+		LocalJsonProperty<bool?> propIgnoreFailure = default;
+		LocalJsonProperty<bool?> propIgnoreMissing = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Ingest.FingerprintDigest?> propMethod = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.Ingest.Processor>?> propOnFailure = default;
+		LocalJsonProperty<string?> propSalt = default;
+		LocalJsonProperty<string?> propTag = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Field?> propTargetField = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propDescription.TryRead(ref reader, options, PropDescription))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propIf.TryRead(ref reader, options, PropIf))
+			{
+				continue;
+			}
+
+			if (propIgnoreFailure.TryRead(ref reader, options, PropIgnoreFailure))
+			{
+				continue;
+			}
+
+			if (propIgnoreMissing.TryRead(ref reader, options, PropIgnoreMissing))
+			{
+				continue;
+			}
+
+			if (propMethod.TryRead(ref reader, options, PropMethod))
+			{
+				continue;
+			}
+
+			if (propOnFailure.TryRead(ref reader, options, PropOnFailure))
+			{
+				continue;
+			}
+
+			if (propSalt.TryRead(ref reader, options, PropSalt))
+			{
+				continue;
+			}
+
+			if (propTag.TryRead(ref reader, options, PropTag))
+			{
+				continue;
+			}
+
+			if (propTargetField.TryRead(ref reader, options, PropTargetField))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new FingerprintProcessor
+		{
+			Description = propDescription.Value
+,
+			Fields = propFields.Value
+,
+			If = propIf.Value
+,
+			IgnoreFailure = propIgnoreFailure.Value
+,
+			IgnoreMissing = propIgnoreMissing.Value
+,
+			Method = propMethod.Value
+,
+			OnFailure = propOnFailure.Value
+,
+			Salt = propSalt.Value
+,
+			Tag = propTag.Value
+,
+			TargetField = propTargetField.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, FingerprintProcessor value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDescription, value.Description);
+		writer.WriteProperty(options, PropFields, value.Fields, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropIf, value.If);
+		writer.WriteProperty(options, PropIgnoreFailure, value.IgnoreFailure);
+		writer.WriteProperty(options, PropIgnoreMissing, value.IgnoreMissing);
+		writer.WriteProperty(options, PropMethod, value.Method);
+		writer.WriteProperty(options, PropOnFailure, value.OnFailure);
+		writer.WriteProperty(options, PropSalt, value.Salt);
+		writer.WriteProperty(options, PropTag, value.Tag);
+		writer.WriteProperty(options, PropTargetField, value.TargetField);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(FingerprintProcessorConverter))]
 public sealed partial class FingerprintProcessor
 {
 	/// <summary>
@@ -35,7 +160,6 @@ public sealed partial class FingerprintProcessor
 	/// Useful for describing the purpose of the processor or its configuration.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("description")]
 	public string? Description { get; set; }
 
 	/// <summary>
@@ -45,8 +169,6 @@ public sealed partial class FingerprintProcessor
 	/// only the field value.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("fields")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Serverless.Fields Fields { get; set; }
 
 	/// <summary>
@@ -54,7 +176,6 @@ public sealed partial class FingerprintProcessor
 	/// Conditionally execute the processor.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("if")]
 	public string? If { get; set; }
 
 	/// <summary>
@@ -62,7 +183,6 @@ public sealed partial class FingerprintProcessor
 	/// Ignore failures for the processor.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("ignore_failure")]
 	public bool? IgnoreFailure { get; set; }
 
 	/// <summary>
@@ -71,7 +191,6 @@ public sealed partial class FingerprintProcessor
 	/// missing, the processor silently exits without modifying the document.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("ignore_missing")]
 	public bool? IgnoreMissing { get; set; }
 
 	/// <summary>
@@ -80,7 +199,6 @@ public sealed partial class FingerprintProcessor
 	/// SHA-256, SHA-512, or MurmurHash3.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("method")]
 	public Elastic.Clients.Elasticsearch.Serverless.Ingest.FingerprintDigest? Method { get; set; }
 
 	/// <summary>
@@ -88,7 +206,6 @@ public sealed partial class FingerprintProcessor
 	/// Handle failures for the processor.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("on_failure")]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.Ingest.Processor>? OnFailure { get; set; }
 
 	/// <summary>
@@ -96,7 +213,6 @@ public sealed partial class FingerprintProcessor
 	/// Salt value for the hash function.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("salt")]
 	public string? Salt { get; set; }
 
 	/// <summary>
@@ -105,7 +221,6 @@ public sealed partial class FingerprintProcessor
 	/// Useful for debugging and metrics.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("tag")]
 	public string? Tag { get; set; }
 
 	/// <summary>
@@ -113,7 +228,6 @@ public sealed partial class FingerprintProcessor
 	/// Output field for the fingerprint.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("target_field")]
 	public Elastic.Clients.Elasticsearch.Serverless.Field? TargetField { get; set; }
 
 	public static implicit operator Elastic.Clients.Elasticsearch.Serverless.Ingest.Processor(FingerprintProcessor fingerprintProcessor) => Elastic.Clients.Elasticsearch.Serverless.Ingest.Processor.Fingerprint(fingerprintProcessor);
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Ingest/InferenceConfig.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Ingest/InferenceConfig.g.cs
index 7d79f093d47..c602221561d 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Ingest/InferenceConfig.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Ingest/InferenceConfig.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -39,12 +40,16 @@ internal InferenceConfig(string variantName, object variant)
 			throw new ArgumentNullException(nameof(variant));
 		if (string.IsNullOrWhiteSpace(variantName))
 			throw new ArgumentException("Variant name must not be empty or whitespace.");
-		VariantName = variantName;
+		VariantType = variantName;
 		Variant = variant;
 	}
 
-	internal object Variant { get; }
-	internal string VariantName { get; }
+	internal InferenceConfig()
+	{
+	}
+
+	public object Variant { get; internal set; }
+	public string VariantType { get; internal set; }
 
 	public static InferenceConfig Classification(Elastic.Clients.Elasticsearch.Serverless.Ingest.InferenceConfigClassification inferenceConfigClassification) => new InferenceConfig("classification", inferenceConfigClassification);
 	public static InferenceConfig Regression(Elastic.Clients.Elasticsearch.Serverless.Ingest.InferenceConfigRegression inferenceConfigRegression) => new InferenceConfig("regression", inferenceConfigRegression);
@@ -62,67 +67,56 @@ public bool TryGet<T>([NotNullWhen(true)] out T? result) where T : class
 	}
 }
 
-internal sealed partial class InferenceConfigConverter : JsonConverter<InferenceConfig>
+internal sealed partial class InferenceConfigConverter : System.Text.Json.Serialization.JsonConverter<InferenceConfig>
 {
-	public override InferenceConfig Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-		{
-			throw new JsonException("Expected start token.");
-		}
+	private static readonly System.Text.Json.JsonEncodedText VariantClassification = System.Text.Json.JsonEncodedText.Encode("classification");
+	private static readonly System.Text.Json.JsonEncodedText VariantRegression = System.Text.Json.JsonEncodedText.Encode("regression");
 
-		object? variantValue = default;
-		string? variantNameValue = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+	public override InferenceConfig Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		var variantType = string.Empty;
+		object? variant = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
+			if (reader.ValueTextEquals(VariantClassification))
 			{
-				throw new JsonException("Expected a property name token.");
-			}
-
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token representing the name of an Elasticsearch field.");
-			}
-
-			var propertyName = reader.GetString();
-			reader.Read();
-			if (propertyName == "classification")
-			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.InferenceConfigClassification?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantClassification.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Ingest.InferenceConfigClassification?>(options);
 				continue;
 			}
 
-			if (propertyName == "regression")
+			if (reader.ValueTextEquals(VariantRegression))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.InferenceConfigRegression?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantRegression.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Ingest.InferenceConfigRegression?>(options);
 				continue;
 			}
 
-			throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'InferenceConfig' from the response.");
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		var result = new InferenceConfig(variantNameValue, variantValue);
-		return result;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new InferenceConfig { VariantType = variantType, Variant = variant };
 	}
 
-	public override void Write(Utf8JsonWriter writer, InferenceConfig value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, InferenceConfig value, System.Text.Json.JsonSerializerOptions options)
 	{
 		writer.WriteStartObject();
-		if (value.VariantName is not null && value.Variant is not null)
+		switch (value.VariantType)
 		{
-			writer.WritePropertyName(value.VariantName);
-			switch (value.VariantName)
-			{
-				case "classification":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.InferenceConfigClassification>(writer, (Elastic.Clients.Elasticsearch.Serverless.Ingest.InferenceConfigClassification)value.Variant, options);
-					break;
-				case "regression":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.InferenceConfigRegression>(writer, (Elastic.Clients.Elasticsearch.Serverless.Ingest.InferenceConfigRegression)value.Variant, options);
-					break;
-			}
+			case "":
+				break;
+			case "classification":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Ingest.InferenceConfigClassification?)value.Variant);
+				break;
+			case "regression":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Ingest.InferenceConfigRegression?)value.Variant);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.VariantType}' is not supported for type '{nameof(InferenceConfig)}'.");
 		}
 
 		writer.WriteEndObject();
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Ingest/Processor.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Ingest/Processor.g.cs
index f464444d218..eef15711e00 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Ingest/Processor.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Ingest/Processor.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -39,12 +40,16 @@ internal Processor(string variantName, object variant)
 			throw new ArgumentNullException(nameof(variant));
 		if (string.IsNullOrWhiteSpace(variantName))
 			throw new ArgumentException("Variant name must not be empty or whitespace.");
-		VariantName = variantName;
+		VariantType = variantName;
 		Variant = variant;
 	}
 
-	internal object Variant { get; }
-	internal string VariantName { get; }
+	internal Processor()
+	{
+	}
+
+	public object Variant { get; internal set; }
+	public string VariantType { get; internal set; }
 
 	public static Processor Append(Elastic.Clients.Elasticsearch.Serverless.Ingest.AppendProcessor appendProcessor) => new Processor("append", appendProcessor);
 	public static Processor Attachment(Elastic.Clients.Elasticsearch.Serverless.Ingest.AttachmentProcessor attachmentProcessor) => new Processor("attachment", attachmentProcessor);
@@ -105,497 +110,572 @@ public bool TryGet<T>([NotNullWhen(true)] out T? result) where T : class
 	}
 }
 
-internal sealed partial class ProcessorConverter : JsonConverter<Processor>
+internal sealed partial class ProcessorConverter : System.Text.Json.Serialization.JsonConverter<Processor>
 {
-	public override Processor Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText VariantAppend = System.Text.Json.JsonEncodedText.Encode("append");
+	private static readonly System.Text.Json.JsonEncodedText VariantAttachment = System.Text.Json.JsonEncodedText.Encode("attachment");
+	private static readonly System.Text.Json.JsonEncodedText VariantBytes = System.Text.Json.JsonEncodedText.Encode("bytes");
+	private static readonly System.Text.Json.JsonEncodedText VariantCircle = System.Text.Json.JsonEncodedText.Encode("circle");
+	private static readonly System.Text.Json.JsonEncodedText VariantCommunityId = System.Text.Json.JsonEncodedText.Encode("community_id");
+	private static readonly System.Text.Json.JsonEncodedText VariantConvert = System.Text.Json.JsonEncodedText.Encode("convert");
+	private static readonly System.Text.Json.JsonEncodedText VariantCsv = System.Text.Json.JsonEncodedText.Encode("csv");
+	private static readonly System.Text.Json.JsonEncodedText VariantDate = System.Text.Json.JsonEncodedText.Encode("date");
+	private static readonly System.Text.Json.JsonEncodedText VariantDateIndexName = System.Text.Json.JsonEncodedText.Encode("date_index_name");
+	private static readonly System.Text.Json.JsonEncodedText VariantDissect = System.Text.Json.JsonEncodedText.Encode("dissect");
+	private static readonly System.Text.Json.JsonEncodedText VariantDotExpander = System.Text.Json.JsonEncodedText.Encode("dot_expander");
+	private static readonly System.Text.Json.JsonEncodedText VariantDrop = System.Text.Json.JsonEncodedText.Encode("drop");
+	private static readonly System.Text.Json.JsonEncodedText VariantEnrich = System.Text.Json.JsonEncodedText.Encode("enrich");
+	private static readonly System.Text.Json.JsonEncodedText VariantFail = System.Text.Json.JsonEncodedText.Encode("fail");
+	private static readonly System.Text.Json.JsonEncodedText VariantFingerprint = System.Text.Json.JsonEncodedText.Encode("fingerprint");
+	private static readonly System.Text.Json.JsonEncodedText VariantForeach = System.Text.Json.JsonEncodedText.Encode("foreach");
+	private static readonly System.Text.Json.JsonEncodedText VariantGeoGrid = System.Text.Json.JsonEncodedText.Encode("geo_grid");
+	private static readonly System.Text.Json.JsonEncodedText VariantGeoip = System.Text.Json.JsonEncodedText.Encode("geoip");
+	private static readonly System.Text.Json.JsonEncodedText VariantGrok = System.Text.Json.JsonEncodedText.Encode("grok");
+	private static readonly System.Text.Json.JsonEncodedText VariantGsub = System.Text.Json.JsonEncodedText.Encode("gsub");
+	private static readonly System.Text.Json.JsonEncodedText VariantHtmlStrip = System.Text.Json.JsonEncodedText.Encode("html_strip");
+	private static readonly System.Text.Json.JsonEncodedText VariantInference = System.Text.Json.JsonEncodedText.Encode("inference");
+	private static readonly System.Text.Json.JsonEncodedText VariantIpLocation = System.Text.Json.JsonEncodedText.Encode("ip_location");
+	private static readonly System.Text.Json.JsonEncodedText VariantJoin = System.Text.Json.JsonEncodedText.Encode("join");
+	private static readonly System.Text.Json.JsonEncodedText VariantJson = System.Text.Json.JsonEncodedText.Encode("json");
+	private static readonly System.Text.Json.JsonEncodedText VariantKv = System.Text.Json.JsonEncodedText.Encode("kv");
+	private static readonly System.Text.Json.JsonEncodedText VariantLowercase = System.Text.Json.JsonEncodedText.Encode("lowercase");
+	private static readonly System.Text.Json.JsonEncodedText VariantNetworkDirection = System.Text.Json.JsonEncodedText.Encode("network_direction");
+	private static readonly System.Text.Json.JsonEncodedText VariantPipeline = System.Text.Json.JsonEncodedText.Encode("pipeline");
+	private static readonly System.Text.Json.JsonEncodedText VariantRedact = System.Text.Json.JsonEncodedText.Encode("redact");
+	private static readonly System.Text.Json.JsonEncodedText VariantRegisteredDomain = System.Text.Json.JsonEncodedText.Encode("registered_domain");
+	private static readonly System.Text.Json.JsonEncodedText VariantRemove = System.Text.Json.JsonEncodedText.Encode("remove");
+	private static readonly System.Text.Json.JsonEncodedText VariantRename = System.Text.Json.JsonEncodedText.Encode("rename");
+	private static readonly System.Text.Json.JsonEncodedText VariantReroute = System.Text.Json.JsonEncodedText.Encode("reroute");
+	private static readonly System.Text.Json.JsonEncodedText VariantScript = System.Text.Json.JsonEncodedText.Encode("script");
+	private static readonly System.Text.Json.JsonEncodedText VariantSet = System.Text.Json.JsonEncodedText.Encode("set");
+	private static readonly System.Text.Json.JsonEncodedText VariantSetSecurityUser = System.Text.Json.JsonEncodedText.Encode("set_security_user");
+	private static readonly System.Text.Json.JsonEncodedText VariantSort = System.Text.Json.JsonEncodedText.Encode("sort");
+	private static readonly System.Text.Json.JsonEncodedText VariantSplit = System.Text.Json.JsonEncodedText.Encode("split");
+	private static readonly System.Text.Json.JsonEncodedText VariantTerminate = System.Text.Json.JsonEncodedText.Encode("terminate");
+	private static readonly System.Text.Json.JsonEncodedText VariantTrim = System.Text.Json.JsonEncodedText.Encode("trim");
+	private static readonly System.Text.Json.JsonEncodedText VariantUppercase = System.Text.Json.JsonEncodedText.Encode("uppercase");
+	private static readonly System.Text.Json.JsonEncodedText VariantUriParts = System.Text.Json.JsonEncodedText.Encode("uri_parts");
+	private static readonly System.Text.Json.JsonEncodedText VariantUrlDecode = System.Text.Json.JsonEncodedText.Encode("urldecode");
+	private static readonly System.Text.Json.JsonEncodedText VariantUserAgent = System.Text.Json.JsonEncodedText.Encode("user_agent");
+
+	public override Processor Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		var variantType = string.Empty;
+		object? variant = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			throw new JsonException("Expected start token.");
-		}
-
-		object? variantValue = default;
-		string? variantNameValue = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
-		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
+			if (reader.ValueTextEquals(VariantAppend))
 			{
-				throw new JsonException("Expected a property name token.");
-			}
-
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token representing the name of an Elasticsearch field.");
-			}
-
-			var propertyName = reader.GetString();
-			reader.Read();
-			if (propertyName == "append")
-			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.AppendProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantAppend.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Ingest.AppendProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "attachment")
+			if (reader.ValueTextEquals(VariantAttachment))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.AttachmentProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantAttachment.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Ingest.AttachmentProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "bytes")
+			if (reader.ValueTextEquals(VariantBytes))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.BytesProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantBytes.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Ingest.BytesProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "circle")
+			if (reader.ValueTextEquals(VariantCircle))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.CircleProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantCircle.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Ingest.CircleProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "community_id")
+			if (reader.ValueTextEquals(VariantCommunityId))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.CommunityIDProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantCommunityId.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Ingest.CommunityIDProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "convert")
+			if (reader.ValueTextEquals(VariantConvert))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.ConvertProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantConvert.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Ingest.ConvertProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "csv")
+			if (reader.ValueTextEquals(VariantCsv))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.CsvProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantCsv.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Ingest.CsvProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "date")
+			if (reader.ValueTextEquals(VariantDate))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.DateProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantDate.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Ingest.DateProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "date_index_name")
+			if (reader.ValueTextEquals(VariantDateIndexName))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.DateIndexNameProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantDateIndexName.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Ingest.DateIndexNameProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "dissect")
+			if (reader.ValueTextEquals(VariantDissect))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.DissectProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantDissect.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Ingest.DissectProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "dot_expander")
+			if (reader.ValueTextEquals(VariantDotExpander))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.DotExpanderProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantDotExpander.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Ingest.DotExpanderProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "drop")
+			if (reader.ValueTextEquals(VariantDrop))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.DropProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantDrop.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Ingest.DropProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "enrich")
+			if (reader.ValueTextEquals(VariantEnrich))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.EnrichProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantEnrich.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Ingest.EnrichProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "fail")
+			if (reader.ValueTextEquals(VariantFail))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.FailProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantFail.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Ingest.FailProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "fingerprint")
+			if (reader.ValueTextEquals(VariantFingerprint))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.FingerprintProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantFingerprint.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Ingest.FingerprintProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "foreach")
+			if (reader.ValueTextEquals(VariantForeach))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.ForeachProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantForeach.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Ingest.ForeachProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "geo_grid")
+			if (reader.ValueTextEquals(VariantGeoGrid))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.GeoGridProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantGeoGrid.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Ingest.GeoGridProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "geoip")
+			if (reader.ValueTextEquals(VariantGeoip))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.GeoIpProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantGeoip.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Ingest.GeoIpProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "grok")
+			if (reader.ValueTextEquals(VariantGrok))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.GrokProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantGrok.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Ingest.GrokProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "gsub")
+			if (reader.ValueTextEquals(VariantGsub))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.GsubProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantGsub.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Ingest.GsubProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "html_strip")
+			if (reader.ValueTextEquals(VariantHtmlStrip))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.HtmlStripProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantHtmlStrip.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Ingest.HtmlStripProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "inference")
+			if (reader.ValueTextEquals(VariantInference))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.InferenceProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantInference.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Ingest.InferenceProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "ip_location")
+			if (reader.ValueTextEquals(VariantIpLocation))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.IpLocationProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantIpLocation.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Ingest.IpLocationProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "join")
+			if (reader.ValueTextEquals(VariantJoin))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.JoinProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantJoin.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Ingest.JoinProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "json")
+			if (reader.ValueTextEquals(VariantJson))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.JsonProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantJson.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Ingest.JsonProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "kv")
+			if (reader.ValueTextEquals(VariantKv))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.KeyValueProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantKv.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Ingest.KeyValueProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "lowercase")
+			if (reader.ValueTextEquals(VariantLowercase))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.LowercaseProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantLowercase.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Ingest.LowercaseProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "network_direction")
+			if (reader.ValueTextEquals(VariantNetworkDirection))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.NetworkDirectionProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantNetworkDirection.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Ingest.NetworkDirectionProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "pipeline")
+			if (reader.ValueTextEquals(VariantPipeline))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.PipelineProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantPipeline.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Ingest.PipelineProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "redact")
+			if (reader.ValueTextEquals(VariantRedact))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.RedactProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantRedact.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Ingest.RedactProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "registered_domain")
+			if (reader.ValueTextEquals(VariantRegisteredDomain))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.RegisteredDomainProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantRegisteredDomain.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Ingest.RegisteredDomainProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "remove")
+			if (reader.ValueTextEquals(VariantRemove))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.RemoveProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantRemove.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Ingest.RemoveProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "rename")
+			if (reader.ValueTextEquals(VariantRename))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.RenameProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantRename.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Ingest.RenameProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "reroute")
+			if (reader.ValueTextEquals(VariantReroute))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.RerouteProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantReroute.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Ingest.RerouteProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "script")
+			if (reader.ValueTextEquals(VariantScript))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.ScriptProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantScript.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Ingest.ScriptProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "set")
+			if (reader.ValueTextEquals(VariantSet))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.SetProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantSet.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Ingest.SetProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "set_security_user")
+			if (reader.ValueTextEquals(VariantSetSecurityUser))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.SetSecurityUserProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantSetSecurityUser.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Ingest.SetSecurityUserProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "sort")
+			if (reader.ValueTextEquals(VariantSort))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.SortProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantSort.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Ingest.SortProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "split")
+			if (reader.ValueTextEquals(VariantSplit))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.SplitProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantSplit.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Ingest.SplitProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "terminate")
+			if (reader.ValueTextEquals(VariantTerminate))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.TerminateProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantTerminate.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Ingest.TerminateProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "trim")
+			if (reader.ValueTextEquals(VariantTrim))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.TrimProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantTrim.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Ingest.TrimProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "uppercase")
+			if (reader.ValueTextEquals(VariantUppercase))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.UppercaseProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantUppercase.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Ingest.UppercaseProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "uri_parts")
+			if (reader.ValueTextEquals(VariantUriParts))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.UriPartsProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantUriParts.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Ingest.UriPartsProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "urldecode")
+			if (reader.ValueTextEquals(VariantUrlDecode))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.UrlDecodeProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantUrlDecode.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Ingest.UrlDecodeProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "user_agent")
+			if (reader.ValueTextEquals(VariantUserAgent))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.UserAgentProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantUserAgent.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Ingest.UserAgentProcessor?>(options);
 				continue;
 			}
 
-			throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'Processor' from the response.");
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		var result = new Processor(variantNameValue, variantValue);
-		return result;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new Processor { VariantType = variantType, Variant = variant };
 	}
 
-	public override void Write(Utf8JsonWriter writer, Processor value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, Processor value, System.Text.Json.JsonSerializerOptions options)
 	{
 		writer.WriteStartObject();
-		if (value.VariantName is not null && value.Variant is not null)
+		switch (value.VariantType)
 		{
-			writer.WritePropertyName(value.VariantName);
-			switch (value.VariantName)
-			{
-				case "append":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.AppendProcessor>(writer, (Elastic.Clients.Elasticsearch.Serverless.Ingest.AppendProcessor)value.Variant, options);
-					break;
-				case "attachment":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.AttachmentProcessor>(writer, (Elastic.Clients.Elasticsearch.Serverless.Ingest.AttachmentProcessor)value.Variant, options);
-					break;
-				case "bytes":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.BytesProcessor>(writer, (Elastic.Clients.Elasticsearch.Serverless.Ingest.BytesProcessor)value.Variant, options);
-					break;
-				case "circle":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.CircleProcessor>(writer, (Elastic.Clients.Elasticsearch.Serverless.Ingest.CircleProcessor)value.Variant, options);
-					break;
-				case "community_id":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.CommunityIDProcessor>(writer, (Elastic.Clients.Elasticsearch.Serverless.Ingest.CommunityIDProcessor)value.Variant, options);
-					break;
-				case "convert":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.ConvertProcessor>(writer, (Elastic.Clients.Elasticsearch.Serverless.Ingest.ConvertProcessor)value.Variant, options);
-					break;
-				case "csv":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.CsvProcessor>(writer, (Elastic.Clients.Elasticsearch.Serverless.Ingest.CsvProcessor)value.Variant, options);
-					break;
-				case "date":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.DateProcessor>(writer, (Elastic.Clients.Elasticsearch.Serverless.Ingest.DateProcessor)value.Variant, options);
-					break;
-				case "date_index_name":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.DateIndexNameProcessor>(writer, (Elastic.Clients.Elasticsearch.Serverless.Ingest.DateIndexNameProcessor)value.Variant, options);
-					break;
-				case "dissect":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.DissectProcessor>(writer, (Elastic.Clients.Elasticsearch.Serverless.Ingest.DissectProcessor)value.Variant, options);
-					break;
-				case "dot_expander":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.DotExpanderProcessor>(writer, (Elastic.Clients.Elasticsearch.Serverless.Ingest.DotExpanderProcessor)value.Variant, options);
-					break;
-				case "drop":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.DropProcessor>(writer, (Elastic.Clients.Elasticsearch.Serverless.Ingest.DropProcessor)value.Variant, options);
-					break;
-				case "enrich":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.EnrichProcessor>(writer, (Elastic.Clients.Elasticsearch.Serverless.Ingest.EnrichProcessor)value.Variant, options);
-					break;
-				case "fail":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.FailProcessor>(writer, (Elastic.Clients.Elasticsearch.Serverless.Ingest.FailProcessor)value.Variant, options);
-					break;
-				case "fingerprint":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.FingerprintProcessor>(writer, (Elastic.Clients.Elasticsearch.Serverless.Ingest.FingerprintProcessor)value.Variant, options);
-					break;
-				case "foreach":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.ForeachProcessor>(writer, (Elastic.Clients.Elasticsearch.Serverless.Ingest.ForeachProcessor)value.Variant, options);
-					break;
-				case "geo_grid":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.GeoGridProcessor>(writer, (Elastic.Clients.Elasticsearch.Serverless.Ingest.GeoGridProcessor)value.Variant, options);
-					break;
-				case "geoip":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.GeoIpProcessor>(writer, (Elastic.Clients.Elasticsearch.Serverless.Ingest.GeoIpProcessor)value.Variant, options);
-					break;
-				case "grok":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.GrokProcessor>(writer, (Elastic.Clients.Elasticsearch.Serverless.Ingest.GrokProcessor)value.Variant, options);
-					break;
-				case "gsub":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.GsubProcessor>(writer, (Elastic.Clients.Elasticsearch.Serverless.Ingest.GsubProcessor)value.Variant, options);
-					break;
-				case "html_strip":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.HtmlStripProcessor>(writer, (Elastic.Clients.Elasticsearch.Serverless.Ingest.HtmlStripProcessor)value.Variant, options);
-					break;
-				case "inference":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.InferenceProcessor>(writer, (Elastic.Clients.Elasticsearch.Serverless.Ingest.InferenceProcessor)value.Variant, options);
-					break;
-				case "ip_location":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.IpLocationProcessor>(writer, (Elastic.Clients.Elasticsearch.Serverless.Ingest.IpLocationProcessor)value.Variant, options);
-					break;
-				case "join":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.JoinProcessor>(writer, (Elastic.Clients.Elasticsearch.Serverless.Ingest.JoinProcessor)value.Variant, options);
-					break;
-				case "json":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.JsonProcessor>(writer, (Elastic.Clients.Elasticsearch.Serverless.Ingest.JsonProcessor)value.Variant, options);
-					break;
-				case "kv":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.KeyValueProcessor>(writer, (Elastic.Clients.Elasticsearch.Serverless.Ingest.KeyValueProcessor)value.Variant, options);
-					break;
-				case "lowercase":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.LowercaseProcessor>(writer, (Elastic.Clients.Elasticsearch.Serverless.Ingest.LowercaseProcessor)value.Variant, options);
-					break;
-				case "network_direction":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.NetworkDirectionProcessor>(writer, (Elastic.Clients.Elasticsearch.Serverless.Ingest.NetworkDirectionProcessor)value.Variant, options);
-					break;
-				case "pipeline":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.PipelineProcessor>(writer, (Elastic.Clients.Elasticsearch.Serverless.Ingest.PipelineProcessor)value.Variant, options);
-					break;
-				case "redact":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.RedactProcessor>(writer, (Elastic.Clients.Elasticsearch.Serverless.Ingest.RedactProcessor)value.Variant, options);
-					break;
-				case "registered_domain":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.RegisteredDomainProcessor>(writer, (Elastic.Clients.Elasticsearch.Serverless.Ingest.RegisteredDomainProcessor)value.Variant, options);
-					break;
-				case "remove":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.RemoveProcessor>(writer, (Elastic.Clients.Elasticsearch.Serverless.Ingest.RemoveProcessor)value.Variant, options);
-					break;
-				case "rename":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.RenameProcessor>(writer, (Elastic.Clients.Elasticsearch.Serverless.Ingest.RenameProcessor)value.Variant, options);
-					break;
-				case "reroute":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.RerouteProcessor>(writer, (Elastic.Clients.Elasticsearch.Serverless.Ingest.RerouteProcessor)value.Variant, options);
-					break;
-				case "script":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.ScriptProcessor>(writer, (Elastic.Clients.Elasticsearch.Serverless.Ingest.ScriptProcessor)value.Variant, options);
-					break;
-				case "set":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.SetProcessor>(writer, (Elastic.Clients.Elasticsearch.Serverless.Ingest.SetProcessor)value.Variant, options);
-					break;
-				case "set_security_user":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.SetSecurityUserProcessor>(writer, (Elastic.Clients.Elasticsearch.Serverless.Ingest.SetSecurityUserProcessor)value.Variant, options);
-					break;
-				case "sort":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.SortProcessor>(writer, (Elastic.Clients.Elasticsearch.Serverless.Ingest.SortProcessor)value.Variant, options);
-					break;
-				case "split":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.SplitProcessor>(writer, (Elastic.Clients.Elasticsearch.Serverless.Ingest.SplitProcessor)value.Variant, options);
-					break;
-				case "terminate":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.TerminateProcessor>(writer, (Elastic.Clients.Elasticsearch.Serverless.Ingest.TerminateProcessor)value.Variant, options);
-					break;
-				case "trim":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.TrimProcessor>(writer, (Elastic.Clients.Elasticsearch.Serverless.Ingest.TrimProcessor)value.Variant, options);
-					break;
-				case "uppercase":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.UppercaseProcessor>(writer, (Elastic.Clients.Elasticsearch.Serverless.Ingest.UppercaseProcessor)value.Variant, options);
-					break;
-				case "uri_parts":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.UriPartsProcessor>(writer, (Elastic.Clients.Elasticsearch.Serverless.Ingest.UriPartsProcessor)value.Variant, options);
-					break;
-				case "urldecode":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.UrlDecodeProcessor>(writer, (Elastic.Clients.Elasticsearch.Serverless.Ingest.UrlDecodeProcessor)value.Variant, options);
-					break;
-				case "user_agent":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Ingest.UserAgentProcessor>(writer, (Elastic.Clients.Elasticsearch.Serverless.Ingest.UserAgentProcessor)value.Variant, options);
-					break;
-			}
+			case "":
+				break;
+			case "append":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Ingest.AppendProcessor?)value.Variant);
+				break;
+			case "attachment":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Ingest.AttachmentProcessor?)value.Variant);
+				break;
+			case "bytes":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Ingest.BytesProcessor?)value.Variant);
+				break;
+			case "circle":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Ingest.CircleProcessor?)value.Variant);
+				break;
+			case "community_id":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Ingest.CommunityIDProcessor?)value.Variant);
+				break;
+			case "convert":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Ingest.ConvertProcessor?)value.Variant);
+				break;
+			case "csv":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Ingest.CsvProcessor?)value.Variant);
+				break;
+			case "date":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Ingest.DateProcessor?)value.Variant);
+				break;
+			case "date_index_name":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Ingest.DateIndexNameProcessor?)value.Variant);
+				break;
+			case "dissect":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Ingest.DissectProcessor?)value.Variant);
+				break;
+			case "dot_expander":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Ingest.DotExpanderProcessor?)value.Variant);
+				break;
+			case "drop":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Ingest.DropProcessor?)value.Variant);
+				break;
+			case "enrich":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Ingest.EnrichProcessor?)value.Variant);
+				break;
+			case "fail":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Ingest.FailProcessor?)value.Variant);
+				break;
+			case "fingerprint":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Ingest.FingerprintProcessor?)value.Variant);
+				break;
+			case "foreach":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Ingest.ForeachProcessor?)value.Variant);
+				break;
+			case "geo_grid":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Ingest.GeoGridProcessor?)value.Variant);
+				break;
+			case "geoip":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Ingest.GeoIpProcessor?)value.Variant);
+				break;
+			case "grok":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Ingest.GrokProcessor?)value.Variant);
+				break;
+			case "gsub":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Ingest.GsubProcessor?)value.Variant);
+				break;
+			case "html_strip":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Ingest.HtmlStripProcessor?)value.Variant);
+				break;
+			case "inference":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Ingest.InferenceProcessor?)value.Variant);
+				break;
+			case "ip_location":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Ingest.IpLocationProcessor?)value.Variant);
+				break;
+			case "join":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Ingest.JoinProcessor?)value.Variant);
+				break;
+			case "json":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Ingest.JsonProcessor?)value.Variant);
+				break;
+			case "kv":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Ingest.KeyValueProcessor?)value.Variant);
+				break;
+			case "lowercase":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Ingest.LowercaseProcessor?)value.Variant);
+				break;
+			case "network_direction":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Ingest.NetworkDirectionProcessor?)value.Variant);
+				break;
+			case "pipeline":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Ingest.PipelineProcessor?)value.Variant);
+				break;
+			case "redact":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Ingest.RedactProcessor?)value.Variant);
+				break;
+			case "registered_domain":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Ingest.RegisteredDomainProcessor?)value.Variant);
+				break;
+			case "remove":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Ingest.RemoveProcessor?)value.Variant);
+				break;
+			case "rename":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Ingest.RenameProcessor?)value.Variant);
+				break;
+			case "reroute":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Ingest.RerouteProcessor?)value.Variant);
+				break;
+			case "script":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Ingest.ScriptProcessor?)value.Variant);
+				break;
+			case "set":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Ingest.SetProcessor?)value.Variant);
+				break;
+			case "set_security_user":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Ingest.SetSecurityUserProcessor?)value.Variant);
+				break;
+			case "sort":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Ingest.SortProcessor?)value.Variant);
+				break;
+			case "split":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Ingest.SplitProcessor?)value.Variant);
+				break;
+			case "terminate":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Ingest.TerminateProcessor?)value.Variant);
+				break;
+			case "trim":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Ingest.TrimProcessor?)value.Variant);
+				break;
+			case "uppercase":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Ingest.UppercaseProcessor?)value.Variant);
+				break;
+			case "uri_parts":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Ingest.UriPartsProcessor?)value.Variant);
+				break;
+			case "urldecode":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Ingest.UrlDecodeProcessor?)value.Variant);
+				break;
+			case "user_agent":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Ingest.UserAgentProcessor?)value.Variant);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.VariantType}' is not supported for type '{nameof(Processor)}'.");
 		}
 
 		writer.WriteEndObject();
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Ingest/RemoveProcessor.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Ingest/RemoveProcessor.g.cs
index f6f877bc357..647e28859f7 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Ingest/RemoveProcessor.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Ingest/RemoveProcessor.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,110 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Ingest;
 
+internal sealed partial class RemoveProcessorConverter : System.Text.Json.Serialization.JsonConverter<RemoveProcessor>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropDescription = System.Text.Json.JsonEncodedText.Encode("description");
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropIf = System.Text.Json.JsonEncodedText.Encode("if");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreFailure = System.Text.Json.JsonEncodedText.Encode("ignore_failure");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreMissing = System.Text.Json.JsonEncodedText.Encode("ignore_missing");
+	private static readonly System.Text.Json.JsonEncodedText PropKeep = System.Text.Json.JsonEncodedText.Encode("keep");
+	private static readonly System.Text.Json.JsonEncodedText PropOnFailure = System.Text.Json.JsonEncodedText.Encode("on_failure");
+	private static readonly System.Text.Json.JsonEncodedText PropTag = System.Text.Json.JsonEncodedText.Encode("tag");
+
+	public override RemoveProcessor Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string?> propDescription = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Fields> propField = default;
+		LocalJsonProperty<string?> propIf = default;
+		LocalJsonProperty<bool?> propIgnoreFailure = default;
+		LocalJsonProperty<bool?> propIgnoreMissing = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Fields?> propKeep = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.Ingest.Processor>?> propOnFailure = default;
+		LocalJsonProperty<string?> propTag = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propDescription.TryRead(ref reader, options, PropDescription))
+			{
+				continue;
+			}
+
+			if (propField.TryRead(ref reader, options, PropField, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propIf.TryRead(ref reader, options, PropIf))
+			{
+				continue;
+			}
+
+			if (propIgnoreFailure.TryRead(ref reader, options, PropIgnoreFailure))
+			{
+				continue;
+			}
+
+			if (propIgnoreMissing.TryRead(ref reader, options, PropIgnoreMissing))
+			{
+				continue;
+			}
+
+			if (propKeep.TryRead(ref reader, options, PropKeep, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propOnFailure.TryRead(ref reader, options, PropOnFailure))
+			{
+				continue;
+			}
+
+			if (propTag.TryRead(ref reader, options, PropTag))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new RemoveProcessor
+		{
+			Description = propDescription.Value
+,
+			Field = propField.Value
+,
+			If = propIf.Value
+,
+			IgnoreFailure = propIgnoreFailure.Value
+,
+			IgnoreMissing = propIgnoreMissing.Value
+,
+			Keep = propKeep.Value
+,
+			OnFailure = propOnFailure.Value
+,
+			Tag = propTag.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, RemoveProcessor value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDescription, value.Description);
+		writer.WriteProperty(options, PropField, value.Field, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropIf, value.If);
+		writer.WriteProperty(options, PropIgnoreFailure, value.IgnoreFailure);
+		writer.WriteProperty(options, PropIgnoreMissing, value.IgnoreMissing);
+		writer.WriteProperty(options, PropKeep, value.Keep, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropOnFailure, value.OnFailure);
+		writer.WriteProperty(options, PropTag, value.Tag);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(RemoveProcessorConverter))]
 public sealed partial class RemoveProcessor
 {
 	/// <summary>
@@ -35,7 +140,6 @@ public sealed partial class RemoveProcessor
 	/// Useful for describing the purpose of the processor or its configuration.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("description")]
 	public string? Description { get; set; }
 
 	/// <summary>
@@ -43,8 +147,6 @@ public sealed partial class RemoveProcessor
 	/// Fields to be removed. Supports template snippets.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("field")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Serverless.Fields Field { get; set; }
 
 	/// <summary>
@@ -52,7 +154,6 @@ public sealed partial class RemoveProcessor
 	/// Conditionally execute the processor.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("if")]
 	public string? If { get; set; }
 
 	/// <summary>
@@ -60,7 +161,6 @@ public sealed partial class RemoveProcessor
 	/// Ignore failures for the processor.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("ignore_failure")]
 	public bool? IgnoreFailure { get; set; }
 
 	/// <summary>
@@ -68,7 +168,6 @@ public sealed partial class RemoveProcessor
 	/// If <c>true</c> and <c>field</c> does not exist or is <c>null</c>, the processor quietly exits without modifying the document.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("ignore_missing")]
 	public bool? IgnoreMissing { get; set; }
 
 	/// <summary>
@@ -76,8 +175,6 @@ public sealed partial class RemoveProcessor
 	/// Fields to be kept. When set, all fields other than those specified are removed.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("keep")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Serverless.Fields? Keep { get; set; }
 
 	/// <summary>
@@ -85,7 +182,6 @@ public sealed partial class RemoveProcessor
 	/// Handle failures for the processor.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("on_failure")]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.Ingest.Processor>? OnFailure { get; set; }
 
 	/// <summary>
@@ -94,7 +190,6 @@ public sealed partial class RemoveProcessor
 	/// Useful for debugging and metrics.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("tag")]
 	public string? Tag { get; set; }
 
 	public static implicit operator Elastic.Clients.Elasticsearch.Serverless.Ingest.Processor(RemoveProcessor removeProcessor) => Elastic.Clients.Elasticsearch.Serverless.Ingest.Processor.Remove(removeProcessor);
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Ingest/RerouteProcessor.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Ingest/RerouteProcessor.g.cs
index 1e865f6735a..a6a47120ac4 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Ingest/RerouteProcessor.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Ingest/RerouteProcessor.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,110 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Ingest;
 
+internal sealed partial class RerouteProcessorConverter : System.Text.Json.Serialization.JsonConverter<RerouteProcessor>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropDataset = System.Text.Json.JsonEncodedText.Encode("dataset");
+	private static readonly System.Text.Json.JsonEncodedText PropDescription = System.Text.Json.JsonEncodedText.Encode("description");
+	private static readonly System.Text.Json.JsonEncodedText PropDestination = System.Text.Json.JsonEncodedText.Encode("destination");
+	private static readonly System.Text.Json.JsonEncodedText PropIf = System.Text.Json.JsonEncodedText.Encode("if");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreFailure = System.Text.Json.JsonEncodedText.Encode("ignore_failure");
+	private static readonly System.Text.Json.JsonEncodedText PropNamespace = System.Text.Json.JsonEncodedText.Encode("namespace");
+	private static readonly System.Text.Json.JsonEncodedText PropOnFailure = System.Text.Json.JsonEncodedText.Encode("on_failure");
+	private static readonly System.Text.Json.JsonEncodedText PropTag = System.Text.Json.JsonEncodedText.Encode("tag");
+
+	public override RerouteProcessor Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propDataset = default;
+		LocalJsonProperty<string?> propDescription = default;
+		LocalJsonProperty<string?> propDestination = default;
+		LocalJsonProperty<string?> propIf = default;
+		LocalJsonProperty<bool?> propIgnoreFailure = default;
+		LocalJsonProperty<ICollection<string>?> propNamespace = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.Ingest.Processor>?> propOnFailure = default;
+		LocalJsonProperty<string?> propTag = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propDataset.TryRead(ref reader, options, PropDataset, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propDescription.TryRead(ref reader, options, PropDescription))
+			{
+				continue;
+			}
+
+			if (propDestination.TryRead(ref reader, options, PropDestination))
+			{
+				continue;
+			}
+
+			if (propIf.TryRead(ref reader, options, PropIf))
+			{
+				continue;
+			}
+
+			if (propIgnoreFailure.TryRead(ref reader, options, PropIgnoreFailure))
+			{
+				continue;
+			}
+
+			if (propNamespace.TryRead(ref reader, options, PropNamespace, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propOnFailure.TryRead(ref reader, options, PropOnFailure))
+			{
+				continue;
+			}
+
+			if (propTag.TryRead(ref reader, options, PropTag))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new RerouteProcessor
+		{
+			Dataset = propDataset.Value
+,
+			Description = propDescription.Value
+,
+			Destination = propDestination.Value
+,
+			If = propIf.Value
+,
+			IgnoreFailure = propIgnoreFailure.Value
+,
+			Namespace = propNamespace.Value
+,
+			OnFailure = propOnFailure.Value
+,
+			Tag = propTag.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, RerouteProcessor value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDataset, value.Dataset, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropDescription, value.Description);
+		writer.WriteProperty(options, PropDestination, value.Destination);
+		writer.WriteProperty(options, PropIf, value.If);
+		writer.WriteProperty(options, PropIgnoreFailure, value.IgnoreFailure);
+		writer.WriteProperty(options, PropNamespace, value.Namespace, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropOnFailure, value.OnFailure);
+		writer.WriteProperty(options, PropTag, value.Tag);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(RerouteProcessorConverter))]
 public sealed partial class RerouteProcessor
 {
 	/// <summary>
@@ -44,8 +149,6 @@ public sealed partial class RerouteProcessor
 	/// default {{data_stream.dataset}}
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("dataset")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Dataset { get; set; }
 
 	/// <summary>
@@ -54,7 +157,6 @@ public sealed partial class RerouteProcessor
 	/// Useful for describing the purpose of the processor or its configuration.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("description")]
 	public string? Description { get; set; }
 
 	/// <summary>
@@ -62,7 +164,6 @@ public sealed partial class RerouteProcessor
 	/// A static value for the target. Can’t be set when the dataset or namespace option is set.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("destination")]
 	public string? Destination { get; set; }
 
 	/// <summary>
@@ -70,7 +171,6 @@ public sealed partial class RerouteProcessor
 	/// Conditionally execute the processor.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("if")]
 	public string? If { get; set; }
 
 	/// <summary>
@@ -78,7 +178,6 @@ public sealed partial class RerouteProcessor
 	/// Ignore failures for the processor.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("ignore_failure")]
 	public bool? IgnoreFailure { get; set; }
 
 	/// <summary>
@@ -95,8 +194,6 @@ public sealed partial class RerouteProcessor
 	/// default {{data_stream.namespace}}
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("namespace")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Namespace { get; set; }
 
 	/// <summary>
@@ -104,7 +201,6 @@ public sealed partial class RerouteProcessor
 	/// Handle failures for the processor.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("on_failure")]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.Ingest.Processor>? OnFailure { get; set; }
 
 	/// <summary>
@@ -113,7 +209,6 @@ public sealed partial class RerouteProcessor
 	/// Useful for debugging and metrics.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("tag")]
 	public string? Tag { get; set; }
 
 	public static implicit operator Elastic.Clients.Elasticsearch.Serverless.Ingest.Processor(RerouteProcessor rerouteProcessor) => Elastic.Clients.Elasticsearch.Serverless.Ingest.Processor.Reroute(rerouteProcessor);
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/InlineGet.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/InlineGet.g.cs
index 0ecc654b5b4..32992bea636 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/InlineGet.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/InlineGet.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,76 +28,121 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless;
 
-internal sealed partial class InlineGetConverter<TDocument> : JsonConverter<InlineGet<TDocument>>
+internal sealed partial class InlineGetConverter<TDocument> : System.Text.Json.Serialization.JsonConverter<InlineGet<TDocument>>
 {
-	public override InlineGet<TDocument> Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropMetadata = System.Text.Json.JsonEncodedText.Encode("metadata");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropFound = System.Text.Json.JsonEncodedText.Encode("found");
+	private static readonly System.Text.Json.JsonEncodedText PropPrimaryTerm = System.Text.Json.JsonEncodedText.Encode("_primary_term");
+	private static readonly System.Text.Json.JsonEncodedText PropRouting = System.Text.Json.JsonEncodedText.Encode("_routing");
+	private static readonly System.Text.Json.JsonEncodedText PropSeqNo = System.Text.Json.JsonEncodedText.Encode("_seq_no");
+	private static readonly System.Text.Json.JsonEncodedText PropSource = System.Text.Json.JsonEncodedText.Encode("_source");
+
+	public override InlineGet<TDocument> Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		IReadOnlyDictionary<string, object>? fields = default;
-		bool found = default;
-		long? primaryTerm = default;
-		string? routing = default;
-		long? seqNo = default;
-		TDocument? source = default;
-		Dictionary<string, object> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, object> propMetadata = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, object>?> propFields = default;
+		LocalJsonProperty<bool> propFound = default;
+		LocalJsonProperty<long?> propPrimaryTerm = default;
+		LocalJsonProperty<string?> propRouting = default;
+		LocalJsonProperty<long?> propSeqNo = default;
+		LocalJsonProperty<TDocument?> propSource = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propFound.TryRead(ref reader, options, PropFound))
+			{
+				continue;
+			}
+
+			if (propPrimaryTerm.TryRead(ref reader, options, PropPrimaryTerm))
+			{
+				continue;
+			}
+
+			if (propRouting.TryRead(ref reader, options, PropRouting))
+			{
+				continue;
+			}
+
+			if (propSeqNo.TryRead(ref reader, options, PropSeqNo))
+			{
+				continue;
+			}
+
+			if (propSource.TryRead(ref reader, options, PropSource, typeof(SourceMarker<TDocument?>)))
 			{
-				var property = reader.GetString();
-				if (property == "fields")
-				{
-					fields = JsonSerializer.Deserialize<IReadOnlyDictionary<string, object>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "found")
-				{
-					found = JsonSerializer.Deserialize<bool>(ref reader, options);
-					continue;
-				}
-
-				if (property == "_primary_term")
-				{
-					primaryTerm = JsonSerializer.Deserialize<long?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "_routing")
-				{
-					routing = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "_seq_no")
-				{
-					seqNo = JsonSerializer.Deserialize<long?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "_source")
-				{
-					source = JsonSerializer.Deserialize<TDocument?>(ref reader, options);
-					continue;
-				}
-
-				additionalProperties ??= new Dictionary<string, object>();
-				var additionalValue = JsonSerializer.Deserialize<object>(ref reader, options);
-				additionalProperties.Add(property, additionalValue);
+				continue;
 			}
+
+			propMetadata ??= new System.Collections.Generic.Dictionary<string, object>();
+			reader.ReadProperty(options, out string key, out object value);
+			propMetadata[key] = value;
 		}
 
-		return new InlineGet<TDocument> { Fields = fields, Found = found, Metadata = additionalProperties, PrimaryTerm = primaryTerm, Routing = routing, SeqNo = seqNo, Source = source };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new InlineGet<TDocument>
+		{
+			Metadata = propMetadata
+,
+			Fields = propFields.Value
+,
+			Found = propFound.Value
+,
+			PrimaryTerm = propPrimaryTerm.Value
+,
+			Routing = propRouting.Value
+,
+			SeqNo = propSeqNo.Value
+,
+			Source = propSource.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, InlineGet<TDocument> value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropFound, value.Found);
+		writer.WriteProperty(options, PropPrimaryTerm, value.PrimaryTerm);
+		writer.WriteProperty(options, PropRouting, value.Routing);
+		writer.WriteProperty(options, PropSeqNo, value.SeqNo);
+		writer.WriteProperty(options, PropSource, value.Source, typeof(SourceMarker<TDocument?>));
+		if (value.Metadata is not null)
+		{
+			foreach (var item in value.Metadata)
+			{
+				writer.WriteProperty(options, item.Key, item.Value);
+			}
+		}
+
+		writer.WriteEndObject();
+	}
+}
+
+internal sealed partial class InlineGetConverterFactory : System.Text.Json.Serialization.JsonConverterFactory
+{
+	public override bool CanConvert(System.Type typeToConvert)
+	{
+		return typeToConvert.IsGenericType && typeToConvert.GetGenericTypeDefinition() == typeof(InlineGet<>);
 	}
 
-	public override void Write(Utf8JsonWriter writer, InlineGet<TDocument> value, JsonSerializerOptions options)
+	public override System.Text.Json.Serialization.JsonConverter CreateConverter(System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'InlineGet' is a readonly type, used only on responses and does not support being written to JSON.");
+		var args = typeToConvert.GetGenericArguments();
+#pragma warning disable IL3050
+		var converter = (System.Text.Json.Serialization.JsonConverter)System.Activator.CreateInstance(typeof(InlineGetConverter<>).MakeGenericType(args[0]), System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public, binder: null, args: null, culture: null)!;
+#pragma warning restore IL3050
+		return converter;
 	}
 }
 
-[GenericConverter(typeof(InlineGetConverter<>), unwrap: true)]
+[JsonConverter(typeof(InlineGetConverterFactory))]
 public sealed partial class InlineGet<TDocument>
 {
 	public IReadOnlyDictionary<string, object>? Fields { get; init; }
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/KnnQuery.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/KnnQuery.g.cs
index 5c7e205c5ae..6846bb777b9 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/KnnQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/KnnQuery.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,120 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless;
 
+internal sealed partial class KnnQueryConverter : System.Text.Json.Serialization.JsonConverter<KnnQuery>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropFilter = System.Text.Json.JsonEncodedText.Encode("filter");
+	private static readonly System.Text.Json.JsonEncodedText Propk = System.Text.Json.JsonEncodedText.Encode("k");
+	private static readonly System.Text.Json.JsonEncodedText PropNumCandidates = System.Text.Json.JsonEncodedText.Encode("num_candidates");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryName = System.Text.Json.JsonEncodedText.Encode("_name");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryVector = System.Text.Json.JsonEncodedText.Encode("query_vector");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryVectorBuilder = System.Text.Json.JsonEncodedText.Encode("query_vector_builder");
+	private static readonly System.Text.Json.JsonEncodedText PropSimilarity = System.Text.Json.JsonEncodedText.Encode("similarity");
+
+	public override KnnQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<float?> propBoost = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Field> propField = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query>?> propFilter = default;
+		LocalJsonProperty<int?> propk = default;
+		LocalJsonProperty<int?> propNumCandidates = default;
+		LocalJsonProperty<string?> propQueryName = default;
+		LocalJsonProperty<ICollection<float>?> propQueryVector = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.QueryVectorBuilder?> propQueryVectorBuilder = default;
+		LocalJsonProperty<float?> propSimilarity = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
+
+			if (propField.TryRead(ref reader, options, PropField))
+			{
+				continue;
+			}
+
+			if (propFilter.TryRead(ref reader, options, PropFilter, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query>?, Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query>)))
+			{
+				continue;
+			}
+
+			if (propk.TryRead(ref reader, options, Propk))
+			{
+				continue;
+			}
+
+			if (propNumCandidates.TryRead(ref reader, options, PropNumCandidates))
+			{
+				continue;
+			}
+
+			if (propQueryName.TryRead(ref reader, options, PropQueryName))
+			{
+				continue;
+			}
+
+			if (propQueryVector.TryRead(ref reader, options, PropQueryVector))
+			{
+				continue;
+			}
+
+			if (propQueryVectorBuilder.TryRead(ref reader, options, PropQueryVectorBuilder))
+			{
+				continue;
+			}
+
+			if (propSimilarity.TryRead(ref reader, options, PropSimilarity))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new KnnQuery
+		{
+			Boost = propBoost.Value
+,
+			Field = propField.Value
+,
+			Filter = propFilter.Value
+,
+			k = propk.Value
+,
+			NumCandidates = propNumCandidates.Value
+,
+			QueryName = propQueryName.Value
+,
+			QueryVector = propQueryVector.Value
+,
+			QueryVectorBuilder = propQueryVectorBuilder.Value
+,
+			Similarity = propSimilarity.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, KnnQuery value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropField, value.Field);
+		writer.WriteProperty(options, PropFilter, value.Filter, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query>?, Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query>));
+		writer.WriteProperty(options, Propk, value.k);
+		writer.WriteProperty(options, PropNumCandidates, value.NumCandidates);
+		writer.WriteProperty(options, PropQueryName, value.QueryName);
+		writer.WriteProperty(options, PropQueryVector, value.QueryVector);
+		writer.WriteProperty(options, PropQueryVectorBuilder, value.QueryVectorBuilder);
+		writer.WriteProperty(options, PropSimilarity, value.Similarity);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(KnnQueryConverter))]
 public sealed partial class KnnQuery
 {
 	/// <summary>
@@ -37,7 +152,6 @@ public sealed partial class KnnQuery
 	/// A value greater than 1.0 increases the relevance score.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("boost")]
 	public float? Boost { get; set; }
 
 	/// <summary>
@@ -45,7 +159,6 @@ public sealed partial class KnnQuery
 	/// The name of the vector field to search against
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("field")]
 	public Elastic.Clients.Elasticsearch.Serverless.Field Field { get; set; }
 
 	/// <summary>
@@ -53,8 +166,6 @@ public sealed partial class KnnQuery
 	/// Filters for the kNN search query
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("filter")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query))]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query>? Filter { get; set; }
 
 	/// <summary>
@@ -62,7 +173,6 @@ public sealed partial class KnnQuery
 	/// The final number of nearest neighbors to return as top hits
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("k")]
 	public int? k { get; set; }
 
 	/// <summary>
@@ -70,9 +180,7 @@ public sealed partial class KnnQuery
 	/// The number of nearest neighbor candidates to consider per shard
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("num_candidates")]
 	public int? NumCandidates { get; set; }
-	[JsonInclude, JsonPropertyName("_name")]
 	public string? QueryName { get; set; }
 
 	/// <summary>
@@ -80,7 +188,6 @@ public sealed partial class KnnQuery
 	/// The query vector
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("query_vector")]
 	public ICollection<float>? QueryVector { get; set; }
 
 	/// <summary>
@@ -88,7 +195,6 @@ public sealed partial class KnnQuery
 	/// The query vector builder. You must provide a query_vector_builder or query_vector, but not both.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("query_vector_builder")]
 	public Elastic.Clients.Elasticsearch.Serverless.QueryVectorBuilder? QueryVectorBuilder { get; set; }
 
 	/// <summary>
@@ -96,7 +202,6 @@ public sealed partial class KnnQuery
 	/// The minimum similarity for a vector to be considered a match
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("similarity")]
 	public float? Similarity { get; set; }
 
 	public static implicit operator Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query(KnnQuery knnQuery) => Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query.Knn(knnQuery);
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/KnnRetriever.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/KnnRetriever.g.cs
index 12e19169c80..7c020844924 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/KnnRetriever.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/KnnRetriever.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,110 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless;
 
+internal sealed partial class KnnRetrieverConverter : System.Text.Json.Serialization.JsonConverter<KnnRetriever>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropFilter = System.Text.Json.JsonEncodedText.Encode("filter");
+	private static readonly System.Text.Json.JsonEncodedText Propk = System.Text.Json.JsonEncodedText.Encode("k");
+	private static readonly System.Text.Json.JsonEncodedText PropMinScore = System.Text.Json.JsonEncodedText.Encode("min_score");
+	private static readonly System.Text.Json.JsonEncodedText PropNumCandidates = System.Text.Json.JsonEncodedText.Encode("num_candidates");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryVector = System.Text.Json.JsonEncodedText.Encode("query_vector");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryVectorBuilder = System.Text.Json.JsonEncodedText.Encode("query_vector_builder");
+	private static readonly System.Text.Json.JsonEncodedText PropSimilarity = System.Text.Json.JsonEncodedText.Encode("similarity");
+
+	public override KnnRetriever Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propField = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query>?> propFilter = default;
+		LocalJsonProperty<int> propk = default;
+		LocalJsonProperty<float?> propMinScore = default;
+		LocalJsonProperty<int> propNumCandidates = default;
+		LocalJsonProperty<ICollection<float>?> propQueryVector = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.QueryVectorBuilder?> propQueryVectorBuilder = default;
+		LocalJsonProperty<float?> propSimilarity = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propField.TryRead(ref reader, options, PropField))
+			{
+				continue;
+			}
+
+			if (propFilter.TryRead(ref reader, options, PropFilter, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query>?, Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query>)))
+			{
+				continue;
+			}
+
+			if (propk.TryRead(ref reader, options, Propk))
+			{
+				continue;
+			}
+
+			if (propMinScore.TryRead(ref reader, options, PropMinScore))
+			{
+				continue;
+			}
+
+			if (propNumCandidates.TryRead(ref reader, options, PropNumCandidates))
+			{
+				continue;
+			}
+
+			if (propQueryVector.TryRead(ref reader, options, PropQueryVector))
+			{
+				continue;
+			}
+
+			if (propQueryVectorBuilder.TryRead(ref reader, options, PropQueryVectorBuilder))
+			{
+				continue;
+			}
+
+			if (propSimilarity.TryRead(ref reader, options, PropSimilarity))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new KnnRetriever
+		{
+			Field = propField.Value
+,
+			Filter = propFilter.Value
+,
+			k = propk.Value
+,
+			MinScore = propMinScore.Value
+,
+			NumCandidates = propNumCandidates.Value
+,
+			QueryVector = propQueryVector.Value
+,
+			QueryVectorBuilder = propQueryVectorBuilder.Value
+,
+			Similarity = propSimilarity.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, KnnRetriever value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropField, value.Field);
+		writer.WriteProperty(options, PropFilter, value.Filter, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query>?, Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query>));
+		writer.WriteProperty(options, Propk, value.k);
+		writer.WriteProperty(options, PropMinScore, value.MinScore);
+		writer.WriteProperty(options, PropNumCandidates, value.NumCandidates);
+		writer.WriteProperty(options, PropQueryVector, value.QueryVector);
+		writer.WriteProperty(options, PropQueryVectorBuilder, value.QueryVectorBuilder);
+		writer.WriteProperty(options, PropSimilarity, value.Similarity);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(KnnRetrieverConverter))]
 public sealed partial class KnnRetriever
 {
 	/// <summary>
@@ -34,7 +139,6 @@ public sealed partial class KnnRetriever
 	/// The name of the vector field to search against.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("field")]
 	public string Field { get; set; }
 
 	/// <summary>
@@ -42,8 +146,6 @@ public sealed partial class KnnRetriever
 	/// Query to filter the documents that can match.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("filter")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query))]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query>? Filter { get; set; }
 
 	/// <summary>
@@ -51,7 +153,6 @@ public sealed partial class KnnRetriever
 	/// Number of nearest neighbors to return as top hits.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("k")]
 	public int k { get; set; }
 
 	/// <summary>
@@ -59,7 +160,6 @@ public sealed partial class KnnRetriever
 	/// Minimum _score for matching documents. Documents with a lower _score are not included in the top documents.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("min_score")]
 	public float? MinScore { get; set; }
 
 	/// <summary>
@@ -67,7 +167,6 @@ public sealed partial class KnnRetriever
 	/// Number of nearest neighbor candidates to consider per shard.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("num_candidates")]
 	public int NumCandidates { get; set; }
 
 	/// <summary>
@@ -75,7 +174,6 @@ public sealed partial class KnnRetriever
 	/// Query vector. Must have the same number of dimensions as the vector field you are searching against. You must provide a query_vector_builder or query_vector, but not both.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("query_vector")]
 	public ICollection<float>? QueryVector { get; set; }
 
 	/// <summary>
@@ -83,7 +181,6 @@ public sealed partial class KnnRetriever
 	/// Defines a model to build a query vector.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("query_vector_builder")]
 	public Elastic.Clients.Elasticsearch.Serverless.QueryVectorBuilder? QueryVectorBuilder { get; set; }
 
 	/// <summary>
@@ -91,7 +188,6 @@ public sealed partial class KnnRetriever
 	/// The minimum similarity required for a document to be considered a match.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("similarity")]
 	public float? Similarity { get; set; }
 
 	public static implicit operator Elastic.Clients.Elasticsearch.Serverless.Retriever(KnnRetriever knnRetriever) => Elastic.Clients.Elasticsearch.Serverless.Retriever.Knn(knnRetriever);
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/KnnSearch.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/KnnSearch.g.cs
index a1deddb0eb4..27fe09f5c5c 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/KnnSearch.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/KnnSearch.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,120 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless;
 
+internal sealed partial class KnnSearchConverter : System.Text.Json.Serialization.JsonConverter<KnnSearch>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropFilter = System.Text.Json.JsonEncodedText.Encode("filter");
+	private static readonly System.Text.Json.JsonEncodedText PropInnerHits = System.Text.Json.JsonEncodedText.Encode("inner_hits");
+	private static readonly System.Text.Json.JsonEncodedText Propk = System.Text.Json.JsonEncodedText.Encode("k");
+	private static readonly System.Text.Json.JsonEncodedText PropNumCandidates = System.Text.Json.JsonEncodedText.Encode("num_candidates");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryVector = System.Text.Json.JsonEncodedText.Encode("query_vector");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryVectorBuilder = System.Text.Json.JsonEncodedText.Encode("query_vector_builder");
+	private static readonly System.Text.Json.JsonEncodedText PropSimilarity = System.Text.Json.JsonEncodedText.Encode("similarity");
+
+	public override KnnSearch Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<float?> propBoost = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Field> propField = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query>?> propFilter = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Core.Search.InnerHits?> propInnerHits = default;
+		LocalJsonProperty<int?> propk = default;
+		LocalJsonProperty<int?> propNumCandidates = default;
+		LocalJsonProperty<ICollection<float>?> propQueryVector = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.QueryVectorBuilder?> propQueryVectorBuilder = default;
+		LocalJsonProperty<float?> propSimilarity = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
+
+			if (propField.TryRead(ref reader, options, PropField))
+			{
+				continue;
+			}
+
+			if (propFilter.TryRead(ref reader, options, PropFilter, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query>?, Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query>)))
+			{
+				continue;
+			}
+
+			if (propInnerHits.TryRead(ref reader, options, PropInnerHits))
+			{
+				continue;
+			}
+
+			if (propk.TryRead(ref reader, options, Propk))
+			{
+				continue;
+			}
+
+			if (propNumCandidates.TryRead(ref reader, options, PropNumCandidates))
+			{
+				continue;
+			}
+
+			if (propQueryVector.TryRead(ref reader, options, PropQueryVector))
+			{
+				continue;
+			}
+
+			if (propQueryVectorBuilder.TryRead(ref reader, options, PropQueryVectorBuilder))
+			{
+				continue;
+			}
+
+			if (propSimilarity.TryRead(ref reader, options, PropSimilarity))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new KnnSearch
+		{
+			Boost = propBoost.Value
+,
+			Field = propField.Value
+,
+			Filter = propFilter.Value
+,
+			InnerHits = propInnerHits.Value
+,
+			k = propk.Value
+,
+			NumCandidates = propNumCandidates.Value
+,
+			QueryVector = propQueryVector.Value
+,
+			QueryVectorBuilder = propQueryVectorBuilder.Value
+,
+			Similarity = propSimilarity.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, KnnSearch value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropField, value.Field);
+		writer.WriteProperty(options, PropFilter, value.Filter, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query>?, Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query>));
+		writer.WriteProperty(options, PropInnerHits, value.InnerHits);
+		writer.WriteProperty(options, Propk, value.k);
+		writer.WriteProperty(options, PropNumCandidates, value.NumCandidates);
+		writer.WriteProperty(options, PropQueryVector, value.QueryVector);
+		writer.WriteProperty(options, PropQueryVectorBuilder, value.QueryVectorBuilder);
+		writer.WriteProperty(options, PropSimilarity, value.Similarity);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(KnnSearchConverter))]
 public sealed partial class KnnSearch
 {
 	/// <summary>
@@ -34,7 +149,6 @@ public sealed partial class KnnSearch
 	/// Boost value to apply to kNN scores
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("boost")]
 	public float? Boost { get; set; }
 
 	/// <summary>
@@ -42,7 +156,6 @@ public sealed partial class KnnSearch
 	/// The name of the vector field to search against
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("field")]
 	public Elastic.Clients.Elasticsearch.Serverless.Field Field { get; set; }
 
 	/// <summary>
@@ -50,8 +163,6 @@ public sealed partial class KnnSearch
 	/// Filters for the kNN search query
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("filter")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query))]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query>? Filter { get; set; }
 
 	/// <summary>
@@ -59,7 +170,6 @@ public sealed partial class KnnSearch
 	/// If defined, each search hit will contain inner hits.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("inner_hits")]
 	public Elastic.Clients.Elasticsearch.Serverless.Core.Search.InnerHits? InnerHits { get; set; }
 
 	/// <summary>
@@ -67,7 +177,6 @@ public sealed partial class KnnSearch
 	/// The final number of nearest neighbors to return as top hits
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("k")]
 	public int? k { get; set; }
 
 	/// <summary>
@@ -75,7 +184,6 @@ public sealed partial class KnnSearch
 	/// The number of nearest neighbor candidates to consider per shard
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("num_candidates")]
 	public int? NumCandidates { get; set; }
 
 	/// <summary>
@@ -83,7 +191,6 @@ public sealed partial class KnnSearch
 	/// The query vector
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("query_vector")]
 	public ICollection<float>? QueryVector { get; set; }
 
 	/// <summary>
@@ -91,7 +198,6 @@ public sealed partial class KnnSearch
 	/// The query vector builder. You must provide a query_vector_builder or query_vector, but not both.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("query_vector_builder")]
 	public Elastic.Clients.Elasticsearch.Serverless.QueryVectorBuilder? QueryVectorBuilder { get; set; }
 
 	/// <summary>
@@ -99,7 +205,6 @@ public sealed partial class KnnSearch
 	/// The minimum similarity for a vector to be considered a match
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("similarity")]
 	public float? Similarity { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/MachineLearning/AnalysisConfig.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/MachineLearning/AnalysisConfig.g.cs
index 9335a95cc9c..bccf26f4e39 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/MachineLearning/AnalysisConfig.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/MachineLearning/AnalysisConfig.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,140 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.MachineLearning;
 
+internal sealed partial class AnalysisConfigConverter : System.Text.Json.Serialization.JsonConverter<AnalysisConfig>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropBucketSpan = System.Text.Json.JsonEncodedText.Encode("bucket_span");
+	private static readonly System.Text.Json.JsonEncodedText PropCategorizationAnalyzer = System.Text.Json.JsonEncodedText.Encode("categorization_analyzer");
+	private static readonly System.Text.Json.JsonEncodedText PropCategorizationFieldName = System.Text.Json.JsonEncodedText.Encode("categorization_field_name");
+	private static readonly System.Text.Json.JsonEncodedText PropCategorizationFilters = System.Text.Json.JsonEncodedText.Encode("categorization_filters");
+	private static readonly System.Text.Json.JsonEncodedText PropDetectors = System.Text.Json.JsonEncodedText.Encode("detectors");
+	private static readonly System.Text.Json.JsonEncodedText PropInfluencers = System.Text.Json.JsonEncodedText.Encode("influencers");
+	private static readonly System.Text.Json.JsonEncodedText PropLatency = System.Text.Json.JsonEncodedText.Encode("latency");
+	private static readonly System.Text.Json.JsonEncodedText PropModelPruneWindow = System.Text.Json.JsonEncodedText.Encode("model_prune_window");
+	private static readonly System.Text.Json.JsonEncodedText PropMultivariateByFields = System.Text.Json.JsonEncodedText.Encode("multivariate_by_fields");
+	private static readonly System.Text.Json.JsonEncodedText PropPerPartitionCategorization = System.Text.Json.JsonEncodedText.Encode("per_partition_categorization");
+	private static readonly System.Text.Json.JsonEncodedText PropSummaryCountFieldName = System.Text.Json.JsonEncodedText.Encode("summary_count_field_name");
+
+	public override AnalysisConfig Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Duration?> propBucketSpan = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.CategorizationAnalyzer?> propCategorizationAnalyzer = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Field?> propCategorizationFieldName = default;
+		LocalJsonProperty<ICollection<string>?> propCategorizationFilters = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.Detector>> propDetectors = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Fields?> propInfluencers = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Duration?> propLatency = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Duration?> propModelPruneWindow = default;
+		LocalJsonProperty<bool?> propMultivariateByFields = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.PerPartitionCategorization?> propPerPartitionCategorization = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Field?> propSummaryCountFieldName = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBucketSpan.TryRead(ref reader, options, PropBucketSpan))
+			{
+				continue;
+			}
+
+			if (propCategorizationAnalyzer.TryRead(ref reader, options, PropCategorizationAnalyzer))
+			{
+				continue;
+			}
+
+			if (propCategorizationFieldName.TryRead(ref reader, options, PropCategorizationFieldName))
+			{
+				continue;
+			}
+
+			if (propCategorizationFilters.TryRead(ref reader, options, PropCategorizationFilters))
+			{
+				continue;
+			}
+
+			if (propDetectors.TryRead(ref reader, options, PropDetectors))
+			{
+				continue;
+			}
+
+			if (propInfluencers.TryRead(ref reader, options, PropInfluencers, typeof(FieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propLatency.TryRead(ref reader, options, PropLatency))
+			{
+				continue;
+			}
+
+			if (propModelPruneWindow.TryRead(ref reader, options, PropModelPruneWindow))
+			{
+				continue;
+			}
+
+			if (propMultivariateByFields.TryRead(ref reader, options, PropMultivariateByFields))
+			{
+				continue;
+			}
+
+			if (propPerPartitionCategorization.TryRead(ref reader, options, PropPerPartitionCategorization))
+			{
+				continue;
+			}
+
+			if (propSummaryCountFieldName.TryRead(ref reader, options, PropSummaryCountFieldName))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new AnalysisConfig
+		{
+			BucketSpan = propBucketSpan.Value
+,
+			CategorizationAnalyzer = propCategorizationAnalyzer.Value
+,
+			CategorizationFieldName = propCategorizationFieldName.Value
+,
+			CategorizationFilters = propCategorizationFilters.Value
+,
+			Detectors = propDetectors.Value
+,
+			Influencers = propInfluencers.Value
+,
+			Latency = propLatency.Value
+,
+			ModelPruneWindow = propModelPruneWindow.Value
+,
+			MultivariateByFields = propMultivariateByFields.Value
+,
+			PerPartitionCategorization = propPerPartitionCategorization.Value
+,
+			SummaryCountFieldName = propSummaryCountFieldName.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, AnalysisConfig value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBucketSpan, value.BucketSpan);
+		writer.WriteProperty(options, PropCategorizationAnalyzer, value.CategorizationAnalyzer);
+		writer.WriteProperty(options, PropCategorizationFieldName, value.CategorizationFieldName);
+		writer.WriteProperty(options, PropCategorizationFilters, value.CategorizationFilters);
+		writer.WriteProperty(options, PropDetectors, value.Detectors);
+		writer.WriteProperty(options, PropInfluencers, value.Influencers, typeof(FieldsMarker));
+		writer.WriteProperty(options, PropLatency, value.Latency);
+		writer.WriteProperty(options, PropModelPruneWindow, value.ModelPruneWindow);
+		writer.WriteProperty(options, PropMultivariateByFields, value.MultivariateByFields);
+		writer.WriteProperty(options, PropPerPartitionCategorization, value.PerPartitionCategorization);
+		writer.WriteProperty(options, PropSummaryCountFieldName, value.SummaryCountFieldName);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(AnalysisConfigConverter))]
 public sealed partial class AnalysisConfig
 {
 	/// <summary>
@@ -35,7 +170,6 @@ public sealed partial class AnalysisConfig
 	/// whole number of buckets in one day. If the anomaly detection job uses a datafeed with aggregations, this value must also be divisible by the interval of the date histogram aggregation.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("bucket_span")]
 	public Elastic.Clients.Elasticsearch.Serverless.Duration? BucketSpan { get; set; }
 
 	/// <summary>
@@ -43,7 +177,6 @@ public sealed partial class AnalysisConfig
 	/// If <c>categorization_field_name</c> is specified, you can also define the analyzer that is used to interpret the categorization field. This property cannot be used at the same time as <c>categorization_filters</c>. The categorization analyzer specifies how the <c>categorization_field</c> is interpreted by the categorization process. The <c>categorization_analyzer</c> field can be specified either as a string or as an object. If it is a string, it must refer to a built-in analyzer or one added by another plugin.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("categorization_analyzer")]
 	public Elastic.Clients.Elasticsearch.Serverless.MachineLearning.CategorizationAnalyzer? CategorizationAnalyzer { get; set; }
 
 	/// <summary>
@@ -51,7 +184,6 @@ public sealed partial class AnalysisConfig
 	/// If this property is specified, the values of the specified field will be categorized. The resulting categories must be used in a detector by setting <c>by_field_name</c>, <c>over_field_name</c>, or <c>partition_field_name</c> to the keyword <c>mlcategory</c>.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("categorization_field_name")]
 	public Elastic.Clients.Elasticsearch.Serverless.Field? CategorizationFieldName { get; set; }
 
 	/// <summary>
@@ -59,7 +191,6 @@ public sealed partial class AnalysisConfig
 	/// If <c>categorization_field_name</c> is specified, you can also define optional filters. This property expects an array of regular expressions. The expressions are used to filter out matching sequences from the categorization field values. You can use this functionality to fine tune the categorization by excluding sequences from consideration when categories are defined. For example, you can exclude SQL statements that appear in your log files. This property cannot be used at the same time as <c>categorization_analyzer</c>. If you only want to define simple regular expression filters that are applied prior to tokenization, setting this property is the easiest method. If you also want to customize the tokenizer or post-tokenization filtering, use the <c>categorization_analyzer</c> property instead and include the filters as pattern_replace character filters. The effect is exactly the same.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("categorization_filters")]
 	public ICollection<string>? CategorizationFilters { get; set; }
 
 	/// <summary>
@@ -67,7 +198,6 @@ public sealed partial class AnalysisConfig
 	/// Detector configuration objects specify which data fields a job analyzes. They also specify which analytical functions are used. You can specify multiple detectors for a job. If the detectors array does not contain at least one detector, no analysis can occur and an error is returned.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("detectors")]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.Detector> Detectors { get; set; }
 
 	/// <summary>
@@ -75,8 +205,6 @@ public sealed partial class AnalysisConfig
 	/// A comma separated list of influencer field names. Typically these can be the by, over, or partition fields that are used in the detector configuration. You might also want to use a field name that is not specifically named in a detector, but is available as part of the input data. When you use multiple detectors, the use of influencers is recommended as it aggregates results for each influencer entity.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("influencers")]
-	[JsonConverter(typeof(FieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Serverless.Fields? Influencers { get; set; }
 
 	/// <summary>
@@ -84,7 +212,6 @@ public sealed partial class AnalysisConfig
 	/// The size of the window in which to expect data that is out of time order. If you specify a non-zero value, it must be greater than or equal to one second. NOTE: Latency is applicable only when you send data by using the post data API.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("latency")]
 	public Elastic.Clients.Elasticsearch.Serverless.Duration? Latency { get; set; }
 
 	/// <summary>
@@ -92,7 +219,6 @@ public sealed partial class AnalysisConfig
 	/// Advanced configuration option. Affects the pruning of models that have not been updated for the given time duration. The value must be set to a multiple of the <c>bucket_span</c>. If set too low, important information may be removed from the model. For jobs created in 8.1 and later, the default value is the greater of <c>30d</c> or 20 times <c>bucket_span</c>.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("model_prune_window")]
 	public Elastic.Clients.Elasticsearch.Serverless.Duration? ModelPruneWindow { get; set; }
 
 	/// <summary>
@@ -100,7 +226,6 @@ public sealed partial class AnalysisConfig
 	/// This functionality is reserved for internal use. It is not supported for use in customer environments and is not subject to the support SLA of official GA features. If set to <c>true</c>, the analysis will automatically find correlations between metrics for a given by field value and report anomalies when those correlations cease to hold. For example, suppose CPU and memory usage on host A is usually highly correlated with the same metrics on host B. Perhaps this correlation occurs because they are running a load-balanced application. If you enable this property, anomalies will be reported when, for example, CPU usage on host A is high and the value of CPU usage on host B is low. That is to say, you’ll see an anomaly when the CPU of host A is unusual given the CPU of host B. To use the <c>multivariate_by_fields</c> property, you must also specify <c>by_field_name</c> in your detector.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("multivariate_by_fields")]
 	public bool? MultivariateByFields { get; set; }
 
 	/// <summary>
@@ -108,7 +233,6 @@ public sealed partial class AnalysisConfig
 	/// Settings related to how categorization interacts with partition fields.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("per_partition_categorization")]
 	public Elastic.Clients.Elasticsearch.Serverless.MachineLearning.PerPartitionCategorization? PerPartitionCategorization { get; set; }
 
 	/// <summary>
@@ -116,7 +240,6 @@ public sealed partial class AnalysisConfig
 	/// If this property is specified, the data that is fed to the job is expected to be pre-summarized. This property value is the name of the field that contains the count of raw data points that have been summarized. The same <c>summary_count_field_name</c> applies to all detectors in the job. NOTE: The <c>summary_count_field_name</c> property cannot be used with the <c>metric</c> function.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("summary_count_field_name")]
 	public Elastic.Clients.Elasticsearch.Serverless.Field? SummaryCountFieldName { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/MachineLearning/Datafeed.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/MachineLearning/Datafeed.g.cs
index 2b8886a2e00..048956944d9 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/MachineLearning/Datafeed.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/MachineLearning/Datafeed.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,137 +28,187 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.MachineLearning;
 
-internal sealed partial class DatafeedConverter : JsonConverter<Datafeed>
+internal sealed partial class DatafeedConverter : System.Text.Json.Serialization.JsonConverter<Datafeed>
 {
-	public override Datafeed Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations1 = System.Text.Json.JsonEncodedText.Encode("aggs");
+	private static readonly System.Text.Json.JsonEncodedText PropAuthorization = System.Text.Json.JsonEncodedText.Encode("authorization");
+	private static readonly System.Text.Json.JsonEncodedText PropChunkingConfig = System.Text.Json.JsonEncodedText.Encode("chunking_config");
+	private static readonly System.Text.Json.JsonEncodedText PropDatafeedId = System.Text.Json.JsonEncodedText.Encode("datafeed_id");
+	private static readonly System.Text.Json.JsonEncodedText PropDelayedDataCheckConfig = System.Text.Json.JsonEncodedText.Encode("delayed_data_check_config");
+	private static readonly System.Text.Json.JsonEncodedText PropFrequency = System.Text.Json.JsonEncodedText.Encode("frequency");
+	private static readonly System.Text.Json.JsonEncodedText PropIndexes = System.Text.Json.JsonEncodedText.Encode("indexes");
+	private static readonly System.Text.Json.JsonEncodedText PropIndices = System.Text.Json.JsonEncodedText.Encode("indices");
+	private static readonly System.Text.Json.JsonEncodedText PropIndicesOptions = System.Text.Json.JsonEncodedText.Encode("indices_options");
+	private static readonly System.Text.Json.JsonEncodedText PropJobId = System.Text.Json.JsonEncodedText.Encode("job_id");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxEmptySearches = System.Text.Json.JsonEncodedText.Encode("max_empty_searches");
+	private static readonly System.Text.Json.JsonEncodedText PropQuery = System.Text.Json.JsonEncodedText.Encode("query");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryDelay = System.Text.Json.JsonEncodedText.Encode("query_delay");
+	private static readonly System.Text.Json.JsonEncodedText PropRuntimeMappings = System.Text.Json.JsonEncodedText.Encode("runtime_mappings");
+	private static readonly System.Text.Json.JsonEncodedText PropScriptFields = System.Text.Json.JsonEncodedText.Encode("script_fields");
+	private static readonly System.Text.Json.JsonEncodedText PropScrollSize = System.Text.Json.JsonEncodedText.Encode("scroll_size");
+
+	public override Datafeed Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.Aggregation>? aggregations = default;
-		Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DatafeedAuthorization? authorization = default;
-		Elastic.Clients.Elasticsearch.Serverless.MachineLearning.ChunkingConfig? chunkingConfig = default;
-		string datafeedId = default;
-		Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DelayedDataCheckConfig delayedDataCheckConfig = default;
-		Elastic.Clients.Elasticsearch.Serverless.Duration? frequency = default;
-		IReadOnlyCollection<string>? indexes = default;
-		IReadOnlyCollection<string> indices = default;
-		Elastic.Clients.Elasticsearch.Serverless.IndicesOptions? indicesOptions = default;
-		string jobId = default;
-		int? maxEmptySearches = default;
-		Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query query = default;
-		Elastic.Clients.Elasticsearch.Serverless.Duration? queryDelay = default;
-		IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Mapping.RuntimeField>? runtimeMappings = default;
-		IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.ScriptField>? scriptFields = default;
-		int? scrollSize = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.Aggregation>?> propAggregations = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DatafeedAuthorization?> propAuthorization = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.ChunkingConfig?> propChunkingConfig = default;
+		LocalJsonProperty<string> propDatafeedId = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DelayedDataCheckConfig> propDelayedDataCheckConfig = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Duration?> propFrequency = default;
+		LocalJsonProperty<IReadOnlyCollection<string>?> propIndexes = default;
+		LocalJsonProperty<IReadOnlyCollection<string>> propIndices = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.IndicesOptions?> propIndicesOptions = default;
+		LocalJsonProperty<string> propJobId = default;
+		LocalJsonProperty<int?> propMaxEmptySearches = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query> propQuery = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Duration?> propQueryDelay = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Mapping.RuntimeField>?> propRuntimeMappings = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.ScriptField>?> propScriptFields = default;
+		LocalJsonProperty<int?> propScrollSize = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
-			{
-				var property = reader.GetString();
-				if (property == "aggregations" || property == "aggs")
-				{
-					aggregations = JsonSerializer.Deserialize<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.Aggregation>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "authorization")
-				{
-					authorization = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DatafeedAuthorization?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "chunking_config")
-				{
-					chunkingConfig = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.ChunkingConfig?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "datafeed_id")
-				{
-					datafeedId = JsonSerializer.Deserialize<string>(ref reader, options);
-					continue;
-				}
-
-				if (property == "delayed_data_check_config")
-				{
-					delayedDataCheckConfig = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DelayedDataCheckConfig>(ref reader, options);
-					continue;
-				}
-
-				if (property == "frequency")
-				{
-					frequency = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Duration?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "indexes")
-				{
-					indexes = JsonSerializer.Deserialize<IReadOnlyCollection<string>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "indices")
-				{
-					indices = JsonSerializer.Deserialize<IReadOnlyCollection<string>>(ref reader, options);
-					continue;
-				}
-
-				if (property == "indices_options")
-				{
-					indicesOptions = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.IndicesOptions?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "job_id")
-				{
-					jobId = JsonSerializer.Deserialize<string>(ref reader, options);
-					continue;
-				}
-
-				if (property == "max_empty_searches")
-				{
-					maxEmptySearches = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "query")
-				{
-					query = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query>(ref reader, options);
-					continue;
-				}
-
-				if (property == "query_delay")
-				{
-					queryDelay = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Duration?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "runtime_mappings")
-				{
-					runtimeMappings = JsonSerializer.Deserialize<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Mapping.RuntimeField>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "script_fields")
-				{
-					scriptFields = JsonSerializer.Deserialize<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.ScriptField>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "scroll_size")
-				{
-					scrollSize = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
+			if (propAggregations.TryRead(ref reader, options, PropAggregations) || propAggregations.TryRead(ref reader, options, PropAggregations1))
+			{
+				continue;
+			}
+
+			if (propAuthorization.TryRead(ref reader, options, PropAuthorization))
+			{
+				continue;
+			}
+
+			if (propChunkingConfig.TryRead(ref reader, options, PropChunkingConfig))
+			{
+				continue;
+			}
+
+			if (propDatafeedId.TryRead(ref reader, options, PropDatafeedId))
+			{
+				continue;
+			}
+
+			if (propDelayedDataCheckConfig.TryRead(ref reader, options, PropDelayedDataCheckConfig))
+			{
+				continue;
+			}
+
+			if (propFrequency.TryRead(ref reader, options, PropFrequency))
+			{
+				continue;
+			}
+
+			if (propIndexes.TryRead(ref reader, options, PropIndexes))
+			{
+				continue;
+			}
+
+			if (propIndices.TryRead(ref reader, options, PropIndices))
+			{
+				continue;
+			}
+
+			if (propIndicesOptions.TryRead(ref reader, options, PropIndicesOptions))
+			{
+				continue;
+			}
+
+			if (propJobId.TryRead(ref reader, options, PropJobId))
+			{
+				continue;
+			}
+
+			if (propMaxEmptySearches.TryRead(ref reader, options, PropMaxEmptySearches))
+			{
+				continue;
+			}
+
+			if (propQuery.TryRead(ref reader, options, PropQuery))
+			{
+				continue;
+			}
+
+			if (propQueryDelay.TryRead(ref reader, options, PropQueryDelay))
+			{
+				continue;
+			}
+
+			if (propRuntimeMappings.TryRead(ref reader, options, PropRuntimeMappings))
+			{
+				continue;
+			}
+
+			if (propScriptFields.TryRead(ref reader, options, PropScriptFields))
+			{
+				continue;
+			}
+
+			if (propScrollSize.TryRead(ref reader, options, PropScrollSize))
+			{
+				continue;
 			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		return new Datafeed { Aggregations = aggregations, Authorization = authorization, ChunkingConfig = chunkingConfig, DatafeedId = datafeedId, DelayedDataCheckConfig = delayedDataCheckConfig, Frequency = frequency, Indexes = indexes, Indices = indices, IndicesOptions = indicesOptions, JobId = jobId, MaxEmptySearches = maxEmptySearches, Query = query, QueryDelay = queryDelay, RuntimeMappings = runtimeMappings, ScriptFields = scriptFields, ScrollSize = scrollSize };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new Datafeed
+		{
+			Aggregations = propAggregations.Value
+,
+			Authorization = propAuthorization.Value
+,
+			ChunkingConfig = propChunkingConfig.Value
+,
+			DatafeedId = propDatafeedId.Value
+,
+			DelayedDataCheckConfig = propDelayedDataCheckConfig.Value
+,
+			Frequency = propFrequency.Value
+,
+			Indexes = propIndexes.Value
+,
+			Indices = propIndices.Value
+,
+			IndicesOptions = propIndicesOptions.Value
+,
+			JobId = propJobId.Value
+,
+			MaxEmptySearches = propMaxEmptySearches.Value
+,
+			Query = propQuery.Value
+,
+			QueryDelay = propQueryDelay.Value
+,
+			RuntimeMappings = propRuntimeMappings.Value
+,
+			ScriptFields = propScriptFields.Value
+,
+			ScrollSize = propScrollSize.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, Datafeed value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, Datafeed value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'Datafeed' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAggregations, value.Aggregations);
+		writer.WriteProperty(options, PropAuthorization, value.Authorization);
+		writer.WriteProperty(options, PropChunkingConfig, value.ChunkingConfig);
+		writer.WriteProperty(options, PropDatafeedId, value.DatafeedId);
+		writer.WriteProperty(options, PropDelayedDataCheckConfig, value.DelayedDataCheckConfig);
+		writer.WriteProperty(options, PropFrequency, value.Frequency);
+		writer.WriteProperty(options, PropIndexes, value.Indexes);
+		writer.WriteProperty(options, PropIndices, value.Indices);
+		writer.WriteProperty(options, PropIndicesOptions, value.IndicesOptions);
+		writer.WriteProperty(options, PropJobId, value.JobId);
+		writer.WriteProperty(options, PropMaxEmptySearches, value.MaxEmptySearches);
+		writer.WriteProperty(options, PropQuery, value.Query);
+		writer.WriteProperty(options, PropQueryDelay, value.QueryDelay);
+		writer.WriteProperty(options, PropRuntimeMappings, value.RuntimeMappings);
+		writer.WriteProperty(options, PropScriptFields, value.ScriptFields);
+		writer.WriteProperty(options, PropScrollSize, value.ScrollSize);
+		writer.WriteEndObject();
 	}
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/MachineLearning/DatafeedConfig.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/MachineLearning/DatafeedConfig.g.cs
index fabe268dcb2..039734032c6 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/MachineLearning/DatafeedConfig.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/MachineLearning/DatafeedConfig.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,194 +28,167 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.MachineLearning;
 
-internal sealed partial class DatafeedConfigConverter : JsonConverter<DatafeedConfig>
+internal sealed partial class DatafeedConfigConverter : System.Text.Json.Serialization.JsonConverter<DatafeedConfig>
 {
-	public override DatafeedConfig Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations1 = System.Text.Json.JsonEncodedText.Encode("aggs");
+	private static readonly System.Text.Json.JsonEncodedText PropChunkingConfig = System.Text.Json.JsonEncodedText.Encode("chunking_config");
+	private static readonly System.Text.Json.JsonEncodedText PropDatafeedId = System.Text.Json.JsonEncodedText.Encode("datafeed_id");
+	private static readonly System.Text.Json.JsonEncodedText PropDelayedDataCheckConfig = System.Text.Json.JsonEncodedText.Encode("delayed_data_check_config");
+	private static readonly System.Text.Json.JsonEncodedText PropFrequency = System.Text.Json.JsonEncodedText.Encode("frequency");
+	private static readonly System.Text.Json.JsonEncodedText PropIndices = System.Text.Json.JsonEncodedText.Encode("indices");
+	private static readonly System.Text.Json.JsonEncodedText PropIndices1 = System.Text.Json.JsonEncodedText.Encode("indexes");
+	private static readonly System.Text.Json.JsonEncodedText PropIndicesOptions = System.Text.Json.JsonEncodedText.Encode("indices_options");
+	private static readonly System.Text.Json.JsonEncodedText PropJobId = System.Text.Json.JsonEncodedText.Encode("job_id");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxEmptySearches = System.Text.Json.JsonEncodedText.Encode("max_empty_searches");
+	private static readonly System.Text.Json.JsonEncodedText PropQuery = System.Text.Json.JsonEncodedText.Encode("query");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryDelay = System.Text.Json.JsonEncodedText.Encode("query_delay");
+	private static readonly System.Text.Json.JsonEncodedText PropRuntimeMappings = System.Text.Json.JsonEncodedText.Encode("runtime_mappings");
+	private static readonly System.Text.Json.JsonEncodedText PropScriptFields = System.Text.Json.JsonEncodedText.Encode("script_fields");
+	private static readonly System.Text.Json.JsonEncodedText PropScrollSize = System.Text.Json.JsonEncodedText.Encode("scroll_size");
+
+	public override DatafeedConfig Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		var variant = new DatafeedConfig();
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.Aggregation>?> propAggregations = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.ChunkingConfig?> propChunkingConfig = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Id?> propDatafeedId = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DelayedDataCheckConfig?> propDelayedDataCheckConfig = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Duration?> propFrequency = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Indices?> propIndices = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.IndicesOptions?> propIndicesOptions = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Id?> propJobId = default;
+		LocalJsonProperty<int?> propMaxEmptySearches = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query?> propQuery = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Duration?> propQueryDelay = default;
+		LocalJsonProperty<IDictionary<Elastic.Clients.Elasticsearch.Serverless.Field, Elastic.Clients.Elasticsearch.Serverless.Mapping.RuntimeField>?> propRuntimeMappings = default;
+		LocalJsonProperty<IDictionary<string, Elastic.Clients.Elasticsearch.Serverless.ScriptField>?> propScriptFields = default;
+		LocalJsonProperty<int?> propScrollSize = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propAggregations.TryRead(ref reader, options, PropAggregations) || propAggregations.TryRead(ref reader, options, PropAggregations1))
 			{
-				var property = reader.GetString();
-				if (property == "aggregations" || property == "aggs")
-				{
-					variant.Aggregations = JsonSerializer.Deserialize<IDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.Aggregation>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "chunking_config")
-				{
-					variant.ChunkingConfig = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.ChunkingConfig?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "datafeed_id")
-				{
-					variant.DatafeedId = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Id?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "delayed_data_check_config")
-				{
-					variant.DelayedDataCheckConfig = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DelayedDataCheckConfig?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "frequency")
-				{
-					variant.Frequency = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Duration?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "indices" || property == "indexes")
-				{
-					variant.Indices = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Indices?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "indices_options")
-				{
-					variant.IndicesOptions = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.IndicesOptions?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "job_id")
-				{
-					variant.JobId = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Id?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "max_empty_searches")
-				{
-					variant.MaxEmptySearches = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "query")
-				{
-					variant.Query = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "query_delay")
-				{
-					variant.QueryDelay = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Duration?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "runtime_mappings")
-				{
-					variant.RuntimeMappings = JsonSerializer.Deserialize<IDictionary<Elastic.Clients.Elasticsearch.Serverless.Field, Elastic.Clients.Elasticsearch.Serverless.Mapping.RuntimeField>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "script_fields")
-				{
-					variant.ScriptFields = JsonSerializer.Deserialize<IDictionary<string, Elastic.Clients.Elasticsearch.Serverless.ScriptField>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "scroll_size")
-				{
-					variant.ScrollSize = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
+				continue;
 			}
-		}
 
-		return variant;
-	}
+			if (propChunkingConfig.TryRead(ref reader, options, PropChunkingConfig))
+			{
+				continue;
+			}
 
-	public override void Write(Utf8JsonWriter writer, DatafeedConfig value, JsonSerializerOptions options)
-	{
-		writer.WriteStartObject();
-		if (value.Aggregations is not null)
-		{
-			writer.WritePropertyName("aggregations");
-			JsonSerializer.Serialize(writer, value.Aggregations, options);
-		}
+			if (propDatafeedId.TryRead(ref reader, options, PropDatafeedId))
+			{
+				continue;
+			}
 
-		if (value.ChunkingConfig is not null)
-		{
-			writer.WritePropertyName("chunking_config");
-			JsonSerializer.Serialize(writer, value.ChunkingConfig, options);
-		}
+			if (propDelayedDataCheckConfig.TryRead(ref reader, options, PropDelayedDataCheckConfig))
+			{
+				continue;
+			}
 
-		if (value.DatafeedId is not null)
-		{
-			writer.WritePropertyName("datafeed_id");
-			JsonSerializer.Serialize(writer, value.DatafeedId, options);
-		}
+			if (propFrequency.TryRead(ref reader, options, PropFrequency))
+			{
+				continue;
+			}
 
-		if (value.DelayedDataCheckConfig is not null)
-		{
-			writer.WritePropertyName("delayed_data_check_config");
-			JsonSerializer.Serialize(writer, value.DelayedDataCheckConfig, options);
-		}
+			if (propIndices.TryRead(ref reader, options, PropIndices) || propIndices.TryRead(ref reader, options, PropIndices1))
+			{
+				continue;
+			}
 
-		if (value.Frequency is not null)
-		{
-			writer.WritePropertyName("frequency");
-			JsonSerializer.Serialize(writer, value.Frequency, options);
-		}
+			if (propIndicesOptions.TryRead(ref reader, options, PropIndicesOptions))
+			{
+				continue;
+			}
 
-		if (value.Indices is not null)
-		{
-			writer.WritePropertyName("indices");
-			JsonSerializer.Serialize(writer, value.Indices, options);
-		}
+			if (propJobId.TryRead(ref reader, options, PropJobId))
+			{
+				continue;
+			}
 
-		if (value.IndicesOptions is not null)
-		{
-			writer.WritePropertyName("indices_options");
-			JsonSerializer.Serialize(writer, value.IndicesOptions, options);
-		}
+			if (propMaxEmptySearches.TryRead(ref reader, options, PropMaxEmptySearches))
+			{
+				continue;
+			}
 
-		if (value.JobId is not null)
-		{
-			writer.WritePropertyName("job_id");
-			JsonSerializer.Serialize(writer, value.JobId, options);
-		}
+			if (propQuery.TryRead(ref reader, options, PropQuery))
+			{
+				continue;
+			}
 
-		if (value.MaxEmptySearches.HasValue)
-		{
-			writer.WritePropertyName("max_empty_searches");
-			writer.WriteNumberValue(value.MaxEmptySearches.Value);
-		}
+			if (propQueryDelay.TryRead(ref reader, options, PropQueryDelay))
+			{
+				continue;
+			}
 
-		if (value.Query is not null)
-		{
-			writer.WritePropertyName("query");
-			JsonSerializer.Serialize(writer, value.Query, options);
-		}
+			if (propRuntimeMappings.TryRead(ref reader, options, PropRuntimeMappings))
+			{
+				continue;
+			}
 
-		if (value.QueryDelay is not null)
-		{
-			writer.WritePropertyName("query_delay");
-			JsonSerializer.Serialize(writer, value.QueryDelay, options);
-		}
+			if (propScriptFields.TryRead(ref reader, options, PropScriptFields))
+			{
+				continue;
+			}
 
-		if (value.RuntimeMappings is not null)
-		{
-			writer.WritePropertyName("runtime_mappings");
-			JsonSerializer.Serialize(writer, value.RuntimeMappings, options);
-		}
+			if (propScrollSize.TryRead(ref reader, options, PropScrollSize))
+			{
+				continue;
+			}
 
-		if (value.ScriptFields is not null)
-		{
-			writer.WritePropertyName("script_fields");
-			JsonSerializer.Serialize(writer, value.ScriptFields, options);
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		if (value.ScrollSize.HasValue)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DatafeedConfig
 		{
-			writer.WritePropertyName("scroll_size");
-			writer.WriteNumberValue(value.ScrollSize.Value);
-		}
+			Aggregations = propAggregations.Value
+,
+			ChunkingConfig = propChunkingConfig.Value
+,
+			DatafeedId = propDatafeedId.Value
+,
+			DelayedDataCheckConfig = propDelayedDataCheckConfig.Value
+,
+			Frequency = propFrequency.Value
+,
+			Indices = propIndices.Value
+,
+			IndicesOptions = propIndicesOptions.Value
+,
+			JobId = propJobId.Value
+,
+			MaxEmptySearches = propMaxEmptySearches.Value
+,
+			Query = propQuery.Value
+,
+			QueryDelay = propQueryDelay.Value
+,
+			RuntimeMappings = propRuntimeMappings.Value
+,
+			ScriptFields = propScriptFields.Value
+,
+			ScrollSize = propScrollSize.Value
+		};
+	}
 
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DatafeedConfig value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAggregations, value.Aggregations);
+		writer.WriteProperty(options, PropChunkingConfig, value.ChunkingConfig);
+		writer.WriteProperty(options, PropDatafeedId, value.DatafeedId);
+		writer.WriteProperty(options, PropDelayedDataCheckConfig, value.DelayedDataCheckConfig);
+		writer.WriteProperty(options, PropFrequency, value.Frequency);
+		writer.WriteProperty(options, PropIndices, value.Indices);
+		writer.WriteProperty(options, PropIndicesOptions, value.IndicesOptions);
+		writer.WriteProperty(options, PropJobId, value.JobId);
+		writer.WriteProperty(options, PropMaxEmptySearches, value.MaxEmptySearches);
+		writer.WriteProperty(options, PropQuery, value.Query);
+		writer.WriteProperty(options, PropQueryDelay, value.QueryDelay);
+		writer.WriteProperty(options, PropRuntimeMappings, value.RuntimeMappings);
+		writer.WriteProperty(options, PropScriptFields, value.ScriptFields);
+		writer.WriteProperty(options, PropScrollSize, value.ScrollSize);
 		writer.WriteEndObject();
 	}
 }
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/MachineLearning/DataframeAnalysis.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/MachineLearning/DataframeAnalysis.g.cs
index e6b6480fc24..46d74d41e9a 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/MachineLearning/DataframeAnalysis.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/MachineLearning/DataframeAnalysis.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -39,12 +40,16 @@ internal DataframeAnalysis(string variantName, object variant)
 			throw new ArgumentNullException(nameof(variant));
 		if (string.IsNullOrWhiteSpace(variantName))
 			throw new ArgumentException("Variant name must not be empty or whitespace.");
-		VariantName = variantName;
+		VariantType = variantName;
 		Variant = variant;
 	}
 
-	internal object Variant { get; }
-	internal string VariantName { get; }
+	internal DataframeAnalysis()
+	{
+	}
+
+	public object Variant { get; internal set; }
+	public string VariantType { get; internal set; }
 
 	public static DataframeAnalysis Classification(Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeAnalysisClassification dataframeAnalysisClassification) => new DataframeAnalysis("classification", dataframeAnalysisClassification);
 	public static DataframeAnalysis OutlierDetection(Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeAnalysisOutlierDetection dataframeAnalysisOutlierDetection) => new DataframeAnalysis("outlier_detection", dataframeAnalysisOutlierDetection);
@@ -63,77 +68,68 @@ public bool TryGet<T>([NotNullWhen(true)] out T? result) where T : class
 	}
 }
 
-internal sealed partial class DataframeAnalysisConverter : JsonConverter<DataframeAnalysis>
+internal sealed partial class DataframeAnalysisConverter : System.Text.Json.Serialization.JsonConverter<DataframeAnalysis>
 {
-	public override DataframeAnalysis Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-		{
-			throw new JsonException("Expected start token.");
-		}
+	private static readonly System.Text.Json.JsonEncodedText VariantClassification = System.Text.Json.JsonEncodedText.Encode("classification");
+	private static readonly System.Text.Json.JsonEncodedText VariantOutlierDetection = System.Text.Json.JsonEncodedText.Encode("outlier_detection");
+	private static readonly System.Text.Json.JsonEncodedText VariantRegression = System.Text.Json.JsonEncodedText.Encode("regression");
 
-		object? variantValue = default;
-		string? variantNameValue = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+	public override DataframeAnalysis Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		var variantType = string.Empty;
+		object? variant = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
+			if (reader.ValueTextEquals(VariantClassification))
 			{
-				throw new JsonException("Expected a property name token.");
-			}
-
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token representing the name of an Elasticsearch field.");
-			}
-
-			var propertyName = reader.GetString();
-			reader.Read();
-			if (propertyName == "classification")
-			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeAnalysisClassification?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantClassification.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeAnalysisClassification?>(options);
 				continue;
 			}
 
-			if (propertyName == "outlier_detection")
+			if (reader.ValueTextEquals(VariantOutlierDetection))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeAnalysisOutlierDetection?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantOutlierDetection.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeAnalysisOutlierDetection?>(options);
 				continue;
 			}
 
-			if (propertyName == "regression")
+			if (reader.ValueTextEquals(VariantRegression))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeAnalysisRegression?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantRegression.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeAnalysisRegression?>(options);
 				continue;
 			}
 
-			throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'DataframeAnalysis' from the response.");
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		var result = new DataframeAnalysis(variantNameValue, variantValue);
-		return result;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DataframeAnalysis { VariantType = variantType, Variant = variant };
 	}
 
-	public override void Write(Utf8JsonWriter writer, DataframeAnalysis value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DataframeAnalysis value, System.Text.Json.JsonSerializerOptions options)
 	{
 		writer.WriteStartObject();
-		if (value.VariantName is not null && value.Variant is not null)
+		switch (value.VariantType)
 		{
-			writer.WritePropertyName(value.VariantName);
-			switch (value.VariantName)
-			{
-				case "classification":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeAnalysisClassification>(writer, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeAnalysisClassification)value.Variant, options);
-					break;
-				case "outlier_detection":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeAnalysisOutlierDetection>(writer, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeAnalysisOutlierDetection)value.Variant, options);
-					break;
-				case "regression":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeAnalysisRegression>(writer, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeAnalysisRegression)value.Variant, options);
-					break;
-			}
+			case "":
+				break;
+			case "classification":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeAnalysisClassification?)value.Variant);
+				break;
+			case "outlier_detection":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeAnalysisOutlierDetection?)value.Variant);
+				break;
+			case "regression":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeAnalysisRegression?)value.Variant);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.VariantType}' is not supported for type '{nameof(DataframeAnalysis)}'.");
 		}
 
 		writer.WriteEndObject();
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/MachineLearning/DataframeAnalysisAnalyzedFields.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/MachineLearning/DataframeAnalysisAnalyzedFields.g.cs
index c4ec45eaae3..c61237b0f5c 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/MachineLearning/DataframeAnalysisAnalyzedFields.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/MachineLearning/DataframeAnalysisAnalyzedFields.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,56 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.MachineLearning;
 
+internal sealed partial class DataframeAnalysisAnalyzedFieldsConverter : System.Text.Json.Serialization.JsonConverter<DataframeAnalysisAnalyzedFields>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropExcludes = System.Text.Json.JsonEncodedText.Encode("excludes");
+	private static readonly System.Text.Json.JsonEncodedText PropIncludes = System.Text.Json.JsonEncodedText.Encode("includes");
+
+	public override DataframeAnalysisAnalyzedFields Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		if (reader.TokenType is not System.Text.Json.JsonTokenType.StartObject)
+		{
+			var value = reader.ReadValue<ICollection<string>>(options);
+			return new DataframeAnalysisAnalyzedFields { Includes = value };
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>> propExcludes = default;
+		LocalJsonProperty<ICollection<string>> propIncludes = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propExcludes.TryRead(ref reader, options, PropExcludes))
+			{
+				continue;
+			}
+
+			if (propIncludes.TryRead(ref reader, options, PropIncludes))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DataframeAnalysisAnalyzedFields
+		{
+			Excludes = propExcludes.Value
+,
+			Includes = propIncludes.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DataframeAnalysisAnalyzedFields value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropExcludes, value.Excludes);
+		writer.WriteProperty(options, PropIncludes, value.Includes);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DataframeAnalysisAnalyzedFieldsConverter))]
 public sealed partial class DataframeAnalysisAnalyzedFields
 {
 	/// <summary>
@@ -34,7 +85,6 @@ public sealed partial class DataframeAnalysisAnalyzedFields
 	/// An array of strings that defines the fields that will be included in the analysis.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("excludes")]
 	public ICollection<string> Excludes { get; set; }
 
 	/// <summary>
@@ -42,7 +92,6 @@ public sealed partial class DataframeAnalysisAnalyzedFields
 	/// An array of strings that defines the fields that will be excluded from the analysis. You do not need to add fields with unsupported data types to excludes, these fields are excluded from the analysis automatically.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("includes")]
 	public ICollection<string> Includes { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/MachineLearning/DataframeAnalysisClassification.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/MachineLearning/DataframeAnalysisClassification.g.cs
index 812e24662e2..533a32dce6f 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/MachineLearning/DataframeAnalysisClassification.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/MachineLearning/DataframeAnalysisClassification.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,262 +28,226 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.MachineLearning;
 
-internal sealed partial class DataframeAnalysisClassificationConverter : JsonConverter<DataframeAnalysisClassification>
+internal sealed partial class DataframeAnalysisClassificationConverter : System.Text.Json.Serialization.JsonConverter<DataframeAnalysisClassification>
 {
-	public override DataframeAnalysisClassification Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAlpha = System.Text.Json.JsonEncodedText.Encode("alpha");
+	private static readonly System.Text.Json.JsonEncodedText PropClassAssignmentObjective = System.Text.Json.JsonEncodedText.Encode("class_assignment_objective");
+	private static readonly System.Text.Json.JsonEncodedText PropDependentVariable = System.Text.Json.JsonEncodedText.Encode("dependent_variable");
+	private static readonly System.Text.Json.JsonEncodedText PropDownsampleFactor = System.Text.Json.JsonEncodedText.Encode("downsample_factor");
+	private static readonly System.Text.Json.JsonEncodedText PropEarlyStoppingEnabled = System.Text.Json.JsonEncodedText.Encode("early_stopping_enabled");
+	private static readonly System.Text.Json.JsonEncodedText PropEta = System.Text.Json.JsonEncodedText.Encode("eta");
+	private static readonly System.Text.Json.JsonEncodedText PropEtaGrowthRatePerTree = System.Text.Json.JsonEncodedText.Encode("eta_growth_rate_per_tree");
+	private static readonly System.Text.Json.JsonEncodedText PropFeatureBagFraction = System.Text.Json.JsonEncodedText.Encode("feature_bag_fraction");
+	private static readonly System.Text.Json.JsonEncodedText PropFeatureProcessors = System.Text.Json.JsonEncodedText.Encode("feature_processors");
+	private static readonly System.Text.Json.JsonEncodedText PropGamma = System.Text.Json.JsonEncodedText.Encode("gamma");
+	private static readonly System.Text.Json.JsonEncodedText PropLambda = System.Text.Json.JsonEncodedText.Encode("lambda");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxOptimizationRoundsPerHyperparameter = System.Text.Json.JsonEncodedText.Encode("max_optimization_rounds_per_hyperparameter");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxTrees = System.Text.Json.JsonEncodedText.Encode("max_trees");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxTrees1 = System.Text.Json.JsonEncodedText.Encode("maximum_number_trees");
+	private static readonly System.Text.Json.JsonEncodedText PropNumTopClasses = System.Text.Json.JsonEncodedText.Encode("num_top_classes");
+	private static readonly System.Text.Json.JsonEncodedText PropNumTopFeatureImportanceValues = System.Text.Json.JsonEncodedText.Encode("num_top_feature_importance_values");
+	private static readonly System.Text.Json.JsonEncodedText PropPredictionFieldName = System.Text.Json.JsonEncodedText.Encode("prediction_field_name");
+	private static readonly System.Text.Json.JsonEncodedText PropRandomizeSeed = System.Text.Json.JsonEncodedText.Encode("randomize_seed");
+	private static readonly System.Text.Json.JsonEncodedText PropSoftTreeDepthLimit = System.Text.Json.JsonEncodedText.Encode("soft_tree_depth_limit");
+	private static readonly System.Text.Json.JsonEncodedText PropSoftTreeDepthTolerance = System.Text.Json.JsonEncodedText.Encode("soft_tree_depth_tolerance");
+	private static readonly System.Text.Json.JsonEncodedText PropTrainingPercent = System.Text.Json.JsonEncodedText.Encode("training_percent");
+
+	public override DataframeAnalysisClassification Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		var variant = new DataframeAnalysisClassification();
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
-		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<double?> propAlpha = default;
+		LocalJsonProperty<string?> propClassAssignmentObjective = default;
+		LocalJsonProperty<string> propDependentVariable = default;
+		LocalJsonProperty<double?> propDownsampleFactor = default;
+		LocalJsonProperty<bool?> propEarlyStoppingEnabled = default;
+		LocalJsonProperty<double?> propEta = default;
+		LocalJsonProperty<double?> propEtaGrowthRatePerTree = default;
+		LocalJsonProperty<double?> propFeatureBagFraction = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeAnalysisFeatureProcessor>?> propFeatureProcessors = default;
+		LocalJsonProperty<double?> propGamma = default;
+		LocalJsonProperty<double?> propLambda = default;
+		LocalJsonProperty<int?> propMaxOptimizationRoundsPerHyperparameter = default;
+		LocalJsonProperty<int?> propMaxTrees = default;
+		LocalJsonProperty<int?> propNumTopClasses = default;
+		LocalJsonProperty<int?> propNumTopFeatureImportanceValues = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Field?> propPredictionFieldName = default;
+		LocalJsonProperty<double?> propRandomizeSeed = default;
+		LocalJsonProperty<int?> propSoftTreeDepthLimit = default;
+		LocalJsonProperty<double?> propSoftTreeDepthTolerance = default;
+		LocalJsonProperty<double?> propTrainingPercent = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAlpha.TryRead(ref reader, options, PropAlpha))
 			{
-				var property = reader.GetString();
-				if (property == "alpha")
-				{
-					variant.Alpha = JsonSerializer.Deserialize<double?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "class_assignment_objective")
-				{
-					variant.ClassAssignmentObjective = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "dependent_variable")
-				{
-					variant.DependentVariable = JsonSerializer.Deserialize<string>(ref reader, options);
-					continue;
-				}
-
-				if (property == "downsample_factor")
-				{
-					variant.DownsampleFactor = JsonSerializer.Deserialize<double?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "early_stopping_enabled")
-				{
-					variant.EarlyStoppingEnabled = JsonSerializer.Deserialize<bool?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "eta")
-				{
-					variant.Eta = JsonSerializer.Deserialize<double?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "eta_growth_rate_per_tree")
-				{
-					variant.EtaGrowthRatePerTree = JsonSerializer.Deserialize<double?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "feature_bag_fraction")
-				{
-					variant.FeatureBagFraction = JsonSerializer.Deserialize<double?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "feature_processors")
-				{
-					variant.FeatureProcessors = JsonSerializer.Deserialize<ICollection<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeAnalysisFeatureProcessor>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "gamma")
-				{
-					variant.Gamma = JsonSerializer.Deserialize<double?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "lambda")
-				{
-					variant.Lambda = JsonSerializer.Deserialize<double?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "max_optimization_rounds_per_hyperparameter")
-				{
-					variant.MaxOptimizationRoundsPerHyperparameter = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "max_trees" || property == "maximum_number_trees")
-				{
-					variant.MaxTrees = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "num_top_classes")
-				{
-					variant.NumTopClasses = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "num_top_feature_importance_values")
-				{
-					variant.NumTopFeatureImportanceValues = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "prediction_field_name")
-				{
-					variant.PredictionFieldName = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Field?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "randomize_seed")
-				{
-					variant.RandomizeSeed = JsonSerializer.Deserialize<double?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "soft_tree_depth_limit")
-				{
-					variant.SoftTreeDepthLimit = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "soft_tree_depth_tolerance")
-				{
-					variant.SoftTreeDepthTolerance = JsonSerializer.Deserialize<double?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "training_percent")
-				{
-					variant.TrainingPercent = JsonSerializer.Deserialize<double?>(ref reader, options);
-					continue;
-				}
+				continue;
 			}
-		}
 
-		return variant;
-	}
+			if (propClassAssignmentObjective.TryRead(ref reader, options, PropClassAssignmentObjective))
+			{
+				continue;
+			}
 
-	public override void Write(Utf8JsonWriter writer, DataframeAnalysisClassification value, JsonSerializerOptions options)
-	{
-		writer.WriteStartObject();
-		if (value.Alpha.HasValue)
-		{
-			writer.WritePropertyName("alpha");
-			writer.WriteNumberValue(value.Alpha.Value);
-		}
+			if (propDependentVariable.TryRead(ref reader, options, PropDependentVariable))
+			{
+				continue;
+			}
 
-		if (!string.IsNullOrEmpty(value.ClassAssignmentObjective))
-		{
-			writer.WritePropertyName("class_assignment_objective");
-			writer.WriteStringValue(value.ClassAssignmentObjective);
-		}
+			if (propDownsampleFactor.TryRead(ref reader, options, PropDownsampleFactor))
+			{
+				continue;
+			}
 
-		writer.WritePropertyName("dependent_variable");
-		writer.WriteStringValue(value.DependentVariable);
-		if (value.DownsampleFactor.HasValue)
-		{
-			writer.WritePropertyName("downsample_factor");
-			writer.WriteNumberValue(value.DownsampleFactor.Value);
-		}
+			if (propEarlyStoppingEnabled.TryRead(ref reader, options, PropEarlyStoppingEnabled))
+			{
+				continue;
+			}
 
-		if (value.EarlyStoppingEnabled.HasValue)
-		{
-			writer.WritePropertyName("early_stopping_enabled");
-			writer.WriteBooleanValue(value.EarlyStoppingEnabled.Value);
-		}
+			if (propEta.TryRead(ref reader, options, PropEta))
+			{
+				continue;
+			}
 
-		if (value.Eta.HasValue)
-		{
-			writer.WritePropertyName("eta");
-			writer.WriteNumberValue(value.Eta.Value);
-		}
+			if (propEtaGrowthRatePerTree.TryRead(ref reader, options, PropEtaGrowthRatePerTree))
+			{
+				continue;
+			}
 
-		if (value.EtaGrowthRatePerTree.HasValue)
-		{
-			writer.WritePropertyName("eta_growth_rate_per_tree");
-			writer.WriteNumberValue(value.EtaGrowthRatePerTree.Value);
-		}
+			if (propFeatureBagFraction.TryRead(ref reader, options, PropFeatureBagFraction))
+			{
+				continue;
+			}
 
-		if (value.FeatureBagFraction.HasValue)
-		{
-			writer.WritePropertyName("feature_bag_fraction");
-			writer.WriteNumberValue(value.FeatureBagFraction.Value);
-		}
+			if (propFeatureProcessors.TryRead(ref reader, options, PropFeatureProcessors))
+			{
+				continue;
+			}
 
-		if (value.FeatureProcessors is not null)
-		{
-			writer.WritePropertyName("feature_processors");
-			JsonSerializer.Serialize(writer, value.FeatureProcessors, options);
-		}
+			if (propGamma.TryRead(ref reader, options, PropGamma))
+			{
+				continue;
+			}
 
-		if (value.Gamma.HasValue)
-		{
-			writer.WritePropertyName("gamma");
-			writer.WriteNumberValue(value.Gamma.Value);
-		}
+			if (propLambda.TryRead(ref reader, options, PropLambda))
+			{
+				continue;
+			}
 
-		if (value.Lambda.HasValue)
-		{
-			writer.WritePropertyName("lambda");
-			writer.WriteNumberValue(value.Lambda.Value);
-		}
+			if (propMaxOptimizationRoundsPerHyperparameter.TryRead(ref reader, options, PropMaxOptimizationRoundsPerHyperparameter))
+			{
+				continue;
+			}
 
-		if (value.MaxOptimizationRoundsPerHyperparameter.HasValue)
-		{
-			writer.WritePropertyName("max_optimization_rounds_per_hyperparameter");
-			writer.WriteNumberValue(value.MaxOptimizationRoundsPerHyperparameter.Value);
-		}
+			if (propMaxTrees.TryRead(ref reader, options, PropMaxTrees) || propMaxTrees.TryRead(ref reader, options, PropMaxTrees1))
+			{
+				continue;
+			}
 
-		if (value.MaxTrees.HasValue)
-		{
-			writer.WritePropertyName("max_trees");
-			writer.WriteNumberValue(value.MaxTrees.Value);
-		}
+			if (propNumTopClasses.TryRead(ref reader, options, PropNumTopClasses))
+			{
+				continue;
+			}
 
-		if (value.NumTopClasses.HasValue)
-		{
-			writer.WritePropertyName("num_top_classes");
-			writer.WriteNumberValue(value.NumTopClasses.Value);
-		}
+			if (propNumTopFeatureImportanceValues.TryRead(ref reader, options, PropNumTopFeatureImportanceValues))
+			{
+				continue;
+			}
 
-		if (value.NumTopFeatureImportanceValues.HasValue)
-		{
-			writer.WritePropertyName("num_top_feature_importance_values");
-			writer.WriteNumberValue(value.NumTopFeatureImportanceValues.Value);
-		}
+			if (propPredictionFieldName.TryRead(ref reader, options, PropPredictionFieldName))
+			{
+				continue;
+			}
 
-		if (value.PredictionFieldName is not null)
-		{
-			writer.WritePropertyName("prediction_field_name");
-			JsonSerializer.Serialize(writer, value.PredictionFieldName, options);
-		}
+			if (propRandomizeSeed.TryRead(ref reader, options, PropRandomizeSeed))
+			{
+				continue;
+			}
 
-		if (value.RandomizeSeed.HasValue)
-		{
-			writer.WritePropertyName("randomize_seed");
-			writer.WriteNumberValue(value.RandomizeSeed.Value);
-		}
+			if (propSoftTreeDepthLimit.TryRead(ref reader, options, PropSoftTreeDepthLimit))
+			{
+				continue;
+			}
 
-		if (value.SoftTreeDepthLimit.HasValue)
-		{
-			writer.WritePropertyName("soft_tree_depth_limit");
-			writer.WriteNumberValue(value.SoftTreeDepthLimit.Value);
-		}
+			if (propSoftTreeDepthTolerance.TryRead(ref reader, options, PropSoftTreeDepthTolerance))
+			{
+				continue;
+			}
 
-		if (value.SoftTreeDepthTolerance.HasValue)
-		{
-			writer.WritePropertyName("soft_tree_depth_tolerance");
-			writer.WriteNumberValue(value.SoftTreeDepthTolerance.Value);
-		}
+			if (propTrainingPercent.TryRead(ref reader, options, PropTrainingPercent))
+			{
+				continue;
+			}
 
-		if (value.TrainingPercent.HasValue)
-		{
-			writer.WritePropertyName("training_percent");
-			writer.WriteNumberValue(value.TrainingPercent.Value);
-		}
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DataframeAnalysisClassification
+		{
+			Alpha = propAlpha.Value
+,
+			ClassAssignmentObjective = propClassAssignmentObjective.Value
+,
+			DependentVariable = propDependentVariable.Value
+,
+			DownsampleFactor = propDownsampleFactor.Value
+,
+			EarlyStoppingEnabled = propEarlyStoppingEnabled.Value
+,
+			Eta = propEta.Value
+,
+			EtaGrowthRatePerTree = propEtaGrowthRatePerTree.Value
+,
+			FeatureBagFraction = propFeatureBagFraction.Value
+,
+			FeatureProcessors = propFeatureProcessors.Value
+,
+			Gamma = propGamma.Value
+,
+			Lambda = propLambda.Value
+,
+			MaxOptimizationRoundsPerHyperparameter = propMaxOptimizationRoundsPerHyperparameter.Value
+,
+			MaxTrees = propMaxTrees.Value
+,
+			NumTopClasses = propNumTopClasses.Value
+,
+			NumTopFeatureImportanceValues = propNumTopFeatureImportanceValues.Value
+,
+			PredictionFieldName = propPredictionFieldName.Value
+,
+			RandomizeSeed = propRandomizeSeed.Value
+,
+			SoftTreeDepthLimit = propSoftTreeDepthLimit.Value
+,
+			SoftTreeDepthTolerance = propSoftTreeDepthTolerance.Value
+,
+			TrainingPercent = propTrainingPercent.Value
+		};
+	}
 
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DataframeAnalysisClassification value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAlpha, value.Alpha);
+		writer.WriteProperty(options, PropClassAssignmentObjective, value.ClassAssignmentObjective);
+		writer.WriteProperty(options, PropDependentVariable, value.DependentVariable);
+		writer.WriteProperty(options, PropDownsampleFactor, value.DownsampleFactor);
+		writer.WriteProperty(options, PropEarlyStoppingEnabled, value.EarlyStoppingEnabled);
+		writer.WriteProperty(options, PropEta, value.Eta);
+		writer.WriteProperty(options, PropEtaGrowthRatePerTree, value.EtaGrowthRatePerTree);
+		writer.WriteProperty(options, PropFeatureBagFraction, value.FeatureBagFraction);
+		writer.WriteProperty(options, PropFeatureProcessors, value.FeatureProcessors);
+		writer.WriteProperty(options, PropGamma, value.Gamma);
+		writer.WriteProperty(options, PropLambda, value.Lambda);
+		writer.WriteProperty(options, PropMaxOptimizationRoundsPerHyperparameter, value.MaxOptimizationRoundsPerHyperparameter);
+		writer.WriteProperty(options, PropMaxTrees, value.MaxTrees);
+		writer.WriteProperty(options, PropNumTopClasses, value.NumTopClasses);
+		writer.WriteProperty(options, PropNumTopFeatureImportanceValues, value.NumTopFeatureImportanceValues);
+		writer.WriteProperty(options, PropPredictionFieldName, value.PredictionFieldName);
+		writer.WriteProperty(options, PropRandomizeSeed, value.RandomizeSeed);
+		writer.WriteProperty(options, PropSoftTreeDepthLimit, value.SoftTreeDepthLimit);
+		writer.WriteProperty(options, PropSoftTreeDepthTolerance, value.SoftTreeDepthTolerance);
+		writer.WriteProperty(options, PropTrainingPercent, value.TrainingPercent);
 		writer.WriteEndObject();
 	}
 }
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/MachineLearning/DataframeAnalysisFeatureProcessor.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/MachineLearning/DataframeAnalysisFeatureProcessor.g.cs
index f9be4f3ac82..c464524d7ab 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/MachineLearning/DataframeAnalysisFeatureProcessor.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/MachineLearning/DataframeAnalysisFeatureProcessor.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -39,12 +40,16 @@ internal DataframeAnalysisFeatureProcessor(string variantName, object variant)
 			throw new ArgumentNullException(nameof(variant));
 		if (string.IsNullOrWhiteSpace(variantName))
 			throw new ArgumentException("Variant name must not be empty or whitespace.");
-		VariantName = variantName;
+		VariantType = variantName;
 		Variant = variant;
 	}
 
-	internal object Variant { get; }
-	internal string VariantName { get; }
+	internal DataframeAnalysisFeatureProcessor()
+	{
+	}
+
+	public object Variant { get; internal set; }
+	public string VariantType { get; internal set; }
 
 	public static DataframeAnalysisFeatureProcessor FrequencyEncoding(Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeAnalysisFeatureProcessorFrequencyEncoding dataframeAnalysisFeatureProcessorFrequencyEncoding) => new DataframeAnalysisFeatureProcessor("frequency_encoding", dataframeAnalysisFeatureProcessorFrequencyEncoding);
 	public static DataframeAnalysisFeatureProcessor MultiEncoding(Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeAnalysisFeatureProcessorMultiEncoding dataframeAnalysisFeatureProcessorMultiEncoding) => new DataframeAnalysisFeatureProcessor("multi_encoding", dataframeAnalysisFeatureProcessorMultiEncoding);
@@ -65,97 +70,92 @@ public bool TryGet<T>([NotNullWhen(true)] out T? result) where T : class
 	}
 }
 
-internal sealed partial class DataframeAnalysisFeatureProcessorConverter : JsonConverter<DataframeAnalysisFeatureProcessor>
+internal sealed partial class DataframeAnalysisFeatureProcessorConverter : System.Text.Json.Serialization.JsonConverter<DataframeAnalysisFeatureProcessor>
 {
-	public override DataframeAnalysisFeatureProcessor Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-		{
-			throw new JsonException("Expected start token.");
-		}
+	private static readonly System.Text.Json.JsonEncodedText VariantFrequencyEncoding = System.Text.Json.JsonEncodedText.Encode("frequency_encoding");
+	private static readonly System.Text.Json.JsonEncodedText VariantMultiEncoding = System.Text.Json.JsonEncodedText.Encode("multi_encoding");
+	private static readonly System.Text.Json.JsonEncodedText VariantNGramEncoding = System.Text.Json.JsonEncodedText.Encode("n_gram_encoding");
+	private static readonly System.Text.Json.JsonEncodedText VariantOneHotEncoding = System.Text.Json.JsonEncodedText.Encode("one_hot_encoding");
+	private static readonly System.Text.Json.JsonEncodedText VariantTargetMeanEncoding = System.Text.Json.JsonEncodedText.Encode("target_mean_encoding");
 
-		object? variantValue = default;
-		string? variantNameValue = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+	public override DataframeAnalysisFeatureProcessor Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		var variantType = string.Empty;
+		object? variant = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
+			if (reader.ValueTextEquals(VariantFrequencyEncoding))
 			{
-				throw new JsonException("Expected a property name token.");
-			}
-
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token representing the name of an Elasticsearch field.");
-			}
-
-			var propertyName = reader.GetString();
-			reader.Read();
-			if (propertyName == "frequency_encoding")
-			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeAnalysisFeatureProcessorFrequencyEncoding?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantFrequencyEncoding.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeAnalysisFeatureProcessorFrequencyEncoding?>(options);
 				continue;
 			}
 
-			if (propertyName == "multi_encoding")
+			if (reader.ValueTextEquals(VariantMultiEncoding))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeAnalysisFeatureProcessorMultiEncoding?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantMultiEncoding.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeAnalysisFeatureProcessorMultiEncoding?>(options);
 				continue;
 			}
 
-			if (propertyName == "n_gram_encoding")
+			if (reader.ValueTextEquals(VariantNGramEncoding))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeAnalysisFeatureProcessorNGramEncoding?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantNGramEncoding.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeAnalysisFeatureProcessorNGramEncoding?>(options);
 				continue;
 			}
 
-			if (propertyName == "one_hot_encoding")
+			if (reader.ValueTextEquals(VariantOneHotEncoding))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeAnalysisFeatureProcessorOneHotEncoding?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantOneHotEncoding.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeAnalysisFeatureProcessorOneHotEncoding?>(options);
 				continue;
 			}
 
-			if (propertyName == "target_mean_encoding")
+			if (reader.ValueTextEquals(VariantTargetMeanEncoding))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeAnalysisFeatureProcessorTargetMeanEncoding?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantTargetMeanEncoding.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeAnalysisFeatureProcessorTargetMeanEncoding?>(options);
 				continue;
 			}
 
-			throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'DataframeAnalysisFeatureProcessor' from the response.");
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		var result = new DataframeAnalysisFeatureProcessor(variantNameValue, variantValue);
-		return result;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DataframeAnalysisFeatureProcessor { VariantType = variantType, Variant = variant };
 	}
 
-	public override void Write(Utf8JsonWriter writer, DataframeAnalysisFeatureProcessor value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DataframeAnalysisFeatureProcessor value, System.Text.Json.JsonSerializerOptions options)
 	{
 		writer.WriteStartObject();
-		if (value.VariantName is not null && value.Variant is not null)
+		switch (value.VariantType)
 		{
-			writer.WritePropertyName(value.VariantName);
-			switch (value.VariantName)
-			{
-				case "frequency_encoding":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeAnalysisFeatureProcessorFrequencyEncoding>(writer, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeAnalysisFeatureProcessorFrequencyEncoding)value.Variant, options);
-					break;
-				case "multi_encoding":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeAnalysisFeatureProcessorMultiEncoding>(writer, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeAnalysisFeatureProcessorMultiEncoding)value.Variant, options);
-					break;
-				case "n_gram_encoding":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeAnalysisFeatureProcessorNGramEncoding>(writer, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeAnalysisFeatureProcessorNGramEncoding)value.Variant, options);
-					break;
-				case "one_hot_encoding":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeAnalysisFeatureProcessorOneHotEncoding>(writer, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeAnalysisFeatureProcessorOneHotEncoding)value.Variant, options);
-					break;
-				case "target_mean_encoding":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeAnalysisFeatureProcessorTargetMeanEncoding>(writer, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeAnalysisFeatureProcessorTargetMeanEncoding)value.Variant, options);
-					break;
-			}
+			case "":
+				break;
+			case "frequency_encoding":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeAnalysisFeatureProcessorFrequencyEncoding?)value.Variant);
+				break;
+			case "multi_encoding":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeAnalysisFeatureProcessorMultiEncoding?)value.Variant);
+				break;
+			case "n_gram_encoding":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeAnalysisFeatureProcessorNGramEncoding?)value.Variant);
+				break;
+			case "one_hot_encoding":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeAnalysisFeatureProcessorOneHotEncoding?)value.Variant);
+				break;
+			case "target_mean_encoding":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeAnalysisFeatureProcessorTargetMeanEncoding?)value.Variant);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.VariantType}' is not supported for type '{nameof(DataframeAnalysisFeatureProcessor)}'.");
 		}
 
 		writer.WriteEndObject();
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/MachineLearning/DataframeAnalysisRegression.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/MachineLearning/DataframeAnalysisRegression.g.cs
index d8aa08cedd4..394c4e977c8 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/MachineLearning/DataframeAnalysisRegression.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/MachineLearning/DataframeAnalysisRegression.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,262 +28,226 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.MachineLearning;
 
-internal sealed partial class DataframeAnalysisRegressionConverter : JsonConverter<DataframeAnalysisRegression>
+internal sealed partial class DataframeAnalysisRegressionConverter : System.Text.Json.Serialization.JsonConverter<DataframeAnalysisRegression>
 {
-	public override DataframeAnalysisRegression Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAlpha = System.Text.Json.JsonEncodedText.Encode("alpha");
+	private static readonly System.Text.Json.JsonEncodedText PropDependentVariable = System.Text.Json.JsonEncodedText.Encode("dependent_variable");
+	private static readonly System.Text.Json.JsonEncodedText PropDownsampleFactor = System.Text.Json.JsonEncodedText.Encode("downsample_factor");
+	private static readonly System.Text.Json.JsonEncodedText PropEarlyStoppingEnabled = System.Text.Json.JsonEncodedText.Encode("early_stopping_enabled");
+	private static readonly System.Text.Json.JsonEncodedText PropEta = System.Text.Json.JsonEncodedText.Encode("eta");
+	private static readonly System.Text.Json.JsonEncodedText PropEtaGrowthRatePerTree = System.Text.Json.JsonEncodedText.Encode("eta_growth_rate_per_tree");
+	private static readonly System.Text.Json.JsonEncodedText PropFeatureBagFraction = System.Text.Json.JsonEncodedText.Encode("feature_bag_fraction");
+	private static readonly System.Text.Json.JsonEncodedText PropFeatureProcessors = System.Text.Json.JsonEncodedText.Encode("feature_processors");
+	private static readonly System.Text.Json.JsonEncodedText PropGamma = System.Text.Json.JsonEncodedText.Encode("gamma");
+	private static readonly System.Text.Json.JsonEncodedText PropLambda = System.Text.Json.JsonEncodedText.Encode("lambda");
+	private static readonly System.Text.Json.JsonEncodedText PropLossFunction = System.Text.Json.JsonEncodedText.Encode("loss_function");
+	private static readonly System.Text.Json.JsonEncodedText PropLossFunctionParameter = System.Text.Json.JsonEncodedText.Encode("loss_function_parameter");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxOptimizationRoundsPerHyperparameter = System.Text.Json.JsonEncodedText.Encode("max_optimization_rounds_per_hyperparameter");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxTrees = System.Text.Json.JsonEncodedText.Encode("max_trees");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxTrees1 = System.Text.Json.JsonEncodedText.Encode("maximum_number_trees");
+	private static readonly System.Text.Json.JsonEncodedText PropNumTopFeatureImportanceValues = System.Text.Json.JsonEncodedText.Encode("num_top_feature_importance_values");
+	private static readonly System.Text.Json.JsonEncodedText PropPredictionFieldName = System.Text.Json.JsonEncodedText.Encode("prediction_field_name");
+	private static readonly System.Text.Json.JsonEncodedText PropRandomizeSeed = System.Text.Json.JsonEncodedText.Encode("randomize_seed");
+	private static readonly System.Text.Json.JsonEncodedText PropSoftTreeDepthLimit = System.Text.Json.JsonEncodedText.Encode("soft_tree_depth_limit");
+	private static readonly System.Text.Json.JsonEncodedText PropSoftTreeDepthTolerance = System.Text.Json.JsonEncodedText.Encode("soft_tree_depth_tolerance");
+	private static readonly System.Text.Json.JsonEncodedText PropTrainingPercent = System.Text.Json.JsonEncodedText.Encode("training_percent");
+
+	public override DataframeAnalysisRegression Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		var variant = new DataframeAnalysisRegression();
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
-		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<double?> propAlpha = default;
+		LocalJsonProperty<string> propDependentVariable = default;
+		LocalJsonProperty<double?> propDownsampleFactor = default;
+		LocalJsonProperty<bool?> propEarlyStoppingEnabled = default;
+		LocalJsonProperty<double?> propEta = default;
+		LocalJsonProperty<double?> propEtaGrowthRatePerTree = default;
+		LocalJsonProperty<double?> propFeatureBagFraction = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeAnalysisFeatureProcessor>?> propFeatureProcessors = default;
+		LocalJsonProperty<double?> propGamma = default;
+		LocalJsonProperty<double?> propLambda = default;
+		LocalJsonProperty<string?> propLossFunction = default;
+		LocalJsonProperty<double?> propLossFunctionParameter = default;
+		LocalJsonProperty<int?> propMaxOptimizationRoundsPerHyperparameter = default;
+		LocalJsonProperty<int?> propMaxTrees = default;
+		LocalJsonProperty<int?> propNumTopFeatureImportanceValues = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Field?> propPredictionFieldName = default;
+		LocalJsonProperty<double?> propRandomizeSeed = default;
+		LocalJsonProperty<int?> propSoftTreeDepthLimit = default;
+		LocalJsonProperty<double?> propSoftTreeDepthTolerance = default;
+		LocalJsonProperty<double?> propTrainingPercent = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAlpha.TryRead(ref reader, options, PropAlpha))
 			{
-				var property = reader.GetString();
-				if (property == "alpha")
-				{
-					variant.Alpha = JsonSerializer.Deserialize<double?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "dependent_variable")
-				{
-					variant.DependentVariable = JsonSerializer.Deserialize<string>(ref reader, options);
-					continue;
-				}
-
-				if (property == "downsample_factor")
-				{
-					variant.DownsampleFactor = JsonSerializer.Deserialize<double?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "early_stopping_enabled")
-				{
-					variant.EarlyStoppingEnabled = JsonSerializer.Deserialize<bool?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "eta")
-				{
-					variant.Eta = JsonSerializer.Deserialize<double?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "eta_growth_rate_per_tree")
-				{
-					variant.EtaGrowthRatePerTree = JsonSerializer.Deserialize<double?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "feature_bag_fraction")
-				{
-					variant.FeatureBagFraction = JsonSerializer.Deserialize<double?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "feature_processors")
-				{
-					variant.FeatureProcessors = JsonSerializer.Deserialize<ICollection<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeAnalysisFeatureProcessor>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "gamma")
-				{
-					variant.Gamma = JsonSerializer.Deserialize<double?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "lambda")
-				{
-					variant.Lambda = JsonSerializer.Deserialize<double?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "loss_function")
-				{
-					variant.LossFunction = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "loss_function_parameter")
-				{
-					variant.LossFunctionParameter = JsonSerializer.Deserialize<double?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "max_optimization_rounds_per_hyperparameter")
-				{
-					variant.MaxOptimizationRoundsPerHyperparameter = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "max_trees" || property == "maximum_number_trees")
-				{
-					variant.MaxTrees = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "num_top_feature_importance_values")
-				{
-					variant.NumTopFeatureImportanceValues = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "prediction_field_name")
-				{
-					variant.PredictionFieldName = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Field?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "randomize_seed")
-				{
-					variant.RandomizeSeed = JsonSerializer.Deserialize<double?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "soft_tree_depth_limit")
-				{
-					variant.SoftTreeDepthLimit = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "soft_tree_depth_tolerance")
-				{
-					variant.SoftTreeDepthTolerance = JsonSerializer.Deserialize<double?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "training_percent")
-				{
-					variant.TrainingPercent = JsonSerializer.Deserialize<double?>(ref reader, options);
-					continue;
-				}
+				continue;
 			}
-		}
 
-		return variant;
-	}
+			if (propDependentVariable.TryRead(ref reader, options, PropDependentVariable))
+			{
+				continue;
+			}
 
-	public override void Write(Utf8JsonWriter writer, DataframeAnalysisRegression value, JsonSerializerOptions options)
-	{
-		writer.WriteStartObject();
-		if (value.Alpha.HasValue)
-		{
-			writer.WritePropertyName("alpha");
-			writer.WriteNumberValue(value.Alpha.Value);
-		}
+			if (propDownsampleFactor.TryRead(ref reader, options, PropDownsampleFactor))
+			{
+				continue;
+			}
 
-		writer.WritePropertyName("dependent_variable");
-		writer.WriteStringValue(value.DependentVariable);
-		if (value.DownsampleFactor.HasValue)
-		{
-			writer.WritePropertyName("downsample_factor");
-			writer.WriteNumberValue(value.DownsampleFactor.Value);
-		}
+			if (propEarlyStoppingEnabled.TryRead(ref reader, options, PropEarlyStoppingEnabled))
+			{
+				continue;
+			}
 
-		if (value.EarlyStoppingEnabled.HasValue)
-		{
-			writer.WritePropertyName("early_stopping_enabled");
-			writer.WriteBooleanValue(value.EarlyStoppingEnabled.Value);
-		}
+			if (propEta.TryRead(ref reader, options, PropEta))
+			{
+				continue;
+			}
 
-		if (value.Eta.HasValue)
-		{
-			writer.WritePropertyName("eta");
-			writer.WriteNumberValue(value.Eta.Value);
-		}
+			if (propEtaGrowthRatePerTree.TryRead(ref reader, options, PropEtaGrowthRatePerTree))
+			{
+				continue;
+			}
 
-		if (value.EtaGrowthRatePerTree.HasValue)
-		{
-			writer.WritePropertyName("eta_growth_rate_per_tree");
-			writer.WriteNumberValue(value.EtaGrowthRatePerTree.Value);
-		}
+			if (propFeatureBagFraction.TryRead(ref reader, options, PropFeatureBagFraction))
+			{
+				continue;
+			}
 
-		if (value.FeatureBagFraction.HasValue)
-		{
-			writer.WritePropertyName("feature_bag_fraction");
-			writer.WriteNumberValue(value.FeatureBagFraction.Value);
-		}
+			if (propFeatureProcessors.TryRead(ref reader, options, PropFeatureProcessors))
+			{
+				continue;
+			}
 
-		if (value.FeatureProcessors is not null)
-		{
-			writer.WritePropertyName("feature_processors");
-			JsonSerializer.Serialize(writer, value.FeatureProcessors, options);
-		}
+			if (propGamma.TryRead(ref reader, options, PropGamma))
+			{
+				continue;
+			}
 
-		if (value.Gamma.HasValue)
-		{
-			writer.WritePropertyName("gamma");
-			writer.WriteNumberValue(value.Gamma.Value);
-		}
+			if (propLambda.TryRead(ref reader, options, PropLambda))
+			{
+				continue;
+			}
 
-		if (value.Lambda.HasValue)
-		{
-			writer.WritePropertyName("lambda");
-			writer.WriteNumberValue(value.Lambda.Value);
-		}
+			if (propLossFunction.TryRead(ref reader, options, PropLossFunction))
+			{
+				continue;
+			}
 
-		if (!string.IsNullOrEmpty(value.LossFunction))
-		{
-			writer.WritePropertyName("loss_function");
-			writer.WriteStringValue(value.LossFunction);
-		}
+			if (propLossFunctionParameter.TryRead(ref reader, options, PropLossFunctionParameter))
+			{
+				continue;
+			}
 
-		if (value.LossFunctionParameter.HasValue)
-		{
-			writer.WritePropertyName("loss_function_parameter");
-			writer.WriteNumberValue(value.LossFunctionParameter.Value);
-		}
+			if (propMaxOptimizationRoundsPerHyperparameter.TryRead(ref reader, options, PropMaxOptimizationRoundsPerHyperparameter))
+			{
+				continue;
+			}
 
-		if (value.MaxOptimizationRoundsPerHyperparameter.HasValue)
-		{
-			writer.WritePropertyName("max_optimization_rounds_per_hyperparameter");
-			writer.WriteNumberValue(value.MaxOptimizationRoundsPerHyperparameter.Value);
-		}
+			if (propMaxTrees.TryRead(ref reader, options, PropMaxTrees) || propMaxTrees.TryRead(ref reader, options, PropMaxTrees1))
+			{
+				continue;
+			}
 
-		if (value.MaxTrees.HasValue)
-		{
-			writer.WritePropertyName("max_trees");
-			writer.WriteNumberValue(value.MaxTrees.Value);
-		}
+			if (propNumTopFeatureImportanceValues.TryRead(ref reader, options, PropNumTopFeatureImportanceValues))
+			{
+				continue;
+			}
 
-		if (value.NumTopFeatureImportanceValues.HasValue)
-		{
-			writer.WritePropertyName("num_top_feature_importance_values");
-			writer.WriteNumberValue(value.NumTopFeatureImportanceValues.Value);
-		}
+			if (propPredictionFieldName.TryRead(ref reader, options, PropPredictionFieldName))
+			{
+				continue;
+			}
 
-		if (value.PredictionFieldName is not null)
-		{
-			writer.WritePropertyName("prediction_field_name");
-			JsonSerializer.Serialize(writer, value.PredictionFieldName, options);
-		}
+			if (propRandomizeSeed.TryRead(ref reader, options, PropRandomizeSeed))
+			{
+				continue;
+			}
 
-		if (value.RandomizeSeed.HasValue)
-		{
-			writer.WritePropertyName("randomize_seed");
-			writer.WriteNumberValue(value.RandomizeSeed.Value);
-		}
+			if (propSoftTreeDepthLimit.TryRead(ref reader, options, PropSoftTreeDepthLimit))
+			{
+				continue;
+			}
 
-		if (value.SoftTreeDepthLimit.HasValue)
-		{
-			writer.WritePropertyName("soft_tree_depth_limit");
-			writer.WriteNumberValue(value.SoftTreeDepthLimit.Value);
-		}
+			if (propSoftTreeDepthTolerance.TryRead(ref reader, options, PropSoftTreeDepthTolerance))
+			{
+				continue;
+			}
 
-		if (value.SoftTreeDepthTolerance.HasValue)
-		{
-			writer.WritePropertyName("soft_tree_depth_tolerance");
-			writer.WriteNumberValue(value.SoftTreeDepthTolerance.Value);
-		}
+			if (propTrainingPercent.TryRead(ref reader, options, PropTrainingPercent))
+			{
+				continue;
+			}
 
-		if (value.TrainingPercent.HasValue)
-		{
-			writer.WritePropertyName("training_percent");
-			writer.WriteNumberValue(value.TrainingPercent.Value);
-		}
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DataframeAnalysisRegression
+		{
+			Alpha = propAlpha.Value
+,
+			DependentVariable = propDependentVariable.Value
+,
+			DownsampleFactor = propDownsampleFactor.Value
+,
+			EarlyStoppingEnabled = propEarlyStoppingEnabled.Value
+,
+			Eta = propEta.Value
+,
+			EtaGrowthRatePerTree = propEtaGrowthRatePerTree.Value
+,
+			FeatureBagFraction = propFeatureBagFraction.Value
+,
+			FeatureProcessors = propFeatureProcessors.Value
+,
+			Gamma = propGamma.Value
+,
+			Lambda = propLambda.Value
+,
+			LossFunction = propLossFunction.Value
+,
+			LossFunctionParameter = propLossFunctionParameter.Value
+,
+			MaxOptimizationRoundsPerHyperparameter = propMaxOptimizationRoundsPerHyperparameter.Value
+,
+			MaxTrees = propMaxTrees.Value
+,
+			NumTopFeatureImportanceValues = propNumTopFeatureImportanceValues.Value
+,
+			PredictionFieldName = propPredictionFieldName.Value
+,
+			RandomizeSeed = propRandomizeSeed.Value
+,
+			SoftTreeDepthLimit = propSoftTreeDepthLimit.Value
+,
+			SoftTreeDepthTolerance = propSoftTreeDepthTolerance.Value
+,
+			TrainingPercent = propTrainingPercent.Value
+		};
+	}
 
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DataframeAnalysisRegression value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAlpha, value.Alpha);
+		writer.WriteProperty(options, PropDependentVariable, value.DependentVariable);
+		writer.WriteProperty(options, PropDownsampleFactor, value.DownsampleFactor);
+		writer.WriteProperty(options, PropEarlyStoppingEnabled, value.EarlyStoppingEnabled);
+		writer.WriteProperty(options, PropEta, value.Eta);
+		writer.WriteProperty(options, PropEtaGrowthRatePerTree, value.EtaGrowthRatePerTree);
+		writer.WriteProperty(options, PropFeatureBagFraction, value.FeatureBagFraction);
+		writer.WriteProperty(options, PropFeatureProcessors, value.FeatureProcessors);
+		writer.WriteProperty(options, PropGamma, value.Gamma);
+		writer.WriteProperty(options, PropLambda, value.Lambda);
+		writer.WriteProperty(options, PropLossFunction, value.LossFunction);
+		writer.WriteProperty(options, PropLossFunctionParameter, value.LossFunctionParameter);
+		writer.WriteProperty(options, PropMaxOptimizationRoundsPerHyperparameter, value.MaxOptimizationRoundsPerHyperparameter);
+		writer.WriteProperty(options, PropMaxTrees, value.MaxTrees);
+		writer.WriteProperty(options, PropNumTopFeatureImportanceValues, value.NumTopFeatureImportanceValues);
+		writer.WriteProperty(options, PropPredictionFieldName, value.PredictionFieldName);
+		writer.WriteProperty(options, PropRandomizeSeed, value.RandomizeSeed);
+		writer.WriteProperty(options, PropSoftTreeDepthLimit, value.SoftTreeDepthLimit);
+		writer.WriteProperty(options, PropSoftTreeDepthTolerance, value.SoftTreeDepthTolerance);
+		writer.WriteProperty(options, PropTrainingPercent, value.TrainingPercent);
 		writer.WriteEndObject();
 	}
 }
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/MachineLearning/DataframeEvaluation.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/MachineLearning/DataframeEvaluation.g.cs
index 1d558249276..6f4a9a4cbd1 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/MachineLearning/DataframeEvaluation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/MachineLearning/DataframeEvaluation.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -39,12 +40,16 @@ internal DataframeEvaluation(string variantName, object variant)
 			throw new ArgumentNullException(nameof(variant));
 		if (string.IsNullOrWhiteSpace(variantName))
 			throw new ArgumentException("Variant name must not be empty or whitespace.");
-		VariantName = variantName;
+		VariantType = variantName;
 		Variant = variant;
 	}
 
-	internal object Variant { get; }
-	internal string VariantName { get; }
+	internal DataframeEvaluation()
+	{
+	}
+
+	public object Variant { get; internal set; }
+	public string VariantType { get; internal set; }
 
 	public static DataframeEvaluation Classification(Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeEvaluationClassification dataframeEvaluationClassification) => new DataframeEvaluation("classification", dataframeEvaluationClassification);
 	public static DataframeEvaluation OutlierDetection(Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeEvaluationOutlierDetection dataframeEvaluationOutlierDetection) => new DataframeEvaluation("outlier_detection", dataframeEvaluationOutlierDetection);
@@ -63,77 +68,68 @@ public bool TryGet<T>([NotNullWhen(true)] out T? result) where T : class
 	}
 }
 
-internal sealed partial class DataframeEvaluationConverter : JsonConverter<DataframeEvaluation>
+internal sealed partial class DataframeEvaluationConverter : System.Text.Json.Serialization.JsonConverter<DataframeEvaluation>
 {
-	public override DataframeEvaluation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-		{
-			throw new JsonException("Expected start token.");
-		}
+	private static readonly System.Text.Json.JsonEncodedText VariantClassification = System.Text.Json.JsonEncodedText.Encode("classification");
+	private static readonly System.Text.Json.JsonEncodedText VariantOutlierDetection = System.Text.Json.JsonEncodedText.Encode("outlier_detection");
+	private static readonly System.Text.Json.JsonEncodedText VariantRegression = System.Text.Json.JsonEncodedText.Encode("regression");
 
-		object? variantValue = default;
-		string? variantNameValue = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+	public override DataframeEvaluation Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		var variantType = string.Empty;
+		object? variant = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
+			if (reader.ValueTextEquals(VariantClassification))
 			{
-				throw new JsonException("Expected a property name token.");
-			}
-
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token representing the name of an Elasticsearch field.");
-			}
-
-			var propertyName = reader.GetString();
-			reader.Read();
-			if (propertyName == "classification")
-			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeEvaluationClassification?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantClassification.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeEvaluationClassification?>(options);
 				continue;
 			}
 
-			if (propertyName == "outlier_detection")
+			if (reader.ValueTextEquals(VariantOutlierDetection))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeEvaluationOutlierDetection?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantOutlierDetection.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeEvaluationOutlierDetection?>(options);
 				continue;
 			}
 
-			if (propertyName == "regression")
+			if (reader.ValueTextEquals(VariantRegression))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeEvaluationRegression?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantRegression.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeEvaluationRegression?>(options);
 				continue;
 			}
 
-			throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'DataframeEvaluation' from the response.");
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		var result = new DataframeEvaluation(variantNameValue, variantValue);
-		return result;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DataframeEvaluation { VariantType = variantType, Variant = variant };
 	}
 
-	public override void Write(Utf8JsonWriter writer, DataframeEvaluation value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DataframeEvaluation value, System.Text.Json.JsonSerializerOptions options)
 	{
 		writer.WriteStartObject();
-		if (value.VariantName is not null && value.Variant is not null)
+		switch (value.VariantType)
 		{
-			writer.WritePropertyName(value.VariantName);
-			switch (value.VariantName)
-			{
-				case "classification":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeEvaluationClassification>(writer, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeEvaluationClassification)value.Variant, options);
-					break;
-				case "outlier_detection":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeEvaluationOutlierDetection>(writer, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeEvaluationOutlierDetection)value.Variant, options);
-					break;
-				case "regression":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeEvaluationRegression>(writer, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeEvaluationRegression)value.Variant, options);
-					break;
-			}
+			case "":
+				break;
+			case "classification":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeEvaluationClassification?)value.Variant);
+				break;
+			case "outlier_detection":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeEvaluationOutlierDetection?)value.Variant);
+				break;
+			case "regression":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.DataframeEvaluationRegression?)value.Variant);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.VariantType}' is not supported for type '{nameof(DataframeEvaluation)}'.");
 		}
 
 		writer.WriteEndObject();
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/MachineLearning/InferenceConfigCreate.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/MachineLearning/InferenceConfigCreate.g.cs
index a86e4468446..4294b6c6b56 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/MachineLearning/InferenceConfigCreate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/MachineLearning/InferenceConfigCreate.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -44,12 +45,16 @@ internal InferenceConfigCreate(string variantName, object variant)
 			throw new ArgumentNullException(nameof(variant));
 		if (string.IsNullOrWhiteSpace(variantName))
 			throw new ArgumentException("Variant name must not be empty or whitespace.");
-		VariantName = variantName;
+		VariantType = variantName;
 		Variant = variant;
 	}
 
-	internal object Variant { get; }
-	internal string VariantName { get; }
+	internal InferenceConfigCreate()
+	{
+	}
+
+	public object Variant { get; internal set; }
+	public string VariantType { get; internal set; }
 
 	public static InferenceConfigCreate Classification(Elastic.Clients.Elasticsearch.Serverless.MachineLearning.ClassificationInferenceOptions classificationInferenceOptions) => new InferenceConfigCreate("classification", classificationInferenceOptions);
 	public static InferenceConfigCreate FillMask(Elastic.Clients.Elasticsearch.Serverless.MachineLearning.FillMaskInferenceOptions fillMaskInferenceOptions) => new InferenceConfigCreate("fill_mask", fillMaskInferenceOptions);
@@ -75,147 +80,152 @@ public bool TryGet<T>([NotNullWhen(true)] out T? result) where T : class
 	}
 }
 
-internal sealed partial class InferenceConfigCreateConverter : JsonConverter<InferenceConfigCreate>
+internal sealed partial class InferenceConfigCreateConverter : System.Text.Json.Serialization.JsonConverter<InferenceConfigCreate>
 {
-	public override InferenceConfigCreate Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText VariantClassification = System.Text.Json.JsonEncodedText.Encode("classification");
+	private static readonly System.Text.Json.JsonEncodedText VariantFillMask = System.Text.Json.JsonEncodedText.Encode("fill_mask");
+	private static readonly System.Text.Json.JsonEncodedText VariantNer = System.Text.Json.JsonEncodedText.Encode("ner");
+	private static readonly System.Text.Json.JsonEncodedText VariantPassThrough = System.Text.Json.JsonEncodedText.Encode("pass_through");
+	private static readonly System.Text.Json.JsonEncodedText VariantQuestionAnswering = System.Text.Json.JsonEncodedText.Encode("question_answering");
+	private static readonly System.Text.Json.JsonEncodedText VariantRegression = System.Text.Json.JsonEncodedText.Encode("regression");
+	private static readonly System.Text.Json.JsonEncodedText VariantTextClassification = System.Text.Json.JsonEncodedText.Encode("text_classification");
+	private static readonly System.Text.Json.JsonEncodedText VariantTextEmbedding = System.Text.Json.JsonEncodedText.Encode("text_embedding");
+	private static readonly System.Text.Json.JsonEncodedText VariantTextExpansion = System.Text.Json.JsonEncodedText.Encode("text_expansion");
+	private static readonly System.Text.Json.JsonEncodedText VariantZeroShotClassification = System.Text.Json.JsonEncodedText.Encode("zero_shot_classification");
+
+	public override InferenceConfigCreate Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		var variantType = string.Empty;
+		object? variant = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			throw new JsonException("Expected start token.");
-		}
-
-		object? variantValue = default;
-		string? variantNameValue = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
-		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token.");
-			}
-
-			if (reader.TokenType != JsonTokenType.PropertyName)
+			if (reader.ValueTextEquals(VariantClassification))
 			{
-				throw new JsonException("Expected a property name token representing the name of an Elasticsearch field.");
-			}
-
-			var propertyName = reader.GetString();
-			reader.Read();
-			if (propertyName == "classification")
-			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.ClassificationInferenceOptions?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantClassification.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.ClassificationInferenceOptions?>(options);
 				continue;
 			}
 
-			if (propertyName == "fill_mask")
+			if (reader.ValueTextEquals(VariantFillMask))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.FillMaskInferenceOptions?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantFillMask.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.FillMaskInferenceOptions?>(options);
 				continue;
 			}
 
-			if (propertyName == "ner")
+			if (reader.ValueTextEquals(VariantNer))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.NerInferenceOptions?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantNer.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.NerInferenceOptions?>(options);
 				continue;
 			}
 
-			if (propertyName == "pass_through")
+			if (reader.ValueTextEquals(VariantPassThrough))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.PassThroughInferenceOptions?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantPassThrough.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.PassThroughInferenceOptions?>(options);
 				continue;
 			}
 
-			if (propertyName == "question_answering")
+			if (reader.ValueTextEquals(VariantQuestionAnswering))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.QuestionAnsweringInferenceOptions?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantQuestionAnswering.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.QuestionAnsweringInferenceOptions?>(options);
 				continue;
 			}
 
-			if (propertyName == "regression")
+			if (reader.ValueTextEquals(VariantRegression))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.RegressionInferenceOptions?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantRegression.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.RegressionInferenceOptions?>(options);
 				continue;
 			}
 
-			if (propertyName == "text_classification")
+			if (reader.ValueTextEquals(VariantTextClassification))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.TextClassificationInferenceOptions?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantTextClassification.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.TextClassificationInferenceOptions?>(options);
 				continue;
 			}
 
-			if (propertyName == "text_embedding")
+			if (reader.ValueTextEquals(VariantTextEmbedding))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.TextEmbeddingInferenceOptions?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantTextEmbedding.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.TextEmbeddingInferenceOptions?>(options);
 				continue;
 			}
 
-			if (propertyName == "text_expansion")
+			if (reader.ValueTextEquals(VariantTextExpansion))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.TextExpansionInferenceOptions?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantTextExpansion.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.TextExpansionInferenceOptions?>(options);
 				continue;
 			}
 
-			if (propertyName == "zero_shot_classification")
+			if (reader.ValueTextEquals(VariantZeroShotClassification))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.ZeroShotClassificationInferenceOptions?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantZeroShotClassification.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.ZeroShotClassificationInferenceOptions?>(options);
 				continue;
 			}
 
-			throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'InferenceConfigCreate' from the response.");
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		var result = new InferenceConfigCreate(variantNameValue, variantValue);
-		return result;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new InferenceConfigCreate { VariantType = variantType, Variant = variant };
 	}
 
-	public override void Write(Utf8JsonWriter writer, InferenceConfigCreate value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, InferenceConfigCreate value, System.Text.Json.JsonSerializerOptions options)
 	{
 		writer.WriteStartObject();
-		if (value.VariantName is not null && value.Variant is not null)
+		switch (value.VariantType)
 		{
-			writer.WritePropertyName(value.VariantName);
-			switch (value.VariantName)
-			{
-				case "classification":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.ClassificationInferenceOptions>(writer, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.ClassificationInferenceOptions)value.Variant, options);
-					break;
-				case "fill_mask":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.FillMaskInferenceOptions>(writer, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.FillMaskInferenceOptions)value.Variant, options);
-					break;
-				case "ner":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.NerInferenceOptions>(writer, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.NerInferenceOptions)value.Variant, options);
-					break;
-				case "pass_through":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.PassThroughInferenceOptions>(writer, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.PassThroughInferenceOptions)value.Variant, options);
-					break;
-				case "question_answering":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.QuestionAnsweringInferenceOptions>(writer, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.QuestionAnsweringInferenceOptions)value.Variant, options);
-					break;
-				case "regression":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.RegressionInferenceOptions>(writer, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.RegressionInferenceOptions)value.Variant, options);
-					break;
-				case "text_classification":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.TextClassificationInferenceOptions>(writer, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.TextClassificationInferenceOptions)value.Variant, options);
-					break;
-				case "text_embedding":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.TextEmbeddingInferenceOptions>(writer, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.TextEmbeddingInferenceOptions)value.Variant, options);
-					break;
-				case "text_expansion":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.TextExpansionInferenceOptions>(writer, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.TextExpansionInferenceOptions)value.Variant, options);
-					break;
-				case "zero_shot_classification":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.ZeroShotClassificationInferenceOptions>(writer, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.ZeroShotClassificationInferenceOptions)value.Variant, options);
-					break;
-			}
+			case "":
+				break;
+			case "classification":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.ClassificationInferenceOptions?)value.Variant);
+				break;
+			case "fill_mask":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.FillMaskInferenceOptions?)value.Variant);
+				break;
+			case "ner":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.NerInferenceOptions?)value.Variant);
+				break;
+			case "pass_through":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.PassThroughInferenceOptions?)value.Variant);
+				break;
+			case "question_answering":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.QuestionAnsweringInferenceOptions?)value.Variant);
+				break;
+			case "regression":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.RegressionInferenceOptions?)value.Variant);
+				break;
+			case "text_classification":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.TextClassificationInferenceOptions?)value.Variant);
+				break;
+			case "text_embedding":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.TextEmbeddingInferenceOptions?)value.Variant);
+				break;
+			case "text_expansion":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.TextExpansionInferenceOptions?)value.Variant);
+				break;
+			case "zero_shot_classification":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.ZeroShotClassificationInferenceOptions?)value.Variant);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.VariantType}' is not supported for type '{nameof(InferenceConfigCreate)}'.");
 		}
 
 		writer.WriteEndObject();
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/MachineLearning/InferenceConfigUpdate.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/MachineLearning/InferenceConfigUpdate.g.cs
index 84a33ce0b83..020a381b7ba 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/MachineLearning/InferenceConfigUpdate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/MachineLearning/InferenceConfigUpdate.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -39,12 +40,16 @@ internal InferenceConfigUpdate(string variantName, object variant)
 			throw new ArgumentNullException(nameof(variant));
 		if (string.IsNullOrWhiteSpace(variantName))
 			throw new ArgumentException("Variant name must not be empty or whitespace.");
-		VariantName = variantName;
+		VariantType = variantName;
 		Variant = variant;
 	}
 
-	internal object Variant { get; }
-	internal string VariantName { get; }
+	internal InferenceConfigUpdate()
+	{
+	}
+
+	public object Variant { get; internal set; }
+	public string VariantType { get; internal set; }
 
 	public static InferenceConfigUpdate Classification(Elastic.Clients.Elasticsearch.Serverless.MachineLearning.ClassificationInferenceOptions classificationInferenceOptions) => new InferenceConfigUpdate("classification", classificationInferenceOptions);
 	public static InferenceConfigUpdate FillMask(Elastic.Clients.Elasticsearch.Serverless.MachineLearning.FillMaskInferenceUpdateOptions fillMaskInferenceUpdateOptions) => new InferenceConfigUpdate("fill_mask", fillMaskInferenceUpdateOptions);
@@ -70,147 +75,152 @@ public bool TryGet<T>([NotNullWhen(true)] out T? result) where T : class
 	}
 }
 
-internal sealed partial class InferenceConfigUpdateConverter : JsonConverter<InferenceConfigUpdate>
+internal sealed partial class InferenceConfigUpdateConverter : System.Text.Json.Serialization.JsonConverter<InferenceConfigUpdate>
 {
-	public override InferenceConfigUpdate Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText VariantClassification = System.Text.Json.JsonEncodedText.Encode("classification");
+	private static readonly System.Text.Json.JsonEncodedText VariantFillMask = System.Text.Json.JsonEncodedText.Encode("fill_mask");
+	private static readonly System.Text.Json.JsonEncodedText VariantNer = System.Text.Json.JsonEncodedText.Encode("ner");
+	private static readonly System.Text.Json.JsonEncodedText VariantPassThrough = System.Text.Json.JsonEncodedText.Encode("pass_through");
+	private static readonly System.Text.Json.JsonEncodedText VariantQuestionAnswering = System.Text.Json.JsonEncodedText.Encode("question_answering");
+	private static readonly System.Text.Json.JsonEncodedText VariantRegression = System.Text.Json.JsonEncodedText.Encode("regression");
+	private static readonly System.Text.Json.JsonEncodedText VariantTextClassification = System.Text.Json.JsonEncodedText.Encode("text_classification");
+	private static readonly System.Text.Json.JsonEncodedText VariantTextEmbedding = System.Text.Json.JsonEncodedText.Encode("text_embedding");
+	private static readonly System.Text.Json.JsonEncodedText VariantTextExpansion = System.Text.Json.JsonEncodedText.Encode("text_expansion");
+	private static readonly System.Text.Json.JsonEncodedText VariantZeroShotClassification = System.Text.Json.JsonEncodedText.Encode("zero_shot_classification");
+
+	public override InferenceConfigUpdate Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		var variantType = string.Empty;
+		object? variant = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			throw new JsonException("Expected start token.");
-		}
-
-		object? variantValue = default;
-		string? variantNameValue = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
-		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token.");
-			}
-
-			if (reader.TokenType != JsonTokenType.PropertyName)
+			if (reader.ValueTextEquals(VariantClassification))
 			{
-				throw new JsonException("Expected a property name token representing the name of an Elasticsearch field.");
-			}
-
-			var propertyName = reader.GetString();
-			reader.Read();
-			if (propertyName == "classification")
-			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.ClassificationInferenceOptions?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantClassification.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.ClassificationInferenceOptions?>(options);
 				continue;
 			}
 
-			if (propertyName == "fill_mask")
+			if (reader.ValueTextEquals(VariantFillMask))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.FillMaskInferenceUpdateOptions?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantFillMask.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.FillMaskInferenceUpdateOptions?>(options);
 				continue;
 			}
 
-			if (propertyName == "ner")
+			if (reader.ValueTextEquals(VariantNer))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.NerInferenceUpdateOptions?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantNer.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.NerInferenceUpdateOptions?>(options);
 				continue;
 			}
 
-			if (propertyName == "pass_through")
+			if (reader.ValueTextEquals(VariantPassThrough))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.PassThroughInferenceUpdateOptions?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantPassThrough.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.PassThroughInferenceUpdateOptions?>(options);
 				continue;
 			}
 
-			if (propertyName == "question_answering")
+			if (reader.ValueTextEquals(VariantQuestionAnswering))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.QuestionAnsweringInferenceUpdateOptions?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantQuestionAnswering.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.QuestionAnsweringInferenceUpdateOptions?>(options);
 				continue;
 			}
 
-			if (propertyName == "regression")
+			if (reader.ValueTextEquals(VariantRegression))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.RegressionInferenceOptions?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantRegression.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.RegressionInferenceOptions?>(options);
 				continue;
 			}
 
-			if (propertyName == "text_classification")
+			if (reader.ValueTextEquals(VariantTextClassification))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.TextClassificationInferenceUpdateOptions?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantTextClassification.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.TextClassificationInferenceUpdateOptions?>(options);
 				continue;
 			}
 
-			if (propertyName == "text_embedding")
+			if (reader.ValueTextEquals(VariantTextEmbedding))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.TextEmbeddingInferenceUpdateOptions?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantTextEmbedding.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.TextEmbeddingInferenceUpdateOptions?>(options);
 				continue;
 			}
 
-			if (propertyName == "text_expansion")
+			if (reader.ValueTextEquals(VariantTextExpansion))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.TextExpansionInferenceUpdateOptions?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantTextExpansion.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.TextExpansionInferenceUpdateOptions?>(options);
 				continue;
 			}
 
-			if (propertyName == "zero_shot_classification")
+			if (reader.ValueTextEquals(VariantZeroShotClassification))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.ZeroShotClassificationInferenceUpdateOptions?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantZeroShotClassification.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.ZeroShotClassificationInferenceUpdateOptions?>(options);
 				continue;
 			}
 
-			throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'InferenceConfigUpdate' from the response.");
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		var result = new InferenceConfigUpdate(variantNameValue, variantValue);
-		return result;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new InferenceConfigUpdate { VariantType = variantType, Variant = variant };
 	}
 
-	public override void Write(Utf8JsonWriter writer, InferenceConfigUpdate value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, InferenceConfigUpdate value, System.Text.Json.JsonSerializerOptions options)
 	{
 		writer.WriteStartObject();
-		if (value.VariantName is not null && value.Variant is not null)
+		switch (value.VariantType)
 		{
-			writer.WritePropertyName(value.VariantName);
-			switch (value.VariantName)
-			{
-				case "classification":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.ClassificationInferenceOptions>(writer, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.ClassificationInferenceOptions)value.Variant, options);
-					break;
-				case "fill_mask":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.FillMaskInferenceUpdateOptions>(writer, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.FillMaskInferenceUpdateOptions)value.Variant, options);
-					break;
-				case "ner":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.NerInferenceUpdateOptions>(writer, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.NerInferenceUpdateOptions)value.Variant, options);
-					break;
-				case "pass_through":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.PassThroughInferenceUpdateOptions>(writer, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.PassThroughInferenceUpdateOptions)value.Variant, options);
-					break;
-				case "question_answering":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.QuestionAnsweringInferenceUpdateOptions>(writer, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.QuestionAnsweringInferenceUpdateOptions)value.Variant, options);
-					break;
-				case "regression":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.RegressionInferenceOptions>(writer, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.RegressionInferenceOptions)value.Variant, options);
-					break;
-				case "text_classification":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.TextClassificationInferenceUpdateOptions>(writer, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.TextClassificationInferenceUpdateOptions)value.Variant, options);
-					break;
-				case "text_embedding":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.TextEmbeddingInferenceUpdateOptions>(writer, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.TextEmbeddingInferenceUpdateOptions)value.Variant, options);
-					break;
-				case "text_expansion":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.TextExpansionInferenceUpdateOptions>(writer, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.TextExpansionInferenceUpdateOptions)value.Variant, options);
-					break;
-				case "zero_shot_classification":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.ZeroShotClassificationInferenceUpdateOptions>(writer, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.ZeroShotClassificationInferenceUpdateOptions)value.Variant, options);
-					break;
-			}
+			case "":
+				break;
+			case "classification":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.ClassificationInferenceOptions?)value.Variant);
+				break;
+			case "fill_mask":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.FillMaskInferenceUpdateOptions?)value.Variant);
+				break;
+			case "ner":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.NerInferenceUpdateOptions?)value.Variant);
+				break;
+			case "pass_through":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.PassThroughInferenceUpdateOptions?)value.Variant);
+				break;
+			case "question_answering":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.QuestionAnsweringInferenceUpdateOptions?)value.Variant);
+				break;
+			case "regression":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.RegressionInferenceOptions?)value.Variant);
+				break;
+			case "text_classification":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.TextClassificationInferenceUpdateOptions?)value.Variant);
+				break;
+			case "text_embedding":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.TextEmbeddingInferenceUpdateOptions?)value.Variant);
+				break;
+			case "text_expansion":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.TextExpansionInferenceUpdateOptions?)value.Variant);
+				break;
+			case "zero_shot_classification":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.ZeroShotClassificationInferenceUpdateOptions?)value.Variant);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.VariantType}' is not supported for type '{nameof(InferenceConfigUpdate)}'.");
 		}
 
 		writer.WriteEndObject();
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/MachineLearning/InferenceResponseResult.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/MachineLearning/InferenceResponseResult.g.cs
index 17adcb46d84..fec46366df1 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/MachineLearning/InferenceResponseResult.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/MachineLearning/InferenceResponseResult.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,120 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.MachineLearning;
 
+internal sealed partial class InferenceResponseResultConverter : System.Text.Json.Serialization.JsonConverter<InferenceResponseResult>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropEntities = System.Text.Json.JsonEncodedText.Encode("entities");
+	private static readonly System.Text.Json.JsonEncodedText PropFeatureImportance = System.Text.Json.JsonEncodedText.Encode("feature_importance");
+	private static readonly System.Text.Json.JsonEncodedText PropIsTruncated = System.Text.Json.JsonEncodedText.Encode("is_truncated");
+	private static readonly System.Text.Json.JsonEncodedText PropPredictedValue = System.Text.Json.JsonEncodedText.Encode("predicted_value");
+	private static readonly System.Text.Json.JsonEncodedText PropPredictedValueSequence = System.Text.Json.JsonEncodedText.Encode("predicted_value_sequence");
+	private static readonly System.Text.Json.JsonEncodedText PropPredictionProbability = System.Text.Json.JsonEncodedText.Encode("prediction_probability");
+	private static readonly System.Text.Json.JsonEncodedText PropPredictionScore = System.Text.Json.JsonEncodedText.Encode("prediction_score");
+	private static readonly System.Text.Json.JsonEncodedText PropTopClasses = System.Text.Json.JsonEncodedText.Encode("top_classes");
+	private static readonly System.Text.Json.JsonEncodedText PropWarning = System.Text.Json.JsonEncodedText.Encode("warning");
+
+	public override InferenceResponseResult Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.TrainedModelEntities>?> propEntities = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.TrainedModelInferenceFeatureImportance>?> propFeatureImportance = default;
+		LocalJsonProperty<bool?> propIsTruncated = default;
+		LocalJsonProperty<IReadOnlyCollection<object>?> propPredictedValue = default;
+		LocalJsonProperty<string?> propPredictedValueSequence = default;
+		LocalJsonProperty<double?> propPredictionProbability = default;
+		LocalJsonProperty<double?> propPredictionScore = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.TopClassEntry>?> propTopClasses = default;
+		LocalJsonProperty<string?> propWarning = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propEntities.TryRead(ref reader, options, PropEntities))
+			{
+				continue;
+			}
+
+			if (propFeatureImportance.TryRead(ref reader, options, PropFeatureImportance))
+			{
+				continue;
+			}
+
+			if (propIsTruncated.TryRead(ref reader, options, PropIsTruncated))
+			{
+				continue;
+			}
+
+			if (propPredictedValue.TryRead(ref reader, options, PropPredictedValue, typeof(SingleOrManyMarker<IReadOnlyCollection<object>?, object>)))
+			{
+				continue;
+			}
+
+			if (propPredictedValueSequence.TryRead(ref reader, options, PropPredictedValueSequence))
+			{
+				continue;
+			}
+
+			if (propPredictionProbability.TryRead(ref reader, options, PropPredictionProbability))
+			{
+				continue;
+			}
+
+			if (propPredictionScore.TryRead(ref reader, options, PropPredictionScore))
+			{
+				continue;
+			}
+
+			if (propTopClasses.TryRead(ref reader, options, PropTopClasses))
+			{
+				continue;
+			}
+
+			if (propWarning.TryRead(ref reader, options, PropWarning))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new InferenceResponseResult
+		{
+			Entities = propEntities.Value
+,
+			FeatureImportance = propFeatureImportance.Value
+,
+			IsTruncated = propIsTruncated.Value
+,
+			PredictedValue = propPredictedValue.Value
+,
+			PredictedValueSequence = propPredictedValueSequence.Value
+,
+			PredictionProbability = propPredictionProbability.Value
+,
+			PredictionScore = propPredictionScore.Value
+,
+			TopClasses = propTopClasses.Value
+,
+			Warning = propWarning.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, InferenceResponseResult value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropEntities, value.Entities);
+		writer.WriteProperty(options, PropFeatureImportance, value.FeatureImportance);
+		writer.WriteProperty(options, PropIsTruncated, value.IsTruncated);
+		writer.WriteProperty(options, PropPredictedValue, value.PredictedValue, typeof(SingleOrManyMarker<IReadOnlyCollection<object>?, object>));
+		writer.WriteProperty(options, PropPredictedValueSequence, value.PredictedValueSequence);
+		writer.WriteProperty(options, PropPredictionProbability, value.PredictionProbability);
+		writer.WriteProperty(options, PropPredictionScore, value.PredictionScore);
+		writer.WriteProperty(options, PropTopClasses, value.TopClasses);
+		writer.WriteProperty(options, PropWarning, value.Warning);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(InferenceResponseResultConverter))]
 public sealed partial class InferenceResponseResult
 {
 	/// <summary>
@@ -34,7 +149,6 @@ public sealed partial class InferenceResponseResult
 	/// If the model is trained for named entity recognition (NER) tasks, the response contains the recognized entities.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("entities")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.TrainedModelEntities>? Entities { get; init; }
 
 	/// <summary>
@@ -42,7 +156,6 @@ public sealed partial class InferenceResponseResult
 	/// The feature importance for the inference results. Relevant only for classification or regression models
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("feature_importance")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.TrainedModelInferenceFeatureImportance>? FeatureImportance { get; init; }
 
 	/// <summary>
@@ -51,7 +164,6 @@ public sealed partial class InferenceResponseResult
 	/// is present only when it is true.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("is_truncated")]
 	public bool? IsTruncated { get; init; }
 
 	/// <summary>
@@ -65,8 +177,6 @@ public sealed partial class InferenceResponseResult
 	/// For classification models, it may be an integer, double, boolean or string depending on prediction type
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("predicted_value")]
-	[SingleOrManyCollectionConverter(typeof(object))]
 	public IReadOnlyCollection<object>? PredictedValue { get; init; }
 
 	/// <summary>
@@ -76,7 +186,6 @@ public sealed partial class InferenceResponseResult
 	/// Additionally
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("predicted_value_sequence")]
 	public string? PredictedValueSequence { get; init; }
 
 	/// <summary>
@@ -84,7 +193,6 @@ public sealed partial class InferenceResponseResult
 	/// Specifies a probability for the predicted value.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("prediction_probability")]
 	public double? PredictionProbability { get; init; }
 
 	/// <summary>
@@ -92,7 +200,6 @@ public sealed partial class InferenceResponseResult
 	/// Specifies a confidence score for the predicted value.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("prediction_score")]
 	public double? PredictionScore { get; init; }
 
 	/// <summary>
@@ -101,7 +208,6 @@ public sealed partial class InferenceResponseResult
 	/// class entries.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("top_classes")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.TopClassEntry>? TopClasses { get; init; }
 
 	/// <summary>
@@ -109,6 +215,5 @@ public sealed partial class InferenceResponseResult
 	/// If the request failed, the response contains the reason for the failure.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("warning")]
 	public string? Warning { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/MachineLearning/Preprocessor.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/MachineLearning/Preprocessor.g.cs
index ffce803e061..7b680126ba5 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/MachineLearning/Preprocessor.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/MachineLearning/Preprocessor.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -39,12 +40,16 @@ internal Preprocessor(string variantName, object variant)
 			throw new ArgumentNullException(nameof(variant));
 		if (string.IsNullOrWhiteSpace(variantName))
 			throw new ArgumentException("Variant name must not be empty or whitespace.");
-		VariantName = variantName;
+		VariantType = variantName;
 		Variant = variant;
 	}
 
-	internal object Variant { get; }
-	internal string VariantName { get; }
+	internal Preprocessor()
+	{
+	}
+
+	public object Variant { get; internal set; }
+	public string VariantType { get; internal set; }
 
 	public static Preprocessor FrequencyEncoding(Elastic.Clients.Elasticsearch.Serverless.MachineLearning.FrequencyEncodingPreprocessor frequencyEncodingPreprocessor) => new Preprocessor("frequency_encoding", frequencyEncodingPreprocessor);
 	public static Preprocessor OneHotEncoding(Elastic.Clients.Elasticsearch.Serverless.MachineLearning.OneHotEncodingPreprocessor oneHotEncodingPreprocessor) => new Preprocessor("one_hot_encoding", oneHotEncodingPreprocessor);
@@ -63,77 +68,68 @@ public bool TryGet<T>([NotNullWhen(true)] out T? result) where T : class
 	}
 }
 
-internal sealed partial class PreprocessorConverter : JsonConverter<Preprocessor>
+internal sealed partial class PreprocessorConverter : System.Text.Json.Serialization.JsonConverter<Preprocessor>
 {
-	public override Preprocessor Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-		{
-			throw new JsonException("Expected start token.");
-		}
+	private static readonly System.Text.Json.JsonEncodedText VariantFrequencyEncoding = System.Text.Json.JsonEncodedText.Encode("frequency_encoding");
+	private static readonly System.Text.Json.JsonEncodedText VariantOneHotEncoding = System.Text.Json.JsonEncodedText.Encode("one_hot_encoding");
+	private static readonly System.Text.Json.JsonEncodedText VariantTargetMeanEncoding = System.Text.Json.JsonEncodedText.Encode("target_mean_encoding");
 
-		object? variantValue = default;
-		string? variantNameValue = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+	public override Preprocessor Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		var variantType = string.Empty;
+		object? variant = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
+			if (reader.ValueTextEquals(VariantFrequencyEncoding))
 			{
-				throw new JsonException("Expected a property name token.");
-			}
-
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token representing the name of an Elasticsearch field.");
-			}
-
-			var propertyName = reader.GetString();
-			reader.Read();
-			if (propertyName == "frequency_encoding")
-			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.FrequencyEncodingPreprocessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantFrequencyEncoding.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.FrequencyEncodingPreprocessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "one_hot_encoding")
+			if (reader.ValueTextEquals(VariantOneHotEncoding))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.OneHotEncodingPreprocessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantOneHotEncoding.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.OneHotEncodingPreprocessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "target_mean_encoding")
+			if (reader.ValueTextEquals(VariantTargetMeanEncoding))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.TargetMeanEncodingPreprocessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantTargetMeanEncoding.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.TargetMeanEncodingPreprocessor?>(options);
 				continue;
 			}
 
-			throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'Preprocessor' from the response.");
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		var result = new Preprocessor(variantNameValue, variantValue);
-		return result;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new Preprocessor { VariantType = variantType, Variant = variant };
 	}
 
-	public override void Write(Utf8JsonWriter writer, Preprocessor value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, Preprocessor value, System.Text.Json.JsonSerializerOptions options)
 	{
 		writer.WriteStartObject();
-		if (value.VariantName is not null && value.Variant is not null)
+		switch (value.VariantType)
 		{
-			writer.WritePropertyName(value.VariantName);
-			switch (value.VariantName)
-			{
-				case "frequency_encoding":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.FrequencyEncodingPreprocessor>(writer, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.FrequencyEncodingPreprocessor)value.Variant, options);
-					break;
-				case "one_hot_encoding":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.OneHotEncodingPreprocessor>(writer, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.OneHotEncodingPreprocessor)value.Variant, options);
-					break;
-				case "target_mean_encoding":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.TargetMeanEncodingPreprocessor>(writer, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.TargetMeanEncodingPreprocessor)value.Variant, options);
-					break;
-			}
+			case "":
+				break;
+			case "frequency_encoding":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.FrequencyEncodingPreprocessor?)value.Variant);
+				break;
+			case "one_hot_encoding":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.OneHotEncodingPreprocessor?)value.Variant);
+				break;
+			case "target_mean_encoding":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.TargetMeanEncodingPreprocessor?)value.Variant);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.VariantType}' is not supported for type '{nameof(Preprocessor)}'.");
 		}
 
 		writer.WriteEndObject();
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/MachineLearning/TokenizationConfig.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/MachineLearning/TokenizationConfig.g.cs
index fb54aca32fc..df1204ccae3 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/MachineLearning/TokenizationConfig.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/MachineLearning/TokenizationConfig.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -44,12 +45,16 @@ internal TokenizationConfig(string variantName, object variant)
 			throw new ArgumentNullException(nameof(variant));
 		if (string.IsNullOrWhiteSpace(variantName))
 			throw new ArgumentException("Variant name must not be empty or whitespace.");
-		VariantName = variantName;
+		VariantType = variantName;
 		Variant = variant;
 	}
 
-	internal object Variant { get; }
-	internal string VariantName { get; }
+	internal TokenizationConfig()
+	{
+	}
+
+	public object Variant { get; internal set; }
+	public string VariantType { get; internal set; }
 
 	public static TokenizationConfig Bert(Elastic.Clients.Elasticsearch.Serverless.MachineLearning.NlpBertTokenizationConfig nlpBertTokenizationConfig) => new TokenizationConfig("bert", nlpBertTokenizationConfig);
 	public static TokenizationConfig BertJa(Elastic.Clients.Elasticsearch.Serverless.MachineLearning.NlpBertTokenizationConfig nlpBertTokenizationConfig) => new TokenizationConfig("bert_ja", nlpBertTokenizationConfig);
@@ -69,87 +74,80 @@ public bool TryGet<T>([NotNullWhen(true)] out T? result) where T : class
 	}
 }
 
-internal sealed partial class TokenizationConfigConverter : JsonConverter<TokenizationConfig>
+internal sealed partial class TokenizationConfigConverter : System.Text.Json.Serialization.JsonConverter<TokenizationConfig>
 {
-	public override TokenizationConfig Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-		{
-			throw new JsonException("Expected start token.");
-		}
+	private static readonly System.Text.Json.JsonEncodedText VariantBert = System.Text.Json.JsonEncodedText.Encode("bert");
+	private static readonly System.Text.Json.JsonEncodedText VariantBertJa = System.Text.Json.JsonEncodedText.Encode("bert_ja");
+	private static readonly System.Text.Json.JsonEncodedText VariantMpnet = System.Text.Json.JsonEncodedText.Encode("mpnet");
+	private static readonly System.Text.Json.JsonEncodedText VariantRoberta = System.Text.Json.JsonEncodedText.Encode("roberta");
 
-		object? variantValue = default;
-		string? variantNameValue = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+	public override TokenizationConfig Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		var variantType = string.Empty;
+		object? variant = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
+			if (reader.ValueTextEquals(VariantBert))
 			{
-				throw new JsonException("Expected a property name token.");
-			}
-
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token representing the name of an Elasticsearch field.");
-			}
-
-			var propertyName = reader.GetString();
-			reader.Read();
-			if (propertyName == "bert")
-			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.NlpBertTokenizationConfig?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantBert.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.NlpBertTokenizationConfig?>(options);
 				continue;
 			}
 
-			if (propertyName == "bert_ja")
+			if (reader.ValueTextEquals(VariantBertJa))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.NlpBertTokenizationConfig?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantBertJa.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.NlpBertTokenizationConfig?>(options);
 				continue;
 			}
 
-			if (propertyName == "mpnet")
+			if (reader.ValueTextEquals(VariantMpnet))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.NlpBertTokenizationConfig?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantMpnet.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.NlpBertTokenizationConfig?>(options);
 				continue;
 			}
 
-			if (propertyName == "roberta")
+			if (reader.ValueTextEquals(VariantRoberta))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.NlpRobertaTokenizationConfig?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantRoberta.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.NlpRobertaTokenizationConfig?>(options);
 				continue;
 			}
 
-			throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'TokenizationConfig' from the response.");
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		var result = new TokenizationConfig(variantNameValue, variantValue);
-		return result;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new TokenizationConfig { VariantType = variantType, Variant = variant };
 	}
 
-	public override void Write(Utf8JsonWriter writer, TokenizationConfig value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, TokenizationConfig value, System.Text.Json.JsonSerializerOptions options)
 	{
 		writer.WriteStartObject();
-		if (value.VariantName is not null && value.Variant is not null)
+		switch (value.VariantType)
 		{
-			writer.WritePropertyName(value.VariantName);
-			switch (value.VariantName)
-			{
-				case "bert":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.NlpBertTokenizationConfig>(writer, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.NlpBertTokenizationConfig)value.Variant, options);
-					break;
-				case "bert_ja":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.NlpBertTokenizationConfig>(writer, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.NlpBertTokenizationConfig)value.Variant, options);
-					break;
-				case "mpnet":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.NlpBertTokenizationConfig>(writer, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.NlpBertTokenizationConfig)value.Variant, options);
-					break;
-				case "roberta":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.MachineLearning.NlpRobertaTokenizationConfig>(writer, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.NlpRobertaTokenizationConfig)value.Variant, options);
-					break;
-			}
+			case "":
+				break;
+			case "bert":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.NlpBertTokenizationConfig?)value.Variant);
+				break;
+			case "bert_ja":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.NlpBertTokenizationConfig?)value.Variant);
+				break;
+			case "mpnet":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.NlpBertTokenizationConfig?)value.Variant);
+				break;
+			case "roberta":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.MachineLearning.NlpRobertaTokenizationConfig?)value.Variant);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.VariantType}' is not supported for type '{nameof(TokenizationConfig)}'.");
 		}
 
 		writer.WriteEndObject();
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/BinaryProperty.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/BinaryProperty.g.cs
index b28e2cb4305..2b2ed79c90a 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/BinaryProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/BinaryProperty.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,18 +28,124 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Mapping;
 
+internal sealed partial class BinaryPropertyConverter : System.Text.Json.Serialization.JsonConverter<BinaryProperty>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCopyTo = System.Text.Json.JsonEncodedText.Encode("copy_to");
+	private static readonly System.Text.Json.JsonEncodedText PropDocValues = System.Text.Json.JsonEncodedText.Encode("doc_values");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamic = System.Text.Json.JsonEncodedText.Encode("dynamic");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreAbove = System.Text.Json.JsonEncodedText.Encode("ignore_above");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropProperties = System.Text.Json.JsonEncodedText.Encode("properties");
+	private static readonly System.Text.Json.JsonEncodedText PropStore = System.Text.Json.JsonEncodedText.Encode("store");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override BinaryProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Fields?> propCopyTo = default;
+		LocalJsonProperty<bool?> propDocValues = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicMapping?> propDynamic = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties?> propFields = default;
+		LocalJsonProperty<int?> propIgnoreAbove = default;
+		LocalJsonProperty<IDictionary<string, string>?> propMeta = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties?> propProperties = default;
+		LocalJsonProperty<bool?> propStore = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCopyTo.TryRead(ref reader, options, PropCopyTo, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propDocValues.TryRead(ref reader, options, PropDocValues))
+			{
+				continue;
+			}
+
+			if (propDynamic.TryRead(ref reader, options, PropDynamic))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propIgnoreAbove.TryRead(ref reader, options, PropIgnoreAbove))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propProperties.TryRead(ref reader, options, PropProperties))
+			{
+				continue;
+			}
+
+			if (propStore.TryRead(ref reader, options, PropStore))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new BinaryProperty
+		{
+			CopyTo = propCopyTo.Value
+,
+			DocValues = propDocValues.Value
+,
+			Dynamic = propDynamic.Value
+,
+			Fields = propFields.Value
+,
+			IgnoreAbove = propIgnoreAbove.Value
+,
+			Meta = propMeta.Value
+,
+			Properties = propProperties.Value
+,
+			Store = propStore.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, BinaryProperty value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCopyTo, value.CopyTo, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropDocValues, value.DocValues);
+		writer.WriteProperty(options, PropDynamic, value.Dynamic);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropIgnoreAbove, value.IgnoreAbove);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropProperties, value.Properties);
+		writer.WriteProperty(options, PropStore, value.Store);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(BinaryPropertyConverter))]
 public sealed partial class BinaryProperty : IProperty
 {
-	[JsonInclude, JsonPropertyName("copy_to")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Serverless.Fields? CopyTo { get; set; }
-	[JsonInclude, JsonPropertyName("doc_values")]
 	public bool? DocValues { get; set; }
-	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicMapping? Dynamic { get; set; }
-	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties? Fields { get; set; }
-	[JsonInclude, JsonPropertyName("ignore_above")]
 	public int? IgnoreAbove { get; set; }
 
 	/// <summary>
@@ -46,14 +153,10 @@ public sealed partial class BinaryProperty : IProperty
 	/// Metadata about the field.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties? Properties { get; set; }
-	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "binary";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/BooleanProperty.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/BooleanProperty.g.cs
index 590190c8b1e..01ef30cff37 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/BooleanProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/BooleanProperty.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,24 +28,167 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Mapping;
 
+internal sealed partial class BooleanPropertyConverter : System.Text.Json.Serialization.JsonConverter<BooleanProperty>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropCopyTo = System.Text.Json.JsonEncodedText.Encode("copy_to");
+	private static readonly System.Text.Json.JsonEncodedText PropDocValues = System.Text.Json.JsonEncodedText.Encode("doc_values");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamic = System.Text.Json.JsonEncodedText.Encode("dynamic");
+	private static readonly System.Text.Json.JsonEncodedText PropFielddata = System.Text.Json.JsonEncodedText.Encode("fielddata");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreAbove = System.Text.Json.JsonEncodedText.Encode("ignore_above");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropNullValue = System.Text.Json.JsonEncodedText.Encode("null_value");
+	private static readonly System.Text.Json.JsonEncodedText PropProperties = System.Text.Json.JsonEncodedText.Encode("properties");
+	private static readonly System.Text.Json.JsonEncodedText PropStore = System.Text.Json.JsonEncodedText.Encode("store");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override BooleanProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<double?> propBoost = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Fields?> propCopyTo = default;
+		LocalJsonProperty<bool?> propDocValues = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicMapping?> propDynamic = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.NumericFielddata?> propFielddata = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties?> propFields = default;
+		LocalJsonProperty<int?> propIgnoreAbove = default;
+		LocalJsonProperty<bool?> propIndex = default;
+		LocalJsonProperty<IDictionary<string, string>?> propMeta = default;
+		LocalJsonProperty<bool?> propNullValue = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties?> propProperties = default;
+		LocalJsonProperty<bool?> propStore = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
+
+			if (propCopyTo.TryRead(ref reader, options, PropCopyTo, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propDocValues.TryRead(ref reader, options, PropDocValues))
+			{
+				continue;
+			}
+
+			if (propDynamic.TryRead(ref reader, options, PropDynamic))
+			{
+				continue;
+			}
+
+			if (propFielddata.TryRead(ref reader, options, PropFielddata))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propIgnoreAbove.TryRead(ref reader, options, PropIgnoreAbove))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propNullValue.TryRead(ref reader, options, PropNullValue))
+			{
+				continue;
+			}
+
+			if (propProperties.TryRead(ref reader, options, PropProperties))
+			{
+				continue;
+			}
+
+			if (propStore.TryRead(ref reader, options, PropStore))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new BooleanProperty
+		{
+			Boost = propBoost.Value
+,
+			CopyTo = propCopyTo.Value
+,
+			DocValues = propDocValues.Value
+,
+			Dynamic = propDynamic.Value
+,
+			Fielddata = propFielddata.Value
+,
+			Fields = propFields.Value
+,
+			IgnoreAbove = propIgnoreAbove.Value
+,
+			Index = propIndex.Value
+,
+			Meta = propMeta.Value
+,
+			NullValue = propNullValue.Value
+,
+			Properties = propProperties.Value
+,
+			Store = propStore.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, BooleanProperty value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropCopyTo, value.CopyTo, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropDocValues, value.DocValues);
+		writer.WriteProperty(options, PropDynamic, value.Dynamic);
+		writer.WriteProperty(options, PropFielddata, value.Fielddata);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropIgnoreAbove, value.IgnoreAbove);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropNullValue, value.NullValue);
+		writer.WriteProperty(options, PropProperties, value.Properties);
+		writer.WriteProperty(options, PropStore, value.Store);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(BooleanPropertyConverter))]
 public sealed partial class BooleanProperty : IProperty
 {
-	[JsonInclude, JsonPropertyName("boost")]
 	public double? Boost { get; set; }
-	[JsonInclude, JsonPropertyName("copy_to")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Serverless.Fields? CopyTo { get; set; }
-	[JsonInclude, JsonPropertyName("doc_values")]
 	public bool? DocValues { get; set; }
-	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicMapping? Dynamic { get; set; }
-	[JsonInclude, JsonPropertyName("fielddata")]
 	public Elastic.Clients.Elasticsearch.Serverless.IndexManagement.NumericFielddata? Fielddata { get; set; }
-	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties? Fields { get; set; }
-	[JsonInclude, JsonPropertyName("ignore_above")]
 	public int? IgnoreAbove { get; set; }
-	[JsonInclude, JsonPropertyName("index")]
 	public bool? Index { get; set; }
 
 	/// <summary>
@@ -52,16 +196,11 @@ public sealed partial class BooleanProperty : IProperty
 	/// Metadata about the field.
 	/// </para>
 	/// </summary>
-	[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.Serverless.Mapping.Properties? Properties { get; set; }
-	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "boolean";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/ByteNumberProperty.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/ByteNumberProperty.g.cs
index bc24858541b..aa429115100 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/ByteNumberProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/ByteNumberProperty.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,26 +28,198 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Mapping;
 
+internal sealed partial class ByteNumberPropertyConverter : System.Text.Json.Serialization.JsonConverter<ByteNumberProperty>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropCoerce = System.Text.Json.JsonEncodedText.Encode("coerce");
+	private static readonly System.Text.Json.JsonEncodedText PropCopyTo = System.Text.Json.JsonEncodedText.Encode("copy_to");
+	private static readonly System.Text.Json.JsonEncodedText PropDocValues = System.Text.Json.JsonEncodedText.Encode("doc_values");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamic = System.Text.Json.JsonEncodedText.Encode("dynamic");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreAbove = System.Text.Json.JsonEncodedText.Encode("ignore_above");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreMalformed = System.Text.Json.JsonEncodedText.Encode("ignore_malformed");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropNullValue = System.Text.Json.JsonEncodedText.Encode("null_value");
+	private static readonly System.Text.Json.JsonEncodedText PropOnScriptError = System.Text.Json.JsonEncodedText.Encode("on_script_error");
+	private static readonly System.Text.Json.JsonEncodedText PropProperties = System.Text.Json.JsonEncodedText.Encode("properties");
+	private static readonly System.Text.Json.JsonEncodedText PropScript = System.Text.Json.JsonEncodedText.Encode("script");
+	private static readonly System.Text.Json.JsonEncodedText PropStore = System.Text.Json.JsonEncodedText.Encode("store");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override ByteNumberProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<double?> propBoost = default;
+		LocalJsonProperty<bool?> propCoerce = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Fields?> propCopyTo = default;
+		LocalJsonProperty<bool?> propDocValues = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicMapping?> propDynamic = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties?> propFields = default;
+		LocalJsonProperty<int?> propIgnoreAbove = default;
+		LocalJsonProperty<bool?> propIgnoreMalformed = default;
+		LocalJsonProperty<bool?> propIndex = default;
+		LocalJsonProperty<IDictionary<string, string>?> propMeta = default;
+		LocalJsonProperty<byte?> propNullValue = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.OnScriptError?> propOnScriptError = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties?> propProperties = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Script?> propScript = default;
+		LocalJsonProperty<bool?> propStore = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
+
+			if (propCoerce.TryRead(ref reader, options, PropCoerce))
+			{
+				continue;
+			}
+
+			if (propCopyTo.TryRead(ref reader, options, PropCopyTo, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propDocValues.TryRead(ref reader, options, PropDocValues))
+			{
+				continue;
+			}
+
+			if (propDynamic.TryRead(ref reader, options, PropDynamic))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propIgnoreAbove.TryRead(ref reader, options, PropIgnoreAbove))
+			{
+				continue;
+			}
+
+			if (propIgnoreMalformed.TryRead(ref reader, options, PropIgnoreMalformed))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propNullValue.TryRead(ref reader, options, PropNullValue))
+			{
+				continue;
+			}
+
+			if (propOnScriptError.TryRead(ref reader, options, PropOnScriptError))
+			{
+				continue;
+			}
+
+			if (propProperties.TryRead(ref reader, options, PropProperties))
+			{
+				continue;
+			}
+
+			if (propScript.TryRead(ref reader, options, PropScript))
+			{
+				continue;
+			}
+
+			if (propStore.TryRead(ref reader, options, PropStore))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ByteNumberProperty
+		{
+			Boost = propBoost.Value
+,
+			Coerce = propCoerce.Value
+,
+			CopyTo = propCopyTo.Value
+,
+			DocValues = propDocValues.Value
+,
+			Dynamic = propDynamic.Value
+,
+			Fields = propFields.Value
+,
+			IgnoreAbove = propIgnoreAbove.Value
+,
+			IgnoreMalformed = propIgnoreMalformed.Value
+,
+			Index = propIndex.Value
+,
+			Meta = propMeta.Value
+,
+			NullValue = propNullValue.Value
+,
+			OnScriptError = propOnScriptError.Value
+,
+			Properties = propProperties.Value
+,
+			Script = propScript.Value
+,
+			Store = propStore.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ByteNumberProperty value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropCoerce, value.Coerce);
+		writer.WriteProperty(options, PropCopyTo, value.CopyTo, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropDocValues, value.DocValues);
+		writer.WriteProperty(options, PropDynamic, value.Dynamic);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropIgnoreAbove, value.IgnoreAbove);
+		writer.WriteProperty(options, PropIgnoreMalformed, value.IgnoreMalformed);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropNullValue, value.NullValue);
+		writer.WriteProperty(options, PropOnScriptError, value.OnScriptError);
+		writer.WriteProperty(options, PropProperties, value.Properties);
+		writer.WriteProperty(options, PropScript, value.Script);
+		writer.WriteProperty(options, PropStore, value.Store);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ByteNumberPropertyConverter))]
 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")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Serverless.Fields? CopyTo { get; set; }
-	[JsonInclude, JsonPropertyName("doc_values")]
 	public bool? DocValues { get; set; }
-	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicMapping? Dynamic { get; set; }
-	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Serverless.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; }
 
 	/// <summary>
@@ -54,20 +227,13 @@ public sealed partial class ByteNumberProperty : IProperty
 	/// Metadata about the field.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-	[JsonInclude, JsonPropertyName("null_value")]
 	public byte? NullValue { get; set; }
-	[JsonInclude, JsonPropertyName("on_script_error")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.OnScriptError? OnScriptError { get; set; }
-	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties? Properties { get; set; }
-	[JsonInclude, JsonPropertyName("script")]
 	public Elastic.Clients.Elasticsearch.Serverless.Script? Script { get; set; }
-	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "byte";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/CompletionProperty.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/CompletionProperty.g.cs
index 68c7d5053b5..e4b3fc1aed4 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/CompletionProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/CompletionProperty.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,24 +28,187 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Mapping;
 
+internal sealed partial class CompletionPropertyConverter : System.Text.Json.Serialization.JsonConverter<CompletionProperty>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAnalyzer = System.Text.Json.JsonEncodedText.Encode("analyzer");
+	private static readonly System.Text.Json.JsonEncodedText PropContexts = System.Text.Json.JsonEncodedText.Encode("contexts");
+	private static readonly System.Text.Json.JsonEncodedText PropCopyTo = System.Text.Json.JsonEncodedText.Encode("copy_to");
+	private static readonly System.Text.Json.JsonEncodedText PropDocValues = System.Text.Json.JsonEncodedText.Encode("doc_values");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamic = System.Text.Json.JsonEncodedText.Encode("dynamic");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreAbove = System.Text.Json.JsonEncodedText.Encode("ignore_above");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxInputLength = System.Text.Json.JsonEncodedText.Encode("max_input_length");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropPreservePositionIncrements = System.Text.Json.JsonEncodedText.Encode("preserve_position_increments");
+	private static readonly System.Text.Json.JsonEncodedText PropPreserveSeparators = System.Text.Json.JsonEncodedText.Encode("preserve_separators");
+	private static readonly System.Text.Json.JsonEncodedText PropProperties = System.Text.Json.JsonEncodedText.Encode("properties");
+	private static readonly System.Text.Json.JsonEncodedText PropSearchAnalyzer = System.Text.Json.JsonEncodedText.Encode("search_analyzer");
+	private static readonly System.Text.Json.JsonEncodedText PropStore = System.Text.Json.JsonEncodedText.Encode("store");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override CompletionProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string?> propAnalyzer = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.Mapping.SuggestContext>?> propContexts = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Fields?> propCopyTo = default;
+		LocalJsonProperty<bool?> propDocValues = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicMapping?> propDynamic = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties?> propFields = default;
+		LocalJsonProperty<int?> propIgnoreAbove = default;
+		LocalJsonProperty<int?> propMaxInputLength = default;
+		LocalJsonProperty<IDictionary<string, string>?> propMeta = default;
+		LocalJsonProperty<bool?> propPreservePositionIncrements = default;
+		LocalJsonProperty<bool?> propPreserveSeparators = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties?> propProperties = default;
+		LocalJsonProperty<string?> propSearchAnalyzer = default;
+		LocalJsonProperty<bool?> propStore = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAnalyzer.TryRead(ref reader, options, PropAnalyzer))
+			{
+				continue;
+			}
+
+			if (propContexts.TryRead(ref reader, options, PropContexts))
+			{
+				continue;
+			}
+
+			if (propCopyTo.TryRead(ref reader, options, PropCopyTo, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propDocValues.TryRead(ref reader, options, PropDocValues))
+			{
+				continue;
+			}
+
+			if (propDynamic.TryRead(ref reader, options, PropDynamic))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propIgnoreAbove.TryRead(ref reader, options, PropIgnoreAbove))
+			{
+				continue;
+			}
+
+			if (propMaxInputLength.TryRead(ref reader, options, PropMaxInputLength))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propPreservePositionIncrements.TryRead(ref reader, options, PropPreservePositionIncrements))
+			{
+				continue;
+			}
+
+			if (propPreserveSeparators.TryRead(ref reader, options, PropPreserveSeparators))
+			{
+				continue;
+			}
+
+			if (propProperties.TryRead(ref reader, options, PropProperties))
+			{
+				continue;
+			}
+
+			if (propSearchAnalyzer.TryRead(ref reader, options, PropSearchAnalyzer))
+			{
+				continue;
+			}
+
+			if (propStore.TryRead(ref reader, options, PropStore))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new CompletionProperty
+		{
+			Analyzer = propAnalyzer.Value
+,
+			Contexts = propContexts.Value
+,
+			CopyTo = propCopyTo.Value
+,
+			DocValues = propDocValues.Value
+,
+			Dynamic = propDynamic.Value
+,
+			Fields = propFields.Value
+,
+			IgnoreAbove = propIgnoreAbove.Value
+,
+			MaxInputLength = propMaxInputLength.Value
+,
+			Meta = propMeta.Value
+,
+			PreservePositionIncrements = propPreservePositionIncrements.Value
+,
+			PreserveSeparators = propPreserveSeparators.Value
+,
+			Properties = propProperties.Value
+,
+			SearchAnalyzer = propSearchAnalyzer.Value
+,
+			Store = propStore.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, CompletionProperty value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAnalyzer, value.Analyzer);
+		writer.WriteProperty(options, PropContexts, value.Contexts);
+		writer.WriteProperty(options, PropCopyTo, value.CopyTo, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropDocValues, value.DocValues);
+		writer.WriteProperty(options, PropDynamic, value.Dynamic);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropIgnoreAbove, value.IgnoreAbove);
+		writer.WriteProperty(options, PropMaxInputLength, value.MaxInputLength);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropPreservePositionIncrements, value.PreservePositionIncrements);
+		writer.WriteProperty(options, PropPreserveSeparators, value.PreserveSeparators);
+		writer.WriteProperty(options, PropProperties, value.Properties);
+		writer.WriteProperty(options, PropSearchAnalyzer, value.SearchAnalyzer);
+		writer.WriteProperty(options, PropStore, value.Store);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(CompletionPropertyConverter))]
 public sealed partial class CompletionProperty : IProperty
 {
-	[JsonInclude, JsonPropertyName("analyzer")]
 	public string? Analyzer { get; set; }
-	[JsonInclude, JsonPropertyName("contexts")]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.Mapping.SuggestContext>? Contexts { get; set; }
-	[JsonInclude, JsonPropertyName("copy_to")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Serverless.Fields? CopyTo { get; set; }
-	[JsonInclude, JsonPropertyName("doc_values")]
 	public bool? DocValues { get; set; }
-	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicMapping? Dynamic { get; set; }
-	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties? Fields { get; set; }
-	[JsonInclude, JsonPropertyName("ignore_above")]
 	public int? IgnoreAbove { get; set; }
-	[JsonInclude, JsonPropertyName("max_input_length")]
 	public int? MaxInputLength { get; set; }
 
 	/// <summary>
@@ -52,20 +216,13 @@ public sealed partial class CompletionProperty : IProperty
 	/// Metadata about the field.
 	/// </para>
 	/// </summary>
-	[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.Serverless.Mapping.Properties? Properties { get; set; }
-	[JsonInclude, JsonPropertyName("search_analyzer")]
 	public string? SearchAnalyzer { get; set; }
-	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "completion";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/DateNanosProperty.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/DateNanosProperty.g.cs
index 9cc89e12a5b..457b33346d1 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/DateNanosProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/DateNanosProperty.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,26 +28,188 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Mapping;
 
+internal sealed partial class DateNanosPropertyConverter : System.Text.Json.Serialization.JsonConverter<DateNanosProperty>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropCopyTo = System.Text.Json.JsonEncodedText.Encode("copy_to");
+	private static readonly System.Text.Json.JsonEncodedText PropDocValues = System.Text.Json.JsonEncodedText.Encode("doc_values");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamic = System.Text.Json.JsonEncodedText.Encode("dynamic");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropFormat = System.Text.Json.JsonEncodedText.Encode("format");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreAbove = System.Text.Json.JsonEncodedText.Encode("ignore_above");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreMalformed = System.Text.Json.JsonEncodedText.Encode("ignore_malformed");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropNullValue = System.Text.Json.JsonEncodedText.Encode("null_value");
+	private static readonly System.Text.Json.JsonEncodedText PropPrecisionStep = System.Text.Json.JsonEncodedText.Encode("precision_step");
+	private static readonly System.Text.Json.JsonEncodedText PropProperties = System.Text.Json.JsonEncodedText.Encode("properties");
+	private static readonly System.Text.Json.JsonEncodedText PropStore = System.Text.Json.JsonEncodedText.Encode("store");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override DateNanosProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<double?> propBoost = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Fields?> propCopyTo = default;
+		LocalJsonProperty<bool?> propDocValues = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicMapping?> propDynamic = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties?> propFields = default;
+		LocalJsonProperty<string?> propFormat = default;
+		LocalJsonProperty<int?> propIgnoreAbove = default;
+		LocalJsonProperty<bool?> propIgnoreMalformed = default;
+		LocalJsonProperty<bool?> propIndex = default;
+		LocalJsonProperty<IDictionary<string, string>?> propMeta = default;
+		LocalJsonProperty<DateTimeOffset?> propNullValue = default;
+		LocalJsonProperty<int?> propPrecisionStep = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties?> propProperties = default;
+		LocalJsonProperty<bool?> propStore = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
+
+			if (propCopyTo.TryRead(ref reader, options, PropCopyTo, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propDocValues.TryRead(ref reader, options, PropDocValues))
+			{
+				continue;
+			}
+
+			if (propDynamic.TryRead(ref reader, options, PropDynamic))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propFormat.TryRead(ref reader, options, PropFormat))
+			{
+				continue;
+			}
+
+			if (propIgnoreAbove.TryRead(ref reader, options, PropIgnoreAbove))
+			{
+				continue;
+			}
+
+			if (propIgnoreMalformed.TryRead(ref reader, options, PropIgnoreMalformed))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propNullValue.TryRead(ref reader, options, PropNullValue))
+			{
+				continue;
+			}
+
+			if (propPrecisionStep.TryRead(ref reader, options, PropPrecisionStep))
+			{
+				continue;
+			}
+
+			if (propProperties.TryRead(ref reader, options, PropProperties))
+			{
+				continue;
+			}
+
+			if (propStore.TryRead(ref reader, options, PropStore))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DateNanosProperty
+		{
+			Boost = propBoost.Value
+,
+			CopyTo = propCopyTo.Value
+,
+			DocValues = propDocValues.Value
+,
+			Dynamic = propDynamic.Value
+,
+			Fields = propFields.Value
+,
+			Format = propFormat.Value
+,
+			IgnoreAbove = propIgnoreAbove.Value
+,
+			IgnoreMalformed = propIgnoreMalformed.Value
+,
+			Index = propIndex.Value
+,
+			Meta = propMeta.Value
+,
+			NullValue = propNullValue.Value
+,
+			PrecisionStep = propPrecisionStep.Value
+,
+			Properties = propProperties.Value
+,
+			Store = propStore.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DateNanosProperty value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropCopyTo, value.CopyTo, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropDocValues, value.DocValues);
+		writer.WriteProperty(options, PropDynamic, value.Dynamic);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropFormat, value.Format);
+		writer.WriteProperty(options, PropIgnoreAbove, value.IgnoreAbove);
+		writer.WriteProperty(options, PropIgnoreMalformed, value.IgnoreMalformed);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropNullValue, value.NullValue);
+		writer.WriteProperty(options, PropPrecisionStep, value.PrecisionStep);
+		writer.WriteProperty(options, PropProperties, value.Properties);
+		writer.WriteProperty(options, PropStore, value.Store);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DateNanosPropertyConverter))]
 public sealed partial class DateNanosProperty : IProperty
 {
-	[JsonInclude, JsonPropertyName("boost")]
 	public double? Boost { get; set; }
-	[JsonInclude, JsonPropertyName("copy_to")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Serverless.Fields? CopyTo { get; set; }
-	[JsonInclude, JsonPropertyName("doc_values")]
 	public bool? DocValues { get; set; }
-	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicMapping? Dynamic { get; set; }
-	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Serverless.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; }
 
 	/// <summary>
@@ -54,18 +217,12 @@ public sealed partial class DateNanosProperty : IProperty
 	/// Metadata about the field.
 	/// </para>
 	/// </summary>
-	[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.Serverless.Mapping.Properties? Properties { get; set; }
-	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "date_nanos";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/DateProperty.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/DateProperty.g.cs
index 01298193afb..e0232e2542a 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/DateProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/DateProperty.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,30 +28,210 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Mapping;
 
+internal sealed partial class DatePropertyConverter : System.Text.Json.Serialization.JsonConverter<DateProperty>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropCopyTo = System.Text.Json.JsonEncodedText.Encode("copy_to");
+	private static readonly System.Text.Json.JsonEncodedText PropDocValues = System.Text.Json.JsonEncodedText.Encode("doc_values");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamic = System.Text.Json.JsonEncodedText.Encode("dynamic");
+	private static readonly System.Text.Json.JsonEncodedText PropFielddata = System.Text.Json.JsonEncodedText.Encode("fielddata");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropFormat = System.Text.Json.JsonEncodedText.Encode("format");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreAbove = System.Text.Json.JsonEncodedText.Encode("ignore_above");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreMalformed = System.Text.Json.JsonEncodedText.Encode("ignore_malformed");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropLocale = System.Text.Json.JsonEncodedText.Encode("locale");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropNullValue = System.Text.Json.JsonEncodedText.Encode("null_value");
+	private static readonly System.Text.Json.JsonEncodedText PropPrecisionStep = System.Text.Json.JsonEncodedText.Encode("precision_step");
+	private static readonly System.Text.Json.JsonEncodedText PropProperties = System.Text.Json.JsonEncodedText.Encode("properties");
+	private static readonly System.Text.Json.JsonEncodedText PropStore = System.Text.Json.JsonEncodedText.Encode("store");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override DateProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<double?> propBoost = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Fields?> propCopyTo = default;
+		LocalJsonProperty<bool?> propDocValues = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicMapping?> propDynamic = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.NumericFielddata?> propFielddata = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties?> propFields = default;
+		LocalJsonProperty<string?> propFormat = default;
+		LocalJsonProperty<int?> propIgnoreAbove = default;
+		LocalJsonProperty<bool?> propIgnoreMalformed = default;
+		LocalJsonProperty<bool?> propIndex = default;
+		LocalJsonProperty<string?> propLocale = default;
+		LocalJsonProperty<IDictionary<string, string>?> propMeta = default;
+		LocalJsonProperty<DateTimeOffset?> propNullValue = default;
+		LocalJsonProperty<int?> propPrecisionStep = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties?> propProperties = default;
+		LocalJsonProperty<bool?> propStore = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
+
+			if (propCopyTo.TryRead(ref reader, options, PropCopyTo, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propDocValues.TryRead(ref reader, options, PropDocValues))
+			{
+				continue;
+			}
+
+			if (propDynamic.TryRead(ref reader, options, PropDynamic))
+			{
+				continue;
+			}
+
+			if (propFielddata.TryRead(ref reader, options, PropFielddata))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propFormat.TryRead(ref reader, options, PropFormat))
+			{
+				continue;
+			}
+
+			if (propIgnoreAbove.TryRead(ref reader, options, PropIgnoreAbove))
+			{
+				continue;
+			}
+
+			if (propIgnoreMalformed.TryRead(ref reader, options, PropIgnoreMalformed))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propLocale.TryRead(ref reader, options, PropLocale))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propNullValue.TryRead(ref reader, options, PropNullValue))
+			{
+				continue;
+			}
+
+			if (propPrecisionStep.TryRead(ref reader, options, PropPrecisionStep))
+			{
+				continue;
+			}
+
+			if (propProperties.TryRead(ref reader, options, PropProperties))
+			{
+				continue;
+			}
+
+			if (propStore.TryRead(ref reader, options, PropStore))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DateProperty
+		{
+			Boost = propBoost.Value
+,
+			CopyTo = propCopyTo.Value
+,
+			DocValues = propDocValues.Value
+,
+			Dynamic = propDynamic.Value
+,
+			Fielddata = propFielddata.Value
+,
+			Fields = propFields.Value
+,
+			Format = propFormat.Value
+,
+			IgnoreAbove = propIgnoreAbove.Value
+,
+			IgnoreMalformed = propIgnoreMalformed.Value
+,
+			Index = propIndex.Value
+,
+			Locale = propLocale.Value
+,
+			Meta = propMeta.Value
+,
+			NullValue = propNullValue.Value
+,
+			PrecisionStep = propPrecisionStep.Value
+,
+			Properties = propProperties.Value
+,
+			Store = propStore.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DateProperty value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropCopyTo, value.CopyTo, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropDocValues, value.DocValues);
+		writer.WriteProperty(options, PropDynamic, value.Dynamic);
+		writer.WriteProperty(options, PropFielddata, value.Fielddata);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropFormat, value.Format);
+		writer.WriteProperty(options, PropIgnoreAbove, value.IgnoreAbove);
+		writer.WriteProperty(options, PropIgnoreMalformed, value.IgnoreMalformed);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropLocale, value.Locale);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropNullValue, value.NullValue);
+		writer.WriteProperty(options, PropPrecisionStep, value.PrecisionStep);
+		writer.WriteProperty(options, PropProperties, value.Properties);
+		writer.WriteProperty(options, PropStore, value.Store);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DatePropertyConverter))]
 public sealed partial class DateProperty : IProperty
 {
-	[JsonInclude, JsonPropertyName("boost")]
 	public double? Boost { get; set; }
-	[JsonInclude, JsonPropertyName("copy_to")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Serverless.Fields? CopyTo { get; set; }
-	[JsonInclude, JsonPropertyName("doc_values")]
 	public bool? DocValues { get; set; }
-	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicMapping? Dynamic { get; set; }
-	[JsonInclude, JsonPropertyName("fielddata")]
 	public Elastic.Clients.Elasticsearch.Serverless.IndexManagement.NumericFielddata? Fielddata { get; set; }
-	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Serverless.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; }
 
 	/// <summary>
@@ -58,18 +239,12 @@ public sealed partial class DateProperty : IProperty
 	/// Metadata about the field.
 	/// </para>
 	/// </summary>
-	[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.Serverless.Mapping.Properties? Properties { get; set; }
-	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "date";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/DateRangeProperty.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/DateRangeProperty.g.cs
index 98a8be7ae0d..87aa936cfbb 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/DateRangeProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/DateRangeProperty.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,26 +28,168 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Mapping;
 
+internal sealed partial class DateRangePropertyConverter : System.Text.Json.Serialization.JsonConverter<DateRangeProperty>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropCoerce = System.Text.Json.JsonEncodedText.Encode("coerce");
+	private static readonly System.Text.Json.JsonEncodedText PropCopyTo = System.Text.Json.JsonEncodedText.Encode("copy_to");
+	private static readonly System.Text.Json.JsonEncodedText PropDocValues = System.Text.Json.JsonEncodedText.Encode("doc_values");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamic = System.Text.Json.JsonEncodedText.Encode("dynamic");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropFormat = System.Text.Json.JsonEncodedText.Encode("format");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreAbove = System.Text.Json.JsonEncodedText.Encode("ignore_above");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropProperties = System.Text.Json.JsonEncodedText.Encode("properties");
+	private static readonly System.Text.Json.JsonEncodedText PropStore = System.Text.Json.JsonEncodedText.Encode("store");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override DateRangeProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<double?> propBoost = default;
+		LocalJsonProperty<bool?> propCoerce = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Fields?> propCopyTo = default;
+		LocalJsonProperty<bool?> propDocValues = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicMapping?> propDynamic = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties?> propFields = default;
+		LocalJsonProperty<string?> propFormat = default;
+		LocalJsonProperty<int?> propIgnoreAbove = default;
+		LocalJsonProperty<bool?> propIndex = default;
+		LocalJsonProperty<IDictionary<string, string>?> propMeta = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties?> propProperties = default;
+		LocalJsonProperty<bool?> propStore = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
+
+			if (propCoerce.TryRead(ref reader, options, PropCoerce))
+			{
+				continue;
+			}
+
+			if (propCopyTo.TryRead(ref reader, options, PropCopyTo, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propDocValues.TryRead(ref reader, options, PropDocValues))
+			{
+				continue;
+			}
+
+			if (propDynamic.TryRead(ref reader, options, PropDynamic))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propFormat.TryRead(ref reader, options, PropFormat))
+			{
+				continue;
+			}
+
+			if (propIgnoreAbove.TryRead(ref reader, options, PropIgnoreAbove))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propProperties.TryRead(ref reader, options, PropProperties))
+			{
+				continue;
+			}
+
+			if (propStore.TryRead(ref reader, options, PropStore))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DateRangeProperty
+		{
+			Boost = propBoost.Value
+,
+			Coerce = propCoerce.Value
+,
+			CopyTo = propCopyTo.Value
+,
+			DocValues = propDocValues.Value
+,
+			Dynamic = propDynamic.Value
+,
+			Fields = propFields.Value
+,
+			Format = propFormat.Value
+,
+			IgnoreAbove = propIgnoreAbove.Value
+,
+			Index = propIndex.Value
+,
+			Meta = propMeta.Value
+,
+			Properties = propProperties.Value
+,
+			Store = propStore.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DateRangeProperty value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropCoerce, value.Coerce);
+		writer.WriteProperty(options, PropCopyTo, value.CopyTo, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropDocValues, value.DocValues);
+		writer.WriteProperty(options, PropDynamic, value.Dynamic);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropFormat, value.Format);
+		writer.WriteProperty(options, PropIgnoreAbove, value.IgnoreAbove);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropProperties, value.Properties);
+		writer.WriteProperty(options, PropStore, value.Store);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DateRangePropertyConverter))]
 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")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Serverless.Fields? CopyTo { get; set; }
-	[JsonInclude, JsonPropertyName("doc_values")]
 	public bool? DocValues { get; set; }
-	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicMapping? Dynamic { get; set; }
-	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Serverless.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; }
 
 	/// <summary>
@@ -54,14 +197,10 @@ public sealed partial class DateRangeProperty : IProperty
 	/// Metadata about the field.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties? Properties { get; set; }
-	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "date_range";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/DoubleNumberProperty.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/DoubleNumberProperty.g.cs
index 1c50170dbfe..ba926366bf9 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/DoubleNumberProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/DoubleNumberProperty.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,26 +28,198 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Mapping;
 
+internal sealed partial class DoubleNumberPropertyConverter : System.Text.Json.Serialization.JsonConverter<DoubleNumberProperty>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropCoerce = System.Text.Json.JsonEncodedText.Encode("coerce");
+	private static readonly System.Text.Json.JsonEncodedText PropCopyTo = System.Text.Json.JsonEncodedText.Encode("copy_to");
+	private static readonly System.Text.Json.JsonEncodedText PropDocValues = System.Text.Json.JsonEncodedText.Encode("doc_values");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamic = System.Text.Json.JsonEncodedText.Encode("dynamic");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreAbove = System.Text.Json.JsonEncodedText.Encode("ignore_above");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreMalformed = System.Text.Json.JsonEncodedText.Encode("ignore_malformed");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropNullValue = System.Text.Json.JsonEncodedText.Encode("null_value");
+	private static readonly System.Text.Json.JsonEncodedText PropOnScriptError = System.Text.Json.JsonEncodedText.Encode("on_script_error");
+	private static readonly System.Text.Json.JsonEncodedText PropProperties = System.Text.Json.JsonEncodedText.Encode("properties");
+	private static readonly System.Text.Json.JsonEncodedText PropScript = System.Text.Json.JsonEncodedText.Encode("script");
+	private static readonly System.Text.Json.JsonEncodedText PropStore = System.Text.Json.JsonEncodedText.Encode("store");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override DoubleNumberProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<double?> propBoost = default;
+		LocalJsonProperty<bool?> propCoerce = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Fields?> propCopyTo = default;
+		LocalJsonProperty<bool?> propDocValues = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicMapping?> propDynamic = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties?> propFields = default;
+		LocalJsonProperty<int?> propIgnoreAbove = default;
+		LocalJsonProperty<bool?> propIgnoreMalformed = default;
+		LocalJsonProperty<bool?> propIndex = default;
+		LocalJsonProperty<IDictionary<string, string>?> propMeta = default;
+		LocalJsonProperty<double?> propNullValue = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.OnScriptError?> propOnScriptError = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties?> propProperties = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Script?> propScript = default;
+		LocalJsonProperty<bool?> propStore = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
+
+			if (propCoerce.TryRead(ref reader, options, PropCoerce))
+			{
+				continue;
+			}
+
+			if (propCopyTo.TryRead(ref reader, options, PropCopyTo, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propDocValues.TryRead(ref reader, options, PropDocValues))
+			{
+				continue;
+			}
+
+			if (propDynamic.TryRead(ref reader, options, PropDynamic))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propIgnoreAbove.TryRead(ref reader, options, PropIgnoreAbove))
+			{
+				continue;
+			}
+
+			if (propIgnoreMalformed.TryRead(ref reader, options, PropIgnoreMalformed))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propNullValue.TryRead(ref reader, options, PropNullValue))
+			{
+				continue;
+			}
+
+			if (propOnScriptError.TryRead(ref reader, options, PropOnScriptError))
+			{
+				continue;
+			}
+
+			if (propProperties.TryRead(ref reader, options, PropProperties))
+			{
+				continue;
+			}
+
+			if (propScript.TryRead(ref reader, options, PropScript))
+			{
+				continue;
+			}
+
+			if (propStore.TryRead(ref reader, options, PropStore))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DoubleNumberProperty
+		{
+			Boost = propBoost.Value
+,
+			Coerce = propCoerce.Value
+,
+			CopyTo = propCopyTo.Value
+,
+			DocValues = propDocValues.Value
+,
+			Dynamic = propDynamic.Value
+,
+			Fields = propFields.Value
+,
+			IgnoreAbove = propIgnoreAbove.Value
+,
+			IgnoreMalformed = propIgnoreMalformed.Value
+,
+			Index = propIndex.Value
+,
+			Meta = propMeta.Value
+,
+			NullValue = propNullValue.Value
+,
+			OnScriptError = propOnScriptError.Value
+,
+			Properties = propProperties.Value
+,
+			Script = propScript.Value
+,
+			Store = propStore.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DoubleNumberProperty value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropCoerce, value.Coerce);
+		writer.WriteProperty(options, PropCopyTo, value.CopyTo, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropDocValues, value.DocValues);
+		writer.WriteProperty(options, PropDynamic, value.Dynamic);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropIgnoreAbove, value.IgnoreAbove);
+		writer.WriteProperty(options, PropIgnoreMalformed, value.IgnoreMalformed);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropNullValue, value.NullValue);
+		writer.WriteProperty(options, PropOnScriptError, value.OnScriptError);
+		writer.WriteProperty(options, PropProperties, value.Properties);
+		writer.WriteProperty(options, PropScript, value.Script);
+		writer.WriteProperty(options, PropStore, value.Store);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DoubleNumberPropertyConverter))]
 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")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Serverless.Fields? CopyTo { get; set; }
-	[JsonInclude, JsonPropertyName("doc_values")]
 	public bool? DocValues { get; set; }
-	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicMapping? Dynamic { get; set; }
-	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Serverless.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; }
 
 	/// <summary>
@@ -54,20 +227,13 @@ public sealed partial class DoubleNumberProperty : IProperty
 	/// Metadata about the field.
 	/// </para>
 	/// </summary>
-	[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.Serverless.Mapping.OnScriptError? OnScriptError { get; set; }
-	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties? Properties { get; set; }
-	[JsonInclude, JsonPropertyName("script")]
 	public Elastic.Clients.Elasticsearch.Serverless.Script? Script { get; set; }
-	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "double";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/DoubleRangeProperty.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/DoubleRangeProperty.g.cs
index cd3a1dfc6c5..ff7a2aba327 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/DoubleRangeProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/DoubleRangeProperty.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,24 +28,157 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Mapping;
 
+internal sealed partial class DoubleRangePropertyConverter : System.Text.Json.Serialization.JsonConverter<DoubleRangeProperty>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropCoerce = System.Text.Json.JsonEncodedText.Encode("coerce");
+	private static readonly System.Text.Json.JsonEncodedText PropCopyTo = System.Text.Json.JsonEncodedText.Encode("copy_to");
+	private static readonly System.Text.Json.JsonEncodedText PropDocValues = System.Text.Json.JsonEncodedText.Encode("doc_values");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamic = System.Text.Json.JsonEncodedText.Encode("dynamic");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreAbove = System.Text.Json.JsonEncodedText.Encode("ignore_above");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropProperties = System.Text.Json.JsonEncodedText.Encode("properties");
+	private static readonly System.Text.Json.JsonEncodedText PropStore = System.Text.Json.JsonEncodedText.Encode("store");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override DoubleRangeProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<double?> propBoost = default;
+		LocalJsonProperty<bool?> propCoerce = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Fields?> propCopyTo = default;
+		LocalJsonProperty<bool?> propDocValues = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicMapping?> propDynamic = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties?> propFields = default;
+		LocalJsonProperty<int?> propIgnoreAbove = default;
+		LocalJsonProperty<bool?> propIndex = default;
+		LocalJsonProperty<IDictionary<string, string>?> propMeta = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties?> propProperties = default;
+		LocalJsonProperty<bool?> propStore = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
+
+			if (propCoerce.TryRead(ref reader, options, PropCoerce))
+			{
+				continue;
+			}
+
+			if (propCopyTo.TryRead(ref reader, options, PropCopyTo, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propDocValues.TryRead(ref reader, options, PropDocValues))
+			{
+				continue;
+			}
+
+			if (propDynamic.TryRead(ref reader, options, PropDynamic))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propIgnoreAbove.TryRead(ref reader, options, PropIgnoreAbove))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propProperties.TryRead(ref reader, options, PropProperties))
+			{
+				continue;
+			}
+
+			if (propStore.TryRead(ref reader, options, PropStore))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DoubleRangeProperty
+		{
+			Boost = propBoost.Value
+,
+			Coerce = propCoerce.Value
+,
+			CopyTo = propCopyTo.Value
+,
+			DocValues = propDocValues.Value
+,
+			Dynamic = propDynamic.Value
+,
+			Fields = propFields.Value
+,
+			IgnoreAbove = propIgnoreAbove.Value
+,
+			Index = propIndex.Value
+,
+			Meta = propMeta.Value
+,
+			Properties = propProperties.Value
+,
+			Store = propStore.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DoubleRangeProperty value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropCoerce, value.Coerce);
+		writer.WriteProperty(options, PropCopyTo, value.CopyTo, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropDocValues, value.DocValues);
+		writer.WriteProperty(options, PropDynamic, value.Dynamic);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropIgnoreAbove, value.IgnoreAbove);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropProperties, value.Properties);
+		writer.WriteProperty(options, PropStore, value.Store);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DoubleRangePropertyConverter))]
 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")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Serverless.Fields? CopyTo { get; set; }
-	[JsonInclude, JsonPropertyName("doc_values")]
 	public bool? DocValues { get; set; }
-	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicMapping? Dynamic { get; set; }
-	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties? Fields { get; set; }
-	[JsonInclude, JsonPropertyName("ignore_above")]
 	public int? IgnoreAbove { get; set; }
-	[JsonInclude, JsonPropertyName("index")]
 	public bool? Index { get; set; }
 
 	/// <summary>
@@ -52,14 +186,10 @@ public sealed partial class DoubleRangeProperty : IProperty
 	/// Metadata about the field.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties? Properties { get; set; }
-	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "double_range";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/DynamicProperty.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/DynamicProperty.g.cs
index c82eb82083c..289dd5d1b2a 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/DynamicProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/DynamicProperty.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,42 +28,356 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Mapping;
 
+internal sealed partial class DynamicPropertyConverter : System.Text.Json.Serialization.JsonConverter<DynamicProperty>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAnalyzer = System.Text.Json.JsonEncodedText.Encode("analyzer");
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropCoerce = System.Text.Json.JsonEncodedText.Encode("coerce");
+	private static readonly System.Text.Json.JsonEncodedText PropCopyTo = System.Text.Json.JsonEncodedText.Encode("copy_to");
+	private static readonly System.Text.Json.JsonEncodedText PropDocValues = System.Text.Json.JsonEncodedText.Encode("doc_values");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamic = System.Text.Json.JsonEncodedText.Encode("dynamic");
+	private static readonly System.Text.Json.JsonEncodedText PropEagerGlobalOrdinals = System.Text.Json.JsonEncodedText.Encode("eager_global_ordinals");
+	private static readonly System.Text.Json.JsonEncodedText PropEnabled = System.Text.Json.JsonEncodedText.Encode("enabled");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropFormat = System.Text.Json.JsonEncodedText.Encode("format");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreAbove = System.Text.Json.JsonEncodedText.Encode("ignore_above");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreMalformed = System.Text.Json.JsonEncodedText.Encode("ignore_malformed");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropIndexOptions = System.Text.Json.JsonEncodedText.Encode("index_options");
+	private static readonly System.Text.Json.JsonEncodedText PropIndexPhrases = System.Text.Json.JsonEncodedText.Encode("index_phrases");
+	private static readonly System.Text.Json.JsonEncodedText PropIndexPrefixes = System.Text.Json.JsonEncodedText.Encode("index_prefixes");
+	private static readonly System.Text.Json.JsonEncodedText PropLocale = System.Text.Json.JsonEncodedText.Encode("locale");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropNorms = System.Text.Json.JsonEncodedText.Encode("norms");
+	private static readonly System.Text.Json.JsonEncodedText PropNullValue = System.Text.Json.JsonEncodedText.Encode("null_value");
+	private static readonly System.Text.Json.JsonEncodedText PropOnScriptError = System.Text.Json.JsonEncodedText.Encode("on_script_error");
+	private static readonly System.Text.Json.JsonEncodedText PropPositionIncrementGap = System.Text.Json.JsonEncodedText.Encode("position_increment_gap");
+	private static readonly System.Text.Json.JsonEncodedText PropPrecisionStep = System.Text.Json.JsonEncodedText.Encode("precision_step");
+	private static readonly System.Text.Json.JsonEncodedText PropProperties = System.Text.Json.JsonEncodedText.Encode("properties");
+	private static readonly System.Text.Json.JsonEncodedText PropScript = System.Text.Json.JsonEncodedText.Encode("script");
+	private static readonly System.Text.Json.JsonEncodedText PropSearchAnalyzer = System.Text.Json.JsonEncodedText.Encode("search_analyzer");
+	private static readonly System.Text.Json.JsonEncodedText PropSearchQuoteAnalyzer = System.Text.Json.JsonEncodedText.Encode("search_quote_analyzer");
+	private static readonly System.Text.Json.JsonEncodedText PropStore = System.Text.Json.JsonEncodedText.Encode("store");
+	private static readonly System.Text.Json.JsonEncodedText PropTermVector = System.Text.Json.JsonEncodedText.Encode("term_vector");
+	private static readonly System.Text.Json.JsonEncodedText PropTimeSeriesMetric = System.Text.Json.JsonEncodedText.Encode("time_series_metric");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override DynamicProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string?> propAnalyzer = default;
+		LocalJsonProperty<double?> propBoost = default;
+		LocalJsonProperty<bool?> propCoerce = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Fields?> propCopyTo = default;
+		LocalJsonProperty<bool?> propDocValues = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicMapping?> propDynamic = default;
+		LocalJsonProperty<bool?> propEagerGlobalOrdinals = default;
+		LocalJsonProperty<bool?> propEnabled = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties?> propFields = default;
+		LocalJsonProperty<string?> propFormat = default;
+		LocalJsonProperty<int?> propIgnoreAbove = default;
+		LocalJsonProperty<bool?> propIgnoreMalformed = default;
+		LocalJsonProperty<bool?> propIndex = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.IndexOptions?> propIndexOptions = default;
+		LocalJsonProperty<bool?> propIndexPhrases = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.TextIndexPrefixes?> propIndexPrefixes = default;
+		LocalJsonProperty<string?> propLocale = default;
+		LocalJsonProperty<IDictionary<string, string>?> propMeta = default;
+		LocalJsonProperty<bool?> propNorms = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.FieldValue?> propNullValue = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.OnScriptError?> propOnScriptError = default;
+		LocalJsonProperty<int?> propPositionIncrementGap = default;
+		LocalJsonProperty<int?> propPrecisionStep = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties?> propProperties = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Script?> propScript = default;
+		LocalJsonProperty<string?> propSearchAnalyzer = default;
+		LocalJsonProperty<string?> propSearchQuoteAnalyzer = default;
+		LocalJsonProperty<bool?> propStore = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.TermVectorOption?> propTermVector = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.TimeSeriesMetricType?> propTimeSeriesMetric = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAnalyzer.TryRead(ref reader, options, PropAnalyzer))
+			{
+				continue;
+			}
+
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
+
+			if (propCoerce.TryRead(ref reader, options, PropCoerce))
+			{
+				continue;
+			}
+
+			if (propCopyTo.TryRead(ref reader, options, PropCopyTo, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propDocValues.TryRead(ref reader, options, PropDocValues))
+			{
+				continue;
+			}
+
+			if (propDynamic.TryRead(ref reader, options, PropDynamic))
+			{
+				continue;
+			}
+
+			if (propEagerGlobalOrdinals.TryRead(ref reader, options, PropEagerGlobalOrdinals))
+			{
+				continue;
+			}
+
+			if (propEnabled.TryRead(ref reader, options, PropEnabled))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propFormat.TryRead(ref reader, options, PropFormat))
+			{
+				continue;
+			}
+
+			if (propIgnoreAbove.TryRead(ref reader, options, PropIgnoreAbove))
+			{
+				continue;
+			}
+
+			if (propIgnoreMalformed.TryRead(ref reader, options, PropIgnoreMalformed))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propIndexOptions.TryRead(ref reader, options, PropIndexOptions))
+			{
+				continue;
+			}
+
+			if (propIndexPhrases.TryRead(ref reader, options, PropIndexPhrases))
+			{
+				continue;
+			}
+
+			if (propIndexPrefixes.TryRead(ref reader, options, PropIndexPrefixes))
+			{
+				continue;
+			}
+
+			if (propLocale.TryRead(ref reader, options, PropLocale))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propNorms.TryRead(ref reader, options, PropNorms))
+			{
+				continue;
+			}
+
+			if (propNullValue.TryRead(ref reader, options, PropNullValue))
+			{
+				continue;
+			}
+
+			if (propOnScriptError.TryRead(ref reader, options, PropOnScriptError))
+			{
+				continue;
+			}
+
+			if (propPositionIncrementGap.TryRead(ref reader, options, PropPositionIncrementGap))
+			{
+				continue;
+			}
+
+			if (propPrecisionStep.TryRead(ref reader, options, PropPrecisionStep))
+			{
+				continue;
+			}
+
+			if (propProperties.TryRead(ref reader, options, PropProperties))
+			{
+				continue;
+			}
+
+			if (propScript.TryRead(ref reader, options, PropScript))
+			{
+				continue;
+			}
+
+			if (propSearchAnalyzer.TryRead(ref reader, options, PropSearchAnalyzer))
+			{
+				continue;
+			}
+
+			if (propSearchQuoteAnalyzer.TryRead(ref reader, options, PropSearchQuoteAnalyzer))
+			{
+				continue;
+			}
+
+			if (propStore.TryRead(ref reader, options, PropStore))
+			{
+				continue;
+			}
+
+			if (propTermVector.TryRead(ref reader, options, PropTermVector))
+			{
+				continue;
+			}
+
+			if (propTimeSeriesMetric.TryRead(ref reader, options, PropTimeSeriesMetric))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DynamicProperty
+		{
+			Analyzer = propAnalyzer.Value
+,
+			Boost = propBoost.Value
+,
+			Coerce = propCoerce.Value
+,
+			CopyTo = propCopyTo.Value
+,
+			DocValues = propDocValues.Value
+,
+			Dynamic = propDynamic.Value
+,
+			EagerGlobalOrdinals = propEagerGlobalOrdinals.Value
+,
+			Enabled = propEnabled.Value
+,
+			Fields = propFields.Value
+,
+			Format = propFormat.Value
+,
+			IgnoreAbove = propIgnoreAbove.Value
+,
+			IgnoreMalformed = propIgnoreMalformed.Value
+,
+			Index = propIndex.Value
+,
+			IndexOptions = propIndexOptions.Value
+,
+			IndexPhrases = propIndexPhrases.Value
+,
+			IndexPrefixes = propIndexPrefixes.Value
+,
+			Locale = propLocale.Value
+,
+			Meta = propMeta.Value
+,
+			Norms = propNorms.Value
+,
+			NullValue = propNullValue.Value
+,
+			OnScriptError = propOnScriptError.Value
+,
+			PositionIncrementGap = propPositionIncrementGap.Value
+,
+			PrecisionStep = propPrecisionStep.Value
+,
+			Properties = propProperties.Value
+,
+			Script = propScript.Value
+,
+			SearchAnalyzer = propSearchAnalyzer.Value
+,
+			SearchQuoteAnalyzer = propSearchQuoteAnalyzer.Value
+,
+			Store = propStore.Value
+,
+			TermVector = propTermVector.Value
+,
+			TimeSeriesMetric = propTimeSeriesMetric.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DynamicProperty value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAnalyzer, value.Analyzer);
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropCoerce, value.Coerce);
+		writer.WriteProperty(options, PropCopyTo, value.CopyTo, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropDocValues, value.DocValues);
+		writer.WriteProperty(options, PropDynamic, value.Dynamic);
+		writer.WriteProperty(options, PropEagerGlobalOrdinals, value.EagerGlobalOrdinals);
+		writer.WriteProperty(options, PropEnabled, value.Enabled);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropFormat, value.Format);
+		writer.WriteProperty(options, PropIgnoreAbove, value.IgnoreAbove);
+		writer.WriteProperty(options, PropIgnoreMalformed, value.IgnoreMalformed);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropIndexOptions, value.IndexOptions);
+		writer.WriteProperty(options, PropIndexPhrases, value.IndexPhrases);
+		writer.WriteProperty(options, PropIndexPrefixes, value.IndexPrefixes);
+		writer.WriteProperty(options, PropLocale, value.Locale);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropNorms, value.Norms);
+		writer.WriteProperty(options, PropNullValue, value.NullValue);
+		writer.WriteProperty(options, PropOnScriptError, value.OnScriptError);
+		writer.WriteProperty(options, PropPositionIncrementGap, value.PositionIncrementGap);
+		writer.WriteProperty(options, PropPrecisionStep, value.PrecisionStep);
+		writer.WriteProperty(options, PropProperties, value.Properties);
+		writer.WriteProperty(options, PropScript, value.Script);
+		writer.WriteProperty(options, PropSearchAnalyzer, value.SearchAnalyzer);
+		writer.WriteProperty(options, PropSearchQuoteAnalyzer, value.SearchQuoteAnalyzer);
+		writer.WriteProperty(options, PropStore, value.Store);
+		writer.WriteProperty(options, PropTermVector, value.TermVector);
+		writer.WriteProperty(options, PropTimeSeriesMetric, value.TimeSeriesMetric);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DynamicPropertyConverter))]
 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")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Serverless.Fields? CopyTo { get; set; }
-	[JsonInclude, JsonPropertyName("doc_values")]
 	public bool? DocValues { get; set; }
-	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Serverless.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.Serverless.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.Serverless.Mapping.IndexOptions? IndexOptions { get; set; }
-	[JsonInclude, JsonPropertyName("index_phrases")]
 	public bool? IndexPhrases { get; set; }
-	[JsonInclude, JsonPropertyName("index_prefixes")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.TextIndexPrefixes? IndexPrefixes { get; set; }
-	[JsonInclude, JsonPropertyName("locale")]
 	public string? Locale { get; set; }
 
 	/// <summary>
@@ -70,34 +385,20 @@ public sealed partial class DynamicProperty : IProperty
 	/// Metadata about the field.
 	/// </para>
 	/// </summary>
-	[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.Serverless.FieldValue? NullValue { get; set; }
-	[JsonInclude, JsonPropertyName("on_script_error")]
 	public Elastic.Clients.Elasticsearch.Serverless.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.Serverless.Mapping.Properties? Properties { get; set; }
-	[JsonInclude, JsonPropertyName("script")]
 	public Elastic.Clients.Elasticsearch.Serverless.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("store")]
 	public bool? Store { get; set; }
-	[JsonInclude, JsonPropertyName("term_vector")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.TermVectorOption? TermVector { get; set; }
-	[JsonInclude, JsonPropertyName("time_series_metric")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.TimeSeriesMetricType? TimeSeriesMetric { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "{dynamic_type}";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/DynamicTemplate.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/DynamicTemplate.g.cs
index 84661cf4461..e999ebf8852 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/DynamicTemplate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/DynamicTemplate.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -39,12 +40,16 @@ internal DynamicTemplate(string variantName, object variant)
 			throw new ArgumentNullException(nameof(variant));
 		if (string.IsNullOrWhiteSpace(variantName))
 			throw new ArgumentException("Variant name must not be empty or whitespace.");
-		VariantName = variantName;
+		VariantType = variantName;
 		Variant = variant;
 	}
 
-	internal object Variant { get; }
-	internal string VariantName { get; }
+	internal DynamicTemplate()
+	{
+	}
+
+	public object Variant { get; internal set; }
+	public string VariantType { get; internal set; }
 
 	public static DynamicTemplate Mapping(Elastic.Clients.Elasticsearch.Serverless.Mapping.IProperty property) => new DynamicTemplate("mapping", property);
 	public static DynamicTemplate Runtime(Elastic.Clients.Elasticsearch.Serverless.Mapping.IProperty property) => new DynamicTemplate("runtime", property);
@@ -77,167 +82,131 @@ public bool TryGet<T>([NotNullWhen(true)] out T? result) where T : class
 	}
 }
 
-internal sealed partial class DynamicTemplateConverter : JsonConverter<DynamicTemplate>
+internal sealed partial class DynamicTemplateConverter : System.Text.Json.Serialization.JsonConverter<DynamicTemplate>
 {
-	public override DynamicTemplate Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropMatch = System.Text.Json.JsonEncodedText.Encode("match");
+	private static readonly System.Text.Json.JsonEncodedText PropMatchMappingType = System.Text.Json.JsonEncodedText.Encode("match_mapping_type");
+	private static readonly System.Text.Json.JsonEncodedText PropMatchPattern = System.Text.Json.JsonEncodedText.Encode("match_pattern");
+	private static readonly System.Text.Json.JsonEncodedText PropPathMatch = System.Text.Json.JsonEncodedText.Encode("path_match");
+	private static readonly System.Text.Json.JsonEncodedText PropPathUnmatch = System.Text.Json.JsonEncodedText.Encode("path_unmatch");
+	private static readonly System.Text.Json.JsonEncodedText PropUnmatch = System.Text.Json.JsonEncodedText.Encode("unmatch");
+	private static readonly System.Text.Json.JsonEncodedText PropUnmatchMappingType = System.Text.Json.JsonEncodedText.Encode("unmatch_mapping_type");
+	private static readonly System.Text.Json.JsonEncodedText VariantMapping = System.Text.Json.JsonEncodedText.Encode("mapping");
+	private static readonly System.Text.Json.JsonEncodedText VariantRuntime = System.Text.Json.JsonEncodedText.Encode("runtime");
+
+	public override DynamicTemplate Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-		{
-			throw new JsonException("Expected start token.");
-		}
-
-		object? variantValue = default;
-		string? variantNameValue = default;
-		ICollection<string>? matchValue = default;
-		ICollection<string>? matchMappingTypeValue = default;
-		Elastic.Clients.Elasticsearch.Serverless.Mapping.MatchType? matchPatternValue = default;
-		ICollection<string>? pathMatchValue = default;
-		ICollection<string>? pathUnmatchValue = default;
-		ICollection<string>? unmatchValue = default;
-		ICollection<string>? unmatchMappingTypeValue = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propMatch = default;
+		LocalJsonProperty<ICollection<string>?> propMatchMappingType = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.MatchType?> propMatchPattern = default;
+		LocalJsonProperty<ICollection<string>?> propPathMatch = default;
+		LocalJsonProperty<ICollection<string>?> propPathUnmatch = default;
+		LocalJsonProperty<ICollection<string>?> propUnmatch = default;
+		LocalJsonProperty<ICollection<string>?> propUnmatchMappingType = default;
+		var variantType = string.Empty;
+		object? variant = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token.");
-			}
-
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token representing the name of an Elasticsearch field.");
-			}
-
-			var propertyName = reader.GetString();
-			reader.Read();
-			if (propertyName == "match")
+			if (propMatch.TryRead(ref reader, options, PropMatch, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
 			{
-				matchValue = SingleOrManySerializationHelper.Deserialize<string>(ref reader, options);
 				continue;
 			}
 
-			if (propertyName == "match_mapping_type")
+			if (propMatchMappingType.TryRead(ref reader, options, PropMatchMappingType, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
 			{
-				matchMappingTypeValue = SingleOrManySerializationHelper.Deserialize<string>(ref reader, options);
 				continue;
 			}
 
-			if (propertyName == "match_pattern")
+			if (propMatchPattern.TryRead(ref reader, options, PropMatchPattern))
 			{
-				matchPatternValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Mapping.MatchType?>(ref reader, options);
 				continue;
 			}
 
-			if (propertyName == "path_match")
+			if (propPathMatch.TryRead(ref reader, options, PropPathMatch, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
 			{
-				pathMatchValue = SingleOrManySerializationHelper.Deserialize<string>(ref reader, options);
 				continue;
 			}
 
-			if (propertyName == "path_unmatch")
+			if (propPathUnmatch.TryRead(ref reader, options, PropPathUnmatch, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
 			{
-				pathUnmatchValue = SingleOrManySerializationHelper.Deserialize<string>(ref reader, options);
 				continue;
 			}
 
-			if (propertyName == "unmatch")
+			if (propUnmatch.TryRead(ref reader, options, PropUnmatch, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
 			{
-				unmatchValue = SingleOrManySerializationHelper.Deserialize<string>(ref reader, options);
 				continue;
 			}
 
-			if (propertyName == "unmatch_mapping_type")
+			if (propUnmatchMappingType.TryRead(ref reader, options, PropUnmatchMappingType, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
 			{
-				unmatchMappingTypeValue = SingleOrManySerializationHelper.Deserialize<string>(ref reader, options);
 				continue;
 			}
 
-			if (propertyName == "mapping")
+			if (reader.ValueTextEquals(VariantMapping))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Mapping.IProperty?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantMapping.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Mapping.IProperty?>(options);
 				continue;
 			}
 
-			if (propertyName == "runtime")
+			if (reader.ValueTextEquals(VariantRuntime))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Mapping.IProperty?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantRuntime.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Mapping.IProperty?>(options);
 				continue;
 			}
 
-			throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'DynamicTemplate' from the response.");
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		var result = new DynamicTemplate(variantNameValue, variantValue);
-		result.Match = matchValue;
-		result.MatchMappingType = matchMappingTypeValue;
-		result.MatchPattern = matchPatternValue;
-		result.PathMatch = pathMatchValue;
-		result.PathUnmatch = pathUnmatchValue;
-		result.Unmatch = unmatchValue;
-		result.UnmatchMappingType = unmatchMappingTypeValue;
-		return result;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DynamicTemplate
+		{
+			VariantType = variantType,
+			Variant = variant,
+			Match = propMatch.Value
+,
+			MatchMappingType = propMatchMappingType.Value
+,
+			MatchPattern = propMatchPattern.Value
+,
+			PathMatch = propPathMatch.Value
+,
+			PathUnmatch = propPathUnmatch.Value
+,
+			Unmatch = propUnmatch.Value
+,
+			UnmatchMappingType = propUnmatchMappingType.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, DynamicTemplate value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DynamicTemplate value, System.Text.Json.JsonSerializerOptions options)
 	{
 		writer.WriteStartObject();
-		if (value.Match is not null)
-		{
-			writer.WritePropertyName("match");
-			SingleOrManySerializationHelper.Serialize<string>(value.Match, writer, options);
-		}
-
-		if (value.MatchMappingType is not null)
+		switch (value.VariantType)
 		{
-			writer.WritePropertyName("match_mapping_type");
-			SingleOrManySerializationHelper.Serialize<string>(value.MatchMappingType, writer, options);
-		}
-
-		if (value.MatchPattern is not null)
-		{
-			writer.WritePropertyName("match_pattern");
-			JsonSerializer.Serialize(writer, value.MatchPattern, options);
-		}
-
-		if (value.PathMatch is not null)
-		{
-			writer.WritePropertyName("path_match");
-			SingleOrManySerializationHelper.Serialize<string>(value.PathMatch, writer, options);
-		}
-
-		if (value.PathUnmatch is not null)
-		{
-			writer.WritePropertyName("path_unmatch");
-			SingleOrManySerializationHelper.Serialize<string>(value.PathUnmatch, writer, options);
-		}
-
-		if (value.Unmatch is not null)
-		{
-			writer.WritePropertyName("unmatch");
-			SingleOrManySerializationHelper.Serialize<string>(value.Unmatch, writer, options);
-		}
-
-		if (value.UnmatchMappingType is not null)
-		{
-			writer.WritePropertyName("unmatch_mapping_type");
-			SingleOrManySerializationHelper.Serialize<string>(value.UnmatchMappingType, writer, options);
-		}
-
-		if (value.VariantName is not null && value.Variant is not null)
-		{
-			writer.WritePropertyName(value.VariantName);
-			switch (value.VariantName)
-			{
-				case "mapping":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Mapping.IProperty>(writer, (Elastic.Clients.Elasticsearch.Serverless.Mapping.IProperty)value.Variant, options);
-					break;
-				case "runtime":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Mapping.IProperty>(writer, (Elastic.Clients.Elasticsearch.Serverless.Mapping.IProperty)value.Variant, options);
-					break;
-			}
+			case "":
+				break;
+			case "mapping":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Mapping.IProperty?)value.Variant);
+				break;
+			case "runtime":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Mapping.IProperty?)value.Variant);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.VariantType}' is not supported for type '{nameof(DynamicTemplate)}'.");
 		}
 
+		writer.WriteProperty(options, PropMatch, value.Match, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropMatchMappingType, value.MatchMappingType, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropMatchPattern, value.MatchPattern);
+		writer.WriteProperty(options, PropPathMatch, value.PathMatch, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropPathUnmatch, value.PathUnmatch, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropUnmatch, value.Unmatch, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropUnmatchMappingType, value.UnmatchMappingType, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
 		writer.WriteEndObject();
 	}
 }
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/FloatNumberProperty.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/FloatNumberProperty.g.cs
index 209758f348f..942ecd5e5da 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/FloatNumberProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/FloatNumberProperty.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,26 +28,198 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Mapping;
 
+internal sealed partial class FloatNumberPropertyConverter : System.Text.Json.Serialization.JsonConverter<FloatNumberProperty>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropCoerce = System.Text.Json.JsonEncodedText.Encode("coerce");
+	private static readonly System.Text.Json.JsonEncodedText PropCopyTo = System.Text.Json.JsonEncodedText.Encode("copy_to");
+	private static readonly System.Text.Json.JsonEncodedText PropDocValues = System.Text.Json.JsonEncodedText.Encode("doc_values");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamic = System.Text.Json.JsonEncodedText.Encode("dynamic");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreAbove = System.Text.Json.JsonEncodedText.Encode("ignore_above");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreMalformed = System.Text.Json.JsonEncodedText.Encode("ignore_malformed");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropNullValue = System.Text.Json.JsonEncodedText.Encode("null_value");
+	private static readonly System.Text.Json.JsonEncodedText PropOnScriptError = System.Text.Json.JsonEncodedText.Encode("on_script_error");
+	private static readonly System.Text.Json.JsonEncodedText PropProperties = System.Text.Json.JsonEncodedText.Encode("properties");
+	private static readonly System.Text.Json.JsonEncodedText PropScript = System.Text.Json.JsonEncodedText.Encode("script");
+	private static readonly System.Text.Json.JsonEncodedText PropStore = System.Text.Json.JsonEncodedText.Encode("store");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override FloatNumberProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<double?> propBoost = default;
+		LocalJsonProperty<bool?> propCoerce = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Fields?> propCopyTo = default;
+		LocalJsonProperty<bool?> propDocValues = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicMapping?> propDynamic = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties?> propFields = default;
+		LocalJsonProperty<int?> propIgnoreAbove = default;
+		LocalJsonProperty<bool?> propIgnoreMalformed = default;
+		LocalJsonProperty<bool?> propIndex = default;
+		LocalJsonProperty<IDictionary<string, string>?> propMeta = default;
+		LocalJsonProperty<float?> propNullValue = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.OnScriptError?> propOnScriptError = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties?> propProperties = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Script?> propScript = default;
+		LocalJsonProperty<bool?> propStore = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
+
+			if (propCoerce.TryRead(ref reader, options, PropCoerce))
+			{
+				continue;
+			}
+
+			if (propCopyTo.TryRead(ref reader, options, PropCopyTo, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propDocValues.TryRead(ref reader, options, PropDocValues))
+			{
+				continue;
+			}
+
+			if (propDynamic.TryRead(ref reader, options, PropDynamic))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propIgnoreAbove.TryRead(ref reader, options, PropIgnoreAbove))
+			{
+				continue;
+			}
+
+			if (propIgnoreMalformed.TryRead(ref reader, options, PropIgnoreMalformed))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propNullValue.TryRead(ref reader, options, PropNullValue))
+			{
+				continue;
+			}
+
+			if (propOnScriptError.TryRead(ref reader, options, PropOnScriptError))
+			{
+				continue;
+			}
+
+			if (propProperties.TryRead(ref reader, options, PropProperties))
+			{
+				continue;
+			}
+
+			if (propScript.TryRead(ref reader, options, PropScript))
+			{
+				continue;
+			}
+
+			if (propStore.TryRead(ref reader, options, PropStore))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new FloatNumberProperty
+		{
+			Boost = propBoost.Value
+,
+			Coerce = propCoerce.Value
+,
+			CopyTo = propCopyTo.Value
+,
+			DocValues = propDocValues.Value
+,
+			Dynamic = propDynamic.Value
+,
+			Fields = propFields.Value
+,
+			IgnoreAbove = propIgnoreAbove.Value
+,
+			IgnoreMalformed = propIgnoreMalformed.Value
+,
+			Index = propIndex.Value
+,
+			Meta = propMeta.Value
+,
+			NullValue = propNullValue.Value
+,
+			OnScriptError = propOnScriptError.Value
+,
+			Properties = propProperties.Value
+,
+			Script = propScript.Value
+,
+			Store = propStore.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, FloatNumberProperty value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropCoerce, value.Coerce);
+		writer.WriteProperty(options, PropCopyTo, value.CopyTo, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropDocValues, value.DocValues);
+		writer.WriteProperty(options, PropDynamic, value.Dynamic);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropIgnoreAbove, value.IgnoreAbove);
+		writer.WriteProperty(options, PropIgnoreMalformed, value.IgnoreMalformed);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropNullValue, value.NullValue);
+		writer.WriteProperty(options, PropOnScriptError, value.OnScriptError);
+		writer.WriteProperty(options, PropProperties, value.Properties);
+		writer.WriteProperty(options, PropScript, value.Script);
+		writer.WriteProperty(options, PropStore, value.Store);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(FloatNumberPropertyConverter))]
 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")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Serverless.Fields? CopyTo { get; set; }
-	[JsonInclude, JsonPropertyName("doc_values")]
 	public bool? DocValues { get; set; }
-	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicMapping? Dynamic { get; set; }
-	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Serverless.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; }
 
 	/// <summary>
@@ -54,20 +227,13 @@ public sealed partial class FloatNumberProperty : IProperty
 	/// Metadata about the field.
 	/// </para>
 	/// </summary>
-	[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.Serverless.Mapping.OnScriptError? OnScriptError { get; set; }
-	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties? Properties { get; set; }
-	[JsonInclude, JsonPropertyName("script")]
 	public Elastic.Clients.Elasticsearch.Serverless.Script? Script { get; set; }
-	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "float";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/FloatRangeProperty.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/FloatRangeProperty.g.cs
index 18e6057c59c..d06c120ad34 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/FloatRangeProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/FloatRangeProperty.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,24 +28,157 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Mapping;
 
+internal sealed partial class FloatRangePropertyConverter : System.Text.Json.Serialization.JsonConverter<FloatRangeProperty>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropCoerce = System.Text.Json.JsonEncodedText.Encode("coerce");
+	private static readonly System.Text.Json.JsonEncodedText PropCopyTo = System.Text.Json.JsonEncodedText.Encode("copy_to");
+	private static readonly System.Text.Json.JsonEncodedText PropDocValues = System.Text.Json.JsonEncodedText.Encode("doc_values");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamic = System.Text.Json.JsonEncodedText.Encode("dynamic");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreAbove = System.Text.Json.JsonEncodedText.Encode("ignore_above");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropProperties = System.Text.Json.JsonEncodedText.Encode("properties");
+	private static readonly System.Text.Json.JsonEncodedText PropStore = System.Text.Json.JsonEncodedText.Encode("store");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override FloatRangeProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<double?> propBoost = default;
+		LocalJsonProperty<bool?> propCoerce = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Fields?> propCopyTo = default;
+		LocalJsonProperty<bool?> propDocValues = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicMapping?> propDynamic = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties?> propFields = default;
+		LocalJsonProperty<int?> propIgnoreAbove = default;
+		LocalJsonProperty<bool?> propIndex = default;
+		LocalJsonProperty<IDictionary<string, string>?> propMeta = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties?> propProperties = default;
+		LocalJsonProperty<bool?> propStore = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
+
+			if (propCoerce.TryRead(ref reader, options, PropCoerce))
+			{
+				continue;
+			}
+
+			if (propCopyTo.TryRead(ref reader, options, PropCopyTo, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propDocValues.TryRead(ref reader, options, PropDocValues))
+			{
+				continue;
+			}
+
+			if (propDynamic.TryRead(ref reader, options, PropDynamic))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propIgnoreAbove.TryRead(ref reader, options, PropIgnoreAbove))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propProperties.TryRead(ref reader, options, PropProperties))
+			{
+				continue;
+			}
+
+			if (propStore.TryRead(ref reader, options, PropStore))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new FloatRangeProperty
+		{
+			Boost = propBoost.Value
+,
+			Coerce = propCoerce.Value
+,
+			CopyTo = propCopyTo.Value
+,
+			DocValues = propDocValues.Value
+,
+			Dynamic = propDynamic.Value
+,
+			Fields = propFields.Value
+,
+			IgnoreAbove = propIgnoreAbove.Value
+,
+			Index = propIndex.Value
+,
+			Meta = propMeta.Value
+,
+			Properties = propProperties.Value
+,
+			Store = propStore.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, FloatRangeProperty value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropCoerce, value.Coerce);
+		writer.WriteProperty(options, PropCopyTo, value.CopyTo, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropDocValues, value.DocValues);
+		writer.WriteProperty(options, PropDynamic, value.Dynamic);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropIgnoreAbove, value.IgnoreAbove);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropProperties, value.Properties);
+		writer.WriteProperty(options, PropStore, value.Store);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(FloatRangePropertyConverter))]
 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")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Serverless.Fields? CopyTo { get; set; }
-	[JsonInclude, JsonPropertyName("doc_values")]
 	public bool? DocValues { get; set; }
-	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicMapping? Dynamic { get; set; }
-	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties? Fields { get; set; }
-	[JsonInclude, JsonPropertyName("ignore_above")]
 	public int? IgnoreAbove { get; set; }
-	[JsonInclude, JsonPropertyName("index")]
 	public bool? Index { get; set; }
 
 	/// <summary>
@@ -52,14 +186,10 @@ public sealed partial class FloatRangeProperty : IProperty
 	/// Metadata about the field.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties? Properties { get; set; }
-	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "float_range";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/GeoPointProperty.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/GeoPointProperty.g.cs
index 048ce25f474..e7fe90b0fcf 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/GeoPointProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/GeoPointProperty.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,24 +28,187 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Mapping;
 
+internal sealed partial class GeoPointPropertyConverter : System.Text.Json.Serialization.JsonConverter<GeoPointProperty>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCopyTo = System.Text.Json.JsonEncodedText.Encode("copy_to");
+	private static readonly System.Text.Json.JsonEncodedText PropDocValues = System.Text.Json.JsonEncodedText.Encode("doc_values");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamic = System.Text.Json.JsonEncodedText.Encode("dynamic");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreAbove = System.Text.Json.JsonEncodedText.Encode("ignore_above");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreMalformed = System.Text.Json.JsonEncodedText.Encode("ignore_malformed");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreZValue = System.Text.Json.JsonEncodedText.Encode("ignore_z_value");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropNullValue = System.Text.Json.JsonEncodedText.Encode("null_value");
+	private static readonly System.Text.Json.JsonEncodedText PropOnScriptError = System.Text.Json.JsonEncodedText.Encode("on_script_error");
+	private static readonly System.Text.Json.JsonEncodedText PropProperties = System.Text.Json.JsonEncodedText.Encode("properties");
+	private static readonly System.Text.Json.JsonEncodedText PropScript = System.Text.Json.JsonEncodedText.Encode("script");
+	private static readonly System.Text.Json.JsonEncodedText PropStore = System.Text.Json.JsonEncodedText.Encode("store");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override GeoPointProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Fields?> propCopyTo = default;
+		LocalJsonProperty<bool?> propDocValues = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicMapping?> propDynamic = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties?> propFields = default;
+		LocalJsonProperty<int?> propIgnoreAbove = default;
+		LocalJsonProperty<bool?> propIgnoreMalformed = default;
+		LocalJsonProperty<bool?> propIgnoreZValue = default;
+		LocalJsonProperty<bool?> propIndex = default;
+		LocalJsonProperty<IDictionary<string, string>?> propMeta = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.GeoLocation?> propNullValue = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.OnScriptError?> propOnScriptError = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties?> propProperties = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Script?> propScript = default;
+		LocalJsonProperty<bool?> propStore = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCopyTo.TryRead(ref reader, options, PropCopyTo, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propDocValues.TryRead(ref reader, options, PropDocValues))
+			{
+				continue;
+			}
+
+			if (propDynamic.TryRead(ref reader, options, PropDynamic))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propIgnoreAbove.TryRead(ref reader, options, PropIgnoreAbove))
+			{
+				continue;
+			}
+
+			if (propIgnoreMalformed.TryRead(ref reader, options, PropIgnoreMalformed))
+			{
+				continue;
+			}
+
+			if (propIgnoreZValue.TryRead(ref reader, options, PropIgnoreZValue))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propNullValue.TryRead(ref reader, options, PropNullValue))
+			{
+				continue;
+			}
+
+			if (propOnScriptError.TryRead(ref reader, options, PropOnScriptError))
+			{
+				continue;
+			}
+
+			if (propProperties.TryRead(ref reader, options, PropProperties))
+			{
+				continue;
+			}
+
+			if (propScript.TryRead(ref reader, options, PropScript))
+			{
+				continue;
+			}
+
+			if (propStore.TryRead(ref reader, options, PropStore))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GeoPointProperty
+		{
+			CopyTo = propCopyTo.Value
+,
+			DocValues = propDocValues.Value
+,
+			Dynamic = propDynamic.Value
+,
+			Fields = propFields.Value
+,
+			IgnoreAbove = propIgnoreAbove.Value
+,
+			IgnoreMalformed = propIgnoreMalformed.Value
+,
+			IgnoreZValue = propIgnoreZValue.Value
+,
+			Index = propIndex.Value
+,
+			Meta = propMeta.Value
+,
+			NullValue = propNullValue.Value
+,
+			OnScriptError = propOnScriptError.Value
+,
+			Properties = propProperties.Value
+,
+			Script = propScript.Value
+,
+			Store = propStore.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GeoPointProperty value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCopyTo, value.CopyTo, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropDocValues, value.DocValues);
+		writer.WriteProperty(options, PropDynamic, value.Dynamic);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropIgnoreAbove, value.IgnoreAbove);
+		writer.WriteProperty(options, PropIgnoreMalformed, value.IgnoreMalformed);
+		writer.WriteProperty(options, PropIgnoreZValue, value.IgnoreZValue);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropNullValue, value.NullValue);
+		writer.WriteProperty(options, PropOnScriptError, value.OnScriptError);
+		writer.WriteProperty(options, PropProperties, value.Properties);
+		writer.WriteProperty(options, PropScript, value.Script);
+		writer.WriteProperty(options, PropStore, value.Store);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GeoPointPropertyConverter))]
 public sealed partial class GeoPointProperty : IProperty
 {
-	[JsonInclude, JsonPropertyName("copy_to")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Serverless.Fields? CopyTo { get; set; }
-	[JsonInclude, JsonPropertyName("doc_values")]
 	public bool? DocValues { get; set; }
-	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicMapping? Dynamic { get; set; }
-	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Serverless.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("index")]
 	public bool? Index { get; set; }
 
 	/// <summary>
@@ -52,20 +216,13 @@ public sealed partial class GeoPointProperty : IProperty
 	/// Metadata about the field.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-	[JsonInclude, JsonPropertyName("null_value")]
 	public Elastic.Clients.Elasticsearch.Serverless.GeoLocation? NullValue { get; set; }
-	[JsonInclude, JsonPropertyName("on_script_error")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.OnScriptError? OnScriptError { get; set; }
-	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties? Properties { get; set; }
-	[JsonInclude, JsonPropertyName("script")]
 	public Elastic.Clients.Elasticsearch.Serverless.Script? Script { get; set; }
-	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "geo_point";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/GeoShapeProperty.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/GeoShapeProperty.g.cs
index 30917b79567..3566c63ebf2 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/GeoShapeProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/GeoShapeProperty.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,167 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Mapping;
 
+internal sealed partial class GeoShapePropertyConverter : System.Text.Json.Serialization.JsonConverter<GeoShapeProperty>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCoerce = System.Text.Json.JsonEncodedText.Encode("coerce");
+	private static readonly System.Text.Json.JsonEncodedText PropCopyTo = System.Text.Json.JsonEncodedText.Encode("copy_to");
+	private static readonly System.Text.Json.JsonEncodedText PropDocValues = System.Text.Json.JsonEncodedText.Encode("doc_values");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamic = System.Text.Json.JsonEncodedText.Encode("dynamic");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreAbove = System.Text.Json.JsonEncodedText.Encode("ignore_above");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreMalformed = System.Text.Json.JsonEncodedText.Encode("ignore_malformed");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreZValue = System.Text.Json.JsonEncodedText.Encode("ignore_z_value");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropOrientation = System.Text.Json.JsonEncodedText.Encode("orientation");
+	private static readonly System.Text.Json.JsonEncodedText PropProperties = System.Text.Json.JsonEncodedText.Encode("properties");
+	private static readonly System.Text.Json.JsonEncodedText PropStore = System.Text.Json.JsonEncodedText.Encode("store");
+	private static readonly System.Text.Json.JsonEncodedText PropStrategy = System.Text.Json.JsonEncodedText.Encode("strategy");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override GeoShapeProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool?> propCoerce = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Fields?> propCopyTo = default;
+		LocalJsonProperty<bool?> propDocValues = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicMapping?> propDynamic = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties?> propFields = default;
+		LocalJsonProperty<int?> propIgnoreAbove = default;
+		LocalJsonProperty<bool?> propIgnoreMalformed = default;
+		LocalJsonProperty<bool?> propIgnoreZValue = default;
+		LocalJsonProperty<IDictionary<string, string>?> propMeta = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.GeoOrientation?> propOrientation = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties?> propProperties = default;
+		LocalJsonProperty<bool?> propStore = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.GeoStrategy?> propStrategy = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCoerce.TryRead(ref reader, options, PropCoerce))
+			{
+				continue;
+			}
+
+			if (propCopyTo.TryRead(ref reader, options, PropCopyTo, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propDocValues.TryRead(ref reader, options, PropDocValues))
+			{
+				continue;
+			}
+
+			if (propDynamic.TryRead(ref reader, options, PropDynamic))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propIgnoreAbove.TryRead(ref reader, options, PropIgnoreAbove))
+			{
+				continue;
+			}
+
+			if (propIgnoreMalformed.TryRead(ref reader, options, PropIgnoreMalformed))
+			{
+				continue;
+			}
+
+			if (propIgnoreZValue.TryRead(ref reader, options, PropIgnoreZValue))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propOrientation.TryRead(ref reader, options, PropOrientation))
+			{
+				continue;
+			}
+
+			if (propProperties.TryRead(ref reader, options, PropProperties))
+			{
+				continue;
+			}
+
+			if (propStore.TryRead(ref reader, options, PropStore))
+			{
+				continue;
+			}
+
+			if (propStrategy.TryRead(ref reader, options, PropStrategy))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GeoShapeProperty
+		{
+			Coerce = propCoerce.Value
+,
+			CopyTo = propCopyTo.Value
+,
+			DocValues = propDocValues.Value
+,
+			Dynamic = propDynamic.Value
+,
+			Fields = propFields.Value
+,
+			IgnoreAbove = propIgnoreAbove.Value
+,
+			IgnoreMalformed = propIgnoreMalformed.Value
+,
+			IgnoreZValue = propIgnoreZValue.Value
+,
+			Meta = propMeta.Value
+,
+			Orientation = propOrientation.Value
+,
+			Properties = propProperties.Value
+,
+			Store = propStore.Value
+,
+			Strategy = propStrategy.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GeoShapeProperty value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCoerce, value.Coerce);
+		writer.WriteProperty(options, PropCopyTo, value.CopyTo, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropDocValues, value.DocValues);
+		writer.WriteProperty(options, PropDynamic, value.Dynamic);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropIgnoreAbove, value.IgnoreAbove);
+		writer.WriteProperty(options, PropIgnoreMalformed, value.IgnoreMalformed);
+		writer.WriteProperty(options, PropIgnoreZValue, value.IgnoreZValue);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropOrientation, value.Orientation);
+		writer.WriteProperty(options, PropProperties, value.Properties);
+		writer.WriteProperty(options, PropStore, value.Store);
+		writer.WriteProperty(options, PropStrategy, value.Strategy);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
 /// <summary>
 /// <para>
 /// The <c>geo_shape</c> data type facilitates the indexing of and searching with arbitrary geo shapes such as rectangles
@@ -34,24 +196,16 @@ namespace Elastic.Clients.Elasticsearch.Serverless.Mapping;
 /// </para>
 /// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/8.17/geo-shape.html">Learn more about this API in the Elasticsearch documentation.</see></para>
 /// </summary>
+[JsonConverter(typeof(GeoShapePropertyConverter))]
 public sealed partial class GeoShapeProperty : IProperty
 {
-	[JsonInclude, JsonPropertyName("coerce")]
 	public bool? Coerce { get; set; }
-	[JsonInclude, JsonPropertyName("copy_to")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Serverless.Fields? CopyTo { get; set; }
-	[JsonInclude, JsonPropertyName("doc_values")]
 	public bool? DocValues { get; set; }
-	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicMapping? Dynamic { get; set; }
-	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Serverless.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; }
 
 	/// <summary>
@@ -59,18 +213,12 @@ public sealed partial class GeoShapeProperty : IProperty
 	/// Metadata about the field.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-	[JsonInclude, JsonPropertyName("orientation")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.GeoOrientation? Orientation { get; set; }
-	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties? Properties { get; set; }
-	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
-	[JsonInclude, JsonPropertyName("strategy")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.GeoStrategy? Strategy { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "geo_shape";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/HalfFloatNumberProperty.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/HalfFloatNumberProperty.g.cs
index 2ec7faa6a78..2edc82cf8d0 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/HalfFloatNumberProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/HalfFloatNumberProperty.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,26 +28,198 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Mapping;
 
+internal sealed partial class HalfFloatNumberPropertyConverter : System.Text.Json.Serialization.JsonConverter<HalfFloatNumberProperty>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropCoerce = System.Text.Json.JsonEncodedText.Encode("coerce");
+	private static readonly System.Text.Json.JsonEncodedText PropCopyTo = System.Text.Json.JsonEncodedText.Encode("copy_to");
+	private static readonly System.Text.Json.JsonEncodedText PropDocValues = System.Text.Json.JsonEncodedText.Encode("doc_values");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamic = System.Text.Json.JsonEncodedText.Encode("dynamic");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreAbove = System.Text.Json.JsonEncodedText.Encode("ignore_above");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreMalformed = System.Text.Json.JsonEncodedText.Encode("ignore_malformed");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropNullValue = System.Text.Json.JsonEncodedText.Encode("null_value");
+	private static readonly System.Text.Json.JsonEncodedText PropOnScriptError = System.Text.Json.JsonEncodedText.Encode("on_script_error");
+	private static readonly System.Text.Json.JsonEncodedText PropProperties = System.Text.Json.JsonEncodedText.Encode("properties");
+	private static readonly System.Text.Json.JsonEncodedText PropScript = System.Text.Json.JsonEncodedText.Encode("script");
+	private static readonly System.Text.Json.JsonEncodedText PropStore = System.Text.Json.JsonEncodedText.Encode("store");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override HalfFloatNumberProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<double?> propBoost = default;
+		LocalJsonProperty<bool?> propCoerce = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Fields?> propCopyTo = default;
+		LocalJsonProperty<bool?> propDocValues = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicMapping?> propDynamic = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties?> propFields = default;
+		LocalJsonProperty<int?> propIgnoreAbove = default;
+		LocalJsonProperty<bool?> propIgnoreMalformed = default;
+		LocalJsonProperty<bool?> propIndex = default;
+		LocalJsonProperty<IDictionary<string, string>?> propMeta = default;
+		LocalJsonProperty<float?> propNullValue = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.OnScriptError?> propOnScriptError = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties?> propProperties = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Script?> propScript = default;
+		LocalJsonProperty<bool?> propStore = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
+
+			if (propCoerce.TryRead(ref reader, options, PropCoerce))
+			{
+				continue;
+			}
+
+			if (propCopyTo.TryRead(ref reader, options, PropCopyTo, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propDocValues.TryRead(ref reader, options, PropDocValues))
+			{
+				continue;
+			}
+
+			if (propDynamic.TryRead(ref reader, options, PropDynamic))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propIgnoreAbove.TryRead(ref reader, options, PropIgnoreAbove))
+			{
+				continue;
+			}
+
+			if (propIgnoreMalformed.TryRead(ref reader, options, PropIgnoreMalformed))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propNullValue.TryRead(ref reader, options, PropNullValue))
+			{
+				continue;
+			}
+
+			if (propOnScriptError.TryRead(ref reader, options, PropOnScriptError))
+			{
+				continue;
+			}
+
+			if (propProperties.TryRead(ref reader, options, PropProperties))
+			{
+				continue;
+			}
+
+			if (propScript.TryRead(ref reader, options, PropScript))
+			{
+				continue;
+			}
+
+			if (propStore.TryRead(ref reader, options, PropStore))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new HalfFloatNumberProperty
+		{
+			Boost = propBoost.Value
+,
+			Coerce = propCoerce.Value
+,
+			CopyTo = propCopyTo.Value
+,
+			DocValues = propDocValues.Value
+,
+			Dynamic = propDynamic.Value
+,
+			Fields = propFields.Value
+,
+			IgnoreAbove = propIgnoreAbove.Value
+,
+			IgnoreMalformed = propIgnoreMalformed.Value
+,
+			Index = propIndex.Value
+,
+			Meta = propMeta.Value
+,
+			NullValue = propNullValue.Value
+,
+			OnScriptError = propOnScriptError.Value
+,
+			Properties = propProperties.Value
+,
+			Script = propScript.Value
+,
+			Store = propStore.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, HalfFloatNumberProperty value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropCoerce, value.Coerce);
+		writer.WriteProperty(options, PropCopyTo, value.CopyTo, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropDocValues, value.DocValues);
+		writer.WriteProperty(options, PropDynamic, value.Dynamic);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropIgnoreAbove, value.IgnoreAbove);
+		writer.WriteProperty(options, PropIgnoreMalformed, value.IgnoreMalformed);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropNullValue, value.NullValue);
+		writer.WriteProperty(options, PropOnScriptError, value.OnScriptError);
+		writer.WriteProperty(options, PropProperties, value.Properties);
+		writer.WriteProperty(options, PropScript, value.Script);
+		writer.WriteProperty(options, PropStore, value.Store);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(HalfFloatNumberPropertyConverter))]
 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")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Serverless.Fields? CopyTo { get; set; }
-	[JsonInclude, JsonPropertyName("doc_values")]
 	public bool? DocValues { get; set; }
-	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicMapping? Dynamic { get; set; }
-	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Serverless.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; }
 
 	/// <summary>
@@ -54,20 +227,13 @@ public sealed partial class HalfFloatNumberProperty : IProperty
 	/// Metadata about the field.
 	/// </para>
 	/// </summary>
-	[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.Serverless.Mapping.OnScriptError? OnScriptError { get; set; }
-	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties? Properties { get; set; }
-	[JsonInclude, JsonPropertyName("script")]
 	public Elastic.Clients.Elasticsearch.Serverless.Script? Script { get; set; }
-	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "half_float";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/IcuCollationProperty.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/IcuCollationProperty.g.cs
index 21424b05c95..04f284e79af 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/IcuCollationProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/IcuCollationProperty.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,30 +28,290 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Mapping;
 
+internal sealed partial class IcuCollationPropertyConverter : System.Text.Json.Serialization.JsonConverter<IcuCollationProperty>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAlternate = System.Text.Json.JsonEncodedText.Encode("alternate");
+	private static readonly System.Text.Json.JsonEncodedText PropCaseFirst = System.Text.Json.JsonEncodedText.Encode("case_first");
+	private static readonly System.Text.Json.JsonEncodedText PropCaseLevel = System.Text.Json.JsonEncodedText.Encode("case_level");
+	private static readonly System.Text.Json.JsonEncodedText PropCopyTo = System.Text.Json.JsonEncodedText.Encode("copy_to");
+	private static readonly System.Text.Json.JsonEncodedText PropCountry = System.Text.Json.JsonEncodedText.Encode("country");
+	private static readonly System.Text.Json.JsonEncodedText PropDecomposition = System.Text.Json.JsonEncodedText.Encode("decomposition");
+	private static readonly System.Text.Json.JsonEncodedText PropDocValues = System.Text.Json.JsonEncodedText.Encode("doc_values");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamic = System.Text.Json.JsonEncodedText.Encode("dynamic");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropHiraganaQuaternaryMode = System.Text.Json.JsonEncodedText.Encode("hiragana_quaternary_mode");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreAbove = System.Text.Json.JsonEncodedText.Encode("ignore_above");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropIndexOptions = System.Text.Json.JsonEncodedText.Encode("index_options");
+	private static readonly System.Text.Json.JsonEncodedText PropLanguage = System.Text.Json.JsonEncodedText.Encode("language");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropNorms = System.Text.Json.JsonEncodedText.Encode("norms");
+	private static readonly System.Text.Json.JsonEncodedText PropNullValue = System.Text.Json.JsonEncodedText.Encode("null_value");
+	private static readonly System.Text.Json.JsonEncodedText PropNumeric = System.Text.Json.JsonEncodedText.Encode("numeric");
+	private static readonly System.Text.Json.JsonEncodedText PropProperties = System.Text.Json.JsonEncodedText.Encode("properties");
+	private static readonly System.Text.Json.JsonEncodedText PropRules = System.Text.Json.JsonEncodedText.Encode("rules");
+	private static readonly System.Text.Json.JsonEncodedText PropStore = System.Text.Json.JsonEncodedText.Encode("store");
+	private static readonly System.Text.Json.JsonEncodedText PropStrength = System.Text.Json.JsonEncodedText.Encode("strength");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+	private static readonly System.Text.Json.JsonEncodedText PropVariableTop = System.Text.Json.JsonEncodedText.Encode("variable_top");
+	private static readonly System.Text.Json.JsonEncodedText PropVariant = System.Text.Json.JsonEncodedText.Encode("variant");
+
+	public override IcuCollationProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Analysis.IcuCollationAlternate?> propAlternate = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Analysis.IcuCollationCaseFirst?> propCaseFirst = default;
+		LocalJsonProperty<bool?> propCaseLevel = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Fields?> propCopyTo = default;
+		LocalJsonProperty<string?> propCountry = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Analysis.IcuCollationDecomposition?> propDecomposition = default;
+		LocalJsonProperty<bool?> propDocValues = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicMapping?> propDynamic = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties?> propFields = default;
+		LocalJsonProperty<bool?> propHiraganaQuaternaryMode = default;
+		LocalJsonProperty<int?> propIgnoreAbove = default;
+		LocalJsonProperty<bool?> propIndex = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.IndexOptions?> propIndexOptions = default;
+		LocalJsonProperty<string?> propLanguage = default;
+		LocalJsonProperty<IDictionary<string, string>?> propMeta = default;
+		LocalJsonProperty<bool?> propNorms = default;
+		LocalJsonProperty<string?> propNullValue = default;
+		LocalJsonProperty<bool?> propNumeric = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties?> propProperties = default;
+		LocalJsonProperty<string?> propRules = default;
+		LocalJsonProperty<bool?> propStore = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Analysis.IcuCollationStrength?> propStrength = default;
+		LocalJsonProperty<string?> propVariableTop = default;
+		LocalJsonProperty<string?> propVariant = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAlternate.TryRead(ref reader, options, PropAlternate))
+			{
+				continue;
+			}
+
+			if (propCaseFirst.TryRead(ref reader, options, PropCaseFirst))
+			{
+				continue;
+			}
+
+			if (propCaseLevel.TryRead(ref reader, options, PropCaseLevel))
+			{
+				continue;
+			}
+
+			if (propCopyTo.TryRead(ref reader, options, PropCopyTo, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propCountry.TryRead(ref reader, options, PropCountry))
+			{
+				continue;
+			}
+
+			if (propDecomposition.TryRead(ref reader, options, PropDecomposition))
+			{
+				continue;
+			}
+
+			if (propDocValues.TryRead(ref reader, options, PropDocValues))
+			{
+				continue;
+			}
+
+			if (propDynamic.TryRead(ref reader, options, PropDynamic))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propHiraganaQuaternaryMode.TryRead(ref reader, options, PropHiraganaQuaternaryMode))
+			{
+				continue;
+			}
+
+			if (propIgnoreAbove.TryRead(ref reader, options, PropIgnoreAbove))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propIndexOptions.TryRead(ref reader, options, PropIndexOptions))
+			{
+				continue;
+			}
+
+			if (propLanguage.TryRead(ref reader, options, PropLanguage))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propNorms.TryRead(ref reader, options, PropNorms))
+			{
+				continue;
+			}
+
+			if (propNullValue.TryRead(ref reader, options, PropNullValue))
+			{
+				continue;
+			}
+
+			if (propNumeric.TryRead(ref reader, options, PropNumeric))
+			{
+				continue;
+			}
+
+			if (propProperties.TryRead(ref reader, options, PropProperties))
+			{
+				continue;
+			}
+
+			if (propRules.TryRead(ref reader, options, PropRules))
+			{
+				continue;
+			}
+
+			if (propStore.TryRead(ref reader, options, PropStore))
+			{
+				continue;
+			}
+
+			if (propStrength.TryRead(ref reader, options, PropStrength))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			if (propVariableTop.TryRead(ref reader, options, PropVariableTop))
+			{
+				continue;
+			}
+
+			if (propVariant.TryRead(ref reader, options, PropVariant))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new IcuCollationProperty
+		{
+			Alternate = propAlternate.Value
+,
+			CaseFirst = propCaseFirst.Value
+,
+			CaseLevel = propCaseLevel.Value
+,
+			CopyTo = propCopyTo.Value
+,
+			Country = propCountry.Value
+,
+			Decomposition = propDecomposition.Value
+,
+			DocValues = propDocValues.Value
+,
+			Dynamic = propDynamic.Value
+,
+			Fields = propFields.Value
+,
+			HiraganaQuaternaryMode = propHiraganaQuaternaryMode.Value
+,
+			IgnoreAbove = propIgnoreAbove.Value
+,
+			Index = propIndex.Value
+,
+			IndexOptions = propIndexOptions.Value
+,
+			Language = propLanguage.Value
+,
+			Meta = propMeta.Value
+,
+			Norms = propNorms.Value
+,
+			NullValue = propNullValue.Value
+,
+			Numeric = propNumeric.Value
+,
+			Properties = propProperties.Value
+,
+			Rules = propRules.Value
+,
+			Store = propStore.Value
+,
+			Strength = propStrength.Value
+,
+			VariableTop = propVariableTop.Value
+,
+			Variant = propVariant.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IcuCollationProperty value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAlternate, value.Alternate);
+		writer.WriteProperty(options, PropCaseFirst, value.CaseFirst);
+		writer.WriteProperty(options, PropCaseLevel, value.CaseLevel);
+		writer.WriteProperty(options, PropCopyTo, value.CopyTo, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropCountry, value.Country);
+		writer.WriteProperty(options, PropDecomposition, value.Decomposition);
+		writer.WriteProperty(options, PropDocValues, value.DocValues);
+		writer.WriteProperty(options, PropDynamic, value.Dynamic);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropHiraganaQuaternaryMode, value.HiraganaQuaternaryMode);
+		writer.WriteProperty(options, PropIgnoreAbove, value.IgnoreAbove);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropIndexOptions, value.IndexOptions);
+		writer.WriteProperty(options, PropLanguage, value.Language);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropNorms, value.Norms);
+		writer.WriteProperty(options, PropNullValue, value.NullValue);
+		writer.WriteProperty(options, PropNumeric, value.Numeric);
+		writer.WriteProperty(options, PropProperties, value.Properties);
+		writer.WriteProperty(options, PropRules, value.Rules);
+		writer.WriteProperty(options, PropStore, value.Store);
+		writer.WriteProperty(options, PropStrength, value.Strength);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteProperty(options, PropVariableTop, value.VariableTop);
+		writer.WriteProperty(options, PropVariant, value.Variant);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(IcuCollationPropertyConverter))]
 public sealed partial class IcuCollationProperty : IProperty
 {
-	[JsonInclude, JsonPropertyName("alternate")]
 	public Elastic.Clients.Elasticsearch.Serverless.Analysis.IcuCollationAlternate? Alternate { get; set; }
-	[JsonInclude, JsonPropertyName("case_first")]
 	public Elastic.Clients.Elasticsearch.Serverless.Analysis.IcuCollationCaseFirst? CaseFirst { get; set; }
-	[JsonInclude, JsonPropertyName("case_level")]
 	public bool? CaseLevel { get; set; }
-	[JsonInclude, JsonPropertyName("copy_to")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Serverless.Fields? CopyTo { get; set; }
-	[JsonInclude, JsonPropertyName("country")]
 	public string? Country { get; set; }
-	[JsonInclude, JsonPropertyName("decomposition")]
 	public Elastic.Clients.Elasticsearch.Serverless.Analysis.IcuCollationDecomposition? Decomposition { get; set; }
-	[JsonInclude, JsonPropertyName("doc_values")]
 	public bool? DocValues { get; set; }
-	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicMapping? Dynamic { get; set; }
-	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties? Fields { get; set; }
-	[JsonInclude, JsonPropertyName("hiragana_quaternary_mode")]
 	public bool? HiraganaQuaternaryMode { get; set; }
-	[JsonInclude, JsonPropertyName("ignore_above")]
 	public int? IgnoreAbove { get; set; }
 
 	/// <summary>
@@ -58,11 +319,8 @@ public sealed partial class IcuCollationProperty : IProperty
 	/// Should the field be searchable?
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("index")]
 	public bool? Index { get; set; }
-	[JsonInclude, JsonPropertyName("index_options")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.IndexOptions? IndexOptions { get; set; }
-	[JsonInclude, JsonPropertyName("language")]
 	public string? Language { get; set; }
 
 	/// <summary>
@@ -70,9 +328,7 @@ public sealed partial class IcuCollationProperty : IProperty
 	/// Metadata about the field.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-	[JsonInclude, JsonPropertyName("norms")]
 	public bool? Norms { get; set; }
 
 	/// <summary>
@@ -80,25 +336,16 @@ public sealed partial class IcuCollationProperty : IProperty
 	/// Accepts a string value which is substituted for any explicit null values. Defaults to null, which means the field is treated as missing.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("null_value")]
 	public string? NullValue { get; set; }
-	[JsonInclude, JsonPropertyName("numeric")]
 	public bool? Numeric { get; set; }
-	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties? Properties { get; set; }
-	[JsonInclude, JsonPropertyName("rules")]
 	public string? Rules { get; set; }
-	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
-	[JsonInclude, JsonPropertyName("strength")]
 	public Elastic.Clients.Elasticsearch.Serverless.Analysis.IcuCollationStrength? Strength { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "icu_collation_keyword";
 
-	[JsonInclude, JsonPropertyName("variable_top")]
 	public string? VariableTop { get; set; }
-	[JsonInclude, JsonPropertyName("variant")]
 	public string? Variant { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/IntegerNumberProperty.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/IntegerNumberProperty.g.cs
index 508c776da51..19fa24ed105 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/IntegerNumberProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/IntegerNumberProperty.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,26 +28,198 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Mapping;
 
+internal sealed partial class IntegerNumberPropertyConverter : System.Text.Json.Serialization.JsonConverter<IntegerNumberProperty>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropCoerce = System.Text.Json.JsonEncodedText.Encode("coerce");
+	private static readonly System.Text.Json.JsonEncodedText PropCopyTo = System.Text.Json.JsonEncodedText.Encode("copy_to");
+	private static readonly System.Text.Json.JsonEncodedText PropDocValues = System.Text.Json.JsonEncodedText.Encode("doc_values");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamic = System.Text.Json.JsonEncodedText.Encode("dynamic");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreAbove = System.Text.Json.JsonEncodedText.Encode("ignore_above");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreMalformed = System.Text.Json.JsonEncodedText.Encode("ignore_malformed");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropNullValue = System.Text.Json.JsonEncodedText.Encode("null_value");
+	private static readonly System.Text.Json.JsonEncodedText PropOnScriptError = System.Text.Json.JsonEncodedText.Encode("on_script_error");
+	private static readonly System.Text.Json.JsonEncodedText PropProperties = System.Text.Json.JsonEncodedText.Encode("properties");
+	private static readonly System.Text.Json.JsonEncodedText PropScript = System.Text.Json.JsonEncodedText.Encode("script");
+	private static readonly System.Text.Json.JsonEncodedText PropStore = System.Text.Json.JsonEncodedText.Encode("store");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override IntegerNumberProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<double?> propBoost = default;
+		LocalJsonProperty<bool?> propCoerce = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Fields?> propCopyTo = default;
+		LocalJsonProperty<bool?> propDocValues = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicMapping?> propDynamic = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties?> propFields = default;
+		LocalJsonProperty<int?> propIgnoreAbove = default;
+		LocalJsonProperty<bool?> propIgnoreMalformed = default;
+		LocalJsonProperty<bool?> propIndex = default;
+		LocalJsonProperty<IDictionary<string, string>?> propMeta = default;
+		LocalJsonProperty<int?> propNullValue = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.OnScriptError?> propOnScriptError = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties?> propProperties = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Script?> propScript = default;
+		LocalJsonProperty<bool?> propStore = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
+
+			if (propCoerce.TryRead(ref reader, options, PropCoerce))
+			{
+				continue;
+			}
+
+			if (propCopyTo.TryRead(ref reader, options, PropCopyTo, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propDocValues.TryRead(ref reader, options, PropDocValues))
+			{
+				continue;
+			}
+
+			if (propDynamic.TryRead(ref reader, options, PropDynamic))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propIgnoreAbove.TryRead(ref reader, options, PropIgnoreAbove))
+			{
+				continue;
+			}
+
+			if (propIgnoreMalformed.TryRead(ref reader, options, PropIgnoreMalformed))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propNullValue.TryRead(ref reader, options, PropNullValue))
+			{
+				continue;
+			}
+
+			if (propOnScriptError.TryRead(ref reader, options, PropOnScriptError))
+			{
+				continue;
+			}
+
+			if (propProperties.TryRead(ref reader, options, PropProperties))
+			{
+				continue;
+			}
+
+			if (propScript.TryRead(ref reader, options, PropScript))
+			{
+				continue;
+			}
+
+			if (propStore.TryRead(ref reader, options, PropStore))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new IntegerNumberProperty
+		{
+			Boost = propBoost.Value
+,
+			Coerce = propCoerce.Value
+,
+			CopyTo = propCopyTo.Value
+,
+			DocValues = propDocValues.Value
+,
+			Dynamic = propDynamic.Value
+,
+			Fields = propFields.Value
+,
+			IgnoreAbove = propIgnoreAbove.Value
+,
+			IgnoreMalformed = propIgnoreMalformed.Value
+,
+			Index = propIndex.Value
+,
+			Meta = propMeta.Value
+,
+			NullValue = propNullValue.Value
+,
+			OnScriptError = propOnScriptError.Value
+,
+			Properties = propProperties.Value
+,
+			Script = propScript.Value
+,
+			Store = propStore.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IntegerNumberProperty value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropCoerce, value.Coerce);
+		writer.WriteProperty(options, PropCopyTo, value.CopyTo, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropDocValues, value.DocValues);
+		writer.WriteProperty(options, PropDynamic, value.Dynamic);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropIgnoreAbove, value.IgnoreAbove);
+		writer.WriteProperty(options, PropIgnoreMalformed, value.IgnoreMalformed);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropNullValue, value.NullValue);
+		writer.WriteProperty(options, PropOnScriptError, value.OnScriptError);
+		writer.WriteProperty(options, PropProperties, value.Properties);
+		writer.WriteProperty(options, PropScript, value.Script);
+		writer.WriteProperty(options, PropStore, value.Store);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(IntegerNumberPropertyConverter))]
 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")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Serverless.Fields? CopyTo { get; set; }
-	[JsonInclude, JsonPropertyName("doc_values")]
 	public bool? DocValues { get; set; }
-	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicMapping? Dynamic { get; set; }
-	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Serverless.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; }
 
 	/// <summary>
@@ -54,20 +227,13 @@ public sealed partial class IntegerNumberProperty : IProperty
 	/// Metadata about the field.
 	/// </para>
 	/// </summary>
-	[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.Serverless.Mapping.OnScriptError? OnScriptError { get; set; }
-	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties? Properties { get; set; }
-	[JsonInclude, JsonPropertyName("script")]
 	public Elastic.Clients.Elasticsearch.Serverless.Script? Script { get; set; }
-	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "integer";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/IntegerRangeProperty.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/IntegerRangeProperty.g.cs
index 3f5480fa605..abb0e74a9c3 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/IntegerRangeProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/IntegerRangeProperty.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,24 +28,157 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Mapping;
 
+internal sealed partial class IntegerRangePropertyConverter : System.Text.Json.Serialization.JsonConverter<IntegerRangeProperty>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropCoerce = System.Text.Json.JsonEncodedText.Encode("coerce");
+	private static readonly System.Text.Json.JsonEncodedText PropCopyTo = System.Text.Json.JsonEncodedText.Encode("copy_to");
+	private static readonly System.Text.Json.JsonEncodedText PropDocValues = System.Text.Json.JsonEncodedText.Encode("doc_values");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamic = System.Text.Json.JsonEncodedText.Encode("dynamic");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreAbove = System.Text.Json.JsonEncodedText.Encode("ignore_above");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropProperties = System.Text.Json.JsonEncodedText.Encode("properties");
+	private static readonly System.Text.Json.JsonEncodedText PropStore = System.Text.Json.JsonEncodedText.Encode("store");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override IntegerRangeProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<double?> propBoost = default;
+		LocalJsonProperty<bool?> propCoerce = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Fields?> propCopyTo = default;
+		LocalJsonProperty<bool?> propDocValues = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicMapping?> propDynamic = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties?> propFields = default;
+		LocalJsonProperty<int?> propIgnoreAbove = default;
+		LocalJsonProperty<bool?> propIndex = default;
+		LocalJsonProperty<IDictionary<string, string>?> propMeta = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties?> propProperties = default;
+		LocalJsonProperty<bool?> propStore = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
+
+			if (propCoerce.TryRead(ref reader, options, PropCoerce))
+			{
+				continue;
+			}
+
+			if (propCopyTo.TryRead(ref reader, options, PropCopyTo, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propDocValues.TryRead(ref reader, options, PropDocValues))
+			{
+				continue;
+			}
+
+			if (propDynamic.TryRead(ref reader, options, PropDynamic))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propIgnoreAbove.TryRead(ref reader, options, PropIgnoreAbove))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propProperties.TryRead(ref reader, options, PropProperties))
+			{
+				continue;
+			}
+
+			if (propStore.TryRead(ref reader, options, PropStore))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new IntegerRangeProperty
+		{
+			Boost = propBoost.Value
+,
+			Coerce = propCoerce.Value
+,
+			CopyTo = propCopyTo.Value
+,
+			DocValues = propDocValues.Value
+,
+			Dynamic = propDynamic.Value
+,
+			Fields = propFields.Value
+,
+			IgnoreAbove = propIgnoreAbove.Value
+,
+			Index = propIndex.Value
+,
+			Meta = propMeta.Value
+,
+			Properties = propProperties.Value
+,
+			Store = propStore.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IntegerRangeProperty value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropCoerce, value.Coerce);
+		writer.WriteProperty(options, PropCopyTo, value.CopyTo, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropDocValues, value.DocValues);
+		writer.WriteProperty(options, PropDynamic, value.Dynamic);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropIgnoreAbove, value.IgnoreAbove);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropProperties, value.Properties);
+		writer.WriteProperty(options, PropStore, value.Store);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(IntegerRangePropertyConverter))]
 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")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Serverless.Fields? CopyTo { get; set; }
-	[JsonInclude, JsonPropertyName("doc_values")]
 	public bool? DocValues { get; set; }
-	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicMapping? Dynamic { get; set; }
-	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties? Fields { get; set; }
-	[JsonInclude, JsonPropertyName("ignore_above")]
 	public int? IgnoreAbove { get; set; }
-	[JsonInclude, JsonPropertyName("index")]
 	public bool? Index { get; set; }
 
 	/// <summary>
@@ -52,14 +186,10 @@ public sealed partial class IntegerRangeProperty : IProperty
 	/// Metadata about the field.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties? Properties { get; set; }
-	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "integer_range";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/IpProperty.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/IpProperty.g.cs
index adffb9e4746..d99e02d3147 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/IpProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/IpProperty.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,24 +28,187 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Mapping;
 
+internal sealed partial class IpPropertyConverter : System.Text.Json.Serialization.JsonConverter<IpProperty>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropCopyTo = System.Text.Json.JsonEncodedText.Encode("copy_to");
+	private static readonly System.Text.Json.JsonEncodedText PropDocValues = System.Text.Json.JsonEncodedText.Encode("doc_values");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamic = System.Text.Json.JsonEncodedText.Encode("dynamic");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreAbove = System.Text.Json.JsonEncodedText.Encode("ignore_above");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreMalformed = System.Text.Json.JsonEncodedText.Encode("ignore_malformed");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropNullValue = System.Text.Json.JsonEncodedText.Encode("null_value");
+	private static readonly System.Text.Json.JsonEncodedText PropOnScriptError = System.Text.Json.JsonEncodedText.Encode("on_script_error");
+	private static readonly System.Text.Json.JsonEncodedText PropProperties = System.Text.Json.JsonEncodedText.Encode("properties");
+	private static readonly System.Text.Json.JsonEncodedText PropScript = System.Text.Json.JsonEncodedText.Encode("script");
+	private static readonly System.Text.Json.JsonEncodedText PropStore = System.Text.Json.JsonEncodedText.Encode("store");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override IpProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<double?> propBoost = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Fields?> propCopyTo = default;
+		LocalJsonProperty<bool?> propDocValues = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicMapping?> propDynamic = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties?> propFields = default;
+		LocalJsonProperty<int?> propIgnoreAbove = default;
+		LocalJsonProperty<bool?> propIgnoreMalformed = default;
+		LocalJsonProperty<bool?> propIndex = default;
+		LocalJsonProperty<IDictionary<string, string>?> propMeta = default;
+		LocalJsonProperty<string?> propNullValue = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.OnScriptError?> propOnScriptError = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties?> propProperties = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Script?> propScript = default;
+		LocalJsonProperty<bool?> propStore = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
+
+			if (propCopyTo.TryRead(ref reader, options, PropCopyTo, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propDocValues.TryRead(ref reader, options, PropDocValues))
+			{
+				continue;
+			}
+
+			if (propDynamic.TryRead(ref reader, options, PropDynamic))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propIgnoreAbove.TryRead(ref reader, options, PropIgnoreAbove))
+			{
+				continue;
+			}
+
+			if (propIgnoreMalformed.TryRead(ref reader, options, PropIgnoreMalformed))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propNullValue.TryRead(ref reader, options, PropNullValue))
+			{
+				continue;
+			}
+
+			if (propOnScriptError.TryRead(ref reader, options, PropOnScriptError))
+			{
+				continue;
+			}
+
+			if (propProperties.TryRead(ref reader, options, PropProperties))
+			{
+				continue;
+			}
+
+			if (propScript.TryRead(ref reader, options, PropScript))
+			{
+				continue;
+			}
+
+			if (propStore.TryRead(ref reader, options, PropStore))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new IpProperty
+		{
+			Boost = propBoost.Value
+,
+			CopyTo = propCopyTo.Value
+,
+			DocValues = propDocValues.Value
+,
+			Dynamic = propDynamic.Value
+,
+			Fields = propFields.Value
+,
+			IgnoreAbove = propIgnoreAbove.Value
+,
+			IgnoreMalformed = propIgnoreMalformed.Value
+,
+			Index = propIndex.Value
+,
+			Meta = propMeta.Value
+,
+			NullValue = propNullValue.Value
+,
+			OnScriptError = propOnScriptError.Value
+,
+			Properties = propProperties.Value
+,
+			Script = propScript.Value
+,
+			Store = propStore.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IpProperty value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropCopyTo, value.CopyTo, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropDocValues, value.DocValues);
+		writer.WriteProperty(options, PropDynamic, value.Dynamic);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropIgnoreAbove, value.IgnoreAbove);
+		writer.WriteProperty(options, PropIgnoreMalformed, value.IgnoreMalformed);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropNullValue, value.NullValue);
+		writer.WriteProperty(options, PropOnScriptError, value.OnScriptError);
+		writer.WriteProperty(options, PropProperties, value.Properties);
+		writer.WriteProperty(options, PropScript, value.Script);
+		writer.WriteProperty(options, PropStore, value.Store);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(IpPropertyConverter))]
 public sealed partial class IpProperty : IProperty
 {
-	[JsonInclude, JsonPropertyName("boost")]
 	public double? Boost { get; set; }
-	[JsonInclude, JsonPropertyName("copy_to")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Serverless.Fields? CopyTo { get; set; }
-	[JsonInclude, JsonPropertyName("doc_values")]
 	public bool? DocValues { get; set; }
-	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicMapping? Dynamic { get; set; }
-	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Serverless.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; }
 
 	/// <summary>
@@ -52,20 +216,13 @@ public sealed partial class IpProperty : IProperty
 	/// Metadata about the field.
 	/// </para>
 	/// </summary>
-	[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.Serverless.Mapping.OnScriptError? OnScriptError { get; set; }
-	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties? Properties { get; set; }
-	[JsonInclude, JsonPropertyName("script")]
 	public Elastic.Clients.Elasticsearch.Serverless.Script? Script { get; set; }
-	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "ip";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/IpRangeProperty.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/IpRangeProperty.g.cs
index e8bb6651899..cc9f28ea9c5 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/IpRangeProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/IpRangeProperty.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,24 +28,157 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Mapping;
 
+internal sealed partial class IpRangePropertyConverter : System.Text.Json.Serialization.JsonConverter<IpRangeProperty>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropCoerce = System.Text.Json.JsonEncodedText.Encode("coerce");
+	private static readonly System.Text.Json.JsonEncodedText PropCopyTo = System.Text.Json.JsonEncodedText.Encode("copy_to");
+	private static readonly System.Text.Json.JsonEncodedText PropDocValues = System.Text.Json.JsonEncodedText.Encode("doc_values");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamic = System.Text.Json.JsonEncodedText.Encode("dynamic");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreAbove = System.Text.Json.JsonEncodedText.Encode("ignore_above");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropProperties = System.Text.Json.JsonEncodedText.Encode("properties");
+	private static readonly System.Text.Json.JsonEncodedText PropStore = System.Text.Json.JsonEncodedText.Encode("store");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override IpRangeProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<double?> propBoost = default;
+		LocalJsonProperty<bool?> propCoerce = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Fields?> propCopyTo = default;
+		LocalJsonProperty<bool?> propDocValues = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicMapping?> propDynamic = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties?> propFields = default;
+		LocalJsonProperty<int?> propIgnoreAbove = default;
+		LocalJsonProperty<bool?> propIndex = default;
+		LocalJsonProperty<IDictionary<string, string>?> propMeta = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties?> propProperties = default;
+		LocalJsonProperty<bool?> propStore = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
+
+			if (propCoerce.TryRead(ref reader, options, PropCoerce))
+			{
+				continue;
+			}
+
+			if (propCopyTo.TryRead(ref reader, options, PropCopyTo, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propDocValues.TryRead(ref reader, options, PropDocValues))
+			{
+				continue;
+			}
+
+			if (propDynamic.TryRead(ref reader, options, PropDynamic))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propIgnoreAbove.TryRead(ref reader, options, PropIgnoreAbove))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propProperties.TryRead(ref reader, options, PropProperties))
+			{
+				continue;
+			}
+
+			if (propStore.TryRead(ref reader, options, PropStore))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new IpRangeProperty
+		{
+			Boost = propBoost.Value
+,
+			Coerce = propCoerce.Value
+,
+			CopyTo = propCopyTo.Value
+,
+			DocValues = propDocValues.Value
+,
+			Dynamic = propDynamic.Value
+,
+			Fields = propFields.Value
+,
+			IgnoreAbove = propIgnoreAbove.Value
+,
+			Index = propIndex.Value
+,
+			Meta = propMeta.Value
+,
+			Properties = propProperties.Value
+,
+			Store = propStore.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IpRangeProperty value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropCoerce, value.Coerce);
+		writer.WriteProperty(options, PropCopyTo, value.CopyTo, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropDocValues, value.DocValues);
+		writer.WriteProperty(options, PropDynamic, value.Dynamic);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropIgnoreAbove, value.IgnoreAbove);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropProperties, value.Properties);
+		writer.WriteProperty(options, PropStore, value.Store);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(IpRangePropertyConverter))]
 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")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Serverless.Fields? CopyTo { get; set; }
-	[JsonInclude, JsonPropertyName("doc_values")]
 	public bool? DocValues { get; set; }
-	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicMapping? Dynamic { get; set; }
-	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties? Fields { get; set; }
-	[JsonInclude, JsonPropertyName("ignore_above")]
 	public int? IgnoreAbove { get; set; }
-	[JsonInclude, JsonPropertyName("index")]
 	public bool? Index { get; set; }
 
 	/// <summary>
@@ -52,14 +186,10 @@ public sealed partial class IpRangeProperty : IProperty
 	/// Metadata about the field.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties? Properties { get; set; }
-	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "ip_range";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/KeywordProperty.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/KeywordProperty.g.cs
index 2d120c42c28..924211b413e 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/KeywordProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/KeywordProperty.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,26 +28,238 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Mapping;
 
+internal sealed partial class KeywordPropertyConverter : System.Text.Json.Serialization.JsonConverter<KeywordProperty>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropCopyTo = System.Text.Json.JsonEncodedText.Encode("copy_to");
+	private static readonly System.Text.Json.JsonEncodedText PropDocValues = System.Text.Json.JsonEncodedText.Encode("doc_values");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamic = System.Text.Json.JsonEncodedText.Encode("dynamic");
+	private static readonly System.Text.Json.JsonEncodedText PropEagerGlobalOrdinals = System.Text.Json.JsonEncodedText.Encode("eager_global_ordinals");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreAbove = System.Text.Json.JsonEncodedText.Encode("ignore_above");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropIndexOptions = System.Text.Json.JsonEncodedText.Encode("index_options");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropNormalizer = System.Text.Json.JsonEncodedText.Encode("normalizer");
+	private static readonly System.Text.Json.JsonEncodedText PropNorms = System.Text.Json.JsonEncodedText.Encode("norms");
+	private static readonly System.Text.Json.JsonEncodedText PropNullValue = System.Text.Json.JsonEncodedText.Encode("null_value");
+	private static readonly System.Text.Json.JsonEncodedText PropOnScriptError = System.Text.Json.JsonEncodedText.Encode("on_script_error");
+	private static readonly System.Text.Json.JsonEncodedText PropProperties = System.Text.Json.JsonEncodedText.Encode("properties");
+	private static readonly System.Text.Json.JsonEncodedText PropScript = System.Text.Json.JsonEncodedText.Encode("script");
+	private static readonly System.Text.Json.JsonEncodedText PropSimilarity = System.Text.Json.JsonEncodedText.Encode("similarity");
+	private static readonly System.Text.Json.JsonEncodedText PropSplitQueriesOnWhitespace = System.Text.Json.JsonEncodedText.Encode("split_queries_on_whitespace");
+	private static readonly System.Text.Json.JsonEncodedText PropStore = System.Text.Json.JsonEncodedText.Encode("store");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override KeywordProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<double?> propBoost = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Fields?> propCopyTo = default;
+		LocalJsonProperty<bool?> propDocValues = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicMapping?> propDynamic = default;
+		LocalJsonProperty<bool?> propEagerGlobalOrdinals = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties?> propFields = default;
+		LocalJsonProperty<int?> propIgnoreAbove = default;
+		LocalJsonProperty<bool?> propIndex = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.IndexOptions?> propIndexOptions = default;
+		LocalJsonProperty<IDictionary<string, string>?> propMeta = default;
+		LocalJsonProperty<string?> propNormalizer = default;
+		LocalJsonProperty<bool?> propNorms = default;
+		LocalJsonProperty<string?> propNullValue = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.OnScriptError?> propOnScriptError = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties?> propProperties = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Script?> propScript = default;
+		LocalJsonProperty<string?> propSimilarity = default;
+		LocalJsonProperty<bool?> propSplitQueriesOnWhitespace = default;
+		LocalJsonProperty<bool?> propStore = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
+
+			if (propCopyTo.TryRead(ref reader, options, PropCopyTo, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propDocValues.TryRead(ref reader, options, PropDocValues))
+			{
+				continue;
+			}
+
+			if (propDynamic.TryRead(ref reader, options, PropDynamic))
+			{
+				continue;
+			}
+
+			if (propEagerGlobalOrdinals.TryRead(ref reader, options, PropEagerGlobalOrdinals))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propIgnoreAbove.TryRead(ref reader, options, PropIgnoreAbove))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propIndexOptions.TryRead(ref reader, options, PropIndexOptions))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propNormalizer.TryRead(ref reader, options, PropNormalizer))
+			{
+				continue;
+			}
+
+			if (propNorms.TryRead(ref reader, options, PropNorms))
+			{
+				continue;
+			}
+
+			if (propNullValue.TryRead(ref reader, options, PropNullValue))
+			{
+				continue;
+			}
+
+			if (propOnScriptError.TryRead(ref reader, options, PropOnScriptError))
+			{
+				continue;
+			}
+
+			if (propProperties.TryRead(ref reader, options, PropProperties))
+			{
+				continue;
+			}
+
+			if (propScript.TryRead(ref reader, options, PropScript))
+			{
+				continue;
+			}
+
+			if (propSimilarity.TryRead(ref reader, options, PropSimilarity))
+			{
+				continue;
+			}
+
+			if (propSplitQueriesOnWhitespace.TryRead(ref reader, options, PropSplitQueriesOnWhitespace))
+			{
+				continue;
+			}
+
+			if (propStore.TryRead(ref reader, options, PropStore))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new KeywordProperty
+		{
+			Boost = propBoost.Value
+,
+			CopyTo = propCopyTo.Value
+,
+			DocValues = propDocValues.Value
+,
+			Dynamic = propDynamic.Value
+,
+			EagerGlobalOrdinals = propEagerGlobalOrdinals.Value
+,
+			Fields = propFields.Value
+,
+			IgnoreAbove = propIgnoreAbove.Value
+,
+			Index = propIndex.Value
+,
+			IndexOptions = propIndexOptions.Value
+,
+			Meta = propMeta.Value
+,
+			Normalizer = propNormalizer.Value
+,
+			Norms = propNorms.Value
+,
+			NullValue = propNullValue.Value
+,
+			OnScriptError = propOnScriptError.Value
+,
+			Properties = propProperties.Value
+,
+			Script = propScript.Value
+,
+			Similarity = propSimilarity.Value
+,
+			SplitQueriesOnWhitespace = propSplitQueriesOnWhitespace.Value
+,
+			Store = propStore.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, KeywordProperty value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropCopyTo, value.CopyTo, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropDocValues, value.DocValues);
+		writer.WriteProperty(options, PropDynamic, value.Dynamic);
+		writer.WriteProperty(options, PropEagerGlobalOrdinals, value.EagerGlobalOrdinals);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropIgnoreAbove, value.IgnoreAbove);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropIndexOptions, value.IndexOptions);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropNormalizer, value.Normalizer);
+		writer.WriteProperty(options, PropNorms, value.Norms);
+		writer.WriteProperty(options, PropNullValue, value.NullValue);
+		writer.WriteProperty(options, PropOnScriptError, value.OnScriptError);
+		writer.WriteProperty(options, PropProperties, value.Properties);
+		writer.WriteProperty(options, PropScript, value.Script);
+		writer.WriteProperty(options, PropSimilarity, value.Similarity);
+		writer.WriteProperty(options, PropSplitQueriesOnWhitespace, value.SplitQueriesOnWhitespace);
+		writer.WriteProperty(options, PropStore, value.Store);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(KeywordPropertyConverter))]
 public sealed partial class KeywordProperty : IProperty
 {
-	[JsonInclude, JsonPropertyName("boost")]
 	public double? Boost { get; set; }
-	[JsonInclude, JsonPropertyName("copy_to")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Serverless.Fields? CopyTo { get; set; }
-	[JsonInclude, JsonPropertyName("doc_values")]
 	public bool? DocValues { get; set; }
-	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicMapping? Dynamic { get; set; }
-	[JsonInclude, JsonPropertyName("eager_global_ordinals")]
 	public bool? EagerGlobalOrdinals { get; set; }
-	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Serverless.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.Serverless.Mapping.IndexOptions? IndexOptions { get; set; }
 
 	/// <summary>
@@ -54,28 +267,17 @@ public sealed partial class KeywordProperty : IProperty
 	/// Metadata about the field.
 	/// </para>
 	/// </summary>
-	[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("on_script_error")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.OnScriptError? OnScriptError { get; set; }
-	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties? Properties { get; set; }
-	[JsonInclude, JsonPropertyName("script")]
 	public Elastic.Clients.Elasticsearch.Serverless.Script? Script { 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; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "keyword";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/LongNumberProperty.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/LongNumberProperty.g.cs
index b96b7870eef..f86f018942f 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/LongNumberProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/LongNumberProperty.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,26 +28,198 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Mapping;
 
+internal sealed partial class LongNumberPropertyConverter : System.Text.Json.Serialization.JsonConverter<LongNumberProperty>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropCoerce = System.Text.Json.JsonEncodedText.Encode("coerce");
+	private static readonly System.Text.Json.JsonEncodedText PropCopyTo = System.Text.Json.JsonEncodedText.Encode("copy_to");
+	private static readonly System.Text.Json.JsonEncodedText PropDocValues = System.Text.Json.JsonEncodedText.Encode("doc_values");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamic = System.Text.Json.JsonEncodedText.Encode("dynamic");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreAbove = System.Text.Json.JsonEncodedText.Encode("ignore_above");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreMalformed = System.Text.Json.JsonEncodedText.Encode("ignore_malformed");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropNullValue = System.Text.Json.JsonEncodedText.Encode("null_value");
+	private static readonly System.Text.Json.JsonEncodedText PropOnScriptError = System.Text.Json.JsonEncodedText.Encode("on_script_error");
+	private static readonly System.Text.Json.JsonEncodedText PropProperties = System.Text.Json.JsonEncodedText.Encode("properties");
+	private static readonly System.Text.Json.JsonEncodedText PropScript = System.Text.Json.JsonEncodedText.Encode("script");
+	private static readonly System.Text.Json.JsonEncodedText PropStore = System.Text.Json.JsonEncodedText.Encode("store");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override LongNumberProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<double?> propBoost = default;
+		LocalJsonProperty<bool?> propCoerce = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Fields?> propCopyTo = default;
+		LocalJsonProperty<bool?> propDocValues = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicMapping?> propDynamic = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties?> propFields = default;
+		LocalJsonProperty<int?> propIgnoreAbove = default;
+		LocalJsonProperty<bool?> propIgnoreMalformed = default;
+		LocalJsonProperty<bool?> propIndex = default;
+		LocalJsonProperty<IDictionary<string, string>?> propMeta = default;
+		LocalJsonProperty<long?> propNullValue = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.OnScriptError?> propOnScriptError = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties?> propProperties = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Script?> propScript = default;
+		LocalJsonProperty<bool?> propStore = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
+
+			if (propCoerce.TryRead(ref reader, options, PropCoerce))
+			{
+				continue;
+			}
+
+			if (propCopyTo.TryRead(ref reader, options, PropCopyTo, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propDocValues.TryRead(ref reader, options, PropDocValues))
+			{
+				continue;
+			}
+
+			if (propDynamic.TryRead(ref reader, options, PropDynamic))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propIgnoreAbove.TryRead(ref reader, options, PropIgnoreAbove))
+			{
+				continue;
+			}
+
+			if (propIgnoreMalformed.TryRead(ref reader, options, PropIgnoreMalformed))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propNullValue.TryRead(ref reader, options, PropNullValue))
+			{
+				continue;
+			}
+
+			if (propOnScriptError.TryRead(ref reader, options, PropOnScriptError))
+			{
+				continue;
+			}
+
+			if (propProperties.TryRead(ref reader, options, PropProperties))
+			{
+				continue;
+			}
+
+			if (propScript.TryRead(ref reader, options, PropScript))
+			{
+				continue;
+			}
+
+			if (propStore.TryRead(ref reader, options, PropStore))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new LongNumberProperty
+		{
+			Boost = propBoost.Value
+,
+			Coerce = propCoerce.Value
+,
+			CopyTo = propCopyTo.Value
+,
+			DocValues = propDocValues.Value
+,
+			Dynamic = propDynamic.Value
+,
+			Fields = propFields.Value
+,
+			IgnoreAbove = propIgnoreAbove.Value
+,
+			IgnoreMalformed = propIgnoreMalformed.Value
+,
+			Index = propIndex.Value
+,
+			Meta = propMeta.Value
+,
+			NullValue = propNullValue.Value
+,
+			OnScriptError = propOnScriptError.Value
+,
+			Properties = propProperties.Value
+,
+			Script = propScript.Value
+,
+			Store = propStore.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, LongNumberProperty value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropCoerce, value.Coerce);
+		writer.WriteProperty(options, PropCopyTo, value.CopyTo, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropDocValues, value.DocValues);
+		writer.WriteProperty(options, PropDynamic, value.Dynamic);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropIgnoreAbove, value.IgnoreAbove);
+		writer.WriteProperty(options, PropIgnoreMalformed, value.IgnoreMalformed);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropNullValue, value.NullValue);
+		writer.WriteProperty(options, PropOnScriptError, value.OnScriptError);
+		writer.WriteProperty(options, PropProperties, value.Properties);
+		writer.WriteProperty(options, PropScript, value.Script);
+		writer.WriteProperty(options, PropStore, value.Store);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(LongNumberPropertyConverter))]
 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")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Serverless.Fields? CopyTo { get; set; }
-	[JsonInclude, JsonPropertyName("doc_values")]
 	public bool? DocValues { get; set; }
-	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicMapping? Dynamic { get; set; }
-	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Serverless.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; }
 
 	/// <summary>
@@ -54,20 +227,13 @@ public sealed partial class LongNumberProperty : IProperty
 	/// Metadata about the field.
 	/// </para>
 	/// </summary>
-	[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.Serverless.Mapping.OnScriptError? OnScriptError { get; set; }
-	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties? Properties { get; set; }
-	[JsonInclude, JsonPropertyName("script")]
 	public Elastic.Clients.Elasticsearch.Serverless.Script? Script { get; set; }
-	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "long";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/LongRangeProperty.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/LongRangeProperty.g.cs
index 8237b58c9eb..7568f02d360 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/LongRangeProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/LongRangeProperty.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,24 +28,157 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Mapping;
 
+internal sealed partial class LongRangePropertyConverter : System.Text.Json.Serialization.JsonConverter<LongRangeProperty>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropCoerce = System.Text.Json.JsonEncodedText.Encode("coerce");
+	private static readonly System.Text.Json.JsonEncodedText PropCopyTo = System.Text.Json.JsonEncodedText.Encode("copy_to");
+	private static readonly System.Text.Json.JsonEncodedText PropDocValues = System.Text.Json.JsonEncodedText.Encode("doc_values");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamic = System.Text.Json.JsonEncodedText.Encode("dynamic");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreAbove = System.Text.Json.JsonEncodedText.Encode("ignore_above");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropProperties = System.Text.Json.JsonEncodedText.Encode("properties");
+	private static readonly System.Text.Json.JsonEncodedText PropStore = System.Text.Json.JsonEncodedText.Encode("store");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override LongRangeProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<double?> propBoost = default;
+		LocalJsonProperty<bool?> propCoerce = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Fields?> propCopyTo = default;
+		LocalJsonProperty<bool?> propDocValues = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicMapping?> propDynamic = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties?> propFields = default;
+		LocalJsonProperty<int?> propIgnoreAbove = default;
+		LocalJsonProperty<bool?> propIndex = default;
+		LocalJsonProperty<IDictionary<string, string>?> propMeta = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties?> propProperties = default;
+		LocalJsonProperty<bool?> propStore = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
+
+			if (propCoerce.TryRead(ref reader, options, PropCoerce))
+			{
+				continue;
+			}
+
+			if (propCopyTo.TryRead(ref reader, options, PropCopyTo, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propDocValues.TryRead(ref reader, options, PropDocValues))
+			{
+				continue;
+			}
+
+			if (propDynamic.TryRead(ref reader, options, PropDynamic))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propIgnoreAbove.TryRead(ref reader, options, PropIgnoreAbove))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propProperties.TryRead(ref reader, options, PropProperties))
+			{
+				continue;
+			}
+
+			if (propStore.TryRead(ref reader, options, PropStore))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new LongRangeProperty
+		{
+			Boost = propBoost.Value
+,
+			Coerce = propCoerce.Value
+,
+			CopyTo = propCopyTo.Value
+,
+			DocValues = propDocValues.Value
+,
+			Dynamic = propDynamic.Value
+,
+			Fields = propFields.Value
+,
+			IgnoreAbove = propIgnoreAbove.Value
+,
+			Index = propIndex.Value
+,
+			Meta = propMeta.Value
+,
+			Properties = propProperties.Value
+,
+			Store = propStore.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, LongRangeProperty value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropCoerce, value.Coerce);
+		writer.WriteProperty(options, PropCopyTo, value.CopyTo, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropDocValues, value.DocValues);
+		writer.WriteProperty(options, PropDynamic, value.Dynamic);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropIgnoreAbove, value.IgnoreAbove);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropProperties, value.Properties);
+		writer.WriteProperty(options, PropStore, value.Store);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(LongRangePropertyConverter))]
 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")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Serverless.Fields? CopyTo { get; set; }
-	[JsonInclude, JsonPropertyName("doc_values")]
 	public bool? DocValues { get; set; }
-	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicMapping? Dynamic { get; set; }
-	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties? Fields { get; set; }
-	[JsonInclude, JsonPropertyName("ignore_above")]
 	public int? IgnoreAbove { get; set; }
-	[JsonInclude, JsonPropertyName("index")]
 	public bool? Index { get; set; }
 
 	/// <summary>
@@ -52,14 +186,10 @@ public sealed partial class LongRangeProperty : IProperty
 	/// Metadata about the field.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties? Properties { get; set; }
-	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "long_range";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/MatchOnlyTextProperty.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/MatchOnlyTextProperty.g.cs
index 25409117667..a6df7cdd596 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/MatchOnlyTextProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/MatchOnlyTextProperty.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,67 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Mapping;
 
+internal sealed partial class MatchOnlyTextPropertyConverter : System.Text.Json.Serialization.JsonConverter<MatchOnlyTextProperty>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCopyTo = System.Text.Json.JsonEncodedText.Encode("copy_to");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override MatchOnlyTextProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Fields?> propCopyTo = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties?> propFields = default;
+		LocalJsonProperty<IDictionary<string, string>?> propMeta = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCopyTo.TryRead(ref reader, options, PropCopyTo, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new MatchOnlyTextProperty
+		{
+			CopyTo = propCopyTo.Value
+,
+			Fields = propFields.Value
+,
+			Meta = propMeta.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, MatchOnlyTextProperty value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCopyTo, value.CopyTo, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
 /// <summary>
 /// <para>
 /// A variant of text that trades scoring and efficiency of positional queries for space efficiency. This field
@@ -36,6 +98,7 @@ namespace Elastic.Clients.Elasticsearch.Serverless.Mapping;
 /// to verify whether a phrase matches. All queries return constant scores that are equal to 1.0.
 /// </para>
 /// </summary>
+[JsonConverter(typeof(MatchOnlyTextPropertyConverter))]
 public sealed partial class MatchOnlyTextProperty : IProperty
 {
 	/// <summary>
@@ -44,8 +107,6 @@ public sealed partial class MatchOnlyTextProperty : IProperty
 	/// field, which can then be queried as a single field.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("copy_to")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Serverless.Fields? CopyTo { get; set; }
 
 	/// <summary>
@@ -54,7 +115,6 @@ public sealed partial class MatchOnlyTextProperty : IProperty
 	/// 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.Serverless.Mapping.Properties? Fields { get; set; }
 
 	/// <summary>
@@ -62,10 +122,8 @@ public sealed partial class MatchOnlyTextProperty : IProperty
 	/// Metadata about the field.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "match_only_text";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/Murmur3HashProperty.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/Murmur3HashProperty.g.cs
index 5c7491fbe11..a18ff495302 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/Murmur3HashProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/Murmur3HashProperty.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,18 +28,124 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Mapping;
 
+internal sealed partial class Murmur3HashPropertyConverter : System.Text.Json.Serialization.JsonConverter<Murmur3HashProperty>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCopyTo = System.Text.Json.JsonEncodedText.Encode("copy_to");
+	private static readonly System.Text.Json.JsonEncodedText PropDocValues = System.Text.Json.JsonEncodedText.Encode("doc_values");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamic = System.Text.Json.JsonEncodedText.Encode("dynamic");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreAbove = System.Text.Json.JsonEncodedText.Encode("ignore_above");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropProperties = System.Text.Json.JsonEncodedText.Encode("properties");
+	private static readonly System.Text.Json.JsonEncodedText PropStore = System.Text.Json.JsonEncodedText.Encode("store");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override Murmur3HashProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Fields?> propCopyTo = default;
+		LocalJsonProperty<bool?> propDocValues = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicMapping?> propDynamic = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties?> propFields = default;
+		LocalJsonProperty<int?> propIgnoreAbove = default;
+		LocalJsonProperty<IDictionary<string, string>?> propMeta = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties?> propProperties = default;
+		LocalJsonProperty<bool?> propStore = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCopyTo.TryRead(ref reader, options, PropCopyTo, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propDocValues.TryRead(ref reader, options, PropDocValues))
+			{
+				continue;
+			}
+
+			if (propDynamic.TryRead(ref reader, options, PropDynamic))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propIgnoreAbove.TryRead(ref reader, options, PropIgnoreAbove))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propProperties.TryRead(ref reader, options, PropProperties))
+			{
+				continue;
+			}
+
+			if (propStore.TryRead(ref reader, options, PropStore))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new Murmur3HashProperty
+		{
+			CopyTo = propCopyTo.Value
+,
+			DocValues = propDocValues.Value
+,
+			Dynamic = propDynamic.Value
+,
+			Fields = propFields.Value
+,
+			IgnoreAbove = propIgnoreAbove.Value
+,
+			Meta = propMeta.Value
+,
+			Properties = propProperties.Value
+,
+			Store = propStore.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, Murmur3HashProperty value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCopyTo, value.CopyTo, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropDocValues, value.DocValues);
+		writer.WriteProperty(options, PropDynamic, value.Dynamic);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropIgnoreAbove, value.IgnoreAbove);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropProperties, value.Properties);
+		writer.WriteProperty(options, PropStore, value.Store);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(Murmur3HashPropertyConverter))]
 public sealed partial class Murmur3HashProperty : IProperty
 {
-	[JsonInclude, JsonPropertyName("copy_to")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Serverless.Fields? CopyTo { get; set; }
-	[JsonInclude, JsonPropertyName("doc_values")]
 	public bool? DocValues { get; set; }
-	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicMapping? Dynamic { get; set; }
-	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties? Fields { get; set; }
-	[JsonInclude, JsonPropertyName("ignore_above")]
 	public int? IgnoreAbove { get; set; }
 
 	/// <summary>
@@ -46,14 +153,10 @@ public sealed partial class Murmur3HashProperty : IProperty
 	/// Metadata about the field.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties? Properties { get; set; }
-	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "murmur3";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/NestedProperty.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/NestedProperty.g.cs
index e632c686608..ffdd1388723 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/NestedProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/NestedProperty.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,22 +28,146 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Mapping;
 
+internal sealed partial class NestedPropertyConverter : System.Text.Json.Serialization.JsonConverter<NestedProperty>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCopyTo = System.Text.Json.JsonEncodedText.Encode("copy_to");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamic = System.Text.Json.JsonEncodedText.Encode("dynamic");
+	private static readonly System.Text.Json.JsonEncodedText PropEnabled = System.Text.Json.JsonEncodedText.Encode("enabled");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreAbove = System.Text.Json.JsonEncodedText.Encode("ignore_above");
+	private static readonly System.Text.Json.JsonEncodedText PropIncludeInParent = System.Text.Json.JsonEncodedText.Encode("include_in_parent");
+	private static readonly System.Text.Json.JsonEncodedText PropIncludeInRoot = System.Text.Json.JsonEncodedText.Encode("include_in_root");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropProperties = System.Text.Json.JsonEncodedText.Encode("properties");
+	private static readonly System.Text.Json.JsonEncodedText PropStore = System.Text.Json.JsonEncodedText.Encode("store");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override NestedProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Fields?> propCopyTo = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicMapping?> propDynamic = default;
+		LocalJsonProperty<bool?> propEnabled = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties?> propFields = default;
+		LocalJsonProperty<int?> propIgnoreAbove = default;
+		LocalJsonProperty<bool?> propIncludeInParent = default;
+		LocalJsonProperty<bool?> propIncludeInRoot = default;
+		LocalJsonProperty<IDictionary<string, string>?> propMeta = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties?> propProperties = default;
+		LocalJsonProperty<bool?> propStore = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCopyTo.TryRead(ref reader, options, PropCopyTo, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propDynamic.TryRead(ref reader, options, PropDynamic))
+			{
+				continue;
+			}
+
+			if (propEnabled.TryRead(ref reader, options, PropEnabled))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propIgnoreAbove.TryRead(ref reader, options, PropIgnoreAbove))
+			{
+				continue;
+			}
+
+			if (propIncludeInParent.TryRead(ref reader, options, PropIncludeInParent))
+			{
+				continue;
+			}
+
+			if (propIncludeInRoot.TryRead(ref reader, options, PropIncludeInRoot))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propProperties.TryRead(ref reader, options, PropProperties))
+			{
+				continue;
+			}
+
+			if (propStore.TryRead(ref reader, options, PropStore))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new NestedProperty
+		{
+			CopyTo = propCopyTo.Value
+,
+			Dynamic = propDynamic.Value
+,
+			Enabled = propEnabled.Value
+,
+			Fields = propFields.Value
+,
+			IgnoreAbove = propIgnoreAbove.Value
+,
+			IncludeInParent = propIncludeInParent.Value
+,
+			IncludeInRoot = propIncludeInRoot.Value
+,
+			Meta = propMeta.Value
+,
+			Properties = propProperties.Value
+,
+			Store = propStore.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, NestedProperty value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCopyTo, value.CopyTo, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropDynamic, value.Dynamic);
+		writer.WriteProperty(options, PropEnabled, value.Enabled);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropIgnoreAbove, value.IgnoreAbove);
+		writer.WriteProperty(options, PropIncludeInParent, value.IncludeInParent);
+		writer.WriteProperty(options, PropIncludeInRoot, value.IncludeInRoot);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropProperties, value.Properties);
+		writer.WriteProperty(options, PropStore, value.Store);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(NestedPropertyConverter))]
 public sealed partial class NestedProperty : IProperty
 {
-	[JsonInclude, JsonPropertyName("copy_to")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Serverless.Fields? CopyTo { get; set; }
-	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicMapping? Dynamic { get; set; }
-	[JsonInclude, JsonPropertyName("enabled")]
 	public bool? Enabled { get; set; }
-	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Serverless.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; }
 
 	/// <summary>
@@ -50,14 +175,10 @@ public sealed partial class NestedProperty : IProperty
 	/// Metadata about the field.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties? Properties { get; set; }
-	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "nested";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/ObjectProperty.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/ObjectProperty.g.cs
index 39d02cbef85..149d8e67294 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/ObjectProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/ObjectProperty.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,18 +28,134 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Mapping;
 
+internal sealed partial class ObjectPropertyConverter : System.Text.Json.Serialization.JsonConverter<ObjectProperty>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCopyTo = System.Text.Json.JsonEncodedText.Encode("copy_to");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamic = System.Text.Json.JsonEncodedText.Encode("dynamic");
+	private static readonly System.Text.Json.JsonEncodedText PropEnabled = System.Text.Json.JsonEncodedText.Encode("enabled");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreAbove = System.Text.Json.JsonEncodedText.Encode("ignore_above");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropProperties = System.Text.Json.JsonEncodedText.Encode("properties");
+	private static readonly System.Text.Json.JsonEncodedText PropStore = System.Text.Json.JsonEncodedText.Encode("store");
+	private static readonly System.Text.Json.JsonEncodedText PropSubobjects = System.Text.Json.JsonEncodedText.Encode("subobjects");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override ObjectProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Fields?> propCopyTo = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicMapping?> propDynamic = default;
+		LocalJsonProperty<bool?> propEnabled = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties?> propFields = default;
+		LocalJsonProperty<int?> propIgnoreAbove = default;
+		LocalJsonProperty<IDictionary<string, string>?> propMeta = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties?> propProperties = default;
+		LocalJsonProperty<bool?> propStore = default;
+		LocalJsonProperty<bool?> propSubobjects = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCopyTo.TryRead(ref reader, options, PropCopyTo, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propDynamic.TryRead(ref reader, options, PropDynamic))
+			{
+				continue;
+			}
+
+			if (propEnabled.TryRead(ref reader, options, PropEnabled))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propIgnoreAbove.TryRead(ref reader, options, PropIgnoreAbove))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propProperties.TryRead(ref reader, options, PropProperties))
+			{
+				continue;
+			}
+
+			if (propStore.TryRead(ref reader, options, PropStore))
+			{
+				continue;
+			}
+
+			if (propSubobjects.TryRead(ref reader, options, PropSubobjects))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ObjectProperty
+		{
+			CopyTo = propCopyTo.Value
+,
+			Dynamic = propDynamic.Value
+,
+			Enabled = propEnabled.Value
+,
+			Fields = propFields.Value
+,
+			IgnoreAbove = propIgnoreAbove.Value
+,
+			Meta = propMeta.Value
+,
+			Properties = propProperties.Value
+,
+			Store = propStore.Value
+,
+			Subobjects = propSubobjects.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ObjectProperty value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCopyTo, value.CopyTo, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropDynamic, value.Dynamic);
+		writer.WriteProperty(options, PropEnabled, value.Enabled);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropIgnoreAbove, value.IgnoreAbove);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropProperties, value.Properties);
+		writer.WriteProperty(options, PropStore, value.Store);
+		writer.WriteProperty(options, PropSubobjects, value.Subobjects);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ObjectPropertyConverter))]
 public sealed partial class ObjectProperty : IProperty
 {
-	[JsonInclude, JsonPropertyName("copy_to")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Serverless.Fields? CopyTo { get; set; }
-	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicMapping? Dynamic { get; set; }
-	[JsonInclude, JsonPropertyName("enabled")]
 	public bool? Enabled { get; set; }
-	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties? Fields { get; set; }
-	[JsonInclude, JsonPropertyName("ignore_above")]
 	public int? IgnoreAbove { get; set; }
 
 	/// <summary>
@@ -46,16 +163,11 @@ public sealed partial class ObjectProperty : IProperty
 	/// Metadata about the field.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties? Properties { get; set; }
-	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
-	[JsonInclude, JsonPropertyName("subobjects")]
 	public bool? Subobjects { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "object";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/PassthroughObjectProperty.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/PassthroughObjectProperty.g.cs
index d7451d3544d..ee76a236221 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/PassthroughObjectProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/PassthroughObjectProperty.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,18 +28,144 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Mapping;
 
+internal sealed partial class PassthroughObjectPropertyConverter : System.Text.Json.Serialization.JsonConverter<PassthroughObjectProperty>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCopyTo = System.Text.Json.JsonEncodedText.Encode("copy_to");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamic = System.Text.Json.JsonEncodedText.Encode("dynamic");
+	private static readonly System.Text.Json.JsonEncodedText PropEnabled = System.Text.Json.JsonEncodedText.Encode("enabled");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreAbove = System.Text.Json.JsonEncodedText.Encode("ignore_above");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropPriority = System.Text.Json.JsonEncodedText.Encode("priority");
+	private static readonly System.Text.Json.JsonEncodedText PropProperties = System.Text.Json.JsonEncodedText.Encode("properties");
+	private static readonly System.Text.Json.JsonEncodedText PropStore = System.Text.Json.JsonEncodedText.Encode("store");
+	private static readonly System.Text.Json.JsonEncodedText PropTimeSeriesDimension = System.Text.Json.JsonEncodedText.Encode("time_series_dimension");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override PassthroughObjectProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Fields?> propCopyTo = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicMapping?> propDynamic = default;
+		LocalJsonProperty<bool?> propEnabled = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties?> propFields = default;
+		LocalJsonProperty<int?> propIgnoreAbove = default;
+		LocalJsonProperty<IDictionary<string, string>?> propMeta = default;
+		LocalJsonProperty<int?> propPriority = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties?> propProperties = default;
+		LocalJsonProperty<bool?> propStore = default;
+		LocalJsonProperty<bool?> propTimeSeriesDimension = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCopyTo.TryRead(ref reader, options, PropCopyTo, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propDynamic.TryRead(ref reader, options, PropDynamic))
+			{
+				continue;
+			}
+
+			if (propEnabled.TryRead(ref reader, options, PropEnabled))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propIgnoreAbove.TryRead(ref reader, options, PropIgnoreAbove))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propPriority.TryRead(ref reader, options, PropPriority))
+			{
+				continue;
+			}
+
+			if (propProperties.TryRead(ref reader, options, PropProperties))
+			{
+				continue;
+			}
+
+			if (propStore.TryRead(ref reader, options, PropStore))
+			{
+				continue;
+			}
+
+			if (propTimeSeriesDimension.TryRead(ref reader, options, PropTimeSeriesDimension))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PassthroughObjectProperty
+		{
+			CopyTo = propCopyTo.Value
+,
+			Dynamic = propDynamic.Value
+,
+			Enabled = propEnabled.Value
+,
+			Fields = propFields.Value
+,
+			IgnoreAbove = propIgnoreAbove.Value
+,
+			Meta = propMeta.Value
+,
+			Priority = propPriority.Value
+,
+			Properties = propProperties.Value
+,
+			Store = propStore.Value
+,
+			TimeSeriesDimension = propTimeSeriesDimension.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PassthroughObjectProperty value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCopyTo, value.CopyTo, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropDynamic, value.Dynamic);
+		writer.WriteProperty(options, PropEnabled, value.Enabled);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropIgnoreAbove, value.IgnoreAbove);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropPriority, value.Priority);
+		writer.WriteProperty(options, PropProperties, value.Properties);
+		writer.WriteProperty(options, PropStore, value.Store);
+		writer.WriteProperty(options, PropTimeSeriesDimension, value.TimeSeriesDimension);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PassthroughObjectPropertyConverter))]
 public sealed partial class PassthroughObjectProperty : IProperty
 {
-	[JsonInclude, JsonPropertyName("copy_to")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Serverless.Fields? CopyTo { get; set; }
-	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicMapping? Dynamic { get; set; }
-	[JsonInclude, JsonPropertyName("enabled")]
 	public bool? Enabled { get; set; }
-	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties? Fields { get; set; }
-	[JsonInclude, JsonPropertyName("ignore_above")]
 	public int? IgnoreAbove { get; set; }
 
 	/// <summary>
@@ -46,18 +173,12 @@ public sealed partial class PassthroughObjectProperty : IProperty
 	/// Metadata about the field.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-	[JsonInclude, JsonPropertyName("priority")]
 	public int? Priority { get; set; }
-	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties? Properties { get; set; }
-	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
-	[JsonInclude, JsonPropertyName("time_series_dimension")]
 	public bool? TimeSeriesDimension { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "passthrough";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/PointProperty.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/PointProperty.g.cs
index 5dae9fbd8da..d43f8c4fdb7 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/PointProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/PointProperty.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,22 +28,156 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Mapping;
 
+internal sealed partial class PointPropertyConverter : System.Text.Json.Serialization.JsonConverter<PointProperty>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCopyTo = System.Text.Json.JsonEncodedText.Encode("copy_to");
+	private static readonly System.Text.Json.JsonEncodedText PropDocValues = System.Text.Json.JsonEncodedText.Encode("doc_values");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamic = System.Text.Json.JsonEncodedText.Encode("dynamic");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreAbove = System.Text.Json.JsonEncodedText.Encode("ignore_above");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreMalformed = System.Text.Json.JsonEncodedText.Encode("ignore_malformed");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreZValue = System.Text.Json.JsonEncodedText.Encode("ignore_z_value");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropNullValue = System.Text.Json.JsonEncodedText.Encode("null_value");
+	private static readonly System.Text.Json.JsonEncodedText PropProperties = System.Text.Json.JsonEncodedText.Encode("properties");
+	private static readonly System.Text.Json.JsonEncodedText PropStore = System.Text.Json.JsonEncodedText.Encode("store");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override PointProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Fields?> propCopyTo = default;
+		LocalJsonProperty<bool?> propDocValues = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicMapping?> propDynamic = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties?> propFields = default;
+		LocalJsonProperty<int?> propIgnoreAbove = default;
+		LocalJsonProperty<bool?> propIgnoreMalformed = default;
+		LocalJsonProperty<bool?> propIgnoreZValue = default;
+		LocalJsonProperty<IDictionary<string, string>?> propMeta = default;
+		LocalJsonProperty<string?> propNullValue = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties?> propProperties = default;
+		LocalJsonProperty<bool?> propStore = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCopyTo.TryRead(ref reader, options, PropCopyTo, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propDocValues.TryRead(ref reader, options, PropDocValues))
+			{
+				continue;
+			}
+
+			if (propDynamic.TryRead(ref reader, options, PropDynamic))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propIgnoreAbove.TryRead(ref reader, options, PropIgnoreAbove))
+			{
+				continue;
+			}
+
+			if (propIgnoreMalformed.TryRead(ref reader, options, PropIgnoreMalformed))
+			{
+				continue;
+			}
+
+			if (propIgnoreZValue.TryRead(ref reader, options, PropIgnoreZValue))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propNullValue.TryRead(ref reader, options, PropNullValue))
+			{
+				continue;
+			}
+
+			if (propProperties.TryRead(ref reader, options, PropProperties))
+			{
+				continue;
+			}
+
+			if (propStore.TryRead(ref reader, options, PropStore))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PointProperty
+		{
+			CopyTo = propCopyTo.Value
+,
+			DocValues = propDocValues.Value
+,
+			Dynamic = propDynamic.Value
+,
+			Fields = propFields.Value
+,
+			IgnoreAbove = propIgnoreAbove.Value
+,
+			IgnoreMalformed = propIgnoreMalformed.Value
+,
+			IgnoreZValue = propIgnoreZValue.Value
+,
+			Meta = propMeta.Value
+,
+			NullValue = propNullValue.Value
+,
+			Properties = propProperties.Value
+,
+			Store = propStore.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PointProperty value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCopyTo, value.CopyTo, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropDocValues, value.DocValues);
+		writer.WriteProperty(options, PropDynamic, value.Dynamic);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropIgnoreAbove, value.IgnoreAbove);
+		writer.WriteProperty(options, PropIgnoreMalformed, value.IgnoreMalformed);
+		writer.WriteProperty(options, PropIgnoreZValue, value.IgnoreZValue);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropNullValue, value.NullValue);
+		writer.WriteProperty(options, PropProperties, value.Properties);
+		writer.WriteProperty(options, PropStore, value.Store);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PointPropertyConverter))]
 public sealed partial class PointProperty : IProperty
 {
-	[JsonInclude, JsonPropertyName("copy_to")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Serverless.Fields? CopyTo { get; set; }
-	[JsonInclude, JsonPropertyName("doc_values")]
 	public bool? DocValues { get; set; }
-	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicMapping? Dynamic { get; set; }
-	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Serverless.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; }
 
 	/// <summary>
@@ -50,16 +185,11 @@ public sealed partial class PointProperty : IProperty
 	/// Metadata about the field.
 	/// </para>
 	/// </summary>
-	[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.Serverless.Mapping.Properties? Properties { get; set; }
-	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "point";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/Properties.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/Properties.g.cs
index 1b9d4985eae..a23b5a1eaa5 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/Properties.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/Properties.g.cs
@@ -19,6 +19,7 @@
 
 using Elastic.Clients.Elasticsearch.Serverless.Core;
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport;
 using System;
@@ -318,289 +319,238 @@ public PropertiesDescriptor() : base(new Properties())
 	public PropertiesDescriptor<TDocument> Wildcard(Expression<Func<TDocument, object>> propertyName, Action<Elastic.Clients.Elasticsearch.Serverless.Mapping.WildcardPropertyDescriptor<TDocument>> configure) => AssignVariant<Elastic.Clients.Elasticsearch.Serverless.Mapping.WildcardPropertyDescriptor<TDocument>, WildcardProperty>(propertyName, configure);
 }
 
-internal sealed partial class PropertyInterfaceConverter : JsonConverter<IProperty>
+internal sealed partial class PropertyInterfaceConverter : System.Text.Json.Serialization.JsonConverter<IProperty>
 {
-	public override IProperty Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropDiscriminator = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override IProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var copiedReader = reader;
-		string? type = null;
-		using var jsonDoc = JsonDocument.ParseValue(ref copiedReader);
-		if (jsonDoc is not null && jsonDoc.RootElement.TryGetProperty("type", out var readType) && readType.ValueKind == JsonValueKind.String)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		var readerSnapshot = reader;
+		string? discriminator = "object";
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			type = readType.ToString();
+			if (reader.TryReadProperty(options, PropDiscriminator, ref discriminator))
+			{
+				break;
+			}
+
+			reader.Skip();
 		}
 
-		switch (type)
+		reader = readerSnapshot;
+		return discriminator switch
 		{
-			case "aggregate_metric_double":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Mapping.AggregateMetricDoubleProperty>(ref reader, options);
-			case "binary":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Mapping.BinaryProperty>(ref reader, options);
-			case "boolean":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Mapping.BooleanProperty>(ref reader, options);
-			case "byte":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Mapping.ByteNumberProperty>(ref reader, options);
-			case "completion":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Mapping.CompletionProperty>(ref reader, options);
-			case "constant_keyword":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Mapping.ConstantKeywordProperty>(ref reader, options);
-			case "date_nanos":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Mapping.DateNanosProperty>(ref reader, options);
-			case "date":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Mapping.DateProperty>(ref reader, options);
-			case "date_range":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Mapping.DateRangeProperty>(ref reader, options);
-			case "dense_vector":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Mapping.DenseVectorProperty>(ref reader, options);
-			case "double":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Mapping.DoubleNumberProperty>(ref reader, options);
-			case "double_range":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Mapping.DoubleRangeProperty>(ref reader, options);
-			case "{dynamic_type}":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicProperty>(ref reader, options);
-			case "alias":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Mapping.FieldAliasProperty>(ref reader, options);
-			case "flattened":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Mapping.FlattenedProperty>(ref reader, options);
-			case "float":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Mapping.FloatNumberProperty>(ref reader, options);
-			case "float_range":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Mapping.FloatRangeProperty>(ref reader, options);
-			case "geo_point":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Mapping.GeoPointProperty>(ref reader, options);
-			case "geo_shape":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Mapping.GeoShapeProperty>(ref reader, options);
-			case "half_float":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Mapping.HalfFloatNumberProperty>(ref reader, options);
-			case "histogram":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Mapping.HistogramProperty>(ref reader, options);
-			case "icu_collation_keyword":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Mapping.IcuCollationProperty>(ref reader, options);
-			case "integer":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Mapping.IntegerNumberProperty>(ref reader, options);
-			case "integer_range":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Mapping.IntegerRangeProperty>(ref reader, options);
-			case "ip":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Mapping.IpProperty>(ref reader, options);
-			case "ip_range":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Mapping.IpRangeProperty>(ref reader, options);
-			case "join":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Mapping.JoinProperty>(ref reader, options);
-			case "keyword":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Mapping.KeywordProperty>(ref reader, options);
-			case "long":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Mapping.LongNumberProperty>(ref reader, options);
-			case "long_range":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Mapping.LongRangeProperty>(ref reader, options);
-			case "match_only_text":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Mapping.MatchOnlyTextProperty>(ref reader, options);
-			case "murmur3":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Mapping.Murmur3HashProperty>(ref reader, options);
-			case "nested":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Mapping.NestedProperty>(ref reader, options);
-			case "object":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Mapping.ObjectProperty>(ref reader, options);
-			case "passthrough":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Mapping.PassthroughObjectProperty>(ref reader, options);
-			case "percolator":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Mapping.PercolatorProperty>(ref reader, options);
-			case "point":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Mapping.PointProperty>(ref reader, options);
-			case "rank_feature":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Mapping.RankFeatureProperty>(ref reader, options);
-			case "rank_features":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Mapping.RankFeaturesProperty>(ref reader, options);
-			case "scaled_float":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Mapping.ScaledFloatNumberProperty>(ref reader, options);
-			case "search_as_you_type":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Mapping.SearchAsYouTypeProperty>(ref reader, options);
-			case "semantic_text":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Mapping.SemanticTextProperty>(ref reader, options);
-			case "shape":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Mapping.ShapeProperty>(ref reader, options);
-			case "short":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Mapping.ShortNumberProperty>(ref reader, options);
-			case "sparse_vector":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Mapping.SparseVectorProperty>(ref reader, options);
-			case "text":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Mapping.TextProperty>(ref reader, options);
-			case "token_count":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Mapping.TokenCountProperty>(ref reader, options);
-			case "unsigned_long":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Mapping.UnsignedLongNumberProperty>(ref reader, options);
-			case "version":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Mapping.VersionProperty>(ref reader, options);
-			case "wildcard":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Mapping.WildcardProperty>(ref reader, options);
-			default:
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Mapping.ObjectProperty>(ref reader, options);
-		}
+			"aggregate_metric_double" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Mapping.AggregateMetricDoubleProperty>(options),
+			"binary" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Mapping.BinaryProperty>(options),
+			"boolean" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Mapping.BooleanProperty>(options),
+			"byte" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Mapping.ByteNumberProperty>(options),
+			"completion" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Mapping.CompletionProperty>(options),
+			"constant_keyword" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Mapping.ConstantKeywordProperty>(options),
+			"date_nanos" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Mapping.DateNanosProperty>(options),
+			"date" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Mapping.DateProperty>(options),
+			"date_range" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Mapping.DateRangeProperty>(options),
+			"dense_vector" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Mapping.DenseVectorProperty>(options),
+			"double" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Mapping.DoubleNumberProperty>(options),
+			"double_range" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Mapping.DoubleRangeProperty>(options),
+			"{dynamic_type}" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicProperty>(options),
+			"alias" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Mapping.FieldAliasProperty>(options),
+			"flattened" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Mapping.FlattenedProperty>(options),
+			"float" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Mapping.FloatNumberProperty>(options),
+			"float_range" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Mapping.FloatRangeProperty>(options),
+			"geo_point" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Mapping.GeoPointProperty>(options),
+			"geo_shape" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Mapping.GeoShapeProperty>(options),
+			"half_float" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Mapping.HalfFloatNumberProperty>(options),
+			"histogram" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Mapping.HistogramProperty>(options),
+			"icu_collation_keyword" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Mapping.IcuCollationProperty>(options),
+			"integer" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Mapping.IntegerNumberProperty>(options),
+			"integer_range" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Mapping.IntegerRangeProperty>(options),
+			"ip" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Mapping.IpProperty>(options),
+			"ip_range" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Mapping.IpRangeProperty>(options),
+			"join" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Mapping.JoinProperty>(options),
+			"keyword" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Mapping.KeywordProperty>(options),
+			"long" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Mapping.LongNumberProperty>(options),
+			"long_range" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Mapping.LongRangeProperty>(options),
+			"match_only_text" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Mapping.MatchOnlyTextProperty>(options),
+			"murmur3" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Mapping.Murmur3HashProperty>(options),
+			"nested" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Mapping.NestedProperty>(options),
+			"object" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Mapping.ObjectProperty>(options),
+			"passthrough" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Mapping.PassthroughObjectProperty>(options),
+			"percolator" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Mapping.PercolatorProperty>(options),
+			"point" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Mapping.PointProperty>(options),
+			"rank_feature" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Mapping.RankFeatureProperty>(options),
+			"rank_features" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Mapping.RankFeaturesProperty>(options),
+			"scaled_float" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Mapping.ScaledFloatNumberProperty>(options),
+			"search_as_you_type" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Mapping.SearchAsYouTypeProperty>(options),
+			"semantic_text" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Mapping.SemanticTextProperty>(options),
+			"shape" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Mapping.ShapeProperty>(options),
+			"short" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Mapping.ShortNumberProperty>(options),
+			"sparse_vector" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Mapping.SparseVectorProperty>(options),
+			"text" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Mapping.TextProperty>(options),
+			"token_count" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Mapping.TokenCountProperty>(options),
+			"unsigned_long" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Mapping.UnsignedLongNumberProperty>(options),
+			"version" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Mapping.VersionProperty>(options),
+			"wildcard" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Mapping.WildcardProperty>(options),
+			_ => throw new System.Text.Json.JsonException($"Variant '{discriminator}' is not supported for type '{nameof(IProperty)}'.")
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, IProperty value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IProperty value, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (value is null)
-		{
-			writer.WriteNullValue();
-			return;
-		}
-
 		switch (value.Type)
 		{
 			case "aggregate_metric_double":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Mapping.AggregateMetricDoubleProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Mapping.AggregateMetricDoubleProperty)value);
+				break;
 			case "binary":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Mapping.BinaryProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Mapping.BinaryProperty)value);
+				break;
 			case "boolean":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Mapping.BooleanProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Mapping.BooleanProperty)value);
+				break;
 			case "byte":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Mapping.ByteNumberProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Mapping.ByteNumberProperty)value);
+				break;
 			case "completion":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Mapping.CompletionProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Mapping.CompletionProperty)value);
+				break;
 			case "constant_keyword":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Mapping.ConstantKeywordProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Mapping.ConstantKeywordProperty)value);
+				break;
 			case "date_nanos":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Mapping.DateNanosProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Mapping.DateNanosProperty)value);
+				break;
 			case "date":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Mapping.DateProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Mapping.DateProperty)value);
+				break;
 			case "date_range":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Mapping.DateRangeProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Mapping.DateRangeProperty)value);
+				break;
 			case "dense_vector":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Mapping.DenseVectorProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Mapping.DenseVectorProperty)value);
+				break;
 			case "double":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Mapping.DoubleNumberProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Mapping.DoubleNumberProperty)value);
+				break;
 			case "double_range":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Mapping.DoubleRangeProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Mapping.DoubleRangeProperty)value);
+				break;
 			case "{dynamic_type}":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicProperty)value);
+				break;
 			case "alias":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Mapping.FieldAliasProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Mapping.FieldAliasProperty)value);
+				break;
 			case "flattened":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Mapping.FlattenedProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Mapping.FlattenedProperty)value);
+				break;
 			case "float":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Mapping.FloatNumberProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Mapping.FloatNumberProperty)value);
+				break;
 			case "float_range":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Mapping.FloatRangeProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Mapping.FloatRangeProperty)value);
+				break;
 			case "geo_point":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Mapping.GeoPointProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Mapping.GeoPointProperty)value);
+				break;
 			case "geo_shape":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Mapping.GeoShapeProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Mapping.GeoShapeProperty)value);
+				break;
 			case "half_float":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Mapping.HalfFloatNumberProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Mapping.HalfFloatNumberProperty)value);
+				break;
 			case "histogram":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Mapping.HistogramProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Mapping.HistogramProperty)value);
+				break;
 			case "icu_collation_keyword":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Mapping.IcuCollationProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Mapping.IcuCollationProperty)value);
+				break;
 			case "integer":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Mapping.IntegerNumberProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Mapping.IntegerNumberProperty)value);
+				break;
 			case "integer_range":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Mapping.IntegerRangeProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Mapping.IntegerRangeProperty)value);
+				break;
 			case "ip":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Mapping.IpProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Mapping.IpProperty)value);
+				break;
 			case "ip_range":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Mapping.IpRangeProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Mapping.IpRangeProperty)value);
+				break;
 			case "join":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Mapping.JoinProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Mapping.JoinProperty)value);
+				break;
 			case "keyword":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Mapping.KeywordProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Mapping.KeywordProperty)value);
+				break;
 			case "long":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Mapping.LongNumberProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Mapping.LongNumberProperty)value);
+				break;
 			case "long_range":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Mapping.LongRangeProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Mapping.LongRangeProperty)value);
+				break;
 			case "match_only_text":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Mapping.MatchOnlyTextProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Mapping.MatchOnlyTextProperty)value);
+				break;
 			case "murmur3":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Mapping.Murmur3HashProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Mapping.Murmur3HashProperty)value);
+				break;
 			case "nested":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Mapping.NestedProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Mapping.NestedProperty)value);
+				break;
 			case "object":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Mapping.ObjectProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Mapping.ObjectProperty)value);
+				break;
 			case "passthrough":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Mapping.PassthroughObjectProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Mapping.PassthroughObjectProperty)value);
+				break;
 			case "percolator":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Mapping.PercolatorProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Mapping.PercolatorProperty)value);
+				break;
 			case "point":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Mapping.PointProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Mapping.PointProperty)value);
+				break;
 			case "rank_feature":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Mapping.RankFeatureProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Mapping.RankFeatureProperty)value);
+				break;
 			case "rank_features":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Mapping.RankFeaturesProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Mapping.RankFeaturesProperty)value);
+				break;
 			case "scaled_float":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Mapping.ScaledFloatNumberProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Mapping.ScaledFloatNumberProperty)value);
+				break;
 			case "search_as_you_type":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Mapping.SearchAsYouTypeProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Mapping.SearchAsYouTypeProperty)value);
+				break;
 			case "semantic_text":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Mapping.SemanticTextProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Mapping.SemanticTextProperty)value);
+				break;
 			case "shape":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Mapping.ShapeProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Mapping.ShapeProperty)value);
+				break;
 			case "short":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Mapping.ShortNumberProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Mapping.ShortNumberProperty)value);
+				break;
 			case "sparse_vector":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Mapping.SparseVectorProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Mapping.SparseVectorProperty)value);
+				break;
 			case "text":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Mapping.TextProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Mapping.TextProperty)value);
+				break;
 			case "token_count":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Mapping.TokenCountProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Mapping.TokenCountProperty)value);
+				break;
 			case "unsigned_long":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Mapping.UnsignedLongNumberProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Mapping.UnsignedLongNumberProperty)value);
+				break;
 			case "version":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Mapping.VersionProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Mapping.VersionProperty)value);
+				break;
 			case "wildcard":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Mapping.WildcardProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Mapping.WildcardProperty)value);
+				break;
 			default:
-				var type = value.GetType();
-				JsonSerializer.Serialize(writer, value, type, options);
-				return;
+				throw new System.Text.Json.JsonException($"Variant '{value.Type}' is not supported for type '{nameof(IProperty)}'.");
 		}
 	}
 }
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/RuntimeFieldFetchFields.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/RuntimeFieldFetchFields.g.cs
index 8529c1ecd63..b0e76338cca 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/RuntimeFieldFetchFields.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/RuntimeFieldFetchFields.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,11 +28,63 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Mapping;
 
+internal sealed partial class RuntimeFieldFetchFieldsConverter : System.Text.Json.Serialization.JsonConverter<RuntimeFieldFetchFields>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropFormat = System.Text.Json.JsonEncodedText.Encode("format");
+
+	public override RuntimeFieldFetchFields Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		var readerSnapshot = reader;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Field> propField = default;
+		LocalJsonProperty<string?> propFormat = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propField.TryRead(ref reader, options, PropField))
+			{
+				continue;
+			}
+
+			if (propFormat.TryRead(ref reader, options, PropFormat))
+			{
+				continue;
+			}
+
+			try
+			{
+				reader = readerSnapshot;
+				var result = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Field>(options);
+				return new RuntimeFieldFetchFields { Field = result };
+			}
+			catch (System.Text.Json.JsonException)
+			{
+				throw;
+			}
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new RuntimeFieldFetchFields
+		{
+			Field = propField.Value
+,
+			Format = propFormat.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, RuntimeFieldFetchFields value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropField, value.Field);
+		writer.WriteProperty(options, PropFormat, value.Format);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(RuntimeFieldFetchFieldsConverter))]
 public sealed partial class RuntimeFieldFetchFields
 {
-	[JsonInclude, JsonPropertyName("field")]
 	public Elastic.Clients.Elasticsearch.Serverless.Field Field { get; set; }
-	[JsonInclude, JsonPropertyName("format")]
 	public string? Format { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/ScaledFloatNumberProperty.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/ScaledFloatNumberProperty.g.cs
index 2f3f8288c6f..8555744e4e6 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/ScaledFloatNumberProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/ScaledFloatNumberProperty.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,26 +28,208 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Mapping;
 
+internal sealed partial class ScaledFloatNumberPropertyConverter : System.Text.Json.Serialization.JsonConverter<ScaledFloatNumberProperty>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropCoerce = System.Text.Json.JsonEncodedText.Encode("coerce");
+	private static readonly System.Text.Json.JsonEncodedText PropCopyTo = System.Text.Json.JsonEncodedText.Encode("copy_to");
+	private static readonly System.Text.Json.JsonEncodedText PropDocValues = System.Text.Json.JsonEncodedText.Encode("doc_values");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamic = System.Text.Json.JsonEncodedText.Encode("dynamic");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreAbove = System.Text.Json.JsonEncodedText.Encode("ignore_above");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreMalformed = System.Text.Json.JsonEncodedText.Encode("ignore_malformed");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropNullValue = System.Text.Json.JsonEncodedText.Encode("null_value");
+	private static readonly System.Text.Json.JsonEncodedText PropOnScriptError = System.Text.Json.JsonEncodedText.Encode("on_script_error");
+	private static readonly System.Text.Json.JsonEncodedText PropProperties = System.Text.Json.JsonEncodedText.Encode("properties");
+	private static readonly System.Text.Json.JsonEncodedText PropScalingFactor = System.Text.Json.JsonEncodedText.Encode("scaling_factor");
+	private static readonly System.Text.Json.JsonEncodedText PropScript = System.Text.Json.JsonEncodedText.Encode("script");
+	private static readonly System.Text.Json.JsonEncodedText PropStore = System.Text.Json.JsonEncodedText.Encode("store");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override ScaledFloatNumberProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<double?> propBoost = default;
+		LocalJsonProperty<bool?> propCoerce = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Fields?> propCopyTo = default;
+		LocalJsonProperty<bool?> propDocValues = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicMapping?> propDynamic = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties?> propFields = default;
+		LocalJsonProperty<int?> propIgnoreAbove = default;
+		LocalJsonProperty<bool?> propIgnoreMalformed = default;
+		LocalJsonProperty<bool?> propIndex = default;
+		LocalJsonProperty<IDictionary<string, string>?> propMeta = default;
+		LocalJsonProperty<double?> propNullValue = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.OnScriptError?> propOnScriptError = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties?> propProperties = default;
+		LocalJsonProperty<double?> propScalingFactor = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Script?> propScript = default;
+		LocalJsonProperty<bool?> propStore = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
+
+			if (propCoerce.TryRead(ref reader, options, PropCoerce))
+			{
+				continue;
+			}
+
+			if (propCopyTo.TryRead(ref reader, options, PropCopyTo, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propDocValues.TryRead(ref reader, options, PropDocValues))
+			{
+				continue;
+			}
+
+			if (propDynamic.TryRead(ref reader, options, PropDynamic))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propIgnoreAbove.TryRead(ref reader, options, PropIgnoreAbove))
+			{
+				continue;
+			}
+
+			if (propIgnoreMalformed.TryRead(ref reader, options, PropIgnoreMalformed))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propNullValue.TryRead(ref reader, options, PropNullValue))
+			{
+				continue;
+			}
+
+			if (propOnScriptError.TryRead(ref reader, options, PropOnScriptError))
+			{
+				continue;
+			}
+
+			if (propProperties.TryRead(ref reader, options, PropProperties))
+			{
+				continue;
+			}
+
+			if (propScalingFactor.TryRead(ref reader, options, PropScalingFactor))
+			{
+				continue;
+			}
+
+			if (propScript.TryRead(ref reader, options, PropScript))
+			{
+				continue;
+			}
+
+			if (propStore.TryRead(ref reader, options, PropStore))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ScaledFloatNumberProperty
+		{
+			Boost = propBoost.Value
+,
+			Coerce = propCoerce.Value
+,
+			CopyTo = propCopyTo.Value
+,
+			DocValues = propDocValues.Value
+,
+			Dynamic = propDynamic.Value
+,
+			Fields = propFields.Value
+,
+			IgnoreAbove = propIgnoreAbove.Value
+,
+			IgnoreMalformed = propIgnoreMalformed.Value
+,
+			Index = propIndex.Value
+,
+			Meta = propMeta.Value
+,
+			NullValue = propNullValue.Value
+,
+			OnScriptError = propOnScriptError.Value
+,
+			Properties = propProperties.Value
+,
+			ScalingFactor = propScalingFactor.Value
+,
+			Script = propScript.Value
+,
+			Store = propStore.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ScaledFloatNumberProperty value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropCoerce, value.Coerce);
+		writer.WriteProperty(options, PropCopyTo, value.CopyTo, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropDocValues, value.DocValues);
+		writer.WriteProperty(options, PropDynamic, value.Dynamic);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropIgnoreAbove, value.IgnoreAbove);
+		writer.WriteProperty(options, PropIgnoreMalformed, value.IgnoreMalformed);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropNullValue, value.NullValue);
+		writer.WriteProperty(options, PropOnScriptError, value.OnScriptError);
+		writer.WriteProperty(options, PropProperties, value.Properties);
+		writer.WriteProperty(options, PropScalingFactor, value.ScalingFactor);
+		writer.WriteProperty(options, PropScript, value.Script);
+		writer.WriteProperty(options, PropStore, value.Store);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ScaledFloatNumberPropertyConverter))]
 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")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Serverless.Fields? CopyTo { get; set; }
-	[JsonInclude, JsonPropertyName("doc_values")]
 	public bool? DocValues { get; set; }
-	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicMapping? Dynamic { get; set; }
-	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Serverless.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; }
 
 	/// <summary>
@@ -54,22 +237,14 @@ public sealed partial class ScaledFloatNumberProperty : IProperty
 	/// Metadata about the field.
 	/// </para>
 	/// </summary>
-	[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.Serverless.Mapping.OnScriptError? OnScriptError { get; set; }
-	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties? Properties { get; set; }
-	[JsonInclude, JsonPropertyName("scaling_factor")]
 	public double? ScalingFactor { get; set; }
-	[JsonInclude, JsonPropertyName("script")]
 	public Elastic.Clients.Elasticsearch.Serverless.Script? Script { get; set; }
-	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "scaled_float";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/SearchAsYouTypeProperty.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/SearchAsYouTypeProperty.g.cs
index ac3109d0e5a..b8c0ead3d82 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/SearchAsYouTypeProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/SearchAsYouTypeProperty.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,24 +28,207 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Mapping;
 
+internal sealed partial class SearchAsYouTypePropertyConverter : System.Text.Json.Serialization.JsonConverter<SearchAsYouTypeProperty>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAnalyzer = System.Text.Json.JsonEncodedText.Encode("analyzer");
+	private static readonly System.Text.Json.JsonEncodedText PropCopyTo = System.Text.Json.JsonEncodedText.Encode("copy_to");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamic = System.Text.Json.JsonEncodedText.Encode("dynamic");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreAbove = System.Text.Json.JsonEncodedText.Encode("ignore_above");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropIndexOptions = System.Text.Json.JsonEncodedText.Encode("index_options");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxShingleSize = System.Text.Json.JsonEncodedText.Encode("max_shingle_size");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropNorms = System.Text.Json.JsonEncodedText.Encode("norms");
+	private static readonly System.Text.Json.JsonEncodedText PropProperties = System.Text.Json.JsonEncodedText.Encode("properties");
+	private static readonly System.Text.Json.JsonEncodedText PropSearchAnalyzer = System.Text.Json.JsonEncodedText.Encode("search_analyzer");
+	private static readonly System.Text.Json.JsonEncodedText PropSearchQuoteAnalyzer = System.Text.Json.JsonEncodedText.Encode("search_quote_analyzer");
+	private static readonly System.Text.Json.JsonEncodedText PropSimilarity = System.Text.Json.JsonEncodedText.Encode("similarity");
+	private static readonly System.Text.Json.JsonEncodedText PropStore = System.Text.Json.JsonEncodedText.Encode("store");
+	private static readonly System.Text.Json.JsonEncodedText PropTermVector = System.Text.Json.JsonEncodedText.Encode("term_vector");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override SearchAsYouTypeProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string?> propAnalyzer = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Fields?> propCopyTo = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicMapping?> propDynamic = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties?> propFields = default;
+		LocalJsonProperty<int?> propIgnoreAbove = default;
+		LocalJsonProperty<bool?> propIndex = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.IndexOptions?> propIndexOptions = default;
+		LocalJsonProperty<int?> propMaxShingleSize = default;
+		LocalJsonProperty<IDictionary<string, string>?> propMeta = default;
+		LocalJsonProperty<bool?> propNorms = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties?> propProperties = default;
+		LocalJsonProperty<string?> propSearchAnalyzer = default;
+		LocalJsonProperty<string?> propSearchQuoteAnalyzer = default;
+		LocalJsonProperty<string?> propSimilarity = default;
+		LocalJsonProperty<bool?> propStore = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.TermVectorOption?> propTermVector = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAnalyzer.TryRead(ref reader, options, PropAnalyzer))
+			{
+				continue;
+			}
+
+			if (propCopyTo.TryRead(ref reader, options, PropCopyTo, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propDynamic.TryRead(ref reader, options, PropDynamic))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propIgnoreAbove.TryRead(ref reader, options, PropIgnoreAbove))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propIndexOptions.TryRead(ref reader, options, PropIndexOptions))
+			{
+				continue;
+			}
+
+			if (propMaxShingleSize.TryRead(ref reader, options, PropMaxShingleSize))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propNorms.TryRead(ref reader, options, PropNorms))
+			{
+				continue;
+			}
+
+			if (propProperties.TryRead(ref reader, options, PropProperties))
+			{
+				continue;
+			}
+
+			if (propSearchAnalyzer.TryRead(ref reader, options, PropSearchAnalyzer))
+			{
+				continue;
+			}
+
+			if (propSearchQuoteAnalyzer.TryRead(ref reader, options, PropSearchQuoteAnalyzer))
+			{
+				continue;
+			}
+
+			if (propSimilarity.TryRead(ref reader, options, PropSimilarity))
+			{
+				continue;
+			}
+
+			if (propStore.TryRead(ref reader, options, PropStore))
+			{
+				continue;
+			}
+
+			if (propTermVector.TryRead(ref reader, options, PropTermVector))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SearchAsYouTypeProperty
+		{
+			Analyzer = propAnalyzer.Value
+,
+			CopyTo = propCopyTo.Value
+,
+			Dynamic = propDynamic.Value
+,
+			Fields = propFields.Value
+,
+			IgnoreAbove = propIgnoreAbove.Value
+,
+			Index = propIndex.Value
+,
+			IndexOptions = propIndexOptions.Value
+,
+			MaxShingleSize = propMaxShingleSize.Value
+,
+			Meta = propMeta.Value
+,
+			Norms = propNorms.Value
+,
+			Properties = propProperties.Value
+,
+			SearchAnalyzer = propSearchAnalyzer.Value
+,
+			SearchQuoteAnalyzer = propSearchQuoteAnalyzer.Value
+,
+			Similarity = propSimilarity.Value
+,
+			Store = propStore.Value
+,
+			TermVector = propTermVector.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SearchAsYouTypeProperty value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAnalyzer, value.Analyzer);
+		writer.WriteProperty(options, PropCopyTo, value.CopyTo, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropDynamic, value.Dynamic);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropIgnoreAbove, value.IgnoreAbove);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropIndexOptions, value.IndexOptions);
+		writer.WriteProperty(options, PropMaxShingleSize, value.MaxShingleSize);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropNorms, value.Norms);
+		writer.WriteProperty(options, PropProperties, value.Properties);
+		writer.WriteProperty(options, PropSearchAnalyzer, value.SearchAnalyzer);
+		writer.WriteProperty(options, PropSearchQuoteAnalyzer, value.SearchQuoteAnalyzer);
+		writer.WriteProperty(options, PropSimilarity, value.Similarity);
+		writer.WriteProperty(options, PropStore, value.Store);
+		writer.WriteProperty(options, PropTermVector, value.TermVector);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(SearchAsYouTypePropertyConverter))]
 public sealed partial class SearchAsYouTypeProperty : IProperty
 {
-	[JsonInclude, JsonPropertyName("analyzer")]
 	public string? Analyzer { get; set; }
-	[JsonInclude, JsonPropertyName("copy_to")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Serverless.Fields? CopyTo { get; set; }
-	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicMapping? Dynamic { get; set; }
-	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Serverless.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.Serverless.Mapping.IndexOptions? IndexOptions { get; set; }
-	[JsonInclude, JsonPropertyName("max_shingle_size")]
 	public int? MaxShingleSize { get; set; }
 
 	/// <summary>
@@ -52,24 +236,15 @@ public sealed partial class SearchAsYouTypeProperty : IProperty
 	/// Metadata about the field.
 	/// </para>
 	/// </summary>
-	[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.Serverless.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.Serverless.Mapping.TermVectorOption? TermVector { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "search_as_you_type";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/ShapeProperty.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/ShapeProperty.g.cs
index 18ab1659da1..6d53146802f 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/ShapeProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/ShapeProperty.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,157 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Mapping;
 
+internal sealed partial class ShapePropertyConverter : System.Text.Json.Serialization.JsonConverter<ShapeProperty>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCoerce = System.Text.Json.JsonEncodedText.Encode("coerce");
+	private static readonly System.Text.Json.JsonEncodedText PropCopyTo = System.Text.Json.JsonEncodedText.Encode("copy_to");
+	private static readonly System.Text.Json.JsonEncodedText PropDocValues = System.Text.Json.JsonEncodedText.Encode("doc_values");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamic = System.Text.Json.JsonEncodedText.Encode("dynamic");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreAbove = System.Text.Json.JsonEncodedText.Encode("ignore_above");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreMalformed = System.Text.Json.JsonEncodedText.Encode("ignore_malformed");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreZValue = System.Text.Json.JsonEncodedText.Encode("ignore_z_value");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropOrientation = System.Text.Json.JsonEncodedText.Encode("orientation");
+	private static readonly System.Text.Json.JsonEncodedText PropProperties = System.Text.Json.JsonEncodedText.Encode("properties");
+	private static readonly System.Text.Json.JsonEncodedText PropStore = System.Text.Json.JsonEncodedText.Encode("store");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override ShapeProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool?> propCoerce = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Fields?> propCopyTo = default;
+		LocalJsonProperty<bool?> propDocValues = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicMapping?> propDynamic = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties?> propFields = default;
+		LocalJsonProperty<int?> propIgnoreAbove = default;
+		LocalJsonProperty<bool?> propIgnoreMalformed = default;
+		LocalJsonProperty<bool?> propIgnoreZValue = default;
+		LocalJsonProperty<IDictionary<string, string>?> propMeta = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.GeoOrientation?> propOrientation = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties?> propProperties = default;
+		LocalJsonProperty<bool?> propStore = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCoerce.TryRead(ref reader, options, PropCoerce))
+			{
+				continue;
+			}
+
+			if (propCopyTo.TryRead(ref reader, options, PropCopyTo, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propDocValues.TryRead(ref reader, options, PropDocValues))
+			{
+				continue;
+			}
+
+			if (propDynamic.TryRead(ref reader, options, PropDynamic))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propIgnoreAbove.TryRead(ref reader, options, PropIgnoreAbove))
+			{
+				continue;
+			}
+
+			if (propIgnoreMalformed.TryRead(ref reader, options, PropIgnoreMalformed))
+			{
+				continue;
+			}
+
+			if (propIgnoreZValue.TryRead(ref reader, options, PropIgnoreZValue))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propOrientation.TryRead(ref reader, options, PropOrientation))
+			{
+				continue;
+			}
+
+			if (propProperties.TryRead(ref reader, options, PropProperties))
+			{
+				continue;
+			}
+
+			if (propStore.TryRead(ref reader, options, PropStore))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ShapeProperty
+		{
+			Coerce = propCoerce.Value
+,
+			CopyTo = propCopyTo.Value
+,
+			DocValues = propDocValues.Value
+,
+			Dynamic = propDynamic.Value
+,
+			Fields = propFields.Value
+,
+			IgnoreAbove = propIgnoreAbove.Value
+,
+			IgnoreMalformed = propIgnoreMalformed.Value
+,
+			IgnoreZValue = propIgnoreZValue.Value
+,
+			Meta = propMeta.Value
+,
+			Orientation = propOrientation.Value
+,
+			Properties = propProperties.Value
+,
+			Store = propStore.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ShapeProperty value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCoerce, value.Coerce);
+		writer.WriteProperty(options, PropCopyTo, value.CopyTo, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropDocValues, value.DocValues);
+		writer.WriteProperty(options, PropDynamic, value.Dynamic);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropIgnoreAbove, value.IgnoreAbove);
+		writer.WriteProperty(options, PropIgnoreMalformed, value.IgnoreMalformed);
+		writer.WriteProperty(options, PropIgnoreZValue, value.IgnoreZValue);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropOrientation, value.Orientation);
+		writer.WriteProperty(options, PropProperties, value.Properties);
+		writer.WriteProperty(options, PropStore, value.Store);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
 /// <summary>
 /// <para>
 /// The <c>shape</c> data type facilitates the indexing of and searching with arbitrary <c>x, y</c> cartesian shapes such as
@@ -34,24 +186,16 @@ namespace Elastic.Clients.Elasticsearch.Serverless.Mapping;
 /// </para>
 /// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/8.17/shape.html">Learn more about this API in the Elasticsearch documentation.</see></para>
 /// </summary>
+[JsonConverter(typeof(ShapePropertyConverter))]
 public sealed partial class ShapeProperty : IProperty
 {
-	[JsonInclude, JsonPropertyName("coerce")]
 	public bool? Coerce { get; set; }
-	[JsonInclude, JsonPropertyName("copy_to")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Serverless.Fields? CopyTo { get; set; }
-	[JsonInclude, JsonPropertyName("doc_values")]
 	public bool? DocValues { get; set; }
-	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicMapping? Dynamic { get; set; }
-	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Serverless.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; }
 
 	/// <summary>
@@ -59,16 +203,11 @@ public sealed partial class ShapeProperty : IProperty
 	/// Metadata about the field.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-	[JsonInclude, JsonPropertyName("orientation")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.GeoOrientation? Orientation { get; set; }
-	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties? Properties { get; set; }
-	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "shape";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/ShortNumberProperty.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/ShortNumberProperty.g.cs
index d83c6802a26..9fc8b81e154 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/ShortNumberProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/ShortNumberProperty.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,26 +28,198 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Mapping;
 
+internal sealed partial class ShortNumberPropertyConverter : System.Text.Json.Serialization.JsonConverter<ShortNumberProperty>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropCoerce = System.Text.Json.JsonEncodedText.Encode("coerce");
+	private static readonly System.Text.Json.JsonEncodedText PropCopyTo = System.Text.Json.JsonEncodedText.Encode("copy_to");
+	private static readonly System.Text.Json.JsonEncodedText PropDocValues = System.Text.Json.JsonEncodedText.Encode("doc_values");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamic = System.Text.Json.JsonEncodedText.Encode("dynamic");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreAbove = System.Text.Json.JsonEncodedText.Encode("ignore_above");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreMalformed = System.Text.Json.JsonEncodedText.Encode("ignore_malformed");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropNullValue = System.Text.Json.JsonEncodedText.Encode("null_value");
+	private static readonly System.Text.Json.JsonEncodedText PropOnScriptError = System.Text.Json.JsonEncodedText.Encode("on_script_error");
+	private static readonly System.Text.Json.JsonEncodedText PropProperties = System.Text.Json.JsonEncodedText.Encode("properties");
+	private static readonly System.Text.Json.JsonEncodedText PropScript = System.Text.Json.JsonEncodedText.Encode("script");
+	private static readonly System.Text.Json.JsonEncodedText PropStore = System.Text.Json.JsonEncodedText.Encode("store");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override ShortNumberProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<double?> propBoost = default;
+		LocalJsonProperty<bool?> propCoerce = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Fields?> propCopyTo = default;
+		LocalJsonProperty<bool?> propDocValues = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicMapping?> propDynamic = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties?> propFields = default;
+		LocalJsonProperty<int?> propIgnoreAbove = default;
+		LocalJsonProperty<bool?> propIgnoreMalformed = default;
+		LocalJsonProperty<bool?> propIndex = default;
+		LocalJsonProperty<IDictionary<string, string>?> propMeta = default;
+		LocalJsonProperty<short?> propNullValue = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.OnScriptError?> propOnScriptError = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties?> propProperties = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Script?> propScript = default;
+		LocalJsonProperty<bool?> propStore = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
+
+			if (propCoerce.TryRead(ref reader, options, PropCoerce))
+			{
+				continue;
+			}
+
+			if (propCopyTo.TryRead(ref reader, options, PropCopyTo, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propDocValues.TryRead(ref reader, options, PropDocValues))
+			{
+				continue;
+			}
+
+			if (propDynamic.TryRead(ref reader, options, PropDynamic))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propIgnoreAbove.TryRead(ref reader, options, PropIgnoreAbove))
+			{
+				continue;
+			}
+
+			if (propIgnoreMalformed.TryRead(ref reader, options, PropIgnoreMalformed))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propNullValue.TryRead(ref reader, options, PropNullValue))
+			{
+				continue;
+			}
+
+			if (propOnScriptError.TryRead(ref reader, options, PropOnScriptError))
+			{
+				continue;
+			}
+
+			if (propProperties.TryRead(ref reader, options, PropProperties))
+			{
+				continue;
+			}
+
+			if (propScript.TryRead(ref reader, options, PropScript))
+			{
+				continue;
+			}
+
+			if (propStore.TryRead(ref reader, options, PropStore))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ShortNumberProperty
+		{
+			Boost = propBoost.Value
+,
+			Coerce = propCoerce.Value
+,
+			CopyTo = propCopyTo.Value
+,
+			DocValues = propDocValues.Value
+,
+			Dynamic = propDynamic.Value
+,
+			Fields = propFields.Value
+,
+			IgnoreAbove = propIgnoreAbove.Value
+,
+			IgnoreMalformed = propIgnoreMalformed.Value
+,
+			Index = propIndex.Value
+,
+			Meta = propMeta.Value
+,
+			NullValue = propNullValue.Value
+,
+			OnScriptError = propOnScriptError.Value
+,
+			Properties = propProperties.Value
+,
+			Script = propScript.Value
+,
+			Store = propStore.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ShortNumberProperty value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropCoerce, value.Coerce);
+		writer.WriteProperty(options, PropCopyTo, value.CopyTo, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropDocValues, value.DocValues);
+		writer.WriteProperty(options, PropDynamic, value.Dynamic);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropIgnoreAbove, value.IgnoreAbove);
+		writer.WriteProperty(options, PropIgnoreMalformed, value.IgnoreMalformed);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropNullValue, value.NullValue);
+		writer.WriteProperty(options, PropOnScriptError, value.OnScriptError);
+		writer.WriteProperty(options, PropProperties, value.Properties);
+		writer.WriteProperty(options, PropScript, value.Script);
+		writer.WriteProperty(options, PropStore, value.Store);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ShortNumberPropertyConverter))]
 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")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Serverless.Fields? CopyTo { get; set; }
-	[JsonInclude, JsonPropertyName("doc_values")]
 	public bool? DocValues { get; set; }
-	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicMapping? Dynamic { get; set; }
-	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Serverless.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; }
 
 	/// <summary>
@@ -54,20 +227,13 @@ public sealed partial class ShortNumberProperty : IProperty
 	/// Metadata about the field.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-	[JsonInclude, JsonPropertyName("null_value")]
 	public short? NullValue { get; set; }
-	[JsonInclude, JsonPropertyName("on_script_error")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.OnScriptError? OnScriptError { get; set; }
-	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties? Properties { get; set; }
-	[JsonInclude, JsonPropertyName("script")]
 	public Elastic.Clients.Elasticsearch.Serverless.Script? Script { get; set; }
-	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "short";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/TextProperty.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/TextProperty.g.cs
index 75c78c9a1b9..82cd2259a91 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/TextProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/TextProperty.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,34 +28,272 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Mapping;
 
+internal sealed partial class TextPropertyConverter : System.Text.Json.Serialization.JsonConverter<TextProperty>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAnalyzer = System.Text.Json.JsonEncodedText.Encode("analyzer");
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropCopyTo = System.Text.Json.JsonEncodedText.Encode("copy_to");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamic = System.Text.Json.JsonEncodedText.Encode("dynamic");
+	private static readonly System.Text.Json.JsonEncodedText PropEagerGlobalOrdinals = System.Text.Json.JsonEncodedText.Encode("eager_global_ordinals");
+	private static readonly System.Text.Json.JsonEncodedText PropFielddata = System.Text.Json.JsonEncodedText.Encode("fielddata");
+	private static readonly System.Text.Json.JsonEncodedText PropFielddataFrequencyFilter = System.Text.Json.JsonEncodedText.Encode("fielddata_frequency_filter");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreAbove = System.Text.Json.JsonEncodedText.Encode("ignore_above");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropIndexOptions = System.Text.Json.JsonEncodedText.Encode("index_options");
+	private static readonly System.Text.Json.JsonEncodedText PropIndexPhrases = System.Text.Json.JsonEncodedText.Encode("index_phrases");
+	private static readonly System.Text.Json.JsonEncodedText PropIndexPrefixes = System.Text.Json.JsonEncodedText.Encode("index_prefixes");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropNorms = System.Text.Json.JsonEncodedText.Encode("norms");
+	private static readonly System.Text.Json.JsonEncodedText PropPositionIncrementGap = System.Text.Json.JsonEncodedText.Encode("position_increment_gap");
+	private static readonly System.Text.Json.JsonEncodedText PropProperties = System.Text.Json.JsonEncodedText.Encode("properties");
+	private static readonly System.Text.Json.JsonEncodedText PropSearchAnalyzer = System.Text.Json.JsonEncodedText.Encode("search_analyzer");
+	private static readonly System.Text.Json.JsonEncodedText PropSearchQuoteAnalyzer = System.Text.Json.JsonEncodedText.Encode("search_quote_analyzer");
+	private static readonly System.Text.Json.JsonEncodedText PropSimilarity = System.Text.Json.JsonEncodedText.Encode("similarity");
+	private static readonly System.Text.Json.JsonEncodedText PropStore = System.Text.Json.JsonEncodedText.Encode("store");
+	private static readonly System.Text.Json.JsonEncodedText PropTermVector = System.Text.Json.JsonEncodedText.Encode("term_vector");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override TextProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string?> propAnalyzer = default;
+		LocalJsonProperty<double?> propBoost = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Fields?> propCopyTo = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicMapping?> propDynamic = default;
+		LocalJsonProperty<bool?> propEagerGlobalOrdinals = default;
+		LocalJsonProperty<bool?> propFielddata = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.FielddataFrequencyFilter?> propFielddataFrequencyFilter = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties?> propFields = default;
+		LocalJsonProperty<int?> propIgnoreAbove = default;
+		LocalJsonProperty<bool?> propIndex = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.IndexOptions?> propIndexOptions = default;
+		LocalJsonProperty<bool?> propIndexPhrases = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.TextIndexPrefixes?> propIndexPrefixes = default;
+		LocalJsonProperty<IDictionary<string, string>?> propMeta = default;
+		LocalJsonProperty<bool?> propNorms = default;
+		LocalJsonProperty<int?> propPositionIncrementGap = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties?> propProperties = default;
+		LocalJsonProperty<string?> propSearchAnalyzer = default;
+		LocalJsonProperty<string?> propSearchQuoteAnalyzer = default;
+		LocalJsonProperty<string?> propSimilarity = default;
+		LocalJsonProperty<bool?> propStore = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.TermVectorOption?> propTermVector = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAnalyzer.TryRead(ref reader, options, PropAnalyzer))
+			{
+				continue;
+			}
+
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
+
+			if (propCopyTo.TryRead(ref reader, options, PropCopyTo, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propDynamic.TryRead(ref reader, options, PropDynamic))
+			{
+				continue;
+			}
+
+			if (propEagerGlobalOrdinals.TryRead(ref reader, options, PropEagerGlobalOrdinals))
+			{
+				continue;
+			}
+
+			if (propFielddata.TryRead(ref reader, options, PropFielddata))
+			{
+				continue;
+			}
+
+			if (propFielddataFrequencyFilter.TryRead(ref reader, options, PropFielddataFrequencyFilter))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propIgnoreAbove.TryRead(ref reader, options, PropIgnoreAbove))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propIndexOptions.TryRead(ref reader, options, PropIndexOptions))
+			{
+				continue;
+			}
+
+			if (propIndexPhrases.TryRead(ref reader, options, PropIndexPhrases))
+			{
+				continue;
+			}
+
+			if (propIndexPrefixes.TryRead(ref reader, options, PropIndexPrefixes))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propNorms.TryRead(ref reader, options, PropNorms))
+			{
+				continue;
+			}
+
+			if (propPositionIncrementGap.TryRead(ref reader, options, PropPositionIncrementGap))
+			{
+				continue;
+			}
+
+			if (propProperties.TryRead(ref reader, options, PropProperties))
+			{
+				continue;
+			}
+
+			if (propSearchAnalyzer.TryRead(ref reader, options, PropSearchAnalyzer))
+			{
+				continue;
+			}
+
+			if (propSearchQuoteAnalyzer.TryRead(ref reader, options, PropSearchQuoteAnalyzer))
+			{
+				continue;
+			}
+
+			if (propSimilarity.TryRead(ref reader, options, PropSimilarity))
+			{
+				continue;
+			}
+
+			if (propStore.TryRead(ref reader, options, PropStore))
+			{
+				continue;
+			}
+
+			if (propTermVector.TryRead(ref reader, options, PropTermVector))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new TextProperty
+		{
+			Analyzer = propAnalyzer.Value
+,
+			Boost = propBoost.Value
+,
+			CopyTo = propCopyTo.Value
+,
+			Dynamic = propDynamic.Value
+,
+			EagerGlobalOrdinals = propEagerGlobalOrdinals.Value
+,
+			Fielddata = propFielddata.Value
+,
+			FielddataFrequencyFilter = propFielddataFrequencyFilter.Value
+,
+			Fields = propFields.Value
+,
+			IgnoreAbove = propIgnoreAbove.Value
+,
+			Index = propIndex.Value
+,
+			IndexOptions = propIndexOptions.Value
+,
+			IndexPhrases = propIndexPhrases.Value
+,
+			IndexPrefixes = propIndexPrefixes.Value
+,
+			Meta = propMeta.Value
+,
+			Norms = propNorms.Value
+,
+			PositionIncrementGap = propPositionIncrementGap.Value
+,
+			Properties = propProperties.Value
+,
+			SearchAnalyzer = propSearchAnalyzer.Value
+,
+			SearchQuoteAnalyzer = propSearchQuoteAnalyzer.Value
+,
+			Similarity = propSimilarity.Value
+,
+			Store = propStore.Value
+,
+			TermVector = propTermVector.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, TextProperty value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAnalyzer, value.Analyzer);
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropCopyTo, value.CopyTo, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropDynamic, value.Dynamic);
+		writer.WriteProperty(options, PropEagerGlobalOrdinals, value.EagerGlobalOrdinals);
+		writer.WriteProperty(options, PropFielddata, value.Fielddata);
+		writer.WriteProperty(options, PropFielddataFrequencyFilter, value.FielddataFrequencyFilter);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropIgnoreAbove, value.IgnoreAbove);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropIndexOptions, value.IndexOptions);
+		writer.WriteProperty(options, PropIndexPhrases, value.IndexPhrases);
+		writer.WriteProperty(options, PropIndexPrefixes, value.IndexPrefixes);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropNorms, value.Norms);
+		writer.WriteProperty(options, PropPositionIncrementGap, value.PositionIncrementGap);
+		writer.WriteProperty(options, PropProperties, value.Properties);
+		writer.WriteProperty(options, PropSearchAnalyzer, value.SearchAnalyzer);
+		writer.WriteProperty(options, PropSearchQuoteAnalyzer, value.SearchQuoteAnalyzer);
+		writer.WriteProperty(options, PropSimilarity, value.Similarity);
+		writer.WriteProperty(options, PropStore, value.Store);
+		writer.WriteProperty(options, PropTermVector, value.TermVector);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(TextPropertyConverter))]
 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")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Serverless.Fields? CopyTo { get; set; }
-	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Serverless.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.Serverless.IndexManagement.FielddataFrequencyFilter? FielddataFrequencyFilter { get; set; }
-	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Serverless.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.Serverless.Mapping.IndexOptions? IndexOptions { get; set; }
-	[JsonInclude, JsonPropertyName("index_phrases")]
 	public bool? IndexPhrases { get; set; }
-	[JsonInclude, JsonPropertyName("index_prefixes")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.TextIndexPrefixes? IndexPrefixes { get; set; }
 
 	/// <summary>
@@ -62,26 +301,16 @@ public sealed partial class TextProperty : IProperty
 	/// Metadata about the field.
 	/// </para>
 	/// </summary>
-	[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.Serverless.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.Serverless.Mapping.TermVectorOption? TermVector { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "text";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/TokenCountProperty.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/TokenCountProperty.g.cs
index 8f5f9b0aaa7..e722477e23f 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/TokenCountProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/TokenCountProperty.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,26 +28,178 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Mapping;
 
+internal sealed partial class TokenCountPropertyConverter : System.Text.Json.Serialization.JsonConverter<TokenCountProperty>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAnalyzer = System.Text.Json.JsonEncodedText.Encode("analyzer");
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropCopyTo = System.Text.Json.JsonEncodedText.Encode("copy_to");
+	private static readonly System.Text.Json.JsonEncodedText PropDocValues = System.Text.Json.JsonEncodedText.Encode("doc_values");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamic = System.Text.Json.JsonEncodedText.Encode("dynamic");
+	private static readonly System.Text.Json.JsonEncodedText PropEnablePositionIncrements = System.Text.Json.JsonEncodedText.Encode("enable_position_increments");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreAbove = System.Text.Json.JsonEncodedText.Encode("ignore_above");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropNullValue = System.Text.Json.JsonEncodedText.Encode("null_value");
+	private static readonly System.Text.Json.JsonEncodedText PropProperties = System.Text.Json.JsonEncodedText.Encode("properties");
+	private static readonly System.Text.Json.JsonEncodedText PropStore = System.Text.Json.JsonEncodedText.Encode("store");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override TokenCountProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string?> propAnalyzer = default;
+		LocalJsonProperty<double?> propBoost = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Fields?> propCopyTo = default;
+		LocalJsonProperty<bool?> propDocValues = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicMapping?> propDynamic = default;
+		LocalJsonProperty<bool?> propEnablePositionIncrements = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties?> propFields = default;
+		LocalJsonProperty<int?> propIgnoreAbove = default;
+		LocalJsonProperty<bool?> propIndex = default;
+		LocalJsonProperty<IDictionary<string, string>?> propMeta = default;
+		LocalJsonProperty<double?> propNullValue = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties?> propProperties = default;
+		LocalJsonProperty<bool?> propStore = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAnalyzer.TryRead(ref reader, options, PropAnalyzer))
+			{
+				continue;
+			}
+
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
+
+			if (propCopyTo.TryRead(ref reader, options, PropCopyTo, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propDocValues.TryRead(ref reader, options, PropDocValues))
+			{
+				continue;
+			}
+
+			if (propDynamic.TryRead(ref reader, options, PropDynamic))
+			{
+				continue;
+			}
+
+			if (propEnablePositionIncrements.TryRead(ref reader, options, PropEnablePositionIncrements))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propIgnoreAbove.TryRead(ref reader, options, PropIgnoreAbove))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propNullValue.TryRead(ref reader, options, PropNullValue))
+			{
+				continue;
+			}
+
+			if (propProperties.TryRead(ref reader, options, PropProperties))
+			{
+				continue;
+			}
+
+			if (propStore.TryRead(ref reader, options, PropStore))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new TokenCountProperty
+		{
+			Analyzer = propAnalyzer.Value
+,
+			Boost = propBoost.Value
+,
+			CopyTo = propCopyTo.Value
+,
+			DocValues = propDocValues.Value
+,
+			Dynamic = propDynamic.Value
+,
+			EnablePositionIncrements = propEnablePositionIncrements.Value
+,
+			Fields = propFields.Value
+,
+			IgnoreAbove = propIgnoreAbove.Value
+,
+			Index = propIndex.Value
+,
+			Meta = propMeta.Value
+,
+			NullValue = propNullValue.Value
+,
+			Properties = propProperties.Value
+,
+			Store = propStore.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, TokenCountProperty value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAnalyzer, value.Analyzer);
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropCopyTo, value.CopyTo, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropDocValues, value.DocValues);
+		writer.WriteProperty(options, PropDynamic, value.Dynamic);
+		writer.WriteProperty(options, PropEnablePositionIncrements, value.EnablePositionIncrements);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropIgnoreAbove, value.IgnoreAbove);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropNullValue, value.NullValue);
+		writer.WriteProperty(options, PropProperties, value.Properties);
+		writer.WriteProperty(options, PropStore, value.Store);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(TokenCountPropertyConverter))]
 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")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Serverless.Fields? CopyTo { get; set; }
-	[JsonInclude, JsonPropertyName("doc_values")]
 	public bool? DocValues { get; set; }
-	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicMapping? Dynamic { get; set; }
-	[JsonInclude, JsonPropertyName("enable_position_increments")]
 	public bool? EnablePositionIncrements { get; set; }
-	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties? Fields { get; set; }
-	[JsonInclude, JsonPropertyName("ignore_above")]
 	public int? IgnoreAbove { get; set; }
-	[JsonInclude, JsonPropertyName("index")]
 	public bool? Index { get; set; }
 
 	/// <summary>
@@ -54,16 +207,11 @@ public sealed partial class TokenCountProperty : IProperty
 	/// Metadata about the field.
 	/// </para>
 	/// </summary>
-	[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.Serverless.Mapping.Properties? Properties { get; set; }
-	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "token_count";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/UnsignedLongNumberProperty.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/UnsignedLongNumberProperty.g.cs
index fbf3e48aad7..3a8c5bb5ad1 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/UnsignedLongNumberProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/UnsignedLongNumberProperty.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,26 +28,198 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Mapping;
 
+internal sealed partial class UnsignedLongNumberPropertyConverter : System.Text.Json.Serialization.JsonConverter<UnsignedLongNumberProperty>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropCoerce = System.Text.Json.JsonEncodedText.Encode("coerce");
+	private static readonly System.Text.Json.JsonEncodedText PropCopyTo = System.Text.Json.JsonEncodedText.Encode("copy_to");
+	private static readonly System.Text.Json.JsonEncodedText PropDocValues = System.Text.Json.JsonEncodedText.Encode("doc_values");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamic = System.Text.Json.JsonEncodedText.Encode("dynamic");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreAbove = System.Text.Json.JsonEncodedText.Encode("ignore_above");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreMalformed = System.Text.Json.JsonEncodedText.Encode("ignore_malformed");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropNullValue = System.Text.Json.JsonEncodedText.Encode("null_value");
+	private static readonly System.Text.Json.JsonEncodedText PropOnScriptError = System.Text.Json.JsonEncodedText.Encode("on_script_error");
+	private static readonly System.Text.Json.JsonEncodedText PropProperties = System.Text.Json.JsonEncodedText.Encode("properties");
+	private static readonly System.Text.Json.JsonEncodedText PropScript = System.Text.Json.JsonEncodedText.Encode("script");
+	private static readonly System.Text.Json.JsonEncodedText PropStore = System.Text.Json.JsonEncodedText.Encode("store");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override UnsignedLongNumberProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<double?> propBoost = default;
+		LocalJsonProperty<bool?> propCoerce = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Fields?> propCopyTo = default;
+		LocalJsonProperty<bool?> propDocValues = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicMapping?> propDynamic = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties?> propFields = default;
+		LocalJsonProperty<int?> propIgnoreAbove = default;
+		LocalJsonProperty<bool?> propIgnoreMalformed = default;
+		LocalJsonProperty<bool?> propIndex = default;
+		LocalJsonProperty<IDictionary<string, string>?> propMeta = default;
+		LocalJsonProperty<long?> propNullValue = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.OnScriptError?> propOnScriptError = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties?> propProperties = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Script?> propScript = default;
+		LocalJsonProperty<bool?> propStore = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
+
+			if (propCoerce.TryRead(ref reader, options, PropCoerce))
+			{
+				continue;
+			}
+
+			if (propCopyTo.TryRead(ref reader, options, PropCopyTo, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propDocValues.TryRead(ref reader, options, PropDocValues))
+			{
+				continue;
+			}
+
+			if (propDynamic.TryRead(ref reader, options, PropDynamic))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propIgnoreAbove.TryRead(ref reader, options, PropIgnoreAbove))
+			{
+				continue;
+			}
+
+			if (propIgnoreMalformed.TryRead(ref reader, options, PropIgnoreMalformed))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propNullValue.TryRead(ref reader, options, PropNullValue))
+			{
+				continue;
+			}
+
+			if (propOnScriptError.TryRead(ref reader, options, PropOnScriptError))
+			{
+				continue;
+			}
+
+			if (propProperties.TryRead(ref reader, options, PropProperties))
+			{
+				continue;
+			}
+
+			if (propScript.TryRead(ref reader, options, PropScript))
+			{
+				continue;
+			}
+
+			if (propStore.TryRead(ref reader, options, PropStore))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new UnsignedLongNumberProperty
+		{
+			Boost = propBoost.Value
+,
+			Coerce = propCoerce.Value
+,
+			CopyTo = propCopyTo.Value
+,
+			DocValues = propDocValues.Value
+,
+			Dynamic = propDynamic.Value
+,
+			Fields = propFields.Value
+,
+			IgnoreAbove = propIgnoreAbove.Value
+,
+			IgnoreMalformed = propIgnoreMalformed.Value
+,
+			Index = propIndex.Value
+,
+			Meta = propMeta.Value
+,
+			NullValue = propNullValue.Value
+,
+			OnScriptError = propOnScriptError.Value
+,
+			Properties = propProperties.Value
+,
+			Script = propScript.Value
+,
+			Store = propStore.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, UnsignedLongNumberProperty value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropCoerce, value.Coerce);
+		writer.WriteProperty(options, PropCopyTo, value.CopyTo, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropDocValues, value.DocValues);
+		writer.WriteProperty(options, PropDynamic, value.Dynamic);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropIgnoreAbove, value.IgnoreAbove);
+		writer.WriteProperty(options, PropIgnoreMalformed, value.IgnoreMalformed);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropNullValue, value.NullValue);
+		writer.WriteProperty(options, PropOnScriptError, value.OnScriptError);
+		writer.WriteProperty(options, PropProperties, value.Properties);
+		writer.WriteProperty(options, PropScript, value.Script);
+		writer.WriteProperty(options, PropStore, value.Store);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(UnsignedLongNumberPropertyConverter))]
 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")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Serverless.Fields? CopyTo { get; set; }
-	[JsonInclude, JsonPropertyName("doc_values")]
 	public bool? DocValues { get; set; }
-	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicMapping? Dynamic { get; set; }
-	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Serverless.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; }
 
 	/// <summary>
@@ -54,20 +227,13 @@ public sealed partial class UnsignedLongNumberProperty : IProperty
 	/// Metadata about the field.
 	/// </para>
 	/// </summary>
-	[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.Serverless.Mapping.OnScriptError? OnScriptError { get; set; }
-	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties? Properties { get; set; }
-	[JsonInclude, JsonPropertyName("script")]
 	public Elastic.Clients.Elasticsearch.Serverless.Script? Script { get; set; }
-	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "unsigned_long";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/VersionProperty.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/VersionProperty.g.cs
index 44e9c097d81..2796541704b 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/VersionProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/VersionProperty.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,18 +28,124 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Mapping;
 
+internal sealed partial class VersionPropertyConverter : System.Text.Json.Serialization.JsonConverter<VersionProperty>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCopyTo = System.Text.Json.JsonEncodedText.Encode("copy_to");
+	private static readonly System.Text.Json.JsonEncodedText PropDocValues = System.Text.Json.JsonEncodedText.Encode("doc_values");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamic = System.Text.Json.JsonEncodedText.Encode("dynamic");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreAbove = System.Text.Json.JsonEncodedText.Encode("ignore_above");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropProperties = System.Text.Json.JsonEncodedText.Encode("properties");
+	private static readonly System.Text.Json.JsonEncodedText PropStore = System.Text.Json.JsonEncodedText.Encode("store");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override VersionProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Fields?> propCopyTo = default;
+		LocalJsonProperty<bool?> propDocValues = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicMapping?> propDynamic = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties?> propFields = default;
+		LocalJsonProperty<int?> propIgnoreAbove = default;
+		LocalJsonProperty<IDictionary<string, string>?> propMeta = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties?> propProperties = default;
+		LocalJsonProperty<bool?> propStore = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCopyTo.TryRead(ref reader, options, PropCopyTo, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propDocValues.TryRead(ref reader, options, PropDocValues))
+			{
+				continue;
+			}
+
+			if (propDynamic.TryRead(ref reader, options, PropDynamic))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propIgnoreAbove.TryRead(ref reader, options, PropIgnoreAbove))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propProperties.TryRead(ref reader, options, PropProperties))
+			{
+				continue;
+			}
+
+			if (propStore.TryRead(ref reader, options, PropStore))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new VersionProperty
+		{
+			CopyTo = propCopyTo.Value
+,
+			DocValues = propDocValues.Value
+,
+			Dynamic = propDynamic.Value
+,
+			Fields = propFields.Value
+,
+			IgnoreAbove = propIgnoreAbove.Value
+,
+			Meta = propMeta.Value
+,
+			Properties = propProperties.Value
+,
+			Store = propStore.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, VersionProperty value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCopyTo, value.CopyTo, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropDocValues, value.DocValues);
+		writer.WriteProperty(options, PropDynamic, value.Dynamic);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropIgnoreAbove, value.IgnoreAbove);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropProperties, value.Properties);
+		writer.WriteProperty(options, PropStore, value.Store);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(VersionPropertyConverter))]
 public sealed partial class VersionProperty : IProperty
 {
-	[JsonInclude, JsonPropertyName("copy_to")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Serverless.Fields? CopyTo { get; set; }
-	[JsonInclude, JsonPropertyName("doc_values")]
 	public bool? DocValues { get; set; }
-	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicMapping? Dynamic { get; set; }
-	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties? Fields { get; set; }
-	[JsonInclude, JsonPropertyName("ignore_above")]
 	public int? IgnoreAbove { get; set; }
 
 	/// <summary>
@@ -46,14 +153,10 @@ public sealed partial class VersionProperty : IProperty
 	/// Metadata about the field.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties? Properties { get; set; }
-	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "version";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/WildcardProperty.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/WildcardProperty.g.cs
index 3361d4ac704..0b23b7bf081 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/WildcardProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Mapping/WildcardProperty.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,18 +28,134 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Mapping;
 
+internal sealed partial class WildcardPropertyConverter : System.Text.Json.Serialization.JsonConverter<WildcardProperty>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCopyTo = System.Text.Json.JsonEncodedText.Encode("copy_to");
+	private static readonly System.Text.Json.JsonEncodedText PropDocValues = System.Text.Json.JsonEncodedText.Encode("doc_values");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamic = System.Text.Json.JsonEncodedText.Encode("dynamic");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreAbove = System.Text.Json.JsonEncodedText.Encode("ignore_above");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropNullValue = System.Text.Json.JsonEncodedText.Encode("null_value");
+	private static readonly System.Text.Json.JsonEncodedText PropProperties = System.Text.Json.JsonEncodedText.Encode("properties");
+	private static readonly System.Text.Json.JsonEncodedText PropStore = System.Text.Json.JsonEncodedText.Encode("store");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override WildcardProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Fields?> propCopyTo = default;
+		LocalJsonProperty<bool?> propDocValues = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicMapping?> propDynamic = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties?> propFields = default;
+		LocalJsonProperty<int?> propIgnoreAbove = default;
+		LocalJsonProperty<IDictionary<string, string>?> propMeta = default;
+		LocalJsonProperty<string?> propNullValue = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties?> propProperties = default;
+		LocalJsonProperty<bool?> propStore = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCopyTo.TryRead(ref reader, options, PropCopyTo, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propDocValues.TryRead(ref reader, options, PropDocValues))
+			{
+				continue;
+			}
+
+			if (propDynamic.TryRead(ref reader, options, PropDynamic))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propIgnoreAbove.TryRead(ref reader, options, PropIgnoreAbove))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propNullValue.TryRead(ref reader, options, PropNullValue))
+			{
+				continue;
+			}
+
+			if (propProperties.TryRead(ref reader, options, PropProperties))
+			{
+				continue;
+			}
+
+			if (propStore.TryRead(ref reader, options, PropStore))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new WildcardProperty
+		{
+			CopyTo = propCopyTo.Value
+,
+			DocValues = propDocValues.Value
+,
+			Dynamic = propDynamic.Value
+,
+			Fields = propFields.Value
+,
+			IgnoreAbove = propIgnoreAbove.Value
+,
+			Meta = propMeta.Value
+,
+			NullValue = propNullValue.Value
+,
+			Properties = propProperties.Value
+,
+			Store = propStore.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, WildcardProperty value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCopyTo, value.CopyTo, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropDocValues, value.DocValues);
+		writer.WriteProperty(options, PropDynamic, value.Dynamic);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropIgnoreAbove, value.IgnoreAbove);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropNullValue, value.NullValue);
+		writer.WriteProperty(options, PropProperties, value.Properties);
+		writer.WriteProperty(options, PropStore, value.Store);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(WildcardPropertyConverter))]
 public sealed partial class WildcardProperty : IProperty
 {
-	[JsonInclude, JsonPropertyName("copy_to")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Serverless.Fields? CopyTo { get; set; }
-	[JsonInclude, JsonPropertyName("doc_values")]
 	public bool? DocValues { get; set; }
-	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.DynamicMapping? Dynamic { get; set; }
-	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Serverless.Mapping.Properties? Fields { get; set; }
-	[JsonInclude, JsonPropertyName("ignore_above")]
 	public int? IgnoreAbove { get; set; }
 
 	/// <summary>
@@ -46,16 +163,11 @@ public sealed partial class WildcardProperty : IProperty
 	/// Metadata about the field.
 	/// </para>
 	/// </summary>
-	[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.Serverless.Mapping.Properties? Properties { get; set; }
-	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "wildcard";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Nodes/NodeInfoDiscover.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Nodes/NodeInfoDiscover.g.cs
index ab16ddd86ef..28d73f18045 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Nodes/NodeInfoDiscover.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Nodes/NodeInfoDiscover.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,51 +28,70 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Nodes;
 
-internal sealed partial class NodeInfoDiscoverConverter : JsonConverter<NodeInfoDiscover>
+internal sealed partial class NodeInfoDiscoverConverter : System.Text.Json.Serialization.JsonConverter<NodeInfoDiscover>
 {
-	public override NodeInfoDiscover Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropSettings = System.Text.Json.JsonEncodedText.Encode("settings");
+	private static readonly System.Text.Json.JsonEncodedText PropSeedHosts = System.Text.Json.JsonEncodedText.Encode("seed_hosts");
+	private static readonly System.Text.Json.JsonEncodedText PropSeedProviders = System.Text.Json.JsonEncodedText.Encode("seed_providers");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override NodeInfoDiscover Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		IReadOnlyCollection<string>? seedHosts = default;
-		IReadOnlyCollection<string>? seedProviders = default;
-		string? type = default;
-		Dictionary<string, object> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, object> propSettings = default;
+		LocalJsonProperty<IReadOnlyCollection<string>?> propSeedHosts = default;
+		LocalJsonProperty<IReadOnlyCollection<string>?> propSeedProviders = default;
+		LocalJsonProperty<string?> propType = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propSeedHosts.TryRead(ref reader, options, PropSeedHosts))
 			{
-				var property = reader.GetString();
-				if (property == "seed_hosts")
-				{
-					seedHosts = JsonSerializer.Deserialize<IReadOnlyCollection<string>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "seed_providers")
-				{
-					seedProviders = JsonSerializer.Deserialize<IReadOnlyCollection<string>?>(ref reader, options);
-					continue;
-				}
+				continue;
+			}
 
-				if (property == "type")
-				{
-					type = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
+			if (propSeedProviders.TryRead(ref reader, options, PropSeedProviders))
+			{
+				continue;
+			}
 
-				additionalProperties ??= new Dictionary<string, object>();
-				var additionalValue = JsonSerializer.Deserialize<object>(ref reader, options);
-				additionalProperties.Add(property, additionalValue);
+			if (propType.TryRead(ref reader, options, PropType))
+			{
+				continue;
 			}
+
+			propSettings ??= new System.Collections.Generic.Dictionary<string, object>();
+			reader.ReadProperty(options, out string key, out object value);
+			propSettings[key] = value;
 		}
 
-		return new NodeInfoDiscover { SeedHosts = seedHosts, SeedProviders = seedProviders, Settings = additionalProperties, Type = type };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new NodeInfoDiscover
+		{
+			Settings = propSettings
+,
+			SeedHosts = propSeedHosts.Value
+,
+			SeedProviders = propSeedProviders.Value
+,
+			Type = propType.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, NodeInfoDiscover value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, NodeInfoDiscover value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'NodeInfoDiscover' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropSeedHosts, value.SeedHosts);
+		writer.WriteProperty(options, PropSeedProviders, value.SeedProviders);
+		writer.WriteProperty(options, PropType, value.Type);
+		if (value.Settings is not null)
+		{
+			foreach (var item in value.Settings)
+			{
+				writer.WriteProperty(options, item.Key, item.Value);
+			}
+		}
+
+		writer.WriteEndObject();
 	}
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Nodes/NodeInfoPath.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Nodes/NodeInfoPath.g.cs
index c176bb5a08f..f8181852e95 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Nodes/NodeInfoPath.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Nodes/NodeInfoPath.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,15 +28,74 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Nodes;
 
+internal sealed partial class NodeInfoPathConverter : System.Text.Json.Serialization.JsonConverter<NodeInfoPath>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropData = System.Text.Json.JsonEncodedText.Encode("data");
+	private static readonly System.Text.Json.JsonEncodedText PropHome = System.Text.Json.JsonEncodedText.Encode("home");
+	private static readonly System.Text.Json.JsonEncodedText PropLogs = System.Text.Json.JsonEncodedText.Encode("logs");
+	private static readonly System.Text.Json.JsonEncodedText PropRepo = System.Text.Json.JsonEncodedText.Encode("repo");
+
+	public override NodeInfoPath Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<string>?> propData = default;
+		LocalJsonProperty<string?> propHome = default;
+		LocalJsonProperty<string?> propLogs = default;
+		LocalJsonProperty<IReadOnlyCollection<string>?> propRepo = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propData.TryRead(ref reader, options, PropData, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propHome.TryRead(ref reader, options, PropHome))
+			{
+				continue;
+			}
+
+			if (propLogs.TryRead(ref reader, options, PropLogs))
+			{
+				continue;
+			}
+
+			if (propRepo.TryRead(ref reader, options, PropRepo))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new NodeInfoPath
+		{
+			Data = propData.Value
+,
+			Home = propHome.Value
+,
+			Logs = propLogs.Value
+,
+			Repo = propRepo.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, NodeInfoPath value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropData, value.Data, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropHome, value.Home);
+		writer.WriteProperty(options, PropLogs, value.Logs);
+		writer.WriteProperty(options, PropRepo, value.Repo);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(NodeInfoPathConverter))]
 public sealed partial class NodeInfoPath
 {
-	[JsonInclude, JsonPropertyName("data")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public IReadOnlyCollection<string>? Data { get; init; }
-	[JsonInclude, JsonPropertyName("home")]
 	public string? Home { get; init; }
-	[JsonInclude, JsonPropertyName("logs")]
 	public string? Logs { get; init; }
-	[JsonInclude, JsonPropertyName("repo")]
 	public IReadOnlyCollection<string>? Repo { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Nodes/NodeInfoSettingsHttpType.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Nodes/NodeInfoSettingsHttpType.g.cs
index ea8d393b8c3..5ed7248bf83 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Nodes/NodeInfoSettingsHttpType.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Nodes/NodeInfoSettingsHttpType.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,8 +28,47 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Nodes;
 
+internal sealed partial class NodeInfoSettingsHttpTypeConverter : System.Text.Json.Serialization.JsonConverter<NodeInfoSettingsHttpType>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropDefault = System.Text.Json.JsonEncodedText.Encode("default");
+
+	public override NodeInfoSettingsHttpType Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		if (reader.TokenType is not System.Text.Json.JsonTokenType.StartObject)
+		{
+			var value = reader.ReadValue<string>(options);
+			return new NodeInfoSettingsHttpType { Default = value };
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propDefault = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propDefault.TryRead(ref reader, options, PropDefault))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new NodeInfoSettingsHttpType
+		{
+			Default = propDefault.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, NodeInfoSettingsHttpType value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDefault, value.Default);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(NodeInfoSettingsHttpTypeConverter))]
 public sealed partial class NodeInfoSettingsHttpType
 {
-	[JsonInclude, JsonPropertyName("default")]
 	public string Default { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Nodes/NodeInfoSettingsNetwork.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Nodes/NodeInfoSettingsNetwork.g.cs
index f845950e3bb..16ae2415e9b 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Nodes/NodeInfoSettingsNetwork.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Nodes/NodeInfoSettingsNetwork.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,9 +28,41 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Nodes;
 
+internal sealed partial class NodeInfoSettingsNetworkConverter : System.Text.Json.Serialization.JsonConverter<NodeInfoSettingsNetwork>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropHost = System.Text.Json.JsonEncodedText.Encode("host");
+
+	public override NodeInfoSettingsNetwork Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<string>?> propHost = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propHost.TryRead(ref reader, options, PropHost, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new NodeInfoSettingsNetwork
+		{
+			Host = propHost.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, NodeInfoSettingsNetwork value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropHost, value.Host, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(NodeInfoSettingsNetworkConverter))]
 public sealed partial class NodeInfoSettingsNetwork
 {
-	[JsonInclude, JsonPropertyName("host")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public IReadOnlyCollection<string>? Host { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Nodes/NodeInfoSettingsTransportType.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Nodes/NodeInfoSettingsTransportType.g.cs
index f08f1144e14..c75176d4bcc 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Nodes/NodeInfoSettingsTransportType.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Nodes/NodeInfoSettingsTransportType.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,8 +28,47 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Nodes;
 
+internal sealed partial class NodeInfoSettingsTransportTypeConverter : System.Text.Json.Serialization.JsonConverter<NodeInfoSettingsTransportType>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropDefault = System.Text.Json.JsonEncodedText.Encode("default");
+
+	public override NodeInfoSettingsTransportType Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		if (reader.TokenType is not System.Text.Json.JsonTokenType.StartObject)
+		{
+			var value = reader.ReadValue<string>(options);
+			return new NodeInfoSettingsTransportType { Default = value };
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propDefault = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propDefault.TryRead(ref reader, options, PropDefault))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new NodeInfoSettingsTransportType
+		{
+			Default = propDefault.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, NodeInfoSettingsTransportType value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDefault, value.Default);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(NodeInfoSettingsTransportTypeConverter))]
 public sealed partial class NodeInfoSettingsTransportType
 {
-	[JsonInclude, JsonPropertyName("default")]
 	public string Default { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Nodes/NodeJvmInfo.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Nodes/NodeJvmInfo.g.cs
index 9c93c25fd84..a73f23a7fe6 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Nodes/NodeJvmInfo.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Nodes/NodeJvmInfo.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,109 +28,147 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Nodes;
 
-internal sealed partial class NodeJvmInfoConverter : JsonConverter<NodeJvmInfo>
+internal sealed partial class NodeJvmInfoConverter : System.Text.Json.Serialization.JsonConverter<NodeJvmInfo>
 {
-	public override NodeJvmInfo Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropGcCollectors = System.Text.Json.JsonEncodedText.Encode("gc_collectors");
+	private static readonly System.Text.Json.JsonEncodedText PropInputArguments = System.Text.Json.JsonEncodedText.Encode("input_arguments");
+	private static readonly System.Text.Json.JsonEncodedText PropMem = System.Text.Json.JsonEncodedText.Encode("mem");
+	private static readonly System.Text.Json.JsonEncodedText PropMemoryPools = System.Text.Json.JsonEncodedText.Encode("memory_pools");
+	private static readonly System.Text.Json.JsonEncodedText PropPid = System.Text.Json.JsonEncodedText.Encode("pid");
+	private static readonly System.Text.Json.JsonEncodedText PropStartTimeInMillis = System.Text.Json.JsonEncodedText.Encode("start_time_in_millis");
+	private static readonly System.Text.Json.JsonEncodedText PropUsingBundledJdk = System.Text.Json.JsonEncodedText.Encode("using_bundled_jdk");
+	private static readonly System.Text.Json.JsonEncodedText PropUsingBundledJdk1 = System.Text.Json.JsonEncodedText.Encode("bundled_jdk");
+	private static readonly System.Text.Json.JsonEncodedText PropUsingCompressedOrdinaryObjectPointers = System.Text.Json.JsonEncodedText.Encode("using_compressed_ordinary_object_pointers");
+	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("version");
+	private static readonly System.Text.Json.JsonEncodedText PropVmName = System.Text.Json.JsonEncodedText.Encode("vm_name");
+	private static readonly System.Text.Json.JsonEncodedText PropVmVendor = System.Text.Json.JsonEncodedText.Encode("vm_vendor");
+	private static readonly System.Text.Json.JsonEncodedText PropVmVersion = System.Text.Json.JsonEncodedText.Encode("vm_version");
+
+	public override NodeJvmInfo Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		IReadOnlyCollection<string> gcCollectors = default;
-		IReadOnlyCollection<string> inputArguments = default;
-		Elastic.Clients.Elasticsearch.Serverless.Nodes.NodeInfoJvmMemory mem = default;
-		IReadOnlyCollection<string> memoryPools = default;
-		int pid = default;
-		long startTimeInMillis = default;
-		bool usingBundledJdk = default;
-		object? usingCompressedOrdinaryObjectPointers = default;
-		string version = default;
-		string vmName = default;
-		string vmVendor = default;
-		string vmVersion = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<string>> propGcCollectors = default;
+		LocalJsonProperty<IReadOnlyCollection<string>> propInputArguments = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Nodes.NodeInfoJvmMemory> propMem = default;
+		LocalJsonProperty<IReadOnlyCollection<string>> propMemoryPools = default;
+		LocalJsonProperty<int> propPid = default;
+		LocalJsonProperty<long> propStartTimeInMillis = default;
+		LocalJsonProperty<bool> propUsingBundledJdk = default;
+		LocalJsonProperty<object?> propUsingCompressedOrdinaryObjectPointers = default;
+		LocalJsonProperty<string> propVersion = default;
+		LocalJsonProperty<string> propVmName = default;
+		LocalJsonProperty<string> propVmVendor = default;
+		LocalJsonProperty<string> propVmVersion = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propGcCollectors.TryRead(ref reader, options, PropGcCollectors))
 			{
-				var property = reader.GetString();
-				if (property == "gc_collectors")
-				{
-					gcCollectors = JsonSerializer.Deserialize<IReadOnlyCollection<string>>(ref reader, options);
-					continue;
-				}
-
-				if (property == "input_arguments")
-				{
-					inputArguments = JsonSerializer.Deserialize<IReadOnlyCollection<string>>(ref reader, options);
-					continue;
-				}
-
-				if (property == "mem")
-				{
-					mem = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Nodes.NodeInfoJvmMemory>(ref reader, options);
-					continue;
-				}
-
-				if (property == "memory_pools")
-				{
-					memoryPools = JsonSerializer.Deserialize<IReadOnlyCollection<string>>(ref reader, options);
-					continue;
-				}
-
-				if (property == "pid")
-				{
-					pid = JsonSerializer.Deserialize<int>(ref reader, options);
-					continue;
-				}
-
-				if (property == "start_time_in_millis")
-				{
-					startTimeInMillis = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "using_bundled_jdk" || property == "bundled_jdk")
-				{
-					usingBundledJdk = JsonSerializer.Deserialize<bool>(ref reader, options);
-					continue;
-				}
-
-				if (property == "using_compressed_ordinary_object_pointers")
-				{
-					usingCompressedOrdinaryObjectPointers = JsonSerializer.Deserialize<object?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "version")
-				{
-					version = JsonSerializer.Deserialize<string>(ref reader, options);
-					continue;
-				}
-
-				if (property == "vm_name")
-				{
-					vmName = JsonSerializer.Deserialize<string>(ref reader, options);
-					continue;
-				}
-
-				if (property == "vm_vendor")
-				{
-					vmVendor = JsonSerializer.Deserialize<string>(ref reader, options);
-					continue;
-				}
-
-				if (property == "vm_version")
-				{
-					vmVersion = JsonSerializer.Deserialize<string>(ref reader, options);
-					continue;
-				}
+				continue;
 			}
+
+			if (propInputArguments.TryRead(ref reader, options, PropInputArguments))
+			{
+				continue;
+			}
+
+			if (propMem.TryRead(ref reader, options, PropMem))
+			{
+				continue;
+			}
+
+			if (propMemoryPools.TryRead(ref reader, options, PropMemoryPools))
+			{
+				continue;
+			}
+
+			if (propPid.TryRead(ref reader, options, PropPid))
+			{
+				continue;
+			}
+
+			if (propStartTimeInMillis.TryRead(ref reader, options, PropStartTimeInMillis))
+			{
+				continue;
+			}
+
+			if (propUsingBundledJdk.TryRead(ref reader, options, PropUsingBundledJdk) || propUsingBundledJdk.TryRead(ref reader, options, PropUsingBundledJdk1))
+			{
+				continue;
+			}
+
+			if (propUsingCompressedOrdinaryObjectPointers.TryRead(ref reader, options, PropUsingCompressedOrdinaryObjectPointers))
+			{
+				continue;
+			}
+
+			if (propVersion.TryRead(ref reader, options, PropVersion))
+			{
+				continue;
+			}
+
+			if (propVmName.TryRead(ref reader, options, PropVmName))
+			{
+				continue;
+			}
+
+			if (propVmVendor.TryRead(ref reader, options, PropVmVendor))
+			{
+				continue;
+			}
+
+			if (propVmVersion.TryRead(ref reader, options, PropVmVersion))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		return new NodeJvmInfo { GcCollectors = gcCollectors, InputArguments = inputArguments, Mem = mem, MemoryPools = memoryPools, Pid = pid, StartTimeInMillis = startTimeInMillis, UsingBundledJdk = usingBundledJdk, UsingCompressedOrdinaryObjectPointers = usingCompressedOrdinaryObjectPointers, Version = version, VmName = vmName, VmVendor = vmVendor, VmVersion = vmVersion };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new NodeJvmInfo
+		{
+			GcCollectors = propGcCollectors.Value
+,
+			InputArguments = propInputArguments.Value
+,
+			Mem = propMem.Value
+,
+			MemoryPools = propMemoryPools.Value
+,
+			Pid = propPid.Value
+,
+			StartTimeInMillis = propStartTimeInMillis.Value
+,
+			UsingBundledJdk = propUsingBundledJdk.Value
+,
+			UsingCompressedOrdinaryObjectPointers = propUsingCompressedOrdinaryObjectPointers.Value
+,
+			Version = propVersion.Value
+,
+			VmName = propVmName.Value
+,
+			VmVendor = propVmVendor.Value
+,
+			VmVersion = propVmVersion.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, NodeJvmInfo value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, NodeJvmInfo value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'NodeJvmInfo' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropGcCollectors, value.GcCollectors);
+		writer.WriteProperty(options, PropInputArguments, value.InputArguments);
+		writer.WriteProperty(options, PropMem, value.Mem);
+		writer.WriteProperty(options, PropMemoryPools, value.MemoryPools);
+		writer.WriteProperty(options, PropPid, value.Pid);
+		writer.WriteProperty(options, PropStartTimeInMillis, value.StartTimeInMillis);
+		writer.WriteProperty(options, PropUsingBundledJdk, value.UsingBundledJdk);
+		writer.WriteProperty(options, PropUsingCompressedOrdinaryObjectPointers, value.UsingCompressedOrdinaryObjectPointers);
+		writer.WriteProperty(options, PropVersion, value.Version);
+		writer.WriteProperty(options, PropVmName, value.VmName);
+		writer.WriteProperty(options, PropVmVendor, value.VmVendor);
+		writer.WriteProperty(options, PropVmVersion, value.VmVersion);
+		writer.WriteEndObject();
 	}
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Nodes/Stats.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Nodes/Stats.g.cs
index 5fa4360b7c1..0ceaeb9d59f 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Nodes/Stats.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Nodes/Stats.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,250 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Nodes;
 
+internal sealed partial class StatsConverter : System.Text.Json.Serialization.JsonConverter<Stats>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAdaptiveSelection = System.Text.Json.JsonEncodedText.Encode("adaptive_selection");
+	private static readonly System.Text.Json.JsonEncodedText PropAttributes = System.Text.Json.JsonEncodedText.Encode("attributes");
+	private static readonly System.Text.Json.JsonEncodedText PropBreakers = System.Text.Json.JsonEncodedText.Encode("breakers");
+	private static readonly System.Text.Json.JsonEncodedText PropDiscovery = System.Text.Json.JsonEncodedText.Encode("discovery");
+	private static readonly System.Text.Json.JsonEncodedText PropFs = System.Text.Json.JsonEncodedText.Encode("fs");
+	private static readonly System.Text.Json.JsonEncodedText PropHost = System.Text.Json.JsonEncodedText.Encode("host");
+	private static readonly System.Text.Json.JsonEncodedText PropHttp = System.Text.Json.JsonEncodedText.Encode("http");
+	private static readonly System.Text.Json.JsonEncodedText PropIndexingPressure = System.Text.Json.JsonEncodedText.Encode("indexing_pressure");
+	private static readonly System.Text.Json.JsonEncodedText PropIndices = System.Text.Json.JsonEncodedText.Encode("indices");
+	private static readonly System.Text.Json.JsonEncodedText PropIngest = System.Text.Json.JsonEncodedText.Encode("ingest");
+	private static readonly System.Text.Json.JsonEncodedText PropIp = System.Text.Json.JsonEncodedText.Encode("ip");
+	private static readonly System.Text.Json.JsonEncodedText PropJvm = System.Text.Json.JsonEncodedText.Encode("jvm");
+	private static readonly System.Text.Json.JsonEncodedText PropName = System.Text.Json.JsonEncodedText.Encode("name");
+	private static readonly System.Text.Json.JsonEncodedText PropOs = System.Text.Json.JsonEncodedText.Encode("os");
+	private static readonly System.Text.Json.JsonEncodedText PropProcess = System.Text.Json.JsonEncodedText.Encode("process");
+	private static readonly System.Text.Json.JsonEncodedText PropRoles = System.Text.Json.JsonEncodedText.Encode("roles");
+	private static readonly System.Text.Json.JsonEncodedText PropScript = System.Text.Json.JsonEncodedText.Encode("script");
+	private static readonly System.Text.Json.JsonEncodedText PropScriptCache = System.Text.Json.JsonEncodedText.Encode("script_cache");
+	private static readonly System.Text.Json.JsonEncodedText PropThreadPool = System.Text.Json.JsonEncodedText.Encode("thread_pool");
+	private static readonly System.Text.Json.JsonEncodedText PropTimestamp = System.Text.Json.JsonEncodedText.Encode("timestamp");
+	private static readonly System.Text.Json.JsonEncodedText PropTransport = System.Text.Json.JsonEncodedText.Encode("transport");
+	private static readonly System.Text.Json.JsonEncodedText PropTransportAddress = System.Text.Json.JsonEncodedText.Encode("transport_address");
+
+	public override Stats Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Nodes.AdaptiveSelection>?> propAdaptiveSelection = default;
+		LocalJsonProperty<IReadOnlyDictionary<Elastic.Clients.Elasticsearch.Serverless.Field, string>?> propAttributes = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Nodes.Breaker>?> propBreakers = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Nodes.Discovery?> propDiscovery = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Nodes.FileSystem?> propFs = default;
+		LocalJsonProperty<string?> propHost = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Nodes.Http?> propHttp = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Nodes.IndexingPressure?> propIndexingPressure = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.IndexManagement.ShardStats?> propIndices = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Nodes.Ingest?> propIngest = default;
+		LocalJsonProperty<IReadOnlyCollection<string>?> propIp = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Nodes.Jvm?> propJvm = default;
+		LocalJsonProperty<string?> propName = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Nodes.OperatingSystem?> propOs = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Nodes.Process?> propProcess = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.NodeRole>?> propRoles = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Nodes.Scripting?> propScript = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, Union<Elastic.Clients.Elasticsearch.Serverless.Nodes.ScriptCache, IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Nodes.ScriptCache>>>?> propScriptCache = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Nodes.ThreadCount>?> propThreadPool = default;
+		LocalJsonProperty<long?> propTimestamp = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Nodes.Transport?> propTransport = default;
+		LocalJsonProperty<string?> propTransportAddress = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAdaptiveSelection.TryRead(ref reader, options, PropAdaptiveSelection))
+			{
+				continue;
+			}
+
+			if (propAttributes.TryRead(ref reader, options, PropAttributes))
+			{
+				continue;
+			}
+
+			if (propBreakers.TryRead(ref reader, options, PropBreakers))
+			{
+				continue;
+			}
+
+			if (propDiscovery.TryRead(ref reader, options, PropDiscovery))
+			{
+				continue;
+			}
+
+			if (propFs.TryRead(ref reader, options, PropFs))
+			{
+				continue;
+			}
+
+			if (propHost.TryRead(ref reader, options, PropHost))
+			{
+				continue;
+			}
+
+			if (propHttp.TryRead(ref reader, options, PropHttp))
+			{
+				continue;
+			}
+
+			if (propIndexingPressure.TryRead(ref reader, options, PropIndexingPressure))
+			{
+				continue;
+			}
+
+			if (propIndices.TryRead(ref reader, options, PropIndices))
+			{
+				continue;
+			}
+
+			if (propIngest.TryRead(ref reader, options, PropIngest))
+			{
+				continue;
+			}
+
+			if (propIp.TryRead(ref reader, options, PropIp, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propJvm.TryRead(ref reader, options, PropJvm))
+			{
+				continue;
+			}
+
+			if (propName.TryRead(ref reader, options, PropName))
+			{
+				continue;
+			}
+
+			if (propOs.TryRead(ref reader, options, PropOs))
+			{
+				continue;
+			}
+
+			if (propProcess.TryRead(ref reader, options, PropProcess))
+			{
+				continue;
+			}
+
+			if (propRoles.TryRead(ref reader, options, PropRoles))
+			{
+				continue;
+			}
+
+			if (propScript.TryRead(ref reader, options, PropScript))
+			{
+				continue;
+			}
+
+			if (propScriptCache.TryRead(ref reader, options, PropScriptCache))
+			{
+				continue;
+			}
+
+			if (propThreadPool.TryRead(ref reader, options, PropThreadPool))
+			{
+				continue;
+			}
+
+			if (propTimestamp.TryRead(ref reader, options, PropTimestamp))
+			{
+				continue;
+			}
+
+			if (propTransport.TryRead(ref reader, options, PropTransport))
+			{
+				continue;
+			}
+
+			if (propTransportAddress.TryRead(ref reader, options, PropTransportAddress))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new Stats
+		{
+			AdaptiveSelection = propAdaptiveSelection.Value
+,
+			Attributes = propAttributes.Value
+,
+			Breakers = propBreakers.Value
+,
+			Discovery = propDiscovery.Value
+,
+			Fs = propFs.Value
+,
+			Host = propHost.Value
+,
+			Http = propHttp.Value
+,
+			IndexingPressure = propIndexingPressure.Value
+,
+			Indices = propIndices.Value
+,
+			Ingest = propIngest.Value
+,
+			Ip = propIp.Value
+,
+			Jvm = propJvm.Value
+,
+			Name = propName.Value
+,
+			Os = propOs.Value
+,
+			Process = propProcess.Value
+,
+			Roles = propRoles.Value
+,
+			Script = propScript.Value
+,
+			ScriptCache = propScriptCache.Value
+,
+			ThreadPool = propThreadPool.Value
+,
+			Timestamp = propTimestamp.Value
+,
+			Transport = propTransport.Value
+,
+			TransportAddress = propTransportAddress.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, Stats value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAdaptiveSelection, value.AdaptiveSelection);
+		writer.WriteProperty(options, PropAttributes, value.Attributes);
+		writer.WriteProperty(options, PropBreakers, value.Breakers);
+		writer.WriteProperty(options, PropDiscovery, value.Discovery);
+		writer.WriteProperty(options, PropFs, value.Fs);
+		writer.WriteProperty(options, PropHost, value.Host);
+		writer.WriteProperty(options, PropHttp, value.Http);
+		writer.WriteProperty(options, PropIndexingPressure, value.IndexingPressure);
+		writer.WriteProperty(options, PropIndices, value.Indices);
+		writer.WriteProperty(options, PropIngest, value.Ingest);
+		writer.WriteProperty(options, PropIp, value.Ip, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropJvm, value.Jvm);
+		writer.WriteProperty(options, PropName, value.Name);
+		writer.WriteProperty(options, PropOs, value.Os);
+		writer.WriteProperty(options, PropProcess, value.Process);
+		writer.WriteProperty(options, PropRoles, value.Roles);
+		writer.WriteProperty(options, PropScript, value.Script);
+		writer.WriteProperty(options, PropScriptCache, value.ScriptCache);
+		writer.WriteProperty(options, PropThreadPool, value.ThreadPool);
+		writer.WriteProperty(options, PropTimestamp, value.Timestamp);
+		writer.WriteProperty(options, PropTransport, value.Transport);
+		writer.WriteProperty(options, PropTransportAddress, value.TransportAddress);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(StatsConverter))]
 public sealed partial class Stats
 {
 	/// <summary>
@@ -34,7 +279,6 @@ public sealed partial class Stats
 	/// Statistics about adaptive replica selection.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("adaptive_selection")]
 	public IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Nodes.AdaptiveSelection>? AdaptiveSelection { get; init; }
 
 	/// <summary>
@@ -42,8 +286,6 @@ public sealed partial class Stats
 	/// Contains a list of attributes for the node.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("attributes")]
-	[ReadOnlyFieldDictionaryConverter(typeof(string))]
 	public IReadOnlyDictionary<Elastic.Clients.Elasticsearch.Serverless.Field, string>? Attributes { get; init; }
 
 	/// <summary>
@@ -51,7 +293,6 @@ public sealed partial class Stats
 	/// Statistics about the field data circuit breaker.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("breakers")]
 	public IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Nodes.Breaker>? Breakers { get; init; }
 
 	/// <summary>
@@ -59,7 +300,6 @@ public sealed partial class Stats
 	/// Contains node discovery statistics for the node.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("discovery")]
 	public Elastic.Clients.Elasticsearch.Serverless.Nodes.Discovery? Discovery { get; init; }
 
 	/// <summary>
@@ -67,7 +307,6 @@ public sealed partial class Stats
 	/// File system information, data path, free disk space, read/write stats.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("fs")]
 	public Elastic.Clients.Elasticsearch.Serverless.Nodes.FileSystem? Fs { get; init; }
 
 	/// <summary>
@@ -75,7 +314,6 @@ public sealed partial class Stats
 	/// Network host for the node, based on the network host setting.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("host")]
 	public string? Host { get; init; }
 
 	/// <summary>
@@ -83,7 +321,6 @@ public sealed partial class Stats
 	/// HTTP connection information.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("http")]
 	public Elastic.Clients.Elasticsearch.Serverless.Nodes.Http? Http { get; init; }
 
 	/// <summary>
@@ -91,7 +328,6 @@ public sealed partial class Stats
 	/// Contains indexing pressure statistics for the node.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("indexing_pressure")]
 	public Elastic.Clients.Elasticsearch.Serverless.Nodes.IndexingPressure? IndexingPressure { get; init; }
 
 	/// <summary>
@@ -99,7 +335,6 @@ public sealed partial class Stats
 	/// Indices stats about size, document count, indexing and deletion times, search times, field cache size, merges and flushes.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("indices")]
 	public Elastic.Clients.Elasticsearch.Serverless.IndexManagement.ShardStats? Indices { get; init; }
 
 	/// <summary>
@@ -107,7 +342,6 @@ public sealed partial class Stats
 	/// Statistics about ingest preprocessing.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("ingest")]
 	public Elastic.Clients.Elasticsearch.Serverless.Nodes.Ingest? Ingest { get; init; }
 
 	/// <summary>
@@ -115,8 +349,6 @@ public sealed partial class Stats
 	/// IP address and port for the node.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("ip")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public IReadOnlyCollection<string>? Ip { get; init; }
 
 	/// <summary>
@@ -124,7 +356,6 @@ public sealed partial class Stats
 	/// JVM stats, memory pool information, garbage collection, buffer pools, number of loaded/unloaded classes.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("jvm")]
 	public Elastic.Clients.Elasticsearch.Serverless.Nodes.Jvm? Jvm { get; init; }
 
 	/// <summary>
@@ -133,7 +364,6 @@ public sealed partial class Stats
 	/// Based on the node name setting.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("name")]
 	public string? Name { get; init; }
 
 	/// <summary>
@@ -141,7 +371,6 @@ public sealed partial class Stats
 	/// Operating system stats, load average, mem, swap.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("os")]
 	public Elastic.Clients.Elasticsearch.Serverless.Nodes.OperatingSystem? Os { get; init; }
 
 	/// <summary>
@@ -149,7 +378,6 @@ public sealed partial class Stats
 	/// Process statistics, memory consumption, cpu usage, open file descriptors.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("process")]
 	public Elastic.Clients.Elasticsearch.Serverless.Nodes.Process? Process { get; init; }
 
 	/// <summary>
@@ -157,7 +385,6 @@ public sealed partial class Stats
 	/// Roles assigned to the node.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("roles")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.NodeRole>? Roles { get; init; }
 
 	/// <summary>
@@ -165,9 +392,7 @@ public sealed partial class Stats
 	/// Contains script statistics for the node.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("script")]
 	public Elastic.Clients.Elasticsearch.Serverless.Nodes.Scripting? Script { get; init; }
-	[JsonInclude, JsonPropertyName("script_cache")]
 	public IReadOnlyDictionary<string, Union<Elastic.Clients.Elasticsearch.Serverless.Nodes.ScriptCache, IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Nodes.ScriptCache>>>? ScriptCache { get; init; }
 
 	/// <summary>
@@ -175,9 +400,7 @@ public sealed partial class Stats
 	/// Statistics about each thread pool, including current size, queue and rejected tasks.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("thread_pool")]
 	public IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Nodes.ThreadCount>? ThreadPool { get; init; }
-	[JsonInclude, JsonPropertyName("timestamp")]
 	public long? Timestamp { get; init; }
 
 	/// <summary>
@@ -185,7 +408,6 @@ public sealed partial class Stats
 	/// Transport statistics about sent and received bytes in cluster communication.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("transport")]
 	public Elastic.Clients.Elasticsearch.Serverless.Nodes.Transport? Transport { get; init; }
 
 	/// <summary>
@@ -193,6 +415,5 @@ public sealed partial class Stats
 	/// Host and port for the transport layer, used for internal communication between nodes in a cluster.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("transport_address")]
 	public string? TransportAddress { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/BoolQuery.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/BoolQuery.g.cs
index febf7b6dc6a..a1cb59efd4a 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/BoolQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/BoolQuery.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,100 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.QueryDsl;
 
+internal sealed partial class BoolQueryConverter : System.Text.Json.Serialization.JsonConverter<BoolQuery>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropFilter = System.Text.Json.JsonEncodedText.Encode("filter");
+	private static readonly System.Text.Json.JsonEncodedText PropMinimumShouldMatch = System.Text.Json.JsonEncodedText.Encode("minimum_should_match");
+	private static readonly System.Text.Json.JsonEncodedText PropMust = System.Text.Json.JsonEncodedText.Encode("must");
+	private static readonly System.Text.Json.JsonEncodedText PropMustNot = System.Text.Json.JsonEncodedText.Encode("must_not");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryName = System.Text.Json.JsonEncodedText.Encode("_name");
+	private static readonly System.Text.Json.JsonEncodedText PropShould = System.Text.Json.JsonEncodedText.Encode("should");
+
+	public override BoolQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<float?> propBoost = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query>?> propFilter = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.MinimumShouldMatch?> propMinimumShouldMatch = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query>?> propMust = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query>?> propMustNot = default;
+		LocalJsonProperty<string?> propQueryName = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query>?> propShould = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
+
+			if (propFilter.TryRead(ref reader, options, PropFilter, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query>?, Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query>)))
+			{
+				continue;
+			}
+
+			if (propMinimumShouldMatch.TryRead(ref reader, options, PropMinimumShouldMatch))
+			{
+				continue;
+			}
+
+			if (propMust.TryRead(ref reader, options, PropMust, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query>?, Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query>)))
+			{
+				continue;
+			}
+
+			if (propMustNot.TryRead(ref reader, options, PropMustNot, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query>?, Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query>)))
+			{
+				continue;
+			}
+
+			if (propQueryName.TryRead(ref reader, options, PropQueryName))
+			{
+				continue;
+			}
+
+			if (propShould.TryRead(ref reader, options, PropShould, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query>?, Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query>)))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new BoolQuery
+		{
+			Boost = propBoost.Value
+,
+			Filter = propFilter.Value
+,
+			MinimumShouldMatch = propMinimumShouldMatch.Value
+,
+			Must = propMust.Value
+,
+			MustNot = propMustNot.Value
+,
+			QueryName = propQueryName.Value
+,
+			Should = propShould.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, BoolQuery value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropFilter, value.Filter, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query>?, Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query>));
+		writer.WriteProperty(options, PropMinimumShouldMatch, value.MinimumShouldMatch);
+		writer.WriteProperty(options, PropMust, value.Must, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query>?, Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query>));
+		writer.WriteProperty(options, PropMustNot, value.MustNot, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query>?, Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query>));
+		writer.WriteProperty(options, PropQueryName, value.QueryName);
+		writer.WriteProperty(options, PropShould, value.Should, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query>?, Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query>));
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(BoolQueryConverter))]
 public sealed partial class BoolQuery
 {
 	/// <summary>
@@ -37,7 +132,6 @@ public sealed partial class BoolQuery
 	/// A value greater than 1.0 increases the relevance score.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("boost")]
 	public float? Boost { get; set; }
 
 	/// <summary>
@@ -46,8 +140,6 @@ public sealed partial class BoolQuery
 	/// However, unlike <c>must</c>, the score of the query will be ignored.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("filter")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query))]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query>? Filter { get; set; }
 
 	/// <summary>
@@ -55,7 +147,6 @@ public sealed partial class BoolQuery
 	/// Specifies the number or percentage of <c>should</c> clauses returned documents must match.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("minimum_should_match")]
 	public Elastic.Clients.Elasticsearch.Serverless.MinimumShouldMatch? MinimumShouldMatch { get; set; }
 
 	/// <summary>
@@ -63,8 +154,6 @@ public sealed partial class BoolQuery
 	/// The clause (query) must appear in matching documents and will contribute to the score.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("must")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query))]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query>? Must { get; set; }
 
 	/// <summary>
@@ -73,10 +162,7 @@ public sealed partial class BoolQuery
 	/// Because scoring is ignored, a score of <c>0</c> is returned for all documents.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("must_not")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query))]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query>? MustNot { get; set; }
-	[JsonInclude, JsonPropertyName("_name")]
 	public string? QueryName { get; set; }
 
 	/// <summary>
@@ -84,8 +170,6 @@ public sealed partial class BoolQuery
 	/// The clause (query) should appear in the matching document.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("should")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query))]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query>? Should { get; set; }
 
 	public static implicit operator Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query(BoolQuery boolQuery) => Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query.Bool(boolQuery);
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/CombinedFieldsQuery.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/CombinedFieldsQuery.g.cs
index 5dd65d165b2..77d9907334b 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/CombinedFieldsQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/CombinedFieldsQuery.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,110 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.QueryDsl;
 
+internal sealed partial class CombinedFieldsQueryConverter : System.Text.Json.Serialization.JsonConverter<CombinedFieldsQuery>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAutoGenerateSynonymsPhraseQuery = System.Text.Json.JsonEncodedText.Encode("auto_generate_synonyms_phrase_query");
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropMinimumShouldMatch = System.Text.Json.JsonEncodedText.Encode("minimum_should_match");
+	private static readonly System.Text.Json.JsonEncodedText PropOperator = System.Text.Json.JsonEncodedText.Encode("operator");
+	private static readonly System.Text.Json.JsonEncodedText PropQuery = System.Text.Json.JsonEncodedText.Encode("query");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryName = System.Text.Json.JsonEncodedText.Encode("_name");
+	private static readonly System.Text.Json.JsonEncodedText PropZeroTermsQuery = System.Text.Json.JsonEncodedText.Encode("zero_terms_query");
+
+	public override CombinedFieldsQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool?> propAutoGenerateSynonymsPhraseQuery = default;
+		LocalJsonProperty<float?> propBoost = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Fields> propFields = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.MinimumShouldMatch?> propMinimumShouldMatch = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.CombinedFieldsOperator?> propOperator = default;
+		LocalJsonProperty<string> propQuery = default;
+		LocalJsonProperty<string?> propQueryName = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.CombinedFieldsZeroTerms?> propZeroTermsQuery = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAutoGenerateSynonymsPhraseQuery.TryRead(ref reader, options, PropAutoGenerateSynonymsPhraseQuery))
+			{
+				continue;
+			}
+
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields, typeof(FieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propMinimumShouldMatch.TryRead(ref reader, options, PropMinimumShouldMatch))
+			{
+				continue;
+			}
+
+			if (propOperator.TryRead(ref reader, options, PropOperator))
+			{
+				continue;
+			}
+
+			if (propQuery.TryRead(ref reader, options, PropQuery))
+			{
+				continue;
+			}
+
+			if (propQueryName.TryRead(ref reader, options, PropQueryName))
+			{
+				continue;
+			}
+
+			if (propZeroTermsQuery.TryRead(ref reader, options, PropZeroTermsQuery))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new CombinedFieldsQuery
+		{
+			AutoGenerateSynonymsPhraseQuery = propAutoGenerateSynonymsPhraseQuery.Value
+,
+			Boost = propBoost.Value
+,
+			Fields = propFields.Value
+,
+			MinimumShouldMatch = propMinimumShouldMatch.Value
+,
+			Operator = propOperator.Value
+,
+			Query = propQuery.Value
+,
+			QueryName = propQueryName.Value
+,
+			ZeroTermsQuery = propZeroTermsQuery.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, CombinedFieldsQuery value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAutoGenerateSynonymsPhraseQuery, value.AutoGenerateSynonymsPhraseQuery);
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropFields, value.Fields, typeof(FieldsMarker));
+		writer.WriteProperty(options, PropMinimumShouldMatch, value.MinimumShouldMatch);
+		writer.WriteProperty(options, PropOperator, value.Operator);
+		writer.WriteProperty(options, PropQuery, value.Query);
+		writer.WriteProperty(options, PropQueryName, value.QueryName);
+		writer.WriteProperty(options, PropZeroTermsQuery, value.ZeroTermsQuery);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(CombinedFieldsQueryConverter))]
 public sealed partial class CombinedFieldsQuery
 {
 	/// <summary>
@@ -34,7 +139,6 @@ public sealed partial class CombinedFieldsQuery
 	/// If true, match phrase queries are automatically created for multi-term synonyms.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("auto_generate_synonyms_phrase_query")]
 	public bool? AutoGenerateSynonymsPhraseQuery { get; set; }
 
 	/// <summary>
@@ -45,7 +149,6 @@ public sealed partial class CombinedFieldsQuery
 	/// A value greater than 1.0 increases the relevance score.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("boost")]
 	public float? Boost { get; set; }
 
 	/// <summary>
@@ -53,8 +156,6 @@ public sealed partial class CombinedFieldsQuery
 	/// List of fields to search. Field wildcard patterns are allowed. Only <c>text</c> fields are supported, and they must all have the same search <c>analyzer</c>.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("fields")]
-	[JsonConverter(typeof(FieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Serverless.Fields Fields { get; set; }
 
 	/// <summary>
@@ -62,7 +163,6 @@ public sealed partial class CombinedFieldsQuery
 	/// Minimum number of clauses that must match for a document to be returned.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("minimum_should_match")]
 	public Elastic.Clients.Elasticsearch.Serverless.MinimumShouldMatch? MinimumShouldMatch { get; set; }
 
 	/// <summary>
@@ -70,7 +170,6 @@ public sealed partial class CombinedFieldsQuery
 	/// Boolean logic used to interpret text in the query value.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("operator")]
 	public Elastic.Clients.Elasticsearch.Serverless.QueryDsl.CombinedFieldsOperator? Operator { get; set; }
 
 	/// <summary>
@@ -79,9 +178,7 @@ public sealed partial class CombinedFieldsQuery
 	/// The <c>combined_fields</c> query analyzes the provided text before performing a search.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("query")]
 	public string Query { get; set; }
-	[JsonInclude, JsonPropertyName("_name")]
 	public string? QueryName { get; set; }
 
 	/// <summary>
@@ -89,7 +186,6 @@ public sealed partial class CombinedFieldsQuery
 	/// Indicates whether no documents are returned if the analyzer removes all tokens, such as when using a <c>stop</c> filter.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("zero_terms_query")]
 	public Elastic.Clients.Elasticsearch.Serverless.QueryDsl.CombinedFieldsZeroTerms? ZeroTermsQuery { get; set; }
 
 	public static implicit operator Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query(CombinedFieldsQuery combinedFieldsQuery) => Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query.CombinedFields(combinedFieldsQuery);
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/DateDecayFunction.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/DateDecayFunction.g.cs
index b19c4540e0f..b0a5c5fec81 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/DateDecayFunction.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/DateDecayFunction.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,60 +28,51 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.QueryDsl;
 
-internal sealed partial class DateDecayFunctionConverter : JsonConverter<DateDecayFunction>
+internal sealed partial class DateDecayFunctionConverter : System.Text.Json.Serialization.JsonConverter<DateDecayFunction>
 {
-	public override DateDecayFunction Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		var variant = new DateDecayFunction();
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
-		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
-			{
-				var property = reader.GetString();
-				if (property == "multi_value_mode")
-				{
-					variant.MultiValueMode = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MultiValueMode?>(ref reader, options);
-					continue;
-				}
-
-				variant.Field = property;
-				reader.Read();
-				variant.Placement = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.DecayPlacement<Elastic.Clients.Elasticsearch.Serverless.DateMath, Elastic.Clients.Elasticsearch.Serverless.Duration>>(ref reader, options);
-			}
-		}
-
-		return variant;
-	}
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropPlacement = System.Text.Json.JsonEncodedText.Encode("placement");
+	private static readonly System.Text.Json.JsonEncodedText PropMultiValueMode = System.Text.Json.JsonEncodedText.Encode("multi_value_mode");
 
-	public override void Write(Utf8JsonWriter writer, DateDecayFunction value, JsonSerializerOptions options)
+	public override DateDecayFunction Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		writer.WriteStartObject();
-		if (value.Field is not null && value.Placement is not null)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Field> propField = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.DecayPlacement<Elastic.Clients.Elasticsearch.Serverless.DateMath, Elastic.Clients.Elasticsearch.Serverless.Duration>> propPlacement = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MultiValueMode?> propMultiValueMode = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (!options.TryGetClientSettings(out var settings))
+			if (propMultiValueMode.TryRead(ref reader, options, PropMultiValueMode))
 			{
-				ThrowHelper.ThrowJsonExceptionForMissingSettings();
+				continue;
 			}
 
-			var propertyName = settings.Inferrer.Field(value.Field);
-			writer.WritePropertyName(propertyName);
-			JsonSerializer.Serialize(writer, value.Placement, options);
+			propField.Initialized = propPlacement.Initialized = true;
+			reader.ReadProperty(options, out propField.Value, out propPlacement.Value);
 		}
 
-		if (value.MultiValueMode is not null)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DateDecayFunction
 		{
-			writer.WritePropertyName("multi_value_mode");
-			JsonSerializer.Serialize(writer, value.MultiValueMode, options);
-		}
+			Field = propField.Value
+,
+			Placement = propPlacement.Value
+,
+			MultiValueMode = propMultiValueMode.Value
+		};
+	}
 
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DateDecayFunction value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropMultiValueMode, value.MultiValueMode);
+		writer.WriteProperty(options, value.Field, value.Placement);
 		writer.WriteEndObject();
 	}
 }
 
 [JsonConverter(typeof(DateDecayFunctionConverter))]
-public sealed partial class DateDecayFunction
+public sealed partial class DateDecayFunction : IDecayFunction
 {
 	public Elastic.Clients.Elasticsearch.Serverless.Field Field { get; set; }
 
@@ -91,6 +83,8 @@ public sealed partial class DateDecayFunction
 	/// </summary>
 	public Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MultiValueMode? MultiValueMode { get; set; }
 	public Elastic.Clients.Elasticsearch.Serverless.QueryDsl.DecayPlacement<Elastic.Clients.Elasticsearch.Serverless.DateMath, Elastic.Clients.Elasticsearch.Serverless.Duration> Placement { get; set; }
+
+	public string Type => "datedecayfunction";
 }
 
 public sealed partial class DateDecayFunctionDescriptor<TDocument> : SerializableDescriptor<DateDecayFunctionDescriptor<TDocument>>
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/DateDistanceFeatureQuery.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/DateDistanceFeatureQuery.g.cs
index 4acc19e3a1f..06d6bdf4ec1 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/DateDistanceFeatureQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/DateDistanceFeatureQuery.g.cs
@@ -27,7 +27,7 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.QueryDsl;
 
-public sealed partial class DateDistanceFeatureQuery
+public sealed partial class DateDistanceFeatureQuery : IDistanceFeatureQuery
 {
 	/// <summary>
 	/// <para>
@@ -72,6 +72,9 @@ public sealed partial class DateDistanceFeatureQuery
 	public Elastic.Clients.Elasticsearch.Serverless.Duration Pivot { get; set; }
 	[JsonInclude, JsonPropertyName("_name")]
 	public string? QueryName { get; set; }
+
+	[JsonInclude, JsonPropertyName("")]
+	public string Type => "datedistancefeaturequery";
 }
 
 public sealed partial class DateDistanceFeatureQueryDescriptor<TDocument> : SerializableDescriptor<DateDistanceFeatureQueryDescriptor<TDocument>>
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/DateRangeQuery.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/DateRangeQuery.g.cs
index 685edc8185f..cd6678410d1 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/DateRangeQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/DateRangeQuery.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,151 +28,135 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.QueryDsl;
 
-internal sealed partial class DateRangeQueryConverter : JsonConverter<DateRangeQuery>
+internal sealed partial class DateRangeQueryConverter : System.Text.Json.Serialization.JsonConverter<DateRangeQuery>
 {
-	public override DateRangeQuery Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropFormat = System.Text.Json.JsonEncodedText.Encode("format");
+	private static readonly System.Text.Json.JsonEncodedText PropGt = System.Text.Json.JsonEncodedText.Encode("gt");
+	private static readonly System.Text.Json.JsonEncodedText PropGte = System.Text.Json.JsonEncodedText.Encode("gte");
+	private static readonly System.Text.Json.JsonEncodedText PropLt = System.Text.Json.JsonEncodedText.Encode("lt");
+	private static readonly System.Text.Json.JsonEncodedText PropLte = System.Text.Json.JsonEncodedText.Encode("lte");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryName = System.Text.Json.JsonEncodedText.Encode("_name");
+	private static readonly System.Text.Json.JsonEncodedText PropRelation = System.Text.Json.JsonEncodedText.Encode("relation");
+	private static readonly System.Text.Json.JsonEncodedText PropTimeZone = System.Text.Json.JsonEncodedText.Encode("time_zone");
+
+	public override DateRangeQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Field> propField = default;
 		reader.Read();
-		var fieldName = reader.GetString();
+		propField.Value = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Field>(options);
+		propField.Initialized = true;
 		reader.Read();
-		var variant = new DateRangeQuery(fieldName);
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<float?> propBoost = default;
+		LocalJsonProperty<string?> propFormat = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.DateMath?> propGt = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.DateMath?> propGte = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.DateMath?> propLt = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.DateMath?> propLte = default;
+		LocalJsonProperty<string?> propQueryName = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.RangeRelation?> propRelation = default;
+		LocalJsonProperty<string?> propTimeZone = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propBoost.TryRead(ref reader, options, PropBoost))
 			{
-				var property = reader.GetString();
-				if (property == "boost")
-				{
-					variant.Boost = JsonSerializer.Deserialize<float?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "format")
-				{
-					variant.Format = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "gt")
-				{
-					variant.Gt = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.DateMath?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "gte")
-				{
-					variant.Gte = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.DateMath?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "lt")
-				{
-					variant.Lt = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.DateMath?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "lte")
-				{
-					variant.Lte = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.DateMath?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "_name")
-				{
-					variant.QueryName = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "relation")
-				{
-					variant.Relation = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.RangeRelation?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "time_zone")
-				{
-					variant.TimeZone = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
+				continue;
 			}
-		}
 
-		reader.Read();
-		return variant;
-	}
+			if (propFormat.TryRead(ref reader, options, PropFormat))
+			{
+				continue;
+			}
 
-	public override void Write(Utf8JsonWriter writer, DateRangeQuery value, JsonSerializerOptions options)
-	{
-		if (value.Field is null)
-			throw new JsonException("Unable to serialize DateRangeQuery because the `Field` property is not set. Field name queries must include a valid field name.");
-		if (!options.TryGetClientSettings(out var settings))
-			throw new JsonException("Unable to retrieve client settings required to infer field.");
-		writer.WriteStartObject();
-		writer.WritePropertyName(settings.Inferrer.Field(value.Field));
-		writer.WriteStartObject();
-		if (value.Boost.HasValue)
-		{
-			writer.WritePropertyName("boost");
-			writer.WriteNumberValue(value.Boost.Value);
-		}
+			if (propGt.TryRead(ref reader, options, PropGt))
+			{
+				continue;
+			}
 
-		if (!string.IsNullOrEmpty(value.Format))
-		{
-			writer.WritePropertyName("format");
-			writer.WriteStringValue(value.Format);
-		}
+			if (propGte.TryRead(ref reader, options, PropGte))
+			{
+				continue;
+			}
 
-		if (value.Gt is not null)
-		{
-			writer.WritePropertyName("gt");
-			JsonSerializer.Serialize(writer, value.Gt, options);
-		}
+			if (propLt.TryRead(ref reader, options, PropLt))
+			{
+				continue;
+			}
 
-		if (value.Gte is not null)
-		{
-			writer.WritePropertyName("gte");
-			JsonSerializer.Serialize(writer, value.Gte, options);
-		}
+			if (propLte.TryRead(ref reader, options, PropLte))
+			{
+				continue;
+			}
 
-		if (value.Lt is not null)
-		{
-			writer.WritePropertyName("lt");
-			JsonSerializer.Serialize(writer, value.Lt, options);
-		}
+			if (propQueryName.TryRead(ref reader, options, PropQueryName))
+			{
+				continue;
+			}
 
-		if (value.Lte is not null)
-		{
-			writer.WritePropertyName("lte");
-			JsonSerializer.Serialize(writer, value.Lte, options);
-		}
+			if (propRelation.TryRead(ref reader, options, PropRelation))
+			{
+				continue;
+			}
 
-		if (!string.IsNullOrEmpty(value.QueryName))
-		{
-			writer.WritePropertyName("_name");
-			writer.WriteStringValue(value.QueryName);
-		}
+			if (propTimeZone.TryRead(ref reader, options, PropTimeZone))
+			{
+				continue;
+			}
 
-		if (value.Relation is not null)
-		{
-			writer.WritePropertyName("relation");
-			JsonSerializer.Serialize(writer, value.Relation, options);
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		if (!string.IsNullOrEmpty(value.TimeZone))
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		reader.Read();
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DateRangeQuery
 		{
-			writer.WritePropertyName("time_zone");
-			writer.WriteStringValue(value.TimeZone);
-		}
+			Boost = propBoost.Value
+,
+			Field = propField.Value
+,
+			Format = propFormat.Value
+,
+			Gt = propGt.Value
+,
+			Gte = propGte.Value
+,
+			Lt = propLt.Value
+,
+			Lte = propLte.Value
+,
+			QueryName = propQueryName.Value
+,
+			Relation = propRelation.Value
+,
+			TimeZone = propTimeZone.Value
+		};
+	}
 
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DateRangeQuery value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WritePropertyName(options, value.Field);
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropFormat, value.Format);
+		writer.WriteProperty(options, PropGt, value.Gt);
+		writer.WriteProperty(options, PropGte, value.Gte);
+		writer.WriteProperty(options, PropLt, value.Lt);
+		writer.WriteProperty(options, PropLte, value.Lte);
+		writer.WriteProperty(options, PropQueryName, value.QueryName);
+		writer.WriteProperty(options, PropRelation, value.Relation);
+		writer.WriteProperty(options, PropTimeZone, value.TimeZone);
 		writer.WriteEndObject();
 		writer.WriteEndObject();
 	}
 }
 
 [JsonConverter(typeof(DateRangeQueryConverter))]
-public sealed partial class DateRangeQuery
+public sealed partial class DateRangeQuery : IRangeQuery
 {
 	public DateRangeQuery(Elastic.Clients.Elasticsearch.Serverless.Field field)
 	{
@@ -180,6 +165,10 @@ public DateRangeQuery(Elastic.Clients.Elasticsearch.Serverless.Field field)
 		Field = field;
 	}
 
+	internal DateRangeQuery()
+	{
+	}
+
 	/// <summary>
 	/// <para>
 	/// Floating point number used to decrease or increase the relevance scores of the query.
@@ -240,6 +229,8 @@ public DateRangeQuery(Elastic.Clients.Elasticsearch.Serverless.Field field)
 	/// </para>
 	/// </summary>
 	public string? TimeZone { get; set; }
+
+	public string Type => "daterangequery";
 }
 
 public sealed partial class DateRangeQueryDescriptor<TDocument> : SerializableDescriptor<DateRangeQueryDescriptor<TDocument>>
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/DecayFunction.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/DecayFunction.g.cs
new file mode 100644
index 00000000000..f7fb561070a
--- /dev/null
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/DecayFunction.g.cs
@@ -0,0 +1,64 @@
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information.
+//
+// ███╗   ██╗ ██████╗ ████████╗██╗ ██████╗███████╗
+// ████╗  ██║██╔═══██╗╚══██╔══╝██║██╔════╝██╔════╝
+// ██╔██╗ ██║██║   ██║   ██║   ██║██║     █████╗
+// ██║╚██╗██║██║   ██║   ██║   ██║██║     ██╔══╝
+// ██║ ╚████║╚██████╔╝   ██║   ██║╚██████╗███████╗
+// ╚═╝  ╚═══╝ ╚═════╝    ╚═╝   ╚═╝ ╚═════╝╚══════╝
+// ------------------------------------------------
+//
+// This file is automatically generated.
+// Please do not edit these files manually.
+//
+// ------------------------------------------------
+
+#nullable restore
+
+using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
+using Elastic.Clients.Elasticsearch.Serverless.Serialization;
+using System;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Elastic.Clients.Elasticsearch.Serverless.QueryDsl;
+
+[JsonConverter(typeof(DecayFunctionConverter))]
+public partial interface IDecayFunction
+{
+	public string? Type { get; }
+}
+
+internal sealed partial class DecayFunctionConverter : System.Text.Json.Serialization.JsonConverter<IDecayFunction>
+{
+	public override IDecayFunction Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		return reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.UntypedDecayFunction>(options);
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IDecayFunction value, System.Text.Json.JsonSerializerOptions options)
+	{
+		switch (value)
+		{
+			case Elastic.Clients.Elasticsearch.Serverless.QueryDsl.DateDecayFunction v:
+				writer.WriteValue(options, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Serverless.QueryDsl.GeoDecayFunction v:
+				writer.WriteValue(options, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Serverless.QueryDsl.NumericDecayFunction v:
+				writer.WriteValue(options, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Serverless.QueryDsl.UntypedDecayFunction v:
+				writer.WriteValue(options, v);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.Type}' is not supported for type '{nameof(IDecayFunction)}'.");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/DecayPlacement.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/DecayPlacement.g.cs
index 52c7faaa5d7..d7c64e63c59 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/DecayPlacement.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/DecayPlacement.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,87 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.QueryDsl;
 
+internal sealed partial class DecayPlacementConverter<TOrigin, TScale> : System.Text.Json.Serialization.JsonConverter<DecayPlacement<TOrigin, TScale>>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropDecay = System.Text.Json.JsonEncodedText.Encode("decay");
+	private static readonly System.Text.Json.JsonEncodedText PropOffset = System.Text.Json.JsonEncodedText.Encode("offset");
+	private static readonly System.Text.Json.JsonEncodedText PropOrigin = System.Text.Json.JsonEncodedText.Encode("origin");
+	private static readonly System.Text.Json.JsonEncodedText PropScale = System.Text.Json.JsonEncodedText.Encode("scale");
+
+	public override DecayPlacement<TOrigin, TScale> Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<double?> propDecay = default;
+		LocalJsonProperty<TScale?> propOffset = default;
+		LocalJsonProperty<TOrigin?> propOrigin = default;
+		LocalJsonProperty<TScale?> propScale = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propDecay.TryRead(ref reader, options, PropDecay))
+			{
+				continue;
+			}
+
+			if (propOffset.TryRead(ref reader, options, PropOffset, typeof(SourceMarker<TScale?>)))
+			{
+				continue;
+			}
+
+			if (propOrigin.TryRead(ref reader, options, PropOrigin, typeof(SourceMarker<TOrigin?>)))
+			{
+				continue;
+			}
+
+			if (propScale.TryRead(ref reader, options, PropScale, typeof(SourceMarker<TScale?>)))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DecayPlacement<TOrigin, TScale>
+		{
+			Decay = propDecay.Value
+,
+			Offset = propOffset.Value
+,
+			Origin = propOrigin.Value
+,
+			Scale = propScale.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DecayPlacement<TOrigin, TScale> value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDecay, value.Decay);
+		writer.WriteProperty(options, PropOffset, value.Offset, typeof(SourceMarker<TScale?>));
+		writer.WriteProperty(options, PropOrigin, value.Origin, typeof(SourceMarker<TOrigin?>));
+		writer.WriteProperty(options, PropScale, value.Scale, typeof(SourceMarker<TScale?>));
+		writer.WriteEndObject();
+	}
+}
+
+internal sealed partial class DecayPlacementConverterFactory : System.Text.Json.Serialization.JsonConverterFactory
+{
+	public override bool CanConvert(System.Type typeToConvert)
+	{
+		return typeToConvert.IsGenericType && typeToConvert.GetGenericTypeDefinition() == typeof(DecayPlacement<,>);
+	}
+
+	public override System.Text.Json.Serialization.JsonConverter CreateConverter(System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		var args = typeToConvert.GetGenericArguments();
+#pragma warning disable IL3050
+		var converter = (System.Text.Json.Serialization.JsonConverter)System.Activator.CreateInstance(typeof(DecayPlacementConverter<,>).MakeGenericType(args[0], args[1]), System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public, binder: null, args: null, culture: null)!;
+#pragma warning restore IL3050
+		return converter;
+	}
+}
+
+[JsonConverter(typeof(DecayPlacementConverterFactory))]
 public sealed partial class DecayPlacement<TOrigin, TScale>
 {
 	/// <summary>
@@ -34,7 +116,6 @@ public sealed partial class DecayPlacement<TOrigin, TScale>
 	/// Defines how documents are scored at the distance given at scale.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("decay")]
 	public double? Decay { get; set; }
 
 	/// <summary>
@@ -42,8 +123,6 @@ public sealed partial class DecayPlacement<TOrigin, TScale>
 	/// If defined, the decay function will only compute the decay function for documents with a distance greater than the defined <c>offset</c>.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("offset")]
-	[SourceConverter]
 	public TScale? Offset { get; set; }
 
 	/// <summary>
@@ -51,8 +130,6 @@ public sealed partial class DecayPlacement<TOrigin, TScale>
 	/// The point of origin used for calculating distance. Must be given as a number for numeric field, date for date fields and geo point for geo fields.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("origin")]
-	[SourceConverter]
 	public TOrigin? Origin { get; set; }
 
 	/// <summary>
@@ -60,7 +137,5 @@ public sealed partial class DecayPlacement<TOrigin, TScale>
 	/// Defines the distance from origin + offset at which the computed score will equal <c>decay</c> parameter.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("scale")]
-	[SourceConverter]
 	public TScale? Scale { get; set; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/DistanceFeatureQuery.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/DistanceFeatureQuery.g.cs
new file mode 100644
index 00000000000..860cb6b2492
--- /dev/null
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/DistanceFeatureQuery.g.cs
@@ -0,0 +1,61 @@
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information.
+//
+// ███╗   ██╗ ██████╗ ████████╗██╗ ██████╗███████╗
+// ████╗  ██║██╔═══██╗╚══██╔══╝██║██╔════╝██╔════╝
+// ██╔██╗ ██║██║   ██║   ██║   ██║██║     █████╗
+// ██║╚██╗██║██║   ██║   ██║   ██║██║     ██╔══╝
+// ██║ ╚████║╚██████╔╝   ██║   ██║╚██████╗███████╗
+// ╚═╝  ╚═══╝ ╚═════╝    ╚═╝   ╚═╝ ╚═════╝╚══════╝
+// ------------------------------------------------
+//
+// This file is automatically generated.
+// Please do not edit these files manually.
+//
+// ------------------------------------------------
+
+#nullable restore
+
+using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
+using Elastic.Clients.Elasticsearch.Serverless.Serialization;
+using System;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Elastic.Clients.Elasticsearch.Serverless.QueryDsl;
+
+[JsonConverter(typeof(DistanceFeatureQueryConverter))]
+public partial interface IDistanceFeatureQuery
+{
+	public string? Type { get; }
+}
+
+internal sealed partial class DistanceFeatureQueryConverter : System.Text.Json.Serialization.JsonConverter<IDistanceFeatureQuery>
+{
+	public override IDistanceFeatureQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		return reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.UntypedDistanceFeatureQuery>(options);
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IDistanceFeatureQuery value, System.Text.Json.JsonSerializerOptions options)
+	{
+		switch (value)
+		{
+			case Elastic.Clients.Elasticsearch.Serverless.QueryDsl.DateDistanceFeatureQuery v:
+				writer.WriteValue(options, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Serverless.QueryDsl.GeoDistanceFeatureQuery v:
+				writer.WriteValue(options, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Serverless.QueryDsl.UntypedDistanceFeatureQuery v:
+				writer.WriteValue(options, v);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.Type}' is not supported for type '{nameof(IDistanceFeatureQuery)}'.");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/FieldAndFormat.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/FieldAndFormat.g.cs
index 65dd5cedf73..38ee336ef6b 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/FieldAndFormat.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/FieldAndFormat.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,11 +28,75 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.QueryDsl;
 
+internal sealed partial class FieldAndFormatConverter : System.Text.Json.Serialization.JsonConverter<FieldAndFormat>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropFormat = System.Text.Json.JsonEncodedText.Encode("format");
+	private static readonly System.Text.Json.JsonEncodedText PropIncludeUnmapped = System.Text.Json.JsonEncodedText.Encode("include_unmapped");
+
+	public override FieldAndFormat Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		var readerSnapshot = reader;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Field> propField = default;
+		LocalJsonProperty<string?> propFormat = default;
+		LocalJsonProperty<bool?> propIncludeUnmapped = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propField.TryRead(ref reader, options, PropField))
+			{
+				continue;
+			}
+
+			if (propFormat.TryRead(ref reader, options, PropFormat))
+			{
+				continue;
+			}
+
+			if (propIncludeUnmapped.TryRead(ref reader, options, PropIncludeUnmapped))
+			{
+				continue;
+			}
+
+			try
+			{
+				reader = readerSnapshot;
+				var result = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Field>(options);
+				return new FieldAndFormat { Field = result };
+			}
+			catch (System.Text.Json.JsonException)
+			{
+				throw;
+			}
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new FieldAndFormat
+		{
+			Field = propField.Value
+,
+			Format = propFormat.Value
+,
+			IncludeUnmapped = propIncludeUnmapped.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, FieldAndFormat value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropField, value.Field);
+		writer.WriteProperty(options, PropFormat, value.Format);
+		writer.WriteProperty(options, PropIncludeUnmapped, value.IncludeUnmapped);
+		writer.WriteEndObject();
+	}
+}
+
 /// <summary>
 /// <para>
 /// A reference to a field with formatting instructions on how to return the value
 /// </para>
 /// </summary>
+[JsonConverter(typeof(FieldAndFormatConverter))]
 public sealed partial class FieldAndFormat
 {
 	/// <summary>
@@ -39,7 +104,6 @@ public sealed partial class FieldAndFormat
 	/// Wildcard pattern. The request returns values for field names matching this pattern.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("field")]
 	public Elastic.Clients.Elasticsearch.Serverless.Field Field { get; set; }
 
 	/// <summary>
@@ -47,9 +111,7 @@ public sealed partial class FieldAndFormat
 	/// 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; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/FunctionScore.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/FunctionScore.g.cs
index 08762e35737..27bd9c48efb 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/FunctionScore.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/FunctionScore.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -39,22 +40,29 @@ internal FunctionScore(string variantName, object variant)
 			throw new ArgumentNullException(nameof(variant));
 		if (string.IsNullOrWhiteSpace(variantName))
 			throw new ArgumentException("Variant name must not be empty or whitespace.");
-		VariantName = variantName;
+		VariantType = variantName;
 		Variant = variant;
 	}
 
-	internal object Variant { get; }
-	internal string VariantName { get; }
+	internal FunctionScore()
+	{
+	}
+
+	public object Variant { get; internal set; }
+	public string VariantType { get; internal set; }
 
+	public static FunctionScore Exp(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IDecayFunction decayFunction) => new FunctionScore("exp", decayFunction);
 	public static FunctionScore Exp(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.UntypedDecayFunction decayFunction) => new FunctionScore("exp", decayFunction);
 	public static FunctionScore Exp(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.DateDecayFunction decayFunction) => new FunctionScore("exp", decayFunction);
 	public static FunctionScore Exp(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.NumericDecayFunction decayFunction) => new FunctionScore("exp", decayFunction);
 	public static FunctionScore Exp(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.GeoDecayFunction decayFunction) => new FunctionScore("exp", decayFunction);
 	public static FunctionScore FieldValueFactor(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.FieldValueFactorScoreFunction fieldValueFactorScoreFunction) => new FunctionScore("field_value_factor", fieldValueFactorScoreFunction);
+	public static FunctionScore Gauss(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IDecayFunction decayFunction) => new FunctionScore("gauss", decayFunction);
 	public static FunctionScore Gauss(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.UntypedDecayFunction decayFunction) => new FunctionScore("gauss", decayFunction);
 	public static FunctionScore Gauss(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.DateDecayFunction decayFunction) => new FunctionScore("gauss", decayFunction);
 	public static FunctionScore Gauss(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.NumericDecayFunction decayFunction) => new FunctionScore("gauss", decayFunction);
 	public static FunctionScore Gauss(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.GeoDecayFunction decayFunction) => new FunctionScore("gauss", decayFunction);
+	public static FunctionScore Linear(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IDecayFunction decayFunction) => new FunctionScore("linear", decayFunction);
 	public static FunctionScore Linear(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.UntypedDecayFunction decayFunction) => new FunctionScore("linear", decayFunction);
 	public static FunctionScore Linear(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.DateDecayFunction decayFunction) => new FunctionScore("linear", decayFunction);
 	public static FunctionScore Linear(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.NumericDecayFunction decayFunction) => new FunctionScore("linear", decayFunction);
@@ -80,137 +88,129 @@ public bool TryGet<T>([NotNullWhen(true)] out T? result) where T : class
 	}
 }
 
-internal sealed partial class FunctionScoreConverter : JsonConverter<FunctionScore>
+internal sealed partial class FunctionScoreConverter : System.Text.Json.Serialization.JsonConverter<FunctionScore>
 {
-	public override FunctionScore Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropFilter = System.Text.Json.JsonEncodedText.Encode("filter");
+	private static readonly System.Text.Json.JsonEncodedText PropWeight = System.Text.Json.JsonEncodedText.Encode("weight");
+	private static readonly System.Text.Json.JsonEncodedText VariantExp = System.Text.Json.JsonEncodedText.Encode("exp");
+	private static readonly System.Text.Json.JsonEncodedText VariantFieldValueFactor = System.Text.Json.JsonEncodedText.Encode("field_value_factor");
+	private static readonly System.Text.Json.JsonEncodedText VariantGauss = System.Text.Json.JsonEncodedText.Encode("gauss");
+	private static readonly System.Text.Json.JsonEncodedText VariantLinear = System.Text.Json.JsonEncodedText.Encode("linear");
+	private static readonly System.Text.Json.JsonEncodedText VariantRandomScore = System.Text.Json.JsonEncodedText.Encode("random_score");
+	private static readonly System.Text.Json.JsonEncodedText VariantScriptScore = System.Text.Json.JsonEncodedText.Encode("script_score");
+
+	public override FunctionScore Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-		{
-			throw new JsonException("Expected start token.");
-		}
-
-		object? variantValue = default;
-		string? variantNameValue = default;
-		Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query? filterValue = default;
-		double? weightValue = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query?> propFilter = default;
+		LocalJsonProperty<double?> propWeight = default;
+		var variantType = string.Empty;
+		object? variant = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token.");
-			}
-
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token representing the name of an Elasticsearch field.");
-			}
-
-			var propertyName = reader.GetString();
-			reader.Read();
-			if (propertyName == "filter")
+			if (propFilter.TryRead(ref reader, options, PropFilter))
 			{
-				filterValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query?>(ref reader, options);
 				continue;
 			}
 
-			if (propertyName == "weight")
+			if (propWeight.TryRead(ref reader, options, PropWeight))
 			{
-				weightValue = JsonSerializer.Deserialize<double?>(ref reader, options);
 				continue;
 			}
 
-			if (propertyName == "exp")
+			if (reader.ValueTextEquals(VariantExp))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.UntypedDecayFunction>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantExp.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IDecayFunction>(options);
 				continue;
 			}
 
-			if (propertyName == "field_value_factor")
+			if (reader.ValueTextEquals(VariantFieldValueFactor))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.FieldValueFactorScoreFunction?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantFieldValueFactor.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.FieldValueFactorScoreFunction?>(options);
 				continue;
 			}
 
-			if (propertyName == "gauss")
+			if (reader.ValueTextEquals(VariantGauss))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.UntypedDecayFunction>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantGauss.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IDecayFunction>(options);
 				continue;
 			}
 
-			if (propertyName == "linear")
+			if (reader.ValueTextEquals(VariantLinear))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.UntypedDecayFunction>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantLinear.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IDecayFunction>(options);
 				continue;
 			}
 
-			if (propertyName == "random_score")
+			if (reader.ValueTextEquals(VariantRandomScore))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.RandomScoreFunction?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantRandomScore.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.RandomScoreFunction?>(options);
 				continue;
 			}
 
-			if (propertyName == "script_score")
+			if (reader.ValueTextEquals(VariantScriptScore))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.ScriptScoreFunction?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantScriptScore.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.ScriptScoreFunction?>(options);
 				continue;
 			}
 
-			throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'FunctionScore' from the response.");
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		var result = new FunctionScore(variantNameValue, variantValue);
-		result.Filter = filterValue;
-		result.Weight = weightValue;
-		return result;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new FunctionScore
+		{
+			VariantType = variantType,
+			Variant = variant,
+			Filter = propFilter.Value
+,
+			Weight = propWeight.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, FunctionScore value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, FunctionScore value, System.Text.Json.JsonSerializerOptions options)
 	{
 		writer.WriteStartObject();
-		if (value.Filter is not null)
-		{
-			writer.WritePropertyName("filter");
-			JsonSerializer.Serialize(writer, value.Filter, options);
-		}
-
-		if (value.Weight.HasValue)
+		switch (value.VariantType)
 		{
-			writer.WritePropertyName("weight");
-			writer.WriteNumberValue(value.Weight.Value);
-		}
-
-		if (value.VariantName is not null && value.Variant is not null)
-		{
-			writer.WritePropertyName(value.VariantName);
-			switch (value.VariantName)
-			{
-				case "exp":
-					JsonSerializer.Serialize(writer, value.Variant, value.Variant.GetType(), options);
-					break;
-				case "field_value_factor":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.FieldValueFactorScoreFunction>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.FieldValueFactorScoreFunction)value.Variant, options);
-					break;
-				case "gauss":
-					JsonSerializer.Serialize(writer, value.Variant, value.Variant.GetType(), options);
-					break;
-				case "linear":
-					JsonSerializer.Serialize(writer, value.Variant, value.Variant.GetType(), options);
-					break;
-				case "random_score":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.RandomScoreFunction>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.RandomScoreFunction)value.Variant, options);
-					break;
-				case "script_score":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.ScriptScoreFunction>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.ScriptScoreFunction)value.Variant, options);
-					break;
-			}
+			case "":
+				break;
+			case "exp":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IDecayFunction)value.Variant);
+				break;
+			case "field_value_factor":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.FieldValueFactorScoreFunction?)value.Variant);
+				break;
+			case "gauss":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IDecayFunction)value.Variant);
+				break;
+			case "linear":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IDecayFunction)value.Variant);
+				break;
+			case "random_score":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.RandomScoreFunction?)value.Variant);
+				break;
+			case "script_score":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.ScriptScoreFunction?)value.Variant);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.VariantType}' is not supported for type '{nameof(FunctionScore)}'.");
 		}
 
+		writer.WriteProperty(options, PropFilter, value.Filter);
+		writer.WriteProperty(options, PropWeight, value.Weight);
 		writer.WriteEndObject();
 	}
 }
@@ -261,16 +261,19 @@ public FunctionScoreDescriptor<TDocument> Weight(double? weight)
 		return Self;
 	}
 
+	public FunctionScoreDescriptor<TDocument> Exp(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IDecayFunction decayFunction) => Set(decayFunction, "exp");
 	public FunctionScoreDescriptor<TDocument> Exp(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.UntypedDecayFunction decayFunction) => Set(decayFunction, "exp");
 	public FunctionScoreDescriptor<TDocument> Exp(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.DateDecayFunction decayFunction) => Set(decayFunction, "exp");
 	public FunctionScoreDescriptor<TDocument> Exp(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.NumericDecayFunction decayFunction) => Set(decayFunction, "exp");
 	public FunctionScoreDescriptor<TDocument> Exp(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.GeoDecayFunction decayFunction) => Set(decayFunction, "exp");
 	public FunctionScoreDescriptor<TDocument> FieldValueFactor(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.FieldValueFactorScoreFunction fieldValueFactorScoreFunction) => Set(fieldValueFactorScoreFunction, "field_value_factor");
 	public FunctionScoreDescriptor<TDocument> FieldValueFactor(Action<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.FieldValueFactorScoreFunctionDescriptor<TDocument>> configure) => Set(configure, "field_value_factor");
+	public FunctionScoreDescriptor<TDocument> Gauss(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IDecayFunction decayFunction) => Set(decayFunction, "gauss");
 	public FunctionScoreDescriptor<TDocument> Gauss(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.UntypedDecayFunction decayFunction) => Set(decayFunction, "gauss");
 	public FunctionScoreDescriptor<TDocument> Gauss(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.DateDecayFunction decayFunction) => Set(decayFunction, "gauss");
 	public FunctionScoreDescriptor<TDocument> Gauss(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.NumericDecayFunction decayFunction) => Set(decayFunction, "gauss");
 	public FunctionScoreDescriptor<TDocument> Gauss(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.GeoDecayFunction decayFunction) => Set(decayFunction, "gauss");
+	public FunctionScoreDescriptor<TDocument> Linear(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IDecayFunction decayFunction) => Set(decayFunction, "linear");
 	public FunctionScoreDescriptor<TDocument> Linear(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.UntypedDecayFunction decayFunction) => Set(decayFunction, "linear");
 	public FunctionScoreDescriptor<TDocument> Linear(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.DateDecayFunction decayFunction) => Set(decayFunction, "linear");
 	public FunctionScoreDescriptor<TDocument> Linear(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.NumericDecayFunction decayFunction) => Set(decayFunction, "linear");
@@ -358,16 +361,19 @@ public FunctionScoreDescriptor Weight(double? weight)
 		return Self;
 	}
 
+	public FunctionScoreDescriptor Exp(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IDecayFunction decayFunction) => Set(decayFunction, "exp");
 	public FunctionScoreDescriptor Exp(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.UntypedDecayFunction decayFunction) => Set(decayFunction, "exp");
 	public FunctionScoreDescriptor Exp(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.DateDecayFunction decayFunction) => Set(decayFunction, "exp");
 	public FunctionScoreDescriptor Exp(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.NumericDecayFunction decayFunction) => Set(decayFunction, "exp");
 	public FunctionScoreDescriptor Exp(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.GeoDecayFunction decayFunction) => Set(decayFunction, "exp");
 	public FunctionScoreDescriptor FieldValueFactor(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.FieldValueFactorScoreFunction fieldValueFactorScoreFunction) => Set(fieldValueFactorScoreFunction, "field_value_factor");
 	public FunctionScoreDescriptor FieldValueFactor<TDocument>(Action<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.FieldValueFactorScoreFunctionDescriptor> configure) => Set(configure, "field_value_factor");
+	public FunctionScoreDescriptor Gauss(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IDecayFunction decayFunction) => Set(decayFunction, "gauss");
 	public FunctionScoreDescriptor Gauss(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.UntypedDecayFunction decayFunction) => Set(decayFunction, "gauss");
 	public FunctionScoreDescriptor Gauss(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.DateDecayFunction decayFunction) => Set(decayFunction, "gauss");
 	public FunctionScoreDescriptor Gauss(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.NumericDecayFunction decayFunction) => Set(decayFunction, "gauss");
 	public FunctionScoreDescriptor Gauss(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.GeoDecayFunction decayFunction) => Set(decayFunction, "gauss");
+	public FunctionScoreDescriptor Linear(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IDecayFunction decayFunction) => Set(decayFunction, "linear");
 	public FunctionScoreDescriptor Linear(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.UntypedDecayFunction decayFunction) => Set(decayFunction, "linear");
 	public FunctionScoreDescriptor Linear(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.DateDecayFunction decayFunction) => Set(decayFunction, "linear");
 	public FunctionScoreDescriptor Linear(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.NumericDecayFunction decayFunction) => Set(decayFunction, "linear");
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/FunctionScoreQuery.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/FunctionScoreQuery.g.cs
index d77b5de10da..514469bdf50 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/FunctionScoreQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/FunctionScoreQuery.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,116 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.QueryDsl;
 
+internal sealed partial class FunctionScoreQueryConverter : System.Text.Json.Serialization.JsonConverter<FunctionScoreQuery>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropBoostMode = System.Text.Json.JsonEncodedText.Encode("boost_mode");
+	private static readonly System.Text.Json.JsonEncodedText PropFunctions = System.Text.Json.JsonEncodedText.Encode("functions");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxBoost = System.Text.Json.JsonEncodedText.Encode("max_boost");
+	private static readonly System.Text.Json.JsonEncodedText PropMinScore = System.Text.Json.JsonEncodedText.Encode("min_score");
+	private static readonly System.Text.Json.JsonEncodedText PropQuery = System.Text.Json.JsonEncodedText.Encode("query");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryName = System.Text.Json.JsonEncodedText.Encode("_name");
+	private static readonly System.Text.Json.JsonEncodedText PropScoreMode = System.Text.Json.JsonEncodedText.Encode("score_mode");
+
+	public override FunctionScoreQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		if (reader.TokenType is not System.Text.Json.JsonTokenType.StartObject)
+		{
+			var value = reader.ReadValue<ICollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.FunctionScore>?>(options);
+			return new FunctionScoreQuery { Functions = value };
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<float?> propBoost = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.FunctionBoostMode?> propBoostMode = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.FunctionScore>?> propFunctions = default;
+		LocalJsonProperty<double?> propMaxBoost = default;
+		LocalJsonProperty<double?> propMinScore = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query?> propQuery = default;
+		LocalJsonProperty<string?> propQueryName = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.FunctionScoreMode?> propScoreMode = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
+
+			if (propBoostMode.TryRead(ref reader, options, PropBoostMode))
+			{
+				continue;
+			}
+
+			if (propFunctions.TryRead(ref reader, options, PropFunctions))
+			{
+				continue;
+			}
+
+			if (propMaxBoost.TryRead(ref reader, options, PropMaxBoost))
+			{
+				continue;
+			}
+
+			if (propMinScore.TryRead(ref reader, options, PropMinScore))
+			{
+				continue;
+			}
+
+			if (propQuery.TryRead(ref reader, options, PropQuery))
+			{
+				continue;
+			}
+
+			if (propQueryName.TryRead(ref reader, options, PropQueryName))
+			{
+				continue;
+			}
+
+			if (propScoreMode.TryRead(ref reader, options, PropScoreMode))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new FunctionScoreQuery
+		{
+			Boost = propBoost.Value
+,
+			BoostMode = propBoostMode.Value
+,
+			Functions = propFunctions.Value
+,
+			MaxBoost = propMaxBoost.Value
+,
+			MinScore = propMinScore.Value
+,
+			Query = propQuery.Value
+,
+			QueryName = propQueryName.Value
+,
+			ScoreMode = propScoreMode.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, FunctionScoreQuery value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropBoostMode, value.BoostMode);
+		writer.WriteProperty(options, PropFunctions, value.Functions);
+		writer.WriteProperty(options, PropMaxBoost, value.MaxBoost);
+		writer.WriteProperty(options, PropMinScore, value.MinScore);
+		writer.WriteProperty(options, PropQuery, value.Query);
+		writer.WriteProperty(options, PropQueryName, value.QueryName);
+		writer.WriteProperty(options, PropScoreMode, value.ScoreMode);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(FunctionScoreQueryConverter))]
 public sealed partial class FunctionScoreQuery
 {
 	/// <summary>
@@ -37,7 +148,6 @@ public sealed partial class FunctionScoreQuery
 	/// A value greater than 1.0 increases the relevance score.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("boost")]
 	public float? Boost { get; set; }
 
 	/// <summary>
@@ -45,7 +155,6 @@ public sealed partial class FunctionScoreQuery
 	/// Defines how he newly computed score is combined with the score of the query
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("boost_mode")]
 	public Elastic.Clients.Elasticsearch.Serverless.QueryDsl.FunctionBoostMode? BoostMode { get; set; }
 
 	/// <summary>
@@ -53,7 +162,6 @@ public sealed partial class FunctionScoreQuery
 	/// One or more functions that compute a new score for each document returned by the query.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("functions")]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.FunctionScore>? Functions { get; set; }
 
 	/// <summary>
@@ -61,7 +169,6 @@ public sealed partial class FunctionScoreQuery
 	/// Restricts the new score to not exceed the provided limit.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("max_boost")]
 	public double? MaxBoost { get; set; }
 
 	/// <summary>
@@ -69,7 +176,6 @@ public sealed partial class FunctionScoreQuery
 	/// Excludes documents that do not meet the provided score threshold.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("min_score")]
 	public double? MinScore { get; set; }
 
 	/// <summary>
@@ -77,9 +183,7 @@ public sealed partial class FunctionScoreQuery
 	/// A query that determines the documents for which a new score is computed.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("query")]
 	public Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query? Query { get; set; }
-	[JsonInclude, JsonPropertyName("_name")]
 	public string? QueryName { get; set; }
 
 	/// <summary>
@@ -87,7 +191,6 @@ public sealed partial class FunctionScoreQuery
 	/// Specifies how the computed scores are combined
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("score_mode")]
 	public Elastic.Clients.Elasticsearch.Serverless.QueryDsl.FunctionScoreMode? ScoreMode { get; set; }
 
 	public static implicit operator Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query(FunctionScoreQuery functionScoreQuery) => Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query.FunctionScore(functionScoreQuery);
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/FuzzyQuery.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/FuzzyQuery.g.cs
index 634c9f48cf2..6e4a127f348 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/FuzzyQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/FuzzyQuery.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,128 +28,125 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.QueryDsl;
 
-internal sealed partial class FuzzyQueryConverter : JsonConverter<FuzzyQuery>
+internal sealed partial class FuzzyQueryConverter : System.Text.Json.Serialization.JsonConverter<FuzzyQuery>
 {
-	public override FuzzyQuery Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropFuzziness = System.Text.Json.JsonEncodedText.Encode("fuzziness");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxExpansions = System.Text.Json.JsonEncodedText.Encode("max_expansions");
+	private static readonly System.Text.Json.JsonEncodedText PropPrefixLength = System.Text.Json.JsonEncodedText.Encode("prefix_length");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryName = System.Text.Json.JsonEncodedText.Encode("_name");
+	private static readonly System.Text.Json.JsonEncodedText PropRewrite = System.Text.Json.JsonEncodedText.Encode("rewrite");
+	private static readonly System.Text.Json.JsonEncodedText PropTranspositions = System.Text.Json.JsonEncodedText.Encode("transpositions");
+	private static readonly System.Text.Json.JsonEncodedText PropValue = System.Text.Json.JsonEncodedText.Encode("value");
+
+	public override FuzzyQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Field> propField = default;
 		reader.Read();
-		var fieldName = reader.GetString();
+		propField.Value = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Field>(options);
+		propField.Initialized = true;
 		reader.Read();
-		var variant = new FuzzyQuery(fieldName);
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		if (reader.TokenType is not System.Text.Json.JsonTokenType.StartObject)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			var value = reader.ReadValue<object>(options);
+			reader.Read();
+			return new FuzzyQuery { Value = value };
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<float?> propBoost = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Fuzziness?> propFuzziness = default;
+		LocalJsonProperty<int?> propMaxExpansions = default;
+		LocalJsonProperty<int?> propPrefixLength = default;
+		LocalJsonProperty<string?> propQueryName = default;
+		LocalJsonProperty<string?> propRewrite = default;
+		LocalJsonProperty<bool?> propTranspositions = default;
+		LocalJsonProperty<object> propValue = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBoost.TryRead(ref reader, options, PropBoost))
 			{
-				var property = reader.GetString();
-				if (property == "boost")
-				{
-					variant.Boost = JsonSerializer.Deserialize<float?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "fuzziness")
-				{
-					variant.Fuzziness = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Fuzziness?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "max_expansions")
-				{
-					variant.MaxExpansions = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "prefix_length")
-				{
-					variant.PrefixLength = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "_name")
-				{
-					variant.QueryName = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "rewrite")
-				{
-					variant.Rewrite = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "transpositions")
-				{
-					variant.Transpositions = JsonSerializer.Deserialize<bool?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "value")
-				{
-					variant.Value = JsonSerializer.Deserialize<object>(ref reader, options);
-					continue;
-				}
+				continue;
 			}
-		}
 
-		reader.Read();
-		return variant;
-	}
+			if (propFuzziness.TryRead(ref reader, options, PropFuzziness))
+			{
+				continue;
+			}
 
-	public override void Write(Utf8JsonWriter writer, FuzzyQuery value, JsonSerializerOptions options)
-	{
-		if (value.Field is null)
-			throw new JsonException("Unable to serialize FuzzyQuery because the `Field` property is not set. Field name queries must include a valid field name.");
-		if (!options.TryGetClientSettings(out var settings))
-			throw new JsonException("Unable to retrieve client settings required to infer field.");
-		writer.WriteStartObject();
-		writer.WritePropertyName(settings.Inferrer.Field(value.Field));
-		writer.WriteStartObject();
-		if (value.Boost.HasValue)
-		{
-			writer.WritePropertyName("boost");
-			writer.WriteNumberValue(value.Boost.Value);
-		}
+			if (propMaxExpansions.TryRead(ref reader, options, PropMaxExpansions))
+			{
+				continue;
+			}
 
-		if (value.Fuzziness is not null)
-		{
-			writer.WritePropertyName("fuzziness");
-			JsonSerializer.Serialize(writer, value.Fuzziness, options);
-		}
+			if (propPrefixLength.TryRead(ref reader, options, PropPrefixLength))
+			{
+				continue;
+			}
 
-		if (value.MaxExpansions.HasValue)
-		{
-			writer.WritePropertyName("max_expansions");
-			writer.WriteNumberValue(value.MaxExpansions.Value);
-		}
+			if (propQueryName.TryRead(ref reader, options, PropQueryName))
+			{
+				continue;
+			}
 
-		if (value.PrefixLength.HasValue)
-		{
-			writer.WritePropertyName("prefix_length");
-			writer.WriteNumberValue(value.PrefixLength.Value);
-		}
+			if (propRewrite.TryRead(ref reader, options, PropRewrite))
+			{
+				continue;
+			}
 
-		if (!string.IsNullOrEmpty(value.QueryName))
-		{
-			writer.WritePropertyName("_name");
-			writer.WriteStringValue(value.QueryName);
-		}
+			if (propTranspositions.TryRead(ref reader, options, PropTranspositions))
+			{
+				continue;
+			}
 
-		if (!string.IsNullOrEmpty(value.Rewrite))
-		{
-			writer.WritePropertyName("rewrite");
-			writer.WriteStringValue(value.Rewrite);
+			if (propValue.TryRead(ref reader, options, PropValue))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		if (value.Transpositions.HasValue)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		reader.Read();
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new FuzzyQuery
 		{
-			writer.WritePropertyName("transpositions");
-			writer.WriteBooleanValue(value.Transpositions.Value);
-		}
+			Boost = propBoost.Value
+,
+			Field = propField.Value
+,
+			Fuzziness = propFuzziness.Value
+,
+			MaxExpansions = propMaxExpansions.Value
+,
+			PrefixLength = propPrefixLength.Value
+,
+			QueryName = propQueryName.Value
+,
+			Rewrite = propRewrite.Value
+,
+			Transpositions = propTranspositions.Value
+,
+			Value = propValue.Value
+		};
+	}
 
-		writer.WritePropertyName("value");
-		JsonSerializer.Serialize(writer, value.Value, options);
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, FuzzyQuery value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WritePropertyName(options, value.Field);
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropFuzziness, value.Fuzziness);
+		writer.WriteProperty(options, PropMaxExpansions, value.MaxExpansions);
+		writer.WriteProperty(options, PropPrefixLength, value.PrefixLength);
+		writer.WriteProperty(options, PropQueryName, value.QueryName);
+		writer.WriteProperty(options, PropRewrite, value.Rewrite);
+		writer.WriteProperty(options, PropTranspositions, value.Transpositions);
+		writer.WriteProperty(options, PropValue, value.Value);
 		writer.WriteEndObject();
 		writer.WriteEndObject();
 	}
@@ -164,6 +162,10 @@ public FuzzyQuery(Elastic.Clients.Elasticsearch.Serverless.Field field)
 		Field = field;
 	}
 
+	internal FuzzyQuery()
+	{
+	}
+
 	/// <summary>
 	/// <para>
 	/// Floating point number used to decrease or increase the relevance scores of the query.
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/GeoBoundingBoxQuery.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/GeoBoundingBoxQuery.g.cs
index 3195a8c1898..7d763e1c2c3 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/GeoBoundingBoxQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/GeoBoundingBoxQuery.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,90 +28,75 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.QueryDsl;
 
-internal sealed partial class GeoBoundingBoxQueryConverter : JsonConverter<GeoBoundingBoxQuery>
+internal sealed partial class GeoBoundingBoxQueryConverter : System.Text.Json.Serialization.JsonConverter<GeoBoundingBoxQuery>
 {
-	public override GeoBoundingBoxQuery Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropBoundingBox = System.Text.Json.JsonEncodedText.Encode("bounding_box");
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreUnmapped = System.Text.Json.JsonEncodedText.Encode("ignore_unmapped");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryName = System.Text.Json.JsonEncodedText.Encode("_name");
+	private static readonly System.Text.Json.JsonEncodedText PropValidationMethod = System.Text.Json.JsonEncodedText.Encode("validation_method");
+
+	public override GeoBoundingBoxQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		var variant = new GeoBoundingBoxQuery();
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.GeoBounds> propBoundingBox = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Field> propField = default;
+		LocalJsonProperty<float?> propBoost = default;
+		LocalJsonProperty<bool?> propIgnoreUnmapped = default;
+		LocalJsonProperty<string?> propQueryName = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.GeoValidationMethod?> propValidationMethod = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propBoost.TryRead(ref reader, options, PropBoost))
 			{
-				var property = reader.GetString();
-				if (property == "boost")
-				{
-					variant.Boost = JsonSerializer.Deserialize<float?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "ignore_unmapped")
-				{
-					variant.IgnoreUnmapped = JsonSerializer.Deserialize<bool?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "_name")
-				{
-					variant.QueryName = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "validation_method")
-				{
-					variant.ValidationMethod = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.GeoValidationMethod?>(ref reader, options);
-					continue;
-				}
-
-				variant.Field = property;
-				reader.Read();
-				variant.BoundingBox = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.GeoBounds>(ref reader, options);
+				continue;
 			}
-		}
-
-		return variant;
-	}
 
-	public override void Write(Utf8JsonWriter writer, GeoBoundingBoxQuery value, JsonSerializerOptions options)
-	{
-		writer.WriteStartObject();
-		if (value.Field is not null && value.BoundingBox is not null)
-		{
-			if (!options.TryGetClientSettings(out var settings))
+			if (propIgnoreUnmapped.TryRead(ref reader, options, PropIgnoreUnmapped))
 			{
-				ThrowHelper.ThrowJsonExceptionForMissingSettings();
+				continue;
 			}
 
-			var propertyName = settings.Inferrer.Field(value.Field);
-			writer.WritePropertyName(propertyName);
-			JsonSerializer.Serialize(writer, value.BoundingBox, options);
-		}
-
-		if (value.Boost.HasValue)
-		{
-			writer.WritePropertyName("boost");
-			writer.WriteNumberValue(value.Boost.Value);
-		}
+			if (propQueryName.TryRead(ref reader, options, PropQueryName))
+			{
+				continue;
+			}
 
-		if (value.IgnoreUnmapped.HasValue)
-		{
-			writer.WritePropertyName("ignore_unmapped");
-			writer.WriteBooleanValue(value.IgnoreUnmapped.Value);
-		}
+			if (propValidationMethod.TryRead(ref reader, options, PropValidationMethod))
+			{
+				continue;
+			}
 
-		if (!string.IsNullOrEmpty(value.QueryName))
-		{
-			writer.WritePropertyName("_name");
-			writer.WriteStringValue(value.QueryName);
+			propField.Initialized = propBoundingBox.Initialized = true;
+			reader.ReadProperty(options, out propField.Value, out propBoundingBox.Value);
 		}
 
-		if (value.ValidationMethod is not null)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GeoBoundingBoxQuery
 		{
-			writer.WritePropertyName("validation_method");
-			JsonSerializer.Serialize(writer, value.ValidationMethod, options);
-		}
+			BoundingBox = propBoundingBox.Value
+,
+			Field = propField.Value
+,
+			Boost = propBoost.Value
+,
+			IgnoreUnmapped = propIgnoreUnmapped.Value
+,
+			QueryName = propQueryName.Value
+,
+			ValidationMethod = propValidationMethod.Value
+		};
+	}
 
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GeoBoundingBoxQuery value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropIgnoreUnmapped, value.IgnoreUnmapped);
+		writer.WriteProperty(options, PropQueryName, value.QueryName);
+		writer.WriteProperty(options, PropValidationMethod, value.ValidationMethod);
+		writer.WriteProperty(options, value.Field, value.BoundingBox);
 		writer.WriteEndObject();
 	}
 }
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/GeoDecayFunction.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/GeoDecayFunction.g.cs
index 6691e33a2f3..f0d99960ce7 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/GeoDecayFunction.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/GeoDecayFunction.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,60 +28,51 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.QueryDsl;
 
-internal sealed partial class GeoDecayFunctionConverter : JsonConverter<GeoDecayFunction>
+internal sealed partial class GeoDecayFunctionConverter : System.Text.Json.Serialization.JsonConverter<GeoDecayFunction>
 {
-	public override GeoDecayFunction Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		var variant = new GeoDecayFunction();
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
-		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
-			{
-				var property = reader.GetString();
-				if (property == "multi_value_mode")
-				{
-					variant.MultiValueMode = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MultiValueMode?>(ref reader, options);
-					continue;
-				}
-
-				variant.Field = property;
-				reader.Read();
-				variant.Placement = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.DecayPlacement<Elastic.Clients.Elasticsearch.Serverless.GeoLocation, string>>(ref reader, options);
-			}
-		}
-
-		return variant;
-	}
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropPlacement = System.Text.Json.JsonEncodedText.Encode("placement");
+	private static readonly System.Text.Json.JsonEncodedText PropMultiValueMode = System.Text.Json.JsonEncodedText.Encode("multi_value_mode");
 
-	public override void Write(Utf8JsonWriter writer, GeoDecayFunction value, JsonSerializerOptions options)
+	public override GeoDecayFunction Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		writer.WriteStartObject();
-		if (value.Field is not null && value.Placement is not null)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Field> propField = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.DecayPlacement<Elastic.Clients.Elasticsearch.Serverless.GeoLocation, string>> propPlacement = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MultiValueMode?> propMultiValueMode = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (!options.TryGetClientSettings(out var settings))
+			if (propMultiValueMode.TryRead(ref reader, options, PropMultiValueMode))
 			{
-				ThrowHelper.ThrowJsonExceptionForMissingSettings();
+				continue;
 			}
 
-			var propertyName = settings.Inferrer.Field(value.Field);
-			writer.WritePropertyName(propertyName);
-			JsonSerializer.Serialize(writer, value.Placement, options);
+			propField.Initialized = propPlacement.Initialized = true;
+			reader.ReadProperty(options, out propField.Value, out propPlacement.Value);
 		}
 
-		if (value.MultiValueMode is not null)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GeoDecayFunction
 		{
-			writer.WritePropertyName("multi_value_mode");
-			JsonSerializer.Serialize(writer, value.MultiValueMode, options);
-		}
+			Field = propField.Value
+,
+			Placement = propPlacement.Value
+,
+			MultiValueMode = propMultiValueMode.Value
+		};
+	}
 
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GeoDecayFunction value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropMultiValueMode, value.MultiValueMode);
+		writer.WriteProperty(options, value.Field, value.Placement);
 		writer.WriteEndObject();
 	}
 }
 
 [JsonConverter(typeof(GeoDecayFunctionConverter))]
-public sealed partial class GeoDecayFunction
+public sealed partial class GeoDecayFunction : IDecayFunction
 {
 	public Elastic.Clients.Elasticsearch.Serverless.Field Field { get; set; }
 
@@ -91,6 +83,8 @@ public sealed partial class GeoDecayFunction
 	/// </summary>
 	public Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MultiValueMode? MultiValueMode { get; set; }
 	public Elastic.Clients.Elasticsearch.Serverless.QueryDsl.DecayPlacement<Elastic.Clients.Elasticsearch.Serverless.GeoLocation, string> Placement { get; set; }
+
+	public string Type => "geodecayfunction";
 }
 
 public sealed partial class GeoDecayFunctionDescriptor<TDocument> : SerializableDescriptor<GeoDecayFunctionDescriptor<TDocument>>
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/GeoDistanceFeatureQuery.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/GeoDistanceFeatureQuery.g.cs
index 553ecc6bce7..b7a9f490725 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/GeoDistanceFeatureQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/GeoDistanceFeatureQuery.g.cs
@@ -27,7 +27,7 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.QueryDsl;
 
-public sealed partial class GeoDistanceFeatureQuery
+public sealed partial class GeoDistanceFeatureQuery : IDistanceFeatureQuery
 {
 	/// <summary>
 	/// <para>
@@ -72,6 +72,9 @@ public sealed partial class GeoDistanceFeatureQuery
 	public string Pivot { get; set; }
 	[JsonInclude, JsonPropertyName("_name")]
 	public string? QueryName { get; set; }
+
+	[JsonInclude, JsonPropertyName("")]
+	public string Type => "geodistancefeaturequery";
 }
 
 public sealed partial class GeoDistanceFeatureQueryDescriptor<TDocument> : SerializableDescriptor<GeoDistanceFeatureQueryDescriptor<TDocument>>
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/GeoDistanceQuery.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/GeoDistanceQuery.g.cs
index 2b3714fabf1..bd32df01021 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/GeoDistanceQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/GeoDistanceQuery.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,110 +28,95 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.QueryDsl;
 
-internal sealed partial class GeoDistanceQueryConverter : JsonConverter<GeoDistanceQuery>
+internal sealed partial class GeoDistanceQueryConverter : System.Text.Json.Serialization.JsonConverter<GeoDistanceQuery>
 {
-	public override GeoDistanceQuery Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropLocation = System.Text.Json.JsonEncodedText.Encode("location");
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropDistance = System.Text.Json.JsonEncodedText.Encode("distance");
+	private static readonly System.Text.Json.JsonEncodedText PropDistanceType = System.Text.Json.JsonEncodedText.Encode("distance_type");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreUnmapped = System.Text.Json.JsonEncodedText.Encode("ignore_unmapped");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryName = System.Text.Json.JsonEncodedText.Encode("_name");
+	private static readonly System.Text.Json.JsonEncodedText PropValidationMethod = System.Text.Json.JsonEncodedText.Encode("validation_method");
+
+	public override GeoDistanceQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		var variant = new GeoDistanceQuery();
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Field> propField = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.GeoLocation> propLocation = default;
+		LocalJsonProperty<float?> propBoost = default;
+		LocalJsonProperty<string> propDistance = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.GeoDistanceType?> propDistanceType = default;
+		LocalJsonProperty<bool?> propIgnoreUnmapped = default;
+		LocalJsonProperty<string?> propQueryName = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.GeoValidationMethod?> propValidationMethod = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propBoost.TryRead(ref reader, options, PropBoost))
 			{
-				var property = reader.GetString();
-				if (property == "boost")
-				{
-					variant.Boost = JsonSerializer.Deserialize<float?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "distance")
-				{
-					variant.Distance = JsonSerializer.Deserialize<string>(ref reader, options);
-					continue;
-				}
-
-				if (property == "distance_type")
-				{
-					variant.DistanceType = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.GeoDistanceType?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "ignore_unmapped")
-				{
-					variant.IgnoreUnmapped = JsonSerializer.Deserialize<bool?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "_name")
-				{
-					variant.QueryName = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "validation_method")
-				{
-					variant.ValidationMethod = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.GeoValidationMethod?>(ref reader, options);
-					continue;
-				}
-
-				variant.Field = property;
-				reader.Read();
-				variant.Location = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.GeoLocation>(ref reader, options);
+				continue;
 			}
-		}
-
-		return variant;
-	}
 
-	public override void Write(Utf8JsonWriter writer, GeoDistanceQuery value, JsonSerializerOptions options)
-	{
-		writer.WriteStartObject();
-		if (value.Field is not null && value.Location is not null)
-		{
-			if (!options.TryGetClientSettings(out var settings))
+			if (propDistance.TryRead(ref reader, options, PropDistance))
 			{
-				ThrowHelper.ThrowJsonExceptionForMissingSettings();
+				continue;
 			}
 
-			var propertyName = settings.Inferrer.Field(value.Field);
-			writer.WritePropertyName(propertyName);
-			JsonSerializer.Serialize(writer, value.Location, options);
-		}
+			if (propDistanceType.TryRead(ref reader, options, PropDistanceType))
+			{
+				continue;
+			}
 
-		if (value.Boost.HasValue)
-		{
-			writer.WritePropertyName("boost");
-			writer.WriteNumberValue(value.Boost.Value);
-		}
+			if (propIgnoreUnmapped.TryRead(ref reader, options, PropIgnoreUnmapped))
+			{
+				continue;
+			}
 
-		writer.WritePropertyName("distance");
-		writer.WriteStringValue(value.Distance);
-		if (value.DistanceType is not null)
-		{
-			writer.WritePropertyName("distance_type");
-			JsonSerializer.Serialize(writer, value.DistanceType, options);
-		}
+			if (propQueryName.TryRead(ref reader, options, PropQueryName))
+			{
+				continue;
+			}
 
-		if (value.IgnoreUnmapped.HasValue)
-		{
-			writer.WritePropertyName("ignore_unmapped");
-			writer.WriteBooleanValue(value.IgnoreUnmapped.Value);
-		}
+			if (propValidationMethod.TryRead(ref reader, options, PropValidationMethod))
+			{
+				continue;
+			}
 
-		if (!string.IsNullOrEmpty(value.QueryName))
-		{
-			writer.WritePropertyName("_name");
-			writer.WriteStringValue(value.QueryName);
+			propField.Initialized = propLocation.Initialized = true;
+			reader.ReadProperty(options, out propField.Value, out propLocation.Value);
 		}
 
-		if (value.ValidationMethod is not null)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GeoDistanceQuery
 		{
-			writer.WritePropertyName("validation_method");
-			JsonSerializer.Serialize(writer, value.ValidationMethod, options);
-		}
+			Field = propField.Value
+,
+			Location = propLocation.Value
+,
+			Boost = propBoost.Value
+,
+			Distance = propDistance.Value
+,
+			DistanceType = propDistanceType.Value
+,
+			IgnoreUnmapped = propIgnoreUnmapped.Value
+,
+			QueryName = propQueryName.Value
+,
+			ValidationMethod = propValidationMethod.Value
+		};
+	}
 
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GeoDistanceQuery value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropDistance, value.Distance);
+		writer.WriteProperty(options, PropDistanceType, value.DistanceType);
+		writer.WriteProperty(options, PropIgnoreUnmapped, value.IgnoreUnmapped);
+		writer.WriteProperty(options, PropQueryName, value.QueryName);
+		writer.WriteProperty(options, PropValidationMethod, value.ValidationMethod);
+		writer.WriteProperty(options, value.Field, value.Location);
 		writer.WriteEndObject();
 	}
 }
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/GeoShapeQuery.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/GeoShapeQuery.g.cs
index 7bd66d932fe..d0b67c442c8 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/GeoShapeQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/GeoShapeQuery.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,78 +28,65 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.QueryDsl;
 
-internal sealed partial class GeoShapeQueryConverter : JsonConverter<GeoShapeQuery>
+internal sealed partial class GeoShapeQueryConverter : System.Text.Json.Serialization.JsonConverter<GeoShapeQuery>
 {
-	public override GeoShapeQuery Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropShape = System.Text.Json.JsonEncodedText.Encode("shape");
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreUnmapped = System.Text.Json.JsonEncodedText.Encode("ignore_unmapped");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryName = System.Text.Json.JsonEncodedText.Encode("_name");
+
+	public override GeoShapeQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		var variant = new GeoShapeQuery();
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Field> propField = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.GeoShapeFieldQuery> propShape = default;
+		LocalJsonProperty<float?> propBoost = default;
+		LocalJsonProperty<bool?> propIgnoreUnmapped = default;
+		LocalJsonProperty<string?> propQueryName = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propBoost.TryRead(ref reader, options, PropBoost))
 			{
-				var property = reader.GetString();
-				if (property == "boost")
-				{
-					variant.Boost = JsonSerializer.Deserialize<float?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "ignore_unmapped")
-				{
-					variant.IgnoreUnmapped = JsonSerializer.Deserialize<bool?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "_name")
-				{
-					variant.QueryName = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				variant.Field = property;
-				reader.Read();
-				variant.Shape = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.GeoShapeFieldQuery>(ref reader, options);
+				continue;
 			}
-		}
-
-		return variant;
-	}
 
-	public override void Write(Utf8JsonWriter writer, GeoShapeQuery value, JsonSerializerOptions options)
-	{
-		writer.WriteStartObject();
-		if (value.Field is not null && value.Shape is not null)
-		{
-			if (!options.TryGetClientSettings(out var settings))
+			if (propIgnoreUnmapped.TryRead(ref reader, options, PropIgnoreUnmapped))
 			{
-				ThrowHelper.ThrowJsonExceptionForMissingSettings();
+				continue;
 			}
 
-			var propertyName = settings.Inferrer.Field(value.Field);
-			writer.WritePropertyName(propertyName);
-			JsonSerializer.Serialize(writer, value.Shape, options);
-		}
-
-		if (value.Boost.HasValue)
-		{
-			writer.WritePropertyName("boost");
-			writer.WriteNumberValue(value.Boost.Value);
-		}
+			if (propQueryName.TryRead(ref reader, options, PropQueryName))
+			{
+				continue;
+			}
 
-		if (value.IgnoreUnmapped.HasValue)
-		{
-			writer.WritePropertyName("ignore_unmapped");
-			writer.WriteBooleanValue(value.IgnoreUnmapped.Value);
+			propField.Initialized = propShape.Initialized = true;
+			reader.ReadProperty(options, out propField.Value, out propShape.Value);
 		}
 
-		if (!string.IsNullOrEmpty(value.QueryName))
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GeoShapeQuery
 		{
-			writer.WritePropertyName("_name");
-			writer.WriteStringValue(value.QueryName);
-		}
+			Field = propField.Value
+,
+			Shape = propShape.Value
+,
+			Boost = propBoost.Value
+,
+			IgnoreUnmapped = propIgnoreUnmapped.Value
+,
+			QueryName = propQueryName.Value
+		};
+	}
 
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GeoShapeQuery value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropIgnoreUnmapped, value.IgnoreUnmapped);
+		writer.WriteProperty(options, PropQueryName, value.QueryName);
+		writer.WriteProperty(options, value.Field, value.Shape);
 		writer.WriteEndObject();
 	}
 }
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/Intervals.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/Intervals.g.cs
index 2fba17d43c9..1e49d6a418e 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/Intervals.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/Intervals.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -39,12 +40,16 @@ internal Intervals(string variantName, object variant)
 			throw new ArgumentNullException(nameof(variant));
 		if (string.IsNullOrWhiteSpace(variantName))
 			throw new ArgumentException("Variant name must not be empty or whitespace.");
-		VariantName = variantName;
+		VariantType = variantName;
 		Variant = variant;
 	}
 
-	internal object Variant { get; }
-	internal string VariantName { get; }
+	internal Intervals()
+	{
+	}
+
+	public object Variant { get; internal set; }
+	public string VariantType { get; internal set; }
 
 	public static Intervals AllOf(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IntervalsAllOf intervalsAllOf) => new Intervals("all_of", intervalsAllOf);
 	public static Intervals AnyOf(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IntervalsAnyOf intervalsAnyOf) => new Intervals("any_of", intervalsAnyOf);
@@ -66,107 +71,104 @@ public bool TryGet<T>([NotNullWhen(true)] out T? result) where T : class
 	}
 }
 
-internal sealed partial class IntervalsConverter : JsonConverter<Intervals>
+internal sealed partial class IntervalsConverter : System.Text.Json.Serialization.JsonConverter<Intervals>
 {
-	public override Intervals Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText VariantAllOf = System.Text.Json.JsonEncodedText.Encode("all_of");
+	private static readonly System.Text.Json.JsonEncodedText VariantAnyOf = System.Text.Json.JsonEncodedText.Encode("any_of");
+	private static readonly System.Text.Json.JsonEncodedText VariantFuzzy = System.Text.Json.JsonEncodedText.Encode("fuzzy");
+	private static readonly System.Text.Json.JsonEncodedText VariantMatch = System.Text.Json.JsonEncodedText.Encode("match");
+	private static readonly System.Text.Json.JsonEncodedText VariantPrefix = System.Text.Json.JsonEncodedText.Encode("prefix");
+	private static readonly System.Text.Json.JsonEncodedText VariantWildcard = System.Text.Json.JsonEncodedText.Encode("wildcard");
+
+	public override Intervals Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		var variantType = string.Empty;
+		object? variant = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			throw new JsonException("Expected start token.");
-		}
-
-		object? variantValue = default;
-		string? variantNameValue = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
-		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token.");
-			}
-
-			if (reader.TokenType != JsonTokenType.PropertyName)
+			if (reader.ValueTextEquals(VariantAllOf))
 			{
-				throw new JsonException("Expected a property name token representing the name of an Elasticsearch field.");
-			}
-
-			var propertyName = reader.GetString();
-			reader.Read();
-			if (propertyName == "all_of")
-			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IntervalsAllOf?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantAllOf.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IntervalsAllOf?>(options);
 				continue;
 			}
 
-			if (propertyName == "any_of")
+			if (reader.ValueTextEquals(VariantAnyOf))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IntervalsAnyOf?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantAnyOf.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IntervalsAnyOf?>(options);
 				continue;
 			}
 
-			if (propertyName == "fuzzy")
+			if (reader.ValueTextEquals(VariantFuzzy))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IntervalsFuzzy?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantFuzzy.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IntervalsFuzzy?>(options);
 				continue;
 			}
 
-			if (propertyName == "match")
+			if (reader.ValueTextEquals(VariantMatch))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IntervalsMatch?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantMatch.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IntervalsMatch?>(options);
 				continue;
 			}
 
-			if (propertyName == "prefix")
+			if (reader.ValueTextEquals(VariantPrefix))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IntervalsPrefix?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantPrefix.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IntervalsPrefix?>(options);
 				continue;
 			}
 
-			if (propertyName == "wildcard")
+			if (reader.ValueTextEquals(VariantWildcard))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IntervalsWildcard?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantWildcard.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IntervalsWildcard?>(options);
 				continue;
 			}
 
-			throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'Intervals' from the response.");
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		var result = new Intervals(variantNameValue, variantValue);
-		return result;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new Intervals { VariantType = variantType, Variant = variant };
 	}
 
-	public override void Write(Utf8JsonWriter writer, Intervals value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, Intervals value, System.Text.Json.JsonSerializerOptions options)
 	{
 		writer.WriteStartObject();
-		if (value.VariantName is not null && value.Variant is not null)
+		switch (value.VariantType)
 		{
-			writer.WritePropertyName(value.VariantName);
-			switch (value.VariantName)
-			{
-				case "all_of":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IntervalsAllOf>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IntervalsAllOf)value.Variant, options);
-					break;
-				case "any_of":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IntervalsAnyOf>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IntervalsAnyOf)value.Variant, options);
-					break;
-				case "fuzzy":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IntervalsFuzzy>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IntervalsFuzzy)value.Variant, options);
-					break;
-				case "match":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IntervalsMatch>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IntervalsMatch)value.Variant, options);
-					break;
-				case "prefix":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IntervalsPrefix>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IntervalsPrefix)value.Variant, options);
-					break;
-				case "wildcard":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IntervalsWildcard>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IntervalsWildcard)value.Variant, options);
-					break;
-			}
+			case "":
+				break;
+			case "all_of":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IntervalsAllOf?)value.Variant);
+				break;
+			case "any_of":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IntervalsAnyOf?)value.Variant);
+				break;
+			case "fuzzy":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IntervalsFuzzy?)value.Variant);
+				break;
+			case "match":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IntervalsMatch?)value.Variant);
+				break;
+			case "prefix":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IntervalsPrefix?)value.Variant);
+				break;
+			case "wildcard":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IntervalsWildcard?)value.Variant);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.VariantType}' is not supported for type '{nameof(Intervals)}'.");
 		}
 
 		writer.WriteEndObject();
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/IntervalsFilter.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/IntervalsFilter.g.cs
index 787ad340e5d..e9534995e6f 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/IntervalsFilter.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/IntervalsFilter.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -39,12 +40,16 @@ internal IntervalsFilter(string variantName, object variant)
 			throw new ArgumentNullException(nameof(variant));
 		if (string.IsNullOrWhiteSpace(variantName))
 			throw new ArgumentException("Variant name must not be empty or whitespace.");
-		VariantName = variantName;
+		VariantType = variantName;
 		Variant = variant;
 	}
 
-	internal object Variant { get; }
-	internal string VariantName { get; }
+	internal IntervalsFilter()
+	{
+	}
+
+	public object Variant { get; internal set; }
+	public string VariantType { get; internal set; }
 
 	public static IntervalsFilter After(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Intervals intervalsContainer) => new IntervalsFilter("after", intervalsContainer);
 	public static IntervalsFilter Before(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Intervals intervalsContainer) => new IntervalsFilter("before", intervalsContainer);
@@ -69,137 +74,140 @@ public bool TryGet<T>([NotNullWhen(true)] out T? result) where T : class
 	}
 }
 
-internal sealed partial class IntervalsFilterConverter : JsonConverter<IntervalsFilter>
+internal sealed partial class IntervalsFilterConverter : System.Text.Json.Serialization.JsonConverter<IntervalsFilter>
 {
-	public override IntervalsFilter Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText VariantAfter = System.Text.Json.JsonEncodedText.Encode("after");
+	private static readonly System.Text.Json.JsonEncodedText VariantBefore = System.Text.Json.JsonEncodedText.Encode("before");
+	private static readonly System.Text.Json.JsonEncodedText VariantContainedBy = System.Text.Json.JsonEncodedText.Encode("contained_by");
+	private static readonly System.Text.Json.JsonEncodedText VariantContaining = System.Text.Json.JsonEncodedText.Encode("containing");
+	private static readonly System.Text.Json.JsonEncodedText VariantNotContainedBy = System.Text.Json.JsonEncodedText.Encode("not_contained_by");
+	private static readonly System.Text.Json.JsonEncodedText VariantNotContaining = System.Text.Json.JsonEncodedText.Encode("not_containing");
+	private static readonly System.Text.Json.JsonEncodedText VariantNotOverlapping = System.Text.Json.JsonEncodedText.Encode("not_overlapping");
+	private static readonly System.Text.Json.JsonEncodedText VariantOverlapping = System.Text.Json.JsonEncodedText.Encode("overlapping");
+	private static readonly System.Text.Json.JsonEncodedText VariantScript = System.Text.Json.JsonEncodedText.Encode("script");
+
+	public override IntervalsFilter Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		var variantType = string.Empty;
+		object? variant = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			throw new JsonException("Expected start token.");
-		}
-
-		object? variantValue = default;
-		string? variantNameValue = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
-		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token.");
-			}
-
-			if (reader.TokenType != JsonTokenType.PropertyName)
+			if (reader.ValueTextEquals(VariantAfter))
 			{
-				throw new JsonException("Expected a property name token representing the name of an Elasticsearch field.");
-			}
-
-			var propertyName = reader.GetString();
-			reader.Read();
-			if (propertyName == "after")
-			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Intervals?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantAfter.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Intervals?>(options);
 				continue;
 			}
 
-			if (propertyName == "before")
+			if (reader.ValueTextEquals(VariantBefore))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Intervals?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantBefore.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Intervals?>(options);
 				continue;
 			}
 
-			if (propertyName == "contained_by")
+			if (reader.ValueTextEquals(VariantContainedBy))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Intervals?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantContainedBy.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Intervals?>(options);
 				continue;
 			}
 
-			if (propertyName == "containing")
+			if (reader.ValueTextEquals(VariantContaining))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Intervals?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantContaining.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Intervals?>(options);
 				continue;
 			}
 
-			if (propertyName == "not_contained_by")
+			if (reader.ValueTextEquals(VariantNotContainedBy))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Intervals?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantNotContainedBy.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Intervals?>(options);
 				continue;
 			}
 
-			if (propertyName == "not_containing")
+			if (reader.ValueTextEquals(VariantNotContaining))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Intervals?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantNotContaining.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Intervals?>(options);
 				continue;
 			}
 
-			if (propertyName == "not_overlapping")
+			if (reader.ValueTextEquals(VariantNotOverlapping))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Intervals?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantNotOverlapping.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Intervals?>(options);
 				continue;
 			}
 
-			if (propertyName == "overlapping")
+			if (reader.ValueTextEquals(VariantOverlapping))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Intervals?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantOverlapping.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Intervals?>(options);
 				continue;
 			}
 
-			if (propertyName == "script")
+			if (reader.ValueTextEquals(VariantScript))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Script?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantScript.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Script?>(options);
 				continue;
 			}
 
-			throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'IntervalsFilter' from the response.");
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		var result = new IntervalsFilter(variantNameValue, variantValue);
-		return result;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new IntervalsFilter { VariantType = variantType, Variant = variant };
 	}
 
-	public override void Write(Utf8JsonWriter writer, IntervalsFilter value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IntervalsFilter value, System.Text.Json.JsonSerializerOptions options)
 	{
 		writer.WriteStartObject();
-		if (value.VariantName is not null && value.Variant is not null)
+		switch (value.VariantType)
 		{
-			writer.WritePropertyName(value.VariantName);
-			switch (value.VariantName)
-			{
-				case "after":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Intervals>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Intervals)value.Variant, options);
-					break;
-				case "before":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Intervals>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Intervals)value.Variant, options);
-					break;
-				case "contained_by":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Intervals>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Intervals)value.Variant, options);
-					break;
-				case "containing":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Intervals>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Intervals)value.Variant, options);
-					break;
-				case "not_contained_by":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Intervals>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Intervals)value.Variant, options);
-					break;
-				case "not_containing":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Intervals>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Intervals)value.Variant, options);
-					break;
-				case "not_overlapping":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Intervals>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Intervals)value.Variant, options);
-					break;
-				case "overlapping":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Intervals>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Intervals)value.Variant, options);
-					break;
-				case "script":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Script>(writer, (Elastic.Clients.Elasticsearch.Serverless.Script)value.Variant, options);
-					break;
-			}
+			case "":
+				break;
+			case "after":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Intervals?)value.Variant);
+				break;
+			case "before":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Intervals?)value.Variant);
+				break;
+			case "contained_by":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Intervals?)value.Variant);
+				break;
+			case "containing":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Intervals?)value.Variant);
+				break;
+			case "not_contained_by":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Intervals?)value.Variant);
+				break;
+			case "not_containing":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Intervals?)value.Variant);
+				break;
+			case "not_overlapping":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Intervals?)value.Variant);
+				break;
+			case "overlapping":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Intervals?)value.Variant);
+				break;
+			case "script":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Script?)value.Variant);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.VariantType}' is not supported for type '{nameof(IntervalsFilter)}'.");
 		}
 
 		writer.WriteEndObject();
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/IntervalsQuery.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/IntervalsQuery.g.cs
index 58eac78e84c..d65da61bab7 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/IntervalsQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/IntervalsQuery.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -39,12 +40,16 @@ internal IntervalsQuery(string variantName, object variant)
 			throw new ArgumentNullException(nameof(variant));
 		if (string.IsNullOrWhiteSpace(variantName))
 			throw new ArgumentException("Variant name must not be empty or whitespace.");
-		VariantName = variantName;
+		VariantType = variantName;
 		Variant = variant;
 	}
 
-	internal object Variant { get; }
-	internal string VariantName { get; }
+	internal IntervalsQuery()
+	{
+	}
+
+	public object Variant { get; internal set; }
+	public string VariantType { get; internal set; }
 
 	public static IntervalsQuery AllOf(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IntervalsAllOf intervalsAllOf) => new IntervalsQuery("all_of", intervalsAllOf);
 	public static IntervalsQuery AnyOf(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IntervalsAnyOf intervalsAnyOf) => new IntervalsQuery("any_of", intervalsAnyOf);
@@ -81,149 +86,139 @@ public bool TryGet<T>([NotNullWhen(true)] out T? result) where T : class
 	}
 }
 
-internal sealed partial class IntervalsQueryConverter : JsonConverter<IntervalsQuery>
+internal sealed partial class IntervalsQueryConverter : System.Text.Json.Serialization.JsonConverter<IntervalsQuery>
 {
-	public override IntervalsQuery Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryName = System.Text.Json.JsonEncodedText.Encode("_name");
+	private static readonly System.Text.Json.JsonEncodedText VariantAllOf = System.Text.Json.JsonEncodedText.Encode("all_of");
+	private static readonly System.Text.Json.JsonEncodedText VariantAnyOf = System.Text.Json.JsonEncodedText.Encode("any_of");
+	private static readonly System.Text.Json.JsonEncodedText VariantFuzzy = System.Text.Json.JsonEncodedText.Encode("fuzzy");
+	private static readonly System.Text.Json.JsonEncodedText VariantMatch = System.Text.Json.JsonEncodedText.Encode("match");
+	private static readonly System.Text.Json.JsonEncodedText VariantPrefix = System.Text.Json.JsonEncodedText.Encode("prefix");
+	private static readonly System.Text.Json.JsonEncodedText VariantWildcard = System.Text.Json.JsonEncodedText.Encode("wildcard");
+
+	public override IntervalsQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-		{
-			throw new JsonException("Expected start token.");
-		}
-
-		reader.Read();
-		var fieldName = reader.GetString();
-		reader.Read();
-		object? variantValue = default;
-		string? variantNameValue = default;
-		float? boostValue = default;
-		string? queryNameValue = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<float?> propBoost = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Field> propField = default;
+		LocalJsonProperty<string?> propQueryName = default;
+		var variantType = string.Empty;
+		object? variant = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
+			if (propBoost.TryRead(ref reader, options, PropBoost))
 			{
-				throw new JsonException("Expected a property name token.");
-			}
-
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token representing the name of an Elasticsearch field.");
+				continue;
 			}
 
-			var propertyName = reader.GetString();
-			reader.Read();
-			if (propertyName == "boost")
+			if (propField.TryRead(ref reader, options, PropField))
 			{
-				boostValue = JsonSerializer.Deserialize<float?>(ref reader, options);
 				continue;
 			}
 
-			if (propertyName == "_name")
+			if (propQueryName.TryRead(ref reader, options, PropQueryName))
 			{
-				queryNameValue = JsonSerializer.Deserialize<string?>(ref reader, options);
 				continue;
 			}
 
-			if (propertyName == "all_of")
+			if (reader.ValueTextEquals(VariantAllOf))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IntervalsAllOf?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantAllOf.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IntervalsAllOf?>(options);
 				continue;
 			}
 
-			if (propertyName == "any_of")
+			if (reader.ValueTextEquals(VariantAnyOf))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IntervalsAnyOf?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantAnyOf.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IntervalsAnyOf?>(options);
 				continue;
 			}
 
-			if (propertyName == "fuzzy")
+			if (reader.ValueTextEquals(VariantFuzzy))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IntervalsFuzzy?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantFuzzy.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IntervalsFuzzy?>(options);
 				continue;
 			}
 
-			if (propertyName == "match")
+			if (reader.ValueTextEquals(VariantMatch))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IntervalsMatch?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantMatch.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IntervalsMatch?>(options);
 				continue;
 			}
 
-			if (propertyName == "prefix")
+			if (reader.ValueTextEquals(VariantPrefix))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IntervalsPrefix?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantPrefix.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IntervalsPrefix?>(options);
 				continue;
 			}
 
-			if (propertyName == "wildcard")
+			if (reader.ValueTextEquals(VariantWildcard))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IntervalsWildcard?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantWildcard.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IntervalsWildcard?>(options);
 				continue;
 			}
 
-			throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'IntervalsQuery' from the response.");
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		reader.Read();
-		var result = new IntervalsQuery(variantNameValue, variantValue);
-		result.Boost = boostValue;
-		result.Field = fieldName;
-		result.QueryName = queryNameValue;
-		return result;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new IntervalsQuery
+		{
+			VariantType = variantType,
+			Variant = variant,
+			Boost = propBoost.Value
+	,
+			Field = propField.Value
+	,
+			QueryName = propQueryName.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, IntervalsQuery value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IntervalsQuery value, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (value.Field is null)
-			throw new JsonException("Unable to serialize IntervalsQuery because the `Field` property is not set. Field name queries must include a valid field name.");
-		if (!options.TryGetClientSettings(out var settings))
-			throw new JsonException("Unable to retrieve client settings required to infer field.");
-		writer.WriteStartObject();
-		writer.WritePropertyName(settings.Inferrer.Field(value.Field));
 		writer.WriteStartObject();
-		if (value.Boost.HasValue)
+		switch (value.VariantType)
 		{
-			writer.WritePropertyName("boost");
-			writer.WriteNumberValue(value.Boost.Value);
-		}
-
-		if (!string.IsNullOrEmpty(value.QueryName))
-		{
-			writer.WritePropertyName("_name");
-			writer.WriteStringValue(value.QueryName);
+			case "":
+				break;
+			case "all_of":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IntervalsAllOf?)value.Variant);
+				break;
+			case "any_of":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IntervalsAnyOf?)value.Variant);
+				break;
+			case "fuzzy":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IntervalsFuzzy?)value.Variant);
+				break;
+			case "match":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IntervalsMatch?)value.Variant);
+				break;
+			case "prefix":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IntervalsPrefix?)value.Variant);
+				break;
+			case "wildcard":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IntervalsWildcard?)value.Variant);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.VariantType}' is not supported for type '{nameof(IntervalsQuery)}'.");
 		}
 
-		if (value.VariantName is not null && value.Variant is not null)
-		{
-			writer.WritePropertyName(value.VariantName);
-			switch (value.VariantName)
-			{
-				case "all_of":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IntervalsAllOf>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IntervalsAllOf)value.Variant, options);
-					break;
-				case "any_of":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IntervalsAnyOf>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IntervalsAnyOf)value.Variant, options);
-					break;
-				case "fuzzy":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IntervalsFuzzy>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IntervalsFuzzy)value.Variant, options);
-					break;
-				case "match":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IntervalsMatch>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IntervalsMatch)value.Variant, options);
-					break;
-				case "prefix":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IntervalsPrefix>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IntervalsPrefix)value.Variant, options);
-					break;
-				case "wildcard":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IntervalsWildcard>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IntervalsWildcard)value.Variant, options);
-					break;
-			}
-		}
-
-		writer.WriteEndObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropField, value.Field);
+		writer.WriteProperty(options, PropQueryName, value.QueryName);
 		writer.WriteEndObject();
 	}
 }
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/LikeDocument.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/LikeDocument.g.cs
index 366d3423770..ab69a4ff082 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/LikeDocument.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/LikeDocument.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,110 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.QueryDsl;
 
+internal sealed partial class LikeDocumentConverter : System.Text.Json.Serialization.JsonConverter<LikeDocument>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropDoc = System.Text.Json.JsonEncodedText.Encode("doc");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("_id");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("_index");
+	private static readonly System.Text.Json.JsonEncodedText PropPerFieldAnalyzer = System.Text.Json.JsonEncodedText.Encode("per_field_analyzer");
+	private static readonly System.Text.Json.JsonEncodedText PropRouting = System.Text.Json.JsonEncodedText.Encode("routing");
+	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("version");
+	private static readonly System.Text.Json.JsonEncodedText PropVersionType = System.Text.Json.JsonEncodedText.Encode("version_type");
+
+	public override LikeDocument Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<object?> propDoc = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Fields?> propFields = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Id?> propId = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.IndexName?> propIndex = default;
+		LocalJsonProperty<IDictionary<Elastic.Clients.Elasticsearch.Serverless.Field, string>?> propPerFieldAnalyzer = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Routing?> propRouting = default;
+		LocalJsonProperty<long?> propVersion = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.VersionType?> propVersionType = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propDoc.TryRead(ref reader, options, PropDoc))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields, typeof(FieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propId.TryRead(ref reader, options, PropId))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propPerFieldAnalyzer.TryRead(ref reader, options, PropPerFieldAnalyzer))
+			{
+				continue;
+			}
+
+			if (propRouting.TryRead(ref reader, options, PropRouting))
+			{
+				continue;
+			}
+
+			if (propVersion.TryRead(ref reader, options, PropVersion))
+			{
+				continue;
+			}
+
+			if (propVersionType.TryRead(ref reader, options, PropVersionType))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new LikeDocument
+		{
+			Doc = propDoc.Value
+,
+			Fields = propFields.Value
+,
+			Id = propId.Value
+,
+			Index = propIndex.Value
+,
+			PerFieldAnalyzer = propPerFieldAnalyzer.Value
+,
+			Routing = propRouting.Value
+,
+			Version = propVersion.Value
+,
+			VersionType = propVersionType.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, LikeDocument value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDoc, value.Doc);
+		writer.WriteProperty(options, PropFields, value.Fields, typeof(FieldsMarker));
+		writer.WriteProperty(options, PropId, value.Id);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropPerFieldAnalyzer, value.PerFieldAnalyzer);
+		writer.WriteProperty(options, PropRouting, value.Routing);
+		writer.WriteProperty(options, PropVersion, value.Version);
+		writer.WriteProperty(options, PropVersionType, value.VersionType);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(LikeDocumentConverter))]
 public sealed partial class LikeDocument
 {
 	/// <summary>
@@ -34,10 +139,7 @@ public sealed partial class LikeDocument
 	/// A document not present in the index.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("doc")]
 	public object? Doc { get; set; }
-	[JsonInclude, JsonPropertyName("fields")]
-	[JsonConverter(typeof(FieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Serverless.Fields? Fields { get; set; }
 
 	/// <summary>
@@ -45,7 +147,6 @@ public sealed partial class LikeDocument
 	/// ID of a document.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("_id")]
 	public Elastic.Clients.Elasticsearch.Serverless.Id? Id { get; set; }
 
 	/// <summary>
@@ -53,7 +154,6 @@ public sealed partial class LikeDocument
 	/// Index of a document.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("_index")]
 	public Elastic.Clients.Elasticsearch.Serverless.IndexName? Index { get; set; }
 
 	/// <summary>
@@ -61,13 +161,9 @@ public sealed partial class LikeDocument
 	/// Overrides the default analyzer.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("per_field_analyzer")]
 	public IDictionary<Elastic.Clients.Elasticsearch.Serverless.Field, string>? PerFieldAnalyzer { get; set; }
-	[JsonInclude, JsonPropertyName("routing")]
 	public Elastic.Clients.Elasticsearch.Serverless.Routing? Routing { get; set; }
-	[JsonInclude, JsonPropertyName("version")]
 	public long? Version { get; set; }
-	[JsonInclude, JsonPropertyName("version_type")]
 	public Elastic.Clients.Elasticsearch.Serverless.VersionType? VersionType { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/MatchBoolPrefixQuery.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/MatchBoolPrefixQuery.g.cs
index d9abed4ea45..30f93bacc18 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/MatchBoolPrefixQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/MatchBoolPrefixQuery.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,164 +28,155 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.QueryDsl;
 
-internal sealed partial class MatchBoolPrefixQueryConverter : JsonConverter<MatchBoolPrefixQuery>
+internal sealed partial class MatchBoolPrefixQueryConverter : System.Text.Json.Serialization.JsonConverter<MatchBoolPrefixQuery>
 {
-	public override MatchBoolPrefixQuery Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
+	private static readonly System.Text.Json.JsonEncodedText PropAnalyzer = System.Text.Json.JsonEncodedText.Encode("analyzer");
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropFuzziness = System.Text.Json.JsonEncodedText.Encode("fuzziness");
+	private static readonly System.Text.Json.JsonEncodedText PropFuzzyRewrite = System.Text.Json.JsonEncodedText.Encode("fuzzy_rewrite");
+	private static readonly System.Text.Json.JsonEncodedText PropFuzzyTranspositions = System.Text.Json.JsonEncodedText.Encode("fuzzy_transpositions");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxExpansions = System.Text.Json.JsonEncodedText.Encode("max_expansions");
+	private static readonly System.Text.Json.JsonEncodedText PropMinimumShouldMatch = System.Text.Json.JsonEncodedText.Encode("minimum_should_match");
+	private static readonly System.Text.Json.JsonEncodedText PropOperator = System.Text.Json.JsonEncodedText.Encode("operator");
+	private static readonly System.Text.Json.JsonEncodedText PropPrefixLength = System.Text.Json.JsonEncodedText.Encode("prefix_length");
+	private static readonly System.Text.Json.JsonEncodedText PropQuery = System.Text.Json.JsonEncodedText.Encode("query");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryName = System.Text.Json.JsonEncodedText.Encode("_name");
+
+	public override MatchBoolPrefixQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Field> propField = default;
 		reader.Read();
-		var fieldName = reader.GetString();
+		propField.Value = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Field>(options);
+		propField.Initialized = true;
 		reader.Read();
-		var variant = new MatchBoolPrefixQuery(fieldName);
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		if (reader.TokenType is not System.Text.Json.JsonTokenType.StartObject)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			var value = reader.ReadValue<string>(options);
+			reader.Read();
+			return new MatchBoolPrefixQuery { Query = value };
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string?> propAnalyzer = default;
+		LocalJsonProperty<float?> propBoost = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Fuzziness?> propFuzziness = default;
+		LocalJsonProperty<string?> propFuzzyRewrite = default;
+		LocalJsonProperty<bool?> propFuzzyTranspositions = default;
+		LocalJsonProperty<int?> propMaxExpansions = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.MinimumShouldMatch?> propMinimumShouldMatch = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Operator?> propOperator = default;
+		LocalJsonProperty<int?> propPrefixLength = default;
+		LocalJsonProperty<string> propQuery = default;
+		LocalJsonProperty<string?> propQueryName = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAnalyzer.TryRead(ref reader, options, PropAnalyzer))
 			{
-				var property = reader.GetString();
-				if (property == "analyzer")
-				{
-					variant.Analyzer = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "boost")
-				{
-					variant.Boost = JsonSerializer.Deserialize<float?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "fuzziness")
-				{
-					variant.Fuzziness = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Fuzziness?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "fuzzy_rewrite")
-				{
-					variant.FuzzyRewrite = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "fuzzy_transpositions")
-				{
-					variant.FuzzyTranspositions = JsonSerializer.Deserialize<bool?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "max_expansions")
-				{
-					variant.MaxExpansions = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "minimum_should_match")
-				{
-					variant.MinimumShouldMatch = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.MinimumShouldMatch?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "operator")
-				{
-					variant.Operator = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Operator?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "prefix_length")
-				{
-					variant.PrefixLength = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "query")
-				{
-					variant.Query = JsonSerializer.Deserialize<string>(ref reader, options);
-					continue;
-				}
-
-				if (property == "_name")
-				{
-					variant.QueryName = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
+				continue;
 			}
-		}
 
-		reader.Read();
-		return variant;
-	}
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
 
-	public override void Write(Utf8JsonWriter writer, MatchBoolPrefixQuery value, JsonSerializerOptions options)
-	{
-		if (value.Field is null)
-			throw new JsonException("Unable to serialize MatchBoolPrefixQuery because the `Field` property is not set. Field name queries must include a valid field name.");
-		if (!options.TryGetClientSettings(out var settings))
-			throw new JsonException("Unable to retrieve client settings required to infer field.");
-		writer.WriteStartObject();
-		writer.WritePropertyName(settings.Inferrer.Field(value.Field));
-		writer.WriteStartObject();
-		if (!string.IsNullOrEmpty(value.Analyzer))
-		{
-			writer.WritePropertyName("analyzer");
-			writer.WriteStringValue(value.Analyzer);
-		}
+			if (propFuzziness.TryRead(ref reader, options, PropFuzziness))
+			{
+				continue;
+			}
 
-		if (value.Boost.HasValue)
-		{
-			writer.WritePropertyName("boost");
-			writer.WriteNumberValue(value.Boost.Value);
-		}
+			if (propFuzzyRewrite.TryRead(ref reader, options, PropFuzzyRewrite))
+			{
+				continue;
+			}
 
-		if (value.Fuzziness is not null)
-		{
-			writer.WritePropertyName("fuzziness");
-			JsonSerializer.Serialize(writer, value.Fuzziness, options);
-		}
+			if (propFuzzyTranspositions.TryRead(ref reader, options, PropFuzzyTranspositions))
+			{
+				continue;
+			}
 
-		if (!string.IsNullOrEmpty(value.FuzzyRewrite))
-		{
-			writer.WritePropertyName("fuzzy_rewrite");
-			writer.WriteStringValue(value.FuzzyRewrite);
-		}
+			if (propMaxExpansions.TryRead(ref reader, options, PropMaxExpansions))
+			{
+				continue;
+			}
 
-		if (value.FuzzyTranspositions.HasValue)
-		{
-			writer.WritePropertyName("fuzzy_transpositions");
-			writer.WriteBooleanValue(value.FuzzyTranspositions.Value);
-		}
+			if (propMinimumShouldMatch.TryRead(ref reader, options, PropMinimumShouldMatch))
+			{
+				continue;
+			}
 
-		if (value.MaxExpansions.HasValue)
-		{
-			writer.WritePropertyName("max_expansions");
-			writer.WriteNumberValue(value.MaxExpansions.Value);
-		}
+			if (propOperator.TryRead(ref reader, options, PropOperator))
+			{
+				continue;
+			}
 
-		if (value.MinimumShouldMatch is not null)
-		{
-			writer.WritePropertyName("minimum_should_match");
-			JsonSerializer.Serialize(writer, value.MinimumShouldMatch, options);
-		}
+			if (propPrefixLength.TryRead(ref reader, options, PropPrefixLength))
+			{
+				continue;
+			}
 
-		if (value.Operator is not null)
-		{
-			writer.WritePropertyName("operator");
-			JsonSerializer.Serialize(writer, value.Operator, options);
-		}
+			if (propQuery.TryRead(ref reader, options, PropQuery))
+			{
+				continue;
+			}
 
-		if (value.PrefixLength.HasValue)
-		{
-			writer.WritePropertyName("prefix_length");
-			writer.WriteNumberValue(value.PrefixLength.Value);
-		}
+			if (propQueryName.TryRead(ref reader, options, PropQueryName))
+			{
+				continue;
+			}
 
-		writer.WritePropertyName("query");
-		writer.WriteStringValue(value.Query);
-		if (!string.IsNullOrEmpty(value.QueryName))
-		{
-			writer.WritePropertyName("_name");
-			writer.WriteStringValue(value.QueryName);
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		reader.Read();
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new MatchBoolPrefixQuery
+		{
+			Analyzer = propAnalyzer.Value
+,
+			Boost = propBoost.Value
+,
+			Field = propField.Value
+,
+			Fuzziness = propFuzziness.Value
+,
+			FuzzyRewrite = propFuzzyRewrite.Value
+,
+			FuzzyTranspositions = propFuzzyTranspositions.Value
+,
+			MaxExpansions = propMaxExpansions.Value
+,
+			MinimumShouldMatch = propMinimumShouldMatch.Value
+,
+			Operator = propOperator.Value
+,
+			PrefixLength = propPrefixLength.Value
+,
+			Query = propQuery.Value
+,
+			QueryName = propQueryName.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, MatchBoolPrefixQuery value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WritePropertyName(options, value.Field);
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAnalyzer, value.Analyzer);
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropFuzziness, value.Fuzziness);
+		writer.WriteProperty(options, PropFuzzyRewrite, value.FuzzyRewrite);
+		writer.WriteProperty(options, PropFuzzyTranspositions, value.FuzzyTranspositions);
+		writer.WriteProperty(options, PropMaxExpansions, value.MaxExpansions);
+		writer.WriteProperty(options, PropMinimumShouldMatch, value.MinimumShouldMatch);
+		writer.WriteProperty(options, PropOperator, value.Operator);
+		writer.WriteProperty(options, PropPrefixLength, value.PrefixLength);
+		writer.WriteProperty(options, PropQuery, value.Query);
+		writer.WriteProperty(options, PropQueryName, value.QueryName);
 		writer.WriteEndObject();
 		writer.WriteEndObject();
 	}
@@ -200,6 +192,10 @@ public MatchBoolPrefixQuery(Elastic.Clients.Elasticsearch.Serverless.Field field
 		Field = field;
 	}
 
+	internal MatchBoolPrefixQuery()
+	{
+	}
+
 	/// <summary>
 	/// <para>
 	/// Analyzer used to convert the text in the query value into tokens.
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/MatchPhrasePrefixQuery.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/MatchPhrasePrefixQuery.g.cs
index 037b01ac21b..cb344d8aa71 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/MatchPhrasePrefixQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/MatchPhrasePrefixQuery.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,116 +28,115 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.QueryDsl;
 
-internal sealed partial class MatchPhrasePrefixQueryConverter : JsonConverter<MatchPhrasePrefixQuery>
+internal sealed partial class MatchPhrasePrefixQueryConverter : System.Text.Json.Serialization.JsonConverter<MatchPhrasePrefixQuery>
 {
-	public override MatchPhrasePrefixQuery Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAnalyzer = System.Text.Json.JsonEncodedText.Encode("analyzer");
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxExpansions = System.Text.Json.JsonEncodedText.Encode("max_expansions");
+	private static readonly System.Text.Json.JsonEncodedText PropQuery = System.Text.Json.JsonEncodedText.Encode("query");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryName = System.Text.Json.JsonEncodedText.Encode("_name");
+	private static readonly System.Text.Json.JsonEncodedText PropSlop = System.Text.Json.JsonEncodedText.Encode("slop");
+	private static readonly System.Text.Json.JsonEncodedText PropZeroTermsQuery = System.Text.Json.JsonEncodedText.Encode("zero_terms_query");
+
+	public override MatchPhrasePrefixQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Field> propField = default;
 		reader.Read();
-		var fieldName = reader.GetString();
+		propField.Value = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Field>(options);
+		propField.Initialized = true;
 		reader.Read();
-		var variant = new MatchPhrasePrefixQuery(fieldName);
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		if (reader.TokenType is not System.Text.Json.JsonTokenType.StartObject)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			var value = reader.ReadValue<string>(options);
+			reader.Read();
+			return new MatchPhrasePrefixQuery { Query = value };
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string?> propAnalyzer = default;
+		LocalJsonProperty<float?> propBoost = default;
+		LocalJsonProperty<int?> propMaxExpansions = default;
+		LocalJsonProperty<string> propQuery = default;
+		LocalJsonProperty<string?> propQueryName = default;
+		LocalJsonProperty<int?> propSlop = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.ZeroTermsQuery?> propZeroTermsQuery = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAnalyzer.TryRead(ref reader, options, PropAnalyzer))
 			{
-				var property = reader.GetString();
-				if (property == "analyzer")
-				{
-					variant.Analyzer = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "boost")
-				{
-					variant.Boost = JsonSerializer.Deserialize<float?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "max_expansions")
-				{
-					variant.MaxExpansions = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "query")
-				{
-					variant.Query = JsonSerializer.Deserialize<string>(ref reader, options);
-					continue;
-				}
-
-				if (property == "_name")
-				{
-					variant.QueryName = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "slop")
-				{
-					variant.Slop = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "zero_terms_query")
-				{
-					variant.ZeroTermsQuery = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.ZeroTermsQuery?>(ref reader, options);
-					continue;
-				}
+				continue;
 			}
-		}
 
-		reader.Read();
-		return variant;
-	}
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
 
-	public override void Write(Utf8JsonWriter writer, MatchPhrasePrefixQuery value, JsonSerializerOptions options)
-	{
-		if (value.Field is null)
-			throw new JsonException("Unable to serialize MatchPhrasePrefixQuery because the `Field` property is not set. Field name queries must include a valid field name.");
-		if (!options.TryGetClientSettings(out var settings))
-			throw new JsonException("Unable to retrieve client settings required to infer field.");
-		writer.WriteStartObject();
-		writer.WritePropertyName(settings.Inferrer.Field(value.Field));
-		writer.WriteStartObject();
-		if (!string.IsNullOrEmpty(value.Analyzer))
-		{
-			writer.WritePropertyName("analyzer");
-			writer.WriteStringValue(value.Analyzer);
-		}
+			if (propMaxExpansions.TryRead(ref reader, options, PropMaxExpansions))
+			{
+				continue;
+			}
 
-		if (value.Boost.HasValue)
-		{
-			writer.WritePropertyName("boost");
-			writer.WriteNumberValue(value.Boost.Value);
-		}
+			if (propQuery.TryRead(ref reader, options, PropQuery))
+			{
+				continue;
+			}
 
-		if (value.MaxExpansions.HasValue)
-		{
-			writer.WritePropertyName("max_expansions");
-			writer.WriteNumberValue(value.MaxExpansions.Value);
-		}
+			if (propQueryName.TryRead(ref reader, options, PropQueryName))
+			{
+				continue;
+			}
 
-		writer.WritePropertyName("query");
-		writer.WriteStringValue(value.Query);
-		if (!string.IsNullOrEmpty(value.QueryName))
-		{
-			writer.WritePropertyName("_name");
-			writer.WriteStringValue(value.QueryName);
-		}
+			if (propSlop.TryRead(ref reader, options, PropSlop))
+			{
+				continue;
+			}
 
-		if (value.Slop.HasValue)
-		{
-			writer.WritePropertyName("slop");
-			writer.WriteNumberValue(value.Slop.Value);
+			if (propZeroTermsQuery.TryRead(ref reader, options, PropZeroTermsQuery))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		if (value.ZeroTermsQuery is not null)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		reader.Read();
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new MatchPhrasePrefixQuery
 		{
-			writer.WritePropertyName("zero_terms_query");
-			JsonSerializer.Serialize(writer, value.ZeroTermsQuery, options);
-		}
+			Analyzer = propAnalyzer.Value
+,
+			Boost = propBoost.Value
+,
+			Field = propField.Value
+,
+			MaxExpansions = propMaxExpansions.Value
+,
+			Query = propQuery.Value
+,
+			QueryName = propQueryName.Value
+,
+			Slop = propSlop.Value
+,
+			ZeroTermsQuery = propZeroTermsQuery.Value
+		};
+	}
 
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, MatchPhrasePrefixQuery value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WritePropertyName(options, value.Field);
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAnalyzer, value.Analyzer);
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropMaxExpansions, value.MaxExpansions);
+		writer.WriteProperty(options, PropQuery, value.Query);
+		writer.WriteProperty(options, PropQueryName, value.QueryName);
+		writer.WriteProperty(options, PropSlop, value.Slop);
+		writer.WriteProperty(options, PropZeroTermsQuery, value.ZeroTermsQuery);
 		writer.WriteEndObject();
 		writer.WriteEndObject();
 	}
@@ -152,6 +152,10 @@ public MatchPhrasePrefixQuery(Elastic.Clients.Elasticsearch.Serverless.Field fie
 		Field = field;
 	}
 
+	internal MatchPhrasePrefixQuery()
+	{
+	}
+
 	/// <summary>
 	/// <para>
 	/// Analyzer used to convert text in the query value into tokens.
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/MatchPhraseQuery.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/MatchPhraseQuery.g.cs
index e19091ee3da..9acf8ddfe2d 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/MatchPhraseQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/MatchPhraseQuery.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,104 +28,105 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.QueryDsl;
 
-internal sealed partial class MatchPhraseQueryConverter : JsonConverter<MatchPhraseQuery>
+internal sealed partial class MatchPhraseQueryConverter : System.Text.Json.Serialization.JsonConverter<MatchPhraseQuery>
 {
-	public override MatchPhraseQuery Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAnalyzer = System.Text.Json.JsonEncodedText.Encode("analyzer");
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropQuery = System.Text.Json.JsonEncodedText.Encode("query");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryName = System.Text.Json.JsonEncodedText.Encode("_name");
+	private static readonly System.Text.Json.JsonEncodedText PropSlop = System.Text.Json.JsonEncodedText.Encode("slop");
+	private static readonly System.Text.Json.JsonEncodedText PropZeroTermsQuery = System.Text.Json.JsonEncodedText.Encode("zero_terms_query");
+
+	public override MatchPhraseQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Field> propField = default;
 		reader.Read();
-		var fieldName = reader.GetString();
+		propField.Value = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Field>(options);
+		propField.Initialized = true;
 		reader.Read();
-		var variant = new MatchPhraseQuery(fieldName);
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		if (reader.TokenType is not System.Text.Json.JsonTokenType.StartObject)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			var value = reader.ReadValue<string>(options);
+			reader.Read();
+			return new MatchPhraseQuery { Query = value };
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string?> propAnalyzer = default;
+		LocalJsonProperty<float?> propBoost = default;
+		LocalJsonProperty<string> propQuery = default;
+		LocalJsonProperty<string?> propQueryName = default;
+		LocalJsonProperty<int?> propSlop = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.ZeroTermsQuery?> propZeroTermsQuery = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAnalyzer.TryRead(ref reader, options, PropAnalyzer))
 			{
-				var property = reader.GetString();
-				if (property == "analyzer")
-				{
-					variant.Analyzer = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "boost")
-				{
-					variant.Boost = JsonSerializer.Deserialize<float?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "query")
-				{
-					variant.Query = JsonSerializer.Deserialize<string>(ref reader, options);
-					continue;
-				}
-
-				if (property == "_name")
-				{
-					variant.QueryName = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "slop")
-				{
-					variant.Slop = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "zero_terms_query")
-				{
-					variant.ZeroTermsQuery = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.ZeroTermsQuery?>(ref reader, options);
-					continue;
-				}
+				continue;
 			}
-		}
 
-		reader.Read();
-		return variant;
-	}
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
 
-	public override void Write(Utf8JsonWriter writer, MatchPhraseQuery value, JsonSerializerOptions options)
-	{
-		if (value.Field is null)
-			throw new JsonException("Unable to serialize MatchPhraseQuery because the `Field` property is not set. Field name queries must include a valid field name.");
-		if (!options.TryGetClientSettings(out var settings))
-			throw new JsonException("Unable to retrieve client settings required to infer field.");
-		writer.WriteStartObject();
-		writer.WritePropertyName(settings.Inferrer.Field(value.Field));
-		writer.WriteStartObject();
-		if (!string.IsNullOrEmpty(value.Analyzer))
-		{
-			writer.WritePropertyName("analyzer");
-			writer.WriteStringValue(value.Analyzer);
-		}
+			if (propQuery.TryRead(ref reader, options, PropQuery))
+			{
+				continue;
+			}
 
-		if (value.Boost.HasValue)
-		{
-			writer.WritePropertyName("boost");
-			writer.WriteNumberValue(value.Boost.Value);
-		}
+			if (propQueryName.TryRead(ref reader, options, PropQueryName))
+			{
+				continue;
+			}
 
-		writer.WritePropertyName("query");
-		writer.WriteStringValue(value.Query);
-		if (!string.IsNullOrEmpty(value.QueryName))
-		{
-			writer.WritePropertyName("_name");
-			writer.WriteStringValue(value.QueryName);
-		}
+			if (propSlop.TryRead(ref reader, options, PropSlop))
+			{
+				continue;
+			}
 
-		if (value.Slop.HasValue)
-		{
-			writer.WritePropertyName("slop");
-			writer.WriteNumberValue(value.Slop.Value);
+			if (propZeroTermsQuery.TryRead(ref reader, options, PropZeroTermsQuery))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		if (value.ZeroTermsQuery is not null)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		reader.Read();
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new MatchPhraseQuery
 		{
-			writer.WritePropertyName("zero_terms_query");
-			JsonSerializer.Serialize(writer, value.ZeroTermsQuery, options);
-		}
+			Analyzer = propAnalyzer.Value
+,
+			Boost = propBoost.Value
+,
+			Field = propField.Value
+,
+			Query = propQuery.Value
+,
+			QueryName = propQueryName.Value
+,
+			Slop = propSlop.Value
+,
+			ZeroTermsQuery = propZeroTermsQuery.Value
+		};
+	}
 
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, MatchPhraseQuery value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WritePropertyName(options, value.Field);
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAnalyzer, value.Analyzer);
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropQuery, value.Query);
+		writer.WriteProperty(options, PropQueryName, value.QueryName);
+		writer.WriteProperty(options, PropSlop, value.Slop);
+		writer.WriteProperty(options, PropZeroTermsQuery, value.ZeroTermsQuery);
 		writer.WriteEndObject();
 		writer.WriteEndObject();
 	}
@@ -140,6 +142,10 @@ public MatchPhraseQuery(Elastic.Clients.Elasticsearch.Serverless.Field field)
 		Field = field;
 	}
 
+	internal MatchPhraseQuery()
+	{
+	}
+
 	/// <summary>
 	/// <para>
 	/// Analyzer used to convert the text in the query value into tokens.
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/MatchQuery.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/MatchQuery.g.cs
index 5907d2f7093..a0e716542d8 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/MatchQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/MatchQuery.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,200 +28,185 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.QueryDsl;
 
-internal sealed partial class MatchQueryConverter : JsonConverter<MatchQuery>
+internal sealed partial class MatchQueryConverter : System.Text.Json.Serialization.JsonConverter<MatchQuery>
 {
-	public override MatchQuery Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
+	private static readonly System.Text.Json.JsonEncodedText PropAnalyzer = System.Text.Json.JsonEncodedText.Encode("analyzer");
+	private static readonly System.Text.Json.JsonEncodedText PropAutoGenerateSynonymsPhraseQuery = System.Text.Json.JsonEncodedText.Encode("auto_generate_synonyms_phrase_query");
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropFuzziness = System.Text.Json.JsonEncodedText.Encode("fuzziness");
+	private static readonly System.Text.Json.JsonEncodedText PropFuzzyRewrite = System.Text.Json.JsonEncodedText.Encode("fuzzy_rewrite");
+	private static readonly System.Text.Json.JsonEncodedText PropFuzzyTranspositions = System.Text.Json.JsonEncodedText.Encode("fuzzy_transpositions");
+	private static readonly System.Text.Json.JsonEncodedText PropLenient = System.Text.Json.JsonEncodedText.Encode("lenient");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxExpansions = System.Text.Json.JsonEncodedText.Encode("max_expansions");
+	private static readonly System.Text.Json.JsonEncodedText PropMinimumShouldMatch = System.Text.Json.JsonEncodedText.Encode("minimum_should_match");
+	private static readonly System.Text.Json.JsonEncodedText PropOperator = System.Text.Json.JsonEncodedText.Encode("operator");
+	private static readonly System.Text.Json.JsonEncodedText PropPrefixLength = System.Text.Json.JsonEncodedText.Encode("prefix_length");
+	private static readonly System.Text.Json.JsonEncodedText PropQuery = System.Text.Json.JsonEncodedText.Encode("query");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryName = System.Text.Json.JsonEncodedText.Encode("_name");
+	private static readonly System.Text.Json.JsonEncodedText PropZeroTermsQuery = System.Text.Json.JsonEncodedText.Encode("zero_terms_query");
+
+	public override MatchQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Field> propField = default;
 		reader.Read();
-		var fieldName = reader.GetString();
+		propField.Value = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Field>(options);
+		propField.Initialized = true;
 		reader.Read();
-		var variant = new MatchQuery(fieldName);
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
-		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+		if (reader.TokenType is not System.Text.Json.JsonTokenType.StartObject)
+		{
+			var value = reader.ReadValue<object>(options);
+			reader.Read();
+			return new MatchQuery { Query = value };
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string?> propAnalyzer = default;
+		LocalJsonProperty<bool?> propAutoGenerateSynonymsPhraseQuery = default;
+		LocalJsonProperty<float?> propBoost = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Fuzziness?> propFuzziness = default;
+		LocalJsonProperty<string?> propFuzzyRewrite = default;
+		LocalJsonProperty<bool?> propFuzzyTranspositions = default;
+		LocalJsonProperty<bool?> propLenient = default;
+		LocalJsonProperty<int?> propMaxExpansions = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.MinimumShouldMatch?> propMinimumShouldMatch = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Operator?> propOperator = default;
+		LocalJsonProperty<int?> propPrefixLength = default;
+		LocalJsonProperty<object> propQuery = default;
+		LocalJsonProperty<string?> propQueryName = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.ZeroTermsQuery?> propZeroTermsQuery = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAnalyzer.TryRead(ref reader, options, PropAnalyzer))
 			{
-				var property = reader.GetString();
-				if (property == "analyzer")
-				{
-					variant.Analyzer = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "auto_generate_synonyms_phrase_query")
-				{
-					variant.AutoGenerateSynonymsPhraseQuery = JsonSerializer.Deserialize<bool?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "boost")
-				{
-					variant.Boost = JsonSerializer.Deserialize<float?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "fuzziness")
-				{
-					variant.Fuzziness = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Fuzziness?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "fuzzy_rewrite")
-				{
-					variant.FuzzyRewrite = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "fuzzy_transpositions")
-				{
-					variant.FuzzyTranspositions = JsonSerializer.Deserialize<bool?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "lenient")
-				{
-					variant.Lenient = JsonSerializer.Deserialize<bool?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "max_expansions")
-				{
-					variant.MaxExpansions = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "minimum_should_match")
-				{
-					variant.MinimumShouldMatch = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.MinimumShouldMatch?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "operator")
-				{
-					variant.Operator = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Operator?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "prefix_length")
-				{
-					variant.PrefixLength = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "query")
-				{
-					variant.Query = JsonSerializer.Deserialize<object>(ref reader, options);
-					continue;
-				}
-
-				if (property == "_name")
-				{
-					variant.QueryName = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "zero_terms_query")
-				{
-					variant.ZeroTermsQuery = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.ZeroTermsQuery?>(ref reader, options);
-					continue;
-				}
+				continue;
 			}
-		}
 
-		reader.Read();
-		return variant;
-	}
+			if (propAutoGenerateSynonymsPhraseQuery.TryRead(ref reader, options, PropAutoGenerateSynonymsPhraseQuery))
+			{
+				continue;
+			}
 
-	public override void Write(Utf8JsonWriter writer, MatchQuery value, JsonSerializerOptions options)
-	{
-		if (value.Field is null)
-			throw new JsonException("Unable to serialize MatchQuery because the `Field` property is not set. Field name queries must include a valid field name.");
-		if (!options.TryGetClientSettings(out var settings))
-			throw new JsonException("Unable to retrieve client settings required to infer field.");
-		writer.WriteStartObject();
-		writer.WritePropertyName(settings.Inferrer.Field(value.Field));
-		writer.WriteStartObject();
-		if (!string.IsNullOrEmpty(value.Analyzer))
-		{
-			writer.WritePropertyName("analyzer");
-			writer.WriteStringValue(value.Analyzer);
-		}
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
 
-		if (value.AutoGenerateSynonymsPhraseQuery.HasValue)
-		{
-			writer.WritePropertyName("auto_generate_synonyms_phrase_query");
-			writer.WriteBooleanValue(value.AutoGenerateSynonymsPhraseQuery.Value);
-		}
+			if (propFuzziness.TryRead(ref reader, options, PropFuzziness))
+			{
+				continue;
+			}
 
-		if (value.Boost.HasValue)
-		{
-			writer.WritePropertyName("boost");
-			writer.WriteNumberValue(value.Boost.Value);
-		}
+			if (propFuzzyRewrite.TryRead(ref reader, options, PropFuzzyRewrite))
+			{
+				continue;
+			}
 
-		if (value.Fuzziness is not null)
-		{
-			writer.WritePropertyName("fuzziness");
-			JsonSerializer.Serialize(writer, value.Fuzziness, options);
-		}
+			if (propFuzzyTranspositions.TryRead(ref reader, options, PropFuzzyTranspositions))
+			{
+				continue;
+			}
 
-		if (!string.IsNullOrEmpty(value.FuzzyRewrite))
-		{
-			writer.WritePropertyName("fuzzy_rewrite");
-			writer.WriteStringValue(value.FuzzyRewrite);
-		}
+			if (propLenient.TryRead(ref reader, options, PropLenient))
+			{
+				continue;
+			}
 
-		if (value.FuzzyTranspositions.HasValue)
-		{
-			writer.WritePropertyName("fuzzy_transpositions");
-			writer.WriteBooleanValue(value.FuzzyTranspositions.Value);
-		}
+			if (propMaxExpansions.TryRead(ref reader, options, PropMaxExpansions))
+			{
+				continue;
+			}
 
-		if (value.Lenient.HasValue)
-		{
-			writer.WritePropertyName("lenient");
-			writer.WriteBooleanValue(value.Lenient.Value);
-		}
+			if (propMinimumShouldMatch.TryRead(ref reader, options, PropMinimumShouldMatch))
+			{
+				continue;
+			}
 
-		if (value.MaxExpansions.HasValue)
-		{
-			writer.WritePropertyName("max_expansions");
-			writer.WriteNumberValue(value.MaxExpansions.Value);
-		}
+			if (propOperator.TryRead(ref reader, options, PropOperator))
+			{
+				continue;
+			}
 
-		if (value.MinimumShouldMatch is not null)
-		{
-			writer.WritePropertyName("minimum_should_match");
-			JsonSerializer.Serialize(writer, value.MinimumShouldMatch, options);
-		}
+			if (propPrefixLength.TryRead(ref reader, options, PropPrefixLength))
+			{
+				continue;
+			}
 
-		if (value.Operator is not null)
-		{
-			writer.WritePropertyName("operator");
-			JsonSerializer.Serialize(writer, value.Operator, options);
-		}
+			if (propQuery.TryRead(ref reader, options, PropQuery))
+			{
+				continue;
+			}
 
-		if (value.PrefixLength.HasValue)
-		{
-			writer.WritePropertyName("prefix_length");
-			writer.WriteNumberValue(value.PrefixLength.Value);
-		}
+			if (propQueryName.TryRead(ref reader, options, PropQueryName))
+			{
+				continue;
+			}
 
-		writer.WritePropertyName("query");
-		JsonSerializer.Serialize(writer, value.Query, options);
-		if (!string.IsNullOrEmpty(value.QueryName))
-		{
-			writer.WritePropertyName("_name");
-			writer.WriteStringValue(value.QueryName);
-		}
+			if (propZeroTermsQuery.TryRead(ref reader, options, PropZeroTermsQuery))
+			{
+				continue;
+			}
 
-		if (value.ZeroTermsQuery is not null)
-		{
-			writer.WritePropertyName("zero_terms_query");
-			JsonSerializer.Serialize(writer, value.ZeroTermsQuery, options);
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		reader.Read();
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new MatchQuery
+		{
+			Analyzer = propAnalyzer.Value
+,
+			AutoGenerateSynonymsPhraseQuery = propAutoGenerateSynonymsPhraseQuery.Value
+,
+			Boost = propBoost.Value
+,
+			Field = propField.Value
+,
+			Fuzziness = propFuzziness.Value
+,
+			FuzzyRewrite = propFuzzyRewrite.Value
+,
+			FuzzyTranspositions = propFuzzyTranspositions.Value
+,
+			Lenient = propLenient.Value
+,
+			MaxExpansions = propMaxExpansions.Value
+,
+			MinimumShouldMatch = propMinimumShouldMatch.Value
+,
+			Operator = propOperator.Value
+,
+			PrefixLength = propPrefixLength.Value
+,
+			Query = propQuery.Value
+,
+			QueryName = propQueryName.Value
+,
+			ZeroTermsQuery = propZeroTermsQuery.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, MatchQuery value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WritePropertyName(options, value.Field);
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAnalyzer, value.Analyzer);
+		writer.WriteProperty(options, PropAutoGenerateSynonymsPhraseQuery, value.AutoGenerateSynonymsPhraseQuery);
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropFuzziness, value.Fuzziness);
+		writer.WriteProperty(options, PropFuzzyRewrite, value.FuzzyRewrite);
+		writer.WriteProperty(options, PropFuzzyTranspositions, value.FuzzyTranspositions);
+		writer.WriteProperty(options, PropLenient, value.Lenient);
+		writer.WriteProperty(options, PropMaxExpansions, value.MaxExpansions);
+		writer.WriteProperty(options, PropMinimumShouldMatch, value.MinimumShouldMatch);
+		writer.WriteProperty(options, PropOperator, value.Operator);
+		writer.WriteProperty(options, PropPrefixLength, value.PrefixLength);
+		writer.WriteProperty(options, PropQuery, value.Query);
+		writer.WriteProperty(options, PropQueryName, value.QueryName);
+		writer.WriteProperty(options, PropZeroTermsQuery, value.ZeroTermsQuery);
 		writer.WriteEndObject();
 		writer.WriteEndObject();
 	}
@@ -236,6 +222,10 @@ public MatchQuery(Elastic.Clients.Elasticsearch.Serverless.Field field)
 		Field = field;
 	}
 
+	internal MatchQuery()
+	{
+	}
+
 	/// <summary>
 	/// <para>
 	/// Analyzer used to convert the text in the query value into tokens.
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/MoreLikeThisQuery.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/MoreLikeThisQuery.g.cs
index 96910cced47..2a9a3b926ce 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/MoreLikeThisQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/MoreLikeThisQuery.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,230 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.QueryDsl;
 
+internal sealed partial class MoreLikeThisQueryConverter : System.Text.Json.Serialization.JsonConverter<MoreLikeThisQuery>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAnalyzer = System.Text.Json.JsonEncodedText.Encode("analyzer");
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropBoostTerms = System.Text.Json.JsonEncodedText.Encode("boost_terms");
+	private static readonly System.Text.Json.JsonEncodedText PropFailOnUnsupportedField = System.Text.Json.JsonEncodedText.Encode("fail_on_unsupported_field");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropInclude = System.Text.Json.JsonEncodedText.Encode("include");
+	private static readonly System.Text.Json.JsonEncodedText PropLike = System.Text.Json.JsonEncodedText.Encode("like");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxDocFreq = System.Text.Json.JsonEncodedText.Encode("max_doc_freq");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxQueryTerms = System.Text.Json.JsonEncodedText.Encode("max_query_terms");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxWordLength = System.Text.Json.JsonEncodedText.Encode("max_word_length");
+	private static readonly System.Text.Json.JsonEncodedText PropMinDocFreq = System.Text.Json.JsonEncodedText.Encode("min_doc_freq");
+	private static readonly System.Text.Json.JsonEncodedText PropMinimumShouldMatch = System.Text.Json.JsonEncodedText.Encode("minimum_should_match");
+	private static readonly System.Text.Json.JsonEncodedText PropMinTermFreq = System.Text.Json.JsonEncodedText.Encode("min_term_freq");
+	private static readonly System.Text.Json.JsonEncodedText PropMinWordLength = System.Text.Json.JsonEncodedText.Encode("min_word_length");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryName = System.Text.Json.JsonEncodedText.Encode("_name");
+	private static readonly System.Text.Json.JsonEncodedText PropRouting = System.Text.Json.JsonEncodedText.Encode("routing");
+	private static readonly System.Text.Json.JsonEncodedText PropStopWords = System.Text.Json.JsonEncodedText.Encode("stop_words");
+	private static readonly System.Text.Json.JsonEncodedText PropUnlike = System.Text.Json.JsonEncodedText.Encode("unlike");
+	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("version");
+	private static readonly System.Text.Json.JsonEncodedText PropVersionType = System.Text.Json.JsonEncodedText.Encode("version_type");
+
+	public override MoreLikeThisQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string?> propAnalyzer = default;
+		LocalJsonProperty<float?> propBoost = default;
+		LocalJsonProperty<double?> propBoostTerms = default;
+		LocalJsonProperty<bool?> propFailOnUnsupportedField = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Fields?> propFields = default;
+		LocalJsonProperty<bool?> propInclude = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Like>> propLike = default;
+		LocalJsonProperty<int?> propMaxDocFreq = default;
+		LocalJsonProperty<int?> propMaxQueryTerms = default;
+		LocalJsonProperty<int?> propMaxWordLength = default;
+		LocalJsonProperty<int?> propMinDocFreq = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.MinimumShouldMatch?> propMinimumShouldMatch = default;
+		LocalJsonProperty<int?> propMinTermFreq = default;
+		LocalJsonProperty<int?> propMinWordLength = default;
+		LocalJsonProperty<string?> propQueryName = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Routing?> propRouting = default;
+		LocalJsonProperty<ICollection<string>?> propStopWords = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Like>?> propUnlike = default;
+		LocalJsonProperty<long?> propVersion = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.VersionType?> propVersionType = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAnalyzer.TryRead(ref reader, options, PropAnalyzer))
+			{
+				continue;
+			}
+
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
+
+			if (propBoostTerms.TryRead(ref reader, options, PropBoostTerms))
+			{
+				continue;
+			}
+
+			if (propFailOnUnsupportedField.TryRead(ref reader, options, PropFailOnUnsupportedField))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields, typeof(FieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propInclude.TryRead(ref reader, options, PropInclude))
+			{
+				continue;
+			}
+
+			if (propLike.TryRead(ref reader, options, PropLike, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Like>, Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Like>)))
+			{
+				continue;
+			}
+
+			if (propMaxDocFreq.TryRead(ref reader, options, PropMaxDocFreq))
+			{
+				continue;
+			}
+
+			if (propMaxQueryTerms.TryRead(ref reader, options, PropMaxQueryTerms))
+			{
+				continue;
+			}
+
+			if (propMaxWordLength.TryRead(ref reader, options, PropMaxWordLength))
+			{
+				continue;
+			}
+
+			if (propMinDocFreq.TryRead(ref reader, options, PropMinDocFreq))
+			{
+				continue;
+			}
+
+			if (propMinimumShouldMatch.TryRead(ref reader, options, PropMinimumShouldMatch))
+			{
+				continue;
+			}
+
+			if (propMinTermFreq.TryRead(ref reader, options, PropMinTermFreq))
+			{
+				continue;
+			}
+
+			if (propMinWordLength.TryRead(ref reader, options, PropMinWordLength))
+			{
+				continue;
+			}
+
+			if (propQueryName.TryRead(ref reader, options, PropQueryName))
+			{
+				continue;
+			}
+
+			if (propRouting.TryRead(ref reader, options, PropRouting))
+			{
+				continue;
+			}
+
+			if (propStopWords.TryRead(ref reader, options, PropStopWords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propUnlike.TryRead(ref reader, options, PropUnlike, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Like>?, Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Like>)))
+			{
+				continue;
+			}
+
+			if (propVersion.TryRead(ref reader, options, PropVersion))
+			{
+				continue;
+			}
+
+			if (propVersionType.TryRead(ref reader, options, PropVersionType))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new MoreLikeThisQuery
+		{
+			Analyzer = propAnalyzer.Value
+,
+			Boost = propBoost.Value
+,
+			BoostTerms = propBoostTerms.Value
+,
+			FailOnUnsupportedField = propFailOnUnsupportedField.Value
+,
+			Fields = propFields.Value
+,
+			Include = propInclude.Value
+,
+			Like = propLike.Value
+,
+			MaxDocFreq = propMaxDocFreq.Value
+,
+			MaxQueryTerms = propMaxQueryTerms.Value
+,
+			MaxWordLength = propMaxWordLength.Value
+,
+			MinDocFreq = propMinDocFreq.Value
+,
+			MinimumShouldMatch = propMinimumShouldMatch.Value
+,
+			MinTermFreq = propMinTermFreq.Value
+,
+			MinWordLength = propMinWordLength.Value
+,
+			QueryName = propQueryName.Value
+,
+			Routing = propRouting.Value
+,
+			StopWords = propStopWords.Value
+,
+			Unlike = propUnlike.Value
+,
+			Version = propVersion.Value
+,
+			VersionType = propVersionType.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, MoreLikeThisQuery value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAnalyzer, value.Analyzer);
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropBoostTerms, value.BoostTerms);
+		writer.WriteProperty(options, PropFailOnUnsupportedField, value.FailOnUnsupportedField);
+		writer.WriteProperty(options, PropFields, value.Fields, typeof(FieldsMarker));
+		writer.WriteProperty(options, PropInclude, value.Include);
+		writer.WriteProperty(options, PropLike, value.Like, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Like>, Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Like>));
+		writer.WriteProperty(options, PropMaxDocFreq, value.MaxDocFreq);
+		writer.WriteProperty(options, PropMaxQueryTerms, value.MaxQueryTerms);
+		writer.WriteProperty(options, PropMaxWordLength, value.MaxWordLength);
+		writer.WriteProperty(options, PropMinDocFreq, value.MinDocFreq);
+		writer.WriteProperty(options, PropMinimumShouldMatch, value.MinimumShouldMatch);
+		writer.WriteProperty(options, PropMinTermFreq, value.MinTermFreq);
+		writer.WriteProperty(options, PropMinWordLength, value.MinWordLength);
+		writer.WriteProperty(options, PropQueryName, value.QueryName);
+		writer.WriteProperty(options, PropRouting, value.Routing);
+		writer.WriteProperty(options, PropStopWords, value.StopWords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropUnlike, value.Unlike, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Like>?, Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Like>));
+		writer.WriteProperty(options, PropVersion, value.Version);
+		writer.WriteProperty(options, PropVersionType, value.VersionType);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(MoreLikeThisQueryConverter))]
 public sealed partial class MoreLikeThisQuery
 {
 	/// <summary>
@@ -35,7 +260,6 @@ public sealed partial class MoreLikeThisQuery
 	/// Defaults to the analyzer associated with the first field in fields.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("analyzer")]
 	public string? Analyzer { get; set; }
 
 	/// <summary>
@@ -46,7 +270,6 @@ public sealed partial class MoreLikeThisQuery
 	/// A value greater than 1.0 increases the relevance score.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("boost")]
 	public float? Boost { get; set; }
 
 	/// <summary>
@@ -56,7 +279,6 @@ public sealed partial class MoreLikeThisQuery
 	/// Defaults to deactivated (0).
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("boost_terms")]
 	public double? BoostTerms { get; set; }
 
 	/// <summary>
@@ -64,7 +286,6 @@ public sealed partial class MoreLikeThisQuery
 	/// Controls whether the query should fail (throw an exception) if any of the specified fields are not of the supported types (<c>text</c> or <c>keyword</c>).
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("fail_on_unsupported_field")]
 	public bool? FailOnUnsupportedField { get; set; }
 
 	/// <summary>
@@ -73,8 +294,6 @@ public sealed partial class MoreLikeThisQuery
 	/// Defaults to the <c>index.query.default_field</c> index setting, which has a default value of <c>*</c>.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("fields")]
-	[JsonConverter(typeof(FieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Serverless.Fields? Fields { get; set; }
 
 	/// <summary>
@@ -82,7 +301,6 @@ public sealed partial class MoreLikeThisQuery
 	/// Specifies whether the input documents should also be included in the search results returned.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("include")]
 	public bool? Include { get; set; }
 
 	/// <summary>
@@ -90,8 +308,6 @@ public sealed partial class MoreLikeThisQuery
 	/// Specifies free form text and/or a single or multiple documents for which you want to find similar documents.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("like")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Like))]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Like> Like { get; set; }
 
 	/// <summary>
@@ -99,7 +315,6 @@ public sealed partial class MoreLikeThisQuery
 	/// The maximum document frequency above which the terms are ignored from the input document.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("max_doc_freq")]
 	public int? MaxDocFreq { get; set; }
 
 	/// <summary>
@@ -107,7 +322,6 @@ public sealed partial class MoreLikeThisQuery
 	/// The maximum number of query terms that can be selected.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("max_query_terms")]
 	public int? MaxQueryTerms { get; set; }
 
 	/// <summary>
@@ -116,7 +330,6 @@ public sealed partial class MoreLikeThisQuery
 	/// Defaults to unbounded (<c>0</c>).
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("max_word_length")]
 	public int? MaxWordLength { get; set; }
 
 	/// <summary>
@@ -124,7 +337,6 @@ public sealed partial class MoreLikeThisQuery
 	/// The minimum document frequency below which the terms are ignored from the input document.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("min_doc_freq")]
 	public int? MinDocFreq { get; set; }
 
 	/// <summary>
@@ -132,7 +344,6 @@ public sealed partial class MoreLikeThisQuery
 	/// After the disjunctive query has been formed, this parameter controls the number of terms that must match.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("minimum_should_match")]
 	public Elastic.Clients.Elasticsearch.Serverless.MinimumShouldMatch? MinimumShouldMatch { get; set; }
 
 	/// <summary>
@@ -140,7 +351,6 @@ public sealed partial class MoreLikeThisQuery
 	/// The minimum term frequency below which the terms are ignored from the input document.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("min_term_freq")]
 	public int? MinTermFreq { get; set; }
 
 	/// <summary>
@@ -148,11 +358,8 @@ public sealed partial class MoreLikeThisQuery
 	/// The minimum word length below which the terms are ignored.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("min_word_length")]
 	public int? MinWordLength { get; set; }
-	[JsonInclude, JsonPropertyName("_name")]
 	public string? QueryName { get; set; }
-	[JsonInclude, JsonPropertyName("routing")]
 	public Elastic.Clients.Elasticsearch.Serverless.Routing? Routing { get; set; }
 
 	/// <summary>
@@ -161,8 +368,6 @@ public sealed partial class MoreLikeThisQuery
 	/// Any word in this set is ignored.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("stop_words")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? StopWords { get; set; }
 
 	/// <summary>
@@ -170,12 +375,8 @@ public sealed partial class MoreLikeThisQuery
 	/// Used in combination with <c>like</c> to exclude documents that match a set of terms.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("unlike")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Like))]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Like>? Unlike { get; set; }
-	[JsonInclude, JsonPropertyName("version")]
 	public long? Version { get; set; }
-	[JsonInclude, JsonPropertyName("version_type")]
 	public Elastic.Clients.Elasticsearch.Serverless.VersionType? VersionType { get; set; }
 
 	public static implicit operator Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query(MoreLikeThisQuery moreLikeThisQuery) => Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query.MoreLikeThis(moreLikeThisQuery);
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/MultiMatchQuery.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/MultiMatchQuery.g.cs
index 46c3e3aab35..d97ee54c01a 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/MultiMatchQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/MultiMatchQuery.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,210 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.QueryDsl;
 
+internal sealed partial class MultiMatchQueryConverter : System.Text.Json.Serialization.JsonConverter<MultiMatchQuery>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAnalyzer = System.Text.Json.JsonEncodedText.Encode("analyzer");
+	private static readonly System.Text.Json.JsonEncodedText PropAutoGenerateSynonymsPhraseQuery = System.Text.Json.JsonEncodedText.Encode("auto_generate_synonyms_phrase_query");
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropFuzziness = System.Text.Json.JsonEncodedText.Encode("fuzziness");
+	private static readonly System.Text.Json.JsonEncodedText PropFuzzyRewrite = System.Text.Json.JsonEncodedText.Encode("fuzzy_rewrite");
+	private static readonly System.Text.Json.JsonEncodedText PropFuzzyTranspositions = System.Text.Json.JsonEncodedText.Encode("fuzzy_transpositions");
+	private static readonly System.Text.Json.JsonEncodedText PropLenient = System.Text.Json.JsonEncodedText.Encode("lenient");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxExpansions = System.Text.Json.JsonEncodedText.Encode("max_expansions");
+	private static readonly System.Text.Json.JsonEncodedText PropMinimumShouldMatch = System.Text.Json.JsonEncodedText.Encode("minimum_should_match");
+	private static readonly System.Text.Json.JsonEncodedText PropOperator = System.Text.Json.JsonEncodedText.Encode("operator");
+	private static readonly System.Text.Json.JsonEncodedText PropPrefixLength = System.Text.Json.JsonEncodedText.Encode("prefix_length");
+	private static readonly System.Text.Json.JsonEncodedText PropQuery = System.Text.Json.JsonEncodedText.Encode("query");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryName = System.Text.Json.JsonEncodedText.Encode("_name");
+	private static readonly System.Text.Json.JsonEncodedText PropSlop = System.Text.Json.JsonEncodedText.Encode("slop");
+	private static readonly System.Text.Json.JsonEncodedText PropTieBreaker = System.Text.Json.JsonEncodedText.Encode("tie_breaker");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+	private static readonly System.Text.Json.JsonEncodedText PropZeroTermsQuery = System.Text.Json.JsonEncodedText.Encode("zero_terms_query");
+
+	public override MultiMatchQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string?> propAnalyzer = default;
+		LocalJsonProperty<bool?> propAutoGenerateSynonymsPhraseQuery = default;
+		LocalJsonProperty<float?> propBoost = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Fields?> propFields = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Fuzziness?> propFuzziness = default;
+		LocalJsonProperty<string?> propFuzzyRewrite = default;
+		LocalJsonProperty<bool?> propFuzzyTranspositions = default;
+		LocalJsonProperty<bool?> propLenient = default;
+		LocalJsonProperty<int?> propMaxExpansions = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.MinimumShouldMatch?> propMinimumShouldMatch = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Operator?> propOperator = default;
+		LocalJsonProperty<int?> propPrefixLength = default;
+		LocalJsonProperty<string> propQuery = default;
+		LocalJsonProperty<string?> propQueryName = default;
+		LocalJsonProperty<int?> propSlop = default;
+		LocalJsonProperty<double?> propTieBreaker = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.TextQueryType?> propType = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.ZeroTermsQuery?> propZeroTermsQuery = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAnalyzer.TryRead(ref reader, options, PropAnalyzer))
+			{
+				continue;
+			}
+
+			if (propAutoGenerateSynonymsPhraseQuery.TryRead(ref reader, options, PropAutoGenerateSynonymsPhraseQuery))
+			{
+				continue;
+			}
+
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propFuzziness.TryRead(ref reader, options, PropFuzziness))
+			{
+				continue;
+			}
+
+			if (propFuzzyRewrite.TryRead(ref reader, options, PropFuzzyRewrite))
+			{
+				continue;
+			}
+
+			if (propFuzzyTranspositions.TryRead(ref reader, options, PropFuzzyTranspositions))
+			{
+				continue;
+			}
+
+			if (propLenient.TryRead(ref reader, options, PropLenient))
+			{
+				continue;
+			}
+
+			if (propMaxExpansions.TryRead(ref reader, options, PropMaxExpansions))
+			{
+				continue;
+			}
+
+			if (propMinimumShouldMatch.TryRead(ref reader, options, PropMinimumShouldMatch))
+			{
+				continue;
+			}
+
+			if (propOperator.TryRead(ref reader, options, PropOperator))
+			{
+				continue;
+			}
+
+			if (propPrefixLength.TryRead(ref reader, options, PropPrefixLength))
+			{
+				continue;
+			}
+
+			if (propQuery.TryRead(ref reader, options, PropQuery))
+			{
+				continue;
+			}
+
+			if (propQueryName.TryRead(ref reader, options, PropQueryName))
+			{
+				continue;
+			}
+
+			if (propSlop.TryRead(ref reader, options, PropSlop))
+			{
+				continue;
+			}
+
+			if (propTieBreaker.TryRead(ref reader, options, PropTieBreaker))
+			{
+				continue;
+			}
+
+			if (propType.TryRead(ref reader, options, PropType))
+			{
+				continue;
+			}
+
+			if (propZeroTermsQuery.TryRead(ref reader, options, PropZeroTermsQuery))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new MultiMatchQuery
+		{
+			Analyzer = propAnalyzer.Value
+,
+			AutoGenerateSynonymsPhraseQuery = propAutoGenerateSynonymsPhraseQuery.Value
+,
+			Boost = propBoost.Value
+,
+			Fields = propFields.Value
+,
+			Fuzziness = propFuzziness.Value
+,
+			FuzzyRewrite = propFuzzyRewrite.Value
+,
+			FuzzyTranspositions = propFuzzyTranspositions.Value
+,
+			Lenient = propLenient.Value
+,
+			MaxExpansions = propMaxExpansions.Value
+,
+			MinimumShouldMatch = propMinimumShouldMatch.Value
+,
+			Operator = propOperator.Value
+,
+			PrefixLength = propPrefixLength.Value
+,
+			Query = propQuery.Value
+,
+			QueryName = propQueryName.Value
+,
+			Slop = propSlop.Value
+,
+			TieBreaker = propTieBreaker.Value
+,
+			Type = propType.Value
+,
+			ZeroTermsQuery = propZeroTermsQuery.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, MultiMatchQuery value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAnalyzer, value.Analyzer);
+		writer.WriteProperty(options, PropAutoGenerateSynonymsPhraseQuery, value.AutoGenerateSynonymsPhraseQuery);
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropFields, value.Fields, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropFuzziness, value.Fuzziness);
+		writer.WriteProperty(options, PropFuzzyRewrite, value.FuzzyRewrite);
+		writer.WriteProperty(options, PropFuzzyTranspositions, value.FuzzyTranspositions);
+		writer.WriteProperty(options, PropLenient, value.Lenient);
+		writer.WriteProperty(options, PropMaxExpansions, value.MaxExpansions);
+		writer.WriteProperty(options, PropMinimumShouldMatch, value.MinimumShouldMatch);
+		writer.WriteProperty(options, PropOperator, value.Operator);
+		writer.WriteProperty(options, PropPrefixLength, value.PrefixLength);
+		writer.WriteProperty(options, PropQuery, value.Query);
+		writer.WriteProperty(options, PropQueryName, value.QueryName);
+		writer.WriteProperty(options, PropSlop, value.Slop);
+		writer.WriteProperty(options, PropTieBreaker, value.TieBreaker);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteProperty(options, PropZeroTermsQuery, value.ZeroTermsQuery);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(MultiMatchQueryConverter))]
 public sealed partial class MultiMatchQuery
 {
 	/// <summary>
@@ -34,7 +239,6 @@ public sealed partial class MultiMatchQuery
 	/// Analyzer used to convert the text in the query value into tokens.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("analyzer")]
 	public string? Analyzer { get; set; }
 
 	/// <summary>
@@ -42,7 +246,6 @@ public sealed partial class MultiMatchQuery
 	/// If <c>true</c>, match phrase queries are automatically created for multi-term synonyms.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("auto_generate_synonyms_phrase_query")]
 	public bool? AutoGenerateSynonymsPhraseQuery { get; set; }
 
 	/// <summary>
@@ -53,7 +256,6 @@ public sealed partial class MultiMatchQuery
 	/// A value greater than 1.0 increases the relevance score.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("boost")]
 	public float? Boost { get; set; }
 
 	/// <summary>
@@ -62,8 +264,6 @@ public sealed partial class MultiMatchQuery
 	/// Defaults to the <c>index.query.default_field</c> index settings, which in turn defaults to <c>*</c>.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("fields")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Serverless.Fields? Fields { get; set; }
 
 	/// <summary>
@@ -71,7 +271,6 @@ public sealed partial class MultiMatchQuery
 	/// Maximum edit distance allowed for matching.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("fuzziness")]
 	public Elastic.Clients.Elasticsearch.Serverless.Fuzziness? Fuzziness { get; set; }
 
 	/// <summary>
@@ -79,7 +278,6 @@ public sealed partial class MultiMatchQuery
 	/// Method used to rewrite the query.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("fuzzy_rewrite")]
 	public string? FuzzyRewrite { get; set; }
 
 	/// <summary>
@@ -88,7 +286,6 @@ public sealed partial class MultiMatchQuery
 	/// Can be applied to the term subqueries constructed for all terms but the final term.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("fuzzy_transpositions")]
 	public bool? FuzzyTranspositions { get; set; }
 
 	/// <summary>
@@ -96,7 +293,6 @@ public sealed partial class MultiMatchQuery
 	/// If <c>true</c>, format-based errors, such as providing a text query value for a numeric field, are ignored.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("lenient")]
 	public bool? Lenient { get; set; }
 
 	/// <summary>
@@ -104,7 +300,6 @@ public sealed partial class MultiMatchQuery
 	/// Maximum number of terms to which the query will expand.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("max_expansions")]
 	public int? MaxExpansions { get; set; }
 
 	/// <summary>
@@ -112,7 +307,6 @@ public sealed partial class MultiMatchQuery
 	/// Minimum number of clauses that must match for a document to be returned.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("minimum_should_match")]
 	public Elastic.Clients.Elasticsearch.Serverless.MinimumShouldMatch? MinimumShouldMatch { get; set; }
 
 	/// <summary>
@@ -120,7 +314,6 @@ public sealed partial class MultiMatchQuery
 	/// Boolean logic used to interpret text in the query value.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("operator")]
 	public Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Operator? Operator { get; set; }
 
 	/// <summary>
@@ -128,7 +321,6 @@ public sealed partial class MultiMatchQuery
 	/// Number of beginning characters left unchanged for fuzzy matching.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("prefix_length")]
 	public int? PrefixLength { get; set; }
 
 	/// <summary>
@@ -136,9 +328,7 @@ public sealed partial class MultiMatchQuery
 	/// Text, number, boolean value or date you wish to find in the provided field.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("query")]
 	public string Query { get; set; }
-	[JsonInclude, JsonPropertyName("_name")]
 	public string? QueryName { get; set; }
 
 	/// <summary>
@@ -146,7 +336,6 @@ public sealed partial class MultiMatchQuery
 	/// Maximum number of positions allowed between matching tokens.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("slop")]
 	public int? Slop { get; set; }
 
 	/// <summary>
@@ -154,7 +343,6 @@ public sealed partial class MultiMatchQuery
 	/// Determines how scores for each per-term blended query and scores across groups are combined.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("tie_breaker")]
 	public double? TieBreaker { get; set; }
 
 	/// <summary>
@@ -162,7 +350,6 @@ public sealed partial class MultiMatchQuery
 	/// How <c>the</c> multi_match query is executed internally.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("type")]
 	public Elastic.Clients.Elasticsearch.Serverless.QueryDsl.TextQueryType? Type { get; set; }
 
 	/// <summary>
@@ -170,7 +357,6 @@ public sealed partial class MultiMatchQuery
 	/// Indicates whether no documents are returned if the <c>analyzer</c> removes all tokens, such as when using a <c>stop</c> filter.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("zero_terms_query")]
 	public Elastic.Clients.Elasticsearch.Serverless.QueryDsl.ZeroTermsQuery? ZeroTermsQuery { get; set; }
 
 	public static implicit operator Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query(MultiMatchQuery multiMatchQuery) => Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query.MultiMatch(multiMatchQuery);
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/NumberRangeQuery.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/NumberRangeQuery.g.cs
index 66640e3d2f5..52c8e3a5cd6 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/NumberRangeQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/NumberRangeQuery.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,127 +28,115 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.QueryDsl;
 
-internal sealed partial class NumberRangeQueryConverter : JsonConverter<NumberRangeQuery>
+internal sealed partial class NumberRangeQueryConverter : System.Text.Json.Serialization.JsonConverter<NumberRangeQuery>
 {
-	public override NumberRangeQuery Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropGt = System.Text.Json.JsonEncodedText.Encode("gt");
+	private static readonly System.Text.Json.JsonEncodedText PropGte = System.Text.Json.JsonEncodedText.Encode("gte");
+	private static readonly System.Text.Json.JsonEncodedText PropLt = System.Text.Json.JsonEncodedText.Encode("lt");
+	private static readonly System.Text.Json.JsonEncodedText PropLte = System.Text.Json.JsonEncodedText.Encode("lte");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryName = System.Text.Json.JsonEncodedText.Encode("_name");
+	private static readonly System.Text.Json.JsonEncodedText PropRelation = System.Text.Json.JsonEncodedText.Encode("relation");
+
+	public override NumberRangeQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Field> propField = default;
 		reader.Read();
-		var fieldName = reader.GetString();
+		propField.Value = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Field>(options);
+		propField.Initialized = true;
 		reader.Read();
-		var variant = new NumberRangeQuery(fieldName);
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<float?> propBoost = default;
+		LocalJsonProperty<double?> propGt = default;
+		LocalJsonProperty<double?> propGte = default;
+		LocalJsonProperty<double?> propLt = default;
+		LocalJsonProperty<double?> propLte = default;
+		LocalJsonProperty<string?> propQueryName = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.RangeRelation?> propRelation = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propBoost.TryRead(ref reader, options, PropBoost))
 			{
-				var property = reader.GetString();
-				if (property == "boost")
-				{
-					variant.Boost = JsonSerializer.Deserialize<float?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "gt")
-				{
-					variant.Gt = JsonSerializer.Deserialize<double?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "gte")
-				{
-					variant.Gte = JsonSerializer.Deserialize<double?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "lt")
-				{
-					variant.Lt = JsonSerializer.Deserialize<double?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "lte")
-				{
-					variant.Lte = JsonSerializer.Deserialize<double?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "_name")
-				{
-					variant.QueryName = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "relation")
-				{
-					variant.Relation = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.RangeRelation?>(ref reader, options);
-					continue;
-				}
+				continue;
 			}
-		}
 
-		reader.Read();
-		return variant;
-	}
+			if (propGt.TryRead(ref reader, options, PropGt))
+			{
+				continue;
+			}
 
-	public override void Write(Utf8JsonWriter writer, NumberRangeQuery value, JsonSerializerOptions options)
-	{
-		if (value.Field is null)
-			throw new JsonException("Unable to serialize NumberRangeQuery because the `Field` property is not set. Field name queries must include a valid field name.");
-		if (!options.TryGetClientSettings(out var settings))
-			throw new JsonException("Unable to retrieve client settings required to infer field.");
-		writer.WriteStartObject();
-		writer.WritePropertyName(settings.Inferrer.Field(value.Field));
-		writer.WriteStartObject();
-		if (value.Boost.HasValue)
-		{
-			writer.WritePropertyName("boost");
-			writer.WriteNumberValue(value.Boost.Value);
-		}
+			if (propGte.TryRead(ref reader, options, PropGte))
+			{
+				continue;
+			}
 
-		if (value.Gt.HasValue)
-		{
-			writer.WritePropertyName("gt");
-			writer.WriteNumberValue(value.Gt.Value);
-		}
+			if (propLt.TryRead(ref reader, options, PropLt))
+			{
+				continue;
+			}
 
-		if (value.Gte.HasValue)
-		{
-			writer.WritePropertyName("gte");
-			writer.WriteNumberValue(value.Gte.Value);
-		}
+			if (propLte.TryRead(ref reader, options, PropLte))
+			{
+				continue;
+			}
 
-		if (value.Lt.HasValue)
-		{
-			writer.WritePropertyName("lt");
-			writer.WriteNumberValue(value.Lt.Value);
-		}
+			if (propQueryName.TryRead(ref reader, options, PropQueryName))
+			{
+				continue;
+			}
 
-		if (value.Lte.HasValue)
-		{
-			writer.WritePropertyName("lte");
-			writer.WriteNumberValue(value.Lte.Value);
-		}
+			if (propRelation.TryRead(ref reader, options, PropRelation))
+			{
+				continue;
+			}
 
-		if (!string.IsNullOrEmpty(value.QueryName))
-		{
-			writer.WritePropertyName("_name");
-			writer.WriteStringValue(value.QueryName);
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		if (value.Relation is not null)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		reader.Read();
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new NumberRangeQuery
 		{
-			writer.WritePropertyName("relation");
-			JsonSerializer.Serialize(writer, value.Relation, options);
-		}
+			Boost = propBoost.Value
+,
+			Field = propField.Value
+,
+			Gt = propGt.Value
+,
+			Gte = propGte.Value
+,
+			Lt = propLt.Value
+,
+			Lte = propLte.Value
+,
+			QueryName = propQueryName.Value
+,
+			Relation = propRelation.Value
+		};
+	}
 
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, NumberRangeQuery value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WritePropertyName(options, value.Field);
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropGt, value.Gt);
+		writer.WriteProperty(options, PropGte, value.Gte);
+		writer.WriteProperty(options, PropLt, value.Lt);
+		writer.WriteProperty(options, PropLte, value.Lte);
+		writer.WriteProperty(options, PropQueryName, value.QueryName);
+		writer.WriteProperty(options, PropRelation, value.Relation);
 		writer.WriteEndObject();
 		writer.WriteEndObject();
 	}
 }
 
 [JsonConverter(typeof(NumberRangeQueryConverter))]
-public sealed partial class NumberRangeQuery
+public sealed partial class NumberRangeQuery : IRangeQuery
 {
 	public NumberRangeQuery(Elastic.Clients.Elasticsearch.Serverless.Field field)
 	{
@@ -156,6 +145,10 @@ public NumberRangeQuery(Elastic.Clients.Elasticsearch.Serverless.Field field)
 		Field = field;
 	}
 
+	internal NumberRangeQuery()
+	{
+	}
+
 	/// <summary>
 	/// <para>
 	/// Floating point number used to decrease or increase the relevance scores of the query.
@@ -202,6 +195,8 @@ public NumberRangeQuery(Elastic.Clients.Elasticsearch.Serverless.Field field)
 	/// </para>
 	/// </summary>
 	public Elastic.Clients.Elasticsearch.Serverless.QueryDsl.RangeRelation? Relation { get; set; }
+
+	public string Type => "numberrangequery";
 }
 
 public sealed partial class NumberRangeQueryDescriptor<TDocument> : SerializableDescriptor<NumberRangeQueryDescriptor<TDocument>>
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/NumericDecayFunction.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/NumericDecayFunction.g.cs
index c8fb77dbb14..09492061b9d 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/NumericDecayFunction.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/NumericDecayFunction.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,60 +28,51 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.QueryDsl;
 
-internal sealed partial class NumericDecayFunctionConverter : JsonConverter<NumericDecayFunction>
+internal sealed partial class NumericDecayFunctionConverter : System.Text.Json.Serialization.JsonConverter<NumericDecayFunction>
 {
-	public override NumericDecayFunction Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		var variant = new NumericDecayFunction();
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
-		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
-			{
-				var property = reader.GetString();
-				if (property == "multi_value_mode")
-				{
-					variant.MultiValueMode = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MultiValueMode?>(ref reader, options);
-					continue;
-				}
-
-				variant.Field = property;
-				reader.Read();
-				variant.Placement = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.DecayPlacement<double, double>>(ref reader, options);
-			}
-		}
-
-		return variant;
-	}
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropPlacement = System.Text.Json.JsonEncodedText.Encode("placement");
+	private static readonly System.Text.Json.JsonEncodedText PropMultiValueMode = System.Text.Json.JsonEncodedText.Encode("multi_value_mode");
 
-	public override void Write(Utf8JsonWriter writer, NumericDecayFunction value, JsonSerializerOptions options)
+	public override NumericDecayFunction Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		writer.WriteStartObject();
-		if (value.Field is not null && value.Placement is not null)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Field> propField = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.DecayPlacement<double, double>> propPlacement = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MultiValueMode?> propMultiValueMode = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (!options.TryGetClientSettings(out var settings))
+			if (propMultiValueMode.TryRead(ref reader, options, PropMultiValueMode))
 			{
-				ThrowHelper.ThrowJsonExceptionForMissingSettings();
+				continue;
 			}
 
-			var propertyName = settings.Inferrer.Field(value.Field);
-			writer.WritePropertyName(propertyName);
-			JsonSerializer.Serialize(writer, value.Placement, options);
+			propField.Initialized = propPlacement.Initialized = true;
+			reader.ReadProperty(options, out propField.Value, out propPlacement.Value);
 		}
 
-		if (value.MultiValueMode is not null)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new NumericDecayFunction
 		{
-			writer.WritePropertyName("multi_value_mode");
-			JsonSerializer.Serialize(writer, value.MultiValueMode, options);
-		}
+			Field = propField.Value
+,
+			Placement = propPlacement.Value
+,
+			MultiValueMode = propMultiValueMode.Value
+		};
+	}
 
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, NumericDecayFunction value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropMultiValueMode, value.MultiValueMode);
+		writer.WriteProperty(options, value.Field, value.Placement);
 		writer.WriteEndObject();
 	}
 }
 
 [JsonConverter(typeof(NumericDecayFunctionConverter))]
-public sealed partial class NumericDecayFunction
+public sealed partial class NumericDecayFunction : IDecayFunction
 {
 	public Elastic.Clients.Elasticsearch.Serverless.Field Field { get; set; }
 
@@ -91,6 +83,8 @@ public sealed partial class NumericDecayFunction
 	/// </summary>
 	public Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MultiValueMode? MultiValueMode { get; set; }
 	public Elastic.Clients.Elasticsearch.Serverless.QueryDsl.DecayPlacement<double, double> Placement { get; set; }
+
+	public string Type => "numericdecayfunction";
 }
 
 public sealed partial class NumericDecayFunctionDescriptor<TDocument> : SerializableDescriptor<NumericDecayFunctionDescriptor<TDocument>>
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/PinnedQuery.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/PinnedQuery.g.cs
index 3cee9827032..5429314b790 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/PinnedQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/PinnedQuery.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -39,12 +40,16 @@ internal PinnedQuery(string variantName, object variant)
 			throw new ArgumentNullException(nameof(variant));
 		if (string.IsNullOrWhiteSpace(variantName))
 			throw new ArgumentException("Variant name must not be empty or whitespace.");
-		VariantName = variantName;
+		VariantType = variantName;
 		Variant = variant;
 	}
 
-	internal object Variant { get; }
-	internal string VariantName { get; }
+	internal PinnedQuery()
+	{
+	}
+
+	public object Variant { get; internal set; }
+	public string VariantType { get; internal set; }
 
 	public static PinnedQuery Docs(IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.PinnedDoc> pinnedDoc) => new PinnedQuery("docs", pinnedDoc);
 	public static PinnedQuery Ids(IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Id> id) => new PinnedQuery("ids", id);
@@ -83,111 +88,91 @@ public bool TryGet<T>([NotNullWhen(true)] out T? result) where T : class
 	}
 }
 
-internal sealed partial class PinnedQueryConverter : JsonConverter<PinnedQuery>
+internal sealed partial class PinnedQueryConverter : System.Text.Json.Serialization.JsonConverter<PinnedQuery>
 {
-	public override PinnedQuery Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-		{
-			throw new JsonException("Expected start token.");
-		}
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropOrganic = System.Text.Json.JsonEncodedText.Encode("organic");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryName = System.Text.Json.JsonEncodedText.Encode("_name");
+	private static readonly System.Text.Json.JsonEncodedText VariantDocs = System.Text.Json.JsonEncodedText.Encode("docs");
+	private static readonly System.Text.Json.JsonEncodedText VariantIds = System.Text.Json.JsonEncodedText.Encode("ids");
 
-		object? variantValue = default;
-		string? variantNameValue = default;
-		float? boostValue = default;
-		Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query organicValue = default;
-		string? queryNameValue = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+	public override PinnedQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<float?> propBoost = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query> propOrganic = default;
+		LocalJsonProperty<string?> propQueryName = default;
+		var variantType = string.Empty;
+		object? variant = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
+			if (propBoost.TryRead(ref reader, options, PropBoost))
 			{
-				throw new JsonException("Expected a property name token.");
-			}
-
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token representing the name of an Elasticsearch field.");
-			}
-
-			var propertyName = reader.GetString();
-			reader.Read();
-			if (propertyName == "boost")
-			{
-				boostValue = JsonSerializer.Deserialize<float?>(ref reader, options);
 				continue;
 			}
 
-			if (propertyName == "organic")
+			if (propOrganic.TryRead(ref reader, options, PropOrganic))
 			{
-				organicValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query>(ref reader, options);
 				continue;
 			}
 
-			if (propertyName == "_name")
+			if (propQueryName.TryRead(ref reader, options, PropQueryName))
 			{
-				queryNameValue = JsonSerializer.Deserialize<string?>(ref reader, options);
 				continue;
 			}
 
-			if (propertyName == "docs")
+			if (reader.ValueTextEquals(VariantDocs))
 			{
-				variantValue = JsonSerializer.Deserialize<ICollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.PinnedDoc>?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantDocs.Value;
+				reader.Read();
+				variant = reader.ReadValue<ICollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.PinnedDoc>?>(options);
 				continue;
 			}
 
-			if (propertyName == "ids")
+			if (reader.ValueTextEquals(VariantIds))
 			{
-				variantValue = JsonSerializer.Deserialize<ICollection<Elastic.Clients.Elasticsearch.Serverless.Id>?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantIds.Value;
+				reader.Read();
+				variant = reader.ReadValue<ICollection<Elastic.Clients.Elasticsearch.Serverless.Id>?>(options);
 				continue;
 			}
 
-			throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'PinnedQuery' from the response.");
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		var result = new PinnedQuery(variantNameValue, variantValue);
-		result.Boost = boostValue;
-		result.Organic = organicValue;
-		result.QueryName = queryNameValue;
-		return result;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PinnedQuery
+		{
+			VariantType = variantType,
+			Variant = variant,
+			Boost = propBoost.Value
+	,
+			Organic = propOrganic.Value
+	,
+			QueryName = propQueryName.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, PinnedQuery value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PinnedQuery value, System.Text.Json.JsonSerializerOptions options)
 	{
 		writer.WriteStartObject();
-		if (value.Boost.HasValue)
+		switch (value.VariantType)
 		{
-			writer.WritePropertyName("boost");
-			writer.WriteNumberValue(value.Boost.Value);
-		}
-
-		if (value.Organic is not null)
-		{
-			writer.WritePropertyName("organic");
-			JsonSerializer.Serialize(writer, value.Organic, options);
-		}
-
-		if (!string.IsNullOrEmpty(value.QueryName))
-		{
-			writer.WritePropertyName("_name");
-			writer.WriteStringValue(value.QueryName);
-		}
-
-		if (value.VariantName is not null && value.Variant is not null)
-		{
-			writer.WritePropertyName(value.VariantName);
-			switch (value.VariantName)
-			{
-				case "docs":
-					JsonSerializer.Serialize<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.PinnedDoc>>(writer, (IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.PinnedDoc>)value.Variant, options);
-					break;
-				case "ids":
-					JsonSerializer.Serialize<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Id>>(writer, (IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Id>)value.Variant, options);
-					break;
-			}
+			case "":
+				break;
+			case "docs":
+				writer.WriteProperty(options, value.VariantType, (ICollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.PinnedDoc>?)value.Variant);
+				break;
+			case "ids":
+				writer.WriteProperty(options, value.VariantType, (ICollection<Elastic.Clients.Elasticsearch.Serverless.Id>?)value.Variant);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.VariantType}' is not supported for type '{nameof(PinnedQuery)}'.");
 		}
 
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropOrganic, value.Organic);
+		writer.WriteProperty(options, PropQueryName, value.QueryName);
 		writer.WriteEndObject();
 	}
 }
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/PrefixQuery.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/PrefixQuery.g.cs
index f808632a013..16f9ad937ef 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/PrefixQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/PrefixQuery.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,92 +28,95 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.QueryDsl;
 
-internal sealed partial class PrefixQueryConverter : JsonConverter<PrefixQuery>
+internal sealed partial class PrefixQueryConverter : System.Text.Json.Serialization.JsonConverter<PrefixQuery>
 {
-	public override PrefixQuery Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropCaseInsensitive = System.Text.Json.JsonEncodedText.Encode("case_insensitive");
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryName = System.Text.Json.JsonEncodedText.Encode("_name");
+	private static readonly System.Text.Json.JsonEncodedText PropRewrite = System.Text.Json.JsonEncodedText.Encode("rewrite");
+	private static readonly System.Text.Json.JsonEncodedText PropValue = System.Text.Json.JsonEncodedText.Encode("value");
+
+	public override PrefixQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Field> propField = default;
 		reader.Read();
-		var fieldName = reader.GetString();
+		propField.Value = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Field>(options);
+		propField.Initialized = true;
 		reader.Read();
-		var variant = new PrefixQuery(fieldName);
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		if (reader.TokenType is not System.Text.Json.JsonTokenType.StartObject)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			var value = reader.ReadValue<string>(options);
+			reader.Read();
+			return new PrefixQuery { Value = value };
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<float?> propBoost = default;
+		LocalJsonProperty<bool?> propCaseInsensitive = default;
+		LocalJsonProperty<string?> propQueryName = default;
+		LocalJsonProperty<string?> propRewrite = default;
+		LocalJsonProperty<string> propValue = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBoost.TryRead(ref reader, options, PropBoost))
 			{
-				var property = reader.GetString();
-				if (property == "boost")
-				{
-					variant.Boost = JsonSerializer.Deserialize<float?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "case_insensitive")
-				{
-					variant.CaseInsensitive = JsonSerializer.Deserialize<bool?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "_name")
-				{
-					variant.QueryName = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "rewrite")
-				{
-					variant.Rewrite = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "value")
-				{
-					variant.Value = JsonSerializer.Deserialize<string>(ref reader, options);
-					continue;
-				}
+				continue;
 			}
-		}
 
-		reader.Read();
-		return variant;
-	}
+			if (propCaseInsensitive.TryRead(ref reader, options, PropCaseInsensitive))
+			{
+				continue;
+			}
 
-	public override void Write(Utf8JsonWriter writer, PrefixQuery value, JsonSerializerOptions options)
-	{
-		if (value.Field is null)
-			throw new JsonException("Unable to serialize PrefixQuery because the `Field` property is not set. Field name queries must include a valid field name.");
-		if (!options.TryGetClientSettings(out var settings))
-			throw new JsonException("Unable to retrieve client settings required to infer field.");
-		writer.WriteStartObject();
-		writer.WritePropertyName(settings.Inferrer.Field(value.Field));
-		writer.WriteStartObject();
-		if (value.Boost.HasValue)
-		{
-			writer.WritePropertyName("boost");
-			writer.WriteNumberValue(value.Boost.Value);
-		}
+			if (propQueryName.TryRead(ref reader, options, PropQueryName))
+			{
+				continue;
+			}
 
-		if (value.CaseInsensitive.HasValue)
-		{
-			writer.WritePropertyName("case_insensitive");
-			writer.WriteBooleanValue(value.CaseInsensitive.Value);
-		}
+			if (propRewrite.TryRead(ref reader, options, PropRewrite))
+			{
+				continue;
+			}
 
-		if (!string.IsNullOrEmpty(value.QueryName))
-		{
-			writer.WritePropertyName("_name");
-			writer.WriteStringValue(value.QueryName);
+			if (propValue.TryRead(ref reader, options, PropValue))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		if (!string.IsNullOrEmpty(value.Rewrite))
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		reader.Read();
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PrefixQuery
 		{
-			writer.WritePropertyName("rewrite");
-			writer.WriteStringValue(value.Rewrite);
-		}
+			Boost = propBoost.Value
+,
+			CaseInsensitive = propCaseInsensitive.Value
+,
+			Field = propField.Value
+,
+			QueryName = propQueryName.Value
+,
+			Rewrite = propRewrite.Value
+,
+			Value = propValue.Value
+		};
+	}
 
-		writer.WritePropertyName("value");
-		writer.WriteStringValue(value.Value);
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PrefixQuery value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WritePropertyName(options, value.Field);
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropCaseInsensitive, value.CaseInsensitive);
+		writer.WriteProperty(options, PropQueryName, value.QueryName);
+		writer.WriteProperty(options, PropRewrite, value.Rewrite);
+		writer.WriteProperty(options, PropValue, value.Value);
 		writer.WriteEndObject();
 		writer.WriteEndObject();
 	}
@@ -128,6 +132,10 @@ public PrefixQuery(Elastic.Clients.Elasticsearch.Serverless.Field field)
 		Field = field;
 	}
 
+	internal PrefixQuery()
+	{
+	}
+
 	/// <summary>
 	/// <para>
 	/// Floating point number used to decrease or increase the relevance scores of the query.
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/Query.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/Query.g.cs
index 344d8300e1b..8771568a62e 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/Query.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/Query.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -44,18 +45,23 @@ internal Query(string variantName, object variant)
 			throw new ArgumentNullException(nameof(variant));
 		if (string.IsNullOrWhiteSpace(variantName))
 			throw new ArgumentException("Variant name must not be empty or whitespace.");
-		VariantName = variantName;
+		VariantType = variantName;
 		Variant = variant;
 	}
 
-	internal object Variant { get; }
-	internal string VariantName { get; }
+	internal Query()
+	{
+	}
+
+	public object Variant { get; internal set; }
+	public string VariantType { get; internal set; }
 
 	public static Query Bool(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.BoolQuery boolQuery) => new Query("bool", boolQuery);
 	public static Query Boosting(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.BoostingQuery boostingQuery) => new Query("boosting", boostingQuery);
 	public static Query CombinedFields(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.CombinedFieldsQuery combinedFieldsQuery) => new Query("combined_fields", combinedFieldsQuery);
 	public static Query ConstantScore(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.ConstantScoreQuery constantScoreQuery) => new Query("constant_score", constantScoreQuery);
 	public static Query DisMax(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.DisMaxQuery disMaxQuery) => new Query("dis_max", disMaxQuery);
+	public static Query DistanceFeature(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IDistanceFeatureQuery distanceFeatureQuery) => new Query("distance_feature", distanceFeatureQuery);
 	public static Query DistanceFeature(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.UntypedDistanceFeatureQuery distanceFeatureQuery) => new Query("distance_feature", distanceFeatureQuery);
 	public static Query DistanceFeature(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.GeoDistanceFeatureQuery distanceFeatureQuery) => new Query("distance_feature", distanceFeatureQuery);
 	public static Query DistanceFeature(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.DateDistanceFeatureQuery distanceFeatureQuery) => new Query("distance_feature", distanceFeatureQuery);
@@ -84,6 +90,7 @@ internal Query(string variantName, object variant)
 	public static Query Pinned(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.PinnedQuery pinnedQuery) => new Query("pinned", pinnedQuery);
 	public static Query Prefix(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.PrefixQuery prefixQuery) => new Query("prefix", prefixQuery);
 	public static Query QueryString(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.QueryStringQuery queryStringQuery) => new Query("query_string", queryStringQuery);
+	public static Query Range(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IRangeQuery rangeQuery) => new Query("range", rangeQuery);
 	public static Query Range(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.UntypedRangeQuery rangeQuery) => new Query("range", rangeQuery);
 	public static Query Range(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.DateRangeQuery rangeQuery) => new Query("range", rangeQuery);
 	public static Query Range(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.NumberRangeQuery rangeQuery) => new Query("range", rangeQuery);
@@ -126,607 +133,704 @@ public bool TryGet<T>([NotNullWhen(true)] out T? result) where T : class
 	}
 }
 
-internal sealed partial class QueryConverter : JsonConverter<Query>
+internal sealed partial class QueryConverter : System.Text.Json.Serialization.JsonConverter<Query>
 {
-	public override Query Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText VariantBool = System.Text.Json.JsonEncodedText.Encode("bool");
+	private static readonly System.Text.Json.JsonEncodedText VariantBoosting = System.Text.Json.JsonEncodedText.Encode("boosting");
+	private static readonly System.Text.Json.JsonEncodedText VariantCombinedFields = System.Text.Json.JsonEncodedText.Encode("combined_fields");
+	private static readonly System.Text.Json.JsonEncodedText VariantConstantScore = System.Text.Json.JsonEncodedText.Encode("constant_score");
+	private static readonly System.Text.Json.JsonEncodedText VariantDisMax = System.Text.Json.JsonEncodedText.Encode("dis_max");
+	private static readonly System.Text.Json.JsonEncodedText VariantDistanceFeature = System.Text.Json.JsonEncodedText.Encode("distance_feature");
+	private static readonly System.Text.Json.JsonEncodedText VariantExists = System.Text.Json.JsonEncodedText.Encode("exists");
+	private static readonly System.Text.Json.JsonEncodedText VariantFunctionScore = System.Text.Json.JsonEncodedText.Encode("function_score");
+	private static readonly System.Text.Json.JsonEncodedText VariantFuzzy = System.Text.Json.JsonEncodedText.Encode("fuzzy");
+	private static readonly System.Text.Json.JsonEncodedText VariantGeoBoundingBox = System.Text.Json.JsonEncodedText.Encode("geo_bounding_box");
+	private static readonly System.Text.Json.JsonEncodedText VariantGeoDistance = System.Text.Json.JsonEncodedText.Encode("geo_distance");
+	private static readonly System.Text.Json.JsonEncodedText VariantGeoShape = System.Text.Json.JsonEncodedText.Encode("geo_shape");
+	private static readonly System.Text.Json.JsonEncodedText VariantHasChild = System.Text.Json.JsonEncodedText.Encode("has_child");
+	private static readonly System.Text.Json.JsonEncodedText VariantHasParent = System.Text.Json.JsonEncodedText.Encode("has_parent");
+	private static readonly System.Text.Json.JsonEncodedText VariantIds = System.Text.Json.JsonEncodedText.Encode("ids");
+	private static readonly System.Text.Json.JsonEncodedText VariantIntervals = System.Text.Json.JsonEncodedText.Encode("intervals");
+	private static readonly System.Text.Json.JsonEncodedText VariantKnn = System.Text.Json.JsonEncodedText.Encode("knn");
+	private static readonly System.Text.Json.JsonEncodedText VariantMatch = System.Text.Json.JsonEncodedText.Encode("match");
+	private static readonly System.Text.Json.JsonEncodedText VariantMatchAll = System.Text.Json.JsonEncodedText.Encode("match_all");
+	private static readonly System.Text.Json.JsonEncodedText VariantMatchBoolPrefix = System.Text.Json.JsonEncodedText.Encode("match_bool_prefix");
+	private static readonly System.Text.Json.JsonEncodedText VariantMatchNone = System.Text.Json.JsonEncodedText.Encode("match_none");
+	private static readonly System.Text.Json.JsonEncodedText VariantMatchPhrase = System.Text.Json.JsonEncodedText.Encode("match_phrase");
+	private static readonly System.Text.Json.JsonEncodedText VariantMatchPhrasePrefix = System.Text.Json.JsonEncodedText.Encode("match_phrase_prefix");
+	private static readonly System.Text.Json.JsonEncodedText VariantMoreLikeThis = System.Text.Json.JsonEncodedText.Encode("more_like_this");
+	private static readonly System.Text.Json.JsonEncodedText VariantMultiMatch = System.Text.Json.JsonEncodedText.Encode("multi_match");
+	private static readonly System.Text.Json.JsonEncodedText VariantNested = System.Text.Json.JsonEncodedText.Encode("nested");
+	private static readonly System.Text.Json.JsonEncodedText VariantParentId = System.Text.Json.JsonEncodedText.Encode("parent_id");
+	private static readonly System.Text.Json.JsonEncodedText VariantPercolate = System.Text.Json.JsonEncodedText.Encode("percolate");
+	private static readonly System.Text.Json.JsonEncodedText VariantPinned = System.Text.Json.JsonEncodedText.Encode("pinned");
+	private static readonly System.Text.Json.JsonEncodedText VariantPrefix = System.Text.Json.JsonEncodedText.Encode("prefix");
+	private static readonly System.Text.Json.JsonEncodedText VariantQueryString = System.Text.Json.JsonEncodedText.Encode("query_string");
+	private static readonly System.Text.Json.JsonEncodedText VariantRange = System.Text.Json.JsonEncodedText.Encode("range");
+	private static readonly System.Text.Json.JsonEncodedText VariantRankFeature = System.Text.Json.JsonEncodedText.Encode("rank_feature");
+	private static readonly System.Text.Json.JsonEncodedText VariantRawJson = System.Text.Json.JsonEncodedText.Encode("raw_json");
+	private static readonly System.Text.Json.JsonEncodedText VariantRegexp = System.Text.Json.JsonEncodedText.Encode("regexp");
+	private static readonly System.Text.Json.JsonEncodedText VariantRule = System.Text.Json.JsonEncodedText.Encode("rule");
+	private static readonly System.Text.Json.JsonEncodedText VariantScript = System.Text.Json.JsonEncodedText.Encode("script");
+	private static readonly System.Text.Json.JsonEncodedText VariantScriptScore = System.Text.Json.JsonEncodedText.Encode("script_score");
+	private static readonly System.Text.Json.JsonEncodedText VariantSemantic = System.Text.Json.JsonEncodedText.Encode("semantic");
+	private static readonly System.Text.Json.JsonEncodedText VariantShape = System.Text.Json.JsonEncodedText.Encode("shape");
+	private static readonly System.Text.Json.JsonEncodedText VariantSimpleQueryString = System.Text.Json.JsonEncodedText.Encode("simple_query_string");
+	private static readonly System.Text.Json.JsonEncodedText VariantSpanContaining = System.Text.Json.JsonEncodedText.Encode("span_containing");
+	private static readonly System.Text.Json.JsonEncodedText VariantSpanFieldMasking = System.Text.Json.JsonEncodedText.Encode("span_field_masking");
+	private static readonly System.Text.Json.JsonEncodedText VariantSpanFirst = System.Text.Json.JsonEncodedText.Encode("span_first");
+	private static readonly System.Text.Json.JsonEncodedText VariantSpanMulti = System.Text.Json.JsonEncodedText.Encode("span_multi");
+	private static readonly System.Text.Json.JsonEncodedText VariantSpanNear = System.Text.Json.JsonEncodedText.Encode("span_near");
+	private static readonly System.Text.Json.JsonEncodedText VariantSpanNot = System.Text.Json.JsonEncodedText.Encode("span_not");
+	private static readonly System.Text.Json.JsonEncodedText VariantSpanOr = System.Text.Json.JsonEncodedText.Encode("span_or");
+	private static readonly System.Text.Json.JsonEncodedText VariantSpanTerm = System.Text.Json.JsonEncodedText.Encode("span_term");
+	private static readonly System.Text.Json.JsonEncodedText VariantSpanWithin = System.Text.Json.JsonEncodedText.Encode("span_within");
+	private static readonly System.Text.Json.JsonEncodedText VariantSparseVector = System.Text.Json.JsonEncodedText.Encode("sparse_vector");
+	private static readonly System.Text.Json.JsonEncodedText VariantTerm = System.Text.Json.JsonEncodedText.Encode("term");
+	private static readonly System.Text.Json.JsonEncodedText VariantTerms = System.Text.Json.JsonEncodedText.Encode("terms");
+	private static readonly System.Text.Json.JsonEncodedText VariantTermsSet = System.Text.Json.JsonEncodedText.Encode("terms_set");
+	private static readonly System.Text.Json.JsonEncodedText VariantWildcard = System.Text.Json.JsonEncodedText.Encode("wildcard");
+	private static readonly System.Text.Json.JsonEncodedText VariantWrapper = System.Text.Json.JsonEncodedText.Encode("wrapper");
+
+	public override Query Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		var variantType = string.Empty;
+		object? variant = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			throw new JsonException("Expected start token.");
-		}
-
-		object? variantValue = default;
-		string? variantNameValue = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
-		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token.");
-			}
-
-			if (reader.TokenType != JsonTokenType.PropertyName)
+			if (reader.ValueTextEquals(VariantBool))
 			{
-				throw new JsonException("Expected a property name token representing the name of an Elasticsearch field.");
-			}
-
-			var propertyName = reader.GetString();
-			reader.Read();
-			if (propertyName == "bool")
-			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.BoolQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantBool.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.BoolQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "boosting")
+			if (reader.ValueTextEquals(VariantBoosting))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.BoostingQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantBoosting.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.BoostingQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "combined_fields")
+			if (reader.ValueTextEquals(VariantCombinedFields))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.CombinedFieldsQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantCombinedFields.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.CombinedFieldsQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "constant_score")
+			if (reader.ValueTextEquals(VariantConstantScore))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.ConstantScoreQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantConstantScore.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.ConstantScoreQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "dis_max")
+			if (reader.ValueTextEquals(VariantDisMax))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.DisMaxQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantDisMax.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.DisMaxQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "distance_feature")
+			if (reader.ValueTextEquals(VariantDistanceFeature))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.UntypedDistanceFeatureQuery>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantDistanceFeature.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IDistanceFeatureQuery>(options);
 				continue;
 			}
 
-			if (propertyName == "exists")
+			if (reader.ValueTextEquals(VariantExists))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.ExistsQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantExists.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.ExistsQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "function_score")
+			if (reader.ValueTextEquals(VariantFunctionScore))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.FunctionScoreQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantFunctionScore.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.FunctionScoreQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "fuzzy")
+			if (reader.ValueTextEquals(VariantFuzzy))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.FuzzyQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantFuzzy.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.FuzzyQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "geo_bounding_box")
+			if (reader.ValueTextEquals(VariantGeoBoundingBox))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.GeoBoundingBoxQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantGeoBoundingBox.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.GeoBoundingBoxQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "geo_distance")
+			if (reader.ValueTextEquals(VariantGeoDistance))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.GeoDistanceQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantGeoDistance.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.GeoDistanceQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "geo_shape")
+			if (reader.ValueTextEquals(VariantGeoShape))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.GeoShapeQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantGeoShape.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.GeoShapeQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "has_child")
+			if (reader.ValueTextEquals(VariantHasChild))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.HasChildQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantHasChild.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.HasChildQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "has_parent")
+			if (reader.ValueTextEquals(VariantHasParent))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.HasParentQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantHasParent.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.HasParentQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "ids")
+			if (reader.ValueTextEquals(VariantIds))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IdsQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantIds.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IdsQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "intervals")
+			if (reader.ValueTextEquals(VariantIntervals))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IntervalsQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantIntervals.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IntervalsQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "knn")
+			if (reader.ValueTextEquals(VariantKnn))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.KnnQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantKnn.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.KnnQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "match")
+			if (reader.ValueTextEquals(VariantMatch))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MatchQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantMatch.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MatchQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "match_all")
+			if (reader.ValueTextEquals(VariantMatchAll))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MatchAllQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantMatchAll.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MatchAllQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "match_bool_prefix")
+			if (reader.ValueTextEquals(VariantMatchBoolPrefix))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MatchBoolPrefixQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantMatchBoolPrefix.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MatchBoolPrefixQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "match_none")
+			if (reader.ValueTextEquals(VariantMatchNone))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MatchNoneQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantMatchNone.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MatchNoneQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "match_phrase")
+			if (reader.ValueTextEquals(VariantMatchPhrase))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MatchPhraseQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantMatchPhrase.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MatchPhraseQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "match_phrase_prefix")
+			if (reader.ValueTextEquals(VariantMatchPhrasePrefix))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MatchPhrasePrefixQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantMatchPhrasePrefix.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MatchPhrasePrefixQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "more_like_this")
+			if (reader.ValueTextEquals(VariantMoreLikeThis))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MoreLikeThisQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantMoreLikeThis.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MoreLikeThisQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "multi_match")
+			if (reader.ValueTextEquals(VariantMultiMatch))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MultiMatchQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantMultiMatch.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MultiMatchQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "nested")
+			if (reader.ValueTextEquals(VariantNested))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.NestedQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantNested.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.NestedQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "parent_id")
+			if (reader.ValueTextEquals(VariantParentId))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.ParentIdQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantParentId.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.ParentIdQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "percolate")
+			if (reader.ValueTextEquals(VariantPercolate))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.PercolateQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantPercolate.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.PercolateQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "pinned")
+			if (reader.ValueTextEquals(VariantPinned))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.PinnedQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantPinned.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.PinnedQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "prefix")
+			if (reader.ValueTextEquals(VariantPrefix))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.PrefixQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantPrefix.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.PrefixQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "query_string")
+			if (reader.ValueTextEquals(VariantQueryString))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.QueryStringQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantQueryString.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.QueryStringQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "range")
+			if (reader.ValueTextEquals(VariantRange))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.UntypedRangeQuery>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantRange.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IRangeQuery>(options);
 				continue;
 			}
 
-			if (propertyName == "rank_feature")
+			if (reader.ValueTextEquals(VariantRankFeature))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.RankFeatureQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantRankFeature.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.RankFeatureQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "raw_json")
+			if (reader.ValueTextEquals(VariantRawJson))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.RawJsonQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantRawJson.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.RawJsonQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "regexp")
+			if (reader.ValueTextEquals(VariantRegexp))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.RegexpQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantRegexp.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.RegexpQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "rule")
+			if (reader.ValueTextEquals(VariantRule))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.RuleQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantRule.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.RuleQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "script")
+			if (reader.ValueTextEquals(VariantScript))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.ScriptQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantScript.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.ScriptQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "script_score")
+			if (reader.ValueTextEquals(VariantScriptScore))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.ScriptScoreQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantScriptScore.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.ScriptScoreQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "semantic")
+			if (reader.ValueTextEquals(VariantSemantic))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SemanticQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantSemantic.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SemanticQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "shape")
+			if (reader.ValueTextEquals(VariantShape))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.ShapeQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantShape.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.ShapeQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "simple_query_string")
+			if (reader.ValueTextEquals(VariantSimpleQueryString))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SimpleQueryStringQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantSimpleQueryString.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SimpleQueryStringQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "span_containing")
+			if (reader.ValueTextEquals(VariantSpanContaining))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanContainingQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantSpanContaining.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanContainingQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "span_field_masking")
+			if (reader.ValueTextEquals(VariantSpanFieldMasking))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanFieldMaskingQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantSpanFieldMasking.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanFieldMaskingQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "span_first")
+			if (reader.ValueTextEquals(VariantSpanFirst))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanFirstQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantSpanFirst.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanFirstQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "span_multi")
+			if (reader.ValueTextEquals(VariantSpanMulti))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanMultiTermQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantSpanMulti.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanMultiTermQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "span_near")
+			if (reader.ValueTextEquals(VariantSpanNear))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanNearQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantSpanNear.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanNearQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "span_not")
+			if (reader.ValueTextEquals(VariantSpanNot))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanNotQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantSpanNot.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanNotQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "span_or")
+			if (reader.ValueTextEquals(VariantSpanOr))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanOrQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantSpanOr.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanOrQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "span_term")
+			if (reader.ValueTextEquals(VariantSpanTerm))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanTermQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantSpanTerm.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanTermQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "span_within")
+			if (reader.ValueTextEquals(VariantSpanWithin))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanWithinQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantSpanWithin.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanWithinQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "sparse_vector")
+			if (reader.ValueTextEquals(VariantSparseVector))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SparseVectorQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantSparseVector.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SparseVectorQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "term")
+			if (reader.ValueTextEquals(VariantTerm))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.TermQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantTerm.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.TermQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "terms")
+			if (reader.ValueTextEquals(VariantTerms))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.TermsQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantTerms.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.TermsQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "terms_set")
+			if (reader.ValueTextEquals(VariantTermsSet))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.TermsSetQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantTermsSet.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.TermsSetQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "wildcard")
+			if (reader.ValueTextEquals(VariantWildcard))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.WildcardQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantWildcard.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.WildcardQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "wrapper")
+			if (reader.ValueTextEquals(VariantWrapper))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.WrapperQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantWrapper.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.WrapperQuery?>(options);
 				continue;
 			}
 
-			throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'Query' from the response.");
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		var result = new Query(variantNameValue, variantValue);
-		return result;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new Query { VariantType = variantType, Variant = variant };
 	}
 
-	public override void Write(Utf8JsonWriter writer, Query value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, Query value, System.Text.Json.JsonSerializerOptions options)
 	{
 		writer.WriteStartObject();
-		if (value.VariantName is not null && value.Variant is not null)
+		switch (value.VariantType)
 		{
-			writer.WritePropertyName(value.VariantName);
-			switch (value.VariantName)
-			{
-				case "bool":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.BoolQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.BoolQuery)value.Variant, options);
-					break;
-				case "boosting":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.BoostingQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.BoostingQuery)value.Variant, options);
-					break;
-				case "combined_fields":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.CombinedFieldsQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.CombinedFieldsQuery)value.Variant, options);
-					break;
-				case "constant_score":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.ConstantScoreQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.ConstantScoreQuery)value.Variant, options);
-					break;
-				case "dis_max":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.DisMaxQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.DisMaxQuery)value.Variant, options);
-					break;
-				case "distance_feature":
-					JsonSerializer.Serialize(writer, value.Variant, value.Variant.GetType(), options);
-					break;
-				case "exists":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.ExistsQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.ExistsQuery)value.Variant, options);
-					break;
-				case "function_score":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.FunctionScoreQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.FunctionScoreQuery)value.Variant, options);
-					break;
-				case "fuzzy":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.FuzzyQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.FuzzyQuery)value.Variant, options);
-					break;
-				case "geo_bounding_box":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.GeoBoundingBoxQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.GeoBoundingBoxQuery)value.Variant, options);
-					break;
-				case "geo_distance":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.GeoDistanceQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.GeoDistanceQuery)value.Variant, options);
-					break;
-				case "geo_shape":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.GeoShapeQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.GeoShapeQuery)value.Variant, options);
-					break;
-				case "has_child":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.HasChildQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.HasChildQuery)value.Variant, options);
-					break;
-				case "has_parent":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.HasParentQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.HasParentQuery)value.Variant, options);
-					break;
-				case "ids":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IdsQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IdsQuery)value.Variant, options);
-					break;
-				case "intervals":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IntervalsQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IntervalsQuery)value.Variant, options);
-					break;
-				case "knn":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.KnnQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.KnnQuery)value.Variant, options);
-					break;
-				case "match":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MatchQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MatchQuery)value.Variant, options);
-					break;
-				case "match_all":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MatchAllQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MatchAllQuery)value.Variant, options);
-					break;
-				case "match_bool_prefix":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MatchBoolPrefixQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MatchBoolPrefixQuery)value.Variant, options);
-					break;
-				case "match_none":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MatchNoneQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MatchNoneQuery)value.Variant, options);
-					break;
-				case "match_phrase":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MatchPhraseQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MatchPhraseQuery)value.Variant, options);
-					break;
-				case "match_phrase_prefix":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MatchPhrasePrefixQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MatchPhrasePrefixQuery)value.Variant, options);
-					break;
-				case "more_like_this":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MoreLikeThisQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MoreLikeThisQuery)value.Variant, options);
-					break;
-				case "multi_match":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MultiMatchQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MultiMatchQuery)value.Variant, options);
-					break;
-				case "nested":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.NestedQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.NestedQuery)value.Variant, options);
-					break;
-				case "parent_id":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.ParentIdQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.ParentIdQuery)value.Variant, options);
-					break;
-				case "percolate":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.PercolateQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.PercolateQuery)value.Variant, options);
-					break;
-				case "pinned":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.PinnedQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.PinnedQuery)value.Variant, options);
-					break;
-				case "prefix":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.PrefixQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.PrefixQuery)value.Variant, options);
-					break;
-				case "query_string":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.QueryStringQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.QueryStringQuery)value.Variant, options);
-					break;
-				case "range":
-					JsonSerializer.Serialize(writer, value.Variant, value.Variant.GetType(), options);
-					break;
-				case "rank_feature":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.RankFeatureQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.RankFeatureQuery)value.Variant, options);
-					break;
-				case "raw_json":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.RawJsonQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.RawJsonQuery)value.Variant, options);
-					break;
-				case "regexp":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.RegexpQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.RegexpQuery)value.Variant, options);
-					break;
-				case "rule":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.RuleQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.RuleQuery)value.Variant, options);
-					break;
-				case "script":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.ScriptQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.ScriptQuery)value.Variant, options);
-					break;
-				case "script_score":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.ScriptScoreQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.ScriptScoreQuery)value.Variant, options);
-					break;
-				case "semantic":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SemanticQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SemanticQuery)value.Variant, options);
-					break;
-				case "shape":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.ShapeQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.ShapeQuery)value.Variant, options);
-					break;
-				case "simple_query_string":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SimpleQueryStringQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SimpleQueryStringQuery)value.Variant, options);
-					break;
-				case "span_containing":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanContainingQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanContainingQuery)value.Variant, options);
-					break;
-				case "span_field_masking":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanFieldMaskingQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanFieldMaskingQuery)value.Variant, options);
-					break;
-				case "span_first":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanFirstQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanFirstQuery)value.Variant, options);
-					break;
-				case "span_multi":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanMultiTermQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanMultiTermQuery)value.Variant, options);
-					break;
-				case "span_near":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanNearQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanNearQuery)value.Variant, options);
-					break;
-				case "span_not":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanNotQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanNotQuery)value.Variant, options);
-					break;
-				case "span_or":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanOrQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanOrQuery)value.Variant, options);
-					break;
-				case "span_term":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanTermQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanTermQuery)value.Variant, options);
-					break;
-				case "span_within":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanWithinQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanWithinQuery)value.Variant, options);
-					break;
-				case "sparse_vector":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SparseVectorQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SparseVectorQuery)value.Variant, options);
-					break;
-				case "term":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.TermQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.TermQuery)value.Variant, options);
-					break;
-				case "terms":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.TermsQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.TermsQuery)value.Variant, options);
-					break;
-				case "terms_set":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.TermsSetQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.TermsSetQuery)value.Variant, options);
-					break;
-				case "wildcard":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.WildcardQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.WildcardQuery)value.Variant, options);
-					break;
-				case "wrapper":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.WrapperQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.WrapperQuery)value.Variant, options);
-					break;
-			}
+			case "":
+				break;
+			case "bool":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.BoolQuery?)value.Variant);
+				break;
+			case "boosting":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.BoostingQuery?)value.Variant);
+				break;
+			case "combined_fields":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.CombinedFieldsQuery?)value.Variant);
+				break;
+			case "constant_score":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.ConstantScoreQuery?)value.Variant);
+				break;
+			case "dis_max":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.DisMaxQuery?)value.Variant);
+				break;
+			case "distance_feature":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IDistanceFeatureQuery)value.Variant);
+				break;
+			case "exists":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.ExistsQuery?)value.Variant);
+				break;
+			case "function_score":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.FunctionScoreQuery?)value.Variant);
+				break;
+			case "fuzzy":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.FuzzyQuery?)value.Variant);
+				break;
+			case "geo_bounding_box":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.GeoBoundingBoxQuery?)value.Variant);
+				break;
+			case "geo_distance":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.GeoDistanceQuery?)value.Variant);
+				break;
+			case "geo_shape":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.GeoShapeQuery?)value.Variant);
+				break;
+			case "has_child":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.HasChildQuery?)value.Variant);
+				break;
+			case "has_parent":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.HasParentQuery?)value.Variant);
+				break;
+			case "ids":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IdsQuery?)value.Variant);
+				break;
+			case "intervals":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IntervalsQuery?)value.Variant);
+				break;
+			case "knn":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.KnnQuery?)value.Variant);
+				break;
+			case "match":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MatchQuery?)value.Variant);
+				break;
+			case "match_all":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MatchAllQuery?)value.Variant);
+				break;
+			case "match_bool_prefix":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MatchBoolPrefixQuery?)value.Variant);
+				break;
+			case "match_none":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MatchNoneQuery?)value.Variant);
+				break;
+			case "match_phrase":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MatchPhraseQuery?)value.Variant);
+				break;
+			case "match_phrase_prefix":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MatchPhrasePrefixQuery?)value.Variant);
+				break;
+			case "more_like_this":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MoreLikeThisQuery?)value.Variant);
+				break;
+			case "multi_match":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MultiMatchQuery?)value.Variant);
+				break;
+			case "nested":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.NestedQuery?)value.Variant);
+				break;
+			case "parent_id":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.ParentIdQuery?)value.Variant);
+				break;
+			case "percolate":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.PercolateQuery?)value.Variant);
+				break;
+			case "pinned":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.PinnedQuery?)value.Variant);
+				break;
+			case "prefix":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.PrefixQuery?)value.Variant);
+				break;
+			case "query_string":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.QueryStringQuery?)value.Variant);
+				break;
+			case "range":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IRangeQuery)value.Variant);
+				break;
+			case "rank_feature":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.RankFeatureQuery?)value.Variant);
+				break;
+			case "raw_json":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.RawJsonQuery?)value.Variant);
+				break;
+			case "regexp":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.RegexpQuery?)value.Variant);
+				break;
+			case "rule":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.RuleQuery?)value.Variant);
+				break;
+			case "script":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.ScriptQuery?)value.Variant);
+				break;
+			case "script_score":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.ScriptScoreQuery?)value.Variant);
+				break;
+			case "semantic":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SemanticQuery?)value.Variant);
+				break;
+			case "shape":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.ShapeQuery?)value.Variant);
+				break;
+			case "simple_query_string":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SimpleQueryStringQuery?)value.Variant);
+				break;
+			case "span_containing":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanContainingQuery?)value.Variant);
+				break;
+			case "span_field_masking":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanFieldMaskingQuery?)value.Variant);
+				break;
+			case "span_first":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanFirstQuery?)value.Variant);
+				break;
+			case "span_multi":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanMultiTermQuery?)value.Variant);
+				break;
+			case "span_near":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanNearQuery?)value.Variant);
+				break;
+			case "span_not":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanNotQuery?)value.Variant);
+				break;
+			case "span_or":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanOrQuery?)value.Variant);
+				break;
+			case "span_term":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanTermQuery?)value.Variant);
+				break;
+			case "span_within":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanWithinQuery?)value.Variant);
+				break;
+			case "sparse_vector":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SparseVectorQuery?)value.Variant);
+				break;
+			case "term":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.TermQuery?)value.Variant);
+				break;
+			case "terms":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.TermsQuery?)value.Variant);
+				break;
+			case "terms_set":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.TermsSetQuery?)value.Variant);
+				break;
+			case "wildcard":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.WildcardQuery?)value.Variant);
+				break;
+			case "wrapper":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.WrapperQuery?)value.Variant);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.VariantType}' is not supported for type '{nameof(Query)}'.");
 		}
 
 		writer.WriteEndObject();
@@ -774,6 +878,7 @@ private QueryDescriptor<TDocument> Set(object variant, string variantName)
 	public QueryDescriptor<TDocument> ConstantScore(Action<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.ConstantScoreQueryDescriptor<TDocument>> configure) => Set(configure, "constant_score");
 	public QueryDescriptor<TDocument> DisMax(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.DisMaxQuery disMaxQuery) => Set(disMaxQuery, "dis_max");
 	public QueryDescriptor<TDocument> DisMax(Action<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.DisMaxQueryDescriptor<TDocument>> configure) => Set(configure, "dis_max");
+	public QueryDescriptor<TDocument> DistanceFeature(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IDistanceFeatureQuery distanceFeatureQuery) => Set(distanceFeatureQuery, "distance_feature");
 	public QueryDescriptor<TDocument> DistanceFeature(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.UntypedDistanceFeatureQuery distanceFeatureQuery) => Set(distanceFeatureQuery, "distance_feature");
 	public QueryDescriptor<TDocument> DistanceFeature(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.GeoDistanceFeatureQuery distanceFeatureQuery) => Set(distanceFeatureQuery, "distance_feature");
 	public QueryDescriptor<TDocument> DistanceFeature(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.DateDistanceFeatureQuery distanceFeatureQuery) => Set(distanceFeatureQuery, "distance_feature");
@@ -827,6 +932,7 @@ private QueryDescriptor<TDocument> Set(object variant, string variantName)
 	public QueryDescriptor<TDocument> Prefix(Action<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.PrefixQueryDescriptor<TDocument>> configure) => Set(configure, "prefix");
 	public QueryDescriptor<TDocument> QueryString(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.QueryStringQuery queryStringQuery) => Set(queryStringQuery, "query_string");
 	public QueryDescriptor<TDocument> QueryString(Action<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.QueryStringQueryDescriptor<TDocument>> configure) => Set(configure, "query_string");
+	public QueryDescriptor<TDocument> Range(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IRangeQuery rangeQuery) => Set(rangeQuery, "range");
 	public QueryDescriptor<TDocument> Range(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.UntypedRangeQuery rangeQuery) => Set(rangeQuery, "range");
 	public QueryDescriptor<TDocument> Range(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.DateRangeQuery rangeQuery) => Set(rangeQuery, "range");
 	public QueryDescriptor<TDocument> Range(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.NumberRangeQuery rangeQuery) => Set(rangeQuery, "range");
@@ -940,6 +1046,7 @@ private QueryDescriptor Set(object variant, string variantName)
 	public QueryDescriptor ConstantScore<TDocument>(Action<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.ConstantScoreQueryDescriptor> configure) => Set(configure, "constant_score");
 	public QueryDescriptor DisMax(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.DisMaxQuery disMaxQuery) => Set(disMaxQuery, "dis_max");
 	public QueryDescriptor DisMax<TDocument>(Action<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.DisMaxQueryDescriptor> configure) => Set(configure, "dis_max");
+	public QueryDescriptor DistanceFeature(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IDistanceFeatureQuery distanceFeatureQuery) => Set(distanceFeatureQuery, "distance_feature");
 	public QueryDescriptor DistanceFeature(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.UntypedDistanceFeatureQuery distanceFeatureQuery) => Set(distanceFeatureQuery, "distance_feature");
 	public QueryDescriptor DistanceFeature(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.GeoDistanceFeatureQuery distanceFeatureQuery) => Set(distanceFeatureQuery, "distance_feature");
 	public QueryDescriptor DistanceFeature(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.DateDistanceFeatureQuery distanceFeatureQuery) => Set(distanceFeatureQuery, "distance_feature");
@@ -993,6 +1100,7 @@ private QueryDescriptor Set(object variant, string variantName)
 	public QueryDescriptor Prefix<TDocument>(Action<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.PrefixQueryDescriptor> configure) => Set(configure, "prefix");
 	public QueryDescriptor QueryString(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.QueryStringQuery queryStringQuery) => Set(queryStringQuery, "query_string");
 	public QueryDescriptor QueryString<TDocument>(Action<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.QueryStringQueryDescriptor> configure) => Set(configure, "query_string");
+	public QueryDescriptor Range(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IRangeQuery rangeQuery) => Set(rangeQuery, "range");
 	public QueryDescriptor Range(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.UntypedRangeQuery rangeQuery) => Set(rangeQuery, "range");
 	public QueryDescriptor Range(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.DateRangeQuery rangeQuery) => Set(rangeQuery, "range");
 	public QueryDescriptor Range(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.NumberRangeQuery rangeQuery) => Set(rangeQuery, "range");
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/QueryStringQuery.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/QueryStringQuery.g.cs
index 0e3a26c5163..a7a7c9eb8c6 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/QueryStringQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/QueryStringQuery.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,300 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.QueryDsl;
 
+internal sealed partial class QueryStringQueryConverter : System.Text.Json.Serialization.JsonConverter<QueryStringQuery>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAllowLeadingWildcard = System.Text.Json.JsonEncodedText.Encode("allow_leading_wildcard");
+	private static readonly System.Text.Json.JsonEncodedText PropAnalyzer = System.Text.Json.JsonEncodedText.Encode("analyzer");
+	private static readonly System.Text.Json.JsonEncodedText PropAnalyzeWildcard = System.Text.Json.JsonEncodedText.Encode("analyze_wildcard");
+	private static readonly System.Text.Json.JsonEncodedText PropAutoGenerateSynonymsPhraseQuery = System.Text.Json.JsonEncodedText.Encode("auto_generate_synonyms_phrase_query");
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropDefaultField = System.Text.Json.JsonEncodedText.Encode("default_field");
+	private static readonly System.Text.Json.JsonEncodedText PropDefaultOperator = System.Text.Json.JsonEncodedText.Encode("default_operator");
+	private static readonly System.Text.Json.JsonEncodedText PropEnablePositionIncrements = System.Text.Json.JsonEncodedText.Encode("enable_position_increments");
+	private static readonly System.Text.Json.JsonEncodedText PropEscape = System.Text.Json.JsonEncodedText.Encode("escape");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropFuzziness = System.Text.Json.JsonEncodedText.Encode("fuzziness");
+	private static readonly System.Text.Json.JsonEncodedText PropFuzzyMaxExpansions = System.Text.Json.JsonEncodedText.Encode("fuzzy_max_expansions");
+	private static readonly System.Text.Json.JsonEncodedText PropFuzzyPrefixLength = System.Text.Json.JsonEncodedText.Encode("fuzzy_prefix_length");
+	private static readonly System.Text.Json.JsonEncodedText PropFuzzyRewrite = System.Text.Json.JsonEncodedText.Encode("fuzzy_rewrite");
+	private static readonly System.Text.Json.JsonEncodedText PropFuzzyTranspositions = System.Text.Json.JsonEncodedText.Encode("fuzzy_transpositions");
+	private static readonly System.Text.Json.JsonEncodedText PropLenient = System.Text.Json.JsonEncodedText.Encode("lenient");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxDeterminizedStates = System.Text.Json.JsonEncodedText.Encode("max_determinized_states");
+	private static readonly System.Text.Json.JsonEncodedText PropMinimumShouldMatch = System.Text.Json.JsonEncodedText.Encode("minimum_should_match");
+	private static readonly System.Text.Json.JsonEncodedText PropPhraseSlop = System.Text.Json.JsonEncodedText.Encode("phrase_slop");
+	private static readonly System.Text.Json.JsonEncodedText PropQuery = System.Text.Json.JsonEncodedText.Encode("query");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryName = System.Text.Json.JsonEncodedText.Encode("_name");
+	private static readonly System.Text.Json.JsonEncodedText PropQuoteAnalyzer = System.Text.Json.JsonEncodedText.Encode("quote_analyzer");
+	private static readonly System.Text.Json.JsonEncodedText PropQuoteFieldSuffix = System.Text.Json.JsonEncodedText.Encode("quote_field_suffix");
+	private static readonly System.Text.Json.JsonEncodedText PropRewrite = System.Text.Json.JsonEncodedText.Encode("rewrite");
+	private static readonly System.Text.Json.JsonEncodedText PropTieBreaker = System.Text.Json.JsonEncodedText.Encode("tie_breaker");
+	private static readonly System.Text.Json.JsonEncodedText PropTimeZone = System.Text.Json.JsonEncodedText.Encode("time_zone");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override QueryStringQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool?> propAllowLeadingWildcard = default;
+		LocalJsonProperty<string?> propAnalyzer = default;
+		LocalJsonProperty<bool?> propAnalyzeWildcard = default;
+		LocalJsonProperty<bool?> propAutoGenerateSynonymsPhraseQuery = default;
+		LocalJsonProperty<float?> propBoost = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Field?> propDefaultField = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Operator?> propDefaultOperator = default;
+		LocalJsonProperty<bool?> propEnablePositionIncrements = default;
+		LocalJsonProperty<bool?> propEscape = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Fields?> propFields = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Fuzziness?> propFuzziness = default;
+		LocalJsonProperty<int?> propFuzzyMaxExpansions = default;
+		LocalJsonProperty<int?> propFuzzyPrefixLength = default;
+		LocalJsonProperty<string?> propFuzzyRewrite = default;
+		LocalJsonProperty<bool?> propFuzzyTranspositions = default;
+		LocalJsonProperty<bool?> propLenient = default;
+		LocalJsonProperty<int?> propMaxDeterminizedStates = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.MinimumShouldMatch?> propMinimumShouldMatch = default;
+		LocalJsonProperty<double?> propPhraseSlop = default;
+		LocalJsonProperty<string> propQuery = default;
+		LocalJsonProperty<string?> propQueryName = default;
+		LocalJsonProperty<string?> propQuoteAnalyzer = default;
+		LocalJsonProperty<string?> propQuoteFieldSuffix = default;
+		LocalJsonProperty<string?> propRewrite = default;
+		LocalJsonProperty<double?> propTieBreaker = default;
+		LocalJsonProperty<string?> propTimeZone = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.TextQueryType?> propType = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAllowLeadingWildcard.TryRead(ref reader, options, PropAllowLeadingWildcard))
+			{
+				continue;
+			}
+
+			if (propAnalyzer.TryRead(ref reader, options, PropAnalyzer))
+			{
+				continue;
+			}
+
+			if (propAnalyzeWildcard.TryRead(ref reader, options, PropAnalyzeWildcard))
+			{
+				continue;
+			}
+
+			if (propAutoGenerateSynonymsPhraseQuery.TryRead(ref reader, options, PropAutoGenerateSynonymsPhraseQuery))
+			{
+				continue;
+			}
+
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
+
+			if (propDefaultField.TryRead(ref reader, options, PropDefaultField))
+			{
+				continue;
+			}
+
+			if (propDefaultOperator.TryRead(ref reader, options, PropDefaultOperator))
+			{
+				continue;
+			}
+
+			if (propEnablePositionIncrements.TryRead(ref reader, options, PropEnablePositionIncrements))
+			{
+				continue;
+			}
+
+			if (propEscape.TryRead(ref reader, options, PropEscape))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields, typeof(FieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propFuzziness.TryRead(ref reader, options, PropFuzziness))
+			{
+				continue;
+			}
+
+			if (propFuzzyMaxExpansions.TryRead(ref reader, options, PropFuzzyMaxExpansions))
+			{
+				continue;
+			}
+
+			if (propFuzzyPrefixLength.TryRead(ref reader, options, PropFuzzyPrefixLength))
+			{
+				continue;
+			}
+
+			if (propFuzzyRewrite.TryRead(ref reader, options, PropFuzzyRewrite))
+			{
+				continue;
+			}
+
+			if (propFuzzyTranspositions.TryRead(ref reader, options, PropFuzzyTranspositions))
+			{
+				continue;
+			}
+
+			if (propLenient.TryRead(ref reader, options, PropLenient))
+			{
+				continue;
+			}
+
+			if (propMaxDeterminizedStates.TryRead(ref reader, options, PropMaxDeterminizedStates))
+			{
+				continue;
+			}
+
+			if (propMinimumShouldMatch.TryRead(ref reader, options, PropMinimumShouldMatch))
+			{
+				continue;
+			}
+
+			if (propPhraseSlop.TryRead(ref reader, options, PropPhraseSlop))
+			{
+				continue;
+			}
+
+			if (propQuery.TryRead(ref reader, options, PropQuery))
+			{
+				continue;
+			}
+
+			if (propQueryName.TryRead(ref reader, options, PropQueryName))
+			{
+				continue;
+			}
+
+			if (propQuoteAnalyzer.TryRead(ref reader, options, PropQuoteAnalyzer))
+			{
+				continue;
+			}
+
+			if (propQuoteFieldSuffix.TryRead(ref reader, options, PropQuoteFieldSuffix))
+			{
+				continue;
+			}
+
+			if (propRewrite.TryRead(ref reader, options, PropRewrite))
+			{
+				continue;
+			}
+
+			if (propTieBreaker.TryRead(ref reader, options, PropTieBreaker))
+			{
+				continue;
+			}
+
+			if (propTimeZone.TryRead(ref reader, options, PropTimeZone))
+			{
+				continue;
+			}
+
+			if (propType.TryRead(ref reader, options, PropType))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new QueryStringQuery
+		{
+			AllowLeadingWildcard = propAllowLeadingWildcard.Value
+,
+			Analyzer = propAnalyzer.Value
+,
+			AnalyzeWildcard = propAnalyzeWildcard.Value
+,
+			AutoGenerateSynonymsPhraseQuery = propAutoGenerateSynonymsPhraseQuery.Value
+,
+			Boost = propBoost.Value
+,
+			DefaultField = propDefaultField.Value
+,
+			DefaultOperator = propDefaultOperator.Value
+,
+			EnablePositionIncrements = propEnablePositionIncrements.Value
+,
+			Escape = propEscape.Value
+,
+			Fields = propFields.Value
+,
+			Fuzziness = propFuzziness.Value
+,
+			FuzzyMaxExpansions = propFuzzyMaxExpansions.Value
+,
+			FuzzyPrefixLength = propFuzzyPrefixLength.Value
+,
+			FuzzyRewrite = propFuzzyRewrite.Value
+,
+			FuzzyTranspositions = propFuzzyTranspositions.Value
+,
+			Lenient = propLenient.Value
+,
+			MaxDeterminizedStates = propMaxDeterminizedStates.Value
+,
+			MinimumShouldMatch = propMinimumShouldMatch.Value
+,
+			PhraseSlop = propPhraseSlop.Value
+,
+			Query = propQuery.Value
+,
+			QueryName = propQueryName.Value
+,
+			QuoteAnalyzer = propQuoteAnalyzer.Value
+,
+			QuoteFieldSuffix = propQuoteFieldSuffix.Value
+,
+			Rewrite = propRewrite.Value
+,
+			TieBreaker = propTieBreaker.Value
+,
+			TimeZone = propTimeZone.Value
+,
+			Type = propType.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, QueryStringQuery value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAllowLeadingWildcard, value.AllowLeadingWildcard);
+		writer.WriteProperty(options, PropAnalyzer, value.Analyzer);
+		writer.WriteProperty(options, PropAnalyzeWildcard, value.AnalyzeWildcard);
+		writer.WriteProperty(options, PropAutoGenerateSynonymsPhraseQuery, value.AutoGenerateSynonymsPhraseQuery);
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropDefaultField, value.DefaultField);
+		writer.WriteProperty(options, PropDefaultOperator, value.DefaultOperator);
+		writer.WriteProperty(options, PropEnablePositionIncrements, value.EnablePositionIncrements);
+		writer.WriteProperty(options, PropEscape, value.Escape);
+		writer.WriteProperty(options, PropFields, value.Fields, typeof(FieldsMarker));
+		writer.WriteProperty(options, PropFuzziness, value.Fuzziness);
+		writer.WriteProperty(options, PropFuzzyMaxExpansions, value.FuzzyMaxExpansions);
+		writer.WriteProperty(options, PropFuzzyPrefixLength, value.FuzzyPrefixLength);
+		writer.WriteProperty(options, PropFuzzyRewrite, value.FuzzyRewrite);
+		writer.WriteProperty(options, PropFuzzyTranspositions, value.FuzzyTranspositions);
+		writer.WriteProperty(options, PropLenient, value.Lenient);
+		writer.WriteProperty(options, PropMaxDeterminizedStates, value.MaxDeterminizedStates);
+		writer.WriteProperty(options, PropMinimumShouldMatch, value.MinimumShouldMatch);
+		writer.WriteProperty(options, PropPhraseSlop, value.PhraseSlop);
+		writer.WriteProperty(options, PropQuery, value.Query);
+		writer.WriteProperty(options, PropQueryName, value.QueryName);
+		writer.WriteProperty(options, PropQuoteAnalyzer, value.QuoteAnalyzer);
+		writer.WriteProperty(options, PropQuoteFieldSuffix, value.QuoteFieldSuffix);
+		writer.WriteProperty(options, PropRewrite, value.Rewrite);
+		writer.WriteProperty(options, PropTieBreaker, value.TieBreaker);
+		writer.WriteProperty(options, PropTimeZone, value.TimeZone);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(QueryStringQueryConverter))]
 public sealed partial class QueryStringQuery
 {
 	/// <summary>
@@ -34,7 +329,6 @@ public sealed partial class QueryStringQuery
 	/// If <c>true</c>, the wildcard characters <c>*</c> and <c>?</c> are allowed as the first character of the query string.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("allow_leading_wildcard")]
 	public bool? AllowLeadingWildcard { get; set; }
 
 	/// <summary>
@@ -42,7 +336,6 @@ public sealed partial class QueryStringQuery
 	/// Analyzer used to convert text in the query string into tokens.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("analyzer")]
 	public string? Analyzer { get; set; }
 
 	/// <summary>
@@ -50,7 +343,6 @@ public sealed partial class QueryStringQuery
 	/// If <c>true</c>, the query attempts to analyze wildcard terms in the query string.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("analyze_wildcard")]
 	public bool? AnalyzeWildcard { get; set; }
 
 	/// <summary>
@@ -58,7 +350,6 @@ public sealed partial class QueryStringQuery
 	/// If <c>true</c>, match phrase queries are automatically created for multi-term synonyms.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("auto_generate_synonyms_phrase_query")]
 	public bool? AutoGenerateSynonymsPhraseQuery { get; set; }
 
 	/// <summary>
@@ -69,7 +360,6 @@ public sealed partial class QueryStringQuery
 	/// A value greater than 1.0 increases the relevance score.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("boost")]
 	public float? Boost { get; set; }
 
 	/// <summary>
@@ -79,7 +369,6 @@ public sealed partial class QueryStringQuery
 	/// Defaults to the <c>index.query.default_field</c> index setting, which has a default value of <c>*</c>.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("default_field")]
 	public Elastic.Clients.Elasticsearch.Serverless.Field? DefaultField { get; set; }
 
 	/// <summary>
@@ -87,7 +376,6 @@ public sealed partial class QueryStringQuery
 	/// Default boolean logic used to interpret text in the query string if no operators are specified.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("default_operator")]
 	public Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Operator? DefaultOperator { get; set; }
 
 	/// <summary>
@@ -95,9 +383,7 @@ public sealed partial class QueryStringQuery
 	/// If <c>true</c>, enable position increments in queries constructed from a <c>query_string</c> search.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("enable_position_increments")]
 	public bool? EnablePositionIncrements { get; set; }
-	[JsonInclude, JsonPropertyName("escape")]
 	public bool? Escape { get; set; }
 
 	/// <summary>
@@ -105,8 +391,6 @@ public sealed partial class QueryStringQuery
 	/// Array of fields to search. Supports wildcards (<c>*</c>).
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("fields")]
-	[JsonConverter(typeof(FieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Serverless.Fields? Fields { get; set; }
 
 	/// <summary>
@@ -114,7 +398,6 @@ public sealed partial class QueryStringQuery
 	/// Maximum edit distance allowed for fuzzy matching.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("fuzziness")]
 	public Elastic.Clients.Elasticsearch.Serverless.Fuzziness? Fuzziness { get; set; }
 
 	/// <summary>
@@ -122,7 +405,6 @@ public sealed partial class QueryStringQuery
 	/// Maximum number of terms to which the query expands for fuzzy matching.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("fuzzy_max_expansions")]
 	public int? FuzzyMaxExpansions { get; set; }
 
 	/// <summary>
@@ -130,7 +412,6 @@ public sealed partial class QueryStringQuery
 	/// Number of beginning characters left unchanged for fuzzy matching.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("fuzzy_prefix_length")]
 	public int? FuzzyPrefixLength { get; set; }
 
 	/// <summary>
@@ -138,7 +419,6 @@ public sealed partial class QueryStringQuery
 	/// Method used to rewrite the query.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("fuzzy_rewrite")]
 	public string? FuzzyRewrite { get; set; }
 
 	/// <summary>
@@ -146,7 +426,6 @@ public sealed partial class QueryStringQuery
 	/// If <c>true</c>, edits for fuzzy matching include transpositions of two adjacent characters (for example, <c>ab</c> to <c>ba</c>).
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("fuzzy_transpositions")]
 	public bool? FuzzyTranspositions { get; set; }
 
 	/// <summary>
@@ -154,7 +433,6 @@ public sealed partial class QueryStringQuery
 	/// If <c>true</c>, format-based errors, such as providing a text value for a numeric field, are ignored.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("lenient")]
 	public bool? Lenient { get; set; }
 
 	/// <summary>
@@ -162,7 +440,6 @@ public sealed partial class QueryStringQuery
 	/// Maximum number of automaton states required for the query.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("max_determinized_states")]
 	public int? MaxDeterminizedStates { get; set; }
 
 	/// <summary>
@@ -170,7 +447,6 @@ public sealed partial class QueryStringQuery
 	/// Minimum number of clauses that must match for a document to be returned.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("minimum_should_match")]
 	public Elastic.Clients.Elasticsearch.Serverless.MinimumShouldMatch? MinimumShouldMatch { get; set; }
 
 	/// <summary>
@@ -178,7 +454,6 @@ public sealed partial class QueryStringQuery
 	/// Maximum number of positions allowed between matching tokens for phrases.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("phrase_slop")]
 	public double? PhraseSlop { get; set; }
 
 	/// <summary>
@@ -186,9 +461,7 @@ public sealed partial class QueryStringQuery
 	/// Query string you wish to parse and use for search.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("query")]
 	public string Query { get; set; }
-	[JsonInclude, JsonPropertyName("_name")]
 	public string? QueryName { get; set; }
 
 	/// <summary>
@@ -197,7 +470,6 @@ public sealed partial class QueryStringQuery
 	/// For quoted text, this parameter overrides the analyzer specified in the <c>analyzer</c> parameter.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("quote_analyzer")]
 	public string? QuoteAnalyzer { get; set; }
 
 	/// <summary>
@@ -206,7 +478,6 @@ public sealed partial class QueryStringQuery
 	/// You can use this suffix to use a different analysis method for exact matches.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("quote_field_suffix")]
 	public string? QuoteFieldSuffix { get; set; }
 
 	/// <summary>
@@ -214,7 +485,6 @@ public sealed partial class QueryStringQuery
 	/// Method used to rewrite the query.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("rewrite")]
 	public string? Rewrite { get; set; }
 
 	/// <summary>
@@ -222,7 +492,6 @@ public sealed partial class QueryStringQuery
 	/// How to combine the queries generated from the individual search terms in the resulting <c>dis_max</c> query.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("tie_breaker")]
 	public double? TieBreaker { get; set; }
 
 	/// <summary>
@@ -230,7 +499,6 @@ public sealed partial class QueryStringQuery
 	/// Coordinated Universal Time (UTC) offset or IANA time zone used to convert date values in the query string to UTC.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("time_zone")]
 	public string? TimeZone { get; set; }
 
 	/// <summary>
@@ -238,7 +506,6 @@ public sealed partial class QueryStringQuery
 	/// Determines how the query matches and scores documents.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("type")]
 	public Elastic.Clients.Elasticsearch.Serverless.QueryDsl.TextQueryType? Type { get; set; }
 
 	public static implicit operator Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query(QueryStringQuery queryStringQuery) => Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query.QueryString(queryStringQuery);
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/RangeQuery.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/RangeQuery.g.cs
new file mode 100644
index 00000000000..3be088cbeff
--- /dev/null
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/RangeQuery.g.cs
@@ -0,0 +1,64 @@
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information.
+//
+// ███╗   ██╗ ██████╗ ████████╗██╗ ██████╗███████╗
+// ████╗  ██║██╔═══██╗╚══██╔══╝██║██╔════╝██╔════╝
+// ██╔██╗ ██║██║   ██║   ██║   ██║██║     █████╗
+// ██║╚██╗██║██║   ██║   ██║   ██║██║     ██╔══╝
+// ██║ ╚████║╚██████╔╝   ██║   ██║╚██████╗███████╗
+// ╚═╝  ╚═══╝ ╚═════╝    ╚═╝   ╚═╝ ╚═════╝╚══════╝
+// ------------------------------------------------
+//
+// This file is automatically generated.
+// Please do not edit these files manually.
+//
+// ------------------------------------------------
+
+#nullable restore
+
+using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
+using Elastic.Clients.Elasticsearch.Serverless.Serialization;
+using System;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Elastic.Clients.Elasticsearch.Serverless.QueryDsl;
+
+[JsonConverter(typeof(RangeQueryConverter))]
+public partial interface IRangeQuery
+{
+	public string? Type { get; }
+}
+
+internal sealed partial class RangeQueryConverter : System.Text.Json.Serialization.JsonConverter<IRangeQuery>
+{
+	public override IRangeQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		return reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.UntypedRangeQuery>(options);
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IRangeQuery value, System.Text.Json.JsonSerializerOptions options)
+	{
+		switch (value)
+		{
+			case Elastic.Clients.Elasticsearch.Serverless.QueryDsl.DateRangeQuery v:
+				writer.WriteValue(options, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Serverless.QueryDsl.NumberRangeQuery v:
+				writer.WriteValue(options, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Serverless.QueryDsl.TermRangeQuery v:
+				writer.WriteValue(options, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Serverless.QueryDsl.UntypedRangeQuery v:
+				writer.WriteValue(options, v);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.Type}' is not supported for type '{nameof(IRangeQuery)}'.");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/RegexpQuery.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/RegexpQuery.g.cs
index 7f6db6dfaec..905d16c0561 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/RegexpQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/RegexpQuery.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,116 +28,115 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.QueryDsl;
 
-internal sealed partial class RegexpQueryConverter : JsonConverter<RegexpQuery>
+internal sealed partial class RegexpQueryConverter : System.Text.Json.Serialization.JsonConverter<RegexpQuery>
 {
-	public override RegexpQuery Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropCaseInsensitive = System.Text.Json.JsonEncodedText.Encode("case_insensitive");
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropFlags = System.Text.Json.JsonEncodedText.Encode("flags");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxDeterminizedStates = System.Text.Json.JsonEncodedText.Encode("max_determinized_states");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryName = System.Text.Json.JsonEncodedText.Encode("_name");
+	private static readonly System.Text.Json.JsonEncodedText PropRewrite = System.Text.Json.JsonEncodedText.Encode("rewrite");
+	private static readonly System.Text.Json.JsonEncodedText PropValue = System.Text.Json.JsonEncodedText.Encode("value");
+
+	public override RegexpQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Field> propField = default;
 		reader.Read();
-		var fieldName = reader.GetString();
+		propField.Value = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Field>(options);
+		propField.Initialized = true;
 		reader.Read();
-		var variant = new RegexpQuery(fieldName);
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		if (reader.TokenType is not System.Text.Json.JsonTokenType.StartObject)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			var value = reader.ReadValue<string>(options);
+			reader.Read();
+			return new RegexpQuery { Value = value };
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<float?> propBoost = default;
+		LocalJsonProperty<bool?> propCaseInsensitive = default;
+		LocalJsonProperty<string?> propFlags = default;
+		LocalJsonProperty<int?> propMaxDeterminizedStates = default;
+		LocalJsonProperty<string?> propQueryName = default;
+		LocalJsonProperty<string?> propRewrite = default;
+		LocalJsonProperty<string> propValue = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBoost.TryRead(ref reader, options, PropBoost))
 			{
-				var property = reader.GetString();
-				if (property == "boost")
-				{
-					variant.Boost = JsonSerializer.Deserialize<float?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "case_insensitive")
-				{
-					variant.CaseInsensitive = JsonSerializer.Deserialize<bool?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "flags")
-				{
-					variant.Flags = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "max_determinized_states")
-				{
-					variant.MaxDeterminizedStates = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "_name")
-				{
-					variant.QueryName = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "rewrite")
-				{
-					variant.Rewrite = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "value")
-				{
-					variant.Value = JsonSerializer.Deserialize<string>(ref reader, options);
-					continue;
-				}
+				continue;
 			}
-		}
 
-		reader.Read();
-		return variant;
-	}
+			if (propCaseInsensitive.TryRead(ref reader, options, PropCaseInsensitive))
+			{
+				continue;
+			}
 
-	public override void Write(Utf8JsonWriter writer, RegexpQuery value, JsonSerializerOptions options)
-	{
-		if (value.Field is null)
-			throw new JsonException("Unable to serialize RegexpQuery because the `Field` property is not set. Field name queries must include a valid field name.");
-		if (!options.TryGetClientSettings(out var settings))
-			throw new JsonException("Unable to retrieve client settings required to infer field.");
-		writer.WriteStartObject();
-		writer.WritePropertyName(settings.Inferrer.Field(value.Field));
-		writer.WriteStartObject();
-		if (value.Boost.HasValue)
-		{
-			writer.WritePropertyName("boost");
-			writer.WriteNumberValue(value.Boost.Value);
-		}
+			if (propFlags.TryRead(ref reader, options, PropFlags))
+			{
+				continue;
+			}
 
-		if (value.CaseInsensitive.HasValue)
-		{
-			writer.WritePropertyName("case_insensitive");
-			writer.WriteBooleanValue(value.CaseInsensitive.Value);
-		}
+			if (propMaxDeterminizedStates.TryRead(ref reader, options, PropMaxDeterminizedStates))
+			{
+				continue;
+			}
 
-		if (!string.IsNullOrEmpty(value.Flags))
-		{
-			writer.WritePropertyName("flags");
-			writer.WriteStringValue(value.Flags);
-		}
+			if (propQueryName.TryRead(ref reader, options, PropQueryName))
+			{
+				continue;
+			}
 
-		if (value.MaxDeterminizedStates.HasValue)
-		{
-			writer.WritePropertyName("max_determinized_states");
-			writer.WriteNumberValue(value.MaxDeterminizedStates.Value);
-		}
+			if (propRewrite.TryRead(ref reader, options, PropRewrite))
+			{
+				continue;
+			}
 
-		if (!string.IsNullOrEmpty(value.QueryName))
-		{
-			writer.WritePropertyName("_name");
-			writer.WriteStringValue(value.QueryName);
+			if (propValue.TryRead(ref reader, options, PropValue))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		if (!string.IsNullOrEmpty(value.Rewrite))
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		reader.Read();
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new RegexpQuery
 		{
-			writer.WritePropertyName("rewrite");
-			writer.WriteStringValue(value.Rewrite);
-		}
+			Boost = propBoost.Value
+,
+			CaseInsensitive = propCaseInsensitive.Value
+,
+			Field = propField.Value
+,
+			Flags = propFlags.Value
+,
+			MaxDeterminizedStates = propMaxDeterminizedStates.Value
+,
+			QueryName = propQueryName.Value
+,
+			Rewrite = propRewrite.Value
+,
+			Value = propValue.Value
+		};
+	}
 
-		writer.WritePropertyName("value");
-		writer.WriteStringValue(value.Value);
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, RegexpQuery value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WritePropertyName(options, value.Field);
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropCaseInsensitive, value.CaseInsensitive);
+		writer.WriteProperty(options, PropFlags, value.Flags);
+		writer.WriteProperty(options, PropMaxDeterminizedStates, value.MaxDeterminizedStates);
+		writer.WriteProperty(options, PropQueryName, value.QueryName);
+		writer.WriteProperty(options, PropRewrite, value.Rewrite);
+		writer.WriteProperty(options, PropValue, value.Value);
 		writer.WriteEndObject();
 		writer.WriteEndObject();
 	}
@@ -152,6 +152,10 @@ public RegexpQuery(Elastic.Clients.Elasticsearch.Serverless.Field field)
 		Field = field;
 	}
 
+	internal RegexpQuery()
+	{
+	}
+
 	/// <summary>
 	/// <para>
 	/// Floating point number used to decrease or increase the relevance scores of the query.
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/ShapeQuery.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/ShapeQuery.g.cs
index 4d2e827716e..e1b1dd81e86 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/ShapeQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/ShapeQuery.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,78 +28,65 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.QueryDsl;
 
-internal sealed partial class ShapeQueryConverter : JsonConverter<ShapeQuery>
+internal sealed partial class ShapeQueryConverter : System.Text.Json.Serialization.JsonConverter<ShapeQuery>
 {
-	public override ShapeQuery Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropShape = System.Text.Json.JsonEncodedText.Encode("shape");
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreUnmapped = System.Text.Json.JsonEncodedText.Encode("ignore_unmapped");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryName = System.Text.Json.JsonEncodedText.Encode("_name");
+
+	public override ShapeQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		var variant = new ShapeQuery();
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Field> propField = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.ShapeFieldQuery> propShape = default;
+		LocalJsonProperty<float?> propBoost = default;
+		LocalJsonProperty<bool?> propIgnoreUnmapped = default;
+		LocalJsonProperty<string?> propQueryName = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propBoost.TryRead(ref reader, options, PropBoost))
 			{
-				var property = reader.GetString();
-				if (property == "boost")
-				{
-					variant.Boost = JsonSerializer.Deserialize<float?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "ignore_unmapped")
-				{
-					variant.IgnoreUnmapped = JsonSerializer.Deserialize<bool?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "_name")
-				{
-					variant.QueryName = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				variant.Field = property;
-				reader.Read();
-				variant.Shape = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.ShapeFieldQuery>(ref reader, options);
+				continue;
 			}
-		}
-
-		return variant;
-	}
 
-	public override void Write(Utf8JsonWriter writer, ShapeQuery value, JsonSerializerOptions options)
-	{
-		writer.WriteStartObject();
-		if (value.Field is not null && value.Shape is not null)
-		{
-			if (!options.TryGetClientSettings(out var settings))
+			if (propIgnoreUnmapped.TryRead(ref reader, options, PropIgnoreUnmapped))
 			{
-				ThrowHelper.ThrowJsonExceptionForMissingSettings();
+				continue;
 			}
 
-			var propertyName = settings.Inferrer.Field(value.Field);
-			writer.WritePropertyName(propertyName);
-			JsonSerializer.Serialize(writer, value.Shape, options);
-		}
-
-		if (value.Boost.HasValue)
-		{
-			writer.WritePropertyName("boost");
-			writer.WriteNumberValue(value.Boost.Value);
-		}
+			if (propQueryName.TryRead(ref reader, options, PropQueryName))
+			{
+				continue;
+			}
 
-		if (value.IgnoreUnmapped.HasValue)
-		{
-			writer.WritePropertyName("ignore_unmapped");
-			writer.WriteBooleanValue(value.IgnoreUnmapped.Value);
+			propField.Initialized = propShape.Initialized = true;
+			reader.ReadProperty(options, out propField.Value, out propShape.Value);
 		}
 
-		if (!string.IsNullOrEmpty(value.QueryName))
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ShapeQuery
 		{
-			writer.WritePropertyName("_name");
-			writer.WriteStringValue(value.QueryName);
-		}
+			Field = propField.Value
+,
+			Shape = propShape.Value
+,
+			Boost = propBoost.Value
+,
+			IgnoreUnmapped = propIgnoreUnmapped.Value
+,
+			QueryName = propQueryName.Value
+		};
+	}
 
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ShapeQuery value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropIgnoreUnmapped, value.IgnoreUnmapped);
+		writer.WriteProperty(options, PropQueryName, value.QueryName);
+		writer.WriteProperty(options, value.Field, value.Shape);
 		writer.WriteEndObject();
 	}
 }
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/SimpleQueryStringQuery.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/SimpleQueryStringQuery.g.cs
index a8928659067..0c5d66039fd 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/SimpleQueryStringQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/SimpleQueryStringQuery.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,180 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.QueryDsl;
 
+internal sealed partial class SimpleQueryStringQueryConverter : System.Text.Json.Serialization.JsonConverter<SimpleQueryStringQuery>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAnalyzer = System.Text.Json.JsonEncodedText.Encode("analyzer");
+	private static readonly System.Text.Json.JsonEncodedText PropAnalyzeWildcard = System.Text.Json.JsonEncodedText.Encode("analyze_wildcard");
+	private static readonly System.Text.Json.JsonEncodedText PropAutoGenerateSynonymsPhraseQuery = System.Text.Json.JsonEncodedText.Encode("auto_generate_synonyms_phrase_query");
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropDefaultOperator = System.Text.Json.JsonEncodedText.Encode("default_operator");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropFlags = System.Text.Json.JsonEncodedText.Encode("flags");
+	private static readonly System.Text.Json.JsonEncodedText PropFuzzyMaxExpansions = System.Text.Json.JsonEncodedText.Encode("fuzzy_max_expansions");
+	private static readonly System.Text.Json.JsonEncodedText PropFuzzyPrefixLength = System.Text.Json.JsonEncodedText.Encode("fuzzy_prefix_length");
+	private static readonly System.Text.Json.JsonEncodedText PropFuzzyTranspositions = System.Text.Json.JsonEncodedText.Encode("fuzzy_transpositions");
+	private static readonly System.Text.Json.JsonEncodedText PropLenient = System.Text.Json.JsonEncodedText.Encode("lenient");
+	private static readonly System.Text.Json.JsonEncodedText PropMinimumShouldMatch = System.Text.Json.JsonEncodedText.Encode("minimum_should_match");
+	private static readonly System.Text.Json.JsonEncodedText PropQuery = System.Text.Json.JsonEncodedText.Encode("query");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryName = System.Text.Json.JsonEncodedText.Encode("_name");
+	private static readonly System.Text.Json.JsonEncodedText PropQuoteFieldSuffix = System.Text.Json.JsonEncodedText.Encode("quote_field_suffix");
+
+	public override SimpleQueryStringQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string?> propAnalyzer = default;
+		LocalJsonProperty<bool?> propAnalyzeWildcard = default;
+		LocalJsonProperty<bool?> propAutoGenerateSynonymsPhraseQuery = default;
+		LocalJsonProperty<float?> propBoost = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Operator?> propDefaultOperator = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Fields?> propFields = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SimpleQueryStringFlag?> propFlags = default;
+		LocalJsonProperty<int?> propFuzzyMaxExpansions = default;
+		LocalJsonProperty<int?> propFuzzyPrefixLength = default;
+		LocalJsonProperty<bool?> propFuzzyTranspositions = default;
+		LocalJsonProperty<bool?> propLenient = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.MinimumShouldMatch?> propMinimumShouldMatch = default;
+		LocalJsonProperty<string> propQuery = default;
+		LocalJsonProperty<string?> propQueryName = default;
+		LocalJsonProperty<string?> propQuoteFieldSuffix = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAnalyzer.TryRead(ref reader, options, PropAnalyzer))
+			{
+				continue;
+			}
+
+			if (propAnalyzeWildcard.TryRead(ref reader, options, PropAnalyzeWildcard))
+			{
+				continue;
+			}
+
+			if (propAutoGenerateSynonymsPhraseQuery.TryRead(ref reader, options, PropAutoGenerateSynonymsPhraseQuery))
+			{
+				continue;
+			}
+
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
+
+			if (propDefaultOperator.TryRead(ref reader, options, PropDefaultOperator))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields, typeof(FieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propFlags.TryRead(ref reader, options, PropFlags))
+			{
+				continue;
+			}
+
+			if (propFuzzyMaxExpansions.TryRead(ref reader, options, PropFuzzyMaxExpansions))
+			{
+				continue;
+			}
+
+			if (propFuzzyPrefixLength.TryRead(ref reader, options, PropFuzzyPrefixLength))
+			{
+				continue;
+			}
+
+			if (propFuzzyTranspositions.TryRead(ref reader, options, PropFuzzyTranspositions))
+			{
+				continue;
+			}
+
+			if (propLenient.TryRead(ref reader, options, PropLenient))
+			{
+				continue;
+			}
+
+			if (propMinimumShouldMatch.TryRead(ref reader, options, PropMinimumShouldMatch))
+			{
+				continue;
+			}
+
+			if (propQuery.TryRead(ref reader, options, PropQuery))
+			{
+				continue;
+			}
+
+			if (propQueryName.TryRead(ref reader, options, PropQueryName))
+			{
+				continue;
+			}
+
+			if (propQuoteFieldSuffix.TryRead(ref reader, options, PropQuoteFieldSuffix))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SimpleQueryStringQuery
+		{
+			Analyzer = propAnalyzer.Value
+,
+			AnalyzeWildcard = propAnalyzeWildcard.Value
+,
+			AutoGenerateSynonymsPhraseQuery = propAutoGenerateSynonymsPhraseQuery.Value
+,
+			Boost = propBoost.Value
+,
+			DefaultOperator = propDefaultOperator.Value
+,
+			Fields = propFields.Value
+,
+			Flags = propFlags.Value
+,
+			FuzzyMaxExpansions = propFuzzyMaxExpansions.Value
+,
+			FuzzyPrefixLength = propFuzzyPrefixLength.Value
+,
+			FuzzyTranspositions = propFuzzyTranspositions.Value
+,
+			Lenient = propLenient.Value
+,
+			MinimumShouldMatch = propMinimumShouldMatch.Value
+,
+			Query = propQuery.Value
+,
+			QueryName = propQueryName.Value
+,
+			QuoteFieldSuffix = propQuoteFieldSuffix.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SimpleQueryStringQuery value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAnalyzer, value.Analyzer);
+		writer.WriteProperty(options, PropAnalyzeWildcard, value.AnalyzeWildcard);
+		writer.WriteProperty(options, PropAutoGenerateSynonymsPhraseQuery, value.AutoGenerateSynonymsPhraseQuery);
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropDefaultOperator, value.DefaultOperator);
+		writer.WriteProperty(options, PropFields, value.Fields, typeof(FieldsMarker));
+		writer.WriteProperty(options, PropFlags, value.Flags);
+		writer.WriteProperty(options, PropFuzzyMaxExpansions, value.FuzzyMaxExpansions);
+		writer.WriteProperty(options, PropFuzzyPrefixLength, value.FuzzyPrefixLength);
+		writer.WriteProperty(options, PropFuzzyTranspositions, value.FuzzyTranspositions);
+		writer.WriteProperty(options, PropLenient, value.Lenient);
+		writer.WriteProperty(options, PropMinimumShouldMatch, value.MinimumShouldMatch);
+		writer.WriteProperty(options, PropQuery, value.Query);
+		writer.WriteProperty(options, PropQueryName, value.QueryName);
+		writer.WriteProperty(options, PropQuoteFieldSuffix, value.QuoteFieldSuffix);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(SimpleQueryStringQueryConverter))]
 public sealed partial class SimpleQueryStringQuery
 {
 	/// <summary>
@@ -34,7 +209,6 @@ public sealed partial class SimpleQueryStringQuery
 	/// Analyzer used to convert text in the query string into tokens.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("analyzer")]
 	public string? Analyzer { get; set; }
 
 	/// <summary>
@@ -42,7 +216,6 @@ public sealed partial class SimpleQueryStringQuery
 	/// If <c>true</c>, the query attempts to analyze wildcard terms in the query string.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("analyze_wildcard")]
 	public bool? AnalyzeWildcard { get; set; }
 
 	/// <summary>
@@ -50,7 +223,6 @@ public sealed partial class SimpleQueryStringQuery
 	/// If <c>true</c>, the parser creates a match_phrase query for each multi-position token.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("auto_generate_synonyms_phrase_query")]
 	public bool? AutoGenerateSynonymsPhraseQuery { get; set; }
 
 	/// <summary>
@@ -61,7 +233,6 @@ public sealed partial class SimpleQueryStringQuery
 	/// A value greater than 1.0 increases the relevance score.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("boost")]
 	public float? Boost { get; set; }
 
 	/// <summary>
@@ -69,7 +240,6 @@ public sealed partial class SimpleQueryStringQuery
 	/// Default boolean logic used to interpret text in the query string if no operators are specified.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("default_operator")]
 	public Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Operator? DefaultOperator { get; set; }
 
 	/// <summary>
@@ -80,8 +250,6 @@ public sealed partial class SimpleQueryStringQuery
 	/// Defaults to the <c>index.query.default_field index</c> setting, which has a default value of <c>*</c>.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("fields")]
-	[JsonConverter(typeof(FieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Serverless.Fields? Fields { get; set; }
 
 	/// <summary>
@@ -89,7 +257,6 @@ public sealed partial class SimpleQueryStringQuery
 	/// List of enabled operators for the simple query string syntax.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("flags")]
 	public Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SimpleQueryStringFlag? Flags { get; set; }
 
 	/// <summary>
@@ -97,7 +264,6 @@ public sealed partial class SimpleQueryStringQuery
 	/// Maximum number of terms to which the query expands for fuzzy matching.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("fuzzy_max_expansions")]
 	public int? FuzzyMaxExpansions { get; set; }
 
 	/// <summary>
@@ -105,7 +271,6 @@ public sealed partial class SimpleQueryStringQuery
 	/// Number of beginning characters left unchanged for fuzzy matching.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("fuzzy_prefix_length")]
 	public int? FuzzyPrefixLength { get; set; }
 
 	/// <summary>
@@ -113,7 +278,6 @@ public sealed partial class SimpleQueryStringQuery
 	/// If <c>true</c>, edits for fuzzy matching include transpositions of two adjacent characters (for example, <c>ab</c> to <c>ba</c>).
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("fuzzy_transpositions")]
 	public bool? FuzzyTranspositions { get; set; }
 
 	/// <summary>
@@ -121,7 +285,6 @@ public sealed partial class SimpleQueryStringQuery
 	/// If <c>true</c>, format-based errors, such as providing a text value for a numeric field, are ignored.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("lenient")]
 	public bool? Lenient { get; set; }
 
 	/// <summary>
@@ -129,7 +292,6 @@ public sealed partial class SimpleQueryStringQuery
 	/// Minimum number of clauses that must match for a document to be returned.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("minimum_should_match")]
 	public Elastic.Clients.Elasticsearch.Serverless.MinimumShouldMatch? MinimumShouldMatch { get; set; }
 
 	/// <summary>
@@ -137,9 +299,7 @@ public sealed partial class SimpleQueryStringQuery
 	/// Query string in the simple query string syntax you wish to parse and use for search.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("query")]
 	public string Query { get; set; }
-	[JsonInclude, JsonPropertyName("_name")]
 	public string? QueryName { get; set; }
 
 	/// <summary>
@@ -147,7 +307,6 @@ public sealed partial class SimpleQueryStringQuery
 	/// Suffix appended to quoted text in the query string.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("quote_field_suffix")]
 	public string? QuoteFieldSuffix { get; set; }
 
 	public static implicit operator Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query(SimpleQueryStringQuery simpleQueryStringQuery) => Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query.SimpleQueryString(simpleQueryStringQuery);
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/SpanQuery.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/SpanQuery.g.cs
index b12510520db..e58bc6c6b7b 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/SpanQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/SpanQuery.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -39,12 +40,16 @@ internal SpanQuery(string variantName, object variant)
 			throw new ArgumentNullException(nameof(variant));
 		if (string.IsNullOrWhiteSpace(variantName))
 			throw new ArgumentException("Variant name must not be empty or whitespace.");
-		VariantName = variantName;
+		VariantType = variantName;
 		Variant = variant;
 	}
 
-	internal object Variant { get; }
-	internal string VariantName { get; }
+	internal SpanQuery()
+	{
+	}
+
+	public object Variant { get; internal set; }
+	public string VariantType { get; internal set; }
 
 	public static SpanQuery SpanContaining(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanContainingQuery spanContainingQuery) => new SpanQuery("span_containing", spanContainingQuery);
 	public static SpanQuery SpanFieldMasking(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanFieldMaskingQuery spanFieldMaskingQuery) => new SpanQuery("span_field_masking", spanFieldMaskingQuery);
@@ -70,147 +75,152 @@ public bool TryGet<T>([NotNullWhen(true)] out T? result) where T : class
 	}
 }
 
-internal sealed partial class SpanQueryConverter : JsonConverter<SpanQuery>
+internal sealed partial class SpanQueryConverter : System.Text.Json.Serialization.JsonConverter<SpanQuery>
 {
-	public override SpanQuery Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText VariantSpanContaining = System.Text.Json.JsonEncodedText.Encode("span_containing");
+	private static readonly System.Text.Json.JsonEncodedText VariantSpanFieldMasking = System.Text.Json.JsonEncodedText.Encode("span_field_masking");
+	private static readonly System.Text.Json.JsonEncodedText VariantSpanFirst = System.Text.Json.JsonEncodedText.Encode("span_first");
+	private static readonly System.Text.Json.JsonEncodedText VariantSpanGap = System.Text.Json.JsonEncodedText.Encode("span_gap");
+	private static readonly System.Text.Json.JsonEncodedText VariantSpanMulti = System.Text.Json.JsonEncodedText.Encode("span_multi");
+	private static readonly System.Text.Json.JsonEncodedText VariantSpanNear = System.Text.Json.JsonEncodedText.Encode("span_near");
+	private static readonly System.Text.Json.JsonEncodedText VariantSpanNot = System.Text.Json.JsonEncodedText.Encode("span_not");
+	private static readonly System.Text.Json.JsonEncodedText VariantSpanOr = System.Text.Json.JsonEncodedText.Encode("span_or");
+	private static readonly System.Text.Json.JsonEncodedText VariantSpanTerm = System.Text.Json.JsonEncodedText.Encode("span_term");
+	private static readonly System.Text.Json.JsonEncodedText VariantSpanWithin = System.Text.Json.JsonEncodedText.Encode("span_within");
+
+	public override SpanQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		var variantType = string.Empty;
+		object? variant = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			throw new JsonException("Expected start token.");
-		}
-
-		object? variantValue = default;
-		string? variantNameValue = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
-		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token.");
-			}
-
-			if (reader.TokenType != JsonTokenType.PropertyName)
+			if (reader.ValueTextEquals(VariantSpanContaining))
 			{
-				throw new JsonException("Expected a property name token representing the name of an Elasticsearch field.");
-			}
-
-			var propertyName = reader.GetString();
-			reader.Read();
-			if (propertyName == "span_containing")
-			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanContainingQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantSpanContaining.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanContainingQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "span_field_masking")
+			if (reader.ValueTextEquals(VariantSpanFieldMasking))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanFieldMaskingQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantSpanFieldMasking.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanFieldMaskingQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "span_first")
+			if (reader.ValueTextEquals(VariantSpanFirst))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanFirstQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantSpanFirst.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanFirstQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "span_gap")
+			if (reader.ValueTextEquals(VariantSpanGap))
 			{
-				variantValue = JsonSerializer.Deserialize<KeyValuePair<Elastic.Clients.Elasticsearch.Serverless.Field, int>?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantSpanGap.Value;
+				reader.Read();
+				variant = reader.ReadValue<KeyValuePair<Elastic.Clients.Elasticsearch.Serverless.Field, int>?>(options);
 				continue;
 			}
 
-			if (propertyName == "span_multi")
+			if (reader.ValueTextEquals(VariantSpanMulti))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanMultiTermQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantSpanMulti.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanMultiTermQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "span_near")
+			if (reader.ValueTextEquals(VariantSpanNear))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanNearQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantSpanNear.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanNearQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "span_not")
+			if (reader.ValueTextEquals(VariantSpanNot))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanNotQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantSpanNot.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanNotQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "span_or")
+			if (reader.ValueTextEquals(VariantSpanOr))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanOrQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantSpanOr.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanOrQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "span_term")
+			if (reader.ValueTextEquals(VariantSpanTerm))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanTermQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantSpanTerm.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanTermQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "span_within")
+			if (reader.ValueTextEquals(VariantSpanWithin))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanWithinQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantSpanWithin.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanWithinQuery?>(options);
 				continue;
 			}
 
-			throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'SpanQuery' from the response.");
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		var result = new SpanQuery(variantNameValue, variantValue);
-		return result;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SpanQuery { VariantType = variantType, Variant = variant };
 	}
 
-	public override void Write(Utf8JsonWriter writer, SpanQuery value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SpanQuery value, System.Text.Json.JsonSerializerOptions options)
 	{
 		writer.WriteStartObject();
-		if (value.VariantName is not null && value.Variant is not null)
+		switch (value.VariantType)
 		{
-			writer.WritePropertyName(value.VariantName);
-			switch (value.VariantName)
-			{
-				case "span_containing":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanContainingQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanContainingQuery)value.Variant, options);
-					break;
-				case "span_field_masking":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanFieldMaskingQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanFieldMaskingQuery)value.Variant, options);
-					break;
-				case "span_first":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanFirstQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanFirstQuery)value.Variant, options);
-					break;
-				case "span_gap":
-					JsonSerializer.Serialize<KeyValuePair<Elastic.Clients.Elasticsearch.Serverless.Field, int>>(writer, (KeyValuePair<Elastic.Clients.Elasticsearch.Serverless.Field, int>)value.Variant, options);
-					break;
-				case "span_multi":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanMultiTermQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanMultiTermQuery)value.Variant, options);
-					break;
-				case "span_near":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanNearQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanNearQuery)value.Variant, options);
-					break;
-				case "span_not":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanNotQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanNotQuery)value.Variant, options);
-					break;
-				case "span_or":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanOrQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanOrQuery)value.Variant, options);
-					break;
-				case "span_term":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanTermQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanTermQuery)value.Variant, options);
-					break;
-				case "span_within":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanWithinQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanWithinQuery)value.Variant, options);
-					break;
-			}
+			case "":
+				break;
+			case "span_containing":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanContainingQuery?)value.Variant);
+				break;
+			case "span_field_masking":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanFieldMaskingQuery?)value.Variant);
+				break;
+			case "span_first":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanFirstQuery?)value.Variant);
+				break;
+			case "span_gap":
+				writer.WriteProperty(options, value.VariantType, (KeyValuePair<Elastic.Clients.Elasticsearch.Serverless.Field, int>?)value.Variant);
+				break;
+			case "span_multi":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanMultiTermQuery?)value.Variant);
+				break;
+			case "span_near":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanNearQuery?)value.Variant);
+				break;
+			case "span_not":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanNotQuery?)value.Variant);
+				break;
+			case "span_or":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanOrQuery?)value.Variant);
+				break;
+			case "span_term":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanTermQuery?)value.Variant);
+				break;
+			case "span_within":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanWithinQuery?)value.Variant);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.VariantType}' is not supported for type '{nameof(SpanQuery)}'.");
 		}
 
 		writer.WriteEndObject();
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/SpanTermQuery.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/SpanTermQuery.g.cs
index 3567a984d2f..1b289af6908 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/SpanTermQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/SpanTermQuery.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,68 +28,75 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.QueryDsl;
 
-internal sealed partial class SpanTermQueryConverter : JsonConverter<SpanTermQuery>
+internal sealed partial class SpanTermQueryConverter : System.Text.Json.Serialization.JsonConverter<SpanTermQuery>
 {
-	public override SpanTermQuery Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryName = System.Text.Json.JsonEncodedText.Encode("_name");
+	private static readonly System.Text.Json.JsonEncodedText PropValue = System.Text.Json.JsonEncodedText.Encode("value");
+
+	public override SpanTermQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Field> propField = default;
 		reader.Read();
-		var fieldName = reader.GetString();
+		propField.Value = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Field>(options);
+		propField.Initialized = true;
 		reader.Read();
-		var variant = new SpanTermQuery(fieldName);
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		if (reader.TokenType is not System.Text.Json.JsonTokenType.StartObject)
+		{
+			var value = reader.ReadValue<string>(options);
+			reader.Read();
+			return new SpanTermQuery { Value = value };
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<float?> propBoost = default;
+		LocalJsonProperty<string?> propQueryName = default;
+		LocalJsonProperty<string> propValue = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
+
+			if (propQueryName.TryRead(ref reader, options, PropQueryName))
+			{
+				continue;
+			}
+
+			if (propValue.TryRead(ref reader, options, PropValue))
 			{
-				var property = reader.GetString();
-				if (property == "boost")
-				{
-					variant.Boost = JsonSerializer.Deserialize<float?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "_name")
-				{
-					variant.QueryName = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "value")
-				{
-					variant.Value = JsonSerializer.Deserialize<string>(ref reader, options);
-					continue;
-				}
+				continue;
 			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
 		reader.Read();
-		return variant;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SpanTermQuery
+		{
+			Boost = propBoost.Value
+,
+			Field = propField.Value
+,
+			QueryName = propQueryName.Value
+,
+			Value = propValue.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, SpanTermQuery value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SpanTermQuery value, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (value.Field is null)
-			throw new JsonException("Unable to serialize SpanTermQuery because the `Field` property is not set. Field name queries must include a valid field name.");
-		if (!options.TryGetClientSettings(out var settings))
-			throw new JsonException("Unable to retrieve client settings required to infer field.");
 		writer.WriteStartObject();
-		writer.WritePropertyName(settings.Inferrer.Field(value.Field));
+		writer.WritePropertyName(options, value.Field);
 		writer.WriteStartObject();
-		if (value.Boost.HasValue)
-		{
-			writer.WritePropertyName("boost");
-			writer.WriteNumberValue(value.Boost.Value);
-		}
-
-		if (!string.IsNullOrEmpty(value.QueryName))
-		{
-			writer.WritePropertyName("_name");
-			writer.WriteStringValue(value.QueryName);
-		}
-
-		writer.WritePropertyName("value");
-		writer.WriteStringValue(value.Value);
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropQueryName, value.QueryName);
+		writer.WriteProperty(options, PropValue, value.Value);
 		writer.WriteEndObject();
 		writer.WriteEndObject();
 	}
@@ -104,6 +112,10 @@ public SpanTermQuery(Elastic.Clients.Elasticsearch.Serverless.Field field)
 		Field = field;
 	}
 
+	internal SpanTermQuery()
+	{
+	}
+
 	/// <summary>
 	/// <para>
 	/// Floating point number used to decrease or increase the relevance scores of the query.
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/SparseVectorQuery.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/SparseVectorQuery.g.cs
index d0034b94dbb..2bdc8916711 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/SparseVectorQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/SparseVectorQuery.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -39,12 +40,16 @@ internal SparseVectorQuery(string variantName, object variant)
 			throw new ArgumentNullException(nameof(variant));
 		if (string.IsNullOrWhiteSpace(variantName))
 			throw new ArgumentException("Variant name must not be empty or whitespace.");
-		VariantName = variantName;
+		VariantType = variantName;
 		Variant = variant;
 	}
 
-	internal object Variant { get; }
-	internal string VariantName { get; }
+	internal SparseVectorQuery()
+	{
+	}
+
+	public object Variant { get; internal set; }
+	public string VariantType { get; internal set; }
 
 	public static SparseVectorQuery InferenceId(Elastic.Clients.Elasticsearch.Serverless.Id id) => new SparseVectorQuery("inference_id", id);
 
@@ -92,115 +97,89 @@ public bool TryGet<T>([NotNullWhen(true)] out T? result) where T : class
 	}
 }
 
-internal sealed partial class SparseVectorQueryConverter : JsonConverter<SparseVectorQuery>
+internal sealed partial class SparseVectorQueryConverter : System.Text.Json.Serialization.JsonConverter<SparseVectorQuery>
 {
-	public override SparseVectorQuery Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-		{
-			throw new JsonException("Expected start token.");
-		}
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropQuery = System.Text.Json.JsonEncodedText.Encode("query");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryName = System.Text.Json.JsonEncodedText.Encode("_name");
+	private static readonly System.Text.Json.JsonEncodedText VariantInferenceId = System.Text.Json.JsonEncodedText.Encode("inference_id");
 
-		object? variantValue = default;
-		string? variantNameValue = default;
-		float? boostValue = default;
-		Elastic.Clients.Elasticsearch.Serverless.Field fieldValue = default;
-		string? queryValue = default;
-		string? queryNameValue = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+	public override SparseVectorQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<float?> propBoost = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Field> propField = default;
+		LocalJsonProperty<string?> propQuery = default;
+		LocalJsonProperty<string?> propQueryName = default;
+		var variantType = string.Empty;
+		object? variant = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token.");
-			}
-
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token representing the name of an Elasticsearch field.");
-			}
-
-			var propertyName = reader.GetString();
-			reader.Read();
-			if (propertyName == "boost")
+			if (propBoost.TryRead(ref reader, options, PropBoost))
 			{
-				boostValue = JsonSerializer.Deserialize<float?>(ref reader, options);
 				continue;
 			}
 
-			if (propertyName == "field")
+			if (propField.TryRead(ref reader, options, PropField))
 			{
-				fieldValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Field>(ref reader, options);
 				continue;
 			}
 
-			if (propertyName == "query")
+			if (propQuery.TryRead(ref reader, options, PropQuery))
 			{
-				queryValue = JsonSerializer.Deserialize<string?>(ref reader, options);
 				continue;
 			}
 
-			if (propertyName == "_name")
+			if (propQueryName.TryRead(ref reader, options, PropQueryName))
 			{
-				queryNameValue = JsonSerializer.Deserialize<string?>(ref reader, options);
 				continue;
 			}
 
-			if (propertyName == "inference_id")
+			if (reader.ValueTextEquals(VariantInferenceId))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Id?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantInferenceId.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Id?>(options);
 				continue;
 			}
 
-			throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'SparseVectorQuery' from the response.");
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		var result = new SparseVectorQuery(variantNameValue, variantValue);
-		result.Boost = boostValue;
-		result.Field = fieldValue;
-		result.Query = queryValue;
-		result.QueryName = queryNameValue;
-		return result;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SparseVectorQuery
+		{
+			VariantType = variantType,
+			Variant = variant,
+			Boost = propBoost.Value
+	,
+			Field = propField.Value
+	,
+			Query = propQuery.Value
+	,
+			QueryName = propQueryName.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, SparseVectorQuery value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SparseVectorQuery value, System.Text.Json.JsonSerializerOptions options)
 	{
 		writer.WriteStartObject();
-		if (value.Boost.HasValue)
-		{
-			writer.WritePropertyName("boost");
-			writer.WriteNumberValue(value.Boost.Value);
-		}
-
-		if (value.Field is not null)
-		{
-			writer.WritePropertyName("field");
-			JsonSerializer.Serialize(writer, value.Field, options);
-		}
-
-		if (!string.IsNullOrEmpty(value.Query))
-		{
-			writer.WritePropertyName("query");
-			writer.WriteStringValue(value.Query);
-		}
-
-		if (!string.IsNullOrEmpty(value.QueryName))
-		{
-			writer.WritePropertyName("_name");
-			writer.WriteStringValue(value.QueryName);
-		}
-
-		if (value.VariantName is not null && value.Variant is not null)
+		switch (value.VariantType)
 		{
-			writer.WritePropertyName(value.VariantName);
-			switch (value.VariantName)
-			{
-				case "inference_id":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Id>(writer, (Elastic.Clients.Elasticsearch.Serverless.Id)value.Variant, options);
-					break;
-			}
+			case "":
+				break;
+			case "inference_id":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Id?)value.Variant);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.VariantType}' is not supported for type '{nameof(SparseVectorQuery)}'.");
 		}
 
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropField, value.Field);
+		writer.WriteProperty(options, PropQuery, value.Query);
+		writer.WriteProperty(options, PropQueryName, value.QueryName);
 		writer.WriteEndObject();
 	}
 }
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/TermQuery.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/TermQuery.g.cs
index b5e2dfd6e85..09e7f2870e0 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/TermQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/TermQuery.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,80 +28,88 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.QueryDsl;
 
-internal sealed partial class TermQueryConverter : JsonConverter<TermQuery>
+internal sealed partial class TermQueryConverter : System.Text.Json.Serialization.JsonConverter<TermQuery>
 {
-	public override TermQuery Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropCaseInsensitive = System.Text.Json.JsonEncodedText.Encode("case_insensitive");
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryName = System.Text.Json.JsonEncodedText.Encode("_name");
+	private static readonly System.Text.Json.JsonEncodedText PropValue = System.Text.Json.JsonEncodedText.Encode("value");
+
+	public override TermQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Field> propField = default;
 		reader.Read();
-		var fieldName = reader.GetString();
+		propField.Value = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Field>(options);
+		propField.Initialized = true;
 		reader.Read();
-		var variant = new TermQuery(fieldName);
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		var readerSnapshot = reader;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<float?> propBoost = default;
+		LocalJsonProperty<bool?> propCaseInsensitive = default;
+		LocalJsonProperty<string?> propQueryName = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.FieldValue> propValue = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
+
+			if (propCaseInsensitive.TryRead(ref reader, options, PropCaseInsensitive))
+			{
+				continue;
+			}
+
+			if (propQueryName.TryRead(ref reader, options, PropQueryName))
+			{
+				continue;
+			}
+
+			if (propValue.TryRead(ref reader, options, PropValue))
+			{
+				continue;
+			}
+
+			try
+			{
+				reader = readerSnapshot;
+				var result = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.FieldValue>(options);
+				return new TermQuery { Field = propField.Value, Value = result };
+			}
+			catch (System.Text.Json.JsonException)
 			{
-				var property = reader.GetString();
-				if (property == "boost")
-				{
-					variant.Boost = JsonSerializer.Deserialize<float?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "case_insensitive")
-				{
-					variant.CaseInsensitive = JsonSerializer.Deserialize<bool?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "_name")
-				{
-					variant.QueryName = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "value")
-				{
-					variant.Value = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.FieldValue>(ref reader, options);
-					continue;
-				}
+				throw;
 			}
 		}
 
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
 		reader.Read();
-		return variant;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new TermQuery
+		{
+			Boost = propBoost.Value
+,
+			CaseInsensitive = propCaseInsensitive.Value
+,
+			Field = propField.Value
+,
+			QueryName = propQueryName.Value
+,
+			Value = propValue.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, TermQuery value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, TermQuery value, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (value.Field is null)
-			throw new JsonException("Unable to serialize TermQuery because the `Field` property is not set. Field name queries must include a valid field name.");
-		if (!options.TryGetClientSettings(out var settings))
-			throw new JsonException("Unable to retrieve client settings required to infer field.");
 		writer.WriteStartObject();
-		writer.WritePropertyName(settings.Inferrer.Field(value.Field));
+		writer.WritePropertyName(options, value.Field);
 		writer.WriteStartObject();
-		if (value.Boost.HasValue)
-		{
-			writer.WritePropertyName("boost");
-			writer.WriteNumberValue(value.Boost.Value);
-		}
-
-		if (value.CaseInsensitive.HasValue)
-		{
-			writer.WritePropertyName("case_insensitive");
-			writer.WriteBooleanValue(value.CaseInsensitive.Value);
-		}
-
-		if (!string.IsNullOrEmpty(value.QueryName))
-		{
-			writer.WritePropertyName("_name");
-			writer.WriteStringValue(value.QueryName);
-		}
-
-		writer.WritePropertyName("value");
-		JsonSerializer.Serialize(writer, value.Value, options);
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropCaseInsensitive, value.CaseInsensitive);
+		writer.WriteProperty(options, PropQueryName, value.QueryName);
+		writer.WriteProperty(options, PropValue, value.Value);
 		writer.WriteEndObject();
 		writer.WriteEndObject();
 	}
@@ -116,6 +125,10 @@ public TermQuery(Elastic.Clients.Elasticsearch.Serverless.Field field)
 		Field = field;
 	}
 
+	internal TermQuery()
+	{
+	}
+
 	/// <summary>
 	/// <para>
 	/// Floating point number used to decrease or increase the relevance scores of the query.
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/TermRangeQuery.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/TermRangeQuery.g.cs
index 538911f2a18..1cb5d884023 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/TermRangeQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/TermRangeQuery.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,127 +28,115 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.QueryDsl;
 
-internal sealed partial class TermRangeQueryConverter : JsonConverter<TermRangeQuery>
+internal sealed partial class TermRangeQueryConverter : System.Text.Json.Serialization.JsonConverter<TermRangeQuery>
 {
-	public override TermRangeQuery Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropGt = System.Text.Json.JsonEncodedText.Encode("gt");
+	private static readonly System.Text.Json.JsonEncodedText PropGte = System.Text.Json.JsonEncodedText.Encode("gte");
+	private static readonly System.Text.Json.JsonEncodedText PropLt = System.Text.Json.JsonEncodedText.Encode("lt");
+	private static readonly System.Text.Json.JsonEncodedText PropLte = System.Text.Json.JsonEncodedText.Encode("lte");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryName = System.Text.Json.JsonEncodedText.Encode("_name");
+	private static readonly System.Text.Json.JsonEncodedText PropRelation = System.Text.Json.JsonEncodedText.Encode("relation");
+
+	public override TermRangeQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Field> propField = default;
 		reader.Read();
-		var fieldName = reader.GetString();
+		propField.Value = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Field>(options);
+		propField.Initialized = true;
 		reader.Read();
-		var variant = new TermRangeQuery(fieldName);
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<float?> propBoost = default;
+		LocalJsonProperty<string?> propGt = default;
+		LocalJsonProperty<string?> propGte = default;
+		LocalJsonProperty<string?> propLt = default;
+		LocalJsonProperty<string?> propLte = default;
+		LocalJsonProperty<string?> propQueryName = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.RangeRelation?> propRelation = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propBoost.TryRead(ref reader, options, PropBoost))
 			{
-				var property = reader.GetString();
-				if (property == "boost")
-				{
-					variant.Boost = JsonSerializer.Deserialize<float?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "gt")
-				{
-					variant.Gt = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "gte")
-				{
-					variant.Gte = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "lt")
-				{
-					variant.Lt = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "lte")
-				{
-					variant.Lte = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "_name")
-				{
-					variant.QueryName = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "relation")
-				{
-					variant.Relation = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.RangeRelation?>(ref reader, options);
-					continue;
-				}
+				continue;
 			}
-		}
 
-		reader.Read();
-		return variant;
-	}
+			if (propGt.TryRead(ref reader, options, PropGt))
+			{
+				continue;
+			}
 
-	public override void Write(Utf8JsonWriter writer, TermRangeQuery value, JsonSerializerOptions options)
-	{
-		if (value.Field is null)
-			throw new JsonException("Unable to serialize TermRangeQuery because the `Field` property is not set. Field name queries must include a valid field name.");
-		if (!options.TryGetClientSettings(out var settings))
-			throw new JsonException("Unable to retrieve client settings required to infer field.");
-		writer.WriteStartObject();
-		writer.WritePropertyName(settings.Inferrer.Field(value.Field));
-		writer.WriteStartObject();
-		if (value.Boost.HasValue)
-		{
-			writer.WritePropertyName("boost");
-			writer.WriteNumberValue(value.Boost.Value);
-		}
+			if (propGte.TryRead(ref reader, options, PropGte))
+			{
+				continue;
+			}
 
-		if (!string.IsNullOrEmpty(value.Gt))
-		{
-			writer.WritePropertyName("gt");
-			writer.WriteStringValue(value.Gt);
-		}
+			if (propLt.TryRead(ref reader, options, PropLt))
+			{
+				continue;
+			}
 
-		if (!string.IsNullOrEmpty(value.Gte))
-		{
-			writer.WritePropertyName("gte");
-			writer.WriteStringValue(value.Gte);
-		}
+			if (propLte.TryRead(ref reader, options, PropLte))
+			{
+				continue;
+			}
 
-		if (!string.IsNullOrEmpty(value.Lt))
-		{
-			writer.WritePropertyName("lt");
-			writer.WriteStringValue(value.Lt);
-		}
+			if (propQueryName.TryRead(ref reader, options, PropQueryName))
+			{
+				continue;
+			}
 
-		if (!string.IsNullOrEmpty(value.Lte))
-		{
-			writer.WritePropertyName("lte");
-			writer.WriteStringValue(value.Lte);
-		}
+			if (propRelation.TryRead(ref reader, options, PropRelation))
+			{
+				continue;
+			}
 
-		if (!string.IsNullOrEmpty(value.QueryName))
-		{
-			writer.WritePropertyName("_name");
-			writer.WriteStringValue(value.QueryName);
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		if (value.Relation is not null)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		reader.Read();
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new TermRangeQuery
 		{
-			writer.WritePropertyName("relation");
-			JsonSerializer.Serialize(writer, value.Relation, options);
-		}
+			Boost = propBoost.Value
+,
+			Field = propField.Value
+,
+			Gt = propGt.Value
+,
+			Gte = propGte.Value
+,
+			Lt = propLt.Value
+,
+			Lte = propLte.Value
+,
+			QueryName = propQueryName.Value
+,
+			Relation = propRelation.Value
+		};
+	}
 
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, TermRangeQuery value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WritePropertyName(options, value.Field);
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropGt, value.Gt);
+		writer.WriteProperty(options, PropGte, value.Gte);
+		writer.WriteProperty(options, PropLt, value.Lt);
+		writer.WriteProperty(options, PropLte, value.Lte);
+		writer.WriteProperty(options, PropQueryName, value.QueryName);
+		writer.WriteProperty(options, PropRelation, value.Relation);
 		writer.WriteEndObject();
 		writer.WriteEndObject();
 	}
 }
 
 [JsonConverter(typeof(TermRangeQueryConverter))]
-public sealed partial class TermRangeQuery
+public sealed partial class TermRangeQuery : IRangeQuery
 {
 	public TermRangeQuery(Elastic.Clients.Elasticsearch.Serverless.Field field)
 	{
@@ -156,6 +145,10 @@ public TermRangeQuery(Elastic.Clients.Elasticsearch.Serverless.Field field)
 		Field = field;
 	}
 
+	internal TermRangeQuery()
+	{
+	}
+
 	/// <summary>
 	/// <para>
 	/// Floating point number used to decrease or increase the relevance scores of the query.
@@ -202,6 +195,8 @@ public TermRangeQuery(Elastic.Clients.Elasticsearch.Serverless.Field field)
 	/// </para>
 	/// </summary>
 	public Elastic.Clients.Elasticsearch.Serverless.QueryDsl.RangeRelation? Relation { get; set; }
+
+	public string Type => "termrangequery";
 }
 
 public sealed partial class TermRangeQueryDescriptor<TDocument> : SerializableDescriptor<TermRangeQueryDescriptor<TDocument>>
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/TermsQuery.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/TermsQuery.g.cs
index ed80e1a50a8..e9b6d74cf7c 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/TermsQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/TermsQuery.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,66 +28,55 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.QueryDsl;
 
-internal sealed partial class TermsQueryConverter : JsonConverter<TermsQuery>
+internal sealed partial class TermsQueryConverter : System.Text.Json.Serialization.JsonConverter<TermsQuery>
 {
-	public override TermsQuery Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropTerms = System.Text.Json.JsonEncodedText.Encode("terms");
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryName = System.Text.Json.JsonEncodedText.Encode("_name");
+
+	public override TermsQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		var variant = new TermsQuery();
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Field> propField = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.TermsQueryField> propTerms = default;
+		LocalJsonProperty<float?> propBoost = default;
+		LocalJsonProperty<string?> propQueryName = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propBoost.TryRead(ref reader, options, PropBoost))
 			{
-				var property = reader.GetString();
-				if (property == "boost")
-				{
-					variant.Boost = JsonSerializer.Deserialize<float?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "_name")
-				{
-					variant.QueryName = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				variant.Field = property;
-				reader.Read();
-				variant.Terms = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.TermsQueryField>(ref reader, options);
+				continue;
 			}
-		}
 
-		return variant;
-	}
-
-	public override void Write(Utf8JsonWriter writer, TermsQuery value, JsonSerializerOptions options)
-	{
-		writer.WriteStartObject();
-		if (value.Field is not null && value.Terms is not null)
-		{
-			if (!options.TryGetClientSettings(out var settings))
+			if (propQueryName.TryRead(ref reader, options, PropQueryName))
 			{
-				ThrowHelper.ThrowJsonExceptionForMissingSettings();
+				continue;
 			}
 
-			var propertyName = settings.Inferrer.Field(value.Field);
-			writer.WritePropertyName(propertyName);
-			JsonSerializer.Serialize(writer, value.Terms, options);
+			propField.Initialized = propTerms.Initialized = true;
+			reader.ReadProperty(options, out propField.Value, out propTerms.Value);
 		}
 
-		if (value.Boost.HasValue)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new TermsQuery
 		{
-			writer.WritePropertyName("boost");
-			writer.WriteNumberValue(value.Boost.Value);
-		}
-
-		if (!string.IsNullOrEmpty(value.QueryName))
-		{
-			writer.WritePropertyName("_name");
-			writer.WriteStringValue(value.QueryName);
-		}
+			Field = propField.Value
+,
+			Terms = propTerms.Value
+,
+			Boost = propBoost.Value
+,
+			QueryName = propQueryName.Value
+		};
+	}
 
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, TermsQuery value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropQueryName, value.QueryName);
+		writer.WriteProperty(options, value.Field, value.Terms);
 		writer.WriteEndObject();
 	}
 }
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/TermsSetQuery.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/TermsSetQuery.g.cs
index 8da1d26d0e4..ee12b8c13a0 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/TermsSetQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/TermsSetQuery.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,104 +28,98 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.QueryDsl;
 
-internal sealed partial class TermsSetQueryConverter : JsonConverter<TermsSetQuery>
+internal sealed partial class TermsSetQueryConverter : System.Text.Json.Serialization.JsonConverter<TermsSetQuery>
 {
-	public override TermsSetQuery Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropMinimumShouldMatch = System.Text.Json.JsonEncodedText.Encode("minimum_should_match");
+	private static readonly System.Text.Json.JsonEncodedText PropMinimumShouldMatchField = System.Text.Json.JsonEncodedText.Encode("minimum_should_match_field");
+	private static readonly System.Text.Json.JsonEncodedText PropMinimumShouldMatchScript = System.Text.Json.JsonEncodedText.Encode("minimum_should_match_script");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryName = System.Text.Json.JsonEncodedText.Encode("_name");
+	private static readonly System.Text.Json.JsonEncodedText PropTerms = System.Text.Json.JsonEncodedText.Encode("terms");
+
+	public override TermsSetQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Field> propField = default;
 		reader.Read();
-		var fieldName = reader.GetString();
+		propField.Value = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Field>(options);
+		propField.Initialized = true;
 		reader.Read();
-		var variant = new TermsSetQuery(fieldName);
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<float?> propBoost = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.MinimumShouldMatch?> propMinimumShouldMatch = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Field?> propMinimumShouldMatchField = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Script?> propMinimumShouldMatchScript = default;
+		LocalJsonProperty<string?> propQueryName = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.FieldValue>> propTerms = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propBoost.TryRead(ref reader, options, PropBoost))
 			{
-				var property = reader.GetString();
-				if (property == "boost")
-				{
-					variant.Boost = JsonSerializer.Deserialize<float?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "minimum_should_match")
-				{
-					variant.MinimumShouldMatch = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.MinimumShouldMatch?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "minimum_should_match_field")
-				{
-					variant.MinimumShouldMatchField = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Field?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "minimum_should_match_script")
-				{
-					variant.MinimumShouldMatchScript = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Script?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "_name")
-				{
-					variant.QueryName = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "terms")
-				{
-					variant.Terms = JsonSerializer.Deserialize<ICollection<Elastic.Clients.Elasticsearch.Serverless.FieldValue>>(ref reader, options);
-					continue;
-				}
+				continue;
 			}
-		}
 
-		reader.Read();
-		return variant;
-	}
+			if (propMinimumShouldMatch.TryRead(ref reader, options, PropMinimumShouldMatch))
+			{
+				continue;
+			}
 
-	public override void Write(Utf8JsonWriter writer, TermsSetQuery value, JsonSerializerOptions options)
-	{
-		if (value.Field is null)
-			throw new JsonException("Unable to serialize TermsSetQuery because the `Field` property is not set. Field name queries must include a valid field name.");
-		if (!options.TryGetClientSettings(out var settings))
-			throw new JsonException("Unable to retrieve client settings required to infer field.");
-		writer.WriteStartObject();
-		writer.WritePropertyName(settings.Inferrer.Field(value.Field));
-		writer.WriteStartObject();
-		if (value.Boost.HasValue)
-		{
-			writer.WritePropertyName("boost");
-			writer.WriteNumberValue(value.Boost.Value);
-		}
+			if (propMinimumShouldMatchField.TryRead(ref reader, options, PropMinimumShouldMatchField))
+			{
+				continue;
+			}
 
-		if (value.MinimumShouldMatch is not null)
-		{
-			writer.WritePropertyName("minimum_should_match");
-			JsonSerializer.Serialize(writer, value.MinimumShouldMatch, options);
-		}
+			if (propMinimumShouldMatchScript.TryRead(ref reader, options, PropMinimumShouldMatchScript))
+			{
+				continue;
+			}
 
-		if (value.MinimumShouldMatchField is not null)
-		{
-			writer.WritePropertyName("minimum_should_match_field");
-			JsonSerializer.Serialize(writer, value.MinimumShouldMatchField, options);
-		}
+			if (propQueryName.TryRead(ref reader, options, PropQueryName))
+			{
+				continue;
+			}
 
-		if (value.MinimumShouldMatchScript is not null)
-		{
-			writer.WritePropertyName("minimum_should_match_script");
-			JsonSerializer.Serialize(writer, value.MinimumShouldMatchScript, options);
-		}
+			if (propTerms.TryRead(ref reader, options, PropTerms))
+			{
+				continue;
+			}
 
-		if (!string.IsNullOrEmpty(value.QueryName))
-		{
-			writer.WritePropertyName("_name");
-			writer.WriteStringValue(value.QueryName);
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		writer.WritePropertyName("terms");
-		JsonSerializer.Serialize(writer, value.Terms, options);
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		reader.Read();
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new TermsSetQuery
+		{
+			Boost = propBoost.Value
+,
+			Field = propField.Value
+,
+			MinimumShouldMatch = propMinimumShouldMatch.Value
+,
+			MinimumShouldMatchField = propMinimumShouldMatchField.Value
+,
+			MinimumShouldMatchScript = propMinimumShouldMatchScript.Value
+,
+			QueryName = propQueryName.Value
+,
+			Terms = propTerms.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, TermsSetQuery value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WritePropertyName(options, value.Field);
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropMinimumShouldMatch, value.MinimumShouldMatch);
+		writer.WriteProperty(options, PropMinimumShouldMatchField, value.MinimumShouldMatchField);
+		writer.WriteProperty(options, PropMinimumShouldMatchScript, value.MinimumShouldMatchScript);
+		writer.WriteProperty(options, PropQueryName, value.QueryName);
+		writer.WriteProperty(options, PropTerms, value.Terms);
 		writer.WriteEndObject();
 		writer.WriteEndObject();
 	}
@@ -140,6 +135,10 @@ public TermsSetQuery(Elastic.Clients.Elasticsearch.Serverless.Field field)
 		Field = field;
 	}
 
+	internal TermsSetQuery()
+	{
+	}
+
 	/// <summary>
 	/// <para>
 	/// Floating point number used to decrease or increase the relevance scores of the query.
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/UntypedDecayFunction.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/UntypedDecayFunction.g.cs
index 443a3d82046..c3d1191bf89 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/UntypedDecayFunction.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/UntypedDecayFunction.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,60 +28,51 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.QueryDsl;
 
-internal sealed partial class UntypedDecayFunctionConverter : JsonConverter<UntypedDecayFunction>
+internal sealed partial class UntypedDecayFunctionConverter : System.Text.Json.Serialization.JsonConverter<UntypedDecayFunction>
 {
-	public override UntypedDecayFunction Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		var variant = new UntypedDecayFunction();
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
-		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
-			{
-				var property = reader.GetString();
-				if (property == "multi_value_mode")
-				{
-					variant.MultiValueMode = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MultiValueMode?>(ref reader, options);
-					continue;
-				}
-
-				variant.Field = property;
-				reader.Read();
-				variant.Placement = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.DecayPlacement<object, object>>(ref reader, options);
-			}
-		}
-
-		return variant;
-	}
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropPlacement = System.Text.Json.JsonEncodedText.Encode("placement");
+	private static readonly System.Text.Json.JsonEncodedText PropMultiValueMode = System.Text.Json.JsonEncodedText.Encode("multi_value_mode");
 
-	public override void Write(Utf8JsonWriter writer, UntypedDecayFunction value, JsonSerializerOptions options)
+	public override UntypedDecayFunction Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		writer.WriteStartObject();
-		if (value.Field is not null && value.Placement is not null)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Field> propField = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.DecayPlacement<object, object>> propPlacement = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MultiValueMode?> propMultiValueMode = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (!options.TryGetClientSettings(out var settings))
+			if (propMultiValueMode.TryRead(ref reader, options, PropMultiValueMode))
 			{
-				ThrowHelper.ThrowJsonExceptionForMissingSettings();
+				continue;
 			}
 
-			var propertyName = settings.Inferrer.Field(value.Field);
-			writer.WritePropertyName(propertyName);
-			JsonSerializer.Serialize(writer, value.Placement, options);
+			propField.Initialized = propPlacement.Initialized = true;
+			reader.ReadProperty(options, out propField.Value, out propPlacement.Value);
 		}
 
-		if (value.MultiValueMode is not null)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new UntypedDecayFunction
 		{
-			writer.WritePropertyName("multi_value_mode");
-			JsonSerializer.Serialize(writer, value.MultiValueMode, options);
-		}
+			Field = propField.Value
+,
+			Placement = propPlacement.Value
+,
+			MultiValueMode = propMultiValueMode.Value
+		};
+	}
 
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, UntypedDecayFunction value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropMultiValueMode, value.MultiValueMode);
+		writer.WriteProperty(options, value.Field, value.Placement);
 		writer.WriteEndObject();
 	}
 }
 
 [JsonConverter(typeof(UntypedDecayFunctionConverter))]
-public sealed partial class UntypedDecayFunction
+public sealed partial class UntypedDecayFunction : IDecayFunction
 {
 	public Elastic.Clients.Elasticsearch.Serverless.Field Field { get; set; }
 
@@ -91,6 +83,8 @@ public sealed partial class UntypedDecayFunction
 	/// </summary>
 	public Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MultiValueMode? MultiValueMode { get; set; }
 	public Elastic.Clients.Elasticsearch.Serverless.QueryDsl.DecayPlacement<object, object> Placement { get; set; }
+
+	public string Type => "untypeddecayfunction";
 }
 
 public sealed partial class UntypedDecayFunctionDescriptor<TDocument> : SerializableDescriptor<UntypedDecayFunctionDescriptor<TDocument>>
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/UntypedDistanceFeatureQuery.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/UntypedDistanceFeatureQuery.g.cs
index 3fd405c221e..c673d22e2cc 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/UntypedDistanceFeatureQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/UntypedDistanceFeatureQuery.g.cs
@@ -27,7 +27,7 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.QueryDsl;
 
-public sealed partial class UntypedDistanceFeatureQuery
+public sealed partial class UntypedDistanceFeatureQuery : IDistanceFeatureQuery
 {
 	/// <summary>
 	/// <para>
@@ -72,6 +72,9 @@ public sealed partial class UntypedDistanceFeatureQuery
 	public object Pivot { get; set; }
 	[JsonInclude, JsonPropertyName("_name")]
 	public string? QueryName { get; set; }
+
+	[JsonInclude, JsonPropertyName("")]
+	public string Type => "untypeddistancefeaturequery";
 }
 
 public sealed partial class UntypedDistanceFeatureQueryDescriptor<TDocument> : SerializableDescriptor<UntypedDistanceFeatureQueryDescriptor<TDocument>>
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/UntypedRangeQuery.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/UntypedRangeQuery.g.cs
index 4a324ee690e..fe7c0716961 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/UntypedRangeQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/UntypedRangeQuery.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,151 +28,135 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.QueryDsl;
 
-internal sealed partial class UntypedRangeQueryConverter : JsonConverter<UntypedRangeQuery>
+internal sealed partial class UntypedRangeQueryConverter : System.Text.Json.Serialization.JsonConverter<UntypedRangeQuery>
 {
-	public override UntypedRangeQuery Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropFormat = System.Text.Json.JsonEncodedText.Encode("format");
+	private static readonly System.Text.Json.JsonEncodedText PropGt = System.Text.Json.JsonEncodedText.Encode("gt");
+	private static readonly System.Text.Json.JsonEncodedText PropGte = System.Text.Json.JsonEncodedText.Encode("gte");
+	private static readonly System.Text.Json.JsonEncodedText PropLt = System.Text.Json.JsonEncodedText.Encode("lt");
+	private static readonly System.Text.Json.JsonEncodedText PropLte = System.Text.Json.JsonEncodedText.Encode("lte");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryName = System.Text.Json.JsonEncodedText.Encode("_name");
+	private static readonly System.Text.Json.JsonEncodedText PropRelation = System.Text.Json.JsonEncodedText.Encode("relation");
+	private static readonly System.Text.Json.JsonEncodedText PropTimeZone = System.Text.Json.JsonEncodedText.Encode("time_zone");
+
+	public override UntypedRangeQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Field> propField = default;
 		reader.Read();
-		var fieldName = reader.GetString();
+		propField.Value = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Field>(options);
+		propField.Initialized = true;
 		reader.Read();
-		var variant = new UntypedRangeQuery(fieldName);
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<float?> propBoost = default;
+		LocalJsonProperty<string?> propFormat = default;
+		LocalJsonProperty<object?> propGt = default;
+		LocalJsonProperty<object?> propGte = default;
+		LocalJsonProperty<object?> propLt = default;
+		LocalJsonProperty<object?> propLte = default;
+		LocalJsonProperty<string?> propQueryName = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.RangeRelation?> propRelation = default;
+		LocalJsonProperty<string?> propTimeZone = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propBoost.TryRead(ref reader, options, PropBoost))
 			{
-				var property = reader.GetString();
-				if (property == "boost")
-				{
-					variant.Boost = JsonSerializer.Deserialize<float?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "format")
-				{
-					variant.Format = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "gt")
-				{
-					variant.Gt = JsonSerializer.Deserialize<object?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "gte")
-				{
-					variant.Gte = JsonSerializer.Deserialize<object?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "lt")
-				{
-					variant.Lt = JsonSerializer.Deserialize<object?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "lte")
-				{
-					variant.Lte = JsonSerializer.Deserialize<object?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "_name")
-				{
-					variant.QueryName = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "relation")
-				{
-					variant.Relation = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.RangeRelation?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "time_zone")
-				{
-					variant.TimeZone = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
+				continue;
 			}
-		}
 
-		reader.Read();
-		return variant;
-	}
+			if (propFormat.TryRead(ref reader, options, PropFormat))
+			{
+				continue;
+			}
 
-	public override void Write(Utf8JsonWriter writer, UntypedRangeQuery value, JsonSerializerOptions options)
-	{
-		if (value.Field is null)
-			throw new JsonException("Unable to serialize UntypedRangeQuery because the `Field` property is not set. Field name queries must include a valid field name.");
-		if (!options.TryGetClientSettings(out var settings))
-			throw new JsonException("Unable to retrieve client settings required to infer field.");
-		writer.WriteStartObject();
-		writer.WritePropertyName(settings.Inferrer.Field(value.Field));
-		writer.WriteStartObject();
-		if (value.Boost.HasValue)
-		{
-			writer.WritePropertyName("boost");
-			writer.WriteNumberValue(value.Boost.Value);
-		}
+			if (propGt.TryRead(ref reader, options, PropGt))
+			{
+				continue;
+			}
 
-		if (!string.IsNullOrEmpty(value.Format))
-		{
-			writer.WritePropertyName("format");
-			writer.WriteStringValue(value.Format);
-		}
+			if (propGte.TryRead(ref reader, options, PropGte))
+			{
+				continue;
+			}
 
-		if (value.Gt is not null)
-		{
-			writer.WritePropertyName("gt");
-			JsonSerializer.Serialize(writer, value.Gt, options);
-		}
+			if (propLt.TryRead(ref reader, options, PropLt))
+			{
+				continue;
+			}
 
-		if (value.Gte is not null)
-		{
-			writer.WritePropertyName("gte");
-			JsonSerializer.Serialize(writer, value.Gte, options);
-		}
+			if (propLte.TryRead(ref reader, options, PropLte))
+			{
+				continue;
+			}
 
-		if (value.Lt is not null)
-		{
-			writer.WritePropertyName("lt");
-			JsonSerializer.Serialize(writer, value.Lt, options);
-		}
+			if (propQueryName.TryRead(ref reader, options, PropQueryName))
+			{
+				continue;
+			}
 
-		if (value.Lte is not null)
-		{
-			writer.WritePropertyName("lte");
-			JsonSerializer.Serialize(writer, value.Lte, options);
-		}
+			if (propRelation.TryRead(ref reader, options, PropRelation))
+			{
+				continue;
+			}
 
-		if (!string.IsNullOrEmpty(value.QueryName))
-		{
-			writer.WritePropertyName("_name");
-			writer.WriteStringValue(value.QueryName);
-		}
+			if (propTimeZone.TryRead(ref reader, options, PropTimeZone))
+			{
+				continue;
+			}
 
-		if (value.Relation is not null)
-		{
-			writer.WritePropertyName("relation");
-			JsonSerializer.Serialize(writer, value.Relation, options);
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		if (!string.IsNullOrEmpty(value.TimeZone))
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		reader.Read();
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new UntypedRangeQuery
 		{
-			writer.WritePropertyName("time_zone");
-			writer.WriteStringValue(value.TimeZone);
-		}
+			Boost = propBoost.Value
+,
+			Field = propField.Value
+,
+			Format = propFormat.Value
+,
+			Gt = propGt.Value
+,
+			Gte = propGte.Value
+,
+			Lt = propLt.Value
+,
+			Lte = propLte.Value
+,
+			QueryName = propQueryName.Value
+,
+			Relation = propRelation.Value
+,
+			TimeZone = propTimeZone.Value
+		};
+	}
 
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, UntypedRangeQuery value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WritePropertyName(options, value.Field);
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropFormat, value.Format);
+		writer.WriteProperty(options, PropGt, value.Gt);
+		writer.WriteProperty(options, PropGte, value.Gte);
+		writer.WriteProperty(options, PropLt, value.Lt);
+		writer.WriteProperty(options, PropLte, value.Lte);
+		writer.WriteProperty(options, PropQueryName, value.QueryName);
+		writer.WriteProperty(options, PropRelation, value.Relation);
+		writer.WriteProperty(options, PropTimeZone, value.TimeZone);
 		writer.WriteEndObject();
 		writer.WriteEndObject();
 	}
 }
 
 [JsonConverter(typeof(UntypedRangeQueryConverter))]
-public sealed partial class UntypedRangeQuery
+public sealed partial class UntypedRangeQuery : IRangeQuery
 {
 	public UntypedRangeQuery(Elastic.Clients.Elasticsearch.Serverless.Field field)
 	{
@@ -180,6 +165,10 @@ public UntypedRangeQuery(Elastic.Clients.Elasticsearch.Serverless.Field field)
 		Field = field;
 	}
 
+	internal UntypedRangeQuery()
+	{
+	}
+
 	/// <summary>
 	/// <para>
 	/// Floating point number used to decrease or increase the relevance scores of the query.
@@ -240,6 +229,8 @@ public UntypedRangeQuery(Elastic.Clients.Elasticsearch.Serverless.Field field)
 	/// </para>
 	/// </summary>
 	public string? TimeZone { get; set; }
+
+	public string Type => "untypedrangequery";
 }
 
 public sealed partial class UntypedRangeQueryDescriptor<TDocument> : SerializableDescriptor<UntypedRangeQueryDescriptor<TDocument>>
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/WildcardQuery.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/WildcardQuery.g.cs
index f45948b7b38..70b141c3de1 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/WildcardQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/WildcardQuery.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,108 +28,105 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.QueryDsl;
 
-internal sealed partial class WildcardQueryConverter : JsonConverter<WildcardQuery>
+internal sealed partial class WildcardQueryConverter : System.Text.Json.Serialization.JsonConverter<WildcardQuery>
 {
-	public override WildcardQuery Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropCaseInsensitive = System.Text.Json.JsonEncodedText.Encode("case_insensitive");
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryName = System.Text.Json.JsonEncodedText.Encode("_name");
+	private static readonly System.Text.Json.JsonEncodedText PropRewrite = System.Text.Json.JsonEncodedText.Encode("rewrite");
+	private static readonly System.Text.Json.JsonEncodedText PropValue = System.Text.Json.JsonEncodedText.Encode("value");
+	private static readonly System.Text.Json.JsonEncodedText PropWildcard = System.Text.Json.JsonEncodedText.Encode("wildcard");
+
+	public override WildcardQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Field> propField = default;
 		reader.Read();
-		var fieldName = reader.GetString();
+		propField.Value = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Field>(options);
+		propField.Initialized = true;
 		reader.Read();
-		var variant = new WildcardQuery(fieldName);
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		if (reader.TokenType is not System.Text.Json.JsonTokenType.StartObject)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			var value = reader.ReadValue<string?>(options);
+			reader.Read();
+			return new WildcardQuery { Value = value };
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<float?> propBoost = default;
+		LocalJsonProperty<bool?> propCaseInsensitive = default;
+		LocalJsonProperty<string?> propQueryName = default;
+		LocalJsonProperty<string?> propRewrite = default;
+		LocalJsonProperty<string?> propValue = default;
+		LocalJsonProperty<string?> propWildcard = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBoost.TryRead(ref reader, options, PropBoost))
 			{
-				var property = reader.GetString();
-				if (property == "boost")
-				{
-					variant.Boost = JsonSerializer.Deserialize<float?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "case_insensitive")
-				{
-					variant.CaseInsensitive = JsonSerializer.Deserialize<bool?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "_name")
-				{
-					variant.QueryName = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "rewrite")
-				{
-					variant.Rewrite = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "value")
-				{
-					variant.Value = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "wildcard")
-				{
-					variant.Wildcard = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
+				continue;
 			}
-		}
 
-		reader.Read();
-		return variant;
-	}
+			if (propCaseInsensitive.TryRead(ref reader, options, PropCaseInsensitive))
+			{
+				continue;
+			}
 
-	public override void Write(Utf8JsonWriter writer, WildcardQuery value, JsonSerializerOptions options)
-	{
-		if (value.Field is null)
-			throw new JsonException("Unable to serialize WildcardQuery because the `Field` property is not set. Field name queries must include a valid field name.");
-		if (!options.TryGetClientSettings(out var settings))
-			throw new JsonException("Unable to retrieve client settings required to infer field.");
-		writer.WriteStartObject();
-		writer.WritePropertyName(settings.Inferrer.Field(value.Field));
-		writer.WriteStartObject();
-		if (value.Boost.HasValue)
-		{
-			writer.WritePropertyName("boost");
-			writer.WriteNumberValue(value.Boost.Value);
-		}
+			if (propQueryName.TryRead(ref reader, options, PropQueryName))
+			{
+				continue;
+			}
 
-		if (value.CaseInsensitive.HasValue)
-		{
-			writer.WritePropertyName("case_insensitive");
-			writer.WriteBooleanValue(value.CaseInsensitive.Value);
-		}
+			if (propRewrite.TryRead(ref reader, options, PropRewrite))
+			{
+				continue;
+			}
 
-		if (!string.IsNullOrEmpty(value.QueryName))
-		{
-			writer.WritePropertyName("_name");
-			writer.WriteStringValue(value.QueryName);
-		}
+			if (propValue.TryRead(ref reader, options, PropValue))
+			{
+				continue;
+			}
 
-		if (!string.IsNullOrEmpty(value.Rewrite))
-		{
-			writer.WritePropertyName("rewrite");
-			writer.WriteStringValue(value.Rewrite);
-		}
+			if (propWildcard.TryRead(ref reader, options, PropWildcard))
+			{
+				continue;
+			}
 
-		if (!string.IsNullOrEmpty(value.Value))
-		{
-			writer.WritePropertyName("value");
-			writer.WriteStringValue(value.Value);
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		if (!string.IsNullOrEmpty(value.Wildcard))
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		reader.Read();
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new WildcardQuery
 		{
-			writer.WritePropertyName("wildcard");
-			writer.WriteStringValue(value.Wildcard);
-		}
+			Boost = propBoost.Value
+,
+			CaseInsensitive = propCaseInsensitive.Value
+,
+			Field = propField.Value
+,
+			QueryName = propQueryName.Value
+,
+			Rewrite = propRewrite.Value
+,
+			Value = propValue.Value
+,
+			Wildcard = propWildcard.Value
+		};
+	}
 
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, WildcardQuery value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WritePropertyName(options, value.Field);
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropCaseInsensitive, value.CaseInsensitive);
+		writer.WriteProperty(options, PropQueryName, value.QueryName);
+		writer.WriteProperty(options, PropRewrite, value.Rewrite);
+		writer.WriteProperty(options, PropValue, value.Value);
+		writer.WriteProperty(options, PropWildcard, value.Wildcard);
 		writer.WriteEndObject();
 		writer.WriteEndObject();
 	}
@@ -144,6 +142,10 @@ public WildcardQuery(Elastic.Clients.Elasticsearch.Serverless.Field field)
 		Field = field;
 	}
 
+	internal WildcardQuery()
+	{
+	}
+
 	/// <summary>
 	/// <para>
 	/// Floating point number used to decrease or increase the relevance scores of the query.
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryRules/QueryRule.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryRules/QueryRule.g.cs
index 66166ab9488..d79b772189d 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryRules/QueryRule.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryRules/QueryRule.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,80 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.QueryRules;
 
+internal sealed partial class QueryRuleConverter : System.Text.Json.Serialization.JsonConverter<QueryRule>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropActions = System.Text.Json.JsonEncodedText.Encode("actions");
+	private static readonly System.Text.Json.JsonEncodedText PropCriteria = System.Text.Json.JsonEncodedText.Encode("criteria");
+	private static readonly System.Text.Json.JsonEncodedText PropPriority = System.Text.Json.JsonEncodedText.Encode("priority");
+	private static readonly System.Text.Json.JsonEncodedText PropRuleId = System.Text.Json.JsonEncodedText.Encode("rule_id");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override QueryRule Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.QueryRules.QueryRuleActions> propActions = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.QueryRules.QueryRuleCriteria>> propCriteria = default;
+		LocalJsonProperty<int?> propPriority = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Id> propRuleId = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.QueryRules.QueryRuleType> propType = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propActions.TryRead(ref reader, options, PropActions))
+			{
+				continue;
+			}
+
+			if (propCriteria.TryRead(ref reader, options, PropCriteria, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.QueryRules.QueryRuleCriteria>, Elastic.Clients.Elasticsearch.Serverless.QueryRules.QueryRuleCriteria>)))
+			{
+				continue;
+			}
+
+			if (propPriority.TryRead(ref reader, options, PropPriority))
+			{
+				continue;
+			}
+
+			if (propRuleId.TryRead(ref reader, options, PropRuleId))
+			{
+				continue;
+			}
+
+			if (propType.TryRead(ref reader, options, PropType))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new QueryRule
+		{
+			Actions = propActions.Value
+,
+			Criteria = propCriteria.Value
+,
+			Priority = propPriority.Value
+,
+			RuleId = propRuleId.Value
+,
+			Type = propType.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, QueryRule value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropActions, value.Actions);
+		writer.WriteProperty(options, PropCriteria, value.Criteria, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.QueryRules.QueryRuleCriteria>, Elastic.Clients.Elasticsearch.Serverless.QueryRules.QueryRuleCriteria>));
+		writer.WriteProperty(options, PropPriority, value.Priority);
+		writer.WriteProperty(options, PropRuleId, value.RuleId);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(QueryRuleConverter))]
 public sealed partial class QueryRule
 {
 	/// <summary>
@@ -35,7 +110,6 @@ public sealed partial class QueryRule
 	/// The format of this action depends on the rule type.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("actions")]
 	public Elastic.Clients.Elasticsearch.Serverless.QueryRules.QueryRuleActions Actions { get; set; }
 
 	/// <summary>
@@ -44,10 +118,7 @@ public sealed partial class QueryRule
 	/// If multiple criteria are specified for a rule, all criteria must be met for the rule to be applied.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("criteria")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.Serverless.QueryRules.QueryRuleCriteria))]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.QueryRules.QueryRuleCriteria> Criteria { get; set; }
-	[JsonInclude, JsonPropertyName("priority")]
 	public int? Priority { get; set; }
 
 	/// <summary>
@@ -55,7 +126,6 @@ public sealed partial class QueryRule
 	/// A unique identifier for the rule.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("rule_id")]
 	public Elastic.Clients.Elasticsearch.Serverless.Id RuleId { get; set; }
 
 	/// <summary>
@@ -65,7 +135,6 @@ public sealed partial class QueryRule
 	/// <c>exclude</c> will exclude specific documents from search results.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("type")]
 	public Elastic.Clients.Elasticsearch.Serverless.QueryRules.QueryRuleType Type { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryVectorBuilder.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryVectorBuilder.g.cs
index 52036aa17c6..02d8407ec88 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryVectorBuilder.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryVectorBuilder.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -39,12 +40,16 @@ internal QueryVectorBuilder(string variantName, object variant)
 			throw new ArgumentNullException(nameof(variant));
 		if (string.IsNullOrWhiteSpace(variantName))
 			throw new ArgumentException("Variant name must not be empty or whitespace.");
-		VariantName = variantName;
+		VariantType = variantName;
 		Variant = variant;
 	}
 
-	internal object Variant { get; }
-	internal string VariantName { get; }
+	internal QueryVectorBuilder()
+	{
+	}
+
+	public object Variant { get; internal set; }
+	public string VariantType { get; internal set; }
 
 	public static QueryVectorBuilder TextEmbedding(Elastic.Clients.Elasticsearch.Serverless.TextEmbedding textEmbedding) => new QueryVectorBuilder("text_embedding", textEmbedding);
 
@@ -61,57 +66,44 @@ public bool TryGet<T>([NotNullWhen(true)] out T? result) where T : class
 	}
 }
 
-internal sealed partial class QueryVectorBuilderConverter : JsonConverter<QueryVectorBuilder>
+internal sealed partial class QueryVectorBuilderConverter : System.Text.Json.Serialization.JsonConverter<QueryVectorBuilder>
 {
-	public override QueryVectorBuilder Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-		{
-			throw new JsonException("Expected start token.");
-		}
+	private static readonly System.Text.Json.JsonEncodedText VariantTextEmbedding = System.Text.Json.JsonEncodedText.Encode("text_embedding");
 
-		object? variantValue = default;
-		string? variantNameValue = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+	public override QueryVectorBuilder Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		var variantType = string.Empty;
+		object? variant = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
+			if (reader.ValueTextEquals(VariantTextEmbedding))
 			{
-				throw new JsonException("Expected a property name token.");
-			}
-
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token representing the name of an Elasticsearch field.");
-			}
-
-			var propertyName = reader.GetString();
-			reader.Read();
-			if (propertyName == "text_embedding")
-			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.TextEmbedding?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantTextEmbedding.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.TextEmbedding?>(options);
 				continue;
 			}
 
-			throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'QueryVectorBuilder' from the response.");
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		var result = new QueryVectorBuilder(variantNameValue, variantValue);
-		return result;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new QueryVectorBuilder { VariantType = variantType, Variant = variant };
 	}
 
-	public override void Write(Utf8JsonWriter writer, QueryVectorBuilder value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, QueryVectorBuilder value, System.Text.Json.JsonSerializerOptions options)
 	{
 		writer.WriteStartObject();
-		if (value.VariantName is not null && value.Variant is not null)
+		switch (value.VariantType)
 		{
-			writer.WritePropertyName(value.VariantName);
-			switch (value.VariantName)
-			{
-				case "text_embedding":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.TextEmbedding>(writer, (Elastic.Clients.Elasticsearch.Serverless.TextEmbedding)value.Variant, options);
-					break;
-			}
+			case "":
+				break;
+			case "text_embedding":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.TextEmbedding?)value.Variant);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.VariantType}' is not supported for type '{nameof(QueryVectorBuilder)}'.");
 		}
 
 		writer.WriteEndObject();
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/RRFRetriever.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/RRFRetriever.g.cs
index 100f1f40cc2..5e48469846d 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/RRFRetriever.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/RRFRetriever.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,80 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless;
 
+internal sealed partial class RRFRetrieverConverter : System.Text.Json.Serialization.JsonConverter<RRFRetriever>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropFilter = System.Text.Json.JsonEncodedText.Encode("filter");
+	private static readonly System.Text.Json.JsonEncodedText PropMinScore = System.Text.Json.JsonEncodedText.Encode("min_score");
+	private static readonly System.Text.Json.JsonEncodedText PropRankConstant = System.Text.Json.JsonEncodedText.Encode("rank_constant");
+	private static readonly System.Text.Json.JsonEncodedText PropRankWindowSize = System.Text.Json.JsonEncodedText.Encode("rank_window_size");
+	private static readonly System.Text.Json.JsonEncodedText PropRetrievers = System.Text.Json.JsonEncodedText.Encode("retrievers");
+
+	public override RRFRetriever Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query>?> propFilter = default;
+		LocalJsonProperty<float?> propMinScore = default;
+		LocalJsonProperty<int?> propRankConstant = default;
+		LocalJsonProperty<int?> propRankWindowSize = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.Retriever>> propRetrievers = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propFilter.TryRead(ref reader, options, PropFilter, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query>?, Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query>)))
+			{
+				continue;
+			}
+
+			if (propMinScore.TryRead(ref reader, options, PropMinScore))
+			{
+				continue;
+			}
+
+			if (propRankConstant.TryRead(ref reader, options, PropRankConstant))
+			{
+				continue;
+			}
+
+			if (propRankWindowSize.TryRead(ref reader, options, PropRankWindowSize))
+			{
+				continue;
+			}
+
+			if (propRetrievers.TryRead(ref reader, options, PropRetrievers))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new RRFRetriever
+		{
+			Filter = propFilter.Value
+,
+			MinScore = propMinScore.Value
+,
+			RankConstant = propRankConstant.Value
+,
+			RankWindowSize = propRankWindowSize.Value
+,
+			Retrievers = propRetrievers.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, RRFRetriever value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropFilter, value.Filter, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query>?, Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query>));
+		writer.WriteProperty(options, PropMinScore, value.MinScore);
+		writer.WriteProperty(options, PropRankConstant, value.RankConstant);
+		writer.WriteProperty(options, PropRankWindowSize, value.RankWindowSize);
+		writer.WriteProperty(options, PropRetrievers, value.Retrievers);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(RRFRetrieverConverter))]
 public sealed partial class RRFRetriever
 {
 	/// <summary>
@@ -34,8 +109,6 @@ public sealed partial class RRFRetriever
 	/// Query to filter the documents that can match.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("filter")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query))]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query>? Filter { get; set; }
 
 	/// <summary>
@@ -43,7 +116,6 @@ public sealed partial class RRFRetriever
 	/// Minimum _score for matching documents. Documents with a lower _score are not included in the top documents.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("min_score")]
 	public float? MinScore { get; set; }
 
 	/// <summary>
@@ -51,7 +123,6 @@ public sealed partial class RRFRetriever
 	/// This value determines how much influence documents in individual result sets per query have over the final ranked result set.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("rank_constant")]
 	public int? RankConstant { get; set; }
 
 	/// <summary>
@@ -59,7 +130,6 @@ public sealed partial class RRFRetriever
 	/// This value determines the size of the individual result sets per query.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("rank_window_size")]
 	public int? RankWindowSize { get; set; }
 
 	/// <summary>
@@ -67,7 +137,6 @@ public sealed partial class RRFRetriever
 	/// A list of child retrievers to specify which sets of returned top documents will have the RRF formula applied to them.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("retrievers")]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.Retriever> Retrievers { get; set; }
 
 	public static implicit operator Elastic.Clients.Elasticsearch.Serverless.Retriever(RRFRetriever rRFRetriever) => Elastic.Clients.Elasticsearch.Serverless.Retriever.Rrf(rRFRetriever);
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Retriever.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Retriever.g.cs
index f6ba60c8271..814948b9836 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Retriever.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Retriever.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -39,12 +40,16 @@ internal Retriever(string variantName, object variant)
 			throw new ArgumentNullException(nameof(variant));
 		if (string.IsNullOrWhiteSpace(variantName))
 			throw new ArgumentException("Variant name must not be empty or whitespace.");
-		VariantName = variantName;
+		VariantType = variantName;
 		Variant = variant;
 	}
 
-	internal object Variant { get; }
-	internal string VariantName { get; }
+	internal Retriever()
+	{
+	}
+
+	public object Variant { get; internal set; }
+	public string VariantType { get; internal set; }
 
 	public static Retriever Knn(Elastic.Clients.Elasticsearch.Serverless.KnnRetriever knnRetriever) => new Retriever("knn", knnRetriever);
 	public static Retriever Rrf(Elastic.Clients.Elasticsearch.Serverless.RRFRetriever rRFRetriever) => new Retriever("rrf", rRFRetriever);
@@ -65,97 +70,92 @@ public bool TryGet<T>([NotNullWhen(true)] out T? result) where T : class
 	}
 }
 
-internal sealed partial class RetrieverConverter : JsonConverter<Retriever>
+internal sealed partial class RetrieverConverter : System.Text.Json.Serialization.JsonConverter<Retriever>
 {
-	public override Retriever Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-		{
-			throw new JsonException("Expected start token.");
-		}
+	private static readonly System.Text.Json.JsonEncodedText VariantKnn = System.Text.Json.JsonEncodedText.Encode("knn");
+	private static readonly System.Text.Json.JsonEncodedText VariantRrf = System.Text.Json.JsonEncodedText.Encode("rrf");
+	private static readonly System.Text.Json.JsonEncodedText VariantRule = System.Text.Json.JsonEncodedText.Encode("rule");
+	private static readonly System.Text.Json.JsonEncodedText VariantStandard = System.Text.Json.JsonEncodedText.Encode("standard");
+	private static readonly System.Text.Json.JsonEncodedText VariantTextSimilarityReranker = System.Text.Json.JsonEncodedText.Encode("text_similarity_reranker");
 
-		object? variantValue = default;
-		string? variantNameValue = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+	public override Retriever Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		var variantType = string.Empty;
+		object? variant = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
+			if (reader.ValueTextEquals(VariantKnn))
 			{
-				throw new JsonException("Expected a property name token.");
-			}
-
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token representing the name of an Elasticsearch field.");
-			}
-
-			var propertyName = reader.GetString();
-			reader.Read();
-			if (propertyName == "knn")
-			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.KnnRetriever?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantKnn.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.KnnRetriever?>(options);
 				continue;
 			}
 
-			if (propertyName == "rrf")
+			if (reader.ValueTextEquals(VariantRrf))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.RRFRetriever?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantRrf.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.RRFRetriever?>(options);
 				continue;
 			}
 
-			if (propertyName == "rule")
+			if (reader.ValueTextEquals(VariantRule))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.RuleRetriever?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantRule.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.RuleRetriever?>(options);
 				continue;
 			}
 
-			if (propertyName == "standard")
+			if (reader.ValueTextEquals(VariantStandard))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.StandardRetriever?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantStandard.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.StandardRetriever?>(options);
 				continue;
 			}
 
-			if (propertyName == "text_similarity_reranker")
+			if (reader.ValueTextEquals(VariantTextSimilarityReranker))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.TextSimilarityReranker?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantTextSimilarityReranker.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.TextSimilarityReranker?>(options);
 				continue;
 			}
 
-			throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'Retriever' from the response.");
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		var result = new Retriever(variantNameValue, variantValue);
-		return result;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new Retriever { VariantType = variantType, Variant = variant };
 	}
 
-	public override void Write(Utf8JsonWriter writer, Retriever value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, Retriever value, System.Text.Json.JsonSerializerOptions options)
 	{
 		writer.WriteStartObject();
-		if (value.VariantName is not null && value.Variant is not null)
+		switch (value.VariantType)
 		{
-			writer.WritePropertyName(value.VariantName);
-			switch (value.VariantName)
-			{
-				case "knn":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.KnnRetriever>(writer, (Elastic.Clients.Elasticsearch.Serverless.KnnRetriever)value.Variant, options);
-					break;
-				case "rrf":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.RRFRetriever>(writer, (Elastic.Clients.Elasticsearch.Serverless.RRFRetriever)value.Variant, options);
-					break;
-				case "rule":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.RuleRetriever>(writer, (Elastic.Clients.Elasticsearch.Serverless.RuleRetriever)value.Variant, options);
-					break;
-				case "standard":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.StandardRetriever>(writer, (Elastic.Clients.Elasticsearch.Serverless.StandardRetriever)value.Variant, options);
-					break;
-				case "text_similarity_reranker":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.TextSimilarityReranker>(writer, (Elastic.Clients.Elasticsearch.Serverless.TextSimilarityReranker)value.Variant, options);
-					break;
-			}
+			case "":
+				break;
+			case "knn":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.KnnRetriever?)value.Variant);
+				break;
+			case "rrf":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.RRFRetriever?)value.Variant);
+				break;
+			case "rule":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.RuleRetriever?)value.Variant);
+				break;
+			case "standard":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.StandardRetriever?)value.Variant);
+				break;
+			case "text_similarity_reranker":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.TextSimilarityReranker?)value.Variant);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.VariantType}' is not supported for type '{nameof(Retriever)}'.");
 		}
 
 		writer.WriteEndObject();
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/RuleRetriever.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/RuleRetriever.g.cs
index d4b7c4c0874..5ddd46235e2 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/RuleRetriever.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/RuleRetriever.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,90 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless;
 
+internal sealed partial class RuleRetrieverConverter : System.Text.Json.Serialization.JsonConverter<RuleRetriever>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropFilter = System.Text.Json.JsonEncodedText.Encode("filter");
+	private static readonly System.Text.Json.JsonEncodedText PropMatchCriteria = System.Text.Json.JsonEncodedText.Encode("match_criteria");
+	private static readonly System.Text.Json.JsonEncodedText PropMinScore = System.Text.Json.JsonEncodedText.Encode("min_score");
+	private static readonly System.Text.Json.JsonEncodedText PropRankWindowSize = System.Text.Json.JsonEncodedText.Encode("rank_window_size");
+	private static readonly System.Text.Json.JsonEncodedText PropRetriever = System.Text.Json.JsonEncodedText.Encode("retriever");
+	private static readonly System.Text.Json.JsonEncodedText PropRulesetIds = System.Text.Json.JsonEncodedText.Encode("ruleset_ids");
+
+	public override RuleRetriever Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query>?> propFilter = default;
+		LocalJsonProperty<object> propMatchCriteria = default;
+		LocalJsonProperty<float?> propMinScore = default;
+		LocalJsonProperty<int?> propRankWindowSize = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Retriever> propRetriever = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.Id>> propRulesetIds = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propFilter.TryRead(ref reader, options, PropFilter, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query>?, Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query>)))
+			{
+				continue;
+			}
+
+			if (propMatchCriteria.TryRead(ref reader, options, PropMatchCriteria))
+			{
+				continue;
+			}
+
+			if (propMinScore.TryRead(ref reader, options, PropMinScore))
+			{
+				continue;
+			}
+
+			if (propRankWindowSize.TryRead(ref reader, options, PropRankWindowSize))
+			{
+				continue;
+			}
+
+			if (propRetriever.TryRead(ref reader, options, PropRetriever))
+			{
+				continue;
+			}
+
+			if (propRulesetIds.TryRead(ref reader, options, PropRulesetIds))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new RuleRetriever
+		{
+			Filter = propFilter.Value
+,
+			MatchCriteria = propMatchCriteria.Value
+,
+			MinScore = propMinScore.Value
+,
+			RankWindowSize = propRankWindowSize.Value
+,
+			Retriever = propRetriever.Value
+,
+			RulesetIds = propRulesetIds.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, RuleRetriever value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropFilter, value.Filter, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query>?, Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query>));
+		writer.WriteProperty(options, PropMatchCriteria, value.MatchCriteria);
+		writer.WriteProperty(options, PropMinScore, value.MinScore);
+		writer.WriteProperty(options, PropRankWindowSize, value.RankWindowSize);
+		writer.WriteProperty(options, PropRetriever, value.Retriever);
+		writer.WriteProperty(options, PropRulesetIds, value.RulesetIds);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(RuleRetrieverConverter))]
 public sealed partial class RuleRetriever
 {
 	/// <summary>
@@ -34,8 +119,6 @@ public sealed partial class RuleRetriever
 	/// Query to filter the documents that can match.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("filter")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query))]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query>? Filter { get; set; }
 
 	/// <summary>
@@ -43,7 +126,6 @@ public sealed partial class RuleRetriever
 	/// The match criteria that will determine if a rule in the provided rulesets should be applied.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("match_criteria")]
 	public object MatchCriteria { get; set; }
 
 	/// <summary>
@@ -51,7 +133,6 @@ public sealed partial class RuleRetriever
 	/// Minimum _score for matching documents. Documents with a lower _score are not included in the top documents.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("min_score")]
 	public float? MinScore { get; set; }
 
 	/// <summary>
@@ -59,7 +140,6 @@ public sealed partial class RuleRetriever
 	/// This value determines the size of the individual result set.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("rank_window_size")]
 	public int? RankWindowSize { get; set; }
 
 	/// <summary>
@@ -67,7 +147,6 @@ public sealed partial class RuleRetriever
 	/// The retriever whose results rules should be applied to.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("retriever")]
 	public Elastic.Clients.Elasticsearch.Serverless.Retriever Retriever { get; set; }
 
 	/// <summary>
@@ -75,7 +154,6 @@ public sealed partial class RuleRetriever
 	/// The ruleset IDs containing the rules this retriever is evaluating against.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("ruleset_ids")]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.Id> RulesetIds { get; set; }
 
 	public static implicit operator Elastic.Clients.Elasticsearch.Serverless.Retriever(RuleRetriever ruleRetriever) => Elastic.Clients.Elasticsearch.Serverless.Retriever.Rule(ruleRetriever);
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Script.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Script.g.cs
index a3b666f40e3..6f1d1687cfd 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Script.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Script.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,86 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless;
 
+internal sealed partial class ScriptConverter : System.Text.Json.Serialization.JsonConverter<Script>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("id");
+	private static readonly System.Text.Json.JsonEncodedText PropLang = System.Text.Json.JsonEncodedText.Encode("lang");
+	private static readonly System.Text.Json.JsonEncodedText PropOptions = System.Text.Json.JsonEncodedText.Encode("options");
+	private static readonly System.Text.Json.JsonEncodedText PropParams = System.Text.Json.JsonEncodedText.Encode("params");
+	private static readonly System.Text.Json.JsonEncodedText PropSource = System.Text.Json.JsonEncodedText.Encode("source");
+
+	public override Script Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		if (reader.TokenType is not System.Text.Json.JsonTokenType.StartObject)
+		{
+			var value = reader.ReadValue<string?>(options);
+			return new Script { Source = value };
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Id?> propId = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.ScriptLanguage?> propLang = default;
+		LocalJsonProperty<IDictionary<string, string>?> propOptions = default;
+		LocalJsonProperty<IDictionary<string, object>?> propParams = default;
+		LocalJsonProperty<string?> propSource = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propId.TryRead(ref reader, options, PropId))
+			{
+				continue;
+			}
+
+			if (propLang.TryRead(ref reader, options, PropLang))
+			{
+				continue;
+			}
+
+			if (propOptions.TryRead(ref reader, options, PropOptions))
+			{
+				continue;
+			}
+
+			if (propParams.TryRead(ref reader, options, PropParams))
+			{
+				continue;
+			}
+
+			if (propSource.TryRead(ref reader, options, PropSource))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new Script
+		{
+			Id = propId.Value
+,
+			Lang = propLang.Value
+,
+			Options = propOptions.Value
+,
+			Params = propParams.Value
+,
+			Source = propSource.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, Script value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropId, value.Id);
+		writer.WriteProperty(options, PropLang, value.Lang);
+		writer.WriteProperty(options, PropOptions, value.Options);
+		writer.WriteProperty(options, PropParams, value.Params);
+		writer.WriteProperty(options, PropSource, value.Source);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ScriptConverter))]
 public sealed partial class Script
 {
 	/// <summary>
@@ -34,7 +115,6 @@ public sealed partial class Script
 	/// The <c>id</c> for a stored script.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("id")]
 	public Elastic.Clients.Elasticsearch.Serverless.Id? Id { get; set; }
 
 	/// <summary>
@@ -42,9 +122,7 @@ public sealed partial class Script
 	/// Specifies the language the script is written in.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("lang")]
 	public Elastic.Clients.Elasticsearch.Serverless.ScriptLanguage? Lang { get; set; }
-	[JsonInclude, JsonPropertyName("options")]
 	public IDictionary<string, string>? Options { get; set; }
 
 	/// <summary>
@@ -53,7 +131,6 @@ public sealed partial class Script
 	/// Use parameters instead of hard-coded values to decrease compile time.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("params")]
 	public IDictionary<string, object>? Params { get; set; }
 
 	/// <summary>
@@ -61,7 +138,6 @@ public sealed partial class Script
 	/// The script source.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("source")]
 	public string? Source { get; set; }
 
 	public static implicit operator Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IntervalsFilter(Script script) => Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IntervalsFilter.Script(script);
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Security/ApiKeyAggregation.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Security/ApiKeyAggregation.g.cs
index 53a0e25eabb..29549a5acb7 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Security/ApiKeyAggregation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Security/ApiKeyAggregation.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -39,12 +40,16 @@ internal ApiKeyAggregation(string variantName, object variant)
 			throw new ArgumentNullException(nameof(variant));
 		if (string.IsNullOrWhiteSpace(variantName))
 			throw new ArgumentException("Variant name must not be empty or whitespace.");
-		VariantName = variantName;
+		VariantType = variantName;
 		Variant = variant;
 	}
 
-	internal object Variant { get; }
-	internal string VariantName { get; }
+	internal ApiKeyAggregation()
+	{
+	}
+
+	public object Variant { get; internal set; }
+	public string VariantType { get; internal set; }
 
 	public static ApiKeyAggregation Cardinality(Elastic.Clients.Elasticsearch.Serverless.Aggregations.CardinalityAggregation cardinalityAggregation) => new ApiKeyAggregation("cardinality", cardinalityAggregation);
 	public static ApiKeyAggregation Composite(Elastic.Clients.Elasticsearch.Serverless.Aggregations.CompositeAggregation compositeAggregation) => new ApiKeyAggregation("composite", compositeAggregation);
@@ -80,167 +85,166 @@ public bool TryGet<T>([NotNullWhen(true)] out T? result) where T : class
 	}
 }
 
-internal sealed partial class ApiKeyAggregationConverter : JsonConverter<ApiKeyAggregation>
+internal sealed partial class ApiKeyAggregationConverter : System.Text.Json.Serialization.JsonConverter<ApiKeyAggregation>
 {
-	public override ApiKeyAggregation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations1 = System.Text.Json.JsonEncodedText.Encode("aggs");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText VariantCardinality = System.Text.Json.JsonEncodedText.Encode("cardinality");
+	private static readonly System.Text.Json.JsonEncodedText VariantComposite = System.Text.Json.JsonEncodedText.Encode("composite");
+	private static readonly System.Text.Json.JsonEncodedText VariantDateRange = System.Text.Json.JsonEncodedText.Encode("date_range");
+	private static readonly System.Text.Json.JsonEncodedText VariantFilter = System.Text.Json.JsonEncodedText.Encode("filter");
+	private static readonly System.Text.Json.JsonEncodedText VariantFilters = System.Text.Json.JsonEncodedText.Encode("filters");
+	private static readonly System.Text.Json.JsonEncodedText VariantMissing = System.Text.Json.JsonEncodedText.Encode("missing");
+	private static readonly System.Text.Json.JsonEncodedText VariantRange = System.Text.Json.JsonEncodedText.Encode("range");
+	private static readonly System.Text.Json.JsonEncodedText VariantTerms = System.Text.Json.JsonEncodedText.Encode("terms");
+	private static readonly System.Text.Json.JsonEncodedText VariantValueCount = System.Text.Json.JsonEncodedText.Encode("value_count");
+
+	public override ApiKeyAggregation Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-		{
-			throw new JsonException("Expected start token.");
-		}
-
-		object? variantValue = default;
-		string? variantNameValue = default;
-		IDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Security.ApiKeyAggregation>? aggregationsValue = default;
-		IDictionary<string, object>? metaValue = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Security.ApiKeyAggregation>?> propAggregations = default;
+		LocalJsonProperty<IDictionary<string, object>?> propMeta = default;
+		var variantType = string.Empty;
+		object? variant = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token.");
-			}
-
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token representing the name of an Elasticsearch field.");
-			}
-
-			var propertyName = reader.GetString();
-			reader.Read();
-			if (propertyName == "aggregations")
+			if (propAggregations.TryRead(ref reader, options, PropAggregations) || propAggregations.TryRead(ref reader, options, PropAggregations1))
 			{
-				aggregationsValue = JsonSerializer.Deserialize<IDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Security.ApiKeyAggregation>?>(ref reader, options);
 				continue;
 			}
 
-			if (propertyName == "meta")
+			if (propMeta.TryRead(ref reader, options, PropMeta))
 			{
-				metaValue = JsonSerializer.Deserialize<IDictionary<string, object>?>(ref reader, options);
 				continue;
 			}
 
-			if (propertyName == "cardinality")
+			if (reader.ValueTextEquals(VariantCardinality))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.CardinalityAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantCardinality.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.CardinalityAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "composite")
+			if (reader.ValueTextEquals(VariantComposite))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.CompositeAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantComposite.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.CompositeAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "date_range")
+			if (reader.ValueTextEquals(VariantDateRange))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.DateRangeAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantDateRange.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.DateRangeAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "filter")
+			if (reader.ValueTextEquals(VariantFilter))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Security.ApiKeyQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantFilter.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Security.ApiKeyQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "filters")
+			if (reader.ValueTextEquals(VariantFilters))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Security.ApiKeyFiltersAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantFilters.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Security.ApiKeyFiltersAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "missing")
+			if (reader.ValueTextEquals(VariantMissing))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.MissingAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantMissing.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.MissingAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "range")
+			if (reader.ValueTextEquals(VariantRange))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.RangeAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantRange.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.RangeAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "terms")
+			if (reader.ValueTextEquals(VariantTerms))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.TermsAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantTerms.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.TermsAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "value_count")
+			if (reader.ValueTextEquals(VariantValueCount))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.ValueCountAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantValueCount.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.ValueCountAggregation?>(options);
 				continue;
 			}
 
-			throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'ApiKeyAggregation' from the response.");
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		var result = new ApiKeyAggregation(variantNameValue, variantValue);
-		result.Aggregations = aggregationsValue;
-		result.Meta = metaValue;
-		return result;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ApiKeyAggregation
+		{
+			VariantType = variantType,
+			Variant = variant,
+			Aggregations = propAggregations.Value
+	,
+			Meta = propMeta.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, ApiKeyAggregation value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ApiKeyAggregation value, System.Text.Json.JsonSerializerOptions options)
 	{
 		writer.WriteStartObject();
-		if (value.Aggregations is not null)
-		{
-			writer.WritePropertyName("aggregations");
-			JsonSerializer.Serialize(writer, value.Aggregations, options);
-		}
-
-		if (value.Meta is not null)
+		switch (value.VariantType)
 		{
-			writer.WritePropertyName("meta");
-			JsonSerializer.Serialize(writer, value.Meta, options);
-		}
-
-		if (value.VariantName is not null && value.Variant is not null)
-		{
-			writer.WritePropertyName(value.VariantName);
-			switch (value.VariantName)
-			{
-				case "cardinality":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.CardinalityAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.CardinalityAggregation)value.Variant, options);
-					break;
-				case "composite":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.CompositeAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.CompositeAggregation)value.Variant, options);
-					break;
-				case "date_range":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.DateRangeAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.DateRangeAggregation)value.Variant, options);
-					break;
-				case "filter":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Security.ApiKeyQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.Security.ApiKeyQuery)value.Variant, options);
-					break;
-				case "filters":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Security.ApiKeyFiltersAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Security.ApiKeyFiltersAggregation)value.Variant, options);
-					break;
-				case "missing":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.MissingAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.MissingAggregation)value.Variant, options);
-					break;
-				case "range":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.RangeAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.RangeAggregation)value.Variant, options);
-					break;
-				case "terms":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.TermsAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.TermsAggregation)value.Variant, options);
-					break;
-				case "value_count":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.ValueCountAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.ValueCountAggregation)value.Variant, options);
-					break;
-			}
+			case "":
+				break;
+			case "cardinality":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.CardinalityAggregation?)value.Variant);
+				break;
+			case "composite":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.CompositeAggregation?)value.Variant);
+				break;
+			case "date_range":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.DateRangeAggregation?)value.Variant);
+				break;
+			case "filter":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Security.ApiKeyQuery?)value.Variant);
+				break;
+			case "filters":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Security.ApiKeyFiltersAggregation?)value.Variant);
+				break;
+			case "missing":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.MissingAggregation?)value.Variant);
+				break;
+			case "range":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.RangeAggregation?)value.Variant);
+				break;
+			case "terms":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.TermsAggregation?)value.Variant);
+				break;
+			case "value_count":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.ValueCountAggregation?)value.Variant);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.VariantType}' is not supported for type '{nameof(ApiKeyAggregation)}'.");
 		}
 
+		writer.WriteProperty(options, PropAggregations, value.Aggregations);
+		writer.WriteProperty(options, PropMeta, value.Meta);
 		writer.WriteEndObject();
 	}
 }
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Security/ApiKeyQuery.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Security/ApiKeyQuery.g.cs
index eac62337667..50f982b5673 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Security/ApiKeyQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Security/ApiKeyQuery.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -39,12 +40,16 @@ internal ApiKeyQuery(string variantName, object variant)
 			throw new ArgumentNullException(nameof(variant));
 		if (string.IsNullOrWhiteSpace(variantName))
 			throw new ArgumentException("Variant name must not be empty or whitespace.");
-		VariantName = variantName;
+		VariantType = variantName;
 		Variant = variant;
 	}
 
-	internal object Variant { get; }
-	internal string VariantName { get; }
+	internal ApiKeyQuery()
+	{
+	}
+
+	public object Variant { get; internal set; }
+	public string VariantType { get; internal set; }
 
 	public static ApiKeyQuery Bool(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.BoolQuery boolQuery) => new ApiKeyQuery("bool", boolQuery);
 	public static ApiKeyQuery Exists(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.ExistsQuery existsQuery) => new ApiKeyQuery("exists", existsQuery);
@@ -52,6 +57,7 @@ internal ApiKeyQuery(string variantName, object variant)
 	public static ApiKeyQuery Match(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MatchQuery matchQuery) => new ApiKeyQuery("match", matchQuery);
 	public static ApiKeyQuery MatchAll(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MatchAllQuery matchAllQuery) => new ApiKeyQuery("match_all", matchAllQuery);
 	public static ApiKeyQuery Prefix(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.PrefixQuery prefixQuery) => new ApiKeyQuery("prefix", prefixQuery);
+	public static ApiKeyQuery Range(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IRangeQuery rangeQuery) => new ApiKeyQuery("range", rangeQuery);
 	public static ApiKeyQuery Range(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.UntypedRangeQuery rangeQuery) => new ApiKeyQuery("range", rangeQuery);
 	public static ApiKeyQuery Range(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.DateRangeQuery rangeQuery) => new ApiKeyQuery("range", rangeQuery);
 	public static ApiKeyQuery Range(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.NumberRangeQuery rangeQuery) => new ApiKeyQuery("range", rangeQuery);
@@ -74,157 +80,164 @@ public bool TryGet<T>([NotNullWhen(true)] out T? result) where T : class
 	}
 }
 
-internal sealed partial class ApiKeyQueryConverter : JsonConverter<ApiKeyQuery>
+internal sealed partial class ApiKeyQueryConverter : System.Text.Json.Serialization.JsonConverter<ApiKeyQuery>
 {
-	public override ApiKeyQuery Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText VariantBool = System.Text.Json.JsonEncodedText.Encode("bool");
+	private static readonly System.Text.Json.JsonEncodedText VariantExists = System.Text.Json.JsonEncodedText.Encode("exists");
+	private static readonly System.Text.Json.JsonEncodedText VariantIds = System.Text.Json.JsonEncodedText.Encode("ids");
+	private static readonly System.Text.Json.JsonEncodedText VariantMatch = System.Text.Json.JsonEncodedText.Encode("match");
+	private static readonly System.Text.Json.JsonEncodedText VariantMatchAll = System.Text.Json.JsonEncodedText.Encode("match_all");
+	private static readonly System.Text.Json.JsonEncodedText VariantPrefix = System.Text.Json.JsonEncodedText.Encode("prefix");
+	private static readonly System.Text.Json.JsonEncodedText VariantRange = System.Text.Json.JsonEncodedText.Encode("range");
+	private static readonly System.Text.Json.JsonEncodedText VariantSimpleQueryString = System.Text.Json.JsonEncodedText.Encode("simple_query_string");
+	private static readonly System.Text.Json.JsonEncodedText VariantTerm = System.Text.Json.JsonEncodedText.Encode("term");
+	private static readonly System.Text.Json.JsonEncodedText VariantTerms = System.Text.Json.JsonEncodedText.Encode("terms");
+	private static readonly System.Text.Json.JsonEncodedText VariantWildcard = System.Text.Json.JsonEncodedText.Encode("wildcard");
+
+	public override ApiKeyQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		var variantType = string.Empty;
+		object? variant = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			throw new JsonException("Expected start token.");
-		}
-
-		object? variantValue = default;
-		string? variantNameValue = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
-		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token.");
-			}
-
-			if (reader.TokenType != JsonTokenType.PropertyName)
+			if (reader.ValueTextEquals(VariantBool))
 			{
-				throw new JsonException("Expected a property name token representing the name of an Elasticsearch field.");
-			}
-
-			var propertyName = reader.GetString();
-			reader.Read();
-			if (propertyName == "bool")
-			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.BoolQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantBool.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.BoolQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "exists")
+			if (reader.ValueTextEquals(VariantExists))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.ExistsQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantExists.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.ExistsQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "ids")
+			if (reader.ValueTextEquals(VariantIds))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IdsQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantIds.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IdsQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "match")
+			if (reader.ValueTextEquals(VariantMatch))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MatchQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantMatch.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MatchQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "match_all")
+			if (reader.ValueTextEquals(VariantMatchAll))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MatchAllQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantMatchAll.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MatchAllQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "prefix")
+			if (reader.ValueTextEquals(VariantPrefix))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.PrefixQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantPrefix.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.PrefixQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "range")
+			if (reader.ValueTextEquals(VariantRange))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.UntypedRangeQuery>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantRange.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IRangeQuery>(options);
 				continue;
 			}
 
-			if (propertyName == "simple_query_string")
+			if (reader.ValueTextEquals(VariantSimpleQueryString))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SimpleQueryStringQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantSimpleQueryString.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SimpleQueryStringQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "term")
+			if (reader.ValueTextEquals(VariantTerm))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.TermQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantTerm.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.TermQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "terms")
+			if (reader.ValueTextEquals(VariantTerms))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.TermsQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantTerms.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.TermsQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "wildcard")
+			if (reader.ValueTextEquals(VariantWildcard))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.WildcardQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantWildcard.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.WildcardQuery?>(options);
 				continue;
 			}
 
-			throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'ApiKeyQuery' from the response.");
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		var result = new ApiKeyQuery(variantNameValue, variantValue);
-		return result;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ApiKeyQuery { VariantType = variantType, Variant = variant };
 	}
 
-	public override void Write(Utf8JsonWriter writer, ApiKeyQuery value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ApiKeyQuery value, System.Text.Json.JsonSerializerOptions options)
 	{
 		writer.WriteStartObject();
-		if (value.VariantName is not null && value.Variant is not null)
+		switch (value.VariantType)
 		{
-			writer.WritePropertyName(value.VariantName);
-			switch (value.VariantName)
-			{
-				case "bool":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.BoolQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.BoolQuery)value.Variant, options);
-					break;
-				case "exists":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.ExistsQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.ExistsQuery)value.Variant, options);
-					break;
-				case "ids":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IdsQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IdsQuery)value.Variant, options);
-					break;
-				case "match":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MatchQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MatchQuery)value.Variant, options);
-					break;
-				case "match_all":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MatchAllQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MatchAllQuery)value.Variant, options);
-					break;
-				case "prefix":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.PrefixQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.PrefixQuery)value.Variant, options);
-					break;
-				case "range":
-					JsonSerializer.Serialize(writer, value.Variant, value.Variant.GetType(), options);
-					break;
-				case "simple_query_string":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SimpleQueryStringQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SimpleQueryStringQuery)value.Variant, options);
-					break;
-				case "term":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.TermQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.TermQuery)value.Variant, options);
-					break;
-				case "terms":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.TermsQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.TermsQuery)value.Variant, options);
-					break;
-				case "wildcard":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.WildcardQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.WildcardQuery)value.Variant, options);
-					break;
-			}
+			case "":
+				break;
+			case "bool":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.BoolQuery?)value.Variant);
+				break;
+			case "exists":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.ExistsQuery?)value.Variant);
+				break;
+			case "ids":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IdsQuery?)value.Variant);
+				break;
+			case "match":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MatchQuery?)value.Variant);
+				break;
+			case "match_all":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MatchAllQuery?)value.Variant);
+				break;
+			case "prefix":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.PrefixQuery?)value.Variant);
+				break;
+			case "range":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IRangeQuery)value.Variant);
+				break;
+			case "simple_query_string":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SimpleQueryStringQuery?)value.Variant);
+				break;
+			case "term":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.TermQuery?)value.Variant);
+				break;
+			case "terms":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.TermsQuery?)value.Variant);
+				break;
+			case "wildcard":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.WildcardQuery?)value.Variant);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.VariantType}' is not supported for type '{nameof(ApiKeyQuery)}'.");
 		}
 
 		writer.WriteEndObject();
@@ -274,6 +287,7 @@ private ApiKeyQueryDescriptor<TDocument> Set(object variant, string variantName)
 	public ApiKeyQueryDescriptor<TDocument> MatchAll(Action<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MatchAllQueryDescriptor> configure) => Set(configure, "match_all");
 	public ApiKeyQueryDescriptor<TDocument> Prefix(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.PrefixQuery prefixQuery) => Set(prefixQuery, "prefix");
 	public ApiKeyQueryDescriptor<TDocument> Prefix(Action<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.PrefixQueryDescriptor<TDocument>> configure) => Set(configure, "prefix");
+	public ApiKeyQueryDescriptor<TDocument> Range(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IRangeQuery rangeQuery) => Set(rangeQuery, "range");
 	public ApiKeyQueryDescriptor<TDocument> Range(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.UntypedRangeQuery rangeQuery) => Set(rangeQuery, "range");
 	public ApiKeyQueryDescriptor<TDocument> Range(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.DateRangeQuery rangeQuery) => Set(rangeQuery, "range");
 	public ApiKeyQueryDescriptor<TDocument> Range(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.NumberRangeQuery rangeQuery) => Set(rangeQuery, "range");
@@ -350,6 +364,7 @@ private ApiKeyQueryDescriptor Set(object variant, string variantName)
 	public ApiKeyQueryDescriptor MatchAll(Action<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MatchAllQueryDescriptor> configure) => Set(configure, "match_all");
 	public ApiKeyQueryDescriptor Prefix(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.PrefixQuery prefixQuery) => Set(prefixQuery, "prefix");
 	public ApiKeyQueryDescriptor Prefix<TDocument>(Action<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.PrefixQueryDescriptor> configure) => Set(configure, "prefix");
+	public ApiKeyQueryDescriptor Range(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IRangeQuery rangeQuery) => Set(rangeQuery, "range");
 	public ApiKeyQueryDescriptor Range(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.UntypedRangeQuery rangeQuery) => Set(rangeQuery, "range");
 	public ApiKeyQueryDescriptor Range(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.DateRangeQuery rangeQuery) => Set(rangeQuery, "range");
 	public ApiKeyQueryDescriptor Range(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.NumberRangeQuery rangeQuery) => Set(rangeQuery, "range");
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Security/FieldRule.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Security/FieldRule.g.cs
index 4b17f9090f9..3074c7b1b83 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Security/FieldRule.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Security/FieldRule.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -39,12 +40,16 @@ internal FieldRule(string variantName, object variant)
 			throw new ArgumentNullException(nameof(variant));
 		if (string.IsNullOrWhiteSpace(variantName))
 			throw new ArgumentException("Variant name must not be empty or whitespace.");
-		VariantName = variantName;
+		VariantType = variantName;
 		Variant = variant;
 	}
 
-	internal object Variant { get; }
-	internal string VariantName { get; }
+	internal FieldRule()
+	{
+	}
+
+	public object Variant { get; internal set; }
+	public string VariantType { get; internal set; }
 
 	public static FieldRule Dn(Elastic.Clients.Elasticsearch.Serverless.Names names) => new FieldRule("dn", names);
 	public static FieldRule Groups(Elastic.Clients.Elasticsearch.Serverless.Names names) => new FieldRule("groups", names);
@@ -63,77 +68,68 @@ public bool TryGet<T>([NotNullWhen(true)] out T? result) where T : class
 	}
 }
 
-internal sealed partial class FieldRuleConverter : JsonConverter<FieldRule>
+internal sealed partial class FieldRuleConverter : System.Text.Json.Serialization.JsonConverter<FieldRule>
 {
-	public override FieldRule Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-		{
-			throw new JsonException("Expected start token.");
-		}
+	private static readonly System.Text.Json.JsonEncodedText VariantDn = System.Text.Json.JsonEncodedText.Encode("dn");
+	private static readonly System.Text.Json.JsonEncodedText VariantGroups = System.Text.Json.JsonEncodedText.Encode("groups");
+	private static readonly System.Text.Json.JsonEncodedText VariantUsername = System.Text.Json.JsonEncodedText.Encode("username");
 
-		object? variantValue = default;
-		string? variantNameValue = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+	public override FieldRule Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		var variantType = string.Empty;
+		object? variant = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
+			if (reader.ValueTextEquals(VariantDn))
 			{
-				throw new JsonException("Expected a property name token.");
-			}
-
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token representing the name of an Elasticsearch field.");
-			}
-
-			var propertyName = reader.GetString();
-			reader.Read();
-			if (propertyName == "dn")
-			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Names?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantDn.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Names?>(options);
 				continue;
 			}
 
-			if (propertyName == "groups")
+			if (reader.ValueTextEquals(VariantGroups))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Names?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantGroups.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Names?>(options);
 				continue;
 			}
 
-			if (propertyName == "username")
+			if (reader.ValueTextEquals(VariantUsername))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Names?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantUsername.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Names?>(options);
 				continue;
 			}
 
-			throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'FieldRule' from the response.");
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		var result = new FieldRule(variantNameValue, variantValue);
-		return result;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new FieldRule { VariantType = variantType, Variant = variant };
 	}
 
-	public override void Write(Utf8JsonWriter writer, FieldRule value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, FieldRule value, System.Text.Json.JsonSerializerOptions options)
 	{
 		writer.WriteStartObject();
-		if (value.VariantName is not null && value.Variant is not null)
+		switch (value.VariantType)
 		{
-			writer.WritePropertyName(value.VariantName);
-			switch (value.VariantName)
-			{
-				case "dn":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Names>(writer, (Elastic.Clients.Elasticsearch.Serverless.Names)value.Variant, options);
-					break;
-				case "groups":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Names>(writer, (Elastic.Clients.Elasticsearch.Serverless.Names)value.Variant, options);
-					break;
-				case "username":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Names>(writer, (Elastic.Clients.Elasticsearch.Serverless.Names)value.Variant, options);
-					break;
-			}
+			case "":
+				break;
+			case "dn":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Names?)value.Variant);
+				break;
+			case "groups":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Names?)value.Variant);
+				break;
+			case "username":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Names?)value.Variant);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.VariantType}' is not supported for type '{nameof(FieldRule)}'.");
 		}
 
 		writer.WriteEndObject();
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Security/FieldSecurity.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Security/FieldSecurity.g.cs
index 02fbe16cb49..86b1dd9defd 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Security/FieldSecurity.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Security/FieldSecurity.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,13 +28,53 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Security;
 
+internal sealed partial class FieldSecurityConverter : System.Text.Json.Serialization.JsonConverter<FieldSecurity>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropExcept = System.Text.Json.JsonEncodedText.Encode("except");
+	private static readonly System.Text.Json.JsonEncodedText PropGrant = System.Text.Json.JsonEncodedText.Encode("grant");
+
+	public override FieldSecurity Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Fields?> propExcept = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Fields?> propGrant = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propExcept.TryRead(ref reader, options, PropExcept, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propGrant.TryRead(ref reader, options, PropGrant, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new FieldSecurity
+		{
+			Except = propExcept.Value
+,
+			Grant = propGrant.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, FieldSecurity value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropExcept, value.Except, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropGrant, value.Grant, typeof(SingleOrManyFieldsMarker));
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(FieldSecurityConverter))]
 public sealed partial class FieldSecurity
 {
-	[JsonInclude, JsonPropertyName("except")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Serverless.Fields? Except { get; set; }
-	[JsonInclude, JsonPropertyName("grant")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Serverless.Fields? Grant { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Security/GrantApiKey.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Security/GrantApiKey.g.cs
index 28fd18d61e1..99c543d72e7 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Security/GrantApiKey.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Security/GrantApiKey.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,70 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Security;
 
+internal sealed partial class GrantApiKeyConverter : System.Text.Json.Serialization.JsonConverter<GrantApiKey>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropExpiration = System.Text.Json.JsonEncodedText.Encode("expiration");
+	private static readonly System.Text.Json.JsonEncodedText PropMetadata = System.Text.Json.JsonEncodedText.Encode("metadata");
+	private static readonly System.Text.Json.JsonEncodedText PropName = System.Text.Json.JsonEncodedText.Encode("name");
+	private static readonly System.Text.Json.JsonEncodedText PropRoleDescriptors = System.Text.Json.JsonEncodedText.Encode("role_descriptors");
+
+	public override GrantApiKey Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string?> propExpiration = default;
+		LocalJsonProperty<IDictionary<string, object>?> propMetadata = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Name> propName = default;
+		LocalJsonProperty<ICollection<IDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Security.RoleDescriptor>>?> propRoleDescriptors = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propExpiration.TryRead(ref reader, options, PropExpiration))
+			{
+				continue;
+			}
+
+			if (propMetadata.TryRead(ref reader, options, PropMetadata))
+			{
+				continue;
+			}
+
+			if (propName.TryRead(ref reader, options, PropName))
+			{
+				continue;
+			}
+
+			if (propRoleDescriptors.TryRead(ref reader, options, PropRoleDescriptors, typeof(SingleOrManyMarker<IReadOnlyCollection<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Security.RoleDescriptor>>?, IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Security.RoleDescriptor>>)))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GrantApiKey
+		{
+			Expiration = propExpiration.Value
+,
+			Metadata = propMetadata.Value
+,
+			Name = propName.Value
+,
+			RoleDescriptors = propRoleDescriptors.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GrantApiKey value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropExpiration, value.Expiration);
+		writer.WriteProperty(options, PropMetadata, value.Metadata);
+		writer.WriteProperty(options, PropName, value.Name);
+		writer.WriteProperty(options, PropRoleDescriptors, value.RoleDescriptors, typeof(SingleOrManyMarker<IReadOnlyCollection<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Security.RoleDescriptor>>?, IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Security.RoleDescriptor>>));
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GrantApiKeyConverter))]
 public sealed partial class GrantApiKey
 {
 	/// <summary>
@@ -34,7 +99,6 @@ public sealed partial class GrantApiKey
 	/// Expiration time for the API key. By default, API keys never expire.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("expiration")]
 	public string? Expiration { get; set; }
 
 	/// <summary>
@@ -44,9 +108,7 @@ public sealed partial class GrantApiKey
 	/// Within the <c>metadata</c> object, keys beginning with <c>_</c> are reserved for system usage.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("metadata")]
 	public IDictionary<string, object>? Metadata { get; set; }
-	[JsonInclude, JsonPropertyName("name")]
 	public Elastic.Clients.Elasticsearch.Serverless.Name Name { get; set; }
 
 	/// <summary>
@@ -57,8 +119,6 @@ public sealed partial class GrantApiKey
 	/// If you supply role descriptors, the resultant permissions are an intersection of API keys permissions and the permissions of the user or access token.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("role_descriptors")]
-	[SingleOrManyCollectionConverter(typeof(IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Security.RoleDescriptor>))]
 	public ICollection<IDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Security.RoleDescriptor>>? RoleDescriptors { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Security/IndicesPrivileges.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Security/IndicesPrivileges.g.cs
index 45feac6f03e..84bfe4092af 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Security/IndicesPrivileges.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Security/IndicesPrivileges.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,70 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Security;
 
+internal sealed partial class IndicesPrivilegesConverter : System.Text.Json.Serialization.JsonConverter<IndicesPrivileges>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropFieldSecurity = System.Text.Json.JsonEncodedText.Encode("field_security");
+	private static readonly System.Text.Json.JsonEncodedText PropNames = System.Text.Json.JsonEncodedText.Encode("names");
+	private static readonly System.Text.Json.JsonEncodedText PropPrivileges = System.Text.Json.JsonEncodedText.Encode("privileges");
+	private static readonly System.Text.Json.JsonEncodedText PropQuery = System.Text.Json.JsonEncodedText.Encode("query");
+
+	public override IndicesPrivileges Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Security.FieldSecurity?> propFieldSecurity = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.IndexName>> propNames = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.Security.IndexPrivilege>> propPrivileges = default;
+		LocalJsonProperty<object?> propQuery = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propFieldSecurity.TryRead(ref reader, options, PropFieldSecurity))
+			{
+				continue;
+			}
+
+			if (propNames.TryRead(ref reader, options, PropNames, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.IndexName>, Elastic.Clients.Elasticsearch.Serverless.IndexName>)))
+			{
+				continue;
+			}
+
+			if (propPrivileges.TryRead(ref reader, options, PropPrivileges))
+			{
+				continue;
+			}
+
+			if (propQuery.TryRead(ref reader, options, PropQuery))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new IndicesPrivileges
+		{
+			FieldSecurity = propFieldSecurity.Value
+,
+			Names = propNames.Value
+,
+			Privileges = propPrivileges.Value
+,
+			Query = propQuery.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IndicesPrivileges value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropFieldSecurity, value.FieldSecurity);
+		writer.WriteProperty(options, PropNames, value.Names, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.IndexName>, Elastic.Clients.Elasticsearch.Serverless.IndexName>));
+		writer.WriteProperty(options, PropPrivileges, value.Privileges);
+		writer.WriteProperty(options, PropQuery, value.Query);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(IndicesPrivilegesConverter))]
 public sealed partial class IndicesPrivileges
 {
 	/// <summary>
@@ -34,7 +99,6 @@ public sealed partial class IndicesPrivileges
 	/// The document fields that the owners of the role have read access to.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("field_security")]
 	public Elastic.Clients.Elasticsearch.Serverless.Security.FieldSecurity? FieldSecurity { get; set; }
 
 	/// <summary>
@@ -42,8 +106,6 @@ public sealed partial class IndicesPrivileges
 	/// A list of indices (or index name patterns) to which the permissions in this entry apply.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("names")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.Serverless.IndexName))]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.IndexName> Names { get; set; }
 
 	/// <summary>
@@ -51,7 +113,6 @@ public sealed partial class IndicesPrivileges
 	/// The index level privileges that owners of the role have on the specified indices.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("privileges")]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.Security.IndexPrivilege> Privileges { get; set; }
 
 	/// <summary>
@@ -59,7 +120,6 @@ public sealed partial class IndicesPrivileges
 	/// A search query that defines the documents the owners of the role have access to. A document within the specified indices must match this query for it to be accessible by the owners of the role.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("query")]
 	public object? Query { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Security/QueryRole.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Security/QueryRole.g.cs
index 2c717cdc12d..132b88aa3ad 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Security/QueryRole.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Security/QueryRole.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,95 +28,127 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Security;
 
-internal sealed partial class QueryRoleConverter : JsonConverter<QueryRole>
+internal sealed partial class QueryRoleConverter : System.Text.Json.Serialization.JsonConverter<QueryRole>
 {
-	public override QueryRole Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropApplications = System.Text.Json.JsonEncodedText.Encode("applications");
+	private static readonly System.Text.Json.JsonEncodedText PropCluster = System.Text.Json.JsonEncodedText.Encode("cluster");
+	private static readonly System.Text.Json.JsonEncodedText PropDescription = System.Text.Json.JsonEncodedText.Encode("description");
+	private static readonly System.Text.Json.JsonEncodedText PropIndices = System.Text.Json.JsonEncodedText.Encode("indices");
+	private static readonly System.Text.Json.JsonEncodedText PropIndices1 = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropMetadata = System.Text.Json.JsonEncodedText.Encode("metadata");
+	private static readonly System.Text.Json.JsonEncodedText PropName = System.Text.Json.JsonEncodedText.Encode("name");
+	private static readonly System.Text.Json.JsonEncodedText PropRestriction = System.Text.Json.JsonEncodedText.Encode("restriction");
+	private static readonly System.Text.Json.JsonEncodedText PropRunAs = System.Text.Json.JsonEncodedText.Encode("run_as");
+	private static readonly System.Text.Json.JsonEncodedText PropSort = System.Text.Json.JsonEncodedText.Encode("_sort");
+	private static readonly System.Text.Json.JsonEncodedText PropTransientMetadata = System.Text.Json.JsonEncodedText.Encode("transient_metadata");
+
+	public override QueryRole Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Security.ApplicationPrivileges>? applications = default;
-		IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Security.ClusterPrivilege>? cluster = default;
-		string? description = default;
-		IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Security.IndicesPrivileges>? indices = default;
-		IReadOnlyDictionary<string, object>? metadata = default;
-		string name = default;
-		Elastic.Clients.Elasticsearch.Serverless.Security.Restriction? restriction = default;
-		IReadOnlyCollection<string>? runAs = default;
-		IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.FieldValue>? sort = default;
-		IReadOnlyDictionary<string, object>? transientMetadata = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Security.ApplicationPrivileges>?> propApplications = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Security.ClusterPrivilege>?> propCluster = default;
+		LocalJsonProperty<string?> propDescription = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Security.IndicesPrivileges>?> propIndices = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, object>?> propMetadata = default;
+		LocalJsonProperty<string> propName = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Security.Restriction?> propRestriction = default;
+		LocalJsonProperty<IReadOnlyCollection<string>?> propRunAs = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.FieldValue>?> propSort = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, object>?> propTransientMetadata = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propApplications.TryRead(ref reader, options, PropApplications))
 			{
-				var property = reader.GetString();
-				if (property == "applications")
-				{
-					applications = JsonSerializer.Deserialize<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Security.ApplicationPrivileges>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "cluster")
-				{
-					cluster = JsonSerializer.Deserialize<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Security.ClusterPrivilege>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "description")
-				{
-					description = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "indices" || property == "index")
-				{
-					indices = JsonSerializer.Deserialize<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Security.IndicesPrivileges>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "metadata")
-				{
-					metadata = JsonSerializer.Deserialize<IReadOnlyDictionary<string, object>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "name")
-				{
-					name = JsonSerializer.Deserialize<string>(ref reader, options);
-					continue;
-				}
-
-				if (property == "restriction")
-				{
-					restriction = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Security.Restriction?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "run_as")
-				{
-					runAs = JsonSerializer.Deserialize<IReadOnlyCollection<string>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "_sort")
-				{
-					sort = JsonSerializer.Deserialize<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.FieldValue>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "transient_metadata")
-				{
-					transientMetadata = JsonSerializer.Deserialize<IReadOnlyDictionary<string, object>?>(ref reader, options);
-					continue;
-				}
+				continue;
 			}
+
+			if (propCluster.TryRead(ref reader, options, PropCluster))
+			{
+				continue;
+			}
+
+			if (propDescription.TryRead(ref reader, options, PropDescription))
+			{
+				continue;
+			}
+
+			if (propIndices.TryRead(ref reader, options, PropIndices) || propIndices.TryRead(ref reader, options, PropIndices1))
+			{
+				continue;
+			}
+
+			if (propMetadata.TryRead(ref reader, options, PropMetadata))
+			{
+				continue;
+			}
+
+			if (propName.TryRead(ref reader, options, PropName))
+			{
+				continue;
+			}
+
+			if (propRestriction.TryRead(ref reader, options, PropRestriction))
+			{
+				continue;
+			}
+
+			if (propRunAs.TryRead(ref reader, options, PropRunAs))
+			{
+				continue;
+			}
+
+			if (propSort.TryRead(ref reader, options, PropSort))
+			{
+				continue;
+			}
+
+			if (propTransientMetadata.TryRead(ref reader, options, PropTransientMetadata))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		return new QueryRole { Applications = applications, Cluster = cluster, Description = description, Indices = indices, Metadata = metadata, Name = name, Restriction = restriction, RunAs = runAs, Sort = sort, TransientMetadata = transientMetadata };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new QueryRole
+		{
+			Applications = propApplications.Value
+,
+			Cluster = propCluster.Value
+,
+			Description = propDescription.Value
+,
+			Indices = propIndices.Value
+,
+			Metadata = propMetadata.Value
+,
+			Name = propName.Value
+,
+			Restriction = propRestriction.Value
+,
+			RunAs = propRunAs.Value
+,
+			Sort = propSort.Value
+,
+			TransientMetadata = propTransientMetadata.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, QueryRole value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, QueryRole value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'QueryRole' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropApplications, value.Applications);
+		writer.WriteProperty(options, PropCluster, value.Cluster);
+		writer.WriteProperty(options, PropDescription, value.Description);
+		writer.WriteProperty(options, PropIndices, value.Indices);
+		writer.WriteProperty(options, PropMetadata, value.Metadata);
+		writer.WriteProperty(options, PropName, value.Name);
+		writer.WriteProperty(options, PropRestriction, value.Restriction);
+		writer.WriteProperty(options, PropRunAs, value.RunAs);
+		writer.WriteProperty(options, PropSort, value.Sort);
+		writer.WriteProperty(options, PropTransientMetadata, value.TransientMetadata);
+		writer.WriteEndObject();
 	}
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Security/ReplicationAccess.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Security/ReplicationAccess.g.cs
index dfcd8cadd9d..6bb21fc7bb3 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Security/ReplicationAccess.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Security/ReplicationAccess.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,50 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Security;
 
+internal sealed partial class ReplicationAccessConverter : System.Text.Json.Serialization.JsonConverter<ReplicationAccess>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAllowRestrictedIndices = System.Text.Json.JsonEncodedText.Encode("allow_restricted_indices");
+	private static readonly System.Text.Json.JsonEncodedText PropNames = System.Text.Json.JsonEncodedText.Encode("names");
+
+	public override ReplicationAccess Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool?> propAllowRestrictedIndices = default;
+		LocalJsonProperty<IReadOnlyCollection<string>> propNames = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAllowRestrictedIndices.TryRead(ref reader, options, PropAllowRestrictedIndices))
+			{
+				continue;
+			}
+
+			if (propNames.TryRead(ref reader, options, PropNames, typeof(SingleOrManyMarker<IReadOnlyCollection<string>, string>)))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ReplicationAccess
+		{
+			AllowRestrictedIndices = propAllowRestrictedIndices.Value
+,
+			Names = propNames.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ReplicationAccess value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAllowRestrictedIndices, value.AllowRestrictedIndices);
+		writer.WriteProperty(options, PropNames, value.Names, typeof(SingleOrManyMarker<IReadOnlyCollection<string>, string>));
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ReplicationAccessConverter))]
 public sealed partial class ReplicationAccess
 {
 	/// <summary>
@@ -34,7 +79,6 @@ public sealed partial class ReplicationAccess
 	/// This needs to be set to true if the patterns in the names field should cover system indices.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("allow_restricted_indices")]
 	public bool? AllowRestrictedIndices { get; init; }
 
 	/// <summary>
@@ -42,7 +86,5 @@ public sealed partial class ReplicationAccess
 	/// A list of indices (or index name patterns) to which the permissions in this entry apply.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("names")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public IReadOnlyCollection<string> Names { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Security/RoleDescriptor.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Security/RoleDescriptor.g.cs
index d12ecb7310e..a9065d0cf91 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Security/RoleDescriptor.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Security/RoleDescriptor.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,122 +28,106 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Security;
 
-internal sealed partial class RoleDescriptorConverter : JsonConverter<RoleDescriptor>
+internal sealed partial class RoleDescriptorConverter : System.Text.Json.Serialization.JsonConverter<RoleDescriptor>
 {
-	public override RoleDescriptor Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		var variant = new RoleDescriptor();
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
-		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+	private static readonly System.Text.Json.JsonEncodedText PropApplications = System.Text.Json.JsonEncodedText.Encode("applications");
+	private static readonly System.Text.Json.JsonEncodedText PropCluster = System.Text.Json.JsonEncodedText.Encode("cluster");
+	private static readonly System.Text.Json.JsonEncodedText PropDescription = System.Text.Json.JsonEncodedText.Encode("description");
+	private static readonly System.Text.Json.JsonEncodedText PropIndices = System.Text.Json.JsonEncodedText.Encode("indices");
+	private static readonly System.Text.Json.JsonEncodedText PropIndices1 = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropMetadata = System.Text.Json.JsonEncodedText.Encode("metadata");
+	private static readonly System.Text.Json.JsonEncodedText PropRestriction = System.Text.Json.JsonEncodedText.Encode("restriction");
+	private static readonly System.Text.Json.JsonEncodedText PropRunAs = System.Text.Json.JsonEncodedText.Encode("run_as");
+	private static readonly System.Text.Json.JsonEncodedText PropTransientMetadata = System.Text.Json.JsonEncodedText.Encode("transient_metadata");
+
+	public override RoleDescriptor Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.Security.ApplicationPrivileges>?> propApplications = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.Security.ClusterPrivilege>?> propCluster = default;
+		LocalJsonProperty<string?> propDescription = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.Security.IndicesPrivileges>?> propIndices = default;
+		LocalJsonProperty<IDictionary<string, object>?> propMetadata = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Security.Restriction?> propRestriction = default;
+		LocalJsonProperty<ICollection<string>?> propRunAs = default;
+		LocalJsonProperty<IDictionary<string, object>?> propTransientMetadata = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propApplications.TryRead(ref reader, options, PropApplications))
 			{
-				var property = reader.GetString();
-				if (property == "applications")
-				{
-					variant.Applications = JsonSerializer.Deserialize<ICollection<Elastic.Clients.Elasticsearch.Serverless.Security.ApplicationPrivileges>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "cluster")
-				{
-					variant.Cluster = JsonSerializer.Deserialize<ICollection<Elastic.Clients.Elasticsearch.Serverless.Security.ClusterPrivilege>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "description")
-				{
-					variant.Description = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "indices" || property == "index")
-				{
-					variant.Indices = JsonSerializer.Deserialize<ICollection<Elastic.Clients.Elasticsearch.Serverless.Security.IndicesPrivileges>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "metadata")
-				{
-					variant.Metadata = JsonSerializer.Deserialize<IDictionary<string, object>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "restriction")
-				{
-					variant.Restriction = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Security.Restriction?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "run_as")
-				{
-					variant.RunAs = JsonSerializer.Deserialize<ICollection<string>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "transient_metadata")
-				{
-					variant.TransientMetadata = JsonSerializer.Deserialize<IDictionary<string, object>?>(ref reader, options);
-					continue;
-				}
+				continue;
 			}
-		}
 
-		return variant;
-	}
+			if (propCluster.TryRead(ref reader, options, PropCluster))
+			{
+				continue;
+			}
 
-	public override void Write(Utf8JsonWriter writer, RoleDescriptor value, JsonSerializerOptions options)
-	{
-		writer.WriteStartObject();
-		if (value.Applications is not null)
-		{
-			writer.WritePropertyName("applications");
-			JsonSerializer.Serialize(writer, value.Applications, options);
-		}
+			if (propDescription.TryRead(ref reader, options, PropDescription))
+			{
+				continue;
+			}
 
-		if (value.Cluster is not null)
-		{
-			writer.WritePropertyName("cluster");
-			JsonSerializer.Serialize(writer, value.Cluster, options);
-		}
+			if (propIndices.TryRead(ref reader, options, PropIndices) || propIndices.TryRead(ref reader, options, PropIndices1))
+			{
+				continue;
+			}
 
-		if (!string.IsNullOrEmpty(value.Description))
-		{
-			writer.WritePropertyName("description");
-			writer.WriteStringValue(value.Description);
-		}
+			if (propMetadata.TryRead(ref reader, options, PropMetadata))
+			{
+				continue;
+			}
 
-		if (value.Indices is not null)
-		{
-			writer.WritePropertyName("indices");
-			JsonSerializer.Serialize(writer, value.Indices, options);
-		}
+			if (propRestriction.TryRead(ref reader, options, PropRestriction))
+			{
+				continue;
+			}
 
-		if (value.Metadata is not null)
-		{
-			writer.WritePropertyName("metadata");
-			JsonSerializer.Serialize(writer, value.Metadata, options);
-		}
+			if (propRunAs.TryRead(ref reader, options, PropRunAs))
+			{
+				continue;
+			}
 
-		if (value.Restriction is not null)
-		{
-			writer.WritePropertyName("restriction");
-			JsonSerializer.Serialize(writer, value.Restriction, options);
-		}
+			if (propTransientMetadata.TryRead(ref reader, options, PropTransientMetadata))
+			{
+				continue;
+			}
 
-		if (value.RunAs is not null)
-		{
-			writer.WritePropertyName("run_as");
-			JsonSerializer.Serialize(writer, value.RunAs, options);
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		if (value.TransientMetadata is not null)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new RoleDescriptor
 		{
-			writer.WritePropertyName("transient_metadata");
-			JsonSerializer.Serialize(writer, value.TransientMetadata, options);
-		}
+			Applications = propApplications.Value
+,
+			Cluster = propCluster.Value
+,
+			Description = propDescription.Value
+,
+			Indices = propIndices.Value
+,
+			Metadata = propMetadata.Value
+,
+			Restriction = propRestriction.Value
+,
+			RunAs = propRunAs.Value
+,
+			TransientMetadata = propTransientMetadata.Value
+		};
+	}
 
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, RoleDescriptor value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropApplications, value.Applications);
+		writer.WriteProperty(options, PropCluster, value.Cluster);
+		writer.WriteProperty(options, PropDescription, value.Description);
+		writer.WriteProperty(options, PropIndices, value.Indices);
+		writer.WriteProperty(options, PropMetadata, value.Metadata);
+		writer.WriteProperty(options, PropRestriction, value.Restriction);
+		writer.WriteProperty(options, PropRunAs, value.RunAs);
+		writer.WriteProperty(options, PropTransientMetadata, value.TransientMetadata);
 		writer.WriteEndObject();
 	}
 }
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Security/RoleDescriptorRead.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Security/RoleDescriptorRead.g.cs
index 34ef826b7ef..afe288d4460 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Security/RoleDescriptorRead.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Security/RoleDescriptorRead.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,81 +28,107 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Security;
 
-internal sealed partial class RoleDescriptorReadConverter : JsonConverter<RoleDescriptorRead>
+internal sealed partial class RoleDescriptorReadConverter : System.Text.Json.Serialization.JsonConverter<RoleDescriptorRead>
 {
-	public override RoleDescriptorRead Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropApplications = System.Text.Json.JsonEncodedText.Encode("applications");
+	private static readonly System.Text.Json.JsonEncodedText PropCluster = System.Text.Json.JsonEncodedText.Encode("cluster");
+	private static readonly System.Text.Json.JsonEncodedText PropDescription = System.Text.Json.JsonEncodedText.Encode("description");
+	private static readonly System.Text.Json.JsonEncodedText PropIndices = System.Text.Json.JsonEncodedText.Encode("indices");
+	private static readonly System.Text.Json.JsonEncodedText PropIndices1 = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropMetadata = System.Text.Json.JsonEncodedText.Encode("metadata");
+	private static readonly System.Text.Json.JsonEncodedText PropRestriction = System.Text.Json.JsonEncodedText.Encode("restriction");
+	private static readonly System.Text.Json.JsonEncodedText PropRunAs = System.Text.Json.JsonEncodedText.Encode("run_as");
+	private static readonly System.Text.Json.JsonEncodedText PropTransientMetadata = System.Text.Json.JsonEncodedText.Encode("transient_metadata");
+
+	public override RoleDescriptorRead Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Security.ApplicationPrivileges>? applications = default;
-		IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Security.ClusterPrivilege> cluster = default;
-		string? description = default;
-		IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Security.IndicesPrivileges> indices = default;
-		IReadOnlyDictionary<string, object>? metadata = default;
-		Elastic.Clients.Elasticsearch.Serverless.Security.Restriction? restriction = default;
-		IReadOnlyCollection<string>? runAs = default;
-		IReadOnlyDictionary<string, object>? transientMetadata = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Security.ApplicationPrivileges>?> propApplications = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Security.ClusterPrivilege>> propCluster = default;
+		LocalJsonProperty<string?> propDescription = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Security.IndicesPrivileges>> propIndices = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, object>?> propMetadata = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Security.Restriction?> propRestriction = default;
+		LocalJsonProperty<IReadOnlyCollection<string>?> propRunAs = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, object>?> propTransientMetadata = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propApplications.TryRead(ref reader, options, PropApplications))
 			{
-				var property = reader.GetString();
-				if (property == "applications")
-				{
-					applications = JsonSerializer.Deserialize<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Security.ApplicationPrivileges>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "cluster")
-				{
-					cluster = JsonSerializer.Deserialize<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Security.ClusterPrivilege>>(ref reader, options);
-					continue;
-				}
-
-				if (property == "description")
-				{
-					description = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "indices" || property == "index")
-				{
-					indices = JsonSerializer.Deserialize<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Security.IndicesPrivileges>>(ref reader, options);
-					continue;
-				}
-
-				if (property == "metadata")
-				{
-					metadata = JsonSerializer.Deserialize<IReadOnlyDictionary<string, object>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "restriction")
-				{
-					restriction = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Security.Restriction?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "run_as")
-				{
-					runAs = JsonSerializer.Deserialize<IReadOnlyCollection<string>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "transient_metadata")
-				{
-					transientMetadata = JsonSerializer.Deserialize<IReadOnlyDictionary<string, object>?>(ref reader, options);
-					continue;
-				}
+				continue;
 			}
+
+			if (propCluster.TryRead(ref reader, options, PropCluster))
+			{
+				continue;
+			}
+
+			if (propDescription.TryRead(ref reader, options, PropDescription))
+			{
+				continue;
+			}
+
+			if (propIndices.TryRead(ref reader, options, PropIndices) || propIndices.TryRead(ref reader, options, PropIndices1))
+			{
+				continue;
+			}
+
+			if (propMetadata.TryRead(ref reader, options, PropMetadata))
+			{
+				continue;
+			}
+
+			if (propRestriction.TryRead(ref reader, options, PropRestriction))
+			{
+				continue;
+			}
+
+			if (propRunAs.TryRead(ref reader, options, PropRunAs))
+			{
+				continue;
+			}
+
+			if (propTransientMetadata.TryRead(ref reader, options, PropTransientMetadata))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		return new RoleDescriptorRead { Applications = applications, Cluster = cluster, Description = description, Indices = indices, Metadata = metadata, Restriction = restriction, RunAs = runAs, TransientMetadata = transientMetadata };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new RoleDescriptorRead
+		{
+			Applications = propApplications.Value
+,
+			Cluster = propCluster.Value
+,
+			Description = propDescription.Value
+,
+			Indices = propIndices.Value
+,
+			Metadata = propMetadata.Value
+,
+			Restriction = propRestriction.Value
+,
+			RunAs = propRunAs.Value
+,
+			TransientMetadata = propTransientMetadata.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, RoleDescriptorRead value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, RoleDescriptorRead value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'RoleDescriptorRead' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropApplications, value.Applications);
+		writer.WriteProperty(options, PropCluster, value.Cluster);
+		writer.WriteProperty(options, PropDescription, value.Description);
+		writer.WriteProperty(options, PropIndices, value.Indices);
+		writer.WriteProperty(options, PropMetadata, value.Metadata);
+		writer.WriteProperty(options, PropRestriction, value.Restriction);
+		writer.WriteProperty(options, PropRunAs, value.RunAs);
+		writer.WriteProperty(options, PropTransientMetadata, value.TransientMetadata);
+		writer.WriteEndObject();
 	}
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Security/RoleMappingRule.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Security/RoleMappingRule.g.cs
index 3c5dc737caf..7f7dbe57fef 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Security/RoleMappingRule.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Security/RoleMappingRule.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -39,12 +40,16 @@ internal RoleMappingRule(string variantName, object variant)
 			throw new ArgumentNullException(nameof(variant));
 		if (string.IsNullOrWhiteSpace(variantName))
 			throw new ArgumentException("Variant name must not be empty or whitespace.");
-		VariantName = variantName;
+		VariantType = variantName;
 		Variant = variant;
 	}
 
-	internal object Variant { get; }
-	internal string VariantName { get; }
+	internal RoleMappingRule()
+	{
+	}
+
+	public object Variant { get; internal set; }
+	public string VariantType { get; internal set; }
 
 	public static RoleMappingRule All(IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Security.RoleMappingRule> roleMappingRule) => new RoleMappingRule("all", roleMappingRule);
 	public static RoleMappingRule Any(IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Security.RoleMappingRule> roleMappingRule) => new RoleMappingRule("any", roleMappingRule);
@@ -64,87 +69,80 @@ public bool TryGet<T>([NotNullWhen(true)] out T? result) where T : class
 	}
 }
 
-internal sealed partial class RoleMappingRuleConverter : JsonConverter<RoleMappingRule>
+internal sealed partial class RoleMappingRuleConverter : System.Text.Json.Serialization.JsonConverter<RoleMappingRule>
 {
-	public override RoleMappingRule Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-		{
-			throw new JsonException("Expected start token.");
-		}
+	private static readonly System.Text.Json.JsonEncodedText VariantAll = System.Text.Json.JsonEncodedText.Encode("all");
+	private static readonly System.Text.Json.JsonEncodedText VariantAny = System.Text.Json.JsonEncodedText.Encode("any");
+	private static readonly System.Text.Json.JsonEncodedText VariantExcept = System.Text.Json.JsonEncodedText.Encode("except");
+	private static readonly System.Text.Json.JsonEncodedText VariantField = System.Text.Json.JsonEncodedText.Encode("field");
 
-		object? variantValue = default;
-		string? variantNameValue = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+	public override RoleMappingRule Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		var variantType = string.Empty;
+		object? variant = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
+			if (reader.ValueTextEquals(VariantAll))
 			{
-				throw new JsonException("Expected a property name token.");
-			}
-
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token representing the name of an Elasticsearch field.");
-			}
-
-			var propertyName = reader.GetString();
-			reader.Read();
-			if (propertyName == "all")
-			{
-				variantValue = JsonSerializer.Deserialize<ICollection<Elastic.Clients.Elasticsearch.Serverless.Security.RoleMappingRule>?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantAll.Value;
+				reader.Read();
+				variant = reader.ReadValue<ICollection<Elastic.Clients.Elasticsearch.Serverless.Security.RoleMappingRule>?>(options);
 				continue;
 			}
 
-			if (propertyName == "any")
+			if (reader.ValueTextEquals(VariantAny))
 			{
-				variantValue = JsonSerializer.Deserialize<ICollection<Elastic.Clients.Elasticsearch.Serverless.Security.RoleMappingRule>?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantAny.Value;
+				reader.Read();
+				variant = reader.ReadValue<ICollection<Elastic.Clients.Elasticsearch.Serverless.Security.RoleMappingRule>?>(options);
 				continue;
 			}
 
-			if (propertyName == "except")
+			if (reader.ValueTextEquals(VariantExcept))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Security.RoleMappingRule?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantExcept.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Security.RoleMappingRule?>(options);
 				continue;
 			}
 
-			if (propertyName == "field")
+			if (reader.ValueTextEquals(VariantField))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Security.FieldRule?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantField.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Security.FieldRule?>(options);
 				continue;
 			}
 
-			throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'RoleMappingRule' from the response.");
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		var result = new RoleMappingRule(variantNameValue, variantValue);
-		return result;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new RoleMappingRule { VariantType = variantType, Variant = variant };
 	}
 
-	public override void Write(Utf8JsonWriter writer, RoleMappingRule value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, RoleMappingRule value, System.Text.Json.JsonSerializerOptions options)
 	{
 		writer.WriteStartObject();
-		if (value.VariantName is not null && value.Variant is not null)
+		switch (value.VariantType)
 		{
-			writer.WritePropertyName(value.VariantName);
-			switch (value.VariantName)
-			{
-				case "all":
-					JsonSerializer.Serialize<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Security.RoleMappingRule>>(writer, (IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Security.RoleMappingRule>)value.Variant, options);
-					break;
-				case "any":
-					JsonSerializer.Serialize<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Security.RoleMappingRule>>(writer, (IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Security.RoleMappingRule>)value.Variant, options);
-					break;
-				case "except":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Security.RoleMappingRule>(writer, (Elastic.Clients.Elasticsearch.Serverless.Security.RoleMappingRule)value.Variant, options);
-					break;
-				case "field":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Security.FieldRule>(writer, (Elastic.Clients.Elasticsearch.Serverless.Security.FieldRule)value.Variant, options);
-					break;
-			}
+			case "":
+				break;
+			case "all":
+				writer.WriteProperty(options, value.VariantType, (ICollection<Elastic.Clients.Elasticsearch.Serverless.Security.RoleMappingRule>?)value.Variant);
+				break;
+			case "any":
+				writer.WriteProperty(options, value.VariantType, (ICollection<Elastic.Clients.Elasticsearch.Serverless.Security.RoleMappingRule>?)value.Variant);
+				break;
+			case "except":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Security.RoleMappingRule?)value.Variant);
+				break;
+			case "field":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Security.FieldRule?)value.Variant);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.VariantType}' is not supported for type '{nameof(RoleMappingRule)}'.");
 		}
 
 		writer.WriteEndObject();
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Security/RoleQuery.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Security/RoleQuery.g.cs
index 5dee2275fcf..3105004a68d 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Security/RoleQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Security/RoleQuery.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -39,12 +40,16 @@ internal RoleQuery(string variantName, object variant)
 			throw new ArgumentNullException(nameof(variant));
 		if (string.IsNullOrWhiteSpace(variantName))
 			throw new ArgumentException("Variant name must not be empty or whitespace.");
-		VariantName = variantName;
+		VariantType = variantName;
 		Variant = variant;
 	}
 
-	internal object Variant { get; }
-	internal string VariantName { get; }
+	internal RoleQuery()
+	{
+	}
+
+	public object Variant { get; internal set; }
+	public string VariantType { get; internal set; }
 
 	public static RoleQuery Bool(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.BoolQuery boolQuery) => new RoleQuery("bool", boolQuery);
 	public static RoleQuery Exists(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.ExistsQuery existsQuery) => new RoleQuery("exists", existsQuery);
@@ -52,6 +57,7 @@ internal RoleQuery(string variantName, object variant)
 	public static RoleQuery Match(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MatchQuery matchQuery) => new RoleQuery("match", matchQuery);
 	public static RoleQuery MatchAll(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MatchAllQuery matchAllQuery) => new RoleQuery("match_all", matchAllQuery);
 	public static RoleQuery Prefix(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.PrefixQuery prefixQuery) => new RoleQuery("prefix", prefixQuery);
+	public static RoleQuery Range(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IRangeQuery rangeQuery) => new RoleQuery("range", rangeQuery);
 	public static RoleQuery Range(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.UntypedRangeQuery rangeQuery) => new RoleQuery("range", rangeQuery);
 	public static RoleQuery Range(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.DateRangeQuery rangeQuery) => new RoleQuery("range", rangeQuery);
 	public static RoleQuery Range(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.NumberRangeQuery rangeQuery) => new RoleQuery("range", rangeQuery);
@@ -74,157 +80,164 @@ public bool TryGet<T>([NotNullWhen(true)] out T? result) where T : class
 	}
 }
 
-internal sealed partial class RoleQueryConverter : JsonConverter<RoleQuery>
+internal sealed partial class RoleQueryConverter : System.Text.Json.Serialization.JsonConverter<RoleQuery>
 {
-	public override RoleQuery Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText VariantBool = System.Text.Json.JsonEncodedText.Encode("bool");
+	private static readonly System.Text.Json.JsonEncodedText VariantExists = System.Text.Json.JsonEncodedText.Encode("exists");
+	private static readonly System.Text.Json.JsonEncodedText VariantIds = System.Text.Json.JsonEncodedText.Encode("ids");
+	private static readonly System.Text.Json.JsonEncodedText VariantMatch = System.Text.Json.JsonEncodedText.Encode("match");
+	private static readonly System.Text.Json.JsonEncodedText VariantMatchAll = System.Text.Json.JsonEncodedText.Encode("match_all");
+	private static readonly System.Text.Json.JsonEncodedText VariantPrefix = System.Text.Json.JsonEncodedText.Encode("prefix");
+	private static readonly System.Text.Json.JsonEncodedText VariantRange = System.Text.Json.JsonEncodedText.Encode("range");
+	private static readonly System.Text.Json.JsonEncodedText VariantSimpleQueryString = System.Text.Json.JsonEncodedText.Encode("simple_query_string");
+	private static readonly System.Text.Json.JsonEncodedText VariantTerm = System.Text.Json.JsonEncodedText.Encode("term");
+	private static readonly System.Text.Json.JsonEncodedText VariantTerms = System.Text.Json.JsonEncodedText.Encode("terms");
+	private static readonly System.Text.Json.JsonEncodedText VariantWildcard = System.Text.Json.JsonEncodedText.Encode("wildcard");
+
+	public override RoleQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		var variantType = string.Empty;
+		object? variant = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			throw new JsonException("Expected start token.");
-		}
-
-		object? variantValue = default;
-		string? variantNameValue = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
-		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token.");
-			}
-
-			if (reader.TokenType != JsonTokenType.PropertyName)
+			if (reader.ValueTextEquals(VariantBool))
 			{
-				throw new JsonException("Expected a property name token representing the name of an Elasticsearch field.");
-			}
-
-			var propertyName = reader.GetString();
-			reader.Read();
-			if (propertyName == "bool")
-			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.BoolQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantBool.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.BoolQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "exists")
+			if (reader.ValueTextEquals(VariantExists))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.ExistsQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantExists.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.ExistsQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "ids")
+			if (reader.ValueTextEquals(VariantIds))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IdsQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantIds.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IdsQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "match")
+			if (reader.ValueTextEquals(VariantMatch))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MatchQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantMatch.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MatchQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "match_all")
+			if (reader.ValueTextEquals(VariantMatchAll))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MatchAllQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantMatchAll.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MatchAllQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "prefix")
+			if (reader.ValueTextEquals(VariantPrefix))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.PrefixQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantPrefix.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.PrefixQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "range")
+			if (reader.ValueTextEquals(VariantRange))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.UntypedRangeQuery>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantRange.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IRangeQuery>(options);
 				continue;
 			}
 
-			if (propertyName == "simple_query_string")
+			if (reader.ValueTextEquals(VariantSimpleQueryString))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SimpleQueryStringQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantSimpleQueryString.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SimpleQueryStringQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "term")
+			if (reader.ValueTextEquals(VariantTerm))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.TermQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantTerm.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.TermQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "terms")
+			if (reader.ValueTextEquals(VariantTerms))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.TermsQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantTerms.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.TermsQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "wildcard")
+			if (reader.ValueTextEquals(VariantWildcard))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.WildcardQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantWildcard.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.WildcardQuery?>(options);
 				continue;
 			}
 
-			throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'RoleQuery' from the response.");
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		var result = new RoleQuery(variantNameValue, variantValue);
-		return result;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new RoleQuery { VariantType = variantType, Variant = variant };
 	}
 
-	public override void Write(Utf8JsonWriter writer, RoleQuery value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, RoleQuery value, System.Text.Json.JsonSerializerOptions options)
 	{
 		writer.WriteStartObject();
-		if (value.VariantName is not null && value.Variant is not null)
+		switch (value.VariantType)
 		{
-			writer.WritePropertyName(value.VariantName);
-			switch (value.VariantName)
-			{
-				case "bool":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.BoolQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.BoolQuery)value.Variant, options);
-					break;
-				case "exists":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.ExistsQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.ExistsQuery)value.Variant, options);
-					break;
-				case "ids":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IdsQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IdsQuery)value.Variant, options);
-					break;
-				case "match":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MatchQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MatchQuery)value.Variant, options);
-					break;
-				case "match_all":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MatchAllQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MatchAllQuery)value.Variant, options);
-					break;
-				case "prefix":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.PrefixQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.PrefixQuery)value.Variant, options);
-					break;
-				case "range":
-					JsonSerializer.Serialize(writer, value.Variant, value.Variant.GetType(), options);
-					break;
-				case "simple_query_string":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SimpleQueryStringQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SimpleQueryStringQuery)value.Variant, options);
-					break;
-				case "term":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.TermQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.TermQuery)value.Variant, options);
-					break;
-				case "terms":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.TermsQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.TermsQuery)value.Variant, options);
-					break;
-				case "wildcard":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.WildcardQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.WildcardQuery)value.Variant, options);
-					break;
-			}
+			case "":
+				break;
+			case "bool":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.BoolQuery?)value.Variant);
+				break;
+			case "exists":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.ExistsQuery?)value.Variant);
+				break;
+			case "ids":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IdsQuery?)value.Variant);
+				break;
+			case "match":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MatchQuery?)value.Variant);
+				break;
+			case "match_all":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MatchAllQuery?)value.Variant);
+				break;
+			case "prefix":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.PrefixQuery?)value.Variant);
+				break;
+			case "range":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IRangeQuery)value.Variant);
+				break;
+			case "simple_query_string":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SimpleQueryStringQuery?)value.Variant);
+				break;
+			case "term":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.TermQuery?)value.Variant);
+				break;
+			case "terms":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.TermsQuery?)value.Variant);
+				break;
+			case "wildcard":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.WildcardQuery?)value.Variant);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.VariantType}' is not supported for type '{nameof(RoleQuery)}'.");
 		}
 
 		writer.WriteEndObject();
@@ -274,6 +287,7 @@ private RoleQueryDescriptor<TDocument> Set(object variant, string variantName)
 	public RoleQueryDescriptor<TDocument> MatchAll(Action<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MatchAllQueryDescriptor> configure) => Set(configure, "match_all");
 	public RoleQueryDescriptor<TDocument> Prefix(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.PrefixQuery prefixQuery) => Set(prefixQuery, "prefix");
 	public RoleQueryDescriptor<TDocument> Prefix(Action<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.PrefixQueryDescriptor<TDocument>> configure) => Set(configure, "prefix");
+	public RoleQueryDescriptor<TDocument> Range(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IRangeQuery rangeQuery) => Set(rangeQuery, "range");
 	public RoleQueryDescriptor<TDocument> Range(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.UntypedRangeQuery rangeQuery) => Set(rangeQuery, "range");
 	public RoleQueryDescriptor<TDocument> Range(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.DateRangeQuery rangeQuery) => Set(rangeQuery, "range");
 	public RoleQueryDescriptor<TDocument> Range(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.NumberRangeQuery rangeQuery) => Set(rangeQuery, "range");
@@ -350,6 +364,7 @@ private RoleQueryDescriptor Set(object variant, string variantName)
 	public RoleQueryDescriptor MatchAll(Action<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MatchAllQueryDescriptor> configure) => Set(configure, "match_all");
 	public RoleQueryDescriptor Prefix(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.PrefixQuery prefixQuery) => Set(prefixQuery, "prefix");
 	public RoleQueryDescriptor Prefix<TDocument>(Action<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.PrefixQueryDescriptor> configure) => Set(configure, "prefix");
+	public RoleQueryDescriptor Range(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IRangeQuery rangeQuery) => Set(rangeQuery, "range");
 	public RoleQueryDescriptor Range(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.UntypedRangeQuery rangeQuery) => Set(rangeQuery, "range");
 	public RoleQueryDescriptor Range(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.DateRangeQuery rangeQuery) => Set(rangeQuery, "range");
 	public RoleQueryDescriptor Range(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.NumberRangeQuery rangeQuery) => Set(rangeQuery, "range");
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Security/SearchAccess.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Security/SearchAccess.g.cs
index ad56f8bdb5d..59d59586cd8 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Security/SearchAccess.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Security/SearchAccess.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,60 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Security;
 
+internal sealed partial class SearchAccessConverter : System.Text.Json.Serialization.JsonConverter<SearchAccess>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropFieldSecurity = System.Text.Json.JsonEncodedText.Encode("field_security");
+	private static readonly System.Text.Json.JsonEncodedText PropNames = System.Text.Json.JsonEncodedText.Encode("names");
+	private static readonly System.Text.Json.JsonEncodedText PropQuery = System.Text.Json.JsonEncodedText.Encode("query");
+
+	public override SearchAccess Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Security.FieldSecurity?> propFieldSecurity = default;
+		LocalJsonProperty<IReadOnlyCollection<string>> propNames = default;
+		LocalJsonProperty<object?> propQuery = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propFieldSecurity.TryRead(ref reader, options, PropFieldSecurity))
+			{
+				continue;
+			}
+
+			if (propNames.TryRead(ref reader, options, PropNames, typeof(SingleOrManyMarker<IReadOnlyCollection<string>, string>)))
+			{
+				continue;
+			}
+
+			if (propQuery.TryRead(ref reader, options, PropQuery))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SearchAccess
+		{
+			FieldSecurity = propFieldSecurity.Value
+,
+			Names = propNames.Value
+,
+			Query = propQuery.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SearchAccess value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropFieldSecurity, value.FieldSecurity);
+		writer.WriteProperty(options, PropNames, value.Names, typeof(SingleOrManyMarker<IReadOnlyCollection<string>, string>));
+		writer.WriteProperty(options, PropQuery, value.Query);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(SearchAccessConverter))]
 public sealed partial class SearchAccess
 {
 	/// <summary>
@@ -34,7 +89,6 @@ public sealed partial class SearchAccess
 	/// The document fields that the owners of the role have read access to.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("field_security")]
 	public Elastic.Clients.Elasticsearch.Serverless.Security.FieldSecurity? FieldSecurity { get; init; }
 
 	/// <summary>
@@ -42,8 +96,6 @@ public sealed partial class SearchAccess
 	/// A list of indices (or index name patterns) to which the permissions in this entry apply.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("names")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public IReadOnlyCollection<string> Names { get; init; }
 
 	/// <summary>
@@ -51,6 +103,5 @@ public sealed partial class SearchAccess
 	/// A search query that defines the documents the owners of the role have access to. A document within the specified indices must match this query for it to be accessible by the owners of the role.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("query")]
 	public object? Query { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Security/UserIndicesPrivileges.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Security/UserIndicesPrivileges.g.cs
index 3693ef101e1..f3985763102 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Security/UserIndicesPrivileges.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Security/UserIndicesPrivileges.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,80 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Security;
 
+internal sealed partial class UserIndicesPrivilegesConverter : System.Text.Json.Serialization.JsonConverter<UserIndicesPrivileges>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAllowRestrictedIndices = System.Text.Json.JsonEncodedText.Encode("allow_restricted_indices");
+	private static readonly System.Text.Json.JsonEncodedText PropFieldSecurity = System.Text.Json.JsonEncodedText.Encode("field_security");
+	private static readonly System.Text.Json.JsonEncodedText PropNames = System.Text.Json.JsonEncodedText.Encode("names");
+	private static readonly System.Text.Json.JsonEncodedText PropPrivileges = System.Text.Json.JsonEncodedText.Encode("privileges");
+	private static readonly System.Text.Json.JsonEncodedText PropQuery = System.Text.Json.JsonEncodedText.Encode("query");
+
+	public override UserIndicesPrivileges Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAllowRestrictedIndices = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Security.FieldSecurity>?> propFieldSecurity = default;
+		LocalJsonProperty<IReadOnlyCollection<string>> propNames = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Security.IndexPrivilege>> propPrivileges = default;
+		LocalJsonProperty<object?> propQuery = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAllowRestrictedIndices.TryRead(ref reader, options, PropAllowRestrictedIndices))
+			{
+				continue;
+			}
+
+			if (propFieldSecurity.TryRead(ref reader, options, PropFieldSecurity))
+			{
+				continue;
+			}
+
+			if (propNames.TryRead(ref reader, options, PropNames, typeof(SingleOrManyMarker<IReadOnlyCollection<string>, string>)))
+			{
+				continue;
+			}
+
+			if (propPrivileges.TryRead(ref reader, options, PropPrivileges))
+			{
+				continue;
+			}
+
+			if (propQuery.TryRead(ref reader, options, PropQuery))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new UserIndicesPrivileges
+		{
+			AllowRestrictedIndices = propAllowRestrictedIndices.Value
+,
+			FieldSecurity = propFieldSecurity.Value
+,
+			Names = propNames.Value
+,
+			Privileges = propPrivileges.Value
+,
+			Query = propQuery.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, UserIndicesPrivileges value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAllowRestrictedIndices, value.AllowRestrictedIndices);
+		writer.WriteProperty(options, PropFieldSecurity, value.FieldSecurity);
+		writer.WriteProperty(options, PropNames, value.Names, typeof(SingleOrManyMarker<IReadOnlyCollection<string>, string>));
+		writer.WriteProperty(options, PropPrivileges, value.Privileges);
+		writer.WriteProperty(options, PropQuery, value.Query);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(UserIndicesPrivilegesConverter))]
 public sealed partial class UserIndicesPrivileges
 {
 	/// <summary>
@@ -34,7 +109,6 @@ public sealed partial class UserIndicesPrivileges
 	/// Set to <c>true</c> if using wildcard or regular expressions for patterns that cover restricted indices. Implicitly, restricted indices have limited privileges that can cause pattern tests to fail. If restricted indices are explicitly included in the <c>names</c> list, Elasticsearch checks privileges against these indices regardless of the value set for <c>allow_restricted_indices</c>.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("allow_restricted_indices")]
 	public bool AllowRestrictedIndices { get; init; }
 
 	/// <summary>
@@ -42,7 +116,6 @@ public sealed partial class UserIndicesPrivileges
 	/// The document fields that the owners of the role have read access to.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("field_security")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Security.FieldSecurity>? FieldSecurity { get; init; }
 
 	/// <summary>
@@ -50,8 +123,6 @@ public sealed partial class UserIndicesPrivileges
 	/// A list of indices (or index name patterns) to which the permissions in this entry apply.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("names")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public IReadOnlyCollection<string> Names { get; init; }
 
 	/// <summary>
@@ -59,7 +130,6 @@ public sealed partial class UserIndicesPrivileges
 	/// The index level privileges that owners of the role have on the specified indices.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("privileges")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.Security.IndexPrivilege> Privileges { get; init; }
 
 	/// <summary>
@@ -67,6 +137,5 @@ public sealed partial class UserIndicesPrivileges
 	/// Search queries that define the documents the user has access to. A document within the specified indices must match these queries for it to be accessible by the owners of the role.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("query")]
 	public object? Query { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Security/UserQuery.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Security/UserQuery.g.cs
index d030a6ecd17..20d244ae975 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Security/UserQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Security/UserQuery.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -39,12 +40,16 @@ internal UserQuery(string variantName, object variant)
 			throw new ArgumentNullException(nameof(variant));
 		if (string.IsNullOrWhiteSpace(variantName))
 			throw new ArgumentException("Variant name must not be empty or whitespace.");
-		VariantName = variantName;
+		VariantType = variantName;
 		Variant = variant;
 	}
 
-	internal object Variant { get; }
-	internal string VariantName { get; }
+	internal UserQuery()
+	{
+	}
+
+	public object Variant { get; internal set; }
+	public string VariantType { get; internal set; }
 
 	public static UserQuery Bool(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.BoolQuery boolQuery) => new UserQuery("bool", boolQuery);
 	public static UserQuery Exists(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.ExistsQuery existsQuery) => new UserQuery("exists", existsQuery);
@@ -52,6 +57,7 @@ internal UserQuery(string variantName, object variant)
 	public static UserQuery Match(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MatchQuery matchQuery) => new UserQuery("match", matchQuery);
 	public static UserQuery MatchAll(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MatchAllQuery matchAllQuery) => new UserQuery("match_all", matchAllQuery);
 	public static UserQuery Prefix(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.PrefixQuery prefixQuery) => new UserQuery("prefix", prefixQuery);
+	public static UserQuery Range(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IRangeQuery rangeQuery) => new UserQuery("range", rangeQuery);
 	public static UserQuery Range(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.UntypedRangeQuery rangeQuery) => new UserQuery("range", rangeQuery);
 	public static UserQuery Range(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.DateRangeQuery rangeQuery) => new UserQuery("range", rangeQuery);
 	public static UserQuery Range(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.NumberRangeQuery rangeQuery) => new UserQuery("range", rangeQuery);
@@ -74,157 +80,164 @@ public bool TryGet<T>([NotNullWhen(true)] out T? result) where T : class
 	}
 }
 
-internal sealed partial class UserQueryConverter : JsonConverter<UserQuery>
+internal sealed partial class UserQueryConverter : System.Text.Json.Serialization.JsonConverter<UserQuery>
 {
-	public override UserQuery Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText VariantBool = System.Text.Json.JsonEncodedText.Encode("bool");
+	private static readonly System.Text.Json.JsonEncodedText VariantExists = System.Text.Json.JsonEncodedText.Encode("exists");
+	private static readonly System.Text.Json.JsonEncodedText VariantIds = System.Text.Json.JsonEncodedText.Encode("ids");
+	private static readonly System.Text.Json.JsonEncodedText VariantMatch = System.Text.Json.JsonEncodedText.Encode("match");
+	private static readonly System.Text.Json.JsonEncodedText VariantMatchAll = System.Text.Json.JsonEncodedText.Encode("match_all");
+	private static readonly System.Text.Json.JsonEncodedText VariantPrefix = System.Text.Json.JsonEncodedText.Encode("prefix");
+	private static readonly System.Text.Json.JsonEncodedText VariantRange = System.Text.Json.JsonEncodedText.Encode("range");
+	private static readonly System.Text.Json.JsonEncodedText VariantSimpleQueryString = System.Text.Json.JsonEncodedText.Encode("simple_query_string");
+	private static readonly System.Text.Json.JsonEncodedText VariantTerm = System.Text.Json.JsonEncodedText.Encode("term");
+	private static readonly System.Text.Json.JsonEncodedText VariantTerms = System.Text.Json.JsonEncodedText.Encode("terms");
+	private static readonly System.Text.Json.JsonEncodedText VariantWildcard = System.Text.Json.JsonEncodedText.Encode("wildcard");
+
+	public override UserQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		var variantType = string.Empty;
+		object? variant = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			throw new JsonException("Expected start token.");
-		}
-
-		object? variantValue = default;
-		string? variantNameValue = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
-		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token.");
-			}
-
-			if (reader.TokenType != JsonTokenType.PropertyName)
+			if (reader.ValueTextEquals(VariantBool))
 			{
-				throw new JsonException("Expected a property name token representing the name of an Elasticsearch field.");
-			}
-
-			var propertyName = reader.GetString();
-			reader.Read();
-			if (propertyName == "bool")
-			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.BoolQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantBool.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.BoolQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "exists")
+			if (reader.ValueTextEquals(VariantExists))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.ExistsQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantExists.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.ExistsQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "ids")
+			if (reader.ValueTextEquals(VariantIds))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IdsQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantIds.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IdsQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "match")
+			if (reader.ValueTextEquals(VariantMatch))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MatchQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantMatch.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MatchQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "match_all")
+			if (reader.ValueTextEquals(VariantMatchAll))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MatchAllQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantMatchAll.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MatchAllQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "prefix")
+			if (reader.ValueTextEquals(VariantPrefix))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.PrefixQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantPrefix.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.PrefixQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "range")
+			if (reader.ValueTextEquals(VariantRange))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.UntypedRangeQuery>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantRange.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IRangeQuery>(options);
 				continue;
 			}
 
-			if (propertyName == "simple_query_string")
+			if (reader.ValueTextEquals(VariantSimpleQueryString))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SimpleQueryStringQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantSimpleQueryString.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SimpleQueryStringQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "term")
+			if (reader.ValueTextEquals(VariantTerm))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.TermQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantTerm.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.TermQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "terms")
+			if (reader.ValueTextEquals(VariantTerms))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.TermsQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantTerms.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.TermsQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "wildcard")
+			if (reader.ValueTextEquals(VariantWildcard))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.WildcardQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantWildcard.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.WildcardQuery?>(options);
 				continue;
 			}
 
-			throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'UserQuery' from the response.");
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		var result = new UserQuery(variantNameValue, variantValue);
-		return result;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new UserQuery { VariantType = variantType, Variant = variant };
 	}
 
-	public override void Write(Utf8JsonWriter writer, UserQuery value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, UserQuery value, System.Text.Json.JsonSerializerOptions options)
 	{
 		writer.WriteStartObject();
-		if (value.VariantName is not null && value.Variant is not null)
+		switch (value.VariantType)
 		{
-			writer.WritePropertyName(value.VariantName);
-			switch (value.VariantName)
-			{
-				case "bool":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.BoolQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.BoolQuery)value.Variant, options);
-					break;
-				case "exists":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.ExistsQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.ExistsQuery)value.Variant, options);
-					break;
-				case "ids":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IdsQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IdsQuery)value.Variant, options);
-					break;
-				case "match":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MatchQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MatchQuery)value.Variant, options);
-					break;
-				case "match_all":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MatchAllQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MatchAllQuery)value.Variant, options);
-					break;
-				case "prefix":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.PrefixQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.PrefixQuery)value.Variant, options);
-					break;
-				case "range":
-					JsonSerializer.Serialize(writer, value.Variant, value.Variant.GetType(), options);
-					break;
-				case "simple_query_string":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SimpleQueryStringQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SimpleQueryStringQuery)value.Variant, options);
-					break;
-				case "term":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.TermQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.TermQuery)value.Variant, options);
-					break;
-				case "terms":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.TermsQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.TermsQuery)value.Variant, options);
-					break;
-				case "wildcard":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.WildcardQuery>(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.WildcardQuery)value.Variant, options);
-					break;
-			}
+			case "":
+				break;
+			case "bool":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.BoolQuery?)value.Variant);
+				break;
+			case "exists":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.ExistsQuery?)value.Variant);
+				break;
+			case "ids":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IdsQuery?)value.Variant);
+				break;
+			case "match":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MatchQuery?)value.Variant);
+				break;
+			case "match_all":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MatchAllQuery?)value.Variant);
+				break;
+			case "prefix":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.PrefixQuery?)value.Variant);
+				break;
+			case "range":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IRangeQuery)value.Variant);
+				break;
+			case "simple_query_string":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SimpleQueryStringQuery?)value.Variant);
+				break;
+			case "term":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.TermQuery?)value.Variant);
+				break;
+			case "terms":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.TermsQuery?)value.Variant);
+				break;
+			case "wildcard":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.WildcardQuery?)value.Variant);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.VariantType}' is not supported for type '{nameof(UserQuery)}'.");
 		}
 
 		writer.WriteEndObject();
@@ -274,6 +287,7 @@ private UserQueryDescriptor<TDocument> Set(object variant, string variantName)
 	public UserQueryDescriptor<TDocument> MatchAll(Action<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MatchAllQueryDescriptor> configure) => Set(configure, "match_all");
 	public UserQueryDescriptor<TDocument> Prefix(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.PrefixQuery prefixQuery) => Set(prefixQuery, "prefix");
 	public UserQueryDescriptor<TDocument> Prefix(Action<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.PrefixQueryDescriptor<TDocument>> configure) => Set(configure, "prefix");
+	public UserQueryDescriptor<TDocument> Range(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IRangeQuery rangeQuery) => Set(rangeQuery, "range");
 	public UserQueryDescriptor<TDocument> Range(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.UntypedRangeQuery rangeQuery) => Set(rangeQuery, "range");
 	public UserQueryDescriptor<TDocument> Range(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.DateRangeQuery rangeQuery) => Set(rangeQuery, "range");
 	public UserQueryDescriptor<TDocument> Range(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.NumberRangeQuery rangeQuery) => Set(rangeQuery, "range");
@@ -350,6 +364,7 @@ private UserQueryDescriptor Set(object variant, string variantName)
 	public UserQueryDescriptor MatchAll(Action<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.MatchAllQueryDescriptor> configure) => Set(configure, "match_all");
 	public UserQueryDescriptor Prefix(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.PrefixQuery prefixQuery) => Set(prefixQuery, "prefix");
 	public UserQueryDescriptor Prefix<TDocument>(Action<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.PrefixQueryDescriptor> configure) => Set(configure, "prefix");
+	public UserQueryDescriptor Range(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.IRangeQuery rangeQuery) => Set(rangeQuery, "range");
 	public UserQueryDescriptor Range(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.UntypedRangeQuery rangeQuery) => Set(rangeQuery, "range");
 	public UserQueryDescriptor Range(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.DateRangeQuery rangeQuery) => Set(rangeQuery, "range");
 	public UserQueryDescriptor Range(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.NumberRangeQuery rangeQuery) => Set(rangeQuery, "range");
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Snapshot/InfoFeatureState.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Snapshot/InfoFeatureState.g.cs
index c7a92a7f6e4..a570840991c 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Snapshot/InfoFeatureState.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Snapshot/InfoFeatureState.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,11 +28,52 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Snapshot;
 
+internal sealed partial class InfoFeatureStateConverter : System.Text.Json.Serialization.JsonConverter<InfoFeatureState>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropFeatureName = System.Text.Json.JsonEncodedText.Encode("feature_name");
+	private static readonly System.Text.Json.JsonEncodedText PropIndices = System.Text.Json.JsonEncodedText.Encode("indices");
+
+	public override InfoFeatureState Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propFeatureName = default;
+		LocalJsonProperty<IReadOnlyCollection<string>> propIndices = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propFeatureName.TryRead(ref reader, options, PropFeatureName))
+			{
+				continue;
+			}
+
+			if (propIndices.TryRead(ref reader, options, PropIndices, typeof(SingleOrManyMarker<IReadOnlyCollection<string>, string>)))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new InfoFeatureState
+		{
+			FeatureName = propFeatureName.Value
+,
+			Indices = propIndices.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, InfoFeatureState value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropFeatureName, value.FeatureName);
+		writer.WriteProperty(options, PropIndices, value.Indices, typeof(SingleOrManyMarker<IReadOnlyCollection<string>, string>));
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(InfoFeatureStateConverter))]
 public sealed partial class InfoFeatureState
 {
-	[JsonInclude, JsonPropertyName("feature_name")]
 	public string FeatureName { get; init; }
-	[JsonInclude, JsonPropertyName("indices")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public IReadOnlyCollection<string> Indices { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Snapshot/Repositories.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Snapshot/Repositories.g.cs
index a8395962378..71e01c88a58 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Snapshot/Repositories.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Snapshot/Repositories.g.cs
@@ -19,6 +19,7 @@
 
 using Elastic.Clients.Elasticsearch.Serverless.Core;
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using Elastic.Transport;
 using System;
@@ -86,70 +87,62 @@ public RepositoriesDescriptor() : base(new Repositories())
 	public RepositoriesDescriptor SourceOnly(string repositoryName, SourceOnlyRepository sourceOnlyRepository) => AssignVariant(repositoryName, sourceOnlyRepository);
 }
 
-internal sealed partial class RepositoryInterfaceConverter : JsonConverter<IRepository>
+internal sealed partial class RepositoryInterfaceConverter : System.Text.Json.Serialization.JsonConverter<IRepository>
 {
-	public override IRepository Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropDiscriminator = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override IRepository Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var copiedReader = reader;
-		string? type = null;
-		using var jsonDoc = JsonDocument.ParseValue(ref copiedReader);
-		if (jsonDoc is not null && jsonDoc.RootElement.TryGetProperty("type", out var readType) && readType.ValueKind == JsonValueKind.String)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		var readerSnapshot = reader;
+		string? discriminator = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			type = readType.ToString();
+			if (reader.TryReadProperty(options, PropDiscriminator, ref discriminator))
+			{
+				break;
+			}
+
+			reader.Skip();
 		}
 
-		switch (type)
+		reader = readerSnapshot;
+		return discriminator switch
 		{
-			case "azure":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Snapshot.AzureRepository>(ref reader, options);
-			case "gcs":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Snapshot.GcsRepository>(ref reader, options);
-			case "url":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Snapshot.ReadOnlyUrlRepository>(ref reader, options);
-			case "s3":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Snapshot.S3Repository>(ref reader, options);
-			case "fs":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Snapshot.SharedFileSystemRepository>(ref reader, options);
-			case "source":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Snapshot.SourceOnlyRepository>(ref reader, options);
-			default:
-				ThrowHelper.ThrowUnknownTaggedUnionVariantJsonException(type, typeof(IRepository));
-				return null;
-		}
+			"azure" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Snapshot.AzureRepository>(options),
+			"gcs" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Snapshot.GcsRepository>(options),
+			"url" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Snapshot.ReadOnlyUrlRepository>(options),
+			"s3" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Snapshot.S3Repository>(options),
+			"fs" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Snapshot.SharedFileSystemRepository>(options),
+			"source" => reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Snapshot.SourceOnlyRepository>(options),
+			_ => throw new System.Text.Json.JsonException($"Variant '{discriminator}' is not supported for type '{nameof(IRepository)}'.")
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, IRepository value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IRepository value, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (value is null)
-		{
-			writer.WriteNullValue();
-			return;
-		}
-
 		switch (value.Type)
 		{
 			case "azure":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Snapshot.AzureRepository), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Snapshot.AzureRepository)value);
+				break;
 			case "gcs":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Snapshot.GcsRepository), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Snapshot.GcsRepository)value);
+				break;
 			case "url":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Snapshot.ReadOnlyUrlRepository), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Snapshot.ReadOnlyUrlRepository)value);
+				break;
 			case "s3":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Snapshot.S3Repository), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Snapshot.S3Repository)value);
+				break;
 			case "fs":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Snapshot.SharedFileSystemRepository), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Snapshot.SharedFileSystemRepository)value);
+				break;
 			case "source":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Serverless.Snapshot.SourceOnlyRepository), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Serverless.Snapshot.SourceOnlyRepository)value);
+				break;
 			default:
-				var type = value.GetType();
-				JsonSerializer.Serialize(writer, value, type, options);
-				return;
+				throw new System.Text.Json.JsonException($"Variant '{value.Type}' is not supported for type '{nameof(IRepository)}'.");
 		}
 	}
 }
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Snapshot/SnapshotInfo.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Snapshot/SnapshotInfo.g.cs
index 56b8fa219e3..e5d1607fc7f 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Snapshot/SnapshotInfo.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Snapshot/SnapshotInfo.g.cs
@@ -46,7 +46,6 @@ public sealed partial class SnapshotInfo
 	[JsonInclude, JsonPropertyName("include_global_state")]
 	public bool? IncludeGlobalState { get; init; }
 	[JsonInclude, JsonPropertyName("index_details")]
-	[ReadOnlyIndexNameDictionaryConverter(typeof(Elastic.Clients.Elasticsearch.Serverless.Snapshot.IndexDetails))]
 	public IReadOnlyDictionary<Elastic.Clients.Elasticsearch.Serverless.IndexName, Elastic.Clients.Elasticsearch.Serverless.Snapshot.IndexDetails>? IndexDetails { get; init; }
 	[JsonInclude, JsonPropertyName("indices")]
 	public IReadOnlyCollection<string>? Indices { get; init; }
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Snapshot/SourceOnlyRepositorySettings.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Snapshot/SourceOnlyRepositorySettings.g.cs
index 3e616a2b04d..83efc89755d 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Snapshot/SourceOnlyRepositorySettings.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Snapshot/SourceOnlyRepositorySettings.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,110 +28,96 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.Snapshot;
 
-internal sealed partial class SourceOnlyRepositorySettingsConverter : JsonConverter<SourceOnlyRepositorySettings>
+internal sealed partial class SourceOnlyRepositorySettingsConverter : System.Text.Json.Serialization.JsonConverter<SourceOnlyRepositorySettings>
 {
-	public override SourceOnlyRepositorySettings Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropChunkSize = System.Text.Json.JsonEncodedText.Encode("chunk_size");
+	private static readonly System.Text.Json.JsonEncodedText PropCompress = System.Text.Json.JsonEncodedText.Encode("compress");
+	private static readonly System.Text.Json.JsonEncodedText PropDelegateType = System.Text.Json.JsonEncodedText.Encode("delegate_type");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxNumberOfSnapshots = System.Text.Json.JsonEncodedText.Encode("max_number_of_snapshots");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxRestoreBytesPerSec = System.Text.Json.JsonEncodedText.Encode("max_restore_bytes_per_sec");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxSnapshotBytesPerSec = System.Text.Json.JsonEncodedText.Encode("max_snapshot_bytes_per_sec");
+	private static readonly System.Text.Json.JsonEncodedText PropReadOnly = System.Text.Json.JsonEncodedText.Encode("read_only");
+	private static readonly System.Text.Json.JsonEncodedText PropReadOnly1 = System.Text.Json.JsonEncodedText.Encode("readonly");
+
+	public override SourceOnlyRepositorySettings Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		var variant = new SourceOnlyRepositorySettings();
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.ByteSize?> propChunkSize = default;
+		LocalJsonProperty<bool?> propCompress = default;
+		LocalJsonProperty<string?> propDelegateType = default;
+		LocalJsonProperty<int?> propMaxNumberOfSnapshots = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.ByteSize?> propMaxRestoreBytesPerSec = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.ByteSize?> propMaxSnapshotBytesPerSec = default;
+		LocalJsonProperty<bool?> propReadOnly = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propChunkSize.TryRead(ref reader, options, PropChunkSize))
 			{
-				var property = reader.GetString();
-				if (property == "chunk_size")
-				{
-					variant.ChunkSize = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.ByteSize?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "compress")
-				{
-					variant.Compress = JsonSerializer.Deserialize<bool?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "delegate_type")
-				{
-					variant.DelegateType = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "max_number_of_snapshots")
-				{
-					variant.MaxNumberOfSnapshots = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "max_restore_bytes_per_sec")
-				{
-					variant.MaxRestoreBytesPerSec = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.ByteSize?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "max_snapshot_bytes_per_sec")
-				{
-					variant.MaxSnapshotBytesPerSec = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.ByteSize?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "read_only" || property == "readonly")
-				{
-					variant.ReadOnly = JsonSerializer.Deserialize<bool?>(ref reader, options);
-					continue;
-				}
+				continue;
 			}
-		}
 
-		return variant;
-	}
+			if (propCompress.TryRead(ref reader, options, PropCompress))
+			{
+				continue;
+			}
 
-	public override void Write(Utf8JsonWriter writer, SourceOnlyRepositorySettings value, JsonSerializerOptions options)
-	{
-		writer.WriteStartObject();
-		if (value.ChunkSize is not null)
-		{
-			writer.WritePropertyName("chunk_size");
-			JsonSerializer.Serialize(writer, value.ChunkSize, options);
-		}
+			if (propDelegateType.TryRead(ref reader, options, PropDelegateType))
+			{
+				continue;
+			}
 
-		if (value.Compress.HasValue)
-		{
-			writer.WritePropertyName("compress");
-			writer.WriteBooleanValue(value.Compress.Value);
-		}
+			if (propMaxNumberOfSnapshots.TryRead(ref reader, options, PropMaxNumberOfSnapshots))
+			{
+				continue;
+			}
 
-		if (!string.IsNullOrEmpty(value.DelegateType))
-		{
-			writer.WritePropertyName("delegate_type");
-			writer.WriteStringValue(value.DelegateType);
-		}
+			if (propMaxRestoreBytesPerSec.TryRead(ref reader, options, PropMaxRestoreBytesPerSec))
+			{
+				continue;
+			}
 
-		if (value.MaxNumberOfSnapshots.HasValue)
-		{
-			writer.WritePropertyName("max_number_of_snapshots");
-			writer.WriteNumberValue(value.MaxNumberOfSnapshots.Value);
-		}
+			if (propMaxSnapshotBytesPerSec.TryRead(ref reader, options, PropMaxSnapshotBytesPerSec))
+			{
+				continue;
+			}
 
-		if (value.MaxRestoreBytesPerSec is not null)
-		{
-			writer.WritePropertyName("max_restore_bytes_per_sec");
-			JsonSerializer.Serialize(writer, value.MaxRestoreBytesPerSec, options);
-		}
+			if (propReadOnly.TryRead(ref reader, options, PropReadOnly) || propReadOnly.TryRead(ref reader, options, PropReadOnly1))
+			{
+				continue;
+			}
 
-		if (value.MaxSnapshotBytesPerSec is not null)
-		{
-			writer.WritePropertyName("max_snapshot_bytes_per_sec");
-			JsonSerializer.Serialize(writer, value.MaxSnapshotBytesPerSec, options);
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		if (value.ReadOnly.HasValue)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SourceOnlyRepositorySettings
 		{
-			writer.WritePropertyName("read_only");
-			writer.WriteBooleanValue(value.ReadOnly.Value);
-		}
+			ChunkSize = propChunkSize.Value
+,
+			Compress = propCompress.Value
+,
+			DelegateType = propDelegateType.Value
+,
+			MaxNumberOfSnapshots = propMaxNumberOfSnapshots.Value
+,
+			MaxRestoreBytesPerSec = propMaxRestoreBytesPerSec.Value
+,
+			MaxSnapshotBytesPerSec = propMaxSnapshotBytesPerSec.Value
+,
+			ReadOnly = propReadOnly.Value
+		};
+	}
 
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SourceOnlyRepositorySettings value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropChunkSize, value.ChunkSize);
+		writer.WriteProperty(options, PropCompress, value.Compress);
+		writer.WriteProperty(options, PropDelegateType, value.DelegateType);
+		writer.WriteProperty(options, PropMaxNumberOfSnapshots, value.MaxNumberOfSnapshots);
+		writer.WriteProperty(options, PropMaxRestoreBytesPerSec, value.MaxRestoreBytesPerSec);
+		writer.WriteProperty(options, PropMaxSnapshotBytesPerSec, value.MaxSnapshotBytesPerSec);
+		writer.WriteProperty(options, PropReadOnly, value.ReadOnly);
 		writer.WriteEndObject();
 	}
 }
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/SnapshotLifecycleManagement/Statistics.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/SnapshotLifecycleManagement/Statistics.g.cs
index d55ab71cb05..59d3158a872 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/SnapshotLifecycleManagement/Statistics.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/SnapshotLifecycleManagement/Statistics.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,95 +28,130 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.SnapshotLifecycleManagement;
 
-internal sealed partial class StatisticsConverter : JsonConverter<Statistics>
+internal sealed partial class StatisticsConverter : System.Text.Json.Serialization.JsonConverter<Statistics>
 {
-	public override Statistics Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropPolicy = System.Text.Json.JsonEncodedText.Encode("policy");
+	private static readonly System.Text.Json.JsonEncodedText PropRetentionDeletionTime = System.Text.Json.JsonEncodedText.Encode("retention_deletion_time");
+	private static readonly System.Text.Json.JsonEncodedText PropRetentionDeletionTimeMillis = System.Text.Json.JsonEncodedText.Encode("retention_deletion_time_millis");
+	private static readonly System.Text.Json.JsonEncodedText PropRetentionFailed = System.Text.Json.JsonEncodedText.Encode("retention_failed");
+	private static readonly System.Text.Json.JsonEncodedText PropRetentionRuns = System.Text.Json.JsonEncodedText.Encode("retention_runs");
+	private static readonly System.Text.Json.JsonEncodedText PropRetentionTimedOut = System.Text.Json.JsonEncodedText.Encode("retention_timed_out");
+	private static readonly System.Text.Json.JsonEncodedText PropTotalSnapshotDeletionFailures = System.Text.Json.JsonEncodedText.Encode("total_snapshot_deletion_failures");
+	private static readonly System.Text.Json.JsonEncodedText PropTotalSnapshotDeletionFailures1 = System.Text.Json.JsonEncodedText.Encode("snapshot_deletion_failures");
+	private static readonly System.Text.Json.JsonEncodedText PropTotalSnapshotsDeleted = System.Text.Json.JsonEncodedText.Encode("total_snapshots_deleted");
+	private static readonly System.Text.Json.JsonEncodedText PropTotalSnapshotsDeleted1 = System.Text.Json.JsonEncodedText.Encode("snapshots_deleted");
+	private static readonly System.Text.Json.JsonEncodedText PropTotalSnapshotsFailed = System.Text.Json.JsonEncodedText.Encode("total_snapshots_failed");
+	private static readonly System.Text.Json.JsonEncodedText PropTotalSnapshotsFailed1 = System.Text.Json.JsonEncodedText.Encode("snapshots_failed");
+	private static readonly System.Text.Json.JsonEncodedText PropTotalSnapshotsTaken = System.Text.Json.JsonEncodedText.Encode("total_snapshots_taken");
+	private static readonly System.Text.Json.JsonEncodedText PropTotalSnapshotsTaken1 = System.Text.Json.JsonEncodedText.Encode("snapshots_taken");
+
+	public override Statistics Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		string? policy = default;
-		Elastic.Clients.Elasticsearch.Serverless.Duration? retentionDeletionTime = default;
-		long? retentionDeletionTimeMillis = default;
-		long? retentionFailed = default;
-		long? retentionRuns = default;
-		long? retentionTimedOut = default;
-		long? totalSnapshotDeletionFailures = default;
-		long? totalSnapshotsDeleted = default;
-		long? totalSnapshotsFailed = default;
-		long? totalSnapshotsTaken = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string?> propPolicy = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Duration?> propRetentionDeletionTime = default;
+		LocalJsonProperty<long?> propRetentionDeletionTimeMillis = default;
+		LocalJsonProperty<long?> propRetentionFailed = default;
+		LocalJsonProperty<long?> propRetentionRuns = default;
+		LocalJsonProperty<long?> propRetentionTimedOut = default;
+		LocalJsonProperty<long?> propTotalSnapshotDeletionFailures = default;
+		LocalJsonProperty<long?> propTotalSnapshotsDeleted = default;
+		LocalJsonProperty<long?> propTotalSnapshotsFailed = default;
+		LocalJsonProperty<long?> propTotalSnapshotsTaken = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propPolicy.TryRead(ref reader, options, PropPolicy))
 			{
-				var property = reader.GetString();
-				if (property == "policy")
-				{
-					policy = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "retention_deletion_time")
-				{
-					retentionDeletionTime = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Duration?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "retention_deletion_time_millis")
-				{
-					retentionDeletionTimeMillis = JsonSerializer.Deserialize<long?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "retention_failed")
-				{
-					retentionFailed = JsonSerializer.Deserialize<long?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "retention_runs")
-				{
-					retentionRuns = JsonSerializer.Deserialize<long?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "retention_timed_out")
-				{
-					retentionTimedOut = JsonSerializer.Deserialize<long?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "total_snapshot_deletion_failures" || property == "snapshot_deletion_failures")
-				{
-					totalSnapshotDeletionFailures = JsonSerializer.Deserialize<long?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "total_snapshots_deleted" || property == "snapshots_deleted")
-				{
-					totalSnapshotsDeleted = JsonSerializer.Deserialize<long?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "total_snapshots_failed" || property == "snapshots_failed")
-				{
-					totalSnapshotsFailed = JsonSerializer.Deserialize<long?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "total_snapshots_taken" || property == "snapshots_taken")
-				{
-					totalSnapshotsTaken = JsonSerializer.Deserialize<long?>(ref reader, options);
-					continue;
-				}
+				continue;
 			}
+
+			if (propRetentionDeletionTime.TryRead(ref reader, options, PropRetentionDeletionTime))
+			{
+				continue;
+			}
+
+			if (propRetentionDeletionTimeMillis.TryRead(ref reader, options, PropRetentionDeletionTimeMillis))
+			{
+				continue;
+			}
+
+			if (propRetentionFailed.TryRead(ref reader, options, PropRetentionFailed))
+			{
+				continue;
+			}
+
+			if (propRetentionRuns.TryRead(ref reader, options, PropRetentionRuns))
+			{
+				continue;
+			}
+
+			if (propRetentionTimedOut.TryRead(ref reader, options, PropRetentionTimedOut))
+			{
+				continue;
+			}
+
+			if (propTotalSnapshotDeletionFailures.TryRead(ref reader, options, PropTotalSnapshotDeletionFailures) || propTotalSnapshotDeletionFailures.TryRead(ref reader, options, PropTotalSnapshotDeletionFailures1))
+			{
+				continue;
+			}
+
+			if (propTotalSnapshotsDeleted.TryRead(ref reader, options, PropTotalSnapshotsDeleted) || propTotalSnapshotsDeleted.TryRead(ref reader, options, PropTotalSnapshotsDeleted1))
+			{
+				continue;
+			}
+
+			if (propTotalSnapshotsFailed.TryRead(ref reader, options, PropTotalSnapshotsFailed) || propTotalSnapshotsFailed.TryRead(ref reader, options, PropTotalSnapshotsFailed1))
+			{
+				continue;
+			}
+
+			if (propTotalSnapshotsTaken.TryRead(ref reader, options, PropTotalSnapshotsTaken) || propTotalSnapshotsTaken.TryRead(ref reader, options, PropTotalSnapshotsTaken1))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		return new Statistics { Policy = policy, RetentionDeletionTime = retentionDeletionTime, RetentionDeletionTimeMillis = retentionDeletionTimeMillis, RetentionFailed = retentionFailed, RetentionRuns = retentionRuns, RetentionTimedOut = retentionTimedOut, TotalSnapshotDeletionFailures = totalSnapshotDeletionFailures, TotalSnapshotsDeleted = totalSnapshotsDeleted, TotalSnapshotsFailed = totalSnapshotsFailed, TotalSnapshotsTaken = totalSnapshotsTaken };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new Statistics
+		{
+			Policy = propPolicy.Value
+,
+			RetentionDeletionTime = propRetentionDeletionTime.Value
+,
+			RetentionDeletionTimeMillis = propRetentionDeletionTimeMillis.Value
+,
+			RetentionFailed = propRetentionFailed.Value
+,
+			RetentionRuns = propRetentionRuns.Value
+,
+			RetentionTimedOut = propRetentionTimedOut.Value
+,
+			TotalSnapshotDeletionFailures = propTotalSnapshotDeletionFailures.Value
+,
+			TotalSnapshotsDeleted = propTotalSnapshotsDeleted.Value
+,
+			TotalSnapshotsFailed = propTotalSnapshotsFailed.Value
+,
+			TotalSnapshotsTaken = propTotalSnapshotsTaken.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, Statistics value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, Statistics value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'Statistics' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropPolicy, value.Policy);
+		writer.WriteProperty(options, PropRetentionDeletionTime, value.RetentionDeletionTime);
+		writer.WriteProperty(options, PropRetentionDeletionTimeMillis, value.RetentionDeletionTimeMillis);
+		writer.WriteProperty(options, PropRetentionFailed, value.RetentionFailed);
+		writer.WriteProperty(options, PropRetentionRuns, value.RetentionRuns);
+		writer.WriteProperty(options, PropRetentionTimedOut, value.RetentionTimedOut);
+		writer.WriteProperty(options, PropTotalSnapshotDeletionFailures, value.TotalSnapshotDeletionFailures);
+		writer.WriteProperty(options, PropTotalSnapshotsDeleted, value.TotalSnapshotsDeleted);
+		writer.WriteProperty(options, PropTotalSnapshotsFailed, value.TotalSnapshotsFailed);
+		writer.WriteProperty(options, PropTotalSnapshotsTaken, value.TotalSnapshotsTaken);
+		writer.WriteEndObject();
 	}
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/StandardRetriever.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/StandardRetriever.g.cs
index 82e67fa2a28..1798a59467f 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/StandardRetriever.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/StandardRetriever.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,100 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless;
 
+internal sealed partial class StandardRetrieverConverter : System.Text.Json.Serialization.JsonConverter<StandardRetriever>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCollapse = System.Text.Json.JsonEncodedText.Encode("collapse");
+	private static readonly System.Text.Json.JsonEncodedText PropFilter = System.Text.Json.JsonEncodedText.Encode("filter");
+	private static readonly System.Text.Json.JsonEncodedText PropMinScore = System.Text.Json.JsonEncodedText.Encode("min_score");
+	private static readonly System.Text.Json.JsonEncodedText PropQuery = System.Text.Json.JsonEncodedText.Encode("query");
+	private static readonly System.Text.Json.JsonEncodedText PropSearchAfter = System.Text.Json.JsonEncodedText.Encode("search_after");
+	private static readonly System.Text.Json.JsonEncodedText PropSort = System.Text.Json.JsonEncodedText.Encode("sort");
+	private static readonly System.Text.Json.JsonEncodedText PropTerminateAfter = System.Text.Json.JsonEncodedText.Encode("terminate_after");
+
+	public override StandardRetriever Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Core.Search.FieldCollapse?> propCollapse = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query>?> propFilter = default;
+		LocalJsonProperty<float?> propMinScore = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query?> propQuery = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.FieldValue>?> propSearchAfter = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.SortOptions>?> propSort = default;
+		LocalJsonProperty<int?> propTerminateAfter = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCollapse.TryRead(ref reader, options, PropCollapse))
+			{
+				continue;
+			}
+
+			if (propFilter.TryRead(ref reader, options, PropFilter, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query>?, Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query>)))
+			{
+				continue;
+			}
+
+			if (propMinScore.TryRead(ref reader, options, PropMinScore))
+			{
+				continue;
+			}
+
+			if (propQuery.TryRead(ref reader, options, PropQuery))
+			{
+				continue;
+			}
+
+			if (propSearchAfter.TryRead(ref reader, options, PropSearchAfter))
+			{
+				continue;
+			}
+
+			if (propSort.TryRead(ref reader, options, PropSort, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.SortOptions>?, Elastic.Clients.Elasticsearch.Serverless.SortOptions>)))
+			{
+				continue;
+			}
+
+			if (propTerminateAfter.TryRead(ref reader, options, PropTerminateAfter))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new StandardRetriever
+		{
+			Collapse = propCollapse.Value
+,
+			Filter = propFilter.Value
+,
+			MinScore = propMinScore.Value
+,
+			Query = propQuery.Value
+,
+			SearchAfter = propSearchAfter.Value
+,
+			Sort = propSort.Value
+,
+			TerminateAfter = propTerminateAfter.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, StandardRetriever value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCollapse, value.Collapse);
+		writer.WriteProperty(options, PropFilter, value.Filter, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query>?, Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query>));
+		writer.WriteProperty(options, PropMinScore, value.MinScore);
+		writer.WriteProperty(options, PropQuery, value.Query);
+		writer.WriteProperty(options, PropSearchAfter, value.SearchAfter);
+		writer.WriteProperty(options, PropSort, value.Sort, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.SortOptions>?, Elastic.Clients.Elasticsearch.Serverless.SortOptions>));
+		writer.WriteProperty(options, PropTerminateAfter, value.TerminateAfter);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(StandardRetrieverConverter))]
 public sealed partial class StandardRetriever
 {
 	/// <summary>
@@ -34,7 +129,6 @@ public sealed partial class StandardRetriever
 	/// Collapses the top documents by a specified key into a single top document per key.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("collapse")]
 	public Elastic.Clients.Elasticsearch.Serverless.Core.Search.FieldCollapse? Collapse { get; set; }
 
 	/// <summary>
@@ -42,8 +136,6 @@ public sealed partial class StandardRetriever
 	/// Query to filter the documents that can match.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("filter")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query))]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query>? Filter { get; set; }
 
 	/// <summary>
@@ -51,7 +143,6 @@ public sealed partial class StandardRetriever
 	/// Minimum _score for matching documents. Documents with a lower _score are not included in the top documents.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("min_score")]
 	public float? MinScore { get; set; }
 
 	/// <summary>
@@ -59,7 +150,6 @@ public sealed partial class StandardRetriever
 	/// Defines a query to retrieve a set of top documents.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("query")]
 	public Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query? Query { get; set; }
 
 	/// <summary>
@@ -67,7 +157,6 @@ public sealed partial class StandardRetriever
 	/// Defines a search after object parameter used for pagination.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("search_after")]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.FieldValue>? SearchAfter { get; set; }
 
 	/// <summary>
@@ -75,8 +164,6 @@ public sealed partial class StandardRetriever
 	/// A sort object that that specifies the order of matching documents.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("sort")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.Serverless.SortOptions))]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.SortOptions>? Sort { get; set; }
 
 	/// <summary>
@@ -84,7 +171,6 @@ public sealed partial class StandardRetriever
 	/// Maximum number of documents to collect for each shard.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("terminate_after")]
 	public int? TerminateAfter { get; set; }
 
 	public static implicit operator Elastic.Clients.Elasticsearch.Serverless.Retriever(StandardRetriever standardRetriever) => Elastic.Clients.Elasticsearch.Serverless.Retriever.Standard(standardRetriever);
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/TextSimilarityReranker.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/TextSimilarityReranker.g.cs
index c3ac989c0e2..a4f10b86d65 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/TextSimilarityReranker.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/TextSimilarityReranker.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,100 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless;
 
+internal sealed partial class TextSimilarityRerankerConverter : System.Text.Json.Serialization.JsonConverter<TextSimilarityReranker>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropFilter = System.Text.Json.JsonEncodedText.Encode("filter");
+	private static readonly System.Text.Json.JsonEncodedText PropInferenceId = System.Text.Json.JsonEncodedText.Encode("inference_id");
+	private static readonly System.Text.Json.JsonEncodedText PropInferenceText = System.Text.Json.JsonEncodedText.Encode("inference_text");
+	private static readonly System.Text.Json.JsonEncodedText PropMinScore = System.Text.Json.JsonEncodedText.Encode("min_score");
+	private static readonly System.Text.Json.JsonEncodedText PropRankWindowSize = System.Text.Json.JsonEncodedText.Encode("rank_window_size");
+	private static readonly System.Text.Json.JsonEncodedText PropRetriever = System.Text.Json.JsonEncodedText.Encode("retriever");
+
+	public override TextSimilarityReranker Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string?> propField = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query>?> propFilter = default;
+		LocalJsonProperty<string?> propInferenceId = default;
+		LocalJsonProperty<string?> propInferenceText = default;
+		LocalJsonProperty<float?> propMinScore = default;
+		LocalJsonProperty<int?> propRankWindowSize = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Retriever> propRetriever = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propField.TryRead(ref reader, options, PropField))
+			{
+				continue;
+			}
+
+			if (propFilter.TryRead(ref reader, options, PropFilter, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query>?, Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query>)))
+			{
+				continue;
+			}
+
+			if (propInferenceId.TryRead(ref reader, options, PropInferenceId))
+			{
+				continue;
+			}
+
+			if (propInferenceText.TryRead(ref reader, options, PropInferenceText))
+			{
+				continue;
+			}
+
+			if (propMinScore.TryRead(ref reader, options, PropMinScore))
+			{
+				continue;
+			}
+
+			if (propRankWindowSize.TryRead(ref reader, options, PropRankWindowSize))
+			{
+				continue;
+			}
+
+			if (propRetriever.TryRead(ref reader, options, PropRetriever))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new TextSimilarityReranker
+		{
+			Field = propField.Value
+,
+			Filter = propFilter.Value
+,
+			InferenceId = propInferenceId.Value
+,
+			InferenceText = propInferenceText.Value
+,
+			MinScore = propMinScore.Value
+,
+			RankWindowSize = propRankWindowSize.Value
+,
+			Retriever = propRetriever.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, TextSimilarityReranker value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropField, value.Field);
+		writer.WriteProperty(options, PropFilter, value.Filter, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query>?, Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query>));
+		writer.WriteProperty(options, PropInferenceId, value.InferenceId);
+		writer.WriteProperty(options, PropInferenceText, value.InferenceText);
+		writer.WriteProperty(options, PropMinScore, value.MinScore);
+		writer.WriteProperty(options, PropRankWindowSize, value.RankWindowSize);
+		writer.WriteProperty(options, PropRetriever, value.Retriever);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(TextSimilarityRerankerConverter))]
 public sealed partial class TextSimilarityReranker
 {
 	/// <summary>
@@ -34,7 +129,6 @@ public sealed partial class TextSimilarityReranker
 	/// The document field to be used for text similarity comparisons. This field should contain the text that will be evaluated against the inference_text
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("field")]
 	public string? Field { get; set; }
 
 	/// <summary>
@@ -42,8 +136,6 @@ public sealed partial class TextSimilarityReranker
 	/// Query to filter the documents that can match.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("filter")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query))]
 	public ICollection<Elastic.Clients.Elasticsearch.Serverless.QueryDsl.Query>? Filter { get; set; }
 
 	/// <summary>
@@ -51,7 +143,6 @@ public sealed partial class TextSimilarityReranker
 	/// Unique identifier of the inference endpoint created using the inference API.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("inference_id")]
 	public string? InferenceId { get; set; }
 
 	/// <summary>
@@ -59,7 +150,6 @@ public sealed partial class TextSimilarityReranker
 	/// The text snippet used as the basis for similarity comparison
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("inference_text")]
 	public string? InferenceText { get; set; }
 
 	/// <summary>
@@ -67,7 +157,6 @@ public sealed partial class TextSimilarityReranker
 	/// Minimum _score for matching documents. Documents with a lower _score are not included in the top documents.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("min_score")]
 	public float? MinScore { get; set; }
 
 	/// <summary>
@@ -75,7 +164,6 @@ public sealed partial class TextSimilarityReranker
 	/// This value determines how many documents we will consider from the nested retriever.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("rank_window_size")]
 	public int? RankWindowSize { get; set; }
 
 	/// <summary>
@@ -83,7 +171,6 @@ public sealed partial class TextSimilarityReranker
 	/// The nested retriever which will produce the first-level results, that will later be used for reranking.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("retriever")]
 	public Elastic.Clients.Elasticsearch.Serverless.Retriever Retriever { get; set; }
 
 	public static implicit operator Elastic.Clients.Elasticsearch.Serverless.Retriever(TextSimilarityReranker textSimilarityReranker) => Elastic.Clients.Elasticsearch.Serverless.Retriever.TextSimilarityReranker(textSimilarityReranker);
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/TransformManagement/Latest.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/TransformManagement/Latest.g.cs
index 246e68681c4..8b5d61bbef6 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/TransformManagement/Latest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/TransformManagement/Latest.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,50 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.TransformManagement;
 
+internal sealed partial class LatestConverter : System.Text.Json.Serialization.JsonConverter<Latest>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropSort = System.Text.Json.JsonEncodedText.Encode("sort");
+	private static readonly System.Text.Json.JsonEncodedText PropUniqueKey = System.Text.Json.JsonEncodedText.Encode("unique_key");
+
+	public override Latest Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Field> propSort = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Serverless.Fields> propUniqueKey = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propSort.TryRead(ref reader, options, PropSort))
+			{
+				continue;
+			}
+
+			if (propUniqueKey.TryRead(ref reader, options, PropUniqueKey, typeof(FieldsMarker)))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new Latest
+		{
+			Sort = propSort.Value
+,
+			UniqueKey = propUniqueKey.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, Latest value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropSort, value.Sort);
+		writer.WriteProperty(options, PropUniqueKey, value.UniqueKey, typeof(FieldsMarker));
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(LatestConverter))]
 public sealed partial class Latest
 {
 	/// <summary>
@@ -34,7 +79,6 @@ public sealed partial class Latest
 	/// Specifies the date field that is used to identify the latest documents.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("sort")]
 	public Elastic.Clients.Elasticsearch.Serverless.Field Sort { get; set; }
 
 	/// <summary>
@@ -42,8 +86,6 @@ public sealed partial class Latest
 	/// Specifies an array of one or more fields that are used to group the data.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("unique_key")]
-	[JsonConverter(typeof(FieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Serverless.Fields UniqueKey { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/TransformManagement/Pivot.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/TransformManagement/Pivot.g.cs
index b688a16548d..ff24980f972 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/TransformManagement/Pivot.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/TransformManagement/Pivot.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,50 +28,46 @@
 
 namespace Elastic.Clients.Elasticsearch.Serverless.TransformManagement;
 
-internal sealed partial class PivotConverter : JsonConverter<Pivot>
+internal sealed partial class PivotConverter : System.Text.Json.Serialization.JsonConverter<Pivot>
 {
-	public override Pivot Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations1 = System.Text.Json.JsonEncodedText.Encode("aggs");
+	private static readonly System.Text.Json.JsonEncodedText PropGroupBy = System.Text.Json.JsonEncodedText.Encode("group_by");
+
+	public override Pivot Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		var variant = new Pivot();
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.Aggregation>?> propAggregations = default;
+		LocalJsonProperty<IDictionary<string, Elastic.Clients.Elasticsearch.Serverless.TransformManagement.PivotGroupBy>?> propGroupBy = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propAggregations.TryRead(ref reader, options, PropAggregations) || propAggregations.TryRead(ref reader, options, PropAggregations1))
 			{
-				var property = reader.GetString();
-				if (property == "aggregations" || property == "aggs")
-				{
-					variant.Aggregations = JsonSerializer.Deserialize<IDictionary<string, Elastic.Clients.Elasticsearch.Serverless.Aggregations.Aggregation>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "group_by")
-				{
-					variant.GroupBy = JsonSerializer.Deserialize<IDictionary<string, Elastic.Clients.Elasticsearch.Serverless.TransformManagement.PivotGroupBy>?>(ref reader, options);
-					continue;
-				}
+				continue;
 			}
-		}
 
-		return variant;
-	}
+			if (propGroupBy.TryRead(ref reader, options, PropGroupBy))
+			{
+				continue;
+			}
 
-	public override void Write(Utf8JsonWriter writer, Pivot value, JsonSerializerOptions options)
-	{
-		writer.WriteStartObject();
-		if (value.Aggregations is not null)
-		{
-			writer.WritePropertyName("aggregations");
-			JsonSerializer.Serialize(writer, value.Aggregations, options);
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		if (value.GroupBy is not null)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new Pivot
 		{
-			writer.WritePropertyName("group_by");
-			JsonSerializer.Serialize(writer, value.GroupBy, options);
-		}
+			Aggregations = propAggregations.Value
+,
+			GroupBy = propGroupBy.Value
+		};
+	}
 
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, Pivot value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAggregations, value.Aggregations);
+		writer.WriteProperty(options, PropGroupBy, value.GroupBy);
 		writer.WriteEndObject();
 	}
 }
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/TransformManagement/PivotGroupBy.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/TransformManagement/PivotGroupBy.g.cs
index 18ae3954bf8..d352f3d63ba 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/TransformManagement/PivotGroupBy.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/TransformManagement/PivotGroupBy.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -39,12 +40,16 @@ internal PivotGroupBy(string variantName, object variant)
 			throw new ArgumentNullException(nameof(variant));
 		if (string.IsNullOrWhiteSpace(variantName))
 			throw new ArgumentException("Variant name must not be empty or whitespace.");
-		VariantName = variantName;
+		VariantType = variantName;
 		Variant = variant;
 	}
 
-	internal object Variant { get; }
-	internal string VariantName { get; }
+	internal PivotGroupBy()
+	{
+	}
+
+	public object Variant { get; internal set; }
+	public string VariantType { get; internal set; }
 
 	public static PivotGroupBy DateHistogram(Elastic.Clients.Elasticsearch.Serverless.Aggregations.DateHistogramAggregation dateHistogramAggregation) => new PivotGroupBy("date_histogram", dateHistogramAggregation);
 	public static PivotGroupBy GeotileGrid(Elastic.Clients.Elasticsearch.Serverless.Aggregations.GeotileGridAggregation geotileGridAggregation) => new PivotGroupBy("geotile_grid", geotileGridAggregation);
@@ -64,87 +69,80 @@ public bool TryGet<T>([NotNullWhen(true)] out T? result) where T : class
 	}
 }
 
-internal sealed partial class PivotGroupByConverter : JsonConverter<PivotGroupBy>
+internal sealed partial class PivotGroupByConverter : System.Text.Json.Serialization.JsonConverter<PivotGroupBy>
 {
-	public override PivotGroupBy Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-		{
-			throw new JsonException("Expected start token.");
-		}
+	private static readonly System.Text.Json.JsonEncodedText VariantDateHistogram = System.Text.Json.JsonEncodedText.Encode("date_histogram");
+	private static readonly System.Text.Json.JsonEncodedText VariantGeotileGrid = System.Text.Json.JsonEncodedText.Encode("geotile_grid");
+	private static readonly System.Text.Json.JsonEncodedText VariantHistogram = System.Text.Json.JsonEncodedText.Encode("histogram");
+	private static readonly System.Text.Json.JsonEncodedText VariantTerms = System.Text.Json.JsonEncodedText.Encode("terms");
 
-		object? variantValue = default;
-		string? variantNameValue = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+	public override PivotGroupBy Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		var variantType = string.Empty;
+		object? variant = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
+			if (reader.ValueTextEquals(VariantDateHistogram))
 			{
-				throw new JsonException("Expected a property name token.");
-			}
-
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token representing the name of an Elasticsearch field.");
-			}
-
-			var propertyName = reader.GetString();
-			reader.Read();
-			if (propertyName == "date_histogram")
-			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.DateHistogramAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantDateHistogram.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.DateHistogramAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "geotile_grid")
+			if (reader.ValueTextEquals(VariantGeotileGrid))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.GeotileGridAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantGeotileGrid.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.GeotileGridAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "histogram")
+			if (reader.ValueTextEquals(VariantHistogram))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.HistogramAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantHistogram.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.HistogramAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "terms")
+			if (reader.ValueTextEquals(VariantTerms))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.TermsAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantTerms.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.Aggregations.TermsAggregation?>(options);
 				continue;
 			}
 
-			throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'PivotGroupBy' from the response.");
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		var result = new PivotGroupBy(variantNameValue, variantValue);
-		return result;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PivotGroupBy { VariantType = variantType, Variant = variant };
 	}
 
-	public override void Write(Utf8JsonWriter writer, PivotGroupBy value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PivotGroupBy value, System.Text.Json.JsonSerializerOptions options)
 	{
 		writer.WriteStartObject();
-		if (value.VariantName is not null && value.Variant is not null)
+		switch (value.VariantType)
 		{
-			writer.WritePropertyName(value.VariantName);
-			switch (value.VariantName)
-			{
-				case "date_histogram":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.DateHistogramAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.DateHistogramAggregation)value.Variant, options);
-					break;
-				case "geotile_grid":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.GeotileGridAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.GeotileGridAggregation)value.Variant, options);
-					break;
-				case "histogram":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.HistogramAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.HistogramAggregation)value.Variant, options);
-					break;
-				case "terms":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.Aggregations.TermsAggregation>(writer, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.TermsAggregation)value.Variant, options);
-					break;
-			}
+			case "":
+				break;
+			case "date_histogram":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.DateHistogramAggregation?)value.Variant);
+				break;
+			case "geotile_grid":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.GeotileGridAggregation?)value.Variant);
+				break;
+			case "histogram":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.HistogramAggregation?)value.Variant);
+				break;
+			case "terms":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.Aggregations.TermsAggregation?)value.Variant);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.VariantType}' is not supported for type '{nameof(PivotGroupBy)}'.");
 		}
 
 		writer.WriteEndObject();
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/TransformManagement/RetentionPolicy.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/TransformManagement/RetentionPolicy.g.cs
index 9839e946239..66d92ec997c 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/TransformManagement/RetentionPolicy.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/TransformManagement/RetentionPolicy.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -39,12 +40,16 @@ internal RetentionPolicy(string variantName, object variant)
 			throw new ArgumentNullException(nameof(variant));
 		if (string.IsNullOrWhiteSpace(variantName))
 			throw new ArgumentException("Variant name must not be empty or whitespace.");
-		VariantName = variantName;
+		VariantType = variantName;
 		Variant = variant;
 	}
 
-	internal object Variant { get; }
-	internal string VariantName { get; }
+	internal RetentionPolicy()
+	{
+	}
+
+	public object Variant { get; internal set; }
+	public string VariantType { get; internal set; }
 
 	public static RetentionPolicy Time(Elastic.Clients.Elasticsearch.Serverless.TransformManagement.TimeRetentionPolicy retentionPolicy) => new RetentionPolicy("time", retentionPolicy);
 
@@ -61,57 +66,44 @@ public bool TryGet<T>([NotNullWhen(true)] out T? result) where T : class
 	}
 }
 
-internal sealed partial class RetentionPolicyConverter : JsonConverter<RetentionPolicy>
+internal sealed partial class RetentionPolicyConverter : System.Text.Json.Serialization.JsonConverter<RetentionPolicy>
 {
-	public override RetentionPolicy Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-		{
-			throw new JsonException("Expected start token.");
-		}
+	private static readonly System.Text.Json.JsonEncodedText VariantTime = System.Text.Json.JsonEncodedText.Encode("time");
 
-		object? variantValue = default;
-		string? variantNameValue = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+	public override RetentionPolicy Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		var variantType = string.Empty;
+		object? variant = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
+			if (reader.ValueTextEquals(VariantTime))
 			{
-				throw new JsonException("Expected a property name token.");
-			}
-
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token representing the name of an Elasticsearch field.");
-			}
-
-			var propertyName = reader.GetString();
-			reader.Read();
-			if (propertyName == "time")
-			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.TransformManagement.TimeRetentionPolicy?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantTime.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.TransformManagement.TimeRetentionPolicy?>(options);
 				continue;
 			}
 
-			throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'RetentionPolicy' from the response.");
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		var result = new RetentionPolicy(variantNameValue, variantValue);
-		return result;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new RetentionPolicy { VariantType = variantType, Variant = variant };
 	}
 
-	public override void Write(Utf8JsonWriter writer, RetentionPolicy value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, RetentionPolicy value, System.Text.Json.JsonSerializerOptions options)
 	{
 		writer.WriteStartObject();
-		if (value.VariantName is not null && value.Variant is not null)
+		switch (value.VariantType)
 		{
-			writer.WritePropertyName(value.VariantName);
-			switch (value.VariantName)
-			{
-				case "time":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.TransformManagement.TimeRetentionPolicy>(writer, (Elastic.Clients.Elasticsearch.Serverless.TransformManagement.TimeRetentionPolicy)value.Variant, options);
-					break;
-			}
+			case "":
+				break;
+			case "time":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.TransformManagement.TimeRetentionPolicy?)value.Variant);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.VariantType}' is not supported for type '{nameof(RetentionPolicy)}'.");
 		}
 
 		writer.WriteEndObject();
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/TransformManagement/Sync.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/TransformManagement/Sync.g.cs
index c55ee411781..95c17aec1ee 100644
--- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/TransformManagement/Sync.g.cs
+++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/TransformManagement/Sync.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Serverless.Fluent;
+using Elastic.Clients.Elasticsearch.Serverless.Next;
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 using System;
 using System.Collections.Generic;
@@ -39,12 +40,16 @@ internal Sync(string variantName, object variant)
 			throw new ArgumentNullException(nameof(variant));
 		if (string.IsNullOrWhiteSpace(variantName))
 			throw new ArgumentException("Variant name must not be empty or whitespace.");
-		VariantName = variantName;
+		VariantType = variantName;
 		Variant = variant;
 	}
 
-	internal object Variant { get; }
-	internal string VariantName { get; }
+	internal Sync()
+	{
+	}
+
+	public object Variant { get; internal set; }
+	public string VariantType { get; internal set; }
 
 	public static Sync Time(Elastic.Clients.Elasticsearch.Serverless.TransformManagement.TimeSync timeSync) => new Sync("time", timeSync);
 
@@ -61,57 +66,44 @@ public bool TryGet<T>([NotNullWhen(true)] out T? result) where T : class
 	}
 }
 
-internal sealed partial class SyncConverter : JsonConverter<Sync>
+internal sealed partial class SyncConverter : System.Text.Json.Serialization.JsonConverter<Sync>
 {
-	public override Sync Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-		{
-			throw new JsonException("Expected start token.");
-		}
+	private static readonly System.Text.Json.JsonEncodedText VariantTime = System.Text.Json.JsonEncodedText.Encode("time");
 
-		object? variantValue = default;
-		string? variantNameValue = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+	public override Sync Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		var variantType = string.Empty;
+		object? variant = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
+			if (reader.ValueTextEquals(VariantTime))
 			{
-				throw new JsonException("Expected a property name token.");
-			}
-
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token representing the name of an Elasticsearch field.");
-			}
-
-			var propertyName = reader.GetString();
-			reader.Read();
-			if (propertyName == "time")
-			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.TransformManagement.TimeSync?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantTime.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Serverless.TransformManagement.TimeSync?>(options);
 				continue;
 			}
 
-			throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'Sync' from the response.");
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		var result = new Sync(variantNameValue, variantValue);
-		return result;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new Sync { VariantType = variantType, Variant = variant };
 	}
 
-	public override void Write(Utf8JsonWriter writer, Sync value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, Sync value, System.Text.Json.JsonSerializerOptions options)
 	{
 		writer.WriteStartObject();
-		if (value.VariantName is not null && value.Variant is not null)
+		switch (value.VariantType)
 		{
-			writer.WritePropertyName(value.VariantName);
-			switch (value.VariantName)
-			{
-				case "time":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Serverless.TransformManagement.TimeSync>(writer, (Elastic.Clients.Elasticsearch.Serverless.TransformManagement.TimeSync)value.Variant, options);
-					break;
-			}
+			case "":
+				break;
+			case "time":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Serverless.TransformManagement.TimeSync?)value.Variant);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.VariantType}' is not supported for type '{nameof(Sync)}'.");
 		}
 
 		writer.WriteEndObject();
diff --git a/src/Elastic.Clients.Elasticsearch/Elastic.Clients.Elasticsearch.csproj b/src/Elastic.Clients.Elasticsearch/Elastic.Clients.Elasticsearch.csproj
index 782d0808216..85630308377 100644
--- a/src/Elastic.Clients.Elasticsearch/Elastic.Clients.Elasticsearch.csproj
+++ b/src/Elastic.Clients.Elasticsearch/Elastic.Clients.Elasticsearch.csproj
@@ -19,9 +19,14 @@
     <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Nullable>annotations</Nullable>
+    <PolySharpIncludeRuntimeSupportedAttributes>true</PolySharpIncludeRuntimeSupportedAttributes>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Elastic.Transport" Version="0.5.7" />
+    <PackageReference Include="PolySharp" Version="1.15.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
   <ItemGroup>
     <InternalsVisibleTo Include="Tests" Key="$(ExposedPublicKey)" />
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 126481dc53a..6322c26864c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/AsyncSearchStatusResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/AsyncSearchStatusResponse.g.cs
@@ -18,14 +18,161 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.AsyncSearch;
 
+internal sealed partial class AsyncSearchStatusResponseConverter : System.Text.Json.Serialization.JsonConverter<AsyncSearchStatusResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropClusters = System.Text.Json.JsonEncodedText.Encode("_clusters");
+	private static readonly System.Text.Json.JsonEncodedText PropCompletionStatus = System.Text.Json.JsonEncodedText.Encode("completion_status");
+	private static readonly System.Text.Json.JsonEncodedText PropCompletionTime = System.Text.Json.JsonEncodedText.Encode("completion_time");
+	private static readonly System.Text.Json.JsonEncodedText PropCompletionTimeInMillis = System.Text.Json.JsonEncodedText.Encode("completion_time_in_millis");
+	private static readonly System.Text.Json.JsonEncodedText PropExpirationTime = System.Text.Json.JsonEncodedText.Encode("expiration_time");
+	private static readonly System.Text.Json.JsonEncodedText PropExpirationTimeInMillis = System.Text.Json.JsonEncodedText.Encode("expiration_time_in_millis");
+	private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("id");
+	private static readonly System.Text.Json.JsonEncodedText PropIsPartial = System.Text.Json.JsonEncodedText.Encode("is_partial");
+	private static readonly System.Text.Json.JsonEncodedText PropIsRunning = System.Text.Json.JsonEncodedText.Encode("is_running");
+	private static readonly System.Text.Json.JsonEncodedText PropShards = System.Text.Json.JsonEncodedText.Encode("_shards");
+	private static readonly System.Text.Json.JsonEncodedText PropStartTime = System.Text.Json.JsonEncodedText.Encode("start_time");
+	private static readonly System.Text.Json.JsonEncodedText PropStartTimeInMillis = System.Text.Json.JsonEncodedText.Encode("start_time_in_millis");
+
+	public override AsyncSearchStatusResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.ClusterStatistics?> propClusters = default;
+		LocalJsonProperty<int?> propCompletionStatus = default;
+		LocalJsonProperty<DateTimeOffset?> propCompletionTime = default;
+		LocalJsonProperty<long?> propCompletionTimeInMillis = default;
+		LocalJsonProperty<DateTimeOffset?> propExpirationTime = default;
+		LocalJsonProperty<long> propExpirationTimeInMillis = default;
+		LocalJsonProperty<string?> propId = default;
+		LocalJsonProperty<bool> propIsPartial = default;
+		LocalJsonProperty<bool> propIsRunning = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.ShardStatistics> propShards = default;
+		LocalJsonProperty<DateTimeOffset?> propStartTime = default;
+		LocalJsonProperty<long> propStartTimeInMillis = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propClusters.TryRead(ref reader, options, PropClusters))
+			{
+				continue;
+			}
+
+			if (propCompletionStatus.TryRead(ref reader, options, PropCompletionStatus))
+			{
+				continue;
+			}
+
+			if (propCompletionTime.TryRead(ref reader, options, PropCompletionTime))
+			{
+				continue;
+			}
+
+			if (propCompletionTimeInMillis.TryRead(ref reader, options, PropCompletionTimeInMillis))
+			{
+				continue;
+			}
+
+			if (propExpirationTime.TryRead(ref reader, options, PropExpirationTime))
+			{
+				continue;
+			}
+
+			if (propExpirationTimeInMillis.TryRead(ref reader, options, PropExpirationTimeInMillis))
+			{
+				continue;
+			}
+
+			if (propId.TryRead(ref reader, options, PropId))
+			{
+				continue;
+			}
+
+			if (propIsPartial.TryRead(ref reader, options, PropIsPartial))
+			{
+				continue;
+			}
+
+			if (propIsRunning.TryRead(ref reader, options, PropIsRunning))
+			{
+				continue;
+			}
+
+			if (propShards.TryRead(ref reader, options, PropShards))
+			{
+				continue;
+			}
+
+			if (propStartTime.TryRead(ref reader, options, PropStartTime))
+			{
+				continue;
+			}
+
+			if (propStartTimeInMillis.TryRead(ref reader, options, PropStartTimeInMillis))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new AsyncSearchStatusResponse
+		{
+			Clusters = propClusters.Value
+,
+			CompletionStatus = propCompletionStatus.Value
+,
+			CompletionTime = propCompletionTime.Value
+,
+			CompletionTimeInMillis = propCompletionTimeInMillis.Value
+,
+			ExpirationTime = propExpirationTime.Value
+,
+			ExpirationTimeInMillis = propExpirationTimeInMillis.Value
+,
+			Id = propId.Value
+,
+			IsPartial = propIsPartial.Value
+,
+			IsRunning = propIsRunning.Value
+,
+			Shards = propShards.Value
+,
+			StartTime = propStartTime.Value
+,
+			StartTimeInMillis = propStartTimeInMillis.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, AsyncSearchStatusResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropClusters, value.Clusters);
+		writer.WriteProperty(options, PropCompletionStatus, value.CompletionStatus);
+		writer.WriteProperty(options, PropCompletionTime, value.CompletionTime);
+		writer.WriteProperty(options, PropCompletionTimeInMillis, value.CompletionTimeInMillis);
+		writer.WriteProperty(options, PropExpirationTime, value.ExpirationTime);
+		writer.WriteProperty(options, PropExpirationTimeInMillis, value.ExpirationTimeInMillis);
+		writer.WriteProperty(options, PropId, value.Id);
+		writer.WriteProperty(options, PropIsPartial, value.IsPartial);
+		writer.WriteProperty(options, PropIsRunning, value.IsRunning);
+		writer.WriteProperty(options, PropShards, value.Shards);
+		writer.WriteProperty(options, PropStartTime, value.StartTime);
+		writer.WriteProperty(options, PropStartTimeInMillis, value.StartTimeInMillis);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(AsyncSearchStatusResponseConverter))]
 public sealed partial class AsyncSearchStatusResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -34,7 +181,6 @@ public sealed partial class AsyncSearchStatusResponse : ElasticsearchResponse
 	/// Not shown for local-only searches.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("_clusters")]
 	public Elastic.Clients.Elasticsearch.ClusterStatistics? Clusters { get; init; }
 
 	/// <summary>
@@ -44,7 +190,6 @@ public sealed partial class AsyncSearchStatusResponse : ElasticsearchResponse
 	/// 503 indicates that the async search was completed with an error.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("completion_status")]
 	public int? CompletionStatus { get; init; }
 
 	/// <summary>
@@ -53,9 +198,7 @@ public sealed partial class AsyncSearchStatusResponse : ElasticsearchResponse
 	/// when the search has completed.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("completion_time")]
 	public DateTimeOffset? CompletionTime { get; init; }
-	[JsonInclude, JsonPropertyName("completion_time_in_millis")]
 	public long? CompletionTimeInMillis { get; init; }
 
 	/// <summary>
@@ -63,11 +206,8 @@ public sealed partial class AsyncSearchStatusResponse : ElasticsearchResponse
 	/// Indicates when the async search will expire.
 	/// </para>
 	/// </summary>
-	[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; }
 
 	/// <summary>
@@ -76,7 +216,6 @@ public sealed partial class AsyncSearchStatusResponse : ElasticsearchResponse
 	/// While the query is running, <c>is_partial</c> is always set to <c>true</c>.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("is_partial")]
 	public bool IsPartial { get; init; }
 
 	/// <summary>
@@ -85,7 +224,6 @@ public sealed partial class AsyncSearchStatusResponse : ElasticsearchResponse
 	/// NOTE: If the search failed after some shards returned their results or the node that is coordinating the async search dies, results may be partial even though <c>is_running</c> is <c>false</c>.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("is_running")]
 	public bool IsRunning { get; init; }
 
 	/// <summary>
@@ -93,10 +231,7 @@ public sealed partial class AsyncSearchStatusResponse : ElasticsearchResponse
 	/// Indicates how many shards have run the query so far.
 	/// </para>
 	/// </summary>
-	[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/DeleteAsyncSearchResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/DeleteAsyncSearchResponse.g.cs
index ea208db9469..89e3520aaf5 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/DeleteAsyncSearchResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/DeleteAsyncSearchResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.AsyncSearch;
 
+internal sealed partial class DeleteAsyncSearchResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteAsyncSearchResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override DeleteAsyncSearchResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteAsyncSearchResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteAsyncSearchResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteAsyncSearchResponseConverter))]
 public sealed partial class DeleteAsyncSearchResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class DeleteAsyncSearchResponse : ElasticsearchResponse
 	/// 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/GetAsyncSearchResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/GetAsyncSearchResponse.g.cs
index 3dd949e280f..1fea174d7cd 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/GetAsyncSearchResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/GetAsyncSearchResponse.g.cs
@@ -18,14 +18,158 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.AsyncSearch;
 
+internal sealed partial class GetAsyncSearchResponseConverter<TDocument> : System.Text.Json.Serialization.JsonConverter<GetAsyncSearchResponse<TDocument>>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCompletionTime = System.Text.Json.JsonEncodedText.Encode("completion_time");
+	private static readonly System.Text.Json.JsonEncodedText PropCompletionTimeInMillis = System.Text.Json.JsonEncodedText.Encode("completion_time_in_millis");
+	private static readonly System.Text.Json.JsonEncodedText PropExpirationTime = System.Text.Json.JsonEncodedText.Encode("expiration_time");
+	private static readonly System.Text.Json.JsonEncodedText PropExpirationTimeInMillis = System.Text.Json.JsonEncodedText.Encode("expiration_time_in_millis");
+	private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("id");
+	private static readonly System.Text.Json.JsonEncodedText PropIsPartial = System.Text.Json.JsonEncodedText.Encode("is_partial");
+	private static readonly System.Text.Json.JsonEncodedText PropIsRunning = System.Text.Json.JsonEncodedText.Encode("is_running");
+	private static readonly System.Text.Json.JsonEncodedText PropResponse = System.Text.Json.JsonEncodedText.Encode("response");
+	private static readonly System.Text.Json.JsonEncodedText PropStartTime = System.Text.Json.JsonEncodedText.Encode("start_time");
+	private static readonly System.Text.Json.JsonEncodedText PropStartTimeInMillis = System.Text.Json.JsonEncodedText.Encode("start_time_in_millis");
+
+	public override GetAsyncSearchResponse<TDocument> Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<DateTimeOffset?> propCompletionTime = default;
+		LocalJsonProperty<long?> propCompletionTimeInMillis = default;
+		LocalJsonProperty<DateTimeOffset?> propExpirationTime = default;
+		LocalJsonProperty<long> propExpirationTimeInMillis = default;
+		LocalJsonProperty<string?> propId = default;
+		LocalJsonProperty<bool> propIsPartial = default;
+		LocalJsonProperty<bool> propIsRunning = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.AsyncSearch.AsyncSearch<TDocument>> propResponse = default;
+		LocalJsonProperty<DateTimeOffset?> propStartTime = default;
+		LocalJsonProperty<long> propStartTimeInMillis = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCompletionTime.TryRead(ref reader, options, PropCompletionTime))
+			{
+				continue;
+			}
+
+			if (propCompletionTimeInMillis.TryRead(ref reader, options, PropCompletionTimeInMillis))
+			{
+				continue;
+			}
+
+			if (propExpirationTime.TryRead(ref reader, options, PropExpirationTime))
+			{
+				continue;
+			}
+
+			if (propExpirationTimeInMillis.TryRead(ref reader, options, PropExpirationTimeInMillis))
+			{
+				continue;
+			}
+
+			if (propId.TryRead(ref reader, options, PropId))
+			{
+				continue;
+			}
+
+			if (propIsPartial.TryRead(ref reader, options, PropIsPartial))
+			{
+				continue;
+			}
+
+			if (propIsRunning.TryRead(ref reader, options, PropIsRunning))
+			{
+				continue;
+			}
+
+			if (propResponse.TryRead(ref reader, options, PropResponse))
+			{
+				continue;
+			}
+
+			if (propStartTime.TryRead(ref reader, options, PropStartTime))
+			{
+				continue;
+			}
+
+			if (propStartTimeInMillis.TryRead(ref reader, options, PropStartTimeInMillis))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetAsyncSearchResponse<TDocument>
+		{
+			CompletionTime = propCompletionTime.Value
+,
+			CompletionTimeInMillis = propCompletionTimeInMillis.Value
+,
+			ExpirationTime = propExpirationTime.Value
+,
+			ExpirationTimeInMillis = propExpirationTimeInMillis.Value
+,
+			Id = propId.Value
+,
+			IsPartial = propIsPartial.Value
+,
+			IsRunning = propIsRunning.Value
+,
+			Response = propResponse.Value
+,
+			StartTime = propStartTime.Value
+,
+			StartTimeInMillis = propStartTimeInMillis.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetAsyncSearchResponse<TDocument> value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCompletionTime, value.CompletionTime);
+		writer.WriteProperty(options, PropCompletionTimeInMillis, value.CompletionTimeInMillis);
+		writer.WriteProperty(options, PropExpirationTime, value.ExpirationTime);
+		writer.WriteProperty(options, PropExpirationTimeInMillis, value.ExpirationTimeInMillis);
+		writer.WriteProperty(options, PropId, value.Id);
+		writer.WriteProperty(options, PropIsPartial, value.IsPartial);
+		writer.WriteProperty(options, PropIsRunning, value.IsRunning);
+		writer.WriteProperty(options, PropResponse, value.Response);
+		writer.WriteProperty(options, PropStartTime, value.StartTime);
+		writer.WriteProperty(options, PropStartTimeInMillis, value.StartTimeInMillis);
+		writer.WriteEndObject();
+	}
+}
+
+internal sealed partial class GetAsyncSearchResponseConverterFactory : System.Text.Json.Serialization.JsonConverterFactory
+{
+	public override bool CanConvert(System.Type typeToConvert)
+	{
+		return typeToConvert.IsGenericType && typeToConvert.GetGenericTypeDefinition() == typeof(GetAsyncSearchResponse<>);
+	}
+
+	public override System.Text.Json.Serialization.JsonConverter CreateConverter(System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		var args = typeToConvert.GetGenericArguments();
+#pragma warning disable IL3050
+		var converter = (System.Text.Json.Serialization.JsonConverter)System.Activator.CreateInstance(typeof(GetAsyncSearchResponseConverter<>).MakeGenericType(args[0]), System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public, binder: null, args: null, culture: null)!;
+#pragma warning restore IL3050
+		return converter;
+	}
+}
+
+[JsonConverter(typeof(GetAsyncSearchResponseConverterFactory))]
 public sealed partial class GetAsyncSearchResponse<TDocument> : ElasticsearchResponse
 {
 	/// <summary>
@@ -34,9 +178,7 @@ public sealed partial class GetAsyncSearchResponse<TDocument> : ElasticsearchRes
 	/// when the search has completed.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("completion_time")]
 	public DateTimeOffset? CompletionTime { get; init; }
-	[JsonInclude, JsonPropertyName("completion_time_in_millis")]
 	public long? CompletionTimeInMillis { get; init; }
 
 	/// <summary>
@@ -44,11 +186,8 @@ public sealed partial class GetAsyncSearchResponse<TDocument> : ElasticsearchRes
 	/// Indicates when the async search will expire.
 	/// </para>
 	/// </summary>
-	[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; }
 
 	/// <summary>
@@ -57,7 +196,6 @@ public sealed partial class GetAsyncSearchResponse<TDocument> : ElasticsearchRes
 	/// While the query is running, <c>is_partial</c> is always set to <c>true</c>.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("is_partial")]
 	public bool IsPartial { get; init; }
 
 	/// <summary>
@@ -66,12 +204,8 @@ public sealed partial class GetAsyncSearchResponse<TDocument> : ElasticsearchRes
 	/// NOTE: If the search failed after some shards returned their results or the node that is coordinating the async search dies, results may be partial even though <c>is_running</c> is <c>false</c>.
 	/// </para>
 	/// </summary>
-	[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 db47e9c2ee2..ea25149cb20 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/SubmitAsyncSearchRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/SubmitAsyncSearchRequest.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport;
@@ -231,410 +232,346 @@ public sealed partial class SubmitAsyncSearchRequestParameters : RequestParamete
 	public Elastic.Clients.Elasticsearch.Duration? WaitForCompletionTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("wait_for_completion_timeout"); set => Q("wait_for_completion_timeout", value); }
 }
 
-internal sealed partial class SubmitAsyncSearchRequestConverter : JsonConverter<SubmitAsyncSearchRequest>
+internal sealed partial class SubmitAsyncSearchRequestConverter : System.Text.Json.Serialization.JsonConverter<SubmitAsyncSearchRequest>
 {
-	public override SubmitAsyncSearchRequest Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		var variant = new SubmitAsyncSearchRequest();
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
-		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations1 = System.Text.Json.JsonEncodedText.Encode("aggs");
+	private static readonly System.Text.Json.JsonEncodedText PropCollapse = System.Text.Json.JsonEncodedText.Encode("collapse");
+	private static readonly System.Text.Json.JsonEncodedText PropDocvalueFields = System.Text.Json.JsonEncodedText.Encode("docvalue_fields");
+	private static readonly System.Text.Json.JsonEncodedText PropExplain = System.Text.Json.JsonEncodedText.Encode("explain");
+	private static readonly System.Text.Json.JsonEncodedText PropExt = System.Text.Json.JsonEncodedText.Encode("ext");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropFrom = System.Text.Json.JsonEncodedText.Encode("from");
+	private static readonly System.Text.Json.JsonEncodedText PropHighlight = System.Text.Json.JsonEncodedText.Encode("highlight");
+	private static readonly System.Text.Json.JsonEncodedText PropIndicesBoost = System.Text.Json.JsonEncodedText.Encode("indices_boost");
+	private static readonly System.Text.Json.JsonEncodedText PropKnn = System.Text.Json.JsonEncodedText.Encode("knn");
+	private static readonly System.Text.Json.JsonEncodedText PropMinScore = System.Text.Json.JsonEncodedText.Encode("min_score");
+	private static readonly System.Text.Json.JsonEncodedText PropPit = System.Text.Json.JsonEncodedText.Encode("pit");
+	private static readonly System.Text.Json.JsonEncodedText PropPostFilter = System.Text.Json.JsonEncodedText.Encode("post_filter");
+	private static readonly System.Text.Json.JsonEncodedText PropProfile = System.Text.Json.JsonEncodedText.Encode("profile");
+	private static readonly System.Text.Json.JsonEncodedText PropQuery = System.Text.Json.JsonEncodedText.Encode("query");
+	private static readonly System.Text.Json.JsonEncodedText PropRescore = System.Text.Json.JsonEncodedText.Encode("rescore");
+	private static readonly System.Text.Json.JsonEncodedText PropRuntimeMappings = System.Text.Json.JsonEncodedText.Encode("runtime_mappings");
+	private static readonly System.Text.Json.JsonEncodedText PropScriptFields = System.Text.Json.JsonEncodedText.Encode("script_fields");
+	private static readonly System.Text.Json.JsonEncodedText PropSearchAfter = System.Text.Json.JsonEncodedText.Encode("search_after");
+	private static readonly System.Text.Json.JsonEncodedText PropSeqNoPrimaryTerm = System.Text.Json.JsonEncodedText.Encode("seq_no_primary_term");
+	private static readonly System.Text.Json.JsonEncodedText PropSize = System.Text.Json.JsonEncodedText.Encode("size");
+	private static readonly System.Text.Json.JsonEncodedText PropSlice = System.Text.Json.JsonEncodedText.Encode("slice");
+	private static readonly System.Text.Json.JsonEncodedText PropSort = System.Text.Json.JsonEncodedText.Encode("sort");
+	private static readonly System.Text.Json.JsonEncodedText PropSource = System.Text.Json.JsonEncodedText.Encode("_source");
+	private static readonly System.Text.Json.JsonEncodedText PropStats = System.Text.Json.JsonEncodedText.Encode("stats");
+	private static readonly System.Text.Json.JsonEncodedText PropStoredFields = System.Text.Json.JsonEncodedText.Encode("stored_fields");
+	private static readonly System.Text.Json.JsonEncodedText PropSuggest = System.Text.Json.JsonEncodedText.Encode("suggest");
+	private static readonly System.Text.Json.JsonEncodedText PropTerminateAfter = System.Text.Json.JsonEncodedText.Encode("terminate_after");
+	private static readonly System.Text.Json.JsonEncodedText PropTimeout = System.Text.Json.JsonEncodedText.Encode("timeout");
+	private static readonly System.Text.Json.JsonEncodedText PropTrackScores = System.Text.Json.JsonEncodedText.Encode("track_scores");
+	private static readonly System.Text.Json.JsonEncodedText PropTrackTotalHits = System.Text.Json.JsonEncodedText.Encode("track_total_hits");
+	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("version");
+
+	public override SubmitAsyncSearchRequest Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IDictionary<string, Elastic.Clients.Elasticsearch.Aggregations.Aggregation>?> propAggregations = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Core.Search.FieldCollapse?> propCollapse = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.QueryDsl.FieldAndFormat>?> propDocvalueFields = default;
+		LocalJsonProperty<bool?> propExplain = default;
+		LocalJsonProperty<IDictionary<string, object>?> propExt = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.QueryDsl.FieldAndFormat>?> propFields = default;
+		LocalJsonProperty<int?> propFrom = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Core.Search.Highlight?> propHighlight = default;
+		LocalJsonProperty<ICollection<IDictionary<Elastic.Clients.Elasticsearch.IndexName, double>>?> propIndicesBoost = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.KnnSearch>?> propKnn = default;
+		LocalJsonProperty<double?> propMinScore = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Core.Search.PointInTimeReference?> propPit = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.QueryDsl.Query?> propPostFilter = default;
+		LocalJsonProperty<bool?> propProfile = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.QueryDsl.Query?> propQuery = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Core.Search.Rescore>?> propRescore = default;
+		LocalJsonProperty<IDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>?> propRuntimeMappings = default;
+		LocalJsonProperty<IDictionary<string, Elastic.Clients.Elasticsearch.ScriptField>?> propScriptFields = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.FieldValue>?> propSearchAfter = default;
+		LocalJsonProperty<bool?> propSeqNoPrimaryTerm = default;
+		LocalJsonProperty<int?> propSize = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.SlicedScroll?> propSlice = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.SortOptions>?> propSort = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Core.Search.SourceConfig?> propSource = default;
+		LocalJsonProperty<ICollection<string>?> propStats = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Fields?> propStoredFields = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Core.Search.Suggester?> propSuggest = default;
+		LocalJsonProperty<long?> propTerminateAfter = default;
+		LocalJsonProperty<string?> propTimeout = default;
+		LocalJsonProperty<bool?> propTrackScores = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Core.Search.TrackHits?> propTrackTotalHits = default;
+		LocalJsonProperty<bool?> propVersion = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAggregations.TryRead(ref reader, options, PropAggregations) || propAggregations.TryRead(ref reader, options, PropAggregations1))
 			{
-				var property = reader.GetString();
-				if (property == "aggregations" || property == "aggs")
-				{
-					variant.Aggregations = JsonSerializer.Deserialize<IDictionary<string, Elastic.Clients.Elasticsearch.Aggregations.Aggregation>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "collapse")
-				{
-					variant.Collapse = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Core.Search.FieldCollapse?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "docvalue_fields")
-				{
-					variant.DocvalueFields = JsonSerializer.Deserialize<ICollection<Elastic.Clients.Elasticsearch.QueryDsl.FieldAndFormat>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "explain")
-				{
-					variant.Explain = JsonSerializer.Deserialize<bool?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "ext")
-				{
-					variant.Ext = JsonSerializer.Deserialize<IDictionary<string, object>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "fields")
-				{
-					variant.Fields = JsonSerializer.Deserialize<ICollection<Elastic.Clients.Elasticsearch.QueryDsl.FieldAndFormat>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "from")
-				{
-					variant.From = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "highlight")
-				{
-					variant.Highlight = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Core.Search.Highlight?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "indices_boost")
-				{
-					variant.IndicesBoost = JsonSerializer.Deserialize<ICollection<IDictionary<Elastic.Clients.Elasticsearch.IndexName, double>>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "knn")
-				{
-					variant.Knn = JsonSerializer.Deserialize<ICollection<Elastic.Clients.Elasticsearch.KnnSearch>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "min_score")
-				{
-					variant.MinScore = JsonSerializer.Deserialize<double?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "pit")
-				{
-					variant.Pit = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Core.Search.PointInTimeReference?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "post_filter")
-				{
-					variant.PostFilter = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.Query?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "profile")
-				{
-					variant.Profile = JsonSerializer.Deserialize<bool?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "query")
-				{
-					variant.Query = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.Query?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "rescore")
-				{
-					variant.Rescore = JsonSerializer.Deserialize<ICollection<Elastic.Clients.Elasticsearch.Core.Search.Rescore>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "runtime_mappings")
-				{
-					variant.RuntimeMappings = JsonSerializer.Deserialize<IDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "script_fields")
-				{
-					variant.ScriptFields = JsonSerializer.Deserialize<IDictionary<string, Elastic.Clients.Elasticsearch.ScriptField>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "search_after")
-				{
-					variant.SearchAfter = JsonSerializer.Deserialize<ICollection<Elastic.Clients.Elasticsearch.FieldValue>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "seq_no_primary_term")
-				{
-					variant.SeqNoPrimaryTerm = JsonSerializer.Deserialize<bool?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "size")
-				{
-					variant.Size = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "slice")
-				{
-					variant.Slice = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.SlicedScroll?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "sort")
-				{
-					variant.Sort = JsonSerializer.Deserialize<ICollection<Elastic.Clients.Elasticsearch.SortOptions>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "_source")
-				{
-					variant.Source = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Core.Search.SourceConfig?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "stats")
-				{
-					variant.Stats = JsonSerializer.Deserialize<ICollection<string>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "stored_fields")
-				{
-					variant.StoredFields = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Fields?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "suggest")
-				{
-					variant.Suggest = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Core.Search.Suggester?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "terminate_after")
-				{
-					variant.TerminateAfter = JsonSerializer.Deserialize<long?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "timeout")
-				{
-					variant.Timeout = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "track_scores")
-				{
-					variant.TrackScores = JsonSerializer.Deserialize<bool?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "track_total_hits")
-				{
-					variant.TrackTotalHits = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Core.Search.TrackHits?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "version")
-				{
-					variant.Version = JsonSerializer.Deserialize<bool?>(ref reader, options);
-					continue;
-				}
+				continue;
 			}
-		}
-
-		return variant;
-	}
-
-	public override void Write(Utf8JsonWriter writer, SubmitAsyncSearchRequest value, JsonSerializerOptions options)
-	{
-		writer.WriteStartObject();
-		if (value.Aggregations is not null)
-		{
-			writer.WritePropertyName("aggregations");
-			JsonSerializer.Serialize(writer, value.Aggregations, options);
-		}
 
-		if (value.Collapse is not null)
-		{
-			writer.WritePropertyName("collapse");
-			JsonSerializer.Serialize(writer, value.Collapse, options);
-		}
+			if (propCollapse.TryRead(ref reader, options, PropCollapse))
+			{
+				continue;
+			}
 
-		if (value.DocvalueFields is not null)
-		{
-			writer.WritePropertyName("docvalue_fields");
-			JsonSerializer.Serialize(writer, value.DocvalueFields, options);
-		}
+			if (propDocvalueFields.TryRead(ref reader, options, PropDocvalueFields))
+			{
+				continue;
+			}
 
-		if (value.Explain.HasValue)
-		{
-			writer.WritePropertyName("explain");
-			writer.WriteBooleanValue(value.Explain.Value);
-		}
+			if (propExplain.TryRead(ref reader, options, PropExplain))
+			{
+				continue;
+			}
 
-		if (value.Ext is not null)
-		{
-			writer.WritePropertyName("ext");
-			JsonSerializer.Serialize(writer, value.Ext, options);
-		}
+			if (propExt.TryRead(ref reader, options, PropExt))
+			{
+				continue;
+			}
 
-		if (value.Fields is not null)
-		{
-			writer.WritePropertyName("fields");
-			JsonSerializer.Serialize(writer, value.Fields, options);
-		}
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
 
-		if (value.From.HasValue)
-		{
-			writer.WritePropertyName("from");
-			writer.WriteNumberValue(value.From.Value);
-		}
+			if (propFrom.TryRead(ref reader, options, PropFrom))
+			{
+				continue;
+			}
 
-		if (value.Highlight is not null)
-		{
-			writer.WritePropertyName("highlight");
-			JsonSerializer.Serialize(writer, value.Highlight, options);
-		}
+			if (propHighlight.TryRead(ref reader, options, PropHighlight))
+			{
+				continue;
+			}
 
-		if (value.IndicesBoost is not null)
-		{
-			writer.WritePropertyName("indices_boost");
-			JsonSerializer.Serialize(writer, value.IndicesBoost, options);
-		}
+			if (propIndicesBoost.TryRead(ref reader, options, PropIndicesBoost))
+			{
+				continue;
+			}
 
-		if (value.Knn is not null)
-		{
-			writer.WritePropertyName("knn");
-			JsonSerializer.Serialize(writer, value.Knn, options);
-		}
+			if (propKnn.TryRead(ref reader, options, PropKnn, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.KnnSearch>?, Elastic.Clients.Elasticsearch.KnnSearch>)))
+			{
+				continue;
+			}
 
-		if (value.MinScore.HasValue)
-		{
-			writer.WritePropertyName("min_score");
-			writer.WriteNumberValue(value.MinScore.Value);
-		}
+			if (propMinScore.TryRead(ref reader, options, PropMinScore))
+			{
+				continue;
+			}
 
-		if (value.Pit is not null)
-		{
-			writer.WritePropertyName("pit");
-			JsonSerializer.Serialize(writer, value.Pit, options);
-		}
+			if (propPit.TryRead(ref reader, options, PropPit))
+			{
+				continue;
+			}
 
-		if (value.PostFilter is not null)
-		{
-			writer.WritePropertyName("post_filter");
-			JsonSerializer.Serialize(writer, value.PostFilter, options);
-		}
+			if (propPostFilter.TryRead(ref reader, options, PropPostFilter))
+			{
+				continue;
+			}
 
-		if (value.Profile.HasValue)
-		{
-			writer.WritePropertyName("profile");
-			writer.WriteBooleanValue(value.Profile.Value);
-		}
+			if (propProfile.TryRead(ref reader, options, PropProfile))
+			{
+				continue;
+			}
 
-		if (value.Query is not null)
-		{
-			writer.WritePropertyName("query");
-			JsonSerializer.Serialize(writer, value.Query, options);
-		}
+			if (propQuery.TryRead(ref reader, options, PropQuery))
+			{
+				continue;
+			}
 
-		if (value.Rescore is not null)
-		{
-			writer.WritePropertyName("rescore");
-			JsonSerializer.Serialize(writer, value.Rescore, options);
-		}
+			if (propRescore.TryRead(ref reader, options, PropRescore, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Core.Search.Rescore>?, Elastic.Clients.Elasticsearch.Core.Search.Rescore>)))
+			{
+				continue;
+			}
 
-		if (value.RuntimeMappings is not null)
-		{
-			writer.WritePropertyName("runtime_mappings");
-			JsonSerializer.Serialize(writer, value.RuntimeMappings, options);
-		}
+			if (propRuntimeMappings.TryRead(ref reader, options, PropRuntimeMappings))
+			{
+				continue;
+			}
 
-		if (value.ScriptFields is not null)
-		{
-			writer.WritePropertyName("script_fields");
-			JsonSerializer.Serialize(writer, value.ScriptFields, options);
-		}
+			if (propScriptFields.TryRead(ref reader, options, PropScriptFields))
+			{
+				continue;
+			}
 
-		if (value.SearchAfter is not null)
-		{
-			writer.WritePropertyName("search_after");
-			JsonSerializer.Serialize(writer, value.SearchAfter, options);
-		}
+			if (propSearchAfter.TryRead(ref reader, options, PropSearchAfter))
+			{
+				continue;
+			}
 
-		if (value.SeqNoPrimaryTerm.HasValue)
-		{
-			writer.WritePropertyName("seq_no_primary_term");
-			writer.WriteBooleanValue(value.SeqNoPrimaryTerm.Value);
-		}
+			if (propSeqNoPrimaryTerm.TryRead(ref reader, options, PropSeqNoPrimaryTerm))
+			{
+				continue;
+			}
 
-		if (value.Size.HasValue)
-		{
-			writer.WritePropertyName("size");
-			writer.WriteNumberValue(value.Size.Value);
-		}
+			if (propSize.TryRead(ref reader, options, PropSize))
+			{
+				continue;
+			}
 
-		if (value.Slice is not null)
-		{
-			writer.WritePropertyName("slice");
-			JsonSerializer.Serialize(writer, value.Slice, options);
-		}
+			if (propSlice.TryRead(ref reader, options, PropSlice))
+			{
+				continue;
+			}
 
-		if (value.Sort is not null)
-		{
-			writer.WritePropertyName("sort");
-			JsonSerializer.Serialize(writer, value.Sort, options);
-		}
+			if (propSort.TryRead(ref reader, options, PropSort, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.SortOptions>?, Elastic.Clients.Elasticsearch.SortOptions>)))
+			{
+				continue;
+			}
 
-		if (value.Source is not null)
-		{
-			writer.WritePropertyName("_source");
-			JsonSerializer.Serialize(writer, value.Source, options);
-		}
+			if (propSource.TryRead(ref reader, options, PropSource))
+			{
+				continue;
+			}
 
-		if (value.Stats is not null)
-		{
-			writer.WritePropertyName("stats");
-			JsonSerializer.Serialize(writer, value.Stats, options);
-		}
+			if (propStats.TryRead(ref reader, options, PropStats))
+			{
+				continue;
+			}
 
-		if (value.StoredFields is not null)
-		{
-			writer.WritePropertyName("stored_fields");
-			new FieldsConverter().Write(writer, value.StoredFields, options);
-		}
+			if (propStoredFields.TryRead(ref reader, options, PropStoredFields, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
 
-		if (value.Suggest is not null)
-		{
-			writer.WritePropertyName("suggest");
-			JsonSerializer.Serialize(writer, value.Suggest, options);
-		}
+			if (propSuggest.TryRead(ref reader, options, PropSuggest))
+			{
+				continue;
+			}
 
-		if (value.TerminateAfter.HasValue)
-		{
-			writer.WritePropertyName("terminate_after");
-			writer.WriteNumberValue(value.TerminateAfter.Value);
-		}
+			if (propTerminateAfter.TryRead(ref reader, options, PropTerminateAfter))
+			{
+				continue;
+			}
 
-		if (!string.IsNullOrEmpty(value.Timeout))
-		{
-			writer.WritePropertyName("timeout");
-			writer.WriteStringValue(value.Timeout);
-		}
+			if (propTimeout.TryRead(ref reader, options, PropTimeout))
+			{
+				continue;
+			}
 
-		if (value.TrackScores.HasValue)
-		{
-			writer.WritePropertyName("track_scores");
-			writer.WriteBooleanValue(value.TrackScores.Value);
-		}
+			if (propTrackScores.TryRead(ref reader, options, PropTrackScores))
+			{
+				continue;
+			}
 
-		if (value.TrackTotalHits is not null)
-		{
-			writer.WritePropertyName("track_total_hits");
-			JsonSerializer.Serialize(writer, value.TrackTotalHits, options);
-		}
+			if (propTrackTotalHits.TryRead(ref reader, options, PropTrackTotalHits))
+			{
+				continue;
+			}
 
-		if (value.Version.HasValue)
-		{
-			writer.WritePropertyName("version");
-			writer.WriteBooleanValue(value.Version.Value);
-		}
+			if (propVersion.TryRead(ref reader, options, PropVersion))
+			{
+				continue;
+			}
 
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SubmitAsyncSearchRequest
+		{
+			Aggregations = propAggregations.Value
+	,
+			Collapse = propCollapse.Value
+	,
+			DocvalueFields = propDocvalueFields.Value
+	,
+			Explain = propExplain.Value
+	,
+			Ext = propExt.Value
+	,
+			Fields = propFields.Value
+	,
+			From = propFrom.Value
+	,
+			Highlight = propHighlight.Value
+	,
+			IndicesBoost = propIndicesBoost.Value
+	,
+			Knn = propKnn.Value
+	,
+			MinScore = propMinScore.Value
+	,
+			Pit = propPit.Value
+	,
+			PostFilter = propPostFilter.Value
+	,
+			Profile = propProfile.Value
+	,
+			Query = propQuery.Value
+	,
+			Rescore = propRescore.Value
+	,
+			RuntimeMappings = propRuntimeMappings.Value
+	,
+			ScriptFields = propScriptFields.Value
+	,
+			SearchAfter = propSearchAfter.Value
+	,
+			SeqNoPrimaryTerm = propSeqNoPrimaryTerm.Value
+	,
+			Size = propSize.Value
+	,
+			Slice = propSlice.Value
+	,
+			Sort = propSort.Value
+	,
+			Source = propSource.Value
+	,
+			Stats = propStats.Value
+	,
+			StoredFields = propStoredFields.Value
+	,
+			Suggest = propSuggest.Value
+	,
+			TerminateAfter = propTerminateAfter.Value
+	,
+			Timeout = propTimeout.Value
+	,
+			TrackScores = propTrackScores.Value
+	,
+			TrackTotalHits = propTrackTotalHits.Value
+	,
+			Version = propVersion.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SubmitAsyncSearchRequest value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAggregations, value.Aggregations);
+		writer.WriteProperty(options, PropCollapse, value.Collapse);
+		writer.WriteProperty(options, PropDocvalueFields, value.DocvalueFields);
+		writer.WriteProperty(options, PropExplain, value.Explain);
+		writer.WriteProperty(options, PropExt, value.Ext);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropFrom, value.From);
+		writer.WriteProperty(options, PropHighlight, value.Highlight);
+		writer.WriteProperty(options, PropIndicesBoost, value.IndicesBoost);
+		writer.WriteProperty(options, PropKnn, value.Knn, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.KnnSearch>?, Elastic.Clients.Elasticsearch.KnnSearch>));
+		writer.WriteProperty(options, PropMinScore, value.MinScore);
+		writer.WriteProperty(options, PropPit, value.Pit);
+		writer.WriteProperty(options, PropPostFilter, value.PostFilter);
+		writer.WriteProperty(options, PropProfile, value.Profile);
+		writer.WriteProperty(options, PropQuery, value.Query);
+		writer.WriteProperty(options, PropRescore, value.Rescore, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Core.Search.Rescore>?, Elastic.Clients.Elasticsearch.Core.Search.Rescore>));
+		writer.WriteProperty(options, PropRuntimeMappings, value.RuntimeMappings);
+		writer.WriteProperty(options, PropScriptFields, value.ScriptFields);
+		writer.WriteProperty(options, PropSearchAfter, value.SearchAfter);
+		writer.WriteProperty(options, PropSeqNoPrimaryTerm, value.SeqNoPrimaryTerm);
+		writer.WriteProperty(options, PropSize, value.Size);
+		writer.WriteProperty(options, PropSlice, value.Slice);
+		writer.WriteProperty(options, PropSort, value.Sort, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.SortOptions>?, Elastic.Clients.Elasticsearch.SortOptions>));
+		writer.WriteProperty(options, PropSource, value.Source);
+		writer.WriteProperty(options, PropStats, value.Stats);
+		writer.WriteProperty(options, PropStoredFields, value.StoredFields, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropSuggest, value.Suggest);
+		writer.WriteProperty(options, PropTerminateAfter, value.TerminateAfter);
+		writer.WriteProperty(options, PropTimeout, value.Timeout);
+		writer.WriteProperty(options, PropTrackScores, value.TrackScores);
+		writer.WriteProperty(options, PropTrackTotalHits, value.TrackTotalHits);
+		writer.WriteProperty(options, PropVersion, value.Version);
 		writer.WriteEndObject();
 	}
 }
@@ -678,7 +615,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Indices? indices)
 	/// Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes <c>_all</c> 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>
@@ -686,7 +622,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Indices? indices)
 	/// 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>
@@ -694,7 +629,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Indices? indices)
 	/// The analyzer to use for the query string
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public string? Analyzer { get => Q<string?>("analyzer"); set => Q("analyzer", value); }
 
 	/// <summary>
@@ -702,7 +636,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Indices? indices)
 	/// 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>
@@ -711,7 +644,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Indices? indices)
 	/// A partial reduction is performed every time the coordinating node has received a certain number of new shard responses (5 by default).
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public long? BatchedReduceSize { get => Q<long?>("batched_reduce_size"); set => Q("batched_reduce_size", value); }
 
 	/// <summary>
@@ -719,7 +651,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Indices? indices)
 	/// The default value is the only supported value.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public bool? CcsMinimizeRoundtrips { get => Q<bool?>("ccs_minimize_roundtrips"); set => Q("ccs_minimize_roundtrips", value); }
 
 	/// <summary>
@@ -727,7 +658,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Indices? indices)
 	/// 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>
@@ -735,7 +665,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Indices? indices)
 	/// 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>
@@ -743,7 +672,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Indices? indices)
 	/// 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>
@@ -751,7 +679,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Indices? indices)
 	/// 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>
@@ -759,7 +686,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Indices? indices)
 	/// 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>
@@ -767,7 +693,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Indices? indices)
 	/// If <c>true</c>, results are stored for later retrieval when the search completes within the <c>wait_for_completion_timeout</c>.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public bool? KeepOnCompletion { get => Q<bool?>("keep_on_completion"); set => Q("keep_on_completion", value); }
 
 	/// <summary>
@@ -775,7 +700,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Indices? indices)
 	/// 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>
@@ -783,7 +707,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Indices? indices)
 	/// 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>
@@ -791,7 +714,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Indices? indices)
 	/// 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>
@@ -799,7 +721,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Indices? indices)
 	/// Query in the Lucene query string syntax
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public string? QueryLuceneSyntax { get => Q<string?>("q"); set => Q("q", value); }
 
 	/// <summary>
@@ -807,7 +728,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Indices? indices)
 	/// 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>
@@ -815,7 +735,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Indices? indices)
 	/// 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>
@@ -823,7 +742,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Indices? indices)
 	/// 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>
@@ -831,7 +749,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Indices? indices)
 	/// 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>
@@ -839,7 +756,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Indices? indices)
 	/// 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>
@@ -847,7 +763,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Indices? indices)
 	/// 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>
@@ -855,7 +770,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Indices? indices)
 	/// 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>
@@ -863,7 +777,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Indices? indices)
 	/// 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>
@@ -871,7 +784,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Indices? indices)
 	/// How many suggestions to return in response
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public long? SuggestSize { get => Q<long?>("suggest_size"); set => Q("suggest_size", value); }
 
 	/// <summary>
@@ -879,7 +791,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Indices? indices)
 	/// 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>
@@ -887,7 +798,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Indices? indices)
 	/// 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>
@@ -896,11 +806,8 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Indices? indices)
 	/// When the async search completes within the timeout, the response won’t include the ID as the results are not stored in the cluster.
 	/// </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); }
-	[JsonInclude, JsonPropertyName("aggregations")]
 	public IDictionary<string, Elastic.Clients.Elasticsearch.Aggregations.Aggregation>? Aggregations { get; set; }
-	[JsonInclude, JsonPropertyName("collapse")]
 	public Elastic.Clients.Elasticsearch.Core.Search.FieldCollapse? Collapse { get; set; }
 
 	/// <summary>
@@ -909,7 +816,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Indices? indices)
 	/// 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>
@@ -917,7 +823,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Indices? indices)
 	/// If true, returns detailed information about score computation as part of a hit.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("explain")]
 	public bool? Explain { get; set; }
 
 	/// <summary>
@@ -925,7 +830,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Indices? indices)
 	/// Configuration of search extensions defined by Elasticsearch plugins.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("ext")]
 	public IDictionary<string, object>? Ext { get; set; }
 
 	/// <summary>
@@ -934,7 +838,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Indices? indices)
 	/// 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>
@@ -944,9 +847,7 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Indices? indices)
 	/// 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>
@@ -954,7 +855,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Indices? indices)
 	/// 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>
@@ -962,8 +862,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Indices? indices)
 	/// Defines the approximate kNN search to run.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("knn")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.KnnSearch))]
 	public ICollection<Elastic.Clients.Elasticsearch.KnnSearch>? Knn { get; set; }
 
 	/// <summary>
@@ -972,7 +870,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Indices? indices)
 	/// not included in the search results.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("min_score")]
 	public double? MinScore { get; set; }
 
 	/// <summary>
@@ -981,11 +878,8 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Indices? indices)
 	/// cannot specify an &lt;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>
@@ -993,10 +887,7 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Indices? indices)
 	/// 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>
@@ -1005,7 +896,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Indices? indices)
 	/// 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>
@@ -1013,9 +903,7 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Indices? indices)
 	/// 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>
@@ -1024,7 +912,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Indices? indices)
 	/// of each hit. See Optimistic concurrency control.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("seq_no_primary_term")]
 	public bool? SeqNoPrimaryTerm { get; set; }
 
 	/// <summary>
@@ -1034,12 +921,8 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Indices? indices)
 	/// 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>
@@ -1048,7 +931,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Indices? indices)
 	/// 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>
@@ -1058,7 +940,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Indices? indices)
 	/// the indices stats API.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("stats")]
 	public ICollection<string>? Stats { get; set; }
 
 	/// <summary>
@@ -1069,10 +950,7 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Indices? indices)
 	/// and stored fields in the search response.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("stored_fields")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Fields? StoredFields { get; set; }
-	[JsonInclude, JsonPropertyName("suggest")]
 	public Elastic.Clients.Elasticsearch.Core.Search.Suggester? Suggest { get; set; }
 
 	/// <summary>
@@ -1082,7 +960,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Indices? indices)
 	/// before sorting. Defaults to 0, which does not terminate query execution early.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("terminate_after")]
 	public long? TerminateAfter { get; set; }
 
 	/// <summary>
@@ -1092,7 +969,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Indices? indices)
 	/// Defaults to no timeout.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("timeout")]
 	public string? Timeout { get; set; }
 
 	/// <summary>
@@ -1100,7 +976,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Indices? indices)
 	/// 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>
@@ -1111,7 +986,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Indices? indices)
 	/// Defaults to 10,000 hits.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("track_total_hits")]
 	public Elastic.Clients.Elasticsearch.Core.Search.TrackHits? TrackTotalHits { get; set; }
 
 	/// <summary>
@@ -1119,7 +993,6 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Indices? indices)
 	/// If true, returns document version as part of a hit.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("version")]
 	public bool? Version { get; set; }
 }
 
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 1eaf8d1c848..abc8216a1a7 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/SubmitAsyncSearchResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/SubmitAsyncSearchResponse.g.cs
@@ -18,14 +18,158 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.AsyncSearch;
 
+internal sealed partial class SubmitAsyncSearchResponseConverter<TDocument> : System.Text.Json.Serialization.JsonConverter<SubmitAsyncSearchResponse<TDocument>>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCompletionTime = System.Text.Json.JsonEncodedText.Encode("completion_time");
+	private static readonly System.Text.Json.JsonEncodedText PropCompletionTimeInMillis = System.Text.Json.JsonEncodedText.Encode("completion_time_in_millis");
+	private static readonly System.Text.Json.JsonEncodedText PropExpirationTime = System.Text.Json.JsonEncodedText.Encode("expiration_time");
+	private static readonly System.Text.Json.JsonEncodedText PropExpirationTimeInMillis = System.Text.Json.JsonEncodedText.Encode("expiration_time_in_millis");
+	private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("id");
+	private static readonly System.Text.Json.JsonEncodedText PropIsPartial = System.Text.Json.JsonEncodedText.Encode("is_partial");
+	private static readonly System.Text.Json.JsonEncodedText PropIsRunning = System.Text.Json.JsonEncodedText.Encode("is_running");
+	private static readonly System.Text.Json.JsonEncodedText PropResponse = System.Text.Json.JsonEncodedText.Encode("response");
+	private static readonly System.Text.Json.JsonEncodedText PropStartTime = System.Text.Json.JsonEncodedText.Encode("start_time");
+	private static readonly System.Text.Json.JsonEncodedText PropStartTimeInMillis = System.Text.Json.JsonEncodedText.Encode("start_time_in_millis");
+
+	public override SubmitAsyncSearchResponse<TDocument> Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<DateTimeOffset?> propCompletionTime = default;
+		LocalJsonProperty<long?> propCompletionTimeInMillis = default;
+		LocalJsonProperty<DateTimeOffset?> propExpirationTime = default;
+		LocalJsonProperty<long> propExpirationTimeInMillis = default;
+		LocalJsonProperty<string?> propId = default;
+		LocalJsonProperty<bool> propIsPartial = default;
+		LocalJsonProperty<bool> propIsRunning = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.AsyncSearch.AsyncSearch<TDocument>> propResponse = default;
+		LocalJsonProperty<DateTimeOffset?> propStartTime = default;
+		LocalJsonProperty<long> propStartTimeInMillis = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCompletionTime.TryRead(ref reader, options, PropCompletionTime))
+			{
+				continue;
+			}
+
+			if (propCompletionTimeInMillis.TryRead(ref reader, options, PropCompletionTimeInMillis))
+			{
+				continue;
+			}
+
+			if (propExpirationTime.TryRead(ref reader, options, PropExpirationTime))
+			{
+				continue;
+			}
+
+			if (propExpirationTimeInMillis.TryRead(ref reader, options, PropExpirationTimeInMillis))
+			{
+				continue;
+			}
+
+			if (propId.TryRead(ref reader, options, PropId))
+			{
+				continue;
+			}
+
+			if (propIsPartial.TryRead(ref reader, options, PropIsPartial))
+			{
+				continue;
+			}
+
+			if (propIsRunning.TryRead(ref reader, options, PropIsRunning))
+			{
+				continue;
+			}
+
+			if (propResponse.TryRead(ref reader, options, PropResponse))
+			{
+				continue;
+			}
+
+			if (propStartTime.TryRead(ref reader, options, PropStartTime))
+			{
+				continue;
+			}
+
+			if (propStartTimeInMillis.TryRead(ref reader, options, PropStartTimeInMillis))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SubmitAsyncSearchResponse<TDocument>
+		{
+			CompletionTime = propCompletionTime.Value
+,
+			CompletionTimeInMillis = propCompletionTimeInMillis.Value
+,
+			ExpirationTime = propExpirationTime.Value
+,
+			ExpirationTimeInMillis = propExpirationTimeInMillis.Value
+,
+			Id = propId.Value
+,
+			IsPartial = propIsPartial.Value
+,
+			IsRunning = propIsRunning.Value
+,
+			Response = propResponse.Value
+,
+			StartTime = propStartTime.Value
+,
+			StartTimeInMillis = propStartTimeInMillis.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SubmitAsyncSearchResponse<TDocument> value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCompletionTime, value.CompletionTime);
+		writer.WriteProperty(options, PropCompletionTimeInMillis, value.CompletionTimeInMillis);
+		writer.WriteProperty(options, PropExpirationTime, value.ExpirationTime);
+		writer.WriteProperty(options, PropExpirationTimeInMillis, value.ExpirationTimeInMillis);
+		writer.WriteProperty(options, PropId, value.Id);
+		writer.WriteProperty(options, PropIsPartial, value.IsPartial);
+		writer.WriteProperty(options, PropIsRunning, value.IsRunning);
+		writer.WriteProperty(options, PropResponse, value.Response);
+		writer.WriteProperty(options, PropStartTime, value.StartTime);
+		writer.WriteProperty(options, PropStartTimeInMillis, value.StartTimeInMillis);
+		writer.WriteEndObject();
+	}
+}
+
+internal sealed partial class SubmitAsyncSearchResponseConverterFactory : System.Text.Json.Serialization.JsonConverterFactory
+{
+	public override bool CanConvert(System.Type typeToConvert)
+	{
+		return typeToConvert.IsGenericType && typeToConvert.GetGenericTypeDefinition() == typeof(SubmitAsyncSearchResponse<>);
+	}
+
+	public override System.Text.Json.Serialization.JsonConverter CreateConverter(System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		var args = typeToConvert.GetGenericArguments();
+#pragma warning disable IL3050
+		var converter = (System.Text.Json.Serialization.JsonConverter)System.Activator.CreateInstance(typeof(SubmitAsyncSearchResponseConverter<>).MakeGenericType(args[0]), System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public, binder: null, args: null, culture: null)!;
+#pragma warning restore IL3050
+		return converter;
+	}
+}
+
+[JsonConverter(typeof(SubmitAsyncSearchResponseConverterFactory))]
 public sealed partial class SubmitAsyncSearchResponse<TDocument> : ElasticsearchResponse
 {
 	/// <summary>
@@ -34,9 +178,7 @@ public sealed partial class SubmitAsyncSearchResponse<TDocument> : Elasticsearch
 	/// when the search has completed.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("completion_time")]
 	public DateTimeOffset? CompletionTime { get; init; }
-	[JsonInclude, JsonPropertyName("completion_time_in_millis")]
 	public long? CompletionTimeInMillis { get; init; }
 
 	/// <summary>
@@ -44,11 +186,8 @@ public sealed partial class SubmitAsyncSearchResponse<TDocument> : Elasticsearch
 	/// Indicates when the async search will expire.
 	/// </para>
 	/// </summary>
-	[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; }
 
 	/// <summary>
@@ -57,7 +196,6 @@ public sealed partial class SubmitAsyncSearchResponse<TDocument> : Elasticsearch
 	/// While the query is running, <c>is_partial</c> is always set to <c>true</c>.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("is_partial")]
 	public bool IsPartial { get; init; }
 
 	/// <summary>
@@ -66,12 +204,8 @@ public sealed partial class SubmitAsyncSearchResponse<TDocument> : Elasticsearch
 	/// NOTE: If the search failed after some shards returned their results or the node that is coordinating the async search dies, results may be partial even though <c>is_running</c> is <c>false</c>.
 	/// </para>
 	/// </summary>
-	[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/BulkResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/BulkResponse.g.cs
index a2c342a8ee7..b378fd1241d 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/BulkResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/BulkResponse.g.cs
@@ -18,20 +18,74 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch;
 
+internal sealed partial class BulkResponseConverter : System.Text.Json.Serialization.JsonConverter<BulkResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropErrors = System.Text.Json.JsonEncodedText.Encode("errors");
+	private static readonly System.Text.Json.JsonEncodedText PropIngestTook = System.Text.Json.JsonEncodedText.Encode("ingest_took");
+	private static readonly System.Text.Json.JsonEncodedText PropTook = System.Text.Json.JsonEncodedText.Encode("took");
+
+	public override BulkResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propErrors = default;
+		LocalJsonProperty<long?> propIngestTook = default;
+		LocalJsonProperty<long> propTook = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propErrors.TryRead(ref reader, options, PropErrors))
+			{
+				continue;
+			}
+
+			if (propIngestTook.TryRead(ref reader, options, PropIngestTook))
+			{
+				continue;
+			}
+
+			if (propTook.TryRead(ref reader, options, PropTook))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new BulkResponse
+		{
+			Errors = propErrors.Value
+,
+			IngestTook = propIngestTook.Value
+,
+			Took = propTook.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, BulkResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropErrors, value.Errors);
+		writer.WriteProperty(options, PropIngestTook, value.IngestTook);
+		writer.WriteProperty(options, PropTook, value.Took);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(BulkResponseConverter))]
 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/ClearScrollResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/ClearScrollResponse.g.cs
index 29bfde63e45..6d372ad203b 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/ClearScrollResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/ClearScrollResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch;
 
+internal sealed partial class ClearScrollResponseConverter : System.Text.Json.Serialization.JsonConverter<ClearScrollResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropNumFreed = System.Text.Json.JsonEncodedText.Encode("num_freed");
+	private static readonly System.Text.Json.JsonEncodedText PropSucceeded = System.Text.Json.JsonEncodedText.Encode("succeeded");
+
+	public override ClearScrollResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<int> propNumFreed = default;
+		LocalJsonProperty<bool> propSucceeded = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propNumFreed.TryRead(ref reader, options, PropNumFreed))
+			{
+				continue;
+			}
+
+			if (propSucceeded.TryRead(ref reader, options, PropSucceeded))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ClearScrollResponse
+		{
+			NumFreed = propNumFreed.Value
+,
+			Succeeded = propSucceeded.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ClearScrollResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropNumFreed, value.NumFreed);
+		writer.WriteProperty(options, PropSucceeded, value.Succeeded);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ClearScrollResponseConverter))]
 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/ClosePointInTimeResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/ClosePointInTimeResponse.g.cs
index 1fdf5b5b3ae..57c2634bb97 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/ClosePointInTimeResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/ClosePointInTimeResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch;
 
+internal sealed partial class ClosePointInTimeResponseConverter : System.Text.Json.Serialization.JsonConverter<ClosePointInTimeResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropNumFreed = System.Text.Json.JsonEncodedText.Encode("num_freed");
+	private static readonly System.Text.Json.JsonEncodedText PropSucceeded = System.Text.Json.JsonEncodedText.Encode("succeeded");
+
+	public override ClosePointInTimeResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<int> propNumFreed = default;
+		LocalJsonProperty<bool> propSucceeded = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propNumFreed.TryRead(ref reader, options, PropNumFreed))
+			{
+				continue;
+			}
+
+			if (propSucceeded.TryRead(ref reader, options, PropSucceeded))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ClosePointInTimeResponse
+		{
+			NumFreed = propNumFreed.Value
+,
+			Succeeded = propSucceeded.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ClosePointInTimeResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropNumFreed, value.NumFreed);
+		writer.WriteProperty(options, PropSucceeded, value.Succeeded);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ClosePointInTimeResponseConverter))]
 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/AllocationExplainResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/AllocationExplainResponse.g.cs
index a17abac6f3c..ddac5094da1 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/AllocationExplainResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/AllocationExplainResponse.g.cs
@@ -18,64 +18,316 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Cluster;
 
+internal sealed partial class AllocationExplainResponseConverter : System.Text.Json.Serialization.JsonConverter<AllocationExplainResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAllocateExplanation = System.Text.Json.JsonEncodedText.Encode("allocate_explanation");
+	private static readonly System.Text.Json.JsonEncodedText PropAllocationDelay = System.Text.Json.JsonEncodedText.Encode("allocation_delay");
+	private static readonly System.Text.Json.JsonEncodedText PropAllocationDelayInMillis = System.Text.Json.JsonEncodedText.Encode("allocation_delay_in_millis");
+	private static readonly System.Text.Json.JsonEncodedText PropCanAllocate = System.Text.Json.JsonEncodedText.Encode("can_allocate");
+	private static readonly System.Text.Json.JsonEncodedText PropCanMoveToOtherNode = System.Text.Json.JsonEncodedText.Encode("can_move_to_other_node");
+	private static readonly System.Text.Json.JsonEncodedText PropCanRebalanceCluster = System.Text.Json.JsonEncodedText.Encode("can_rebalance_cluster");
+	private static readonly System.Text.Json.JsonEncodedText PropCanRebalanceClusterDecisions = System.Text.Json.JsonEncodedText.Encode("can_rebalance_cluster_decisions");
+	private static readonly System.Text.Json.JsonEncodedText PropCanRebalanceToOtherNode = System.Text.Json.JsonEncodedText.Encode("can_rebalance_to_other_node");
+	private static readonly System.Text.Json.JsonEncodedText PropCanRemainDecisions = System.Text.Json.JsonEncodedText.Encode("can_remain_decisions");
+	private static readonly System.Text.Json.JsonEncodedText PropCanRemainOnCurrentNode = System.Text.Json.JsonEncodedText.Encode("can_remain_on_current_node");
+	private static readonly System.Text.Json.JsonEncodedText PropClusterInfo = System.Text.Json.JsonEncodedText.Encode("cluster_info");
+	private static readonly System.Text.Json.JsonEncodedText PropConfiguredDelay = System.Text.Json.JsonEncodedText.Encode("configured_delay");
+	private static readonly System.Text.Json.JsonEncodedText PropConfiguredDelayInMillis = System.Text.Json.JsonEncodedText.Encode("configured_delay_in_millis");
+	private static readonly System.Text.Json.JsonEncodedText PropCurrentNode = System.Text.Json.JsonEncodedText.Encode("current_node");
+	private static readonly System.Text.Json.JsonEncodedText PropCurrentState = System.Text.Json.JsonEncodedText.Encode("current_state");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropMoveExplanation = System.Text.Json.JsonEncodedText.Encode("move_explanation");
+	private static readonly System.Text.Json.JsonEncodedText PropNodeAllocationDecisions = System.Text.Json.JsonEncodedText.Encode("node_allocation_decisions");
+	private static readonly System.Text.Json.JsonEncodedText PropNote = System.Text.Json.JsonEncodedText.Encode("note");
+	private static readonly System.Text.Json.JsonEncodedText PropPrimary = System.Text.Json.JsonEncodedText.Encode("primary");
+	private static readonly System.Text.Json.JsonEncodedText PropRebalanceExplanation = System.Text.Json.JsonEncodedText.Encode("rebalance_explanation");
+	private static readonly System.Text.Json.JsonEncodedText PropRemainingDelay = System.Text.Json.JsonEncodedText.Encode("remaining_delay");
+	private static readonly System.Text.Json.JsonEncodedText PropRemainingDelayInMillis = System.Text.Json.JsonEncodedText.Encode("remaining_delay_in_millis");
+	private static readonly System.Text.Json.JsonEncodedText PropShard = System.Text.Json.JsonEncodedText.Encode("shard");
+	private static readonly System.Text.Json.JsonEncodedText PropUnassignedInfo = System.Text.Json.JsonEncodedText.Encode("unassigned_info");
+
+	public override AllocationExplainResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string?> propAllocateExplanation = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Duration?> propAllocationDelay = default;
+		LocalJsonProperty<long?> propAllocationDelayInMillis = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Cluster.Decision?> propCanAllocate = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Cluster.Decision?> propCanMoveToOtherNode = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Cluster.Decision?> propCanRebalanceCluster = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Cluster.AllocationDecision>?> propCanRebalanceClusterDecisions = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Cluster.Decision?> propCanRebalanceToOtherNode = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Cluster.AllocationDecision>?> propCanRemainDecisions = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Cluster.Decision?> propCanRemainOnCurrentNode = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Cluster.ClusterInfo?> propClusterInfo = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Duration?> propConfiguredDelay = default;
+		LocalJsonProperty<long?> propConfiguredDelayInMillis = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Cluster.CurrentNode?> propCurrentNode = default;
+		LocalJsonProperty<string> propCurrentState = default;
+		LocalJsonProperty<string> propIndex = default;
+		LocalJsonProperty<string?> propMoveExplanation = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Cluster.NodeAllocationExplanation>?> propNodeAllocationDecisions = default;
+		LocalJsonProperty<string?> propNote = default;
+		LocalJsonProperty<bool> propPrimary = default;
+		LocalJsonProperty<string?> propRebalanceExplanation = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Duration?> propRemainingDelay = default;
+		LocalJsonProperty<long?> propRemainingDelayInMillis = default;
+		LocalJsonProperty<int> propShard = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Cluster.UnassignedInformation?> propUnassignedInfo = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAllocateExplanation.TryRead(ref reader, options, PropAllocateExplanation))
+			{
+				continue;
+			}
+
+			if (propAllocationDelay.TryRead(ref reader, options, PropAllocationDelay))
+			{
+				continue;
+			}
+
+			if (propAllocationDelayInMillis.TryRead(ref reader, options, PropAllocationDelayInMillis))
+			{
+				continue;
+			}
+
+			if (propCanAllocate.TryRead(ref reader, options, PropCanAllocate))
+			{
+				continue;
+			}
+
+			if (propCanMoveToOtherNode.TryRead(ref reader, options, PropCanMoveToOtherNode))
+			{
+				continue;
+			}
+
+			if (propCanRebalanceCluster.TryRead(ref reader, options, PropCanRebalanceCluster))
+			{
+				continue;
+			}
+
+			if (propCanRebalanceClusterDecisions.TryRead(ref reader, options, PropCanRebalanceClusterDecisions))
+			{
+				continue;
+			}
+
+			if (propCanRebalanceToOtherNode.TryRead(ref reader, options, PropCanRebalanceToOtherNode))
+			{
+				continue;
+			}
+
+			if (propCanRemainDecisions.TryRead(ref reader, options, PropCanRemainDecisions))
+			{
+				continue;
+			}
+
+			if (propCanRemainOnCurrentNode.TryRead(ref reader, options, PropCanRemainOnCurrentNode))
+			{
+				continue;
+			}
+
+			if (propClusterInfo.TryRead(ref reader, options, PropClusterInfo))
+			{
+				continue;
+			}
+
+			if (propConfiguredDelay.TryRead(ref reader, options, PropConfiguredDelay))
+			{
+				continue;
+			}
+
+			if (propConfiguredDelayInMillis.TryRead(ref reader, options, PropConfiguredDelayInMillis))
+			{
+				continue;
+			}
+
+			if (propCurrentNode.TryRead(ref reader, options, PropCurrentNode))
+			{
+				continue;
+			}
+
+			if (propCurrentState.TryRead(ref reader, options, PropCurrentState))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propMoveExplanation.TryRead(ref reader, options, PropMoveExplanation))
+			{
+				continue;
+			}
+
+			if (propNodeAllocationDecisions.TryRead(ref reader, options, PropNodeAllocationDecisions))
+			{
+				continue;
+			}
+
+			if (propNote.TryRead(ref reader, options, PropNote))
+			{
+				continue;
+			}
+
+			if (propPrimary.TryRead(ref reader, options, PropPrimary))
+			{
+				continue;
+			}
+
+			if (propRebalanceExplanation.TryRead(ref reader, options, PropRebalanceExplanation))
+			{
+				continue;
+			}
+
+			if (propRemainingDelay.TryRead(ref reader, options, PropRemainingDelay))
+			{
+				continue;
+			}
+
+			if (propRemainingDelayInMillis.TryRead(ref reader, options, PropRemainingDelayInMillis))
+			{
+				continue;
+			}
+
+			if (propShard.TryRead(ref reader, options, PropShard))
+			{
+				continue;
+			}
+
+			if (propUnassignedInfo.TryRead(ref reader, options, PropUnassignedInfo))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new AllocationExplainResponse
+		{
+			AllocateExplanation = propAllocateExplanation.Value
+,
+			AllocationDelay = propAllocationDelay.Value
+,
+			AllocationDelayInMillis = propAllocationDelayInMillis.Value
+,
+			CanAllocate = propCanAllocate.Value
+,
+			CanMoveToOtherNode = propCanMoveToOtherNode.Value
+,
+			CanRebalanceCluster = propCanRebalanceCluster.Value
+,
+			CanRebalanceClusterDecisions = propCanRebalanceClusterDecisions.Value
+,
+			CanRebalanceToOtherNode = propCanRebalanceToOtherNode.Value
+,
+			CanRemainDecisions = propCanRemainDecisions.Value
+,
+			CanRemainOnCurrentNode = propCanRemainOnCurrentNode.Value
+,
+			ClusterInfo = propClusterInfo.Value
+,
+			ConfiguredDelay = propConfiguredDelay.Value
+,
+			ConfiguredDelayInMillis = propConfiguredDelayInMillis.Value
+,
+			CurrentNode = propCurrentNode.Value
+,
+			CurrentState = propCurrentState.Value
+,
+			Index = propIndex.Value
+,
+			MoveExplanation = propMoveExplanation.Value
+,
+			NodeAllocationDecisions = propNodeAllocationDecisions.Value
+,
+			Note = propNote.Value
+,
+			Primary = propPrimary.Value
+,
+			RebalanceExplanation = propRebalanceExplanation.Value
+,
+			RemainingDelay = propRemainingDelay.Value
+,
+			RemainingDelayInMillis = propRemainingDelayInMillis.Value
+,
+			Shard = propShard.Value
+,
+			UnassignedInfo = propUnassignedInfo.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, AllocationExplainResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAllocateExplanation, value.AllocateExplanation);
+		writer.WriteProperty(options, PropAllocationDelay, value.AllocationDelay);
+		writer.WriteProperty(options, PropAllocationDelayInMillis, value.AllocationDelayInMillis);
+		writer.WriteProperty(options, PropCanAllocate, value.CanAllocate);
+		writer.WriteProperty(options, PropCanMoveToOtherNode, value.CanMoveToOtherNode);
+		writer.WriteProperty(options, PropCanRebalanceCluster, value.CanRebalanceCluster);
+		writer.WriteProperty(options, PropCanRebalanceClusterDecisions, value.CanRebalanceClusterDecisions);
+		writer.WriteProperty(options, PropCanRebalanceToOtherNode, value.CanRebalanceToOtherNode);
+		writer.WriteProperty(options, PropCanRemainDecisions, value.CanRemainDecisions);
+		writer.WriteProperty(options, PropCanRemainOnCurrentNode, value.CanRemainOnCurrentNode);
+		writer.WriteProperty(options, PropClusterInfo, value.ClusterInfo);
+		writer.WriteProperty(options, PropConfiguredDelay, value.ConfiguredDelay);
+		writer.WriteProperty(options, PropConfiguredDelayInMillis, value.ConfiguredDelayInMillis);
+		writer.WriteProperty(options, PropCurrentNode, value.CurrentNode);
+		writer.WriteProperty(options, PropCurrentState, value.CurrentState);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropMoveExplanation, value.MoveExplanation);
+		writer.WriteProperty(options, PropNodeAllocationDecisions, value.NodeAllocationDecisions);
+		writer.WriteProperty(options, PropNote, value.Note);
+		writer.WriteProperty(options, PropPrimary, value.Primary);
+		writer.WriteProperty(options, PropRebalanceExplanation, value.RebalanceExplanation);
+		writer.WriteProperty(options, PropRemainingDelay, value.RemainingDelay);
+		writer.WriteProperty(options, PropRemainingDelayInMillis, value.RemainingDelayInMillis);
+		writer.WriteProperty(options, PropShard, value.Shard);
+		writer.WriteProperty(options, PropUnassignedInfo, value.UnassignedInfo);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(AllocationExplainResponseConverter))]
 public sealed partial class AllocationExplainResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("allocate_explanation")]
 	public string? AllocateExplanation { get; init; }
-	[JsonInclude, JsonPropertyName("allocation_delay")]
 	public Elastic.Clients.Elasticsearch.Duration? AllocationDelay { get; init; }
-	[JsonInclude, JsonPropertyName("allocation_delay_in_millis")]
 	public long? AllocationDelayInMillis { get; init; }
-	[JsonInclude, JsonPropertyName("can_allocate")]
 	public Elastic.Clients.Elasticsearch.Cluster.Decision? CanAllocate { get; init; }
-	[JsonInclude, JsonPropertyName("can_move_to_other_node")]
 	public Elastic.Clients.Elasticsearch.Cluster.Decision? CanMoveToOtherNode { get; init; }
-	[JsonInclude, JsonPropertyName("can_rebalance_cluster")]
 	public Elastic.Clients.Elasticsearch.Cluster.Decision? CanRebalanceCluster { get; init; }
-	[JsonInclude, JsonPropertyName("can_rebalance_cluster_decisions")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Cluster.AllocationDecision>? CanRebalanceClusterDecisions { get; init; }
-	[JsonInclude, JsonPropertyName("can_rebalance_to_other_node")]
 	public Elastic.Clients.Elasticsearch.Cluster.Decision? CanRebalanceToOtherNode { get; init; }
-	[JsonInclude, JsonPropertyName("can_remain_decisions")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Cluster.AllocationDecision>? CanRemainDecisions { get; init; }
-	[JsonInclude, JsonPropertyName("can_remain_on_current_node")]
 	public Elastic.Clients.Elasticsearch.Cluster.Decision? CanRemainOnCurrentNode { get; init; }
-	[JsonInclude, JsonPropertyName("cluster_info")]
 	public Elastic.Clients.Elasticsearch.Cluster.ClusterInfo? ClusterInfo { get; init; }
-	[JsonInclude, JsonPropertyName("configured_delay")]
 	public Elastic.Clients.Elasticsearch.Duration? ConfiguredDelay { get; init; }
-	[JsonInclude, JsonPropertyName("configured_delay_in_millis")]
 	public long? ConfiguredDelayInMillis { get; init; }
-	[JsonInclude, JsonPropertyName("current_node")]
 	public Elastic.Clients.Elasticsearch.Cluster.CurrentNode? CurrentNode { get; init; }
-	[JsonInclude, JsonPropertyName("current_state")]
 	public string CurrentState { get; init; }
-	[JsonInclude, JsonPropertyName("index")]
 	public string Index { get; init; }
-	[JsonInclude, JsonPropertyName("move_explanation")]
 	public string? MoveExplanation { get; init; }
-	[JsonInclude, JsonPropertyName("node_allocation_decisions")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Cluster.NodeAllocationExplanation>? NodeAllocationDecisions { get; init; }
-	[JsonInclude, JsonPropertyName("note")]
 	public string? Note { get; init; }
-	[JsonInclude, JsonPropertyName("primary")]
 	public bool Primary { get; init; }
-	[JsonInclude, JsonPropertyName("rebalance_explanation")]
 	public string? RebalanceExplanation { get; init; }
-	[JsonInclude, JsonPropertyName("remaining_delay")]
 	public Elastic.Clients.Elasticsearch.Duration? RemainingDelay { get; init; }
-	[JsonInclude, JsonPropertyName("remaining_delay_in_millis")]
 	public long? RemainingDelayInMillis { get; init; }
-	[JsonInclude, JsonPropertyName("shard")]
 	public int Shard { 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/Api/Cluster/ClusterInfoResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/ClusterInfoResponse.g.cs
index 3a0c28fa600..2b3593eb381 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/ClusterInfoResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/ClusterInfoResponse.g.cs
@@ -18,24 +18,96 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Cluster;
 
+internal sealed partial class ClusterInfoResponseConverter : System.Text.Json.Serialization.JsonConverter<ClusterInfoResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropClusterName = System.Text.Json.JsonEncodedText.Encode("cluster_name");
+	private static readonly System.Text.Json.JsonEncodedText PropHttp = System.Text.Json.JsonEncodedText.Encode("http");
+	private static readonly System.Text.Json.JsonEncodedText PropIngest = System.Text.Json.JsonEncodedText.Encode("ingest");
+	private static readonly System.Text.Json.JsonEncodedText PropScript = System.Text.Json.JsonEncodedText.Encode("script");
+	private static readonly System.Text.Json.JsonEncodedText PropThreadPool = System.Text.Json.JsonEncodedText.Encode("thread_pool");
+
+	public override ClusterInfoResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propClusterName = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Nodes.Http?> propHttp = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Nodes.Ingest?> propIngest = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Nodes.Scripting?> propScript = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Nodes.ThreadCount>?> propThreadPool = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propClusterName.TryRead(ref reader, options, PropClusterName))
+			{
+				continue;
+			}
+
+			if (propHttp.TryRead(ref reader, options, PropHttp))
+			{
+				continue;
+			}
+
+			if (propIngest.TryRead(ref reader, options, PropIngest))
+			{
+				continue;
+			}
+
+			if (propScript.TryRead(ref reader, options, PropScript))
+			{
+				continue;
+			}
+
+			if (propThreadPool.TryRead(ref reader, options, PropThreadPool))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ClusterInfoResponse
+		{
+			ClusterName = propClusterName.Value
+,
+			Http = propHttp.Value
+,
+			Ingest = propIngest.Value
+,
+			Script = propScript.Value
+,
+			ThreadPool = propThreadPool.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ClusterInfoResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropClusterName, value.ClusterName);
+		writer.WriteProperty(options, PropHttp, value.Http);
+		writer.WriteProperty(options, PropIngest, value.Ingest);
+		writer.WriteProperty(options, PropScript, value.Script);
+		writer.WriteProperty(options, PropThreadPool, value.ThreadPool);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ClusterInfoResponseConverter))]
 public sealed partial class ClusterInfoResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("cluster_name")]
 	public string ClusterName { get; init; }
-	[JsonInclude, JsonPropertyName("http")]
 	public Elastic.Clients.Elasticsearch.Nodes.Http? Http { get; init; }
-	[JsonInclude, JsonPropertyName("ingest")]
 	public Elastic.Clients.Elasticsearch.Nodes.Ingest? Ingest { get; init; }
-	[JsonInclude, JsonPropertyName("script")]
 	public Elastic.Clients.Elasticsearch.Nodes.Scripting? Script { get; init; }
-	[JsonInclude, JsonPropertyName("thread_pool")]
 	public IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Nodes.ThreadCount>? ThreadPool { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/ClusterStatsResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/ClusterStatsResponse.g.cs
index 75d8dfb2977..0be23cc8c06 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/ClusterStatsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/ClusterStatsResponse.g.cs
@@ -18,14 +18,111 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Cluster;
 
+internal sealed partial class ClusterStatsResponseConverter : System.Text.Json.Serialization.JsonConverter<ClusterStatsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropClusterName = System.Text.Json.JsonEncodedText.Encode("cluster_name");
+	private static readonly System.Text.Json.JsonEncodedText PropClusterUuid = System.Text.Json.JsonEncodedText.Encode("cluster_uuid");
+	private static readonly System.Text.Json.JsonEncodedText PropIndices = System.Text.Json.JsonEncodedText.Encode("indices");
+	private static readonly System.Text.Json.JsonEncodedText PropNodes = System.Text.Json.JsonEncodedText.Encode("nodes");
+	private static readonly System.Text.Json.JsonEncodedText PropNodeStats = System.Text.Json.JsonEncodedText.Encode("_nodes");
+	private static readonly System.Text.Json.JsonEncodedText PropStatus = System.Text.Json.JsonEncodedText.Encode("status");
+	private static readonly System.Text.Json.JsonEncodedText PropTimestamp = System.Text.Json.JsonEncodedText.Encode("timestamp");
+
+	public override ClusterStatsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propClusterName = default;
+		LocalJsonProperty<string> propClusterUuid = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Cluster.ClusterIndices> propIndices = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Cluster.ClusterNodes> propNodes = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.NodeStatistics?> propNodeStats = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.HealthStatus> propStatus = default;
+		LocalJsonProperty<long> propTimestamp = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propClusterName.TryRead(ref reader, options, PropClusterName))
+			{
+				continue;
+			}
+
+			if (propClusterUuid.TryRead(ref reader, options, PropClusterUuid))
+			{
+				continue;
+			}
+
+			if (propIndices.TryRead(ref reader, options, PropIndices))
+			{
+				continue;
+			}
+
+			if (propNodes.TryRead(ref reader, options, PropNodes))
+			{
+				continue;
+			}
+
+			if (propNodeStats.TryRead(ref reader, options, PropNodeStats))
+			{
+				continue;
+			}
+
+			if (propStatus.TryRead(ref reader, options, PropStatus))
+			{
+				continue;
+			}
+
+			if (propTimestamp.TryRead(ref reader, options, PropTimestamp))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ClusterStatsResponse
+		{
+			ClusterName = propClusterName.Value
+,
+			ClusterUuid = propClusterUuid.Value
+,
+			Indices = propIndices.Value
+,
+			Nodes = propNodes.Value
+,
+			NodeStats = propNodeStats.Value
+,
+			Status = propStatus.Value
+,
+			Timestamp = propTimestamp.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ClusterStatsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropClusterName, value.ClusterName);
+		writer.WriteProperty(options, PropClusterUuid, value.ClusterUuid);
+		writer.WriteProperty(options, PropIndices, value.Indices);
+		writer.WriteProperty(options, PropNodes, value.Nodes);
+		writer.WriteProperty(options, PropNodeStats, value.NodeStats);
+		writer.WriteProperty(options, PropStatus, value.Status);
+		writer.WriteProperty(options, PropTimestamp, value.Timestamp);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ClusterStatsResponseConverter))]
 public sealed partial class ClusterStatsResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,7 +130,6 @@ public sealed partial class ClusterStatsResponse : ElasticsearchResponse
 	/// Name of the cluster, based on the cluster name setting.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("cluster_name")]
 	public string ClusterName { get; init; }
 
 	/// <summary>
@@ -41,7 +137,6 @@ public sealed partial class ClusterStatsResponse : ElasticsearchResponse
 	/// Unique identifier for the cluster.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("cluster_uuid")]
 	public string ClusterUuid { get; init; }
 
 	/// <summary>
@@ -49,7 +144,6 @@ public sealed partial class ClusterStatsResponse : ElasticsearchResponse
 	/// Contains statistics about indices with shards assigned to selected nodes.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("indices")]
 	public Elastic.Clients.Elasticsearch.Cluster.ClusterIndices Indices { get; init; }
 
 	/// <summary>
@@ -57,7 +151,6 @@ public sealed partial class ClusterStatsResponse : ElasticsearchResponse
 	/// Contains statistics about nodes selected by the request’s node filters.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("nodes")]
 	public Elastic.Clients.Elasticsearch.Cluster.ClusterNodes Nodes { get; init; }
 
 	/// <summary>
@@ -65,7 +158,6 @@ public sealed partial class ClusterStatsResponse : ElasticsearchResponse
 	/// Contains statistics about the number of nodes selected by the request’s node filters.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("_nodes")]
 	public Elastic.Clients.Elasticsearch.NodeStatistics? NodeStats { get; init; }
 
 	/// <summary>
@@ -73,7 +165,6 @@ public sealed partial class ClusterStatsResponse : ElasticsearchResponse
 	/// Health status of the cluster, based on the state of its primary and replica shards.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("status")]
 	public Elastic.Clients.Elasticsearch.HealthStatus Status { get; init; }
 
 	/// <summary>
@@ -81,6 +172,5 @@ public sealed partial class ClusterStatsResponse : ElasticsearchResponse
 	/// Unix timestamp, in milliseconds, for the last time the cluster statistics were refreshed.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("timestamp")]
 	public long Timestamp { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/DeleteComponentTemplateResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/DeleteComponentTemplateResponse.g.cs
index 7f8b65c9cbe..12e9e603212 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/DeleteComponentTemplateResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/DeleteComponentTemplateResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Cluster;
 
+internal sealed partial class DeleteComponentTemplateResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteComponentTemplateResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override DeleteComponentTemplateResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteComponentTemplateResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteComponentTemplateResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteComponentTemplateResponseConverter))]
 public sealed partial class DeleteComponentTemplateResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class DeleteComponentTemplateResponse : ElasticsearchRespo
 	/// 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/Cluster/GetClusterSettingsResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/GetClusterSettingsResponse.g.cs
index febb734d698..e25f5c9b3f1 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/GetClusterSettingsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/GetClusterSettingsResponse.g.cs
@@ -18,20 +18,74 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Cluster;
 
+internal sealed partial class GetClusterSettingsResponseConverter : System.Text.Json.Serialization.JsonConverter<GetClusterSettingsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropDefaults = System.Text.Json.JsonEncodedText.Encode("defaults");
+	private static readonly System.Text.Json.JsonEncodedText PropPersistent = System.Text.Json.JsonEncodedText.Encode("persistent");
+	private static readonly System.Text.Json.JsonEncodedText PropTransient = System.Text.Json.JsonEncodedText.Encode("transient");
+
+	public override GetClusterSettingsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyDictionary<string, object>?> propDefaults = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, object>> propPersistent = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, object>> propTransient = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propDefaults.TryRead(ref reader, options, PropDefaults))
+			{
+				continue;
+			}
+
+			if (propPersistent.TryRead(ref reader, options, PropPersistent))
+			{
+				continue;
+			}
+
+			if (propTransient.TryRead(ref reader, options, PropTransient))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetClusterSettingsResponse
+		{
+			Defaults = propDefaults.Value
+,
+			Persistent = propPersistent.Value
+,
+			Transient = propTransient.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetClusterSettingsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDefaults, value.Defaults);
+		writer.WriteProperty(options, PropPersistent, value.Persistent);
+		writer.WriteProperty(options, PropTransient, value.Transient);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetClusterSettingsResponseConverter))]
 public sealed partial class GetClusterSettingsResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("defaults")]
 	public IReadOnlyDictionary<string, object>? Defaults { get; init; }
-	[JsonInclude, JsonPropertyName("persistent")]
 	public IReadOnlyDictionary<string, object> Persistent { get; init; }
-	[JsonInclude, JsonPropertyName("transient")]
 	public IReadOnlyDictionary<string, object> Transient { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/GetComponentTemplateResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/GetComponentTemplateResponse.g.cs
index 629ad116f00..5421e6c2779 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/GetComponentTemplateResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/GetComponentTemplateResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Cluster;
 
+internal sealed partial class GetComponentTemplateResponseConverter : System.Text.Json.Serialization.JsonConverter<GetComponentTemplateResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropComponentTemplates = System.Text.Json.JsonEncodedText.Encode("component_templates");
+
+	public override GetComponentTemplateResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Cluster.ComponentTemplate>> propComponentTemplates = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propComponentTemplates.TryRead(ref reader, options, PropComponentTemplates))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetComponentTemplateResponse
+		{
+			ComponentTemplates = propComponentTemplates.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetComponentTemplateResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropComponentTemplates, value.ComponentTemplates);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetComponentTemplateResponseConverter))]
 public sealed partial class GetComponentTemplateResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("component_templates")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Cluster.ComponentTemplate> ComponentTemplates { get; init; }
 }
\ No newline at end of file
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 e3fca0ec657..14a0fd21c98 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/HealthResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/HealthResponse.g.cs
@@ -18,14 +18,221 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Cluster;
 
+internal sealed partial class HealthResponseConverter : System.Text.Json.Serialization.JsonConverter<HealthResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropActivePrimaryShards = System.Text.Json.JsonEncodedText.Encode("active_primary_shards");
+	private static readonly System.Text.Json.JsonEncodedText PropActiveShards = System.Text.Json.JsonEncodedText.Encode("active_shards");
+	private static readonly System.Text.Json.JsonEncodedText PropActiveShardsPercentAsNumber = System.Text.Json.JsonEncodedText.Encode("active_shards_percent_as_number");
+	private static readonly System.Text.Json.JsonEncodedText PropClusterName = System.Text.Json.JsonEncodedText.Encode("cluster_name");
+	private static readonly System.Text.Json.JsonEncodedText PropDelayedUnassignedShards = System.Text.Json.JsonEncodedText.Encode("delayed_unassigned_shards");
+	private static readonly System.Text.Json.JsonEncodedText PropIndices = System.Text.Json.JsonEncodedText.Encode("indices");
+	private static readonly System.Text.Json.JsonEncodedText PropInitializingShards = System.Text.Json.JsonEncodedText.Encode("initializing_shards");
+	private static readonly System.Text.Json.JsonEncodedText PropNumberOfDataNodes = System.Text.Json.JsonEncodedText.Encode("number_of_data_nodes");
+	private static readonly System.Text.Json.JsonEncodedText PropNumberOfInFlightFetch = System.Text.Json.JsonEncodedText.Encode("number_of_in_flight_fetch");
+	private static readonly System.Text.Json.JsonEncodedText PropNumberOfNodes = System.Text.Json.JsonEncodedText.Encode("number_of_nodes");
+	private static readonly System.Text.Json.JsonEncodedText PropNumberOfPendingTasks = System.Text.Json.JsonEncodedText.Encode("number_of_pending_tasks");
+	private static readonly System.Text.Json.JsonEncodedText PropRelocatingShards = System.Text.Json.JsonEncodedText.Encode("relocating_shards");
+	private static readonly System.Text.Json.JsonEncodedText PropStatus = System.Text.Json.JsonEncodedText.Encode("status");
+	private static readonly System.Text.Json.JsonEncodedText PropTaskMaxWaitingInQueue = System.Text.Json.JsonEncodedText.Encode("task_max_waiting_in_queue");
+	private static readonly System.Text.Json.JsonEncodedText PropTaskMaxWaitingInQueueMillis = System.Text.Json.JsonEncodedText.Encode("task_max_waiting_in_queue_millis");
+	private static readonly System.Text.Json.JsonEncodedText PropTimedOut = System.Text.Json.JsonEncodedText.Encode("timed_out");
+	private static readonly System.Text.Json.JsonEncodedText PropUnassignedPrimaryShards = System.Text.Json.JsonEncodedText.Encode("unassigned_primary_shards");
+	private static readonly System.Text.Json.JsonEncodedText PropUnassignedShards = System.Text.Json.JsonEncodedText.Encode("unassigned_shards");
+
+	public override HealthResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<int> propActivePrimaryShards = default;
+		LocalJsonProperty<int> propActiveShards = default;
+		LocalJsonProperty<double> propActiveShardsPercentAsNumber = default;
+		LocalJsonProperty<string> propClusterName = default;
+		LocalJsonProperty<int> propDelayedUnassignedShards = default;
+		LocalJsonProperty<IReadOnlyDictionary<Elastic.Clients.Elasticsearch.IndexName, Elastic.Clients.Elasticsearch.Cluster.IndexHealthStats>?> propIndices = default;
+		LocalJsonProperty<int> propInitializingShards = default;
+		LocalJsonProperty<int> propNumberOfDataNodes = default;
+		LocalJsonProperty<int> propNumberOfInFlightFetch = default;
+		LocalJsonProperty<int> propNumberOfNodes = default;
+		LocalJsonProperty<int> propNumberOfPendingTasks = default;
+		LocalJsonProperty<int> propRelocatingShards = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.HealthStatus> propStatus = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Duration?> propTaskMaxWaitingInQueue = default;
+		LocalJsonProperty<long> propTaskMaxWaitingInQueueMillis = default;
+		LocalJsonProperty<bool> propTimedOut = default;
+		LocalJsonProperty<int> propUnassignedPrimaryShards = default;
+		LocalJsonProperty<int> propUnassignedShards = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propActivePrimaryShards.TryRead(ref reader, options, PropActivePrimaryShards))
+			{
+				continue;
+			}
+
+			if (propActiveShards.TryRead(ref reader, options, PropActiveShards))
+			{
+				continue;
+			}
+
+			if (propActiveShardsPercentAsNumber.TryRead(ref reader, options, PropActiveShardsPercentAsNumber))
+			{
+				continue;
+			}
+
+			if (propClusterName.TryRead(ref reader, options, PropClusterName))
+			{
+				continue;
+			}
+
+			if (propDelayedUnassignedShards.TryRead(ref reader, options, PropDelayedUnassignedShards))
+			{
+				continue;
+			}
+
+			if (propIndices.TryRead(ref reader, options, PropIndices))
+			{
+				continue;
+			}
+
+			if (propInitializingShards.TryRead(ref reader, options, PropInitializingShards))
+			{
+				continue;
+			}
+
+			if (propNumberOfDataNodes.TryRead(ref reader, options, PropNumberOfDataNodes))
+			{
+				continue;
+			}
+
+			if (propNumberOfInFlightFetch.TryRead(ref reader, options, PropNumberOfInFlightFetch))
+			{
+				continue;
+			}
+
+			if (propNumberOfNodes.TryRead(ref reader, options, PropNumberOfNodes))
+			{
+				continue;
+			}
+
+			if (propNumberOfPendingTasks.TryRead(ref reader, options, PropNumberOfPendingTasks))
+			{
+				continue;
+			}
+
+			if (propRelocatingShards.TryRead(ref reader, options, PropRelocatingShards))
+			{
+				continue;
+			}
+
+			if (propStatus.TryRead(ref reader, options, PropStatus))
+			{
+				continue;
+			}
+
+			if (propTaskMaxWaitingInQueue.TryRead(ref reader, options, PropTaskMaxWaitingInQueue))
+			{
+				continue;
+			}
+
+			if (propTaskMaxWaitingInQueueMillis.TryRead(ref reader, options, PropTaskMaxWaitingInQueueMillis))
+			{
+				continue;
+			}
+
+			if (propTimedOut.TryRead(ref reader, options, PropTimedOut))
+			{
+				continue;
+			}
+
+			if (propUnassignedPrimaryShards.TryRead(ref reader, options, PropUnassignedPrimaryShards))
+			{
+				continue;
+			}
+
+			if (propUnassignedShards.TryRead(ref reader, options, PropUnassignedShards))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new HealthResponse
+		{
+			ActivePrimaryShards = propActivePrimaryShards.Value
+,
+			ActiveShards = propActiveShards.Value
+,
+			ActiveShardsPercentAsNumber = propActiveShardsPercentAsNumber.Value
+,
+			ClusterName = propClusterName.Value
+,
+			DelayedUnassignedShards = propDelayedUnassignedShards.Value
+,
+			Indices = propIndices.Value
+,
+			InitializingShards = propInitializingShards.Value
+,
+			NumberOfDataNodes = propNumberOfDataNodes.Value
+,
+			NumberOfInFlightFetch = propNumberOfInFlightFetch.Value
+,
+			NumberOfNodes = propNumberOfNodes.Value
+,
+			NumberOfPendingTasks = propNumberOfPendingTasks.Value
+,
+			RelocatingShards = propRelocatingShards.Value
+,
+			Status = propStatus.Value
+,
+			TaskMaxWaitingInQueue = propTaskMaxWaitingInQueue.Value
+,
+			TaskMaxWaitingInQueueMillis = propTaskMaxWaitingInQueueMillis.Value
+,
+			TimedOut = propTimedOut.Value
+,
+			UnassignedPrimaryShards = propUnassignedPrimaryShards.Value
+,
+			UnassignedShards = propUnassignedShards.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, HealthResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropActivePrimaryShards, value.ActivePrimaryShards);
+		writer.WriteProperty(options, PropActiveShards, value.ActiveShards);
+		writer.WriteProperty(options, PropActiveShardsPercentAsNumber, value.ActiveShardsPercentAsNumber);
+		writer.WriteProperty(options, PropClusterName, value.ClusterName);
+		writer.WriteProperty(options, PropDelayedUnassignedShards, value.DelayedUnassignedShards);
+		writer.WriteProperty(options, PropIndices, value.Indices);
+		writer.WriteProperty(options, PropInitializingShards, value.InitializingShards);
+		writer.WriteProperty(options, PropNumberOfDataNodes, value.NumberOfDataNodes);
+		writer.WriteProperty(options, PropNumberOfInFlightFetch, value.NumberOfInFlightFetch);
+		writer.WriteProperty(options, PropNumberOfNodes, value.NumberOfNodes);
+		writer.WriteProperty(options, PropNumberOfPendingTasks, value.NumberOfPendingTasks);
+		writer.WriteProperty(options, PropRelocatingShards, value.RelocatingShards);
+		writer.WriteProperty(options, PropStatus, value.Status);
+		writer.WriteProperty(options, PropTaskMaxWaitingInQueue, value.TaskMaxWaitingInQueue);
+		writer.WriteProperty(options, PropTaskMaxWaitingInQueueMillis, value.TaskMaxWaitingInQueueMillis);
+		writer.WriteProperty(options, PropTimedOut, value.TimedOut);
+		writer.WriteProperty(options, PropUnassignedPrimaryShards, value.UnassignedPrimaryShards);
+		writer.WriteProperty(options, PropUnassignedShards, value.UnassignedShards);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(HealthResponseConverter))]
 public sealed partial class HealthResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,7 +240,6 @@ public sealed partial class HealthResponse : ElasticsearchResponse
 	/// The number of active primary shards.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("active_primary_shards")]
 	public int ActivePrimaryShards { get; init; }
 
 	/// <summary>
@@ -41,7 +247,6 @@ public sealed partial class HealthResponse : ElasticsearchResponse
 	/// The total number of active primary and replica shards.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("active_shards")]
 	public int ActiveShards { get; init; }
 
 	/// <summary>
@@ -49,7 +254,6 @@ public sealed partial class HealthResponse : ElasticsearchResponse
 	/// 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>
@@ -57,7 +261,6 @@ public sealed partial class HealthResponse : ElasticsearchResponse
 	/// The name of the cluster.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("cluster_name")]
 	public string ClusterName { get; init; }
 
 	/// <summary>
@@ -65,10 +268,7 @@ public sealed partial class HealthResponse : ElasticsearchResponse
 	/// 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>
@@ -76,7 +276,6 @@ public sealed partial class HealthResponse : ElasticsearchResponse
 	/// The number of shards that are under initialization.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("initializing_shards")]
 	public int InitializingShards { get; init; }
 
 	/// <summary>
@@ -84,7 +283,6 @@ public sealed partial class HealthResponse : ElasticsearchResponse
 	/// The number of nodes that are dedicated data nodes.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("number_of_data_nodes")]
 	public int NumberOfDataNodes { get; init; }
 
 	/// <summary>
@@ -92,7 +290,6 @@ public sealed partial class HealthResponse : ElasticsearchResponse
 	/// The number of unfinished fetches.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("number_of_in_flight_fetch")]
 	public int NumberOfInFlightFetch { get; init; }
 
 	/// <summary>
@@ -100,7 +297,6 @@ public sealed partial class HealthResponse : ElasticsearchResponse
 	/// The number of nodes within the cluster.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("number_of_nodes")]
 	public int NumberOfNodes { get; init; }
 
 	/// <summary>
@@ -108,7 +304,6 @@ public sealed partial class HealthResponse : ElasticsearchResponse
 	/// 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>
@@ -116,9 +311,7 @@ public sealed partial class HealthResponse : ElasticsearchResponse
 	/// 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>
@@ -126,7 +319,6 @@ public sealed partial class HealthResponse : ElasticsearchResponse
 	/// 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>
@@ -134,7 +326,6 @@ public sealed partial class HealthResponse : ElasticsearchResponse
 	/// 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>
@@ -142,7 +333,6 @@ public sealed partial class HealthResponse : ElasticsearchResponse
 	/// 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>
@@ -150,7 +340,6 @@ public sealed partial class HealthResponse : ElasticsearchResponse
 	/// The number of primary shards that are not allocated.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("unassigned_primary_shards")]
 	public int UnassignedPrimaryShards { get; init; }
 
 	/// <summary>
@@ -158,6 +347,5 @@ public sealed partial class HealthResponse : ElasticsearchResponse
 	/// 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/Cluster/PendingTasksResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/PendingTasksResponse.g.cs
index 024b4bad879..54a70c4b170 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/PendingTasksResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/PendingTasksResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Cluster;
 
+internal sealed partial class PendingTasksResponseConverter : System.Text.Json.Serialization.JsonConverter<PendingTasksResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropTasks = System.Text.Json.JsonEncodedText.Encode("tasks");
+
+	public override PendingTasksResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Cluster.PendingTask>> propTasks = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propTasks.TryRead(ref reader, options, PropTasks))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PendingTasksResponse
+		{
+			Tasks = propTasks.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PendingTasksResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropTasks, value.Tasks);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PendingTasksResponseConverter))]
 public sealed partial class PendingTasksResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("tasks")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Cluster.PendingTask> Tasks { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/PutComponentTemplateResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/PutComponentTemplateResponse.g.cs
index 5b48a459f7a..8a389a51c7c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/PutComponentTemplateResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/PutComponentTemplateResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Cluster;
 
+internal sealed partial class PutComponentTemplateResponseConverter : System.Text.Json.Serialization.JsonConverter<PutComponentTemplateResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override PutComponentTemplateResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutComponentTemplateResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutComponentTemplateResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PutComponentTemplateResponseConverter))]
 public sealed partial class PutComponentTemplateResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class PutComponentTemplateResponse : ElasticsearchResponse
 	/// 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/CountResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/CountResponse.g.cs
index e225c0dee65..a4e19c0b018 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/CountResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/CountResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch;
 
+internal sealed partial class CountResponseConverter : System.Text.Json.Serialization.JsonConverter<CountResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCount = System.Text.Json.JsonEncodedText.Encode("count");
+	private static readonly System.Text.Json.JsonEncodedText PropShards = System.Text.Json.JsonEncodedText.Encode("_shards");
+
+	public override CountResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<long> propCount = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.ShardStatistics> propShards = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCount.TryRead(ref reader, options, PropCount))
+			{
+				continue;
+			}
+
+			if (propShards.TryRead(ref reader, options, PropShards))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new CountResponse
+		{
+			Count = propCount.Value
+,
+			Shards = propShards.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, CountResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCount, value.Count);
+		writer.WriteProperty(options, PropShards, value.Shards);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(CountResponseConverter))]
 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 e9cf25961c7..ecdc39331fa 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/CreateRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/CreateRequest.g.cs
@@ -94,7 +94,7 @@ public sealed partial class CreateRequestParameters : RequestParameters
 /// If the target is an index and the document already exists, the request updates the document and increments its version.
 /// </para>
 /// </summary>
-public sealed partial class CreateRequest<TDocument> : PlainRequest<CreateRequestParameters>, ISelfSerializable
+public sealed partial class CreateRequest<TDocument> : PlainRequest<CreateRequestParameters>, ISelfTwoWaySerializable
 {
 	public CreateRequest(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("index", index).Required("id", id))
 	{
@@ -168,13 +168,17 @@ public CreateRequest(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clie
 	/// </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); }
-	[JsonIgnore]
 	public TDocument Document { get; set; }
 
-	void ISelfSerializable.Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
+	void ISelfTwoWaySerializable.Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 	{
 		settings.SourceSerializer.Serialize(Document, writer);
 	}
+
+	void ISelfTwoWaySerializable.Deserialize(ref Utf8JsonReader reader, JsonSerializerOptions options, IElasticsearchClientSettings settings)
+	{
+		Document = settings.SourceSerializer.Deserialize<TDocument>(ref reader);
+	}
 }
 
 /// <summary>
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/CreateResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/CreateResponse.g.cs
index edeaeb613d2..c5ab10483e6 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/CreateResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/CreateResponse.g.cs
@@ -18,30 +18,129 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch;
 
+internal sealed partial class CreateResponseConverter : System.Text.Json.Serialization.JsonConverter<CreateResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropForcedRefresh = System.Text.Json.JsonEncodedText.Encode("forced_refresh");
+	private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("_id");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("_index");
+	private static readonly System.Text.Json.JsonEncodedText PropPrimaryTerm = System.Text.Json.JsonEncodedText.Encode("_primary_term");
+	private static readonly System.Text.Json.JsonEncodedText PropResult = System.Text.Json.JsonEncodedText.Encode("result");
+	private static readonly System.Text.Json.JsonEncodedText PropSeqNo = System.Text.Json.JsonEncodedText.Encode("_seq_no");
+	private static readonly System.Text.Json.JsonEncodedText PropShards = System.Text.Json.JsonEncodedText.Encode("_shards");
+	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("_version");
+
+	public override CreateResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool?> propForcedRefresh = default;
+		LocalJsonProperty<string> propId = default;
+		LocalJsonProperty<string> propIndex = default;
+		LocalJsonProperty<long?> propPrimaryTerm = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Result> propResult = default;
+		LocalJsonProperty<long?> propSeqNo = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.ShardStatistics> propShards = default;
+		LocalJsonProperty<long> propVersion = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propForcedRefresh.TryRead(ref reader, options, PropForcedRefresh))
+			{
+				continue;
+			}
+
+			if (propId.TryRead(ref reader, options, PropId))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propPrimaryTerm.TryRead(ref reader, options, PropPrimaryTerm))
+			{
+				continue;
+			}
+
+			if (propResult.TryRead(ref reader, options, PropResult))
+			{
+				continue;
+			}
+
+			if (propSeqNo.TryRead(ref reader, options, PropSeqNo))
+			{
+				continue;
+			}
+
+			if (propShards.TryRead(ref reader, options, PropShards))
+			{
+				continue;
+			}
+
+			if (propVersion.TryRead(ref reader, options, PropVersion))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new CreateResponse
+		{
+			ForcedRefresh = propForcedRefresh.Value
+,
+			Id = propId.Value
+,
+			Index = propIndex.Value
+,
+			PrimaryTerm = propPrimaryTerm.Value
+,
+			Result = propResult.Value
+,
+			SeqNo = propSeqNo.Value
+,
+			Shards = propShards.Value
+,
+			Version = propVersion.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, CreateResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropForcedRefresh, value.ForcedRefresh);
+		writer.WriteProperty(options, PropId, value.Id);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropPrimaryTerm, value.PrimaryTerm);
+		writer.WriteProperty(options, PropResult, value.Result);
+		writer.WriteProperty(options, PropSeqNo, value.SeqNo);
+		writer.WriteProperty(options, PropShards, value.Shards);
+		writer.WriteProperty(options, PropVersion, value.Version);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(CreateResponseConverter))]
 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/CrossClusterReplication/CcrStatsResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/CrossClusterReplication/CcrStatsResponse.g.cs
index 774d051bff4..9e13d236083 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/CrossClusterReplication/CcrStatsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/CrossClusterReplication/CcrStatsResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.CrossClusterReplication;
 
+internal sealed partial class CcrStatsResponseConverter : System.Text.Json.Serialization.JsonConverter<CcrStatsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAutoFollowStats = System.Text.Json.JsonEncodedText.Encode("auto_follow_stats");
+	private static readonly System.Text.Json.JsonEncodedText PropFollowStats = System.Text.Json.JsonEncodedText.Encode("follow_stats");
+
+	public override CcrStatsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.CrossClusterReplication.AutoFollowStats> propAutoFollowStats = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.CrossClusterReplication.FollowStats> propFollowStats = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAutoFollowStats.TryRead(ref reader, options, PropAutoFollowStats))
+			{
+				continue;
+			}
+
+			if (propFollowStats.TryRead(ref reader, options, PropFollowStats))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new CcrStatsResponse
+		{
+			AutoFollowStats = propAutoFollowStats.Value
+,
+			FollowStats = propFollowStats.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, CcrStatsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAutoFollowStats, value.AutoFollowStats);
+		writer.WriteProperty(options, PropFollowStats, value.FollowStats);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(CcrStatsResponseConverter))]
 public sealed partial class CcrStatsResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("auto_follow_stats")]
 	public Elastic.Clients.Elasticsearch.CrossClusterReplication.AutoFollowStats AutoFollowStats { get; init; }
-	[JsonInclude, JsonPropertyName("follow_stats")]
 	public Elastic.Clients.Elasticsearch.CrossClusterReplication.FollowStats FollowStats { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/CrossClusterReplication/DeleteAutoFollowPatternResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/CrossClusterReplication/DeleteAutoFollowPatternResponse.g.cs
index 99617d5ed3d..cd3b3704c66 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/CrossClusterReplication/DeleteAutoFollowPatternResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/CrossClusterReplication/DeleteAutoFollowPatternResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.CrossClusterReplication;
 
+internal sealed partial class DeleteAutoFollowPatternResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteAutoFollowPatternResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override DeleteAutoFollowPatternResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteAutoFollowPatternResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteAutoFollowPatternResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteAutoFollowPatternResponseConverter))]
 public sealed partial class DeleteAutoFollowPatternResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class DeleteAutoFollowPatternResponse : ElasticsearchRespo
 	/// 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/CrossClusterReplication/FollowInfoResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/CrossClusterReplication/FollowInfoResponse.g.cs
index 54fcd7202df..3384cd72bb6 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/CrossClusterReplication/FollowInfoResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/CrossClusterReplication/FollowInfoResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.CrossClusterReplication;
 
+internal sealed partial class FollowInfoResponseConverter : System.Text.Json.Serialization.JsonConverter<FollowInfoResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropFollowerIndices = System.Text.Json.JsonEncodedText.Encode("follower_indices");
+
+	public override FollowInfoResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.CrossClusterReplication.FollowerIndex>> propFollowerIndices = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propFollowerIndices.TryRead(ref reader, options, PropFollowerIndices))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new FollowInfoResponse
+		{
+			FollowerIndices = propFollowerIndices.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, FollowInfoResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropFollowerIndices, value.FollowerIndices);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(FollowInfoResponseConverter))]
 public sealed partial class FollowInfoResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("follower_indices")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.CrossClusterReplication.FollowerIndex> FollowerIndices { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/CrossClusterReplication/FollowResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/CrossClusterReplication/FollowResponse.g.cs
index c30f351af3c..c487f8dd7ce 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/CrossClusterReplication/FollowResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/CrossClusterReplication/FollowResponse.g.cs
@@ -18,20 +18,74 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.CrossClusterReplication;
 
+internal sealed partial class FollowResponseConverter : System.Text.Json.Serialization.JsonConverter<FollowResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropFollowIndexCreated = System.Text.Json.JsonEncodedText.Encode("follow_index_created");
+	private static readonly System.Text.Json.JsonEncodedText PropFollowIndexShardsAcked = System.Text.Json.JsonEncodedText.Encode("follow_index_shards_acked");
+	private static readonly System.Text.Json.JsonEncodedText PropIndexFollowingStarted = System.Text.Json.JsonEncodedText.Encode("index_following_started");
+
+	public override FollowResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propFollowIndexCreated = default;
+		LocalJsonProperty<bool> propFollowIndexShardsAcked = default;
+		LocalJsonProperty<bool> propIndexFollowingStarted = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propFollowIndexCreated.TryRead(ref reader, options, PropFollowIndexCreated))
+			{
+				continue;
+			}
+
+			if (propFollowIndexShardsAcked.TryRead(ref reader, options, PropFollowIndexShardsAcked))
+			{
+				continue;
+			}
+
+			if (propIndexFollowingStarted.TryRead(ref reader, options, PropIndexFollowingStarted))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new FollowResponse
+		{
+			FollowIndexCreated = propFollowIndexCreated.Value
+,
+			FollowIndexShardsAcked = propFollowIndexShardsAcked.Value
+,
+			IndexFollowingStarted = propIndexFollowingStarted.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, FollowResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropFollowIndexCreated, value.FollowIndexCreated);
+		writer.WriteProperty(options, PropFollowIndexShardsAcked, value.FollowIndexShardsAcked);
+		writer.WriteProperty(options, PropIndexFollowingStarted, value.IndexFollowingStarted);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(FollowResponseConverter))]
 public sealed partial class FollowResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("follow_index_created")]
 	public bool FollowIndexCreated { get; init; }
-	[JsonInclude, JsonPropertyName("follow_index_shards_acked")]
 	public bool FollowIndexShardsAcked { get; init; }
-	[JsonInclude, JsonPropertyName("index_following_started")]
 	public bool IndexFollowingStarted { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/CrossClusterReplication/FollowStatsResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/CrossClusterReplication/FollowStatsResponse.g.cs
index 46fc142371f..496f9ff5ead 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/CrossClusterReplication/FollowStatsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/CrossClusterReplication/FollowStatsResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.CrossClusterReplication;
 
+internal sealed partial class FollowStatsResponseConverter : System.Text.Json.Serialization.JsonConverter<FollowStatsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropIndices = System.Text.Json.JsonEncodedText.Encode("indices");
+
+	public override FollowStatsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.CrossClusterReplication.FollowIndexStats>> propIndices = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propIndices.TryRead(ref reader, options, PropIndices))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new FollowStatsResponse
+		{
+			Indices = propIndices.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, FollowStatsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropIndices, value.Indices);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(FollowStatsResponseConverter))]
 public sealed partial class FollowStatsResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("indices")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.CrossClusterReplication.FollowIndexStats> Indices { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/CrossClusterReplication/ForgetFollowerResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/CrossClusterReplication/ForgetFollowerResponse.g.cs
index cb86186b4b9..76bd8328f2b 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/CrossClusterReplication/ForgetFollowerResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/CrossClusterReplication/ForgetFollowerResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.CrossClusterReplication;
 
+internal sealed partial class ForgetFollowerResponseConverter : System.Text.Json.Serialization.JsonConverter<ForgetFollowerResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropShards = System.Text.Json.JsonEncodedText.Encode("_shards");
+
+	public override ForgetFollowerResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.ShardStatistics> propShards = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propShards.TryRead(ref reader, options, PropShards))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ForgetFollowerResponse
+		{
+			Shards = propShards.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ForgetFollowerResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropShards, value.Shards);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ForgetFollowerResponseConverter))]
 public sealed partial class ForgetFollowerResponse : ElasticsearchResponse
 {
-	[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/CrossClusterReplication/GetAutoFollowPatternResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/CrossClusterReplication/GetAutoFollowPatternResponse.g.cs
index 7e0562b9122..c10c0437340 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/CrossClusterReplication/GetAutoFollowPatternResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/CrossClusterReplication/GetAutoFollowPatternResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.CrossClusterReplication;
 
+internal sealed partial class GetAutoFollowPatternResponseConverter : System.Text.Json.Serialization.JsonConverter<GetAutoFollowPatternResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropPatterns = System.Text.Json.JsonEncodedText.Encode("patterns");
+
+	public override GetAutoFollowPatternResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.CrossClusterReplication.AutoFollowPattern>> propPatterns = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propPatterns.TryRead(ref reader, options, PropPatterns))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetAutoFollowPatternResponse
+		{
+			Patterns = propPatterns.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetAutoFollowPatternResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropPatterns, value.Patterns);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetAutoFollowPatternResponseConverter))]
 public sealed partial class GetAutoFollowPatternResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("patterns")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.CrossClusterReplication.AutoFollowPattern> Patterns { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/CrossClusterReplication/PauseAutoFollowPatternResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/CrossClusterReplication/PauseAutoFollowPatternResponse.g.cs
index bb6d5fb3a2e..2cbb15341ee 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/CrossClusterReplication/PauseAutoFollowPatternResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/CrossClusterReplication/PauseAutoFollowPatternResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.CrossClusterReplication;
 
+internal sealed partial class PauseAutoFollowPatternResponseConverter : System.Text.Json.Serialization.JsonConverter<PauseAutoFollowPatternResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override PauseAutoFollowPatternResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PauseAutoFollowPatternResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PauseAutoFollowPatternResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PauseAutoFollowPatternResponseConverter))]
 public sealed partial class PauseAutoFollowPatternResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class PauseAutoFollowPatternResponse : ElasticsearchRespon
 	/// 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/CrossClusterReplication/PauseFollowResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/CrossClusterReplication/PauseFollowResponse.g.cs
index 1d2496b5ce9..8c7e36af661 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/CrossClusterReplication/PauseFollowResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/CrossClusterReplication/PauseFollowResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.CrossClusterReplication;
 
+internal sealed partial class PauseFollowResponseConverter : System.Text.Json.Serialization.JsonConverter<PauseFollowResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override PauseFollowResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PauseFollowResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PauseFollowResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PauseFollowResponseConverter))]
 public sealed partial class PauseFollowResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class PauseFollowResponse : ElasticsearchResponse
 	/// 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/CrossClusterReplication/PutAutoFollowPatternResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/CrossClusterReplication/PutAutoFollowPatternResponse.g.cs
index 12a5140d0b3..0ab86b6f622 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/CrossClusterReplication/PutAutoFollowPatternResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/CrossClusterReplication/PutAutoFollowPatternResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.CrossClusterReplication;
 
+internal sealed partial class PutAutoFollowPatternResponseConverter : System.Text.Json.Serialization.JsonConverter<PutAutoFollowPatternResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override PutAutoFollowPatternResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutAutoFollowPatternResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutAutoFollowPatternResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PutAutoFollowPatternResponseConverter))]
 public sealed partial class PutAutoFollowPatternResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class PutAutoFollowPatternResponse : ElasticsearchResponse
 	/// 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/CrossClusterReplication/ResumeAutoFollowPatternResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/CrossClusterReplication/ResumeAutoFollowPatternResponse.g.cs
index c7cab6b189b..dff908edc44 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/CrossClusterReplication/ResumeAutoFollowPatternResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/CrossClusterReplication/ResumeAutoFollowPatternResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.CrossClusterReplication;
 
+internal sealed partial class ResumeAutoFollowPatternResponseConverter : System.Text.Json.Serialization.JsonConverter<ResumeAutoFollowPatternResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override ResumeAutoFollowPatternResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ResumeAutoFollowPatternResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ResumeAutoFollowPatternResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ResumeAutoFollowPatternResponseConverter))]
 public sealed partial class ResumeAutoFollowPatternResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class ResumeAutoFollowPatternResponse : ElasticsearchRespo
 	/// 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/CrossClusterReplication/ResumeFollowResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/CrossClusterReplication/ResumeFollowResponse.g.cs
index 0a11009556d..06fc5d45265 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/CrossClusterReplication/ResumeFollowResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/CrossClusterReplication/ResumeFollowResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.CrossClusterReplication;
 
+internal sealed partial class ResumeFollowResponseConverter : System.Text.Json.Serialization.JsonConverter<ResumeFollowResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override ResumeFollowResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ResumeFollowResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ResumeFollowResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ResumeFollowResponseConverter))]
 public sealed partial class ResumeFollowResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class ResumeFollowResponse : ElasticsearchResponse
 	/// 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/CrossClusterReplication/UnfollowResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/CrossClusterReplication/UnfollowResponse.g.cs
index ee58b3bcbb8..0866793a9e4 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/CrossClusterReplication/UnfollowResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/CrossClusterReplication/UnfollowResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.CrossClusterReplication;
 
+internal sealed partial class UnfollowResponseConverter : System.Text.Json.Serialization.JsonConverter<UnfollowResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override UnfollowResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new UnfollowResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, UnfollowResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(UnfollowResponseConverter))]
 public sealed partial class UnfollowResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class UnfollowResponse : ElasticsearchResponse
 	/// 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/DanglingIndices/ListDanglingIndicesResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/DanglingIndices/ListDanglingIndicesResponse.g.cs
index b84dd6c6f7f..78bb3dc4347 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/DanglingIndices/ListDanglingIndicesResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/DanglingIndices/ListDanglingIndicesResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.DanglingIndices;
 
+internal sealed partial class ListDanglingIndicesResponseConverter : System.Text.Json.Serialization.JsonConverter<ListDanglingIndicesResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropDanglingIndices = System.Text.Json.JsonEncodedText.Encode("dangling_indices");
+
+	public override ListDanglingIndicesResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.DanglingIndices.DanglingIndex>> propDanglingIndices = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propDanglingIndices.TryRead(ref reader, options, PropDanglingIndices))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ListDanglingIndicesResponse
+		{
+			DanglingIndices = propDanglingIndices.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ListDanglingIndicesResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDanglingIndices, value.DanglingIndices);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ListDanglingIndicesResponseConverter))]
 public sealed partial class ListDanglingIndicesResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("dangling_indices")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.DanglingIndices.DanglingIndex> DanglingIndices { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/DeleteByQueryResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/DeleteByQueryResponse.g.cs
index 04d1a451f0d..77923b03873 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/DeleteByQueryResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/DeleteByQueryResponse.g.cs
@@ -18,46 +18,217 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch;
 
+internal sealed partial class DeleteByQueryResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteByQueryResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropBatches = System.Text.Json.JsonEncodedText.Encode("batches");
+	private static readonly System.Text.Json.JsonEncodedText PropDeleted = System.Text.Json.JsonEncodedText.Encode("deleted");
+	private static readonly System.Text.Json.JsonEncodedText PropFailures = System.Text.Json.JsonEncodedText.Encode("failures");
+	private static readonly System.Text.Json.JsonEncodedText PropNoops = System.Text.Json.JsonEncodedText.Encode("noops");
+	private static readonly System.Text.Json.JsonEncodedText PropRequestsPerSecond = System.Text.Json.JsonEncodedText.Encode("requests_per_second");
+	private static readonly System.Text.Json.JsonEncodedText PropRetries = System.Text.Json.JsonEncodedText.Encode("retries");
+	private static readonly System.Text.Json.JsonEncodedText PropSliceId = System.Text.Json.JsonEncodedText.Encode("slice_id");
+	private static readonly System.Text.Json.JsonEncodedText PropTask = System.Text.Json.JsonEncodedText.Encode("task");
+	private static readonly System.Text.Json.JsonEncodedText PropThrottled = System.Text.Json.JsonEncodedText.Encode("throttled");
+	private static readonly System.Text.Json.JsonEncodedText PropThrottledMillis = System.Text.Json.JsonEncodedText.Encode("throttled_millis");
+	private static readonly System.Text.Json.JsonEncodedText PropThrottledUntil = System.Text.Json.JsonEncodedText.Encode("throttled_until");
+	private static readonly System.Text.Json.JsonEncodedText PropThrottledUntilMillis = System.Text.Json.JsonEncodedText.Encode("throttled_until_millis");
+	private static readonly System.Text.Json.JsonEncodedText PropTimedOut = System.Text.Json.JsonEncodedText.Encode("timed_out");
+	private static readonly System.Text.Json.JsonEncodedText PropTook = System.Text.Json.JsonEncodedText.Encode("took");
+	private static readonly System.Text.Json.JsonEncodedText PropTotal = System.Text.Json.JsonEncodedText.Encode("total");
+	private static readonly System.Text.Json.JsonEncodedText PropVersionConflicts = System.Text.Json.JsonEncodedText.Encode("version_conflicts");
+
+	public override DeleteByQueryResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<long?> propBatches = default;
+		LocalJsonProperty<long?> propDeleted = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.BulkIndexByScrollFailure>?> propFailures = default;
+		LocalJsonProperty<long?> propNoops = default;
+		LocalJsonProperty<float?> propRequestsPerSecond = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Retries?> propRetries = default;
+		LocalJsonProperty<int?> propSliceId = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.TaskId?> propTask = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Duration?> propThrottled = default;
+		LocalJsonProperty<long?> propThrottledMillis = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Duration?> propThrottledUntil = default;
+		LocalJsonProperty<long?> propThrottledUntilMillis = default;
+		LocalJsonProperty<bool?> propTimedOut = default;
+		LocalJsonProperty<long?> propTook = default;
+		LocalJsonProperty<long?> propTotal = default;
+		LocalJsonProperty<long?> propVersionConflicts = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBatches.TryRead(ref reader, options, PropBatches))
+			{
+				continue;
+			}
+
+			if (propDeleted.TryRead(ref reader, options, PropDeleted))
+			{
+				continue;
+			}
+
+			if (propFailures.TryRead(ref reader, options, PropFailures))
+			{
+				continue;
+			}
+
+			if (propNoops.TryRead(ref reader, options, PropNoops))
+			{
+				continue;
+			}
+
+			if (propRequestsPerSecond.TryRead(ref reader, options, PropRequestsPerSecond))
+			{
+				continue;
+			}
+
+			if (propRetries.TryRead(ref reader, options, PropRetries))
+			{
+				continue;
+			}
+
+			if (propSliceId.TryRead(ref reader, options, PropSliceId))
+			{
+				continue;
+			}
+
+			if (propTask.TryRead(ref reader, options, PropTask))
+			{
+				continue;
+			}
+
+			if (propThrottled.TryRead(ref reader, options, PropThrottled))
+			{
+				continue;
+			}
+
+			if (propThrottledMillis.TryRead(ref reader, options, PropThrottledMillis))
+			{
+				continue;
+			}
+
+			if (propThrottledUntil.TryRead(ref reader, options, PropThrottledUntil))
+			{
+				continue;
+			}
+
+			if (propThrottledUntilMillis.TryRead(ref reader, options, PropThrottledUntilMillis))
+			{
+				continue;
+			}
+
+			if (propTimedOut.TryRead(ref reader, options, PropTimedOut))
+			{
+				continue;
+			}
+
+			if (propTook.TryRead(ref reader, options, PropTook))
+			{
+				continue;
+			}
+
+			if (propTotal.TryRead(ref reader, options, PropTotal))
+			{
+				continue;
+			}
+
+			if (propVersionConflicts.TryRead(ref reader, options, PropVersionConflicts))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteByQueryResponse
+		{
+			Batches = propBatches.Value
+,
+			Deleted = propDeleted.Value
+,
+			Failures = propFailures.Value
+,
+			Noops = propNoops.Value
+,
+			RequestsPerSecond = propRequestsPerSecond.Value
+,
+			Retries = propRetries.Value
+,
+			SliceId = propSliceId.Value
+,
+			Task = propTask.Value
+,
+			Throttled = propThrottled.Value
+,
+			ThrottledMillis = propThrottledMillis.Value
+,
+			ThrottledUntil = propThrottledUntil.Value
+,
+			ThrottledUntilMillis = propThrottledUntilMillis.Value
+,
+			TimedOut = propTimedOut.Value
+,
+			Took = propTook.Value
+,
+			Total = propTotal.Value
+,
+			VersionConflicts = propVersionConflicts.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteByQueryResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBatches, value.Batches);
+		writer.WriteProperty(options, PropDeleted, value.Deleted);
+		writer.WriteProperty(options, PropFailures, value.Failures);
+		writer.WriteProperty(options, PropNoops, value.Noops);
+		writer.WriteProperty(options, PropRequestsPerSecond, value.RequestsPerSecond);
+		writer.WriteProperty(options, PropRetries, value.Retries);
+		writer.WriteProperty(options, PropSliceId, value.SliceId);
+		writer.WriteProperty(options, PropTask, value.Task);
+		writer.WriteProperty(options, PropThrottled, value.Throttled);
+		writer.WriteProperty(options, PropThrottledMillis, value.ThrottledMillis);
+		writer.WriteProperty(options, PropThrottledUntil, value.ThrottledUntil);
+		writer.WriteProperty(options, PropThrottledUntilMillis, value.ThrottledUntilMillis);
+		writer.WriteProperty(options, PropTimedOut, value.TimedOut);
+		writer.WriteProperty(options, PropTook, value.Took);
+		writer.WriteProperty(options, PropTotal, value.Total);
+		writer.WriteProperty(options, PropVersionConflicts, value.VersionConflicts);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteByQueryResponseConverter))]
 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/DeleteByQueryRethrottleResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/DeleteByQueryRethrottleResponse.g.cs
index 1835de4dc4b..a7517e3b9b5 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/DeleteByQueryRethrottleResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/DeleteByQueryRethrottleResponse.g.cs
@@ -18,17 +18,83 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch;
 
+internal sealed partial class DeleteByQueryRethrottleResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteByQueryRethrottleResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropNodeFailures = System.Text.Json.JsonEncodedText.Encode("node_failures");
+	private static readonly System.Text.Json.JsonEncodedText PropNodes = System.Text.Json.JsonEncodedText.Encode("nodes");
+	private static readonly System.Text.Json.JsonEncodedText PropTaskFailures = System.Text.Json.JsonEncodedText.Encode("task_failures");
+	private static readonly System.Text.Json.JsonEncodedText PropTasks = System.Text.Json.JsonEncodedText.Encode("tasks");
+
+	public override DeleteByQueryRethrottleResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.ErrorCause>?> propNodeFailures = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Tasks.NodeTasks>?> propNodes = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.TaskFailure>?> propTaskFailures = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Tasks.TaskInfos?> propTasks = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propNodeFailures.TryRead(ref reader, options, PropNodeFailures))
+			{
+				continue;
+			}
+
+			if (propNodes.TryRead(ref reader, options, PropNodes))
+			{
+				continue;
+			}
+
+			if (propTaskFailures.TryRead(ref reader, options, PropTaskFailures))
+			{
+				continue;
+			}
+
+			if (propTasks.TryRead(ref reader, options, PropTasks))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteByQueryRethrottleResponse
+		{
+			NodeFailures = propNodeFailures.Value
+,
+			Nodes = propNodes.Value
+,
+			TaskFailures = propTaskFailures.Value
+,
+			Tasks = propTasks.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteByQueryRethrottleResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropNodeFailures, value.NodeFailures);
+		writer.WriteProperty(options, PropNodes, value.Nodes);
+		writer.WriteProperty(options, PropTaskFailures, value.TaskFailures);
+		writer.WriteProperty(options, PropTasks, value.Tasks);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteByQueryRethrottleResponseConverter))]
 public sealed partial class DeleteByQueryRethrottleResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("node_failures")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.ErrorCause>? NodeFailures { get; init; }
 
 	/// <summary>
@@ -36,9 +102,7 @@ public sealed partial class DeleteByQueryRethrottleResponse : ElasticsearchRespo
 	/// Task information grouped by node, if <c>group_by</c> was set to <c>node</c> (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>
@@ -47,6 +111,5 @@ public sealed partial class DeleteByQueryRethrottleResponse : ElasticsearchRespo
 	/// <c>group_by</c> was set to <c>parents</c>.
 	/// </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/DeleteResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/DeleteResponse.g.cs
index 035076c71fd..1fd2ae210f4 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/DeleteResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/DeleteResponse.g.cs
@@ -18,30 +18,129 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch;
 
+internal sealed partial class DeleteResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropForcedRefresh = System.Text.Json.JsonEncodedText.Encode("forced_refresh");
+	private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("_id");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("_index");
+	private static readonly System.Text.Json.JsonEncodedText PropPrimaryTerm = System.Text.Json.JsonEncodedText.Encode("_primary_term");
+	private static readonly System.Text.Json.JsonEncodedText PropResult = System.Text.Json.JsonEncodedText.Encode("result");
+	private static readonly System.Text.Json.JsonEncodedText PropSeqNo = System.Text.Json.JsonEncodedText.Encode("_seq_no");
+	private static readonly System.Text.Json.JsonEncodedText PropShards = System.Text.Json.JsonEncodedText.Encode("_shards");
+	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("_version");
+
+	public override DeleteResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool?> propForcedRefresh = default;
+		LocalJsonProperty<string> propId = default;
+		LocalJsonProperty<string> propIndex = default;
+		LocalJsonProperty<long?> propPrimaryTerm = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Result> propResult = default;
+		LocalJsonProperty<long?> propSeqNo = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.ShardStatistics> propShards = default;
+		LocalJsonProperty<long> propVersion = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propForcedRefresh.TryRead(ref reader, options, PropForcedRefresh))
+			{
+				continue;
+			}
+
+			if (propId.TryRead(ref reader, options, PropId))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propPrimaryTerm.TryRead(ref reader, options, PropPrimaryTerm))
+			{
+				continue;
+			}
+
+			if (propResult.TryRead(ref reader, options, PropResult))
+			{
+				continue;
+			}
+
+			if (propSeqNo.TryRead(ref reader, options, PropSeqNo))
+			{
+				continue;
+			}
+
+			if (propShards.TryRead(ref reader, options, PropShards))
+			{
+				continue;
+			}
+
+			if (propVersion.TryRead(ref reader, options, PropVersion))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteResponse
+		{
+			ForcedRefresh = propForcedRefresh.Value
+,
+			Id = propId.Value
+,
+			Index = propIndex.Value
+,
+			PrimaryTerm = propPrimaryTerm.Value
+,
+			Result = propResult.Value
+,
+			SeqNo = propSeqNo.Value
+,
+			Shards = propShards.Value
+,
+			Version = propVersion.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropForcedRefresh, value.ForcedRefresh);
+		writer.WriteProperty(options, PropId, value.Id);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropPrimaryTerm, value.PrimaryTerm);
+		writer.WriteProperty(options, PropResult, value.Result);
+		writer.WriteProperty(options, PropSeqNo, value.SeqNo);
+		writer.WriteProperty(options, PropShards, value.Shards);
+		writer.WriteProperty(options, PropVersion, value.Version);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteResponseConverter))]
 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/DeleteScriptResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/DeleteScriptResponse.g.cs
index 660b7f3a641..42692b542a7 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/DeleteScriptResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/DeleteScriptResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch;
 
+internal sealed partial class DeleteScriptResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteScriptResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override DeleteScriptResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteScriptResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteScriptResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteScriptResponseConverter))]
 public sealed partial class DeleteScriptResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class DeleteScriptResponse : ElasticsearchResponse
 	/// 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/Enrich/DeletePolicyResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Enrich/DeletePolicyResponse.g.cs
index ce4f5649cb9..0eb6e476b95 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Enrich/DeletePolicyResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Enrich/DeletePolicyResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Enrich;
 
+internal sealed partial class DeletePolicyResponseConverter : System.Text.Json.Serialization.JsonConverter<DeletePolicyResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override DeletePolicyResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeletePolicyResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeletePolicyResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeletePolicyResponseConverter))]
 public sealed partial class DeletePolicyResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class DeletePolicyResponse : ElasticsearchResponse
 	/// 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/Enrich/EnrichStatsResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Enrich/EnrichStatsResponse.g.cs
index 9e9551fdeb4..9856e93fcdc 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Enrich/EnrichStatsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Enrich/EnrichStatsResponse.g.cs
@@ -18,14 +18,71 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Enrich;
 
+internal sealed partial class EnrichStatsResponseConverter : System.Text.Json.Serialization.JsonConverter<EnrichStatsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCacheStats = System.Text.Json.JsonEncodedText.Encode("cache_stats");
+	private static readonly System.Text.Json.JsonEncodedText PropCoordinatorStats = System.Text.Json.JsonEncodedText.Encode("coordinator_stats");
+	private static readonly System.Text.Json.JsonEncodedText PropExecutingPolicies = System.Text.Json.JsonEncodedText.Encode("executing_policies");
+
+	public override EnrichStatsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Enrich.CacheStats>?> propCacheStats = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Enrich.CoordinatorStats>> propCoordinatorStats = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Enrich.ExecutingPolicy>> propExecutingPolicies = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCacheStats.TryRead(ref reader, options, PropCacheStats))
+			{
+				continue;
+			}
+
+			if (propCoordinatorStats.TryRead(ref reader, options, PropCoordinatorStats))
+			{
+				continue;
+			}
+
+			if (propExecutingPolicies.TryRead(ref reader, options, PropExecutingPolicies))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new EnrichStatsResponse
+		{
+			CacheStats = propCacheStats.Value
+,
+			CoordinatorStats = propCoordinatorStats.Value
+,
+			ExecutingPolicies = propExecutingPolicies.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, EnrichStatsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCacheStats, value.CacheStats);
+		writer.WriteProperty(options, PropCoordinatorStats, value.CoordinatorStats);
+		writer.WriteProperty(options, PropExecutingPolicies, value.ExecutingPolicies);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(EnrichStatsResponseConverter))]
 public sealed partial class EnrichStatsResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,7 +90,6 @@ public sealed partial class EnrichStatsResponse : ElasticsearchResponse
 	/// Objects containing information about the enrich cache stats on each ingest node.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("cache_stats")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Enrich.CacheStats>? CacheStats { get; init; }
 
 	/// <summary>
@@ -41,7 +97,6 @@ public sealed partial class EnrichStatsResponse : ElasticsearchResponse
 	/// Objects containing information about each coordinating ingest node for configured enrich processors.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("coordinator_stats")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Enrich.CoordinatorStats> CoordinatorStats { get; init; }
 
 	/// <summary>
@@ -49,6 +104,5 @@ public sealed partial class EnrichStatsResponse : ElasticsearchResponse
 	/// Objects containing information about each enrich policy that is currently executing.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("executing_policies")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Enrich.ExecutingPolicy> ExecutingPolicies { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Enrich/ExecutePolicyResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Enrich/ExecutePolicyResponse.g.cs
index 16db521cad5..91946795c11 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Enrich/ExecutePolicyResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Enrich/ExecutePolicyResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Enrich;
 
+internal sealed partial class ExecutePolicyResponseConverter : System.Text.Json.Serialization.JsonConverter<ExecutePolicyResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStatus = System.Text.Json.JsonEncodedText.Encode("status");
+	private static readonly System.Text.Json.JsonEncodedText PropTaskId = System.Text.Json.JsonEncodedText.Encode("task_id");
+
+	public override ExecutePolicyResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Enrich.ExecuteEnrichPolicyStatus?> propStatus = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.TaskId?> propTaskId = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStatus.TryRead(ref reader, options, PropStatus))
+			{
+				continue;
+			}
+
+			if (propTaskId.TryRead(ref reader, options, PropTaskId))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ExecutePolicyResponse
+		{
+			Status = propStatus.Value
+,
+			TaskId = propTaskId.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ExecutePolicyResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStatus, value.Status);
+		writer.WriteProperty(options, PropTaskId, value.TaskId);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ExecutePolicyResponseConverter))]
 public sealed partial class ExecutePolicyResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("status")]
 	public Elastic.Clients.Elasticsearch.Enrich.ExecuteEnrichPolicyStatus? Status { get; init; }
-	[JsonInclude, JsonPropertyName("task_id")]
 	public Elastic.Clients.Elasticsearch.TaskId? TaskId { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Enrich/GetPolicyResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Enrich/GetPolicyResponse.g.cs
index cadd77f15f8..b36f634de16 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Enrich/GetPolicyResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Enrich/GetPolicyResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Enrich;
 
+internal sealed partial class GetPolicyResponseConverter : System.Text.Json.Serialization.JsonConverter<GetPolicyResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropPolicies = System.Text.Json.JsonEncodedText.Encode("policies");
+
+	public override GetPolicyResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Enrich.EnrichSummary>> propPolicies = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propPolicies.TryRead(ref reader, options, PropPolicies))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetPolicyResponse
+		{
+			Policies = propPolicies.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetPolicyResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropPolicies, value.Policies);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetPolicyResponseConverter))]
 public sealed partial class GetPolicyResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("policies")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Enrich.EnrichSummary> Policies { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Enrich/PutPolicyResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Enrich/PutPolicyResponse.g.cs
index b1c1eb5625c..0374a1fd710 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Enrich/PutPolicyResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Enrich/PutPolicyResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Enrich;
 
+internal sealed partial class PutPolicyResponseConverter : System.Text.Json.Serialization.JsonConverter<PutPolicyResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override PutPolicyResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutPolicyResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutPolicyResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PutPolicyResponseConverter))]
 public sealed partial class PutPolicyResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class PutPolicyResponse : ElasticsearchResponse
 	/// 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/EqlDeleteResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/EqlDeleteResponse.g.cs
index 2ab88cfe2cc..6802670cf42 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/EqlDeleteResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/EqlDeleteResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Eql;
 
+internal sealed partial class EqlDeleteResponseConverter : System.Text.Json.Serialization.JsonConverter<EqlDeleteResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override EqlDeleteResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new EqlDeleteResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, EqlDeleteResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(EqlDeleteResponseConverter))]
 public sealed partial class EqlDeleteResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class EqlDeleteResponse : ElasticsearchResponse
 	/// 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/EqlGetResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/EqlGetResponse.g.cs
index ccdd1f5ef9d..182f04efe2d 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/EqlGetResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/EqlGetResponse.g.cs
@@ -18,14 +18,128 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Eql;
 
+internal sealed partial class EqlGetResponseConverter<TEvent> : System.Text.Json.Serialization.JsonConverter<EqlGetResponse<TEvent>>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropHits = System.Text.Json.JsonEncodedText.Encode("hits");
+	private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("id");
+	private static readonly System.Text.Json.JsonEncodedText PropIsPartial = System.Text.Json.JsonEncodedText.Encode("is_partial");
+	private static readonly System.Text.Json.JsonEncodedText PropIsRunning = System.Text.Json.JsonEncodedText.Encode("is_running");
+	private static readonly System.Text.Json.JsonEncodedText PropShardFailures = System.Text.Json.JsonEncodedText.Encode("shard_failures");
+	private static readonly System.Text.Json.JsonEncodedText PropTimedOut = System.Text.Json.JsonEncodedText.Encode("timed_out");
+	private static readonly System.Text.Json.JsonEncodedText PropTook = System.Text.Json.JsonEncodedText.Encode("took");
+
+	public override EqlGetResponse<TEvent> Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Eql.EqlHits<TEvent>> propHits = default;
+		LocalJsonProperty<string?> propId = default;
+		LocalJsonProperty<bool?> propIsPartial = default;
+		LocalJsonProperty<bool?> propIsRunning = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.ShardFailure>?> propShardFailures = default;
+		LocalJsonProperty<bool?> propTimedOut = default;
+		LocalJsonProperty<long?> propTook = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propHits.TryRead(ref reader, options, PropHits))
+			{
+				continue;
+			}
+
+			if (propId.TryRead(ref reader, options, PropId))
+			{
+				continue;
+			}
+
+			if (propIsPartial.TryRead(ref reader, options, PropIsPartial))
+			{
+				continue;
+			}
+
+			if (propIsRunning.TryRead(ref reader, options, PropIsRunning))
+			{
+				continue;
+			}
+
+			if (propShardFailures.TryRead(ref reader, options, PropShardFailures))
+			{
+				continue;
+			}
+
+			if (propTimedOut.TryRead(ref reader, options, PropTimedOut))
+			{
+				continue;
+			}
+
+			if (propTook.TryRead(ref reader, options, PropTook))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new EqlGetResponse<TEvent>
+		{
+			Hits = propHits.Value
+,
+			Id = propId.Value
+,
+			IsPartial = propIsPartial.Value
+,
+			IsRunning = propIsRunning.Value
+,
+			ShardFailures = propShardFailures.Value
+,
+			TimedOut = propTimedOut.Value
+,
+			Took = propTook.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, EqlGetResponse<TEvent> value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropHits, value.Hits);
+		writer.WriteProperty(options, PropId, value.Id);
+		writer.WriteProperty(options, PropIsPartial, value.IsPartial);
+		writer.WriteProperty(options, PropIsRunning, value.IsRunning);
+		writer.WriteProperty(options, PropShardFailures, value.ShardFailures);
+		writer.WriteProperty(options, PropTimedOut, value.TimedOut);
+		writer.WriteProperty(options, PropTook, value.Took);
+		writer.WriteEndObject();
+	}
+}
+
+internal sealed partial class EqlGetResponseConverterFactory : System.Text.Json.Serialization.JsonConverterFactory
+{
+	public override bool CanConvert(System.Type typeToConvert)
+	{
+		return typeToConvert.IsGenericType && typeToConvert.GetGenericTypeDefinition() == typeof(EqlGetResponse<>);
+	}
+
+	public override System.Text.Json.Serialization.JsonConverter CreateConverter(System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		var args = typeToConvert.GetGenericArguments();
+#pragma warning disable IL3050
+		var converter = (System.Text.Json.Serialization.JsonConverter)System.Activator.CreateInstance(typeof(EqlGetResponseConverter<>).MakeGenericType(args[0]), System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public, binder: null, args: null, culture: null)!;
+#pragma warning restore IL3050
+		return converter;
+	}
+}
+
+[JsonConverter(typeof(EqlGetResponseConverterFactory))]
 public sealed partial class EqlGetResponse<TEvent> : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,7 +147,6 @@ public sealed partial class EqlGetResponse<TEvent> : ElasticsearchResponse
 	/// 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>
@@ -41,7 +154,6 @@ public sealed partial class EqlGetResponse<TEvent> : ElasticsearchResponse
 	/// Identifier for the search.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("id")]
 	public string? Id { get; init; }
 
 	/// <summary>
@@ -49,7 +161,6 @@ public sealed partial class EqlGetResponse<TEvent> : ElasticsearchResponse
 	/// If true, the response does not contain complete search results.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("is_partial")]
 	public bool? IsPartial { get; init; }
 
 	/// <summary>
@@ -57,7 +168,6 @@ public sealed partial class EqlGetResponse<TEvent> : ElasticsearchResponse
 	/// If true, the search request is still executing.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("is_running")]
 	public bool? IsRunning { get; init; }
 
 	/// <summary>
@@ -65,7 +175,6 @@ public sealed partial class EqlGetResponse<TEvent> : ElasticsearchResponse
 	/// Contains information about shard failures (if any), in case allow_partial_search_results=true
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("shard_failures")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.ShardFailure>? ShardFailures { get; init; }
 
 	/// <summary>
@@ -73,7 +182,6 @@ public sealed partial class EqlGetResponse<TEvent> : ElasticsearchResponse
 	/// If true, the request timed out before completion.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("timed_out")]
 	public bool? TimedOut { get; init; }
 
 	/// <summary>
@@ -81,6 +189,5 @@ public sealed partial class EqlGetResponse<TEvent> : ElasticsearchResponse
 	/// 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 5f88564f66a..31a2ecf245c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/EqlSearchRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/EqlSearchRequest.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport;
@@ -43,6 +44,199 @@ public sealed partial class EqlSearchRequestParameters : RequestParameters
 	public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
 }
 
+internal sealed partial class EqlSearchRequestConverter : System.Text.Json.Serialization.JsonConverter<EqlSearchRequest>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAllowPartialSearchResults = System.Text.Json.JsonEncodedText.Encode("allow_partial_search_results");
+	private static readonly System.Text.Json.JsonEncodedText PropAllowPartialSequenceResults = System.Text.Json.JsonEncodedText.Encode("allow_partial_sequence_results");
+	private static readonly System.Text.Json.JsonEncodedText PropCaseSensitive = System.Text.Json.JsonEncodedText.Encode("case_sensitive");
+	private static readonly System.Text.Json.JsonEncodedText PropEventCategoryField = System.Text.Json.JsonEncodedText.Encode("event_category_field");
+	private static readonly System.Text.Json.JsonEncodedText PropFetchSize = System.Text.Json.JsonEncodedText.Encode("fetch_size");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropFilter = System.Text.Json.JsonEncodedText.Encode("filter");
+	private static readonly System.Text.Json.JsonEncodedText PropKeepAlive = System.Text.Json.JsonEncodedText.Encode("keep_alive");
+	private static readonly System.Text.Json.JsonEncodedText PropKeepOnCompletion = System.Text.Json.JsonEncodedText.Encode("keep_on_completion");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxSamplesPerKey = System.Text.Json.JsonEncodedText.Encode("max_samples_per_key");
+	private static readonly System.Text.Json.JsonEncodedText PropQuery = System.Text.Json.JsonEncodedText.Encode("query");
+	private static readonly System.Text.Json.JsonEncodedText PropResultPosition = System.Text.Json.JsonEncodedText.Encode("result_position");
+	private static readonly System.Text.Json.JsonEncodedText PropRuntimeMappings = System.Text.Json.JsonEncodedText.Encode("runtime_mappings");
+	private static readonly System.Text.Json.JsonEncodedText PropSize = System.Text.Json.JsonEncodedText.Encode("size");
+	private static readonly System.Text.Json.JsonEncodedText PropTiebreakerField = System.Text.Json.JsonEncodedText.Encode("tiebreaker_field");
+	private static readonly System.Text.Json.JsonEncodedText PropTimestampField = System.Text.Json.JsonEncodedText.Encode("timestamp_field");
+	private static readonly System.Text.Json.JsonEncodedText PropWaitForCompletionTimeout = System.Text.Json.JsonEncodedText.Encode("wait_for_completion_timeout");
+
+	public override EqlSearchRequest Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool?> propAllowPartialSearchResults = default;
+		LocalJsonProperty<bool?> propAllowPartialSequenceResults = default;
+		LocalJsonProperty<bool?> propCaseSensitive = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Field?> propEventCategoryField = default;
+		LocalJsonProperty<int?> propFetchSize = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.QueryDsl.FieldAndFormat>?> propFields = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.QueryDsl.Query>?> propFilter = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Duration?> propKeepAlive = default;
+		LocalJsonProperty<bool?> propKeepOnCompletion = default;
+		LocalJsonProperty<int?> propMaxSamplesPerKey = default;
+		LocalJsonProperty<string> propQuery = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Eql.ResultPosition?> propResultPosition = default;
+		LocalJsonProperty<IDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>?> propRuntimeMappings = default;
+		LocalJsonProperty<int?> propSize = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Field?> propTiebreakerField = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Field?> propTimestampField = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Duration?> propWaitForCompletionTimeout = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAllowPartialSearchResults.TryRead(ref reader, options, PropAllowPartialSearchResults))
+			{
+				continue;
+			}
+
+			if (propAllowPartialSequenceResults.TryRead(ref reader, options, PropAllowPartialSequenceResults))
+			{
+				continue;
+			}
+
+			if (propCaseSensitive.TryRead(ref reader, options, PropCaseSensitive))
+			{
+				continue;
+			}
+
+			if (propEventCategoryField.TryRead(ref reader, options, PropEventCategoryField))
+			{
+				continue;
+			}
+
+			if (propFetchSize.TryRead(ref reader, options, PropFetchSize))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.QueryDsl.FieldAndFormat>?, Elastic.Clients.Elasticsearch.QueryDsl.FieldAndFormat>)))
+			{
+				continue;
+			}
+
+			if (propFilter.TryRead(ref reader, options, PropFilter, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.QueryDsl.Query>?, Elastic.Clients.Elasticsearch.QueryDsl.Query>)))
+			{
+				continue;
+			}
+
+			if (propKeepAlive.TryRead(ref reader, options, PropKeepAlive))
+			{
+				continue;
+			}
+
+			if (propKeepOnCompletion.TryRead(ref reader, options, PropKeepOnCompletion))
+			{
+				continue;
+			}
+
+			if (propMaxSamplesPerKey.TryRead(ref reader, options, PropMaxSamplesPerKey))
+			{
+				continue;
+			}
+
+			if (propQuery.TryRead(ref reader, options, PropQuery))
+			{
+				continue;
+			}
+
+			if (propResultPosition.TryRead(ref reader, options, PropResultPosition))
+			{
+				continue;
+			}
+
+			if (propRuntimeMappings.TryRead(ref reader, options, PropRuntimeMappings))
+			{
+				continue;
+			}
+
+			if (propSize.TryRead(ref reader, options, PropSize))
+			{
+				continue;
+			}
+
+			if (propTiebreakerField.TryRead(ref reader, options, PropTiebreakerField))
+			{
+				continue;
+			}
+
+			if (propTimestampField.TryRead(ref reader, options, PropTimestampField))
+			{
+				continue;
+			}
+
+			if (propWaitForCompletionTimeout.TryRead(ref reader, options, PropWaitForCompletionTimeout))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new EqlSearchRequest
+		{
+			AllowPartialSearchResults = propAllowPartialSearchResults.Value
+	,
+			AllowPartialSequenceResults = propAllowPartialSequenceResults.Value
+	,
+			CaseSensitive = propCaseSensitive.Value
+	,
+			EventCategoryField = propEventCategoryField.Value
+	,
+			FetchSize = propFetchSize.Value
+	,
+			Fields = propFields.Value
+	,
+			Filter = propFilter.Value
+	,
+			KeepAlive = propKeepAlive.Value
+	,
+			KeepOnCompletion = propKeepOnCompletion.Value
+	,
+			MaxSamplesPerKey = propMaxSamplesPerKey.Value
+	,
+			Query = propQuery.Value
+	,
+			ResultPosition = propResultPosition.Value
+	,
+			RuntimeMappings = propRuntimeMappings.Value
+	,
+			Size = propSize.Value
+	,
+			TiebreakerField = propTiebreakerField.Value
+	,
+			TimestampField = propTimestampField.Value
+	,
+			WaitForCompletionTimeout = propWaitForCompletionTimeout.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, EqlSearchRequest value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAllowPartialSearchResults, value.AllowPartialSearchResults);
+		writer.WriteProperty(options, PropAllowPartialSequenceResults, value.AllowPartialSequenceResults);
+		writer.WriteProperty(options, PropCaseSensitive, value.CaseSensitive);
+		writer.WriteProperty(options, PropEventCategoryField, value.EventCategoryField);
+		writer.WriteProperty(options, PropFetchSize, value.FetchSize);
+		writer.WriteProperty(options, PropFields, value.Fields, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.QueryDsl.FieldAndFormat>?, Elastic.Clients.Elasticsearch.QueryDsl.FieldAndFormat>));
+		writer.WriteProperty(options, PropFilter, value.Filter, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.QueryDsl.Query>?, Elastic.Clients.Elasticsearch.QueryDsl.Query>));
+		writer.WriteProperty(options, PropKeepAlive, value.KeepAlive);
+		writer.WriteProperty(options, PropKeepOnCompletion, value.KeepOnCompletion);
+		writer.WriteProperty(options, PropMaxSamplesPerKey, value.MaxSamplesPerKey);
+		writer.WriteProperty(options, PropQuery, value.Query);
+		writer.WriteProperty(options, PropResultPosition, value.ResultPosition);
+		writer.WriteProperty(options, PropRuntimeMappings, value.RuntimeMappings);
+		writer.WriteProperty(options, PropSize, value.Size);
+		writer.WriteProperty(options, PropTiebreakerField, value.TiebreakerField);
+		writer.WriteProperty(options, PropTimestampField, value.TimestampField);
+		writer.WriteProperty(options, PropWaitForCompletionTimeout, value.WaitForCompletionTimeout);
+		writer.WriteEndObject();
+	}
+}
+
 /// <summary>
 /// <para>
 /// Get EQL search results.
@@ -50,6 +244,7 @@ public sealed partial class EqlSearchRequestParameters : RequestParameters
 /// EQL assumes each document in a data stream or index corresponds to an event.
 /// </para>
 /// </summary>
+[JsonConverter(typeof(EqlSearchRequestConverter))]
 public sealed partial class EqlSearchRequest : PlainRequest<EqlSearchRequestParameters>
 {
 	public EqlSearchRequest(Elastic.Clients.Elasticsearch.Indices indices) : base(r => r.Required("index", indices))
@@ -64,9 +259,7 @@ public EqlSearchRequest(Elastic.Clients.Elasticsearch.Indices indices) : base(r
 
 	internal override string OperationName => "eql.search";
 
-	[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>
@@ -74,13 +267,9 @@ public EqlSearchRequest(Elastic.Clients.Elasticsearch.Indices indices) : base(r
 	/// 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); }
-	[JsonInclude, JsonPropertyName("allow_partial_search_results")]
 	public bool? AllowPartialSearchResults { get; set; }
-	[JsonInclude, JsonPropertyName("allow_partial_sequence_results")]
 	public bool? AllowPartialSequenceResults { get; set; }
-	[JsonInclude, JsonPropertyName("case_sensitive")]
 	public bool? CaseSensitive { get; set; }
 
 	/// <summary>
@@ -88,7 +277,6 @@ public EqlSearchRequest(Elastic.Clients.Elasticsearch.Indices indices) : base(r
 	/// 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>
@@ -96,7 +284,6 @@ public EqlSearchRequest(Elastic.Clients.Elasticsearch.Indices indices) : base(r
 	/// Maximum number of events to search at a time for sequence queries.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("fetch_size")]
 	public int? FetchSize { get; set; }
 
 	/// <summary>
@@ -104,8 +291,6 @@ public EqlSearchRequest(Elastic.Clients.Elasticsearch.Indices indices) : base(r
 	/// 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; }
 
 	/// <summary>
@@ -113,12 +298,8 @@ public EqlSearchRequest(Elastic.Clients.Elasticsearch.Indices indices) : base(r
 	/// 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; }
 
 	/// <summary>
@@ -128,7 +309,6 @@ public EqlSearchRequest(Elastic.Clients.Elasticsearch.Indices indices) : base(r
 	/// <c>max_samples_per_key</c> parameter. Pipes are not supported for sample queries.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("max_samples_per_key")]
 	public int? MaxSamplesPerKey { get; set; }
 
 	/// <summary>
@@ -136,11 +316,8 @@ public EqlSearchRequest(Elastic.Clients.Elasticsearch.Indices indices) : base(r
 	/// EQL query you wish to run.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("query")]
 	public string Query { 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>
@@ -148,7 +325,6 @@ public EqlSearchRequest(Elastic.Clients.Elasticsearch.Indices indices) : base(r
 	/// 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>
@@ -156,7 +332,6 @@ public EqlSearchRequest(Elastic.Clients.Elasticsearch.Indices indices) : base(r
 	/// 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>
@@ -164,9 +339,7 @@ public EqlSearchRequest(Elastic.Clients.Elasticsearch.Indices indices) : base(r
 	/// Field containing event timestamp. Default "@timestamp"
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("timestamp_field")]
 	public Elastic.Clients.Elasticsearch.Field? TimestampField { get; set; }
-	[JsonInclude, JsonPropertyName("wait_for_completion_timeout")]
 	public Elastic.Clients.Elasticsearch.Duration? WaitForCompletionTimeout { get; set; }
 }
 
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 720dbc35012..4d721f96ccf 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/EqlSearchResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/EqlSearchResponse.g.cs
@@ -18,14 +18,128 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Eql;
 
+internal sealed partial class EqlSearchResponseConverter<TEvent> : System.Text.Json.Serialization.JsonConverter<EqlSearchResponse<TEvent>>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropHits = System.Text.Json.JsonEncodedText.Encode("hits");
+	private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("id");
+	private static readonly System.Text.Json.JsonEncodedText PropIsPartial = System.Text.Json.JsonEncodedText.Encode("is_partial");
+	private static readonly System.Text.Json.JsonEncodedText PropIsRunning = System.Text.Json.JsonEncodedText.Encode("is_running");
+	private static readonly System.Text.Json.JsonEncodedText PropShardFailures = System.Text.Json.JsonEncodedText.Encode("shard_failures");
+	private static readonly System.Text.Json.JsonEncodedText PropTimedOut = System.Text.Json.JsonEncodedText.Encode("timed_out");
+	private static readonly System.Text.Json.JsonEncodedText PropTook = System.Text.Json.JsonEncodedText.Encode("took");
+
+	public override EqlSearchResponse<TEvent> Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Eql.EqlHits<TEvent>> propHits = default;
+		LocalJsonProperty<string?> propId = default;
+		LocalJsonProperty<bool?> propIsPartial = default;
+		LocalJsonProperty<bool?> propIsRunning = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.ShardFailure>?> propShardFailures = default;
+		LocalJsonProperty<bool?> propTimedOut = default;
+		LocalJsonProperty<long?> propTook = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propHits.TryRead(ref reader, options, PropHits))
+			{
+				continue;
+			}
+
+			if (propId.TryRead(ref reader, options, PropId))
+			{
+				continue;
+			}
+
+			if (propIsPartial.TryRead(ref reader, options, PropIsPartial))
+			{
+				continue;
+			}
+
+			if (propIsRunning.TryRead(ref reader, options, PropIsRunning))
+			{
+				continue;
+			}
+
+			if (propShardFailures.TryRead(ref reader, options, PropShardFailures))
+			{
+				continue;
+			}
+
+			if (propTimedOut.TryRead(ref reader, options, PropTimedOut))
+			{
+				continue;
+			}
+
+			if (propTook.TryRead(ref reader, options, PropTook))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new EqlSearchResponse<TEvent>
+		{
+			Hits = propHits.Value
+,
+			Id = propId.Value
+,
+			IsPartial = propIsPartial.Value
+,
+			IsRunning = propIsRunning.Value
+,
+			ShardFailures = propShardFailures.Value
+,
+			TimedOut = propTimedOut.Value
+,
+			Took = propTook.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, EqlSearchResponse<TEvent> value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropHits, value.Hits);
+		writer.WriteProperty(options, PropId, value.Id);
+		writer.WriteProperty(options, PropIsPartial, value.IsPartial);
+		writer.WriteProperty(options, PropIsRunning, value.IsRunning);
+		writer.WriteProperty(options, PropShardFailures, value.ShardFailures);
+		writer.WriteProperty(options, PropTimedOut, value.TimedOut);
+		writer.WriteProperty(options, PropTook, value.Took);
+		writer.WriteEndObject();
+	}
+}
+
+internal sealed partial class EqlSearchResponseConverterFactory : System.Text.Json.Serialization.JsonConverterFactory
+{
+	public override bool CanConvert(System.Type typeToConvert)
+	{
+		return typeToConvert.IsGenericType && typeToConvert.GetGenericTypeDefinition() == typeof(EqlSearchResponse<>);
+	}
+
+	public override System.Text.Json.Serialization.JsonConverter CreateConverter(System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		var args = typeToConvert.GetGenericArguments();
+#pragma warning disable IL3050
+		var converter = (System.Text.Json.Serialization.JsonConverter)System.Activator.CreateInstance(typeof(EqlSearchResponseConverter<>).MakeGenericType(args[0]), System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public, binder: null, args: null, culture: null)!;
+#pragma warning restore IL3050
+		return converter;
+	}
+}
+
+[JsonConverter(typeof(EqlSearchResponseConverterFactory))]
 public sealed partial class EqlSearchResponse<TEvent> : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,7 +147,6 @@ public sealed partial class EqlSearchResponse<TEvent> : ElasticsearchResponse
 	/// 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>
@@ -41,7 +154,6 @@ public sealed partial class EqlSearchResponse<TEvent> : ElasticsearchResponse
 	/// Identifier for the search.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("id")]
 	public string? Id { get; init; }
 
 	/// <summary>
@@ -49,7 +161,6 @@ public sealed partial class EqlSearchResponse<TEvent> : ElasticsearchResponse
 	/// If true, the response does not contain complete search results.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("is_partial")]
 	public bool? IsPartial { get; init; }
 
 	/// <summary>
@@ -57,7 +168,6 @@ public sealed partial class EqlSearchResponse<TEvent> : ElasticsearchResponse
 	/// If true, the search request is still executing.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("is_running")]
 	public bool? IsRunning { get; init; }
 
 	/// <summary>
@@ -65,7 +175,6 @@ public sealed partial class EqlSearchResponse<TEvent> : ElasticsearchResponse
 	/// Contains information about shard failures (if any), in case allow_partial_search_results=true
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("shard_failures")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.ShardFailure>? ShardFailures { get; init; }
 
 	/// <summary>
@@ -73,7 +182,6 @@ public sealed partial class EqlSearchResponse<TEvent> : ElasticsearchResponse
 	/// If true, the request timed out before completion.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("timed_out")]
 	public bool? TimedOut { get; init; }
 
 	/// <summary>
@@ -81,6 +189,5 @@ public sealed partial class EqlSearchResponse<TEvent> : ElasticsearchResponse
 	/// 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/GetEqlStatusResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/GetEqlStatusResponse.g.cs
index a087b94c3a8..a013c9b13dd 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/GetEqlStatusResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/GetEqlStatusResponse.g.cs
@@ -18,14 +18,101 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Eql;
 
+internal sealed partial class GetEqlStatusResponseConverter : System.Text.Json.Serialization.JsonConverter<GetEqlStatusResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCompletionStatus = System.Text.Json.JsonEncodedText.Encode("completion_status");
+	private static readonly System.Text.Json.JsonEncodedText PropExpirationTimeInMillis = System.Text.Json.JsonEncodedText.Encode("expiration_time_in_millis");
+	private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("id");
+	private static readonly System.Text.Json.JsonEncodedText PropIsPartial = System.Text.Json.JsonEncodedText.Encode("is_partial");
+	private static readonly System.Text.Json.JsonEncodedText PropIsRunning = System.Text.Json.JsonEncodedText.Encode("is_running");
+	private static readonly System.Text.Json.JsonEncodedText PropStartTimeInMillis = System.Text.Json.JsonEncodedText.Encode("start_time_in_millis");
+
+	public override GetEqlStatusResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<int?> propCompletionStatus = default;
+		LocalJsonProperty<long?> propExpirationTimeInMillis = default;
+		LocalJsonProperty<string> propId = default;
+		LocalJsonProperty<bool> propIsPartial = default;
+		LocalJsonProperty<bool> propIsRunning = default;
+		LocalJsonProperty<long?> propStartTimeInMillis = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCompletionStatus.TryRead(ref reader, options, PropCompletionStatus))
+			{
+				continue;
+			}
+
+			if (propExpirationTimeInMillis.TryRead(ref reader, options, PropExpirationTimeInMillis))
+			{
+				continue;
+			}
+
+			if (propId.TryRead(ref reader, options, PropId))
+			{
+				continue;
+			}
+
+			if (propIsPartial.TryRead(ref reader, options, PropIsPartial))
+			{
+				continue;
+			}
+
+			if (propIsRunning.TryRead(ref reader, options, PropIsRunning))
+			{
+				continue;
+			}
+
+			if (propStartTimeInMillis.TryRead(ref reader, options, PropStartTimeInMillis))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetEqlStatusResponse
+		{
+			CompletionStatus = propCompletionStatus.Value
+,
+			ExpirationTimeInMillis = propExpirationTimeInMillis.Value
+,
+			Id = propId.Value
+,
+			IsPartial = propIsPartial.Value
+,
+			IsRunning = propIsRunning.Value
+,
+			StartTimeInMillis = propStartTimeInMillis.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetEqlStatusResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCompletionStatus, value.CompletionStatus);
+		writer.WriteProperty(options, PropExpirationTimeInMillis, value.ExpirationTimeInMillis);
+		writer.WriteProperty(options, PropId, value.Id);
+		writer.WriteProperty(options, PropIsPartial, value.IsPartial);
+		writer.WriteProperty(options, PropIsRunning, value.IsRunning);
+		writer.WriteProperty(options, PropStartTimeInMillis, value.StartTimeInMillis);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetEqlStatusResponseConverter))]
 public sealed partial class GetEqlStatusResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,7 +120,6 @@ public sealed partial class GetEqlStatusResponse : ElasticsearchResponse
 	/// 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>
@@ -41,7 +127,6 @@ public sealed partial class GetEqlStatusResponse : ElasticsearchResponse
 	/// 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>
@@ -49,7 +134,6 @@ public sealed partial class GetEqlStatusResponse : ElasticsearchResponse
 	/// Identifier for the search.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("id")]
 	public string Id { get; init; }
 
 	/// <summary>
@@ -57,7 +141,6 @@ public sealed partial class GetEqlStatusResponse : ElasticsearchResponse
 	/// 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>
@@ -65,7 +148,6 @@ public sealed partial class GetEqlStatusResponse : ElasticsearchResponse
 	/// 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>
@@ -73,6 +155,5 @@ public sealed partial class GetEqlStatusResponse : ElasticsearchResponse
 	/// 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/ExplainResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/ExplainResponse.g.cs
index 507b277bdfe..d27698fb2eb 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/ExplainResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/ExplainResponse.g.cs
@@ -18,24 +18,113 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch;
 
+internal sealed partial class ExplainResponseConverter<TDocument> : System.Text.Json.Serialization.JsonConverter<ExplainResponse<TDocument>>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropExplanation = System.Text.Json.JsonEncodedText.Encode("explanation");
+	private static readonly System.Text.Json.JsonEncodedText PropGet = System.Text.Json.JsonEncodedText.Encode("get");
+	private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("_id");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("_index");
+	private static readonly System.Text.Json.JsonEncodedText PropMatched = System.Text.Json.JsonEncodedText.Encode("matched");
+
+	public override ExplainResponse<TDocument> Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Core.Explain.ExplanationDetail?> propExplanation = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.InlineGet<TDocument>?> propGet = default;
+		LocalJsonProperty<string> propId = default;
+		LocalJsonProperty<string> propIndex = default;
+		LocalJsonProperty<bool> propMatched = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propExplanation.TryRead(ref reader, options, PropExplanation))
+			{
+				continue;
+			}
+
+			if (propGet.TryRead(ref reader, options, PropGet))
+			{
+				continue;
+			}
+
+			if (propId.TryRead(ref reader, options, PropId))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propMatched.TryRead(ref reader, options, PropMatched))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ExplainResponse<TDocument>
+		{
+			Explanation = propExplanation.Value
+,
+			Get = propGet.Value
+,
+			Id = propId.Value
+,
+			Index = propIndex.Value
+,
+			Matched = propMatched.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ExplainResponse<TDocument> value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropExplanation, value.Explanation);
+		writer.WriteProperty(options, PropGet, value.Get);
+		writer.WriteProperty(options, PropId, value.Id);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropMatched, value.Matched);
+		writer.WriteEndObject();
+	}
+}
+
+internal sealed partial class ExplainResponseConverterFactory : System.Text.Json.Serialization.JsonConverterFactory
+{
+	public override bool CanConvert(System.Type typeToConvert)
+	{
+		return typeToConvert.IsGenericType && typeToConvert.GetGenericTypeDefinition() == typeof(ExplainResponse<>);
+	}
+
+	public override System.Text.Json.Serialization.JsonConverter CreateConverter(System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		var args = typeToConvert.GetGenericArguments();
+#pragma warning disable IL3050
+		var converter = (System.Text.Json.Serialization.JsonConverter)System.Activator.CreateInstance(typeof(ExplainResponseConverter<>).MakeGenericType(args[0]), System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public, binder: null, args: null, culture: null)!;
+#pragma warning restore IL3050
+		return converter;
+	}
+}
+
+[JsonConverter(typeof(ExplainResponseConverterFactory))]
 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/Features/GetFeaturesResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Features/GetFeaturesResponse.g.cs
index 330a44bf3e4..aa27e1f32b4 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Features/GetFeaturesResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Features/GetFeaturesResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Features;
 
+internal sealed partial class GetFeaturesResponseConverter : System.Text.Json.Serialization.JsonConverter<GetFeaturesResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropFeatures = System.Text.Json.JsonEncodedText.Encode("features");
+
+	public override GetFeaturesResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Features.Feature>> propFeatures = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propFeatures.TryRead(ref reader, options, PropFeatures))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetFeaturesResponse
+		{
+			Features = propFeatures.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetFeaturesResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropFeatures, value.Features);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetFeaturesResponseConverter))]
 public sealed partial class GetFeaturesResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("features")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Features.Feature> Features { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Features/ResetFeaturesResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Features/ResetFeaturesResponse.g.cs
index d92067d295e..b104f26d970 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Features/ResetFeaturesResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Features/ResetFeaturesResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Features;
 
+internal sealed partial class ResetFeaturesResponseConverter : System.Text.Json.Serialization.JsonConverter<ResetFeaturesResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropFeatures = System.Text.Json.JsonEncodedText.Encode("features");
+
+	public override ResetFeaturesResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Features.Feature>> propFeatures = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propFeatures.TryRead(ref reader, options, PropFeatures))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ResetFeaturesResponse
+		{
+			Features = propFeatures.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ResetFeaturesResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropFeatures, value.Features);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ResetFeaturesResponseConverter))]
 public sealed partial class ResetFeaturesResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("features")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Features.Feature> Features { 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 40ca0aa9140..a2c776081e8 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/FieldCapsRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/FieldCapsRequest.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport;
@@ -84,6 +85,59 @@ public sealed partial class FieldCapsRequestParameters : RequestParameters
 	public ICollection<string>? Types { get => Q<ICollection<string>?>("types"); set => Q("types", value); }
 }
 
+internal sealed partial class FieldCapsRequestConverter : System.Text.Json.Serialization.JsonConverter<FieldCapsRequest>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropIndexFilter = System.Text.Json.JsonEncodedText.Encode("index_filter");
+	private static readonly System.Text.Json.JsonEncodedText PropRuntimeMappings = System.Text.Json.JsonEncodedText.Encode("runtime_mappings");
+
+	public override FieldCapsRequest Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Fields?> propFields = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.QueryDsl.Query?> propIndexFilter = default;
+		LocalJsonProperty<IDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>?> propRuntimeMappings = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propFields.TryRead(ref reader, options, PropFields, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propIndexFilter.TryRead(ref reader, options, PropIndexFilter))
+			{
+				continue;
+			}
+
+			if (propRuntimeMappings.TryRead(ref reader, options, PropRuntimeMappings))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new FieldCapsRequest
+		{
+			Fields = propFields.Value
+	,
+			IndexFilter = propIndexFilter.Value
+	,
+			RuntimeMappings = propRuntimeMappings.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, FieldCapsRequest value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropFields, value.Fields, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropIndexFilter, value.IndexFilter);
+		writer.WriteProperty(options, PropRuntimeMappings, value.RuntimeMappings);
+		writer.WriteEndObject();
+	}
+}
+
 /// <summary>
 /// <para>
 /// Get the field capabilities.
@@ -97,6 +151,7 @@ public sealed partial class FieldCapsRequestParameters : RequestParameters
 /// For example, a runtime field with a type of keyword is returned the same as any other field that belongs to the <c>keyword</c> family.
 /// </para>
 /// </summary>
+[JsonConverter(typeof(FieldCapsRequestConverter))]
 public sealed partial class FieldCapsRequest : PlainRequest<FieldCapsRequestParameters>
 {
 	public FieldCapsRequest()
@@ -122,7 +177,6 @@ public FieldCapsRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r
 	/// targeting <c>foo*,bar*</c> 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>
@@ -130,7 +184,6 @@ public FieldCapsRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r
 	/// 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 <c>open,hidden</c>.
 	/// </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>
@@ -138,7 +191,6 @@ public FieldCapsRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r
 	/// 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>
@@ -146,7 +198,6 @@ public FieldCapsRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r
 	/// If <c>true</c>, 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>
@@ -154,7 +205,6 @@ public FieldCapsRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r
 	/// If false, empty fields are not included in the response.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public bool? IncludeEmptyFields { get => Q<bool?>("include_empty_fields"); set => Q("include_empty_fields", value); }
 
 	/// <summary>
@@ -162,7 +212,6 @@ public FieldCapsRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r
 	/// 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>
@@ -170,7 +219,6 @@ public FieldCapsRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r
 	/// 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>
@@ -178,8 +226,6 @@ public FieldCapsRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r
 	/// List of fields to retrieve capabilities for. Wildcard (<c>*</c>) expressions are supported.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("fields")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Fields? Fields { get; set; }
 
 	/// <summary>
@@ -187,7 +233,6 @@ public FieldCapsRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r
 	/// 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>
@@ -196,7 +241,6 @@ public FieldCapsRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r
 	/// 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; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/FieldCapsResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/FieldCapsResponse.g.cs
index 1f2841fe397..515a932fd39 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/FieldCapsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/FieldCapsResponse.g.cs
@@ -18,20 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch;
 
+internal sealed partial class FieldCapsResponseConverter : System.Text.Json.Serialization.JsonConverter<FieldCapsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropIndices = System.Text.Json.JsonEncodedText.Encode("indices");
+
+	public override FieldCapsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyDictionary<Elastic.Clients.Elasticsearch.Field, IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Core.FieldCaps.FieldCapability>>> propFields = default;
+		LocalJsonProperty<IReadOnlyCollection<string>> propIndices = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propIndices.TryRead(ref reader, options, PropIndices, typeof(SingleOrManyMarker<IReadOnlyCollection<string>, string>)))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new FieldCapsResponse
+		{
+			Fields = propFields.Value
+,
+			Indices = propIndices.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, FieldCapsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropIndices, value.Indices, typeof(SingleOrManyMarker<IReadOnlyCollection<string>, string>));
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(FieldCapsResponseConverter))]
 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")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public IReadOnlyCollection<string> Indices { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/GetResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/GetResponse.g.cs
index 09773e266f6..5dba19eb3aa 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/GetResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/GetResponse.g.cs
@@ -18,35 +18,168 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch;
 
+internal sealed partial class GetResponseConverter<TDocument> : System.Text.Json.Serialization.JsonConverter<GetResponse<TDocument>>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropFound = System.Text.Json.JsonEncodedText.Encode("found");
+	private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("_id");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnored = System.Text.Json.JsonEncodedText.Encode("_ignored");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("_index");
+	private static readonly System.Text.Json.JsonEncodedText PropPrimaryTerm = System.Text.Json.JsonEncodedText.Encode("_primary_term");
+	private static readonly System.Text.Json.JsonEncodedText PropRouting = System.Text.Json.JsonEncodedText.Encode("_routing");
+	private static readonly System.Text.Json.JsonEncodedText PropSeqNo = System.Text.Json.JsonEncodedText.Encode("_seq_no");
+	private static readonly System.Text.Json.JsonEncodedText PropSource = System.Text.Json.JsonEncodedText.Encode("_source");
+	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("_version");
+
+	public override GetResponse<TDocument> Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.FieldValues?> propFields = default;
+		LocalJsonProperty<bool> propFound = default;
+		LocalJsonProperty<string> propId = default;
+		LocalJsonProperty<IReadOnlyCollection<string>?> propIgnored = default;
+		LocalJsonProperty<string> propIndex = default;
+		LocalJsonProperty<long?> propPrimaryTerm = default;
+		LocalJsonProperty<string?> propRouting = default;
+		LocalJsonProperty<long?> propSeqNo = default;
+		LocalJsonProperty<TDocument?> propSource = default;
+		LocalJsonProperty<long?> propVersion = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propFound.TryRead(ref reader, options, PropFound))
+			{
+				continue;
+			}
+
+			if (propId.TryRead(ref reader, options, PropId))
+			{
+				continue;
+			}
+
+			if (propIgnored.TryRead(ref reader, options, PropIgnored))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propPrimaryTerm.TryRead(ref reader, options, PropPrimaryTerm))
+			{
+				continue;
+			}
+
+			if (propRouting.TryRead(ref reader, options, PropRouting))
+			{
+				continue;
+			}
+
+			if (propSeqNo.TryRead(ref reader, options, PropSeqNo))
+			{
+				continue;
+			}
+
+			if (propSource.TryRead(ref reader, options, PropSource, typeof(SourceMarker<TDocument?>)))
+			{
+				continue;
+			}
+
+			if (propVersion.TryRead(ref reader, options, PropVersion))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetResponse<TDocument>
+		{
+			Fields = propFields.Value
+,
+			Found = propFound.Value
+,
+			Id = propId.Value
+,
+			Ignored = propIgnored.Value
+,
+			Index = propIndex.Value
+,
+			PrimaryTerm = propPrimaryTerm.Value
+,
+			Routing = propRouting.Value
+,
+			SeqNo = propSeqNo.Value
+,
+			Source = propSource.Value
+,
+			Version = propVersion.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetResponse<TDocument> value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropFound, value.Found);
+		writer.WriteProperty(options, PropId, value.Id);
+		writer.WriteProperty(options, PropIgnored, value.Ignored);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropPrimaryTerm, value.PrimaryTerm);
+		writer.WriteProperty(options, PropRouting, value.Routing);
+		writer.WriteProperty(options, PropSeqNo, value.SeqNo);
+		writer.WriteProperty(options, PropSource, value.Source, typeof(SourceMarker<TDocument?>));
+		writer.WriteProperty(options, PropVersion, value.Version);
+		writer.WriteEndObject();
+	}
+}
+
+internal sealed partial class GetResponseConverterFactory : System.Text.Json.Serialization.JsonConverterFactory
+{
+	public override bool CanConvert(System.Type typeToConvert)
+	{
+		return typeToConvert.IsGenericType && typeToConvert.GetGenericTypeDefinition() == typeof(GetResponse<>);
+	}
+
+	public override System.Text.Json.Serialization.JsonConverter CreateConverter(System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		var args = typeToConvert.GetGenericArguments();
+#pragma warning disable IL3050
+		var converter = (System.Text.Json.Serialization.JsonConverter)System.Activator.CreateInstance(typeof(GetResponseConverter<>).MakeGenericType(args[0]), System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public, binder: null, args: null, culture: null)!;
+#pragma warning restore IL3050
+		return converter;
+	}
+}
+
+[JsonConverter(typeof(GetResponseConverterFactory))]
 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("_ignored")]
 	public IReadOnlyCollection<string>? Ignored { 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/GetScriptContextResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/GetScriptContextResponse.g.cs
index 675104dff9c..f0503c70e94 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/GetScriptContextResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/GetScriptContextResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch;
 
+internal sealed partial class GetScriptContextResponseConverter : System.Text.Json.Serialization.JsonConverter<GetScriptContextResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropContexts = System.Text.Json.JsonEncodedText.Encode("contexts");
+
+	public override GetScriptContextResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Core.GetScriptContext.Context>> propContexts = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propContexts.TryRead(ref reader, options, PropContexts))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetScriptContextResponse
+		{
+			Contexts = propContexts.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetScriptContextResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropContexts, value.Contexts);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetScriptContextResponseConverter))]
 public sealed partial class GetScriptContextResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("contexts")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Core.GetScriptContext.Context> Contexts { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/GetScriptLanguagesResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/GetScriptLanguagesResponse.g.cs
index 37a210be29b..9e1e77b47e2 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/GetScriptLanguagesResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/GetScriptLanguagesResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch;
 
+internal sealed partial class GetScriptLanguagesResponseConverter : System.Text.Json.Serialization.JsonConverter<GetScriptLanguagesResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropLanguageContexts = System.Text.Json.JsonEncodedText.Encode("language_contexts");
+	private static readonly System.Text.Json.JsonEncodedText PropTypesAllowed = System.Text.Json.JsonEncodedText.Encode("types_allowed");
+
+	public override GetScriptLanguagesResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Core.GetScriptLanguages.LanguageContext>> propLanguageContexts = default;
+		LocalJsonProperty<IReadOnlyCollection<string>> propTypesAllowed = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propLanguageContexts.TryRead(ref reader, options, PropLanguageContexts))
+			{
+				continue;
+			}
+
+			if (propTypesAllowed.TryRead(ref reader, options, PropTypesAllowed))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetScriptLanguagesResponse
+		{
+			LanguageContexts = propLanguageContexts.Value
+,
+			TypesAllowed = propTypesAllowed.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetScriptLanguagesResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropLanguageContexts, value.LanguageContexts);
+		writer.WriteProperty(options, PropTypesAllowed, value.TypesAllowed);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetScriptLanguagesResponseConverter))]
 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/GetScriptResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/GetScriptResponse.g.cs
index e9e8fa8c010..fea0d7577d9 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/GetScriptResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/GetScriptResponse.g.cs
@@ -18,20 +18,74 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch;
 
+internal sealed partial class GetScriptResponseConverter : System.Text.Json.Serialization.JsonConverter<GetScriptResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropFound = System.Text.Json.JsonEncodedText.Encode("found");
+	private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("_id");
+	private static readonly System.Text.Json.JsonEncodedText PropScript = System.Text.Json.JsonEncodedText.Encode("script");
+
+	public override GetScriptResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propFound = default;
+		LocalJsonProperty<string> propId = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.StoredScript?> propScript = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propFound.TryRead(ref reader, options, PropFound))
+			{
+				continue;
+			}
+
+			if (propId.TryRead(ref reader, options, PropId))
+			{
+				continue;
+			}
+
+			if (propScript.TryRead(ref reader, options, PropScript))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetScriptResponse
+		{
+			Found = propFound.Value
+,
+			Id = propId.Value
+,
+			Script = propScript.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetScriptResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropFound, value.Found);
+		writer.WriteProperty(options, PropId, value.Id);
+		writer.WriteProperty(options, PropScript, value.Script);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetScriptResponseConverter))]
 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/Graph/ExploreResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Graph/ExploreResponse.g.cs
index b916b224e45..7fb78dfb4c3 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Graph/ExploreResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Graph/ExploreResponse.g.cs
@@ -18,24 +18,96 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Graph;
 
+internal sealed partial class ExploreResponseConverter : System.Text.Json.Serialization.JsonConverter<ExploreResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropConnections = System.Text.Json.JsonEncodedText.Encode("connections");
+	private static readonly System.Text.Json.JsonEncodedText PropFailures = System.Text.Json.JsonEncodedText.Encode("failures");
+	private static readonly System.Text.Json.JsonEncodedText PropTimedOut = System.Text.Json.JsonEncodedText.Encode("timed_out");
+	private static readonly System.Text.Json.JsonEncodedText PropTook = System.Text.Json.JsonEncodedText.Encode("took");
+	private static readonly System.Text.Json.JsonEncodedText PropVertices = System.Text.Json.JsonEncodedText.Encode("vertices");
+
+	public override ExploreResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Graph.Connection>> propConnections = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.ShardFailure>> propFailures = default;
+		LocalJsonProperty<bool> propTimedOut = default;
+		LocalJsonProperty<long> propTook = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Graph.Vertex>> propVertices = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propConnections.TryRead(ref reader, options, PropConnections))
+			{
+				continue;
+			}
+
+			if (propFailures.TryRead(ref reader, options, PropFailures))
+			{
+				continue;
+			}
+
+			if (propTimedOut.TryRead(ref reader, options, PropTimedOut))
+			{
+				continue;
+			}
+
+			if (propTook.TryRead(ref reader, options, PropTook))
+			{
+				continue;
+			}
+
+			if (propVertices.TryRead(ref reader, options, PropVertices))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ExploreResponse
+		{
+			Connections = propConnections.Value
+,
+			Failures = propFailures.Value
+,
+			TimedOut = propTimedOut.Value
+,
+			Took = propTook.Value
+,
+			Vertices = propVertices.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ExploreResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropConnections, value.Connections);
+		writer.WriteProperty(options, PropFailures, value.Failures);
+		writer.WriteProperty(options, PropTimedOut, value.TimedOut);
+		writer.WriteProperty(options, PropTook, value.Took);
+		writer.WriteProperty(options, PropVertices, value.Vertices);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ExploreResponseConverter))]
 public sealed partial class ExploreResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("connections")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Graph.Connection> Connections { get; init; }
-	[JsonInclude, JsonPropertyName("failures")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.ShardFailure> Failures { get; init; }
-	[JsonInclude, JsonPropertyName("timed_out")]
 	public bool TimedOut { get; init; }
-	[JsonInclude, JsonPropertyName("took")]
 	public long Took { get; init; }
-	[JsonInclude, JsonPropertyName("vertices")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Graph.Vertex> Vertices { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/HealthReportResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/HealthReportResponse.g.cs
index a076c3eba52..9d3edb1d42e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/HealthReportResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/HealthReportResponse.g.cs
@@ -18,20 +18,74 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch;
 
+internal sealed partial class HealthReportResponseConverter : System.Text.Json.Serialization.JsonConverter<HealthReportResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropClusterName = System.Text.Json.JsonEncodedText.Encode("cluster_name");
+	private static readonly System.Text.Json.JsonEncodedText PropIndicators = System.Text.Json.JsonEncodedText.Encode("indicators");
+	private static readonly System.Text.Json.JsonEncodedText PropStatus = System.Text.Json.JsonEncodedText.Encode("status");
+
+	public override HealthReportResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propClusterName = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Core.HealthReport.Indicators> propIndicators = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Core.HealthReport.IndicatorHealthStatus?> propStatus = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propClusterName.TryRead(ref reader, options, PropClusterName))
+			{
+				continue;
+			}
+
+			if (propIndicators.TryRead(ref reader, options, PropIndicators))
+			{
+				continue;
+			}
+
+			if (propStatus.TryRead(ref reader, options, PropStatus))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new HealthReportResponse
+		{
+			ClusterName = propClusterName.Value
+,
+			Indicators = propIndicators.Value
+,
+			Status = propStatus.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, HealthReportResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropClusterName, value.ClusterName);
+		writer.WriteProperty(options, PropIndicators, value.Indicators);
+		writer.WriteProperty(options, PropStatus, value.Status);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(HealthReportResponseConverter))]
 public sealed partial class HealthReportResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("cluster_name")]
 	public string ClusterName { get; init; }
-	[JsonInclude, JsonPropertyName("indicators")]
 	public Elastic.Clients.Elasticsearch.Core.HealthReport.Indicators Indicators { get; init; }
-	[JsonInclude, JsonPropertyName("status")]
 	public Elastic.Clients.Elasticsearch.Core.HealthReport.IndicatorHealthStatus? Status { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexLifecycleManagement/DeleteLifecycleResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexLifecycleManagement/DeleteLifecycleResponse.g.cs
index 07ce56d24ab..4354c0ce89f 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexLifecycleManagement/DeleteLifecycleResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexLifecycleManagement/DeleteLifecycleResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.IndexLifecycleManagement;
 
+internal sealed partial class DeleteLifecycleResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteLifecycleResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override DeleteLifecycleResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteLifecycleResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteLifecycleResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteLifecycleResponseConverter))]
 public sealed partial class DeleteLifecycleResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class DeleteLifecycleResponse : ElasticsearchResponse
 	/// 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/IndexLifecycleManagement/GetIlmStatusResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexLifecycleManagement/GetIlmStatusResponse.g.cs
index 0cb87d29c09..1261459ea0a 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexLifecycleManagement/GetIlmStatusResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexLifecycleManagement/GetIlmStatusResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.IndexLifecycleManagement;
 
+internal sealed partial class GetIlmStatusResponseConverter : System.Text.Json.Serialization.JsonConverter<GetIlmStatusResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropOperationMode = System.Text.Json.JsonEncodedText.Encode("operation_mode");
+
+	public override GetIlmStatusResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.LifecycleOperationMode> propOperationMode = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propOperationMode.TryRead(ref reader, options, PropOperationMode))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetIlmStatusResponse
+		{
+			OperationMode = propOperationMode.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetIlmStatusResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropOperationMode, value.OperationMode);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetIlmStatusResponseConverter))]
 public sealed partial class GetIlmStatusResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("operation_mode")]
 	public Elastic.Clients.Elasticsearch.LifecycleOperationMode OperationMode { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexLifecycleManagement/MigrateToDataTiersResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexLifecycleManagement/MigrateToDataTiersResponse.g.cs
index 72723c175c6..db5242cb592 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexLifecycleManagement/MigrateToDataTiersResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexLifecycleManagement/MigrateToDataTiersResponse.g.cs
@@ -18,17 +18,113 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.IndexLifecycleManagement;
 
+internal sealed partial class MigrateToDataTiersResponseConverter : System.Text.Json.Serialization.JsonConverter<MigrateToDataTiersResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropDryRun = System.Text.Json.JsonEncodedText.Encode("dry_run");
+	private static readonly System.Text.Json.JsonEncodedText PropMigratedComponentTemplates = System.Text.Json.JsonEncodedText.Encode("migrated_component_templates");
+	private static readonly System.Text.Json.JsonEncodedText PropMigratedComposableTemplates = System.Text.Json.JsonEncodedText.Encode("migrated_composable_templates");
+	private static readonly System.Text.Json.JsonEncodedText PropMigratedIlmPolicies = System.Text.Json.JsonEncodedText.Encode("migrated_ilm_policies");
+	private static readonly System.Text.Json.JsonEncodedText PropMigratedIndices = System.Text.Json.JsonEncodedText.Encode("migrated_indices");
+	private static readonly System.Text.Json.JsonEncodedText PropMigratedLegacyTemplates = System.Text.Json.JsonEncodedText.Encode("migrated_legacy_templates");
+	private static readonly System.Text.Json.JsonEncodedText PropRemovedLegacyTemplate = System.Text.Json.JsonEncodedText.Encode("removed_legacy_template");
+
+	public override MigrateToDataTiersResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propDryRun = default;
+		LocalJsonProperty<IReadOnlyCollection<string>> propMigratedComponentTemplates = default;
+		LocalJsonProperty<IReadOnlyCollection<string>> propMigratedComposableTemplates = default;
+		LocalJsonProperty<IReadOnlyCollection<string>> propMigratedIlmPolicies = default;
+		LocalJsonProperty<IReadOnlyCollection<string>> propMigratedIndices = default;
+		LocalJsonProperty<IReadOnlyCollection<string>> propMigratedLegacyTemplates = default;
+		LocalJsonProperty<string> propRemovedLegacyTemplate = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propDryRun.TryRead(ref reader, options, PropDryRun))
+			{
+				continue;
+			}
+
+			if (propMigratedComponentTemplates.TryRead(ref reader, options, PropMigratedComponentTemplates))
+			{
+				continue;
+			}
+
+			if (propMigratedComposableTemplates.TryRead(ref reader, options, PropMigratedComposableTemplates))
+			{
+				continue;
+			}
+
+			if (propMigratedIlmPolicies.TryRead(ref reader, options, PropMigratedIlmPolicies))
+			{
+				continue;
+			}
+
+			if (propMigratedIndices.TryRead(ref reader, options, PropMigratedIndices, typeof(SingleOrManyMarker<IReadOnlyCollection<string>, string>)))
+			{
+				continue;
+			}
+
+			if (propMigratedLegacyTemplates.TryRead(ref reader, options, PropMigratedLegacyTemplates))
+			{
+				continue;
+			}
+
+			if (propRemovedLegacyTemplate.TryRead(ref reader, options, PropRemovedLegacyTemplate))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new MigrateToDataTiersResponse
+		{
+			DryRun = propDryRun.Value
+,
+			MigratedComponentTemplates = propMigratedComponentTemplates.Value
+,
+			MigratedComposableTemplates = propMigratedComposableTemplates.Value
+,
+			MigratedIlmPolicies = propMigratedIlmPolicies.Value
+,
+			MigratedIndices = propMigratedIndices.Value
+,
+			MigratedLegacyTemplates = propMigratedLegacyTemplates.Value
+,
+			RemovedLegacyTemplate = propRemovedLegacyTemplate.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, MigrateToDataTiersResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDryRun, value.DryRun);
+		writer.WriteProperty(options, PropMigratedComponentTemplates, value.MigratedComponentTemplates);
+		writer.WriteProperty(options, PropMigratedComposableTemplates, value.MigratedComposableTemplates);
+		writer.WriteProperty(options, PropMigratedIlmPolicies, value.MigratedIlmPolicies);
+		writer.WriteProperty(options, PropMigratedIndices, value.MigratedIndices, typeof(SingleOrManyMarker<IReadOnlyCollection<string>, string>));
+		writer.WriteProperty(options, PropMigratedLegacyTemplates, value.MigratedLegacyTemplates);
+		writer.WriteProperty(options, PropRemovedLegacyTemplate, value.RemovedLegacyTemplate);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(MigrateToDataTiersResponseConverter))]
 public sealed partial class MigrateToDataTiersResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("dry_run")]
 	public bool DryRun { get; init; }
 
 	/// <summary>
@@ -36,7 +132,6 @@ public sealed partial class MigrateToDataTiersResponse : ElasticsearchResponse
 	/// The component templates that were updated to not contain custom routing settings for the provided data attribute.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("migrated_component_templates")]
 	public IReadOnlyCollection<string> MigratedComponentTemplates { get; init; }
 
 	/// <summary>
@@ -44,7 +139,6 @@ public sealed partial class MigrateToDataTiersResponse : ElasticsearchResponse
 	/// The composable index templates that were updated to not contain custom routing settings for the provided data attribute.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("migrated_composable_templates")]
 	public IReadOnlyCollection<string> MigratedComposableTemplates { get; init; }
 
 	/// <summary>
@@ -52,7 +146,6 @@ public sealed partial class MigrateToDataTiersResponse : ElasticsearchResponse
 	/// The ILM policies that were updated.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("migrated_ilm_policies")]
 	public IReadOnlyCollection<string> MigratedIlmPolicies { get; init; }
 
 	/// <summary>
@@ -60,8 +153,6 @@ public sealed partial class MigrateToDataTiersResponse : ElasticsearchResponse
 	/// The indices that were migrated to tier preference routing.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("migrated_indices")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public IReadOnlyCollection<string> MigratedIndices { get; init; }
 
 	/// <summary>
@@ -69,7 +160,6 @@ public sealed partial class MigrateToDataTiersResponse : ElasticsearchResponse
 	/// The legacy index templates that were updated to not contain custom routing settings for the provided data attribute.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("migrated_legacy_templates")]
 	public IReadOnlyCollection<string> MigratedLegacyTemplates { get; init; }
 
 	/// <summary>
@@ -78,6 +168,5 @@ public sealed partial class MigrateToDataTiersResponse : ElasticsearchResponse
 	/// This information is missing if no legacy index templates were deleted.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("removed_legacy_template")]
 	public string RemovedLegacyTemplate { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexLifecycleManagement/MoveToStepResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexLifecycleManagement/MoveToStepResponse.g.cs
index 081d908885b..9fd2e574a12 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexLifecycleManagement/MoveToStepResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexLifecycleManagement/MoveToStepResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.IndexLifecycleManagement;
 
+internal sealed partial class MoveToStepResponseConverter : System.Text.Json.Serialization.JsonConverter<MoveToStepResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override MoveToStepResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new MoveToStepResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, MoveToStepResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(MoveToStepResponseConverter))]
 public sealed partial class MoveToStepResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class MoveToStepResponse : ElasticsearchResponse
 	/// 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/IndexLifecycleManagement/PutLifecycleResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexLifecycleManagement/PutLifecycleResponse.g.cs
index d9f92f43a06..24cfe49c0ae 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexLifecycleManagement/PutLifecycleResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexLifecycleManagement/PutLifecycleResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.IndexLifecycleManagement;
 
+internal sealed partial class PutLifecycleResponseConverter : System.Text.Json.Serialization.JsonConverter<PutLifecycleResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override PutLifecycleResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutLifecycleResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutLifecycleResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PutLifecycleResponseConverter))]
 public sealed partial class PutLifecycleResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class PutLifecycleResponse : ElasticsearchResponse
 	/// 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/IndexLifecycleManagement/RemovePolicyResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexLifecycleManagement/RemovePolicyResponse.g.cs
index 2b40e8f3b60..fcdb8a2628f 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexLifecycleManagement/RemovePolicyResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexLifecycleManagement/RemovePolicyResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.IndexLifecycleManagement;
 
+internal sealed partial class RemovePolicyResponseConverter : System.Text.Json.Serialization.JsonConverter<RemovePolicyResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropFailedIndexes = System.Text.Json.JsonEncodedText.Encode("failed_indexes");
+	private static readonly System.Text.Json.JsonEncodedText PropHasFailures = System.Text.Json.JsonEncodedText.Encode("has_failures");
+
+	public override RemovePolicyResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<string>> propFailedIndexes = default;
+		LocalJsonProperty<bool> propHasFailures = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propFailedIndexes.TryRead(ref reader, options, PropFailedIndexes))
+			{
+				continue;
+			}
+
+			if (propHasFailures.TryRead(ref reader, options, PropHasFailures))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new RemovePolicyResponse
+		{
+			FailedIndexes = propFailedIndexes.Value
+,
+			HasFailures = propHasFailures.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, RemovePolicyResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropFailedIndexes, value.FailedIndexes);
+		writer.WriteProperty(options, PropHasFailures, value.HasFailures);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(RemovePolicyResponseConverter))]
 public sealed partial class RemovePolicyResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("failed_indexes")]
 	public IReadOnlyCollection<string> FailedIndexes { get; init; }
-	[JsonInclude, JsonPropertyName("has_failures")]
 	public bool HasFailures { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexLifecycleManagement/RetryResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexLifecycleManagement/RetryResponse.g.cs
index 73e6389fe10..d7a7beedb2e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexLifecycleManagement/RetryResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexLifecycleManagement/RetryResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.IndexLifecycleManagement;
 
+internal sealed partial class RetryResponseConverter : System.Text.Json.Serialization.JsonConverter<RetryResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override RetryResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new RetryResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, RetryResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(RetryResponseConverter))]
 public sealed partial class RetryResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class RetryResponse : ElasticsearchResponse
 	/// 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/IndexLifecycleManagement/StartIlmResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexLifecycleManagement/StartIlmResponse.g.cs
index 039eca5b3fc..984472e921c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexLifecycleManagement/StartIlmResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexLifecycleManagement/StartIlmResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.IndexLifecycleManagement;
 
+internal sealed partial class StartIlmResponseConverter : System.Text.Json.Serialization.JsonConverter<StartIlmResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override StartIlmResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new StartIlmResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, StartIlmResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(StartIlmResponseConverter))]
 public sealed partial class StartIlmResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class StartIlmResponse : ElasticsearchResponse
 	/// 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/IndexLifecycleManagement/StopIlmResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexLifecycleManagement/StopIlmResponse.g.cs
index d41403aec0b..b26ec5bbd07 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexLifecycleManagement/StopIlmResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexLifecycleManagement/StopIlmResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.IndexLifecycleManagement;
 
+internal sealed partial class StopIlmResponseConverter : System.Text.Json.Serialization.JsonConverter<StopIlmResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override StopIlmResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new StopIlmResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, StopIlmResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(StopIlmResponseConverter))]
 public sealed partial class StopIlmResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class StopIlmResponse : ElasticsearchResponse
 	/// 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/AnalyzeIndexRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/AnalyzeIndexRequest.g.cs
index a542c96bd8a..cc693031de6 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/AnalyzeIndexRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/AnalyzeIndexRequest.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport;
@@ -34,6 +35,119 @@ public sealed partial class AnalyzeIndexRequestParameters : RequestParameters
 {
 }
 
+internal sealed partial class AnalyzeIndexRequestConverter : System.Text.Json.Serialization.JsonConverter<AnalyzeIndexRequest>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAnalyzer = System.Text.Json.JsonEncodedText.Encode("analyzer");
+	private static readonly System.Text.Json.JsonEncodedText PropAttributes = System.Text.Json.JsonEncodedText.Encode("attributes");
+	private static readonly System.Text.Json.JsonEncodedText PropCharFilter = System.Text.Json.JsonEncodedText.Encode("char_filter");
+	private static readonly System.Text.Json.JsonEncodedText PropExplain = System.Text.Json.JsonEncodedText.Encode("explain");
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropFilter = System.Text.Json.JsonEncodedText.Encode("filter");
+	private static readonly System.Text.Json.JsonEncodedText PropNormalizer = System.Text.Json.JsonEncodedText.Encode("normalizer");
+	private static readonly System.Text.Json.JsonEncodedText PropText = System.Text.Json.JsonEncodedText.Encode("text");
+	private static readonly System.Text.Json.JsonEncodedText PropTokenizer = System.Text.Json.JsonEncodedText.Encode("tokenizer");
+
+	public override AnalyzeIndexRequest Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string?> propAnalyzer = default;
+		LocalJsonProperty<ICollection<string>?> propAttributes = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Analysis.ICharFilter>?> propCharFilter = default;
+		LocalJsonProperty<bool?> propExplain = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Field?> propField = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Analysis.ITokenFilter>?> propFilter = default;
+		LocalJsonProperty<string?> propNormalizer = default;
+		LocalJsonProperty<ICollection<string>?> propText = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Analysis.ITokenizer?> propTokenizer = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAnalyzer.TryRead(ref reader, options, PropAnalyzer))
+			{
+				continue;
+			}
+
+			if (propAttributes.TryRead(ref reader, options, PropAttributes))
+			{
+				continue;
+			}
+
+			if (propCharFilter.TryRead(ref reader, options, PropCharFilter))
+			{
+				continue;
+			}
+
+			if (propExplain.TryRead(ref reader, options, PropExplain))
+			{
+				continue;
+			}
+
+			if (propField.TryRead(ref reader, options, PropField))
+			{
+				continue;
+			}
+
+			if (propFilter.TryRead(ref reader, options, PropFilter))
+			{
+				continue;
+			}
+
+			if (propNormalizer.TryRead(ref reader, options, PropNormalizer))
+			{
+				continue;
+			}
+
+			if (propText.TryRead(ref reader, options, PropText, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propTokenizer.TryRead(ref reader, options, PropTokenizer))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new AnalyzeIndexRequest
+		{
+			Analyzer = propAnalyzer.Value
+,
+			Attributes = propAttributes.Value
+,
+			CharFilter = propCharFilter.Value
+,
+			Explain = propExplain.Value
+,
+			Field = propField.Value
+,
+			Filter = propFilter.Value
+,
+			Normalizer = propNormalizer.Value
+,
+			Text = propText.Value
+,
+			Tokenizer = propTokenizer.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, AnalyzeIndexRequest value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAnalyzer, value.Analyzer);
+		writer.WriteProperty(options, PropAttributes, value.Attributes);
+		writer.WriteProperty(options, PropCharFilter, value.CharFilter);
+		writer.WriteProperty(options, PropExplain, value.Explain);
+		writer.WriteProperty(options, PropField, value.Field);
+		writer.WriteProperty(options, PropFilter, value.Filter);
+		writer.WriteProperty(options, PropNormalizer, value.Normalizer);
+		writer.WriteProperty(options, PropText, value.Text, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropTokenizer, value.Tokenizer);
+		writer.WriteEndObject();
+	}
+}
+
 /// <summary>
 /// <para>
 /// Get tokens from text analysis.
@@ -46,6 +160,7 @@ public sealed partial class AnalyzeIndexRequestParameters : RequestParameters
 /// The <c>_analyze</c> endpoint without a specified index will always use <c>10000</c> as its limit.
 /// </para>
 /// </summary>
+[JsonConverter(typeof(AnalyzeIndexRequestConverter))]
 public sealed partial class AnalyzeIndexRequest : PlainRequest<AnalyzeIndexRequestParameters>
 {
 	public AnalyzeIndexRequest()
@@ -70,7 +185,6 @@ public AnalyzeIndexRequest(Elastic.Clients.Elasticsearch.IndexName? index) : bas
 	/// This could be a built-in analyzer, or an analyzer that’s been configured in the index.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("analyzer")]
 	public string? Analyzer { get; set; }
 
 	/// <summary>
@@ -78,7 +192,6 @@ public AnalyzeIndexRequest(Elastic.Clients.Elasticsearch.IndexName? index) : bas
 	/// Array of token attributes used to filter the output of the <c>explain</c> parameter.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("attributes")]
 	public ICollection<string>? Attributes { get; set; }
 
 	/// <summary>
@@ -86,7 +199,6 @@ public AnalyzeIndexRequest(Elastic.Clients.Elasticsearch.IndexName? index) : bas
 	/// Array of character filters used to preprocess characters before the tokenizer.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("char_filter")]
 	public ICollection<Elastic.Clients.Elasticsearch.Analysis.ICharFilter>? CharFilter { get; set; }
 
 	/// <summary>
@@ -94,7 +206,6 @@ public AnalyzeIndexRequest(Elastic.Clients.Elasticsearch.IndexName? index) : bas
 	/// If <c>true</c>, the response includes token attributes and additional details.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("explain")]
 	public bool? Explain { get; set; }
 
 	/// <summary>
@@ -104,7 +215,6 @@ public AnalyzeIndexRequest(Elastic.Clients.Elasticsearch.IndexName? index) : bas
 	/// If specified, the <c>analyzer</c> parameter overrides this value.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("field")]
 	public Elastic.Clients.Elasticsearch.Field? Field { get; set; }
 
 	/// <summary>
@@ -112,7 +222,6 @@ public AnalyzeIndexRequest(Elastic.Clients.Elasticsearch.IndexName? index) : bas
 	/// Array of token filters used to apply after the tokenizer.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("filter")]
 	public ICollection<Elastic.Clients.Elasticsearch.Analysis.ITokenFilter>? Filter { get; set; }
 
 	/// <summary>
@@ -120,7 +229,6 @@ public AnalyzeIndexRequest(Elastic.Clients.Elasticsearch.IndexName? index) : bas
 	/// Normalizer to use to convert text into a single token.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("normalizer")]
 	public string? Normalizer { get; set; }
 
 	/// <summary>
@@ -129,8 +237,6 @@ public AnalyzeIndexRequest(Elastic.Clients.Elasticsearch.IndexName? index) : bas
 	/// If an array of strings is provided, it is analyzed as a multi-value field.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("text")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Text { get; set; }
 
 	/// <summary>
@@ -138,7 +244,6 @@ public AnalyzeIndexRequest(Elastic.Clients.Elasticsearch.IndexName? index) : bas
 	/// Tokenizer to use to convert text into tokens.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("tokenizer")]
 	public Elastic.Clients.Elasticsearch.Analysis.ITokenizer? Tokenizer { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/AnalyzeIndexResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/AnalyzeIndexResponse.g.cs
index 13b4f7e9f3a..c7107812918 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/AnalyzeIndexResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/AnalyzeIndexResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
 
+internal sealed partial class AnalyzeIndexResponseConverter : System.Text.Json.Serialization.JsonConverter<AnalyzeIndexResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropDetail = System.Text.Json.JsonEncodedText.Encode("detail");
+	private static readonly System.Text.Json.JsonEncodedText PropTokens = System.Text.Json.JsonEncodedText.Encode("tokens");
+
+	public override AnalyzeIndexResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.IndexManagement.AnalyzeDetail?> propDetail = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.IndexManagement.AnalyzeToken>?> propTokens = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propDetail.TryRead(ref reader, options, PropDetail))
+			{
+				continue;
+			}
+
+			if (propTokens.TryRead(ref reader, options, PropTokens))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new AnalyzeIndexResponse
+		{
+			Detail = propDetail.Value
+,
+			Tokens = propTokens.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, AnalyzeIndexResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDetail, value.Detail);
+		writer.WriteProperty(options, PropTokens, value.Tokens);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(AnalyzeIndexResponseConverter))]
 public sealed partial class AnalyzeIndexResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("detail")]
 	public Elastic.Clients.Elasticsearch.IndexManagement.AnalyzeDetail? Detail { get; init; }
-	[JsonInclude, JsonPropertyName("tokens")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.IndexManagement.AnalyzeToken>? Tokens { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ClearCacheResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ClearCacheResponse.g.cs
index 889431a5852..496b97c405b 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ClearCacheResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ClearCacheResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
 
+internal sealed partial class ClearCacheResponseConverter : System.Text.Json.Serialization.JsonConverter<ClearCacheResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropShards = System.Text.Json.JsonEncodedText.Encode("_shards");
+
+	public override ClearCacheResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.ShardStatistics?> propShards = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propShards.TryRead(ref reader, options, PropShards))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ClearCacheResponse
+		{
+			Shards = propShards.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ClearCacheResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropShards, value.Shards);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ClearCacheResponseConverter))]
 public sealed partial class ClearCacheResponse : ElasticsearchResponse
 {
-	[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/CloneIndexResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CloneIndexResponse.g.cs
index e4a02be3cea..20d88d5ced3 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CloneIndexResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CloneIndexResponse.g.cs
@@ -18,20 +18,74 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
 
+internal sealed partial class CloneIndexResponseConverter : System.Text.Json.Serialization.JsonConverter<CloneIndexResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropShardsAcknowledged = System.Text.Json.JsonEncodedText.Encode("shards_acknowledged");
+
+	public override CloneIndexResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		LocalJsonProperty<string> propIndex = default;
+		LocalJsonProperty<bool> propShardsAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propShardsAcknowledged.TryRead(ref reader, options, PropShardsAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new CloneIndexResponse
+		{
+			Acknowledged = propAcknowledged.Value
+,
+			Index = propIndex.Value
+,
+			ShardsAcknowledged = propShardsAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, CloneIndexResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropShardsAcknowledged, value.ShardsAcknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(CloneIndexResponseConverter))]
 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/CloseIndexResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CloseIndexResponse.g.cs
index 388a41401eb..98387642b02 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CloseIndexResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CloseIndexResponse.g.cs
@@ -18,21 +18,74 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
 
+internal sealed partial class CloseIndexResponseConverter : System.Text.Json.Serialization.JsonConverter<CloseIndexResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+	private static readonly System.Text.Json.JsonEncodedText PropIndices = System.Text.Json.JsonEncodedText.Encode("indices");
+	private static readonly System.Text.Json.JsonEncodedText PropShardsAcknowledged = System.Text.Json.JsonEncodedText.Encode("shards_acknowledged");
+
+	public override CloseIndexResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		LocalJsonProperty<IReadOnlyDictionary<Elastic.Clients.Elasticsearch.IndexName, Elastic.Clients.Elasticsearch.IndexManagement.CloseIndexResult>> propIndices = default;
+		LocalJsonProperty<bool> propShardsAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			if (propIndices.TryRead(ref reader, options, PropIndices))
+			{
+				continue;
+			}
+
+			if (propShardsAcknowledged.TryRead(ref reader, options, PropShardsAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new CloseIndexResponse
+		{
+			Acknowledged = propAcknowledged.Value
+,
+			Indices = propIndices.Value
+,
+			ShardsAcknowledged = propShardsAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, CloseIndexResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteProperty(options, PropIndices, value.Indices);
+		writer.WriteProperty(options, PropShardsAcknowledged, value.ShardsAcknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(CloseIndexResponseConverter))]
 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/CreateDataStreamResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CreateDataStreamResponse.g.cs
index 8317bdb2da9..efa11e927e6 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CreateDataStreamResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CreateDataStreamResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
 
+internal sealed partial class CreateDataStreamResponseConverter : System.Text.Json.Serialization.JsonConverter<CreateDataStreamResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override CreateDataStreamResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new CreateDataStreamResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, CreateDataStreamResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(CreateDataStreamResponseConverter))]
 public sealed partial class CreateDataStreamResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class CreateDataStreamResponse : ElasticsearchResponse
 	/// 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/CreateIndexResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CreateIndexResponse.g.cs
index 8a847b2e204..9f6f569f248 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CreateIndexResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CreateIndexResponse.g.cs
@@ -18,20 +18,74 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
 
+internal sealed partial class CreateIndexResponseConverter : System.Text.Json.Serialization.JsonConverter<CreateIndexResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropShardsAcknowledged = System.Text.Json.JsonEncodedText.Encode("shards_acknowledged");
+
+	public override CreateIndexResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		LocalJsonProperty<string> propIndex = default;
+		LocalJsonProperty<bool> propShardsAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propShardsAcknowledged.TryRead(ref reader, options, PropShardsAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new CreateIndexResponse
+		{
+			Acknowledged = propAcknowledged.Value
+,
+			Index = propIndex.Value
+,
+			ShardsAcknowledged = propShardsAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, CreateIndexResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropShardsAcknowledged, value.ShardsAcknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(CreateIndexResponseConverter))]
 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/DataStreamsStatsResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DataStreamsStatsResponse.g.cs
index e4b9e962207..970dfb10050 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DataStreamsStatsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DataStreamsStatsResponse.g.cs
@@ -18,14 +18,101 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
 
+internal sealed partial class DataStreamsStatsResponseConverter : System.Text.Json.Serialization.JsonConverter<DataStreamsStatsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropBackingIndices = System.Text.Json.JsonEncodedText.Encode("backing_indices");
+	private static readonly System.Text.Json.JsonEncodedText PropDataStreamCount = System.Text.Json.JsonEncodedText.Encode("data_stream_count");
+	private static readonly System.Text.Json.JsonEncodedText PropDataStreams = System.Text.Json.JsonEncodedText.Encode("data_streams");
+	private static readonly System.Text.Json.JsonEncodedText PropShards = System.Text.Json.JsonEncodedText.Encode("_shards");
+	private static readonly System.Text.Json.JsonEncodedText PropTotalStoreSizeBytes = System.Text.Json.JsonEncodedText.Encode("total_store_size_bytes");
+	private static readonly System.Text.Json.JsonEncodedText PropTotalStoreSizes = System.Text.Json.JsonEncodedText.Encode("total_store_sizes");
+
+	public override DataStreamsStatsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<int> propBackingIndices = default;
+		LocalJsonProperty<int> propDataStreamCount = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.IndexManagement.DataStreamsStatsItem>> propDataStreams = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.ShardStatistics> propShards = default;
+		LocalJsonProperty<long> propTotalStoreSizeBytes = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.ByteSize?> propTotalStoreSizes = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBackingIndices.TryRead(ref reader, options, PropBackingIndices))
+			{
+				continue;
+			}
+
+			if (propDataStreamCount.TryRead(ref reader, options, PropDataStreamCount))
+			{
+				continue;
+			}
+
+			if (propDataStreams.TryRead(ref reader, options, PropDataStreams))
+			{
+				continue;
+			}
+
+			if (propShards.TryRead(ref reader, options, PropShards))
+			{
+				continue;
+			}
+
+			if (propTotalStoreSizeBytes.TryRead(ref reader, options, PropTotalStoreSizeBytes))
+			{
+				continue;
+			}
+
+			if (propTotalStoreSizes.TryRead(ref reader, options, PropTotalStoreSizes))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DataStreamsStatsResponse
+		{
+			BackingIndices = propBackingIndices.Value
+,
+			DataStreamCount = propDataStreamCount.Value
+,
+			DataStreams = propDataStreams.Value
+,
+			Shards = propShards.Value
+,
+			TotalStoreSizeBytes = propTotalStoreSizeBytes.Value
+,
+			TotalStoreSizes = propTotalStoreSizes.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DataStreamsStatsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBackingIndices, value.BackingIndices);
+		writer.WriteProperty(options, PropDataStreamCount, value.DataStreamCount);
+		writer.WriteProperty(options, PropDataStreams, value.DataStreams);
+		writer.WriteProperty(options, PropShards, value.Shards);
+		writer.WriteProperty(options, PropTotalStoreSizeBytes, value.TotalStoreSizeBytes);
+		writer.WriteProperty(options, PropTotalStoreSizes, value.TotalStoreSizes);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DataStreamsStatsResponseConverter))]
 public sealed partial class DataStreamsStatsResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,7 +120,6 @@ public sealed partial class DataStreamsStatsResponse : ElasticsearchResponse
 	/// Total number of backing indices for the selected data streams.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("backing_indices")]
 	public int BackingIndices { get; init; }
 
 	/// <summary>
@@ -41,7 +127,6 @@ public sealed partial class DataStreamsStatsResponse : ElasticsearchResponse
 	/// Total number of selected data streams.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("data_stream_count")]
 	public int DataStreamCount { get; init; }
 
 	/// <summary>
@@ -49,7 +134,6 @@ public sealed partial class DataStreamsStatsResponse : ElasticsearchResponse
 	/// Contains statistics for the selected data streams.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("data_streams")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.IndexManagement.DataStreamsStatsItem> DataStreams { get; init; }
 
 	/// <summary>
@@ -57,7 +141,6 @@ public sealed partial class DataStreamsStatsResponse : ElasticsearchResponse
 	/// Contains information about shards that attempted to execute the request.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("_shards")]
 	public Elastic.Clients.Elasticsearch.ShardStatistics Shards { get; init; }
 
 	/// <summary>
@@ -65,7 +148,6 @@ public sealed partial class DataStreamsStatsResponse : ElasticsearchResponse
 	/// Total size, in bytes, of all shards for the selected data streams.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("total_store_size_bytes")]
 	public long TotalStoreSizeBytes { get; init; }
 
 	/// <summary>
@@ -74,6 +156,5 @@ public sealed partial class DataStreamsStatsResponse : ElasticsearchResponse
 	/// This property is included only if the <c>human</c> query parameter is <c>true</c>
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("total_store_sizes")]
 	public Elastic.Clients.Elasticsearch.ByteSize? TotalStoreSizes { get; init; }
 }
\ No newline at end of file
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 ae5ec7e2278..952e45f79a1 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteAliasResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteAliasResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
 
+internal sealed partial class DeleteAliasResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteAliasResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override DeleteAliasResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteAliasResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteAliasResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteAliasResponseConverter))]
 public sealed partial class DeleteAliasResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class DeleteAliasResponse : ElasticsearchResponse
 	/// 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/DeleteDataLifecycleResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteDataLifecycleResponse.g.cs
index f9d2038fc50..0470ac5f96a 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteDataLifecycleResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteDataLifecycleResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
 
+internal sealed partial class DeleteDataLifecycleResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteDataLifecycleResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override DeleteDataLifecycleResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteDataLifecycleResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteDataLifecycleResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteDataLifecycleResponseConverter))]
 public sealed partial class DeleteDataLifecycleResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class DeleteDataLifecycleResponse : ElasticsearchResponse
 	/// 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/DeleteDataStreamResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteDataStreamResponse.g.cs
index fbecc62a90f..07afbaec5f4 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteDataStreamResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteDataStreamResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
 
+internal sealed partial class DeleteDataStreamResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteDataStreamResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override DeleteDataStreamResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteDataStreamResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteDataStreamResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteDataStreamResponseConverter))]
 public sealed partial class DeleteDataStreamResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class DeleteDataStreamResponse : ElasticsearchResponse
 	/// 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/DeleteIndexResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteIndexResponse.g.cs
index 1462583eece..def2bdc2128 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteIndexResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteIndexResponse.g.cs
@@ -18,14 +18,61 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
 
+internal sealed partial class DeleteIndexResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteIndexResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+	private static readonly System.Text.Json.JsonEncodedText PropShards = System.Text.Json.JsonEncodedText.Encode("_shards");
+
+	public override DeleteIndexResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.ShardStatistics?> propShards = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			if (propShards.TryRead(ref reader, options, PropShards))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteIndexResponse
+		{
+			Acknowledged = propAcknowledged.Value
+,
+			Shards = propShards.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteIndexResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteProperty(options, PropShards, value.Shards);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteIndexResponseConverter))]
 public sealed partial class DeleteIndexResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,8 +80,6 @@ public sealed partial class DeleteIndexResponse : ElasticsearchResponse
 	/// 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; }
-	[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/DeleteIndexTemplateResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteIndexTemplateResponse.g.cs
index b80c8280abb..8ca5f6eda5f 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteIndexTemplateResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteIndexTemplateResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
 
+internal sealed partial class DeleteIndexTemplateResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteIndexTemplateResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override DeleteIndexTemplateResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteIndexTemplateResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteIndexTemplateResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteIndexTemplateResponseConverter))]
 public sealed partial class DeleteIndexTemplateResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class DeleteIndexTemplateResponse : ElasticsearchResponse
 	/// 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/DeleteTemplateResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteTemplateResponse.g.cs
index a4129c54a7c..ee2b004682e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteTemplateResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteTemplateResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
 
+internal sealed partial class DeleteTemplateResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteTemplateResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override DeleteTemplateResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteTemplateResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteTemplateResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteTemplateResponseConverter))]
 public sealed partial class DeleteTemplateResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class DeleteTemplateResponse : ElasticsearchResponse
 	/// 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/DownsampleRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DownsampleRequest.g.cs
index 0685bdc4ac9..d823e712b67 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DownsampleRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DownsampleRequest.g.cs
@@ -47,7 +47,7 @@ public sealed partial class DownsampleRequestParameters : RequestParameters
 /// The source index must be read only (<c>index.blocks.write: true</c>).
 /// </para>
 /// </summary>
-public sealed partial class DownsampleRequest : PlainRequest<DownsampleRequestParameters>, ISelfSerializable
+public sealed partial class DownsampleRequest : PlainRequest<DownsampleRequestParameters>, ISelfTwoWaySerializable
 {
 	public DownsampleRequest(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.IndexName targetIndex) : base(r => r.Required("index", index).Required("target_index", targetIndex))
 	{
@@ -61,13 +61,17 @@ public DownsampleRequest(Elastic.Clients.Elasticsearch.IndexName index, Elastic.
 
 	internal override string OperationName => "indices.downsample";
 
-	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.IndexManagement.DownsampleConfig Config { get; set; }
 
-	void ISelfSerializable.Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
+	void ISelfTwoWaySerializable.Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 	{
 		JsonSerializer.Serialize(writer, Config, options);
 	}
+
+	void ISelfTwoWaySerializable.Deserialize(ref Utf8JsonReader reader, JsonSerializerOptions options, IElasticsearchClientSettings settings)
+	{
+		Config = settings.RequestResponseSerializer.Deserialize<Elastic.Clients.Elasticsearch.IndexManagement.DownsampleConfig>(ref reader);
+	}
 }
 
 /// <summary>
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ExplainDataLifecycleResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ExplainDataLifecycleResponse.g.cs
index 8dfd1f29eeb..2ce8ca82fbf 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ExplainDataLifecycleResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ExplainDataLifecycleResponse.g.cs
@@ -18,17 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
 
+internal sealed partial class ExplainDataLifecycleResponseConverter : System.Text.Json.Serialization.JsonConverter<ExplainDataLifecycleResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropIndices = System.Text.Json.JsonEncodedText.Encode("indices");
+
+	public override ExplainDataLifecycleResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyDictionary<Elastic.Clients.Elasticsearch.IndexName, Elastic.Clients.Elasticsearch.IndexManagement.DataStreamLifecycleExplain>> propIndices = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propIndices.TryRead(ref reader, options, PropIndices))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ExplainDataLifecycleResponse
+		{
+			Indices = propIndices.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ExplainDataLifecycleResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropIndices, value.Indices);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ExplainDataLifecycleResponseConverter))]
 public sealed partial class ExplainDataLifecycleResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("indices")]
-	[ReadOnlyIndexNameDictionaryConverter(typeof(Elastic.Clients.Elasticsearch.IndexManagement.DataStreamLifecycleExplain))]
 	public IReadOnlyDictionary<Elastic.Clients.Elasticsearch.IndexName, Elastic.Clients.Elasticsearch.IndexManagement.DataStreamLifecycleExplain> Indices { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/FieldUsageStatsResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/FieldUsageStatsResponse.g.cs
index f5e5ded303a..660f7f18cae 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/FieldUsageStatsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/FieldUsageStatsResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
 
+internal sealed partial class FieldUsageStatsResponseConverter : System.Text.Json.Serialization.JsonConverter<FieldUsageStatsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropShards = System.Text.Json.JsonEncodedText.Encode("_shards");
+
+	public override FieldUsageStatsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.ShardStatistics> propShards = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propShards.TryRead(ref reader, options, PropShards))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new FieldUsageStatsResponse
+		{
+			Shards = propShards.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, FieldUsageStatsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropShards, value.Shards);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(FieldUsageStatsResponseConverter))]
 public sealed partial class FieldUsageStatsResponse : ElasticsearchResponse
 {
-	[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/FlushResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/FlushResponse.g.cs
index a65538aaae8..7c2d00d4438 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/FlushResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/FlushResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
 
+internal sealed partial class FlushResponseConverter : System.Text.Json.Serialization.JsonConverter<FlushResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropShards = System.Text.Json.JsonEncodedText.Encode("_shards");
+
+	public override FlushResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.ShardStatistics?> propShards = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propShards.TryRead(ref reader, options, PropShards))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new FlushResponse
+		{
+			Shards = propShards.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, FlushResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropShards, value.Shards);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(FlushResponseConverter))]
 public sealed partial class FlushResponse : ElasticsearchResponse
 {
-	[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/ForcemergeResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ForcemergeResponse.g.cs
index 31e852e84b8..f3fa53d19ec 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ForcemergeResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ForcemergeResponse.g.cs
@@ -18,17 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
 
+internal sealed partial class ForcemergeResponseConverter : System.Text.Json.Serialization.JsonConverter<ForcemergeResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropShards = System.Text.Json.JsonEncodedText.Encode("_shards");
+	private static readonly System.Text.Json.JsonEncodedText PropTask = System.Text.Json.JsonEncodedText.Encode("task");
+
+	public override ForcemergeResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.ShardStatistics?> propShards = default;
+		LocalJsonProperty<string?> propTask = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propShards.TryRead(ref reader, options, PropShards))
+			{
+				continue;
+			}
+
+			if (propTask.TryRead(ref reader, options, PropTask))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ForcemergeResponse
+		{
+			Shards = propShards.Value
+,
+			Task = propTask.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ForcemergeResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropShards, value.Shards);
+		writer.WriteProperty(options, PropTask, value.Task);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ForcemergeResponseConverter))]
 public sealed partial class ForcemergeResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("_shards")]
 	public Elastic.Clients.Elasticsearch.ShardStatistics? Shards { get; init; }
 
 	/// <summary>
@@ -37,6 +83,5 @@ public sealed partial class ForcemergeResponse : ElasticsearchResponse
 	/// you can use the task_id to get the status of the task at _tasks/&lt;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/GetDataLifecycleResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetDataLifecycleResponse.g.cs
index 9fcbcfc0c5c..323b098d845 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetDataLifecycleResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetDataLifecycleResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
 
+internal sealed partial class GetDataLifecycleResponseConverter : System.Text.Json.Serialization.JsonConverter<GetDataLifecycleResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropDataStreams = System.Text.Json.JsonEncodedText.Encode("data_streams");
+
+	public override GetDataLifecycleResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.IndexManagement.DataStreamWithLifecycle>> propDataStreams = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propDataStreams.TryRead(ref reader, options, PropDataStreams))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetDataLifecycleResponse
+		{
+			DataStreams = propDataStreams.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetDataLifecycleResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDataStreams, value.DataStreams);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetDataLifecycleResponseConverter))]
 public sealed partial class GetDataLifecycleResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("data_streams")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.IndexManagement.DataStreamWithLifecycle> DataStreams { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetDataLifecycleStatsResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetDataLifecycleStatsResponse.g.cs
index 53645820197..b5855c7ab19 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetDataLifecycleStatsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetDataLifecycleStatsResponse.g.cs
@@ -18,14 +18,81 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
 
+internal sealed partial class GetDataLifecycleStatsResponseConverter : System.Text.Json.Serialization.JsonConverter<GetDataLifecycleStatsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropDataStreamCount = System.Text.Json.JsonEncodedText.Encode("data_stream_count");
+	private static readonly System.Text.Json.JsonEncodedText PropDataStreams = System.Text.Json.JsonEncodedText.Encode("data_streams");
+	private static readonly System.Text.Json.JsonEncodedText PropLastRunDurationInMillis = System.Text.Json.JsonEncodedText.Encode("last_run_duration_in_millis");
+	private static readonly System.Text.Json.JsonEncodedText PropTimeBetweenStartsInMillis = System.Text.Json.JsonEncodedText.Encode("time_between_starts_in_millis");
+
+	public override GetDataLifecycleStatsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<int> propDataStreamCount = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.IndexManagement.DataStreamStats>> propDataStreams = default;
+		LocalJsonProperty<long?> propLastRunDurationInMillis = default;
+		LocalJsonProperty<long?> propTimeBetweenStartsInMillis = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propDataStreamCount.TryRead(ref reader, options, PropDataStreamCount))
+			{
+				continue;
+			}
+
+			if (propDataStreams.TryRead(ref reader, options, PropDataStreams))
+			{
+				continue;
+			}
+
+			if (propLastRunDurationInMillis.TryRead(ref reader, options, PropLastRunDurationInMillis))
+			{
+				continue;
+			}
+
+			if (propTimeBetweenStartsInMillis.TryRead(ref reader, options, PropTimeBetweenStartsInMillis))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetDataLifecycleStatsResponse
+		{
+			DataStreamCount = propDataStreamCount.Value
+,
+			DataStreams = propDataStreams.Value
+,
+			LastRunDurationInMillis = propLastRunDurationInMillis.Value
+,
+			TimeBetweenStartsInMillis = propTimeBetweenStartsInMillis.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetDataLifecycleStatsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDataStreamCount, value.DataStreamCount);
+		writer.WriteProperty(options, PropDataStreams, value.DataStreams);
+		writer.WriteProperty(options, PropLastRunDurationInMillis, value.LastRunDurationInMillis);
+		writer.WriteProperty(options, PropTimeBetweenStartsInMillis, value.TimeBetweenStartsInMillis);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetDataLifecycleStatsResponseConverter))]
 public sealed partial class GetDataLifecycleStatsResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,7 +100,6 @@ public sealed partial class GetDataLifecycleStatsResponse : ElasticsearchRespons
 	/// The count of data streams currently being managed by the data stream lifecycle.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("data_stream_count")]
 	public int DataStreamCount { get; init; }
 
 	/// <summary>
@@ -41,7 +107,6 @@ public sealed partial class GetDataLifecycleStatsResponse : ElasticsearchRespons
 	/// Information about the data streams that are managed by the data stream lifecycle.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("data_streams")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.IndexManagement.DataStreamStats> DataStreams { get; init; }
 
 	/// <summary>
@@ -49,7 +114,6 @@ public sealed partial class GetDataLifecycleStatsResponse : ElasticsearchRespons
 	/// The duration of the last data stream lifecycle execution.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("last_run_duration_in_millis")]
 	public long? LastRunDurationInMillis { get; init; }
 
 	/// <summary>
@@ -58,6 +122,5 @@ public sealed partial class GetDataLifecycleStatsResponse : ElasticsearchRespons
 	/// This value should amount approximately to <c>data_streams.lifecycle.poll_interval</c>.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("time_between_starts_in_millis")]
 	public long? TimeBetweenStartsInMillis { get; init; }
 }
\ No newline at end of file
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 f6c1a882edf..1611ee2be55 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetDataStreamResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetDataStreamResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
 
+internal sealed partial class GetDataStreamResponseConverter : System.Text.Json.Serialization.JsonConverter<GetDataStreamResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropDataStreams = System.Text.Json.JsonEncodedText.Encode("data_streams");
+
+	public override GetDataStreamResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.IndexManagement.DataStream>> propDataStreams = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propDataStreams.TryRead(ref reader, options, PropDataStreams))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetDataStreamResponse
+		{
+			DataStreams = propDataStreams.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetDataStreamResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDataStreams, value.DataStreams);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetDataStreamResponseConverter))]
 public sealed partial class GetDataStreamResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("data_streams")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.IndexManagement.DataStream> DataStreams { get; init; }
 }
\ No newline at end of file
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 bc57e63ef5e..b22e0271280 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetIndexTemplateResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetIndexTemplateResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
 
+internal sealed partial class GetIndexTemplateResponseConverter : System.Text.Json.Serialization.JsonConverter<GetIndexTemplateResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropIndexTemplates = System.Text.Json.JsonEncodedText.Encode("index_templates");
+
+	public override GetIndexTemplateResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.IndexManagement.IndexTemplateItem>> propIndexTemplates = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propIndexTemplates.TryRead(ref reader, options, PropIndexTemplates))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetIndexTemplateResponse
+		{
+			IndexTemplates = propIndexTemplates.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetIndexTemplateResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropIndexTemplates, value.IndexTemplates);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetIndexTemplateResponseConverter))]
 public sealed partial class GetIndexTemplateResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("index_templates")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.IndexManagement.IndexTemplateItem> IndexTemplates { get; init; }
 }
\ No newline at end of file
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 7a78a645850..48acd4c2a80 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/IndicesStatsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/IndicesStatsResponse.g.cs
@@ -18,20 +18,74 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
 
+internal sealed partial class IndicesStatsResponseConverter : System.Text.Json.Serialization.JsonConverter<IndicesStatsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAll = System.Text.Json.JsonEncodedText.Encode("_all");
+	private static readonly System.Text.Json.JsonEncodedText PropIndices = System.Text.Json.JsonEncodedText.Encode("indices");
+	private static readonly System.Text.Json.JsonEncodedText PropShards = System.Text.Json.JsonEncodedText.Encode("_shards");
+
+	public override IndicesStatsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.IndexManagement.IndicesStats> propAll = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.IndexManagement.IndicesStats>?> propIndices = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.ShardStatistics> propShards = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAll.TryRead(ref reader, options, PropAll))
+			{
+				continue;
+			}
+
+			if (propIndices.TryRead(ref reader, options, PropIndices))
+			{
+				continue;
+			}
+
+			if (propShards.TryRead(ref reader, options, PropShards))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new IndicesStatsResponse
+		{
+			All = propAll.Value
+,
+			Indices = propIndices.Value
+,
+			Shards = propShards.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IndicesStatsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAll, value.All);
+		writer.WriteProperty(options, PropIndices, value.Indices);
+		writer.WriteProperty(options, PropShards, value.Shards);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(IndicesStatsResponseConverter))]
 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/MigrateToDataStreamResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/MigrateToDataStreamResponse.g.cs
index 48d6aa2e95e..60bf3ae5c77 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/MigrateToDataStreamResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/MigrateToDataStreamResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
 
+internal sealed partial class MigrateToDataStreamResponseConverter : System.Text.Json.Serialization.JsonConverter<MigrateToDataStreamResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override MigrateToDataStreamResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new MigrateToDataStreamResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, MigrateToDataStreamResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(MigrateToDataStreamResponseConverter))]
 public sealed partial class MigrateToDataStreamResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class MigrateToDataStreamResponse : ElasticsearchResponse
 	/// 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/ModifyDataStreamResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ModifyDataStreamResponse.g.cs
index f55c2d8935d..b77684e8619 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ModifyDataStreamResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ModifyDataStreamResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
 
+internal sealed partial class ModifyDataStreamResponseConverter : System.Text.Json.Serialization.JsonConverter<ModifyDataStreamResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override ModifyDataStreamResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ModifyDataStreamResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ModifyDataStreamResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ModifyDataStreamResponseConverter))]
 public sealed partial class ModifyDataStreamResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class ModifyDataStreamResponse : ElasticsearchResponse
 	/// 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/OpenIndexResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/OpenIndexResponse.g.cs
index bfbbff8b77c..c23330f8dc0 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/OpenIndexResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/OpenIndexResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
 
+internal sealed partial class OpenIndexResponseConverter : System.Text.Json.Serialization.JsonConverter<OpenIndexResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+	private static readonly System.Text.Json.JsonEncodedText PropShardsAcknowledged = System.Text.Json.JsonEncodedText.Encode("shards_acknowledged");
+
+	public override OpenIndexResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		LocalJsonProperty<bool> propShardsAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			if (propShardsAcknowledged.TryRead(ref reader, options, PropShardsAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new OpenIndexResponse
+		{
+			Acknowledged = propAcknowledged.Value
+,
+			ShardsAcknowledged = propShardsAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, OpenIndexResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteProperty(options, PropShardsAcknowledged, value.ShardsAcknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(OpenIndexResponseConverter))]
 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/PutAliasResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutAliasResponse.g.cs
index 4b2d5f8e957..4b9bd63937d 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutAliasResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutAliasResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
 
+internal sealed partial class PutAliasResponseConverter : System.Text.Json.Serialization.JsonConverter<PutAliasResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override PutAliasResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutAliasResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutAliasResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PutAliasResponseConverter))]
 public sealed partial class PutAliasResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class PutAliasResponse : ElasticsearchResponse
 	/// 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/PutDataLifecycleRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutDataLifecycleRequest.g.cs
index 85d023869c7..2a0f9db04e4 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutDataLifecycleRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutDataLifecycleRequest.g.cs
@@ -65,7 +65,7 @@ public sealed partial class PutDataLifecycleRequestParameters : RequestParameter
 /// Update the data stream lifecycle of the specified data streams.
 /// </para>
 /// </summary>
-public sealed partial class PutDataLifecycleRequest : PlainRequest<PutDataLifecycleRequestParameters>, ISelfSerializable
+public sealed partial class PutDataLifecycleRequest : PlainRequest<PutDataLifecycleRequestParameters>, ISelfTwoWaySerializable
 {
 	public PutDataLifecycleRequest(Elastic.Clients.Elasticsearch.DataStreamNames name) : base(r => r.Required("name", name))
 	{
@@ -107,13 +107,17 @@ public PutDataLifecycleRequest(Elastic.Clients.Elasticsearch.DataStreamNames nam
 	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
-	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.IndexManagement.DataStreamLifecycle Lifecycle { get; set; }
 
-	void ISelfSerializable.Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
+	void ISelfTwoWaySerializable.Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 	{
 		JsonSerializer.Serialize(writer, Lifecycle, options);
 	}
+
+	void ISelfTwoWaySerializable.Deserialize(ref Utf8JsonReader reader, JsonSerializerOptions options, IElasticsearchClientSettings settings)
+	{
+		Lifecycle = settings.RequestResponseSerializer.Deserialize<Elastic.Clients.Elasticsearch.IndexManagement.DataStreamLifecycle>(ref reader);
+	}
 }
 
 /// <summary>
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutDataLifecycleResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutDataLifecycleResponse.g.cs
index ba771b59fb4..25196a12186 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutDataLifecycleResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutDataLifecycleResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
 
+internal sealed partial class PutDataLifecycleResponseConverter : System.Text.Json.Serialization.JsonConverter<PutDataLifecycleResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override PutDataLifecycleResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutDataLifecycleResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutDataLifecycleResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PutDataLifecycleResponseConverter))]
 public sealed partial class PutDataLifecycleResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class PutDataLifecycleResponse : ElasticsearchResponse
 	/// 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/PutIndexTemplateResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutIndexTemplateResponse.g.cs
index ca9c859e0ba..e7506b8c2b7 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutIndexTemplateResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutIndexTemplateResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
 
+internal sealed partial class PutIndexTemplateResponseConverter : System.Text.Json.Serialization.JsonConverter<PutIndexTemplateResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override PutIndexTemplateResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutIndexTemplateResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutIndexTemplateResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PutIndexTemplateResponseConverter))]
 public sealed partial class PutIndexTemplateResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class PutIndexTemplateResponse : ElasticsearchResponse
 	/// 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/PutIndicesSettingsRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutIndicesSettingsRequest.g.cs
index 8bb53488e96..353d4148600 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutIndicesSettingsRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutIndicesSettingsRequest.g.cs
@@ -114,7 +114,7 @@ public sealed partial class PutIndicesSettingsRequestParameters : RequestParamet
 /// To change the analyzer for existing backing indices, you must create a new data stream and reindex your data into it.
 /// </para>
 /// </summary>
-public sealed partial class PutIndicesSettingsRequest : PlainRequest<PutIndicesSettingsRequestParameters>, ISelfSerializable
+public sealed partial class PutIndicesSettingsRequest : PlainRequest<PutIndicesSettingsRequestParameters>, ISelfTwoWaySerializable
 {
 	public PutIndicesSettingsRequest()
 	{
@@ -197,13 +197,17 @@ public PutIndicesSettingsRequest(Elastic.Clients.Elasticsearch.Indices? indices)
 	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
-	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.IndexManagement.IndexSettings Settings { get; set; }
 
-	void ISelfSerializable.Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
+	void ISelfTwoWaySerializable.Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 	{
 		JsonSerializer.Serialize(writer, Settings, options);
 	}
+
+	void ISelfTwoWaySerializable.Deserialize(ref Utf8JsonReader reader, JsonSerializerOptions options, IElasticsearchClientSettings settings)
+	{
+		Settings = settings.RequestResponseSerializer.Deserialize<Elastic.Clients.Elasticsearch.IndexManagement.IndexSettings>(ref reader);
+	}
 }
 
 /// <summary>
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutIndicesSettingsResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutIndicesSettingsResponse.g.cs
index f5ada21c60d..784a2f8c1e4 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutIndicesSettingsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutIndicesSettingsResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
 
+internal sealed partial class PutIndicesSettingsResponseConverter : System.Text.Json.Serialization.JsonConverter<PutIndicesSettingsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override PutIndicesSettingsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutIndicesSettingsResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutIndicesSettingsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PutIndicesSettingsResponseConverter))]
 public sealed partial class PutIndicesSettingsResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class PutIndicesSettingsResponse : ElasticsearchResponse
 	/// 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 1f1cd563d76..5b6ccbffdcb 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutMappingRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutMappingRequest.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport;
@@ -81,6 +82,139 @@ public sealed partial class PutMappingRequestParameters : RequestParameters
 	public bool? WriteIndexOnly { get => Q<bool?>("write_index_only"); set => Q("write_index_only", value); }
 }
 
+internal sealed partial class PutMappingRequestConverter : System.Text.Json.Serialization.JsonConverter<PutMappingRequest>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropDateDetection = System.Text.Json.JsonEncodedText.Encode("date_detection");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamic = System.Text.Json.JsonEncodedText.Encode("dynamic");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamicDateFormats = System.Text.Json.JsonEncodedText.Encode("dynamic_date_formats");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamicTemplates = System.Text.Json.JsonEncodedText.Encode("dynamic_templates");
+	private static readonly System.Text.Json.JsonEncodedText PropFieldNames = System.Text.Json.JsonEncodedText.Encode("_field_names");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("_meta");
+	private static readonly System.Text.Json.JsonEncodedText PropNumericDetection = System.Text.Json.JsonEncodedText.Encode("numeric_detection");
+	private static readonly System.Text.Json.JsonEncodedText PropProperties = System.Text.Json.JsonEncodedText.Encode("properties");
+	private static readonly System.Text.Json.JsonEncodedText PropRouting = System.Text.Json.JsonEncodedText.Encode("_routing");
+	private static readonly System.Text.Json.JsonEncodedText PropRuntime = System.Text.Json.JsonEncodedText.Encode("runtime");
+	private static readonly System.Text.Json.JsonEncodedText PropSource = System.Text.Json.JsonEncodedText.Encode("_source");
+
+	public override PutMappingRequest Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool?> propDateDetection = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.DynamicMapping?> propDynamic = default;
+		LocalJsonProperty<ICollection<string>?> propDynamicDateFormats = default;
+		LocalJsonProperty<ICollection<IDictionary<string, Elastic.Clients.Elasticsearch.Mapping.DynamicTemplate>>?> propDynamicTemplates = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.FieldNamesField?> propFieldNames = default;
+		LocalJsonProperty<IDictionary<string, object>?> propMeta = default;
+		LocalJsonProperty<bool?> propNumericDetection = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.Properties?> propProperties = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.RoutingField?> propRouting = default;
+		LocalJsonProperty<IDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>?> propRuntime = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.SourceField?> propSource = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propDateDetection.TryRead(ref reader, options, PropDateDetection))
+			{
+				continue;
+			}
+
+			if (propDynamic.TryRead(ref reader, options, PropDynamic))
+			{
+				continue;
+			}
+
+			if (propDynamicDateFormats.TryRead(ref reader, options, PropDynamicDateFormats))
+			{
+				continue;
+			}
+
+			if (propDynamicTemplates.TryRead(ref reader, options, PropDynamicTemplates, typeof(SingleOrManyMarker<IReadOnlyCollection<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Mapping.DynamicTemplate>>?, IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Mapping.DynamicTemplate>>)))
+			{
+				continue;
+			}
+
+			if (propFieldNames.TryRead(ref reader, options, PropFieldNames))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propNumericDetection.TryRead(ref reader, options, PropNumericDetection))
+			{
+				continue;
+			}
+
+			if (propProperties.TryRead(ref reader, options, PropProperties))
+			{
+				continue;
+			}
+
+			if (propRouting.TryRead(ref reader, options, PropRouting))
+			{
+				continue;
+			}
+
+			if (propRuntime.TryRead(ref reader, options, PropRuntime))
+			{
+				continue;
+			}
+
+			if (propSource.TryRead(ref reader, options, PropSource))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutMappingRequest
+		{
+			DateDetection = propDateDetection.Value
+	,
+			Dynamic = propDynamic.Value
+	,
+			DynamicDateFormats = propDynamicDateFormats.Value
+	,
+			DynamicTemplates = propDynamicTemplates.Value
+	,
+			FieldNames = propFieldNames.Value
+	,
+			Meta = propMeta.Value
+	,
+			NumericDetection = propNumericDetection.Value
+	,
+			Properties = propProperties.Value
+	,
+			Routing = propRouting.Value
+	,
+			Runtime = propRuntime.Value
+	,
+			Source = propSource.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutMappingRequest value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDateDetection, value.DateDetection);
+		writer.WriteProperty(options, PropDynamic, value.Dynamic);
+		writer.WriteProperty(options, PropDynamicDateFormats, value.DynamicDateFormats);
+		writer.WriteProperty(options, PropDynamicTemplates, value.DynamicTemplates, typeof(SingleOrManyMarker<IReadOnlyCollection<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Mapping.DynamicTemplate>>?, IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Mapping.DynamicTemplate>>));
+		writer.WriteProperty(options, PropFieldNames, value.FieldNames);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropNumericDetection, value.NumericDetection);
+		writer.WriteProperty(options, PropProperties, value.Properties);
+		writer.WriteProperty(options, PropRouting, value.Routing);
+		writer.WriteProperty(options, PropRuntime, value.Runtime);
+		writer.WriteProperty(options, PropSource, value.Source);
+		writer.WriteEndObject();
+	}
+}
+
 /// <summary>
 /// <para>
 /// Update field mappings.
@@ -123,6 +257,7 @@ public sealed partial class PutMappingRequestParameters : RequestParameters
 /// Instead, add an alias field to create an alternate field name.
 /// </para>
 /// </summary>
+[JsonConverter(typeof(PutMappingRequestConverter))]
 public sealed partial class PutMappingRequest : PlainRequest<PutMappingRequestParameters>
 {
 	public PutMappingRequest(Elastic.Clients.Elasticsearch.Indices indices) : base(r => r.Required("index", indices))
@@ -143,7 +278,6 @@ public PutMappingRequest(Elastic.Clients.Elasticsearch.Indices indices) : base(r
 	/// This behavior applies even if the request targets other open indices.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public bool? AllowNoIndices { get => Q<bool?>("allow_no_indices"); set => Q("allow_no_indices", value); }
 
 	/// <summary>
@@ -154,7 +288,6 @@ public PutMappingRequest(Elastic.Clients.Elasticsearch.Indices indices) : base(r
 	/// Valid values are: <c>all</c>, <c>open</c>, <c>closed</c>, <c>hidden</c>, <c>none</c>.
 	/// </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>
@@ -162,7 +295,6 @@ public PutMappingRequest(Elastic.Clients.Elasticsearch.Indices indices) : base(r
 	/// If <c>false</c>, the request returns an error if it targets a missing or closed index.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
 
 	/// <summary>
@@ -171,7 +303,6 @@ public PutMappingRequest(Elastic.Clients.Elasticsearch.Indices indices) : base(r
 	/// 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>
@@ -180,7 +311,6 @@ public PutMappingRequest(Elastic.Clients.Elasticsearch.Indices indices) : base(r
 	/// 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>
@@ -188,7 +318,6 @@ public PutMappingRequest(Elastic.Clients.Elasticsearch.Indices indices) : base(r
 	/// If <c>true</c>, the mappings are applied only to the current write index for the target.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public bool? WriteIndexOnly { get => Q<bool?>("write_index_only"); set => Q("write_index_only", value); }
 
 	/// <summary>
@@ -196,7 +325,6 @@ public PutMappingRequest(Elastic.Clients.Elasticsearch.Indices indices) : base(r
 	/// Controls whether dynamic date detection is enabled.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("date_detection")]
 	public bool? DateDetection { get; set; }
 
 	/// <summary>
@@ -204,7 +332,6 @@ public PutMappingRequest(Elastic.Clients.Elasticsearch.Indices indices) : base(r
 	/// Controls whether new fields are added dynamically.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? Dynamic { get; set; }
 
 	/// <summary>
@@ -214,7 +341,6 @@ public PutMappingRequest(Elastic.Clients.Elasticsearch.Indices indices) : base(r
 	/// a new date field is added instead of string.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("dynamic_date_formats")]
 	public ICollection<string>? DynamicDateFormats { get; set; }
 
 	/// <summary>
@@ -222,8 +348,6 @@ public PutMappingRequest(Elastic.Clients.Elasticsearch.Indices indices) : base(r
 	/// Specify dynamic templates for the mapping.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("dynamic_templates")]
-	[SingleOrManyCollectionConverter(typeof(IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Mapping.DynamicTemplate>))]
 	public ICollection<IDictionary<string, Elastic.Clients.Elasticsearch.Mapping.DynamicTemplate>>? DynamicTemplates { get; set; }
 
 	/// <summary>
@@ -231,7 +355,6 @@ public PutMappingRequest(Elastic.Clients.Elasticsearch.Indices indices) : base(r
 	/// 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>
@@ -241,7 +364,6 @@ public PutMappingRequest(Elastic.Clients.Elasticsearch.Indices indices) : base(r
 	/// application-specific metadata.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("_meta")]
 	public IDictionary<string, object>? Meta { get; set; }
 
 	/// <summary>
@@ -249,7 +371,6 @@ public PutMappingRequest(Elastic.Clients.Elasticsearch.Indices indices) : base(r
 	/// Automatically map strings into numeric data types for all fields.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("numeric_detection")]
 	public bool? NumericDetection { get; set; }
 
 	/// <summary>
@@ -274,7 +395,6 @@ public PutMappingRequest(Elastic.Clients.Elasticsearch.Indices indices) : base(r
 	/// </item>
 	/// </list>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Properties { get; set; }
 
 	/// <summary>
@@ -282,7 +402,6 @@ public PutMappingRequest(Elastic.Clients.Elasticsearch.Indices indices) : base(r
 	/// Enable making a routing value required on indexed documents.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("_routing")]
 	public Elastic.Clients.Elasticsearch.Mapping.RoutingField? Routing { get; set; }
 
 	/// <summary>
@@ -290,7 +409,6 @@ public PutMappingRequest(Elastic.Clients.Elasticsearch.Indices indices) : base(r
 	/// 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>
@@ -298,7 +416,6 @@ public PutMappingRequest(Elastic.Clients.Elasticsearch.Indices indices) : base(r
 	/// Control whether the _source field is enabled on the index.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("_source")]
 	public Elastic.Clients.Elasticsearch.Mapping.SourceField? Source { get; set; }
 }
 
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 ee2d54544d5..6bc6645fb0b 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutMappingResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutMappingResponse.g.cs
@@ -18,14 +18,61 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
 
+internal sealed partial class PutMappingResponseConverter : System.Text.Json.Serialization.JsonConverter<PutMappingResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+	private static readonly System.Text.Json.JsonEncodedText PropShards = System.Text.Json.JsonEncodedText.Encode("_shards");
+
+	public override PutMappingResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.ShardStatistics?> propShards = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			if (propShards.TryRead(ref reader, options, PropShards))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutMappingResponse
+		{
+			Acknowledged = propAcknowledged.Value
+,
+			Shards = propShards.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutMappingResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteProperty(options, PropShards, value.Shards);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PutMappingResponseConverter))]
 public sealed partial class PutMappingResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,8 +80,6 @@ public sealed partial class PutMappingResponse : ElasticsearchResponse
 	/// 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; }
-	[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 3c6067ef0eb..f690a67a5ee 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutTemplateRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutTemplateRequest.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport;
@@ -50,6 +51,89 @@ public sealed partial class PutTemplateRequestParameters : RequestParameters
 	public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 }
 
+internal sealed partial class PutTemplateRequestConverter : System.Text.Json.Serialization.JsonConverter<PutTemplateRequest>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAliases = System.Text.Json.JsonEncodedText.Encode("aliases");
+	private static readonly System.Text.Json.JsonEncodedText PropIndexPatterns = System.Text.Json.JsonEncodedText.Encode("index_patterns");
+	private static readonly System.Text.Json.JsonEncodedText PropMappings = System.Text.Json.JsonEncodedText.Encode("mappings");
+	private static readonly System.Text.Json.JsonEncodedText PropOrder = System.Text.Json.JsonEncodedText.Encode("order");
+	private static readonly System.Text.Json.JsonEncodedText PropSettings = System.Text.Json.JsonEncodedText.Encode("settings");
+	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("version");
+
+	public override PutTemplateRequest Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IDictionary<Elastic.Clients.Elasticsearch.IndexName, Elastic.Clients.Elasticsearch.IndexManagement.Alias>?> propAliases = default;
+		LocalJsonProperty<ICollection<string>?> propIndexPatterns = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.TypeMapping?> propMappings = default;
+		LocalJsonProperty<int?> propOrder = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.IndexManagement.IndexSettings?> propSettings = default;
+		LocalJsonProperty<long?> propVersion = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAliases.TryRead(ref reader, options, PropAliases))
+			{
+				continue;
+			}
+
+			if (propIndexPatterns.TryRead(ref reader, options, PropIndexPatterns, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propMappings.TryRead(ref reader, options, PropMappings))
+			{
+				continue;
+			}
+
+			if (propOrder.TryRead(ref reader, options, PropOrder))
+			{
+				continue;
+			}
+
+			if (propSettings.TryRead(ref reader, options, PropSettings))
+			{
+				continue;
+			}
+
+			if (propVersion.TryRead(ref reader, options, PropVersion))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutTemplateRequest
+		{
+			Aliases = propAliases.Value
+	,
+			IndexPatterns = propIndexPatterns.Value
+	,
+			Mappings = propMappings.Value
+	,
+			Order = propOrder.Value
+	,
+			Settings = propSettings.Value
+	,
+			Version = propVersion.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutTemplateRequest value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAliases, value.Aliases);
+		writer.WriteProperty(options, PropIndexPatterns, value.IndexPatterns, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropMappings, value.Mappings);
+		writer.WriteProperty(options, PropOrder, value.Order);
+		writer.WriteProperty(options, PropSettings, value.Settings);
+		writer.WriteProperty(options, PropVersion, value.Version);
+		writer.WriteEndObject();
+	}
+}
+
 /// <summary>
 /// <para>
 /// Create or update an index template.
@@ -81,6 +165,7 @@ public sealed partial class PutTemplateRequestParameters : RequestParameters
 /// NOTE: Multiple matching templates with the same order value will result in a non-deterministic merging order.
 /// </para>
 /// </summary>
+[JsonConverter(typeof(PutTemplateRequestConverter))]
 public sealed partial class PutTemplateRequest : PlainRequest<PutTemplateRequestParameters>
 {
 	public PutTemplateRequest(Elastic.Clients.Elasticsearch.Name name) : base(r => r.Required("name", name))
@@ -95,7 +180,6 @@ public PutTemplateRequest(Elastic.Clients.Elasticsearch.Name name) : base(r => r
 
 	internal override string OperationName => "indices.put_template";
 
-	[JsonIgnore]
 	public string? Cause { get => Q<string?>("cause"); set => Q("cause", value); }
 
 	/// <summary>
@@ -103,7 +187,6 @@ public PutTemplateRequest(Elastic.Clients.Elasticsearch.Name name) : base(r => r
 	/// 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); }
 
 	/// <summary>
@@ -112,7 +195,6 @@ public PutTemplateRequest(Elastic.Clients.Elasticsearch.Name name) : base(r => r
 	/// 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>
@@ -120,7 +202,6 @@ public PutTemplateRequest(Elastic.Clients.Elasticsearch.Name name) : base(r => r
 	/// Aliases for the index.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("aliases")]
 	public IDictionary<Elastic.Clients.Elasticsearch.IndexName, Elastic.Clients.Elasticsearch.IndexManagement.Alias>? Aliases { get; set; }
 
 	/// <summary>
@@ -129,8 +210,6 @@ public PutTemplateRequest(Elastic.Clients.Elasticsearch.Name name) : base(r => r
 	/// of indices during creation.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("index_patterns")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? IndexPatterns { get; set; }
 
 	/// <summary>
@@ -138,7 +217,6 @@ public PutTemplateRequest(Elastic.Clients.Elasticsearch.Name name) : base(r => r
 	/// Mapping for fields in the index.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("mappings")]
 	public Elastic.Clients.Elasticsearch.Mapping.TypeMapping? Mappings { get; set; }
 
 	/// <summary>
@@ -151,7 +229,6 @@ public PutTemplateRequest(Elastic.Clients.Elasticsearch.Name name) : base(r => r
 	/// 'order' values are merged later, overriding templates with lower values.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("order")]
 	public int? Order { get; set; }
 
 	/// <summary>
@@ -159,7 +236,6 @@ public PutTemplateRequest(Elastic.Clients.Elasticsearch.Name name) : base(r => r
 	/// Configuration options for the index.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("settings")]
 	public Elastic.Clients.Elasticsearch.IndexManagement.IndexSettings? Settings { get; set; }
 
 	/// <summary>
@@ -169,7 +245,6 @@ public PutTemplateRequest(Elastic.Clients.Elasticsearch.Name name) : base(r => r
 	/// To unset a version, replace the template without specifying one.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("version")]
 	public long? Version { get; set; }
 }
 
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 45918fda300..6a314b7f311 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutTemplateResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutTemplateResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
 
+internal sealed partial class PutTemplateResponseConverter : System.Text.Json.Serialization.JsonConverter<PutTemplateResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override PutTemplateResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutTemplateResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutTemplateResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PutTemplateResponseConverter))]
 public sealed partial class PutTemplateResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class PutTemplateResponse : ElasticsearchResponse
 	/// 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/RefreshResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/RefreshResponse.g.cs
index 173d7f57182..670f1d472e7 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/RefreshResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/RefreshResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
 
+internal sealed partial class RefreshResponseConverter : System.Text.Json.Serialization.JsonConverter<RefreshResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropShards = System.Text.Json.JsonEncodedText.Encode("_shards");
+
+	public override RefreshResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.ShardStatistics?> propShards = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propShards.TryRead(ref reader, options, PropShards))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new RefreshResponse
+		{
+			Shards = propShards.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, RefreshResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropShards, value.Shards);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(RefreshResponseConverter))]
 public sealed partial class RefreshResponse : ElasticsearchResponse
 {
-	[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/ReloadSearchAnalyzersResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ReloadSearchAnalyzersResponse.g.cs
index 63b89ee9ae3..e009a00a23f 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ReloadSearchAnalyzersResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ReloadSearchAnalyzersResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
 
+internal sealed partial class ReloadSearchAnalyzersResponseConverter : System.Text.Json.Serialization.JsonConverter<ReloadSearchAnalyzersResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropReloadDetails = System.Text.Json.JsonEncodedText.Encode("reload_details");
+	private static readonly System.Text.Json.JsonEncodedText PropShards = System.Text.Json.JsonEncodedText.Encode("_shards");
+
+	public override ReloadSearchAnalyzersResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.IndexManagement.ReloadDetails>> propReloadDetails = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.ShardStatistics> propShards = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propReloadDetails.TryRead(ref reader, options, PropReloadDetails))
+			{
+				continue;
+			}
+
+			if (propShards.TryRead(ref reader, options, PropShards))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ReloadSearchAnalyzersResponse
+		{
+			ReloadDetails = propReloadDetails.Value
+,
+			Shards = propShards.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ReloadSearchAnalyzersResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropReloadDetails, value.ReloadDetails);
+		writer.WriteProperty(options, PropShards, value.Shards);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ReloadSearchAnalyzersResponseConverter))]
 public sealed partial class ReloadSearchAnalyzersResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("reload_details")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.IndexManagement.ReloadDetails> ReloadDetails { 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/ResolveIndexResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ResolveIndexResponse.g.cs
index 9fa71a9fca0..14a6da35904 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ResolveIndexResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ResolveIndexResponse.g.cs
@@ -18,20 +18,74 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
 
+internal sealed partial class ResolveIndexResponseConverter : System.Text.Json.Serialization.JsonConverter<ResolveIndexResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAliases = System.Text.Json.JsonEncodedText.Encode("aliases");
+	private static readonly System.Text.Json.JsonEncodedText PropDataStreams = System.Text.Json.JsonEncodedText.Encode("data_streams");
+	private static readonly System.Text.Json.JsonEncodedText PropIndices = System.Text.Json.JsonEncodedText.Encode("indices");
+
+	public override ResolveIndexResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.IndexManagement.ResolveIndexAliasItem>> propAliases = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.IndexManagement.ResolveIndexDataStreamsItem>> propDataStreams = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.IndexManagement.ResolveIndexItem>> propIndices = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAliases.TryRead(ref reader, options, PropAliases))
+			{
+				continue;
+			}
+
+			if (propDataStreams.TryRead(ref reader, options, PropDataStreams))
+			{
+				continue;
+			}
+
+			if (propIndices.TryRead(ref reader, options, PropIndices))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ResolveIndexResponse
+		{
+			Aliases = propAliases.Value
+,
+			DataStreams = propDataStreams.Value
+,
+			Indices = propIndices.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ResolveIndexResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAliases, value.Aliases);
+		writer.WriteProperty(options, PropDataStreams, value.DataStreams);
+		writer.WriteProperty(options, PropIndices, value.Indices);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ResolveIndexResponseConverter))]
 public sealed partial class ResolveIndexResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("aliases")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.IndexManagement.ResolveIndexAliasItem> Aliases { get; init; }
-	[JsonInclude, JsonPropertyName("data_streams")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.IndexManagement.ResolveIndexDataStreamsItem> DataStreams { get; init; }
-	[JsonInclude, JsonPropertyName("indices")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.IndexManagement.ResolveIndexItem> Indices { get; init; }
 }
\ No newline at end of file
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 cf9804a869f..4f8d08dc92f 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/RolloverResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/RolloverResponse.g.cs
@@ -18,28 +18,118 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
 
+internal sealed partial class RolloverResponseConverter : System.Text.Json.Serialization.JsonConverter<RolloverResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+	private static readonly System.Text.Json.JsonEncodedText PropConditions = System.Text.Json.JsonEncodedText.Encode("conditions");
+	private static readonly System.Text.Json.JsonEncodedText PropDryRun = System.Text.Json.JsonEncodedText.Encode("dry_run");
+	private static readonly System.Text.Json.JsonEncodedText PropNewIndex = System.Text.Json.JsonEncodedText.Encode("new_index");
+	private static readonly System.Text.Json.JsonEncodedText PropOldIndex = System.Text.Json.JsonEncodedText.Encode("old_index");
+	private static readonly System.Text.Json.JsonEncodedText PropRolledOver = System.Text.Json.JsonEncodedText.Encode("rolled_over");
+	private static readonly System.Text.Json.JsonEncodedText PropShardsAcknowledged = System.Text.Json.JsonEncodedText.Encode("shards_acknowledged");
+
+	public override RolloverResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, bool>> propConditions = default;
+		LocalJsonProperty<bool> propDryRun = default;
+		LocalJsonProperty<string> propNewIndex = default;
+		LocalJsonProperty<string> propOldIndex = default;
+		LocalJsonProperty<bool> propRolledOver = default;
+		LocalJsonProperty<bool> propShardsAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			if (propConditions.TryRead(ref reader, options, PropConditions))
+			{
+				continue;
+			}
+
+			if (propDryRun.TryRead(ref reader, options, PropDryRun))
+			{
+				continue;
+			}
+
+			if (propNewIndex.TryRead(ref reader, options, PropNewIndex))
+			{
+				continue;
+			}
+
+			if (propOldIndex.TryRead(ref reader, options, PropOldIndex))
+			{
+				continue;
+			}
+
+			if (propRolledOver.TryRead(ref reader, options, PropRolledOver))
+			{
+				continue;
+			}
+
+			if (propShardsAcknowledged.TryRead(ref reader, options, PropShardsAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new RolloverResponse
+		{
+			Acknowledged = propAcknowledged.Value
+,
+			Conditions = propConditions.Value
+,
+			DryRun = propDryRun.Value
+,
+			NewIndex = propNewIndex.Value
+,
+			OldIndex = propOldIndex.Value
+,
+			RolledOver = propRolledOver.Value
+,
+			ShardsAcknowledged = propShardsAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, RolloverResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteProperty(options, PropConditions, value.Conditions);
+		writer.WriteProperty(options, PropDryRun, value.DryRun);
+		writer.WriteProperty(options, PropNewIndex, value.NewIndex);
+		writer.WriteProperty(options, PropOldIndex, value.OldIndex);
+		writer.WriteProperty(options, PropRolledOver, value.RolledOver);
+		writer.WriteProperty(options, PropShardsAcknowledged, value.ShardsAcknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(RolloverResponseConverter))]
 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/SegmentsResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/SegmentsResponse.g.cs
index eba31e77e85..b19324b92fa 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/SegmentsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/SegmentsResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
 
+internal sealed partial class SegmentsResponseConverter : System.Text.Json.Serialization.JsonConverter<SegmentsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropIndices = System.Text.Json.JsonEncodedText.Encode("indices");
+	private static readonly System.Text.Json.JsonEncodedText PropShards = System.Text.Json.JsonEncodedText.Encode("_shards");
+
+	public override SegmentsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.IndexManagement.IndexSegment>> propIndices = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.ShardStatistics> propShards = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propIndices.TryRead(ref reader, options, PropIndices))
+			{
+				continue;
+			}
+
+			if (propShards.TryRead(ref reader, options, PropShards))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SegmentsResponse
+		{
+			Indices = propIndices.Value
+,
+			Shards = propShards.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SegmentsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropIndices, value.Indices);
+		writer.WriteProperty(options, PropShards, value.Shards);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(SegmentsResponseConverter))]
 public sealed partial class SegmentsResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("indices")]
 	public IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.IndexManagement.IndexSegment> 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/ShardStoresResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ShardStoresResponse.g.cs
index 09e274b9898..b9cb62503c0 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ShardStoresResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ShardStoresResponse.g.cs
@@ -18,17 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
 
+internal sealed partial class ShardStoresResponseConverter : System.Text.Json.Serialization.JsonConverter<ShardStoresResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropIndices = System.Text.Json.JsonEncodedText.Encode("indices");
+
+	public override ShardStoresResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyDictionary<Elastic.Clients.Elasticsearch.IndexName, Elastic.Clients.Elasticsearch.IndexManagement.IndicesShardStores>> propIndices = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propIndices.TryRead(ref reader, options, PropIndices))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ShardStoresResponse
+		{
+			Indices = propIndices.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ShardStoresResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropIndices, value.Indices);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ShardStoresResponseConverter))]
 public sealed partial class ShardStoresResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("indices")]
-	[ReadOnlyIndexNameDictionaryConverter(typeof(Elastic.Clients.Elasticsearch.IndexManagement.IndicesShardStores))]
 	public IReadOnlyDictionary<Elastic.Clients.Elasticsearch.IndexName, Elastic.Clients.Elasticsearch.IndexManagement.IndicesShardStores> Indices { get; init; }
 }
\ No newline at end of file
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 5cdc0a85eaf..11b889fad20 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ShrinkIndexResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ShrinkIndexResponse.g.cs
@@ -18,20 +18,74 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
 
+internal sealed partial class ShrinkIndexResponseConverter : System.Text.Json.Serialization.JsonConverter<ShrinkIndexResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropShardsAcknowledged = System.Text.Json.JsonEncodedText.Encode("shards_acknowledged");
+
+	public override ShrinkIndexResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		LocalJsonProperty<string> propIndex = default;
+		LocalJsonProperty<bool> propShardsAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propShardsAcknowledged.TryRead(ref reader, options, PropShardsAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ShrinkIndexResponse
+		{
+			Acknowledged = propAcknowledged.Value
+,
+			Index = propIndex.Value
+,
+			ShardsAcknowledged = propShardsAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ShrinkIndexResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropShardsAcknowledged, value.ShardsAcknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ShrinkIndexResponseConverter))]
 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/SimulateIndexTemplateResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/SimulateIndexTemplateResponse.g.cs
index 1319b5304d7..c4b4c669510 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/SimulateIndexTemplateResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/SimulateIndexTemplateResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
 
+internal sealed partial class SimulateIndexTemplateResponseConverter : System.Text.Json.Serialization.JsonConverter<SimulateIndexTemplateResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropOverlapping = System.Text.Json.JsonEncodedText.Encode("overlapping");
+	private static readonly System.Text.Json.JsonEncodedText PropTemplate = System.Text.Json.JsonEncodedText.Encode("template");
+
+	public override SimulateIndexTemplateResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.IndexManagement.Overlapping>?> propOverlapping = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.IndexManagement.Template> propTemplate = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propOverlapping.TryRead(ref reader, options, PropOverlapping))
+			{
+				continue;
+			}
+
+			if (propTemplate.TryRead(ref reader, options, PropTemplate))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SimulateIndexTemplateResponse
+		{
+			Overlapping = propOverlapping.Value
+,
+			Template = propTemplate.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SimulateIndexTemplateResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropOverlapping, value.Overlapping);
+		writer.WriteProperty(options, PropTemplate, value.Template);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(SimulateIndexTemplateResponseConverter))]
 public sealed partial class SimulateIndexTemplateResponse : 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/SimulateTemplateResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/SimulateTemplateResponse.g.cs
index 13d495ed53a..dbfaa370d45 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/SimulateTemplateResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/SimulateTemplateResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
 
+internal sealed partial class SimulateTemplateResponseConverter : System.Text.Json.Serialization.JsonConverter<SimulateTemplateResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropOverlapping = System.Text.Json.JsonEncodedText.Encode("overlapping");
+	private static readonly System.Text.Json.JsonEncodedText PropTemplate = System.Text.Json.JsonEncodedText.Encode("template");
+
+	public override SimulateTemplateResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.IndexManagement.Overlapping>?> propOverlapping = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.IndexManagement.Template> propTemplate = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propOverlapping.TryRead(ref reader, options, PropOverlapping))
+			{
+				continue;
+			}
+
+			if (propTemplate.TryRead(ref reader, options, PropTemplate))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SimulateTemplateResponse
+		{
+			Overlapping = propOverlapping.Value
+,
+			Template = propTemplate.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SimulateTemplateResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropOverlapping, value.Overlapping);
+		writer.WriteProperty(options, PropTemplate, value.Template);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(SimulateTemplateResponseConverter))]
 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/SplitIndexResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/SplitIndexResponse.g.cs
index f029453776f..9766ea97c5e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/SplitIndexResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/SplitIndexResponse.g.cs
@@ -18,20 +18,74 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
 
+internal sealed partial class SplitIndexResponseConverter : System.Text.Json.Serialization.JsonConverter<SplitIndexResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropShardsAcknowledged = System.Text.Json.JsonEncodedText.Encode("shards_acknowledged");
+
+	public override SplitIndexResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		LocalJsonProperty<string> propIndex = default;
+		LocalJsonProperty<bool> propShardsAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propShardsAcknowledged.TryRead(ref reader, options, PropShardsAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SplitIndexResponse
+		{
+			Acknowledged = propAcknowledged.Value
+,
+			Index = propIndex.Value
+,
+			ShardsAcknowledged = propShardsAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SplitIndexResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropShardsAcknowledged, value.ShardsAcknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(SplitIndexResponseConverter))]
 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/UpdateAliasesResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/UpdateAliasesResponse.g.cs
index 5b7fd8e987a..c475b1e1585 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/UpdateAliasesResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/UpdateAliasesResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
 
+internal sealed partial class UpdateAliasesResponseConverter : System.Text.Json.Serialization.JsonConverter<UpdateAliasesResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override UpdateAliasesResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new UpdateAliasesResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, UpdateAliasesResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(UpdateAliasesResponseConverter))]
 public sealed partial class UpdateAliasesResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class UpdateAliasesResponse : ElasticsearchResponse
 	/// 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/ValidateQueryResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ValidateQueryResponse.g.cs
index 90f6de37d06..5537ed7e140 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ValidateQueryResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ValidateQueryResponse.g.cs
@@ -18,22 +18,85 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
 
+internal sealed partial class ValidateQueryResponseConverter : System.Text.Json.Serialization.JsonConverter<ValidateQueryResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropError = System.Text.Json.JsonEncodedText.Encode("error");
+	private static readonly System.Text.Json.JsonEncodedText PropExplanations = System.Text.Json.JsonEncodedText.Encode("explanations");
+	private static readonly System.Text.Json.JsonEncodedText PropShards = System.Text.Json.JsonEncodedText.Encode("_shards");
+	private static readonly System.Text.Json.JsonEncodedText PropValid = System.Text.Json.JsonEncodedText.Encode("valid");
+
+	public override ValidateQueryResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string?> propError = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.IndexManagement.IndicesValidationExplanation>?> propExplanations = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.ShardStatistics?> propShards = default;
+		LocalJsonProperty<bool> propValid = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propError.TryRead(ref reader, options, PropError))
+			{
+				continue;
+			}
+
+			if (propExplanations.TryRead(ref reader, options, PropExplanations))
+			{
+				continue;
+			}
+
+			if (propShards.TryRead(ref reader, options, PropShards))
+			{
+				continue;
+			}
+
+			if (propValid.TryRead(ref reader, options, PropValid))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ValidateQueryResponse
+		{
+			Error = propError.Value
+,
+			Explanations = propExplanations.Value
+,
+			Shards = propShards.Value
+,
+			Valid = propValid.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ValidateQueryResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropError, value.Error);
+		writer.WriteProperty(options, PropExplanations, value.Explanations);
+		writer.WriteProperty(options, PropShards, value.Shards);
+		writer.WriteProperty(options, PropValid, value.Valid);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ValidateQueryResponseConverter))]
 public sealed partial class ValidateQueryResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("error")]
 	public string? Error { get; init; }
-	[JsonInclude, JsonPropertyName("explanations")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.IndexManagement.IndicesValidationExplanation>? Explanations { get; init; }
-	[JsonInclude, JsonPropertyName("_shards")]
 	public Elastic.Clients.Elasticsearch.ShardStatistics? Shards { get; init; }
-	[JsonInclude, JsonPropertyName("valid")]
 	public bool Valid { 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 2722f0c9b24..95564a5a8d5 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexRequest.g.cs
@@ -127,7 +127,7 @@ public sealed partial class IndexRequestParameters : RequestParameters
 /// If the target is an index and the document already exists, the request updates the document and increments its version.
 /// </para>
 /// </summary>
-public sealed partial class IndexRequest<TDocument> : PlainRequest<IndexRequestParameters>, ISelfSerializable
+public sealed partial class IndexRequest<TDocument> : PlainRequest<IndexRequestParameters>, ISelfTwoWaySerializable
 {
 	public IndexRequest(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.Id? id) : base(r => r.Required("index", index).Optional("id", id))
 	{
@@ -242,13 +242,17 @@ public IndexRequest(Elastic.Clients.Elasticsearch.IndexName index) : base(r => r
 	/// </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); }
-	[JsonIgnore]
 	public TDocument Document { get; set; }
 
-	void ISelfSerializable.Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
+	void ISelfTwoWaySerializable.Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 	{
 		settings.SourceSerializer.Serialize(Document, writer);
 	}
+
+	void ISelfTwoWaySerializable.Deserialize(ref Utf8JsonReader reader, JsonSerializerOptions options, IElasticsearchClientSettings settings)
+	{
+		Document = settings.SourceSerializer.Deserialize<TDocument>(ref reader);
+	}
 }
 
 /// <summary>
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexResponse.g.cs
index 289d66cf21d..cbd9746232d 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexResponse.g.cs
@@ -18,30 +18,129 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch;
 
+internal sealed partial class IndexResponseConverter : System.Text.Json.Serialization.JsonConverter<IndexResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropForcedRefresh = System.Text.Json.JsonEncodedText.Encode("forced_refresh");
+	private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("_id");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("_index");
+	private static readonly System.Text.Json.JsonEncodedText PropPrimaryTerm = System.Text.Json.JsonEncodedText.Encode("_primary_term");
+	private static readonly System.Text.Json.JsonEncodedText PropResult = System.Text.Json.JsonEncodedText.Encode("result");
+	private static readonly System.Text.Json.JsonEncodedText PropSeqNo = System.Text.Json.JsonEncodedText.Encode("_seq_no");
+	private static readonly System.Text.Json.JsonEncodedText PropShards = System.Text.Json.JsonEncodedText.Encode("_shards");
+	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("_version");
+
+	public override IndexResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool?> propForcedRefresh = default;
+		LocalJsonProperty<string> propId = default;
+		LocalJsonProperty<string> propIndex = default;
+		LocalJsonProperty<long?> propPrimaryTerm = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Result> propResult = default;
+		LocalJsonProperty<long?> propSeqNo = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.ShardStatistics> propShards = default;
+		LocalJsonProperty<long> propVersion = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propForcedRefresh.TryRead(ref reader, options, PropForcedRefresh))
+			{
+				continue;
+			}
+
+			if (propId.TryRead(ref reader, options, PropId))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propPrimaryTerm.TryRead(ref reader, options, PropPrimaryTerm))
+			{
+				continue;
+			}
+
+			if (propResult.TryRead(ref reader, options, PropResult))
+			{
+				continue;
+			}
+
+			if (propSeqNo.TryRead(ref reader, options, PropSeqNo))
+			{
+				continue;
+			}
+
+			if (propShards.TryRead(ref reader, options, PropShards))
+			{
+				continue;
+			}
+
+			if (propVersion.TryRead(ref reader, options, PropVersion))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new IndexResponse
+		{
+			ForcedRefresh = propForcedRefresh.Value
+,
+			Id = propId.Value
+,
+			Index = propIndex.Value
+,
+			PrimaryTerm = propPrimaryTerm.Value
+,
+			Result = propResult.Value
+,
+			SeqNo = propSeqNo.Value
+,
+			Shards = propShards.Value
+,
+			Version = propVersion.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IndexResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropForcedRefresh, value.ForcedRefresh);
+		writer.WriteProperty(options, PropId, value.Id);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropPrimaryTerm, value.PrimaryTerm);
+		writer.WriteProperty(options, PropResult, value.Result);
+		writer.WriteProperty(options, PropSeqNo, value.SeqNo);
+		writer.WriteProperty(options, PropShards, value.Shards);
+		writer.WriteProperty(options, PropVersion, value.Version);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(IndexResponseConverter))]
 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/Inference/DeleteInferenceResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Inference/DeleteInferenceResponse.g.cs
index 2e7e80f69d3..625b4fb4742 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Inference/DeleteInferenceResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Inference/DeleteInferenceResponse.g.cs
@@ -18,14 +18,61 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Inference;
 
+internal sealed partial class DeleteInferenceResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteInferenceResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+	private static readonly System.Text.Json.JsonEncodedText PropPipelines = System.Text.Json.JsonEncodedText.Encode("pipelines");
+
+	public override DeleteInferenceResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		LocalJsonProperty<IReadOnlyCollection<string>> propPipelines = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			if (propPipelines.TryRead(ref reader, options, PropPipelines))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteInferenceResponse
+		{
+			Acknowledged = propAcknowledged.Value
+,
+			Pipelines = propPipelines.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteInferenceResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteProperty(options, PropPipelines, value.Pipelines);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteInferenceResponseConverter))]
 public sealed partial class DeleteInferenceResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,8 +80,6 @@ public sealed partial class DeleteInferenceResponse : ElasticsearchResponse
 	/// 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; }
-	[JsonInclude, JsonPropertyName("pipelines")]
 	public IReadOnlyCollection<string> Pipelines { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Inference/GetInferenceResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Inference/GetInferenceResponse.g.cs
index 254b29ef133..d5492f6063d 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Inference/GetInferenceResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Inference/GetInferenceResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Inference;
 
+internal sealed partial class GetInferenceResponseConverter : System.Text.Json.Serialization.JsonConverter<GetInferenceResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropEndpoints = System.Text.Json.JsonEncodedText.Encode("endpoints");
+
+	public override GetInferenceResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Inference.InferenceEndpointInfo>> propEndpoints = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propEndpoints.TryRead(ref reader, options, PropEndpoints))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetInferenceResponse
+		{
+			Endpoints = propEndpoints.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetInferenceResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropEndpoints, value.Endpoints);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetInferenceResponseConverter))]
 public sealed partial class GetInferenceResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("endpoints")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Inference.InferenceEndpointInfo> Endpoints { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Inference/InferenceRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Inference/InferenceRequest.g.cs
index 8c0ff5643b7..75b940badee 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Inference/InferenceRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Inference/InferenceRequest.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport;
@@ -40,11 +41,65 @@ public sealed partial class InferenceRequestParameters : RequestParameters
 	public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 }
 
+internal sealed partial class InferenceRequestConverter : System.Text.Json.Serialization.JsonConverter<InferenceRequest>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropInput = System.Text.Json.JsonEncodedText.Encode("input");
+	private static readonly System.Text.Json.JsonEncodedText PropQuery = System.Text.Json.JsonEncodedText.Encode("query");
+	private static readonly System.Text.Json.JsonEncodedText PropTaskSettings = System.Text.Json.JsonEncodedText.Encode("task_settings");
+
+	public override InferenceRequest Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>> propInput = default;
+		LocalJsonProperty<string?> propQuery = default;
+		LocalJsonProperty<object?> propTaskSettings = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propInput.TryRead(ref reader, options, PropInput, typeof(SingleOrManyMarker<IReadOnlyCollection<string>, string>)))
+			{
+				continue;
+			}
+
+			if (propQuery.TryRead(ref reader, options, PropQuery))
+			{
+				continue;
+			}
+
+			if (propTaskSettings.TryRead(ref reader, options, PropTaskSettings))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new InferenceRequest
+		{
+			Input = propInput.Value
+	,
+			Query = propQuery.Value
+	,
+			TaskSettings = propTaskSettings.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, InferenceRequest value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropInput, value.Input, typeof(SingleOrManyMarker<IReadOnlyCollection<string>, string>));
+		writer.WriteProperty(options, PropQuery, value.Query);
+		writer.WriteProperty(options, PropTaskSettings, value.TaskSettings);
+		writer.WriteEndObject();
+	}
+}
+
 /// <summary>
 /// <para>
 /// Perform inference on the service
 /// </para>
 /// </summary>
+[JsonConverter(typeof(InferenceRequestConverter))]
 public sealed partial class InferenceRequest : PlainRequest<InferenceRequestParameters>
 {
 	public InferenceRequest(Elastic.Clients.Elasticsearch.Id inferenceId) : base(r => r.Required("inference_id", inferenceId))
@@ -68,7 +123,6 @@ public InferenceRequest(Elastic.Clients.Elasticsearch.Inference.TaskType? taskTy
 	/// Specifies the amount of time to wait for the inference request to complete.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
 	/// <summary>
@@ -77,8 +131,6 @@ public InferenceRequest(Elastic.Clients.Elasticsearch.Inference.TaskType? taskTy
 	/// Either a string or an array of strings.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("input")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string> Input { get; set; }
 
 	/// <summary>
@@ -87,7 +139,6 @@ public InferenceRequest(Elastic.Clients.Elasticsearch.Inference.TaskType? taskTy
 	/// Not required for other tasks.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("query")]
 	public string? Query { get; set; }
 
 	/// <summary>
@@ -95,7 +146,6 @@ public InferenceRequest(Elastic.Clients.Elasticsearch.Inference.TaskType? taskTy
 	/// Optional task settings
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("task_settings")]
 	public object? TaskSettings { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Inference/InferenceResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Inference/InferenceResponse.g.cs
index fb55c4afc55..baf92103d5d 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Inference/InferenceResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Inference/InferenceResponse.g.cs
@@ -18,14 +18,39 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Inference;
 
+internal sealed partial class InferenceResponseConverter : System.Text.Json.Serialization.JsonConverter<InferenceResponse>
+{
+	public override InferenceResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new InferenceResponse { };
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, InferenceResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(InferenceResponseConverter))]
 public sealed partial class InferenceResponse : ElasticsearchResponse
 {
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Inference/PutInferenceRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Inference/PutInferenceRequest.g.cs
index 2b49b107239..805b5cfa53a 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Inference/PutInferenceRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Inference/PutInferenceRequest.g.cs
@@ -49,7 +49,7 @@ public sealed partial class PutInferenceRequestParameters : RequestParameters
 /// However, if you do not plan to use the inference APIs to use these models or if you want to use non-NLP models, use the machine learning trained model APIs.
 /// </para>
 /// </summary>
-public sealed partial class PutInferenceRequest : PlainRequest<PutInferenceRequestParameters>, ISelfSerializable
+public sealed partial class PutInferenceRequest : PlainRequest<PutInferenceRequestParameters>, ISelfTwoWaySerializable
 {
 	public PutInferenceRequest(Elastic.Clients.Elasticsearch.Id inferenceId) : base(r => r.Required("inference_id", inferenceId))
 	{
@@ -67,13 +67,17 @@ public PutInferenceRequest(Elastic.Clients.Elasticsearch.Inference.TaskType? tas
 
 	internal override string OperationName => "inference.put";
 
-	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Inference.InferenceEndpoint InferenceConfig { get; set; }
 
-	void ISelfSerializable.Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
+	void ISelfTwoWaySerializable.Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 	{
 		JsonSerializer.Serialize(writer, InferenceConfig, options);
 	}
+
+	void ISelfTwoWaySerializable.Deserialize(ref Utf8JsonReader reader, JsonSerializerOptions options, IElasticsearchClientSettings settings)
+	{
+		InferenceConfig = settings.RequestResponseSerializer.Deserialize<Elastic.Clients.Elasticsearch.Inference.InferenceEndpoint>(ref reader);
+	}
 }
 
 /// <summary>
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Inference/PutInferenceResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Inference/PutInferenceResponse.g.cs
index dca82330fc2..a8d73a29172 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Inference/PutInferenceResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Inference/PutInferenceResponse.g.cs
@@ -18,14 +18,91 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Inference;
 
+internal sealed partial class PutInferenceResponseConverter : System.Text.Json.Serialization.JsonConverter<PutInferenceResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropInferenceId = System.Text.Json.JsonEncodedText.Encode("inference_id");
+	private static readonly System.Text.Json.JsonEncodedText PropService = System.Text.Json.JsonEncodedText.Encode("service");
+	private static readonly System.Text.Json.JsonEncodedText PropServiceSettings = System.Text.Json.JsonEncodedText.Encode("service_settings");
+	private static readonly System.Text.Json.JsonEncodedText PropTaskSettings = System.Text.Json.JsonEncodedText.Encode("task_settings");
+	private static readonly System.Text.Json.JsonEncodedText PropTaskType = System.Text.Json.JsonEncodedText.Encode("task_type");
+
+	public override PutInferenceResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propInferenceId = default;
+		LocalJsonProperty<string> propService = default;
+		LocalJsonProperty<object> propServiceSettings = default;
+		LocalJsonProperty<object?> propTaskSettings = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Inference.TaskType> propTaskType = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propInferenceId.TryRead(ref reader, options, PropInferenceId))
+			{
+				continue;
+			}
+
+			if (propService.TryRead(ref reader, options, PropService))
+			{
+				continue;
+			}
+
+			if (propServiceSettings.TryRead(ref reader, options, PropServiceSettings))
+			{
+				continue;
+			}
+
+			if (propTaskSettings.TryRead(ref reader, options, PropTaskSettings))
+			{
+				continue;
+			}
+
+			if (propTaskType.TryRead(ref reader, options, PropTaskType))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutInferenceResponse
+		{
+			InferenceId = propInferenceId.Value
+,
+			Service = propService.Value
+,
+			ServiceSettings = propServiceSettings.Value
+,
+			TaskSettings = propTaskSettings.Value
+,
+			TaskType = propTaskType.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutInferenceResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropInferenceId, value.InferenceId);
+		writer.WriteProperty(options, PropService, value.Service);
+		writer.WriteProperty(options, PropServiceSettings, value.ServiceSettings);
+		writer.WriteProperty(options, PropTaskSettings, value.TaskSettings);
+		writer.WriteProperty(options, PropTaskType, value.TaskType);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PutInferenceResponseConverter))]
 public sealed partial class PutInferenceResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,7 +110,6 @@ public sealed partial class PutInferenceResponse : ElasticsearchResponse
 	/// The inference Id
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("inference_id")]
 	public string InferenceId { get; init; }
 
 	/// <summary>
@@ -41,7 +117,6 @@ public sealed partial class PutInferenceResponse : ElasticsearchResponse
 	/// The service type
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("service")]
 	public string Service { get; init; }
 
 	/// <summary>
@@ -49,7 +124,6 @@ public sealed partial class PutInferenceResponse : ElasticsearchResponse
 	/// Settings specific to the service
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("service_settings")]
 	public object ServiceSettings { get; init; }
 
 	/// <summary>
@@ -57,7 +131,6 @@ public sealed partial class PutInferenceResponse : ElasticsearchResponse
 	/// Task settings specific to the service and task type
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("task_settings")]
 	public object? TaskSettings { get; init; }
 
 	/// <summary>
@@ -65,6 +138,5 @@ public sealed partial class PutInferenceResponse : ElasticsearchResponse
 	/// The task type
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("task_type")]
 	public Elastic.Clients.Elasticsearch.Inference.TaskType TaskType { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/InfoResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/InfoResponse.g.cs
index 48d217b3951..f25ef30e656 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/InfoResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/InfoResponse.g.cs
@@ -18,14 +18,91 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch;
 
+internal sealed partial class InfoResponseConverter : System.Text.Json.Serialization.JsonConverter<InfoResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropClusterName = System.Text.Json.JsonEncodedText.Encode("cluster_name");
+	private static readonly System.Text.Json.JsonEncodedText PropClusterUuid = System.Text.Json.JsonEncodedText.Encode("cluster_uuid");
+	private static readonly System.Text.Json.JsonEncodedText PropName = System.Text.Json.JsonEncodedText.Encode("name");
+	private static readonly System.Text.Json.JsonEncodedText PropTagline = System.Text.Json.JsonEncodedText.Encode("tagline");
+	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("version");
+
+	public override InfoResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propClusterName = default;
+		LocalJsonProperty<string> propClusterUuid = default;
+		LocalJsonProperty<string> propName = default;
+		LocalJsonProperty<string> propTagline = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.ElasticsearchVersionInfo> propVersion = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propClusterName.TryRead(ref reader, options, PropClusterName))
+			{
+				continue;
+			}
+
+			if (propClusterUuid.TryRead(ref reader, options, PropClusterUuid))
+			{
+				continue;
+			}
+
+			if (propName.TryRead(ref reader, options, PropName))
+			{
+				continue;
+			}
+
+			if (propTagline.TryRead(ref reader, options, PropTagline))
+			{
+				continue;
+			}
+
+			if (propVersion.TryRead(ref reader, options, PropVersion))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new InfoResponse
+		{
+			ClusterName = propClusterName.Value
+,
+			ClusterUuid = propClusterUuid.Value
+,
+			Name = propName.Value
+,
+			Tagline = propTagline.Value
+,
+			Version = propVersion.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, InfoResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropClusterName, value.ClusterName);
+		writer.WriteProperty(options, PropClusterUuid, value.ClusterUuid);
+		writer.WriteProperty(options, PropName, value.Name);
+		writer.WriteProperty(options, PropTagline, value.Tagline);
+		writer.WriteProperty(options, PropVersion, value.Version);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(InfoResponseConverter))]
 public sealed partial class InfoResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,9 +110,7 @@ public sealed partial class InfoResponse : ElasticsearchResponse
 	/// The responding cluster's name.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("cluster_name")]
 	public string ClusterName { get; init; }
-	[JsonInclude, JsonPropertyName("cluster_uuid")]
 	public string ClusterUuid { get; init; }
 
 	/// <summary>
@@ -43,9 +118,7 @@ public sealed partial class InfoResponse : ElasticsearchResponse
 	/// The responding node's name.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("name")]
 	public string Name { get; init; }
-	[JsonInclude, JsonPropertyName("tagline")]
 	public string Tagline { get; init; }
 
 	/// <summary>
@@ -53,6 +126,5 @@ public sealed partial class InfoResponse : ElasticsearchResponse
 	/// The running version of Elasticsearch.
 	/// </para>
 	/// </summary>
-	[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/DeleteGeoipDatabaseResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/DeleteGeoipDatabaseResponse.g.cs
index dce6d2f572a..6fe045610d4 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/DeleteGeoipDatabaseResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/DeleteGeoipDatabaseResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Ingest;
 
+internal sealed partial class DeleteGeoipDatabaseResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteGeoipDatabaseResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override DeleteGeoipDatabaseResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteGeoipDatabaseResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteGeoipDatabaseResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteGeoipDatabaseResponseConverter))]
 public sealed partial class DeleteGeoipDatabaseResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class DeleteGeoipDatabaseResponse : ElasticsearchResponse
 	/// 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/DeleteIpLocationDatabaseResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/DeleteIpLocationDatabaseResponse.g.cs
index d221599c779..f958a1ddf9d 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/DeleteIpLocationDatabaseResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/DeleteIpLocationDatabaseResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Ingest;
 
+internal sealed partial class DeleteIpLocationDatabaseResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteIpLocationDatabaseResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override DeleteIpLocationDatabaseResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteIpLocationDatabaseResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteIpLocationDatabaseResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteIpLocationDatabaseResponseConverter))]
 public sealed partial class DeleteIpLocationDatabaseResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class DeleteIpLocationDatabaseResponse : ElasticsearchResp
 	/// 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/DeletePipelineResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/DeletePipelineResponse.g.cs
index a56624fd181..51485143dff 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/DeletePipelineResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/DeletePipelineResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Ingest;
 
+internal sealed partial class DeletePipelineResponseConverter : System.Text.Json.Serialization.JsonConverter<DeletePipelineResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override DeletePipelineResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeletePipelineResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeletePipelineResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeletePipelineResponseConverter))]
 public sealed partial class DeletePipelineResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class DeletePipelineResponse : ElasticsearchResponse
 	/// 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/GeoIpStatsResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/GeoIpStatsResponse.g.cs
index dc229b51599..1521a505016 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/GeoIpStatsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/GeoIpStatsResponse.g.cs
@@ -18,14 +18,61 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Ingest;
 
+internal sealed partial class GeoIpStatsResponseConverter : System.Text.Json.Serialization.JsonConverter<GeoIpStatsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropNodes = System.Text.Json.JsonEncodedText.Encode("nodes");
+	private static readonly System.Text.Json.JsonEncodedText PropStats = System.Text.Json.JsonEncodedText.Encode("stats");
+
+	public override GeoIpStatsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Ingest.GeoIpNodeDatabases>> propNodes = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Ingest.GeoIpDownloadStatistics> propStats = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propNodes.TryRead(ref reader, options, PropNodes))
+			{
+				continue;
+			}
+
+			if (propStats.TryRead(ref reader, options, PropStats))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GeoIpStatsResponse
+		{
+			Nodes = propNodes.Value
+,
+			Stats = propStats.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GeoIpStatsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropNodes, value.Nodes);
+		writer.WriteProperty(options, PropStats, value.Stats);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GeoIpStatsResponseConverter))]
 public sealed partial class GeoIpStatsResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,7 +80,6 @@ public sealed partial class GeoIpStatsResponse : ElasticsearchResponse
 	/// Downloaded GeoIP2 databases for each node.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("nodes")]
 	public IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Ingest.GeoIpNodeDatabases> Nodes { get; init; }
 
 	/// <summary>
@@ -41,6 +87,5 @@ public sealed partial class GeoIpStatsResponse : ElasticsearchResponse
 	/// 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/GetGeoipDatabaseResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/GetGeoipDatabaseResponse.g.cs
index e0310e524bc..00100c4a134 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/GetGeoipDatabaseResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/GetGeoipDatabaseResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Ingest;
 
+internal sealed partial class GetGeoipDatabaseResponseConverter : System.Text.Json.Serialization.JsonConverter<GetGeoipDatabaseResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropDatabases = System.Text.Json.JsonEncodedText.Encode("databases");
+
+	public override GetGeoipDatabaseResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Ingest.DatabaseConfigurationMetadata>> propDatabases = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propDatabases.TryRead(ref reader, options, PropDatabases))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetGeoipDatabaseResponse
+		{
+			Databases = propDatabases.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetGeoipDatabaseResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDatabases, value.Databases);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetGeoipDatabaseResponseConverter))]
 public sealed partial class GetGeoipDatabaseResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("databases")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Ingest.DatabaseConfigurationMetadata> Databases { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/GetIpLocationDatabaseResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/GetIpLocationDatabaseResponse.g.cs
index 4e185a14181..e7ad8c95a3e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/GetIpLocationDatabaseResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/GetIpLocationDatabaseResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Ingest;
 
+internal sealed partial class GetIpLocationDatabaseResponseConverter : System.Text.Json.Serialization.JsonConverter<GetIpLocationDatabaseResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropDatabases = System.Text.Json.JsonEncodedText.Encode("databases");
+
+	public override GetIpLocationDatabaseResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Ingest.IpDatabaseConfigurationMetadata>> propDatabases = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propDatabases.TryRead(ref reader, options, PropDatabases))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetIpLocationDatabaseResponse
+		{
+			Databases = propDatabases.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetIpLocationDatabaseResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDatabases, value.Databases);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetIpLocationDatabaseResponseConverter))]
 public sealed partial class GetIpLocationDatabaseResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("databases")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Ingest.IpDatabaseConfigurationMetadata> Databases { get; init; }
 }
\ No newline at end of file
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 823c43ea0e4..0e17d71c021 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/ProcessorGrokResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/ProcessorGrokResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Ingest;
 
+internal sealed partial class ProcessorGrokResponseConverter : System.Text.Json.Serialization.JsonConverter<ProcessorGrokResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropPatterns = System.Text.Json.JsonEncodedText.Encode("patterns");
+
+	public override ProcessorGrokResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyDictionary<string, string>> propPatterns = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propPatterns.TryRead(ref reader, options, PropPatterns))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ProcessorGrokResponse
+		{
+			Patterns = propPatterns.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ProcessorGrokResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropPatterns, value.Patterns);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ProcessorGrokResponseConverter))]
 public sealed partial class ProcessorGrokResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("patterns")]
 	public IReadOnlyDictionary<string, string> Patterns { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/PutGeoipDatabaseResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/PutGeoipDatabaseResponse.g.cs
index 9fa354707d9..c0b594e5479 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/PutGeoipDatabaseResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/PutGeoipDatabaseResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Ingest;
 
+internal sealed partial class PutGeoipDatabaseResponseConverter : System.Text.Json.Serialization.JsonConverter<PutGeoipDatabaseResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override PutGeoipDatabaseResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutGeoipDatabaseResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutGeoipDatabaseResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PutGeoipDatabaseResponseConverter))]
 public sealed partial class PutGeoipDatabaseResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class PutGeoipDatabaseResponse : ElasticsearchResponse
 	/// 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/PutIpLocationDatabaseRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/PutIpLocationDatabaseRequest.g.cs
index 49a39028b0f..c9b7519a3a0 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/PutIpLocationDatabaseRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/PutIpLocationDatabaseRequest.g.cs
@@ -56,7 +56,7 @@ public sealed partial class PutIpLocationDatabaseRequestParameters : RequestPara
 /// Create or update an IP geolocation database configuration.
 /// </para>
 /// </summary>
-public sealed partial class PutIpLocationDatabaseRequest : PlainRequest<PutIpLocationDatabaseRequestParameters>, ISelfSerializable
+public sealed partial class PutIpLocationDatabaseRequest : PlainRequest<PutIpLocationDatabaseRequestParameters>, ISelfTwoWaySerializable
 {
 	public PutIpLocationDatabaseRequest(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id))
 	{
@@ -89,13 +89,17 @@ public PutIpLocationDatabaseRequest(Elastic.Clients.Elasticsearch.Id id) : base(
 	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
-	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Ingest.DatabaseConfiguration Configuration { get; set; }
 
-	void ISelfSerializable.Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
+	void ISelfTwoWaySerializable.Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 	{
 		JsonSerializer.Serialize(writer, Configuration, options);
 	}
+
+	void ISelfTwoWaySerializable.Deserialize(ref Utf8JsonReader reader, JsonSerializerOptions options, IElasticsearchClientSettings settings)
+	{
+		Configuration = settings.RequestResponseSerializer.Deserialize<Elastic.Clients.Elasticsearch.Ingest.DatabaseConfiguration>(ref reader);
+	}
 }
 
 /// <summary>
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/PutIpLocationDatabaseResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/PutIpLocationDatabaseResponse.g.cs
index 3d865e894d1..617e6690c2f 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/PutIpLocationDatabaseResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/PutIpLocationDatabaseResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Ingest;
 
+internal sealed partial class PutIpLocationDatabaseResponseConverter : System.Text.Json.Serialization.JsonConverter<PutIpLocationDatabaseResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override PutIpLocationDatabaseResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutIpLocationDatabaseResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutIpLocationDatabaseResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PutIpLocationDatabaseResponseConverter))]
 public sealed partial class PutIpLocationDatabaseResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class PutIpLocationDatabaseResponse : ElasticsearchRespons
 	/// 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/PutPipelineResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/PutPipelineResponse.g.cs
index e4f7017c4e6..5e2af396c65 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/PutPipelineResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/PutPipelineResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Ingest;
 
+internal sealed partial class PutPipelineResponseConverter : System.Text.Json.Serialization.JsonConverter<PutPipelineResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override PutPipelineResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutPipelineResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutPipelineResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PutPipelineResponseConverter))]
 public sealed partial class PutPipelineResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class PutPipelineResponse : ElasticsearchResponse
 	/// 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/SimulateResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/SimulateResponse.g.cs
index 557e500e320..b2a6d4b3035 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/SimulateResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/SimulateResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Ingest;
 
+internal sealed partial class SimulateResponseConverter : System.Text.Json.Serialization.JsonConverter<SimulateResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropDocs = System.Text.Json.JsonEncodedText.Encode("docs");
+
+	public override SimulateResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Ingest.SimulateDocumentResult>> propDocs = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propDocs.TryRead(ref reader, options, PropDocs))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SimulateResponse
+		{
+			Docs = propDocs.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SimulateResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDocs, value.Docs);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(SimulateResponseConverter))]
 public sealed partial class SimulateResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("docs")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Ingest.SimulateDocumentResult> Docs { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/LicenseManagement/DeleteLicenseResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/LicenseManagement/DeleteLicenseResponse.g.cs
index 91e73fcccf5..93f96398490 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/LicenseManagement/DeleteLicenseResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/LicenseManagement/DeleteLicenseResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.LicenseManagement;
 
+internal sealed partial class DeleteLicenseResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteLicenseResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override DeleteLicenseResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteLicenseResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteLicenseResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteLicenseResponseConverter))]
 public sealed partial class DeleteLicenseResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class DeleteLicenseResponse : ElasticsearchResponse
 	/// 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/LicenseManagement/GetBasicStatusResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/LicenseManagement/GetBasicStatusResponse.g.cs
index ec1e0cba8ff..f9a909994c4 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/LicenseManagement/GetBasicStatusResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/LicenseManagement/GetBasicStatusResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.LicenseManagement;
 
+internal sealed partial class GetBasicStatusResponseConverter : System.Text.Json.Serialization.JsonConverter<GetBasicStatusResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropEligibleToStartBasic = System.Text.Json.JsonEncodedText.Encode("eligible_to_start_basic");
+
+	public override GetBasicStatusResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propEligibleToStartBasic = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propEligibleToStartBasic.TryRead(ref reader, options, PropEligibleToStartBasic))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetBasicStatusResponse
+		{
+			EligibleToStartBasic = propEligibleToStartBasic.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetBasicStatusResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropEligibleToStartBasic, value.EligibleToStartBasic);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetBasicStatusResponseConverter))]
 public sealed partial class GetBasicStatusResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("eligible_to_start_basic")]
 	public bool EligibleToStartBasic { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/LicenseManagement/GetLicenseResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/LicenseManagement/GetLicenseResponse.g.cs
index fae9931e751..bc4972a202a 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/LicenseManagement/GetLicenseResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/LicenseManagement/GetLicenseResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.LicenseManagement;
 
+internal sealed partial class GetLicenseResponseConverter : System.Text.Json.Serialization.JsonConverter<GetLicenseResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropLicense = System.Text.Json.JsonEncodedText.Encode("license");
+
+	public override GetLicenseResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.LicenseManagement.LicenseInformation> propLicense = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propLicense.TryRead(ref reader, options, PropLicense))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetLicenseResponse
+		{
+			License = propLicense.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetLicenseResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropLicense, value.License);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetLicenseResponseConverter))]
 public sealed partial class GetLicenseResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("license")]
 	public Elastic.Clients.Elasticsearch.LicenseManagement.LicenseInformation License { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/LicenseManagement/GetTrialStatusResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/LicenseManagement/GetTrialStatusResponse.g.cs
index 0fa20962a0c..528f2eaf4f8 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/LicenseManagement/GetTrialStatusResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/LicenseManagement/GetTrialStatusResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.LicenseManagement;
 
+internal sealed partial class GetTrialStatusResponseConverter : System.Text.Json.Serialization.JsonConverter<GetTrialStatusResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropEligibleToStartTrial = System.Text.Json.JsonEncodedText.Encode("eligible_to_start_trial");
+
+	public override GetTrialStatusResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propEligibleToStartTrial = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propEligibleToStartTrial.TryRead(ref reader, options, PropEligibleToStartTrial))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetTrialStatusResponse
+		{
+			EligibleToStartTrial = propEligibleToStartTrial.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetTrialStatusResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropEligibleToStartTrial, value.EligibleToStartTrial);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetTrialStatusResponseConverter))]
 public sealed partial class GetTrialStatusResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("eligible_to_start_trial")]
 	public bool EligibleToStartTrial { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/LicenseManagement/PostResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/LicenseManagement/PostResponse.g.cs
index 1ba8f7e99c6..e7389c96983 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/LicenseManagement/PostResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/LicenseManagement/PostResponse.g.cs
@@ -18,20 +18,74 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.LicenseManagement;
 
+internal sealed partial class PostResponseConverter : System.Text.Json.Serialization.JsonConverter<PostResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledge = System.Text.Json.JsonEncodedText.Encode("acknowledge");
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+	private static readonly System.Text.Json.JsonEncodedText PropLicenseStatus = System.Text.Json.JsonEncodedText.Encode("license_status");
+
+	public override PostResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.LicenseManagement.Acknowledgement?> propAcknowledge = default;
+		LocalJsonProperty<bool> propAcknowledged = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.LicenseManagement.LicenseStatus> propLicenseStatus = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledge.TryRead(ref reader, options, PropAcknowledge))
+			{
+				continue;
+			}
+
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			if (propLicenseStatus.TryRead(ref reader, options, PropLicenseStatus))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PostResponse
+		{
+			Acknowledge = propAcknowledge.Value
+,
+			Acknowledged = propAcknowledged.Value
+,
+			LicenseStatus = propLicenseStatus.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PostResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledge, value.Acknowledge);
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteProperty(options, PropLicenseStatus, value.LicenseStatus);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PostResponseConverter))]
 public sealed partial class PostResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("acknowledge")]
 	public Elastic.Clients.Elasticsearch.LicenseManagement.Acknowledgement? Acknowledge { get; init; }
-	[JsonInclude, JsonPropertyName("acknowledged")]
 	public bool Acknowledged { get; init; }
-	[JsonInclude, JsonPropertyName("license_status")]
 	public Elastic.Clients.Elasticsearch.LicenseManagement.LicenseStatus LicenseStatus { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/LicenseManagement/PostStartBasicResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/LicenseManagement/PostStartBasicResponse.g.cs
index 9d33f61d74b..88333fea322 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/LicenseManagement/PostStartBasicResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/LicenseManagement/PostStartBasicResponse.g.cs
@@ -18,24 +18,96 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.LicenseManagement;
 
+internal sealed partial class PostStartBasicResponseConverter : System.Text.Json.Serialization.JsonConverter<PostStartBasicResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledge = System.Text.Json.JsonEncodedText.Encode("acknowledge");
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+	private static readonly System.Text.Json.JsonEncodedText PropBasicWasStarted = System.Text.Json.JsonEncodedText.Encode("basic_was_started");
+	private static readonly System.Text.Json.JsonEncodedText PropErrorMessage = System.Text.Json.JsonEncodedText.Encode("error_message");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override PostStartBasicResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyDictionary<string, Union<string, IReadOnlyCollection<string>>>?> propAcknowledge = default;
+		LocalJsonProperty<bool> propAcknowledged = default;
+		LocalJsonProperty<bool> propBasicWasStarted = default;
+		LocalJsonProperty<string?> propErrorMessage = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.LicenseManagement.LicenseType?> propType = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledge.TryRead(ref reader, options, PropAcknowledge))
+			{
+				continue;
+			}
+
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			if (propBasicWasStarted.TryRead(ref reader, options, PropBasicWasStarted))
+			{
+				continue;
+			}
+
+			if (propErrorMessage.TryRead(ref reader, options, PropErrorMessage))
+			{
+				continue;
+			}
+
+			if (propType.TryRead(ref reader, options, PropType))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PostStartBasicResponse
+		{
+			Acknowledge = propAcknowledge.Value
+,
+			Acknowledged = propAcknowledged.Value
+,
+			BasicWasStarted = propBasicWasStarted.Value
+,
+			ErrorMessage = propErrorMessage.Value
+,
+			Type = propType.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PostStartBasicResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledge, value.Acknowledge);
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteProperty(options, PropBasicWasStarted, value.BasicWasStarted);
+		writer.WriteProperty(options, PropErrorMessage, value.ErrorMessage);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PostStartBasicResponseConverter))]
 public sealed partial class PostStartBasicResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("acknowledge")]
 	public IReadOnlyDictionary<string, Union<string, IReadOnlyCollection<string>>>? Acknowledge { get; init; }
-	[JsonInclude, JsonPropertyName("acknowledged")]
 	public bool Acknowledged { get; init; }
-	[JsonInclude, JsonPropertyName("basic_was_started")]
 	public bool BasicWasStarted { get; init; }
-	[JsonInclude, JsonPropertyName("error_message")]
 	public string? ErrorMessage { get; init; }
-	[JsonInclude, JsonPropertyName("type")]
 	public Elastic.Clients.Elasticsearch.LicenseManagement.LicenseType? Type { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/LicenseManagement/PostStartTrialResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/LicenseManagement/PostStartTrialResponse.g.cs
index c95c366c974..f8da433e05e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/LicenseManagement/PostStartTrialResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/LicenseManagement/PostStartTrialResponse.g.cs
@@ -18,22 +18,85 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.LicenseManagement;
 
+internal sealed partial class PostStartTrialResponseConverter : System.Text.Json.Serialization.JsonConverter<PostStartTrialResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+	private static readonly System.Text.Json.JsonEncodedText PropErrorMessage = System.Text.Json.JsonEncodedText.Encode("error_message");
+	private static readonly System.Text.Json.JsonEncodedText PropTrialWasStarted = System.Text.Json.JsonEncodedText.Encode("trial_was_started");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override PostStartTrialResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		LocalJsonProperty<string?> propErrorMessage = default;
+		LocalJsonProperty<bool> propTrialWasStarted = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.LicenseManagement.LicenseType?> propType = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			if (propErrorMessage.TryRead(ref reader, options, PropErrorMessage))
+			{
+				continue;
+			}
+
+			if (propTrialWasStarted.TryRead(ref reader, options, PropTrialWasStarted))
+			{
+				continue;
+			}
+
+			if (propType.TryRead(ref reader, options, PropType))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PostStartTrialResponse
+		{
+			Acknowledged = propAcknowledged.Value
+,
+			ErrorMessage = propErrorMessage.Value
+,
+			TrialWasStarted = propTrialWasStarted.Value
+,
+			Type = propType.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PostStartTrialResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteProperty(options, PropErrorMessage, value.ErrorMessage);
+		writer.WriteProperty(options, PropTrialWasStarted, value.TrialWasStarted);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PostStartTrialResponseConverter))]
 public sealed partial class PostStartTrialResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("acknowledged")]
 	public bool Acknowledged { get; init; }
-	[JsonInclude, JsonPropertyName("error_message")]
 	public string? ErrorMessage { get; init; }
-	[JsonInclude, JsonPropertyName("trial_was_started")]
 	public bool TrialWasStarted { get; init; }
-	[JsonInclude, JsonPropertyName("type")]
 	public Elastic.Clients.Elasticsearch.LicenseManagement.LicenseType? Type { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/ClearTrainedModelDeploymentCacheResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/ClearTrainedModelDeploymentCacheResponse.g.cs
index 8043e6d4bfa..b02de8c4dbf 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/ClearTrainedModelDeploymentCacheResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/ClearTrainedModelDeploymentCacheResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
+internal sealed partial class ClearTrainedModelDeploymentCacheResponseConverter : System.Text.Json.Serialization.JsonConverter<ClearTrainedModelDeploymentCacheResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCleared = System.Text.Json.JsonEncodedText.Encode("cleared");
+
+	public override ClearTrainedModelDeploymentCacheResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propCleared = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCleared.TryRead(ref reader, options, PropCleared))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ClearTrainedModelDeploymentCacheResponse
+		{
+			Cleared = propCleared.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ClearTrainedModelDeploymentCacheResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCleared, value.Cleared);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ClearTrainedModelDeploymentCacheResponseConverter))]
 public sealed partial class ClearTrainedModelDeploymentCacheResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("cleared")]
 	public bool Cleared { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/CloseJobResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/CloseJobResponse.g.cs
index 6548e5bf9b3..2f95c4ef117 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/CloseJobResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/CloseJobResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
+internal sealed partial class CloseJobResponseConverter : System.Text.Json.Serialization.JsonConverter<CloseJobResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropClosed = System.Text.Json.JsonEncodedText.Encode("closed");
+
+	public override CloseJobResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propClosed = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propClosed.TryRead(ref reader, options, PropClosed))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new CloseJobResponse
+		{
+			Closed = propClosed.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, CloseJobResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropClosed, value.Closed);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(CloseJobResponseConverter))]
 public sealed partial class CloseJobResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("closed")]
 	public bool Closed { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/DeleteCalendarEventResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/DeleteCalendarEventResponse.g.cs
index 47d28a27405..a77d96496dd 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/DeleteCalendarEventResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/DeleteCalendarEventResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
+internal sealed partial class DeleteCalendarEventResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteCalendarEventResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override DeleteCalendarEventResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteCalendarEventResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteCalendarEventResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteCalendarEventResponseConverter))]
 public sealed partial class DeleteCalendarEventResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class DeleteCalendarEventResponse : ElasticsearchResponse
 	/// 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/MachineLearning/DeleteCalendarJobResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/DeleteCalendarJobResponse.g.cs
index f79e96e6c83..df6df0eac36 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/DeleteCalendarJobResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/DeleteCalendarJobResponse.g.cs
@@ -18,14 +18,71 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
+internal sealed partial class DeleteCalendarJobResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteCalendarJobResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCalendarId = System.Text.Json.JsonEncodedText.Encode("calendar_id");
+	private static readonly System.Text.Json.JsonEncodedText PropDescription = System.Text.Json.JsonEncodedText.Encode("description");
+	private static readonly System.Text.Json.JsonEncodedText PropJobIds = System.Text.Json.JsonEncodedText.Encode("job_ids");
+
+	public override DeleteCalendarJobResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propCalendarId = default;
+		LocalJsonProperty<string?> propDescription = default;
+		LocalJsonProperty<IReadOnlyCollection<string>> propJobIds = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCalendarId.TryRead(ref reader, options, PropCalendarId))
+			{
+				continue;
+			}
+
+			if (propDescription.TryRead(ref reader, options, PropDescription))
+			{
+				continue;
+			}
+
+			if (propJobIds.TryRead(ref reader, options, PropJobIds, typeof(SingleOrManyMarker<IReadOnlyCollection<string>, string>)))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteCalendarJobResponse
+		{
+			CalendarId = propCalendarId.Value
+,
+			Description = propDescription.Value
+,
+			JobIds = propJobIds.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteCalendarJobResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCalendarId, value.CalendarId);
+		writer.WriteProperty(options, PropDescription, value.Description);
+		writer.WriteProperty(options, PropJobIds, value.JobIds, typeof(SingleOrManyMarker<IReadOnlyCollection<string>, string>));
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteCalendarJobResponseConverter))]
 public sealed partial class DeleteCalendarJobResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,7 +90,6 @@ public sealed partial class DeleteCalendarJobResponse : ElasticsearchResponse
 	/// A string that uniquely identifies a calendar.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("calendar_id")]
 	public string CalendarId { get; init; }
 
 	/// <summary>
@@ -41,7 +97,6 @@ public sealed partial class DeleteCalendarJobResponse : ElasticsearchResponse
 	/// A description of the calendar.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("description")]
 	public string? Description { get; init; }
 
 	/// <summary>
@@ -49,7 +104,5 @@ public sealed partial class DeleteCalendarJobResponse : ElasticsearchResponse
 	/// A list of anomaly detection job identifiers or group names.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("job_ids")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public IReadOnlyCollection<string> JobIds { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/DeleteCalendarResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/DeleteCalendarResponse.g.cs
index f2439430e4c..ea627a3bb66 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/DeleteCalendarResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/DeleteCalendarResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
+internal sealed partial class DeleteCalendarResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteCalendarResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override DeleteCalendarResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteCalendarResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteCalendarResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteCalendarResponseConverter))]
 public sealed partial class DeleteCalendarResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class DeleteCalendarResponse : ElasticsearchResponse
 	/// 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/MachineLearning/DeleteDataFrameAnalyticsResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/DeleteDataFrameAnalyticsResponse.g.cs
index 78d91d8d7ff..5f4bd7fb44a 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/DeleteDataFrameAnalyticsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/DeleteDataFrameAnalyticsResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
+internal sealed partial class DeleteDataFrameAnalyticsResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteDataFrameAnalyticsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override DeleteDataFrameAnalyticsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteDataFrameAnalyticsResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteDataFrameAnalyticsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteDataFrameAnalyticsResponseConverter))]
 public sealed partial class DeleteDataFrameAnalyticsResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class DeleteDataFrameAnalyticsResponse : ElasticsearchResp
 	/// 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/MachineLearning/DeleteDatafeedResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/DeleteDatafeedResponse.g.cs
index 985d0ec763f..6e18b26634a 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/DeleteDatafeedResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/DeleteDatafeedResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
+internal sealed partial class DeleteDatafeedResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteDatafeedResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override DeleteDatafeedResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteDatafeedResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteDatafeedResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteDatafeedResponseConverter))]
 public sealed partial class DeleteDatafeedResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class DeleteDatafeedResponse : ElasticsearchResponse
 	/// 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/MachineLearning/DeleteExpiredDataResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/DeleteExpiredDataResponse.g.cs
index 2fa4f758f7d..3e0ebed21b5 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/DeleteExpiredDataResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/DeleteExpiredDataResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
+internal sealed partial class DeleteExpiredDataResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteExpiredDataResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropDeleted = System.Text.Json.JsonEncodedText.Encode("deleted");
+
+	public override DeleteExpiredDataResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propDeleted = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propDeleted.TryRead(ref reader, options, PropDeleted))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteExpiredDataResponse
+		{
+			Deleted = propDeleted.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteExpiredDataResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDeleted, value.Deleted);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteExpiredDataResponseConverter))]
 public sealed partial class DeleteExpiredDataResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("deleted")]
 	public bool Deleted { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/DeleteFilterResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/DeleteFilterResponse.g.cs
index 6d37a717058..0d204c2368d 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/DeleteFilterResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/DeleteFilterResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
+internal sealed partial class DeleteFilterResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteFilterResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override DeleteFilterResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteFilterResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteFilterResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteFilterResponseConverter))]
 public sealed partial class DeleteFilterResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class DeleteFilterResponse : ElasticsearchResponse
 	/// 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/MachineLearning/DeleteForecastResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/DeleteForecastResponse.g.cs
index 00b3f7ab79e..c1d13f586e0 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/DeleteForecastResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/DeleteForecastResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
+internal sealed partial class DeleteForecastResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteForecastResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override DeleteForecastResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteForecastResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteForecastResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteForecastResponseConverter))]
 public sealed partial class DeleteForecastResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class DeleteForecastResponse : ElasticsearchResponse
 	/// 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/MachineLearning/DeleteJobResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/DeleteJobResponse.g.cs
index 94765430771..2f831b59bc0 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/DeleteJobResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/DeleteJobResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
+internal sealed partial class DeleteJobResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteJobResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override DeleteJobResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteJobResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteJobResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteJobResponseConverter))]
 public sealed partial class DeleteJobResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class DeleteJobResponse : ElasticsearchResponse
 	/// 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/MachineLearning/DeleteModelSnapshotResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/DeleteModelSnapshotResponse.g.cs
index 658f9205a22..313815b706a 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/DeleteModelSnapshotResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/DeleteModelSnapshotResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
+internal sealed partial class DeleteModelSnapshotResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteModelSnapshotResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override DeleteModelSnapshotResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteModelSnapshotResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteModelSnapshotResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteModelSnapshotResponseConverter))]
 public sealed partial class DeleteModelSnapshotResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class DeleteModelSnapshotResponse : ElasticsearchResponse
 	/// 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/MachineLearning/DeleteTrainedModelAliasResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/DeleteTrainedModelAliasResponse.g.cs
index 9d8644ff51e..6a6b26c30bf 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/DeleteTrainedModelAliasResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/DeleteTrainedModelAliasResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
+internal sealed partial class DeleteTrainedModelAliasResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteTrainedModelAliasResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override DeleteTrainedModelAliasResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteTrainedModelAliasResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteTrainedModelAliasResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteTrainedModelAliasResponseConverter))]
 public sealed partial class DeleteTrainedModelAliasResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class DeleteTrainedModelAliasResponse : ElasticsearchRespo
 	/// 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/MachineLearning/DeleteTrainedModelResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/DeleteTrainedModelResponse.g.cs
index 2a0564f9050..a438fd3bb5e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/DeleteTrainedModelResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/DeleteTrainedModelResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
+internal sealed partial class DeleteTrainedModelResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteTrainedModelResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override DeleteTrainedModelResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteTrainedModelResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteTrainedModelResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteTrainedModelResponseConverter))]
 public sealed partial class DeleteTrainedModelResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class DeleteTrainedModelResponse : ElasticsearchResponse
 	/// 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/MachineLearning/EstimateModelMemoryResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/EstimateModelMemoryResponse.g.cs
index c420b7ffc87..360476bb98c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/EstimateModelMemoryResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/EstimateModelMemoryResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
+internal sealed partial class EstimateModelMemoryResponseConverter : System.Text.Json.Serialization.JsonConverter<EstimateModelMemoryResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropModelMemoryEstimate = System.Text.Json.JsonEncodedText.Encode("model_memory_estimate");
+
+	public override EstimateModelMemoryResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propModelMemoryEstimate = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propModelMemoryEstimate.TryRead(ref reader, options, PropModelMemoryEstimate))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new EstimateModelMemoryResponse
+		{
+			ModelMemoryEstimate = propModelMemoryEstimate.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, EstimateModelMemoryResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropModelMemoryEstimate, value.ModelMemoryEstimate);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(EstimateModelMemoryResponseConverter))]
 public sealed partial class EstimateModelMemoryResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("model_memory_estimate")]
 	public string ModelMemoryEstimate { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/EvaluateDataFrameResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/EvaluateDataFrameResponse.g.cs
index 239a4585c7c..70da62c7185 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/EvaluateDataFrameResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/EvaluateDataFrameResponse.g.cs
@@ -18,14 +18,71 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
+internal sealed partial class EvaluateDataFrameResponseConverter : System.Text.Json.Serialization.JsonConverter<EvaluateDataFrameResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropClassification = System.Text.Json.JsonEncodedText.Encode("classification");
+	private static readonly System.Text.Json.JsonEncodedText PropOutlierDetection = System.Text.Json.JsonEncodedText.Encode("outlier_detection");
+	private static readonly System.Text.Json.JsonEncodedText PropRegression = System.Text.Json.JsonEncodedText.Encode("regression");
+
+	public override EvaluateDataFrameResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.MachineLearning.DataframeClassificationSummary?> propClassification = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.MachineLearning.DataframeOutlierDetectionSummary?> propOutlierDetection = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.MachineLearning.DataframeRegressionSummary?> propRegression = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propClassification.TryRead(ref reader, options, PropClassification))
+			{
+				continue;
+			}
+
+			if (propOutlierDetection.TryRead(ref reader, options, PropOutlierDetection))
+			{
+				continue;
+			}
+
+			if (propRegression.TryRead(ref reader, options, PropRegression))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new EvaluateDataFrameResponse
+		{
+			Classification = propClassification.Value
+,
+			OutlierDetection = propOutlierDetection.Value
+,
+			Regression = propRegression.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, EvaluateDataFrameResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropClassification, value.Classification);
+		writer.WriteProperty(options, PropOutlierDetection, value.OutlierDetection);
+		writer.WriteProperty(options, PropRegression, value.Regression);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(EvaluateDataFrameResponseConverter))]
 public sealed partial class EvaluateDataFrameResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -34,7 +91,6 @@ public sealed partial class EvaluateDataFrameResponse : ElasticsearchResponse
 	/// It outputs a prediction that identifies to which of the classes each document belongs.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("classification")]
 	public Elastic.Clients.Elasticsearch.MachineLearning.DataframeClassificationSummary? Classification { get; init; }
 
 	/// <summary>
@@ -43,7 +99,6 @@ public sealed partial class EvaluateDataFrameResponse : ElasticsearchResponse
 	/// It outputs the probability that each document is an outlier.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("outlier_detection")]
 	public Elastic.Clients.Elasticsearch.MachineLearning.DataframeOutlierDetectionSummary? OutlierDetection { get; init; }
 
 	/// <summary>
@@ -51,6 +106,5 @@ public sealed partial class EvaluateDataFrameResponse : ElasticsearchResponse
 	/// Evaluation results for a regression analysis which outputs a prediction of values.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("regression")]
 	public Elastic.Clients.Elasticsearch.MachineLearning.DataframeRegressionSummary? Regression { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/ExplainDataFrameAnalyticsResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/ExplainDataFrameAnalyticsResponse.g.cs
index 9538fde34a2..f4b0821e902 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/ExplainDataFrameAnalyticsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/ExplainDataFrameAnalyticsResponse.g.cs
@@ -18,14 +18,61 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
+internal sealed partial class ExplainDataFrameAnalyticsResponseConverter : System.Text.Json.Serialization.JsonConverter<ExplainDataFrameAnalyticsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropFieldSelection = System.Text.Json.JsonEncodedText.Encode("field_selection");
+	private static readonly System.Text.Json.JsonEncodedText PropMemoryEstimation = System.Text.Json.JsonEncodedText.Encode("memory_estimation");
+
+	public override ExplainDataFrameAnalyticsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.MachineLearning.DataframeAnalyticsFieldSelection>> propFieldSelection = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.MachineLearning.DataframeAnalyticsMemoryEstimation> propMemoryEstimation = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propFieldSelection.TryRead(ref reader, options, PropFieldSelection))
+			{
+				continue;
+			}
+
+			if (propMemoryEstimation.TryRead(ref reader, options, PropMemoryEstimation))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ExplainDataFrameAnalyticsResponse
+		{
+			FieldSelection = propFieldSelection.Value
+,
+			MemoryEstimation = propMemoryEstimation.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ExplainDataFrameAnalyticsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropFieldSelection, value.FieldSelection);
+		writer.WriteProperty(options, PropMemoryEstimation, value.MemoryEstimation);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ExplainDataFrameAnalyticsResponseConverter))]
 public sealed partial class ExplainDataFrameAnalyticsResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,7 +80,6 @@ public sealed partial class ExplainDataFrameAnalyticsResponse : ElasticsearchRes
 	/// An array of objects that explain selection for each field, sorted by the field names.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("field_selection")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.MachineLearning.DataframeAnalyticsFieldSelection> FieldSelection { get; init; }
 
 	/// <summary>
@@ -41,6 +87,5 @@ public sealed partial class ExplainDataFrameAnalyticsResponse : ElasticsearchRes
 	/// An array of objects that explain selection for each field, sorted by the field names.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("memory_estimation")]
 	public Elastic.Clients.Elasticsearch.MachineLearning.DataframeAnalyticsMemoryEstimation MemoryEstimation { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/FlushJobResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/FlushJobResponse.g.cs
index ad4776b1c49..c2ba0b0c807 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/FlushJobResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/FlushJobResponse.g.cs
@@ -18,17 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
+internal sealed partial class FlushJobResponseConverter : System.Text.Json.Serialization.JsonConverter<FlushJobResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropFlushed = System.Text.Json.JsonEncodedText.Encode("flushed");
+	private static readonly System.Text.Json.JsonEncodedText PropLastFinalizedBucketEnd = System.Text.Json.JsonEncodedText.Encode("last_finalized_bucket_end");
+
+	public override FlushJobResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propFlushed = default;
+		LocalJsonProperty<int?> propLastFinalizedBucketEnd = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propFlushed.TryRead(ref reader, options, PropFlushed))
+			{
+				continue;
+			}
+
+			if (propLastFinalizedBucketEnd.TryRead(ref reader, options, PropLastFinalizedBucketEnd))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new FlushJobResponse
+		{
+			Flushed = propFlushed.Value
+,
+			LastFinalizedBucketEnd = propLastFinalizedBucketEnd.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, FlushJobResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropFlushed, value.Flushed);
+		writer.WriteProperty(options, PropLastFinalizedBucketEnd, value.LastFinalizedBucketEnd);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(FlushJobResponseConverter))]
 public sealed partial class FlushJobResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("flushed")]
 	public bool Flushed { get; init; }
 
 	/// <summary>
@@ -37,6 +83,5 @@ public sealed partial class FlushJobResponse : ElasticsearchResponse
 	/// the last bucket that was processed.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("last_finalized_bucket_end")]
 	public int? LastFinalizedBucketEnd { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/ForecastResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/ForecastResponse.g.cs
index 90c4b0f3cb0..c703709c236 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/ForecastResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/ForecastResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
+internal sealed partial class ForecastResponseConverter : System.Text.Json.Serialization.JsonConverter<ForecastResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+	private static readonly System.Text.Json.JsonEncodedText PropForecastId = System.Text.Json.JsonEncodedText.Encode("forecast_id");
+
+	public override ForecastResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		LocalJsonProperty<string> propForecastId = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			if (propForecastId.TryRead(ref reader, options, PropForecastId))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ForecastResponse
+		{
+			Acknowledged = propAcknowledged.Value
+,
+			ForecastId = propForecastId.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ForecastResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteProperty(options, PropForecastId, value.ForecastId);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ForecastResponseConverter))]
 public sealed partial class ForecastResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("acknowledged")]
 	public bool Acknowledged { get; init; }
-	[JsonInclude, JsonPropertyName("forecast_id")]
 	public string ForecastId { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/GetBucketsResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/GetBucketsResponse.g.cs
index a4c60815b86..b1aab9b1038 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/GetBucketsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/GetBucketsResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
+internal sealed partial class GetBucketsResponseConverter : System.Text.Json.Serialization.JsonConverter<GetBucketsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropBuckets = System.Text.Json.JsonEncodedText.Encode("buckets");
+	private static readonly System.Text.Json.JsonEncodedText PropCount = System.Text.Json.JsonEncodedText.Encode("count");
+
+	public override GetBucketsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.MachineLearning.BucketSummary>> propBuckets = default;
+		LocalJsonProperty<long> propCount = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBuckets.TryRead(ref reader, options, PropBuckets))
+			{
+				continue;
+			}
+
+			if (propCount.TryRead(ref reader, options, PropCount))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetBucketsResponse
+		{
+			Buckets = propBuckets.Value
+,
+			Count = propCount.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetBucketsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBuckets, value.Buckets);
+		writer.WriteProperty(options, PropCount, value.Count);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetBucketsResponseConverter))]
 public sealed partial class GetBucketsResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("buckets")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.MachineLearning.BucketSummary> Buckets { get; init; }
-	[JsonInclude, JsonPropertyName("count")]
 	public long Count { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/GetCalendarEventsResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/GetCalendarEventsResponse.g.cs
index a8e698977df..b35ae18af24 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/GetCalendarEventsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/GetCalendarEventsResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
+internal sealed partial class GetCalendarEventsResponseConverter : System.Text.Json.Serialization.JsonConverter<GetCalendarEventsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCount = System.Text.Json.JsonEncodedText.Encode("count");
+	private static readonly System.Text.Json.JsonEncodedText PropEvents = System.Text.Json.JsonEncodedText.Encode("events");
+
+	public override GetCalendarEventsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<long> propCount = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.MachineLearning.CalendarEvent>> propEvents = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCount.TryRead(ref reader, options, PropCount))
+			{
+				continue;
+			}
+
+			if (propEvents.TryRead(ref reader, options, PropEvents))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetCalendarEventsResponse
+		{
+			Count = propCount.Value
+,
+			Events = propEvents.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetCalendarEventsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCount, value.Count);
+		writer.WriteProperty(options, PropEvents, value.Events);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetCalendarEventsResponseConverter))]
 public sealed partial class GetCalendarEventsResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("count")]
 	public long Count { get; init; }
-	[JsonInclude, JsonPropertyName("events")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.MachineLearning.CalendarEvent> Events { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/GetCalendarsResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/GetCalendarsResponse.g.cs
index 4b098d1cd30..36881c74265 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/GetCalendarsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/GetCalendarsResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
+internal sealed partial class GetCalendarsResponseConverter : System.Text.Json.Serialization.JsonConverter<GetCalendarsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCalendars = System.Text.Json.JsonEncodedText.Encode("calendars");
+	private static readonly System.Text.Json.JsonEncodedText PropCount = System.Text.Json.JsonEncodedText.Encode("count");
+
+	public override GetCalendarsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.MachineLearning.Calendar>> propCalendars = default;
+		LocalJsonProperty<long> propCount = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCalendars.TryRead(ref reader, options, PropCalendars))
+			{
+				continue;
+			}
+
+			if (propCount.TryRead(ref reader, options, PropCount))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetCalendarsResponse
+		{
+			Calendars = propCalendars.Value
+,
+			Count = propCount.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetCalendarsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCalendars, value.Calendars);
+		writer.WriteProperty(options, PropCount, value.Count);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetCalendarsResponseConverter))]
 public sealed partial class GetCalendarsResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("calendars")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.MachineLearning.Calendar> Calendars { get; init; }
-	[JsonInclude, JsonPropertyName("count")]
 	public long Count { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/GetCategoriesResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/GetCategoriesResponse.g.cs
index 0a9fef54aeb..e1227515356 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/GetCategoriesResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/GetCategoriesResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
+internal sealed partial class GetCategoriesResponseConverter : System.Text.Json.Serialization.JsonConverter<GetCategoriesResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCategories = System.Text.Json.JsonEncodedText.Encode("categories");
+	private static readonly System.Text.Json.JsonEncodedText PropCount = System.Text.Json.JsonEncodedText.Encode("count");
+
+	public override GetCategoriesResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.MachineLearning.Category>> propCategories = default;
+		LocalJsonProperty<long> propCount = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCategories.TryRead(ref reader, options, PropCategories))
+			{
+				continue;
+			}
+
+			if (propCount.TryRead(ref reader, options, PropCount))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetCategoriesResponse
+		{
+			Categories = propCategories.Value
+,
+			Count = propCount.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetCategoriesResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCategories, value.Categories);
+		writer.WriteProperty(options, PropCount, value.Count);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetCategoriesResponseConverter))]
 public sealed partial class GetCategoriesResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("categories")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.MachineLearning.Category> Categories { get; init; }
-	[JsonInclude, JsonPropertyName("count")]
 	public long Count { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/GetDataFrameAnalyticsResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/GetDataFrameAnalyticsResponse.g.cs
index da8f94fc4cb..fd92aa8183e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/GetDataFrameAnalyticsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/GetDataFrameAnalyticsResponse.g.cs
@@ -18,17 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
+internal sealed partial class GetDataFrameAnalyticsResponseConverter : System.Text.Json.Serialization.JsonConverter<GetDataFrameAnalyticsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCount = System.Text.Json.JsonEncodedText.Encode("count");
+	private static readonly System.Text.Json.JsonEncodedText PropDataFrameAnalytics = System.Text.Json.JsonEncodedText.Encode("data_frame_analytics");
+
+	public override GetDataFrameAnalyticsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<int> propCount = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.MachineLearning.DataframeAnalyticsSummary>> propDataFrameAnalytics = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCount.TryRead(ref reader, options, PropCount))
+			{
+				continue;
+			}
+
+			if (propDataFrameAnalytics.TryRead(ref reader, options, PropDataFrameAnalytics))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetDataFrameAnalyticsResponse
+		{
+			Count = propCount.Value
+,
+			DataFrameAnalytics = propDataFrameAnalytics.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetDataFrameAnalyticsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCount, value.Count);
+		writer.WriteProperty(options, PropDataFrameAnalytics, value.DataFrameAnalytics);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetDataFrameAnalyticsResponseConverter))]
 public sealed partial class GetDataFrameAnalyticsResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("count")]
 	public int Count { get; init; }
 
 	/// <summary>
@@ -36,6 +82,5 @@ public sealed partial class GetDataFrameAnalyticsResponse : ElasticsearchRespons
 	/// An array of data frame analytics job resources, which are sorted by the id value in ascending order.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("data_frame_analytics")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.MachineLearning.DataframeAnalyticsSummary> DataFrameAnalytics { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/GetDataFrameAnalyticsStatsResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/GetDataFrameAnalyticsStatsResponse.g.cs
index fb6b005d405..2fbcb6b9ec7 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/GetDataFrameAnalyticsStatsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/GetDataFrameAnalyticsStatsResponse.g.cs
@@ -18,17 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
+internal sealed partial class GetDataFrameAnalyticsStatsResponseConverter : System.Text.Json.Serialization.JsonConverter<GetDataFrameAnalyticsStatsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCount = System.Text.Json.JsonEncodedText.Encode("count");
+	private static readonly System.Text.Json.JsonEncodedText PropDataFrameAnalytics = System.Text.Json.JsonEncodedText.Encode("data_frame_analytics");
+
+	public override GetDataFrameAnalyticsStatsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<long> propCount = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.MachineLearning.DataframeAnalytics>> propDataFrameAnalytics = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCount.TryRead(ref reader, options, PropCount))
+			{
+				continue;
+			}
+
+			if (propDataFrameAnalytics.TryRead(ref reader, options, PropDataFrameAnalytics))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetDataFrameAnalyticsStatsResponse
+		{
+			Count = propCount.Value
+,
+			DataFrameAnalytics = propDataFrameAnalytics.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetDataFrameAnalyticsStatsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCount, value.Count);
+		writer.WriteProperty(options, PropDataFrameAnalytics, value.DataFrameAnalytics);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetDataFrameAnalyticsStatsResponseConverter))]
 public sealed partial class GetDataFrameAnalyticsStatsResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("count")]
 	public long Count { get; init; }
 
 	/// <summary>
@@ -36,6 +82,5 @@ public sealed partial class GetDataFrameAnalyticsStatsResponse : ElasticsearchRe
 	/// An array of objects that contain usage information for data frame analytics jobs, which are sorted by the id value in ascending order.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("data_frame_analytics")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.MachineLearning.DataframeAnalytics> DataFrameAnalytics { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/GetDatafeedStatsResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/GetDatafeedStatsResponse.g.cs
index 5b5b708f0f5..e801c1d993f 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/GetDatafeedStatsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/GetDatafeedStatsResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
+internal sealed partial class GetDatafeedStatsResponseConverter : System.Text.Json.Serialization.JsonConverter<GetDatafeedStatsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCount = System.Text.Json.JsonEncodedText.Encode("count");
+	private static readonly System.Text.Json.JsonEncodedText PropDatafeeds = System.Text.Json.JsonEncodedText.Encode("datafeeds");
+
+	public override GetDatafeedStatsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<long> propCount = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.MachineLearning.DatafeedStats>> propDatafeeds = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCount.TryRead(ref reader, options, PropCount))
+			{
+				continue;
+			}
+
+			if (propDatafeeds.TryRead(ref reader, options, PropDatafeeds))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetDatafeedStatsResponse
+		{
+			Count = propCount.Value
+,
+			Datafeeds = propDatafeeds.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetDatafeedStatsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCount, value.Count);
+		writer.WriteProperty(options, PropDatafeeds, value.Datafeeds);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetDatafeedStatsResponseConverter))]
 public sealed partial class GetDatafeedStatsResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("count")]
 	public long Count { get; init; }
-	[JsonInclude, JsonPropertyName("datafeeds")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.MachineLearning.DatafeedStats> Datafeeds { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/GetDatafeedsResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/GetDatafeedsResponse.g.cs
index 080ae74ef84..988a26979e7 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/GetDatafeedsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/GetDatafeedsResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
+internal sealed partial class GetDatafeedsResponseConverter : System.Text.Json.Serialization.JsonConverter<GetDatafeedsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCount = System.Text.Json.JsonEncodedText.Encode("count");
+	private static readonly System.Text.Json.JsonEncodedText PropDatafeeds = System.Text.Json.JsonEncodedText.Encode("datafeeds");
+
+	public override GetDatafeedsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<long> propCount = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.MachineLearning.Datafeed>> propDatafeeds = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCount.TryRead(ref reader, options, PropCount))
+			{
+				continue;
+			}
+
+			if (propDatafeeds.TryRead(ref reader, options, PropDatafeeds))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetDatafeedsResponse
+		{
+			Count = propCount.Value
+,
+			Datafeeds = propDatafeeds.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetDatafeedsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCount, value.Count);
+		writer.WriteProperty(options, PropDatafeeds, value.Datafeeds);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetDatafeedsResponseConverter))]
 public sealed partial class GetDatafeedsResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("count")]
 	public long Count { get; init; }
-	[JsonInclude, JsonPropertyName("datafeeds")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.MachineLearning.Datafeed> Datafeeds { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/GetFiltersResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/GetFiltersResponse.g.cs
index e7c60c8592c..0df9e00c49f 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/GetFiltersResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/GetFiltersResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
+internal sealed partial class GetFiltersResponseConverter : System.Text.Json.Serialization.JsonConverter<GetFiltersResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCount = System.Text.Json.JsonEncodedText.Encode("count");
+	private static readonly System.Text.Json.JsonEncodedText PropFilters = System.Text.Json.JsonEncodedText.Encode("filters");
+
+	public override GetFiltersResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<long> propCount = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.MachineLearning.Filter>> propFilters = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCount.TryRead(ref reader, options, PropCount))
+			{
+				continue;
+			}
+
+			if (propFilters.TryRead(ref reader, options, PropFilters))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetFiltersResponse
+		{
+			Count = propCount.Value
+,
+			Filters = propFilters.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetFiltersResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCount, value.Count);
+		writer.WriteProperty(options, PropFilters, value.Filters);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetFiltersResponseConverter))]
 public sealed partial class GetFiltersResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("count")]
 	public long Count { get; init; }
-	[JsonInclude, JsonPropertyName("filters")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.MachineLearning.Filter> Filters { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/GetInfluencersResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/GetInfluencersResponse.g.cs
index 188949c02d9..a7b8be9c212 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/GetInfluencersResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/GetInfluencersResponse.g.cs
@@ -18,17 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
+internal sealed partial class GetInfluencersResponseConverter : System.Text.Json.Serialization.JsonConverter<GetInfluencersResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCount = System.Text.Json.JsonEncodedText.Encode("count");
+	private static readonly System.Text.Json.JsonEncodedText PropInfluencers = System.Text.Json.JsonEncodedText.Encode("influencers");
+
+	public override GetInfluencersResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<long> propCount = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.MachineLearning.Influencer>> propInfluencers = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCount.TryRead(ref reader, options, PropCount))
+			{
+				continue;
+			}
+
+			if (propInfluencers.TryRead(ref reader, options, PropInfluencers))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetInfluencersResponse
+		{
+			Count = propCount.Value
+,
+			Influencers = propInfluencers.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetInfluencersResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCount, value.Count);
+		writer.WriteProperty(options, PropInfluencers, value.Influencers);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetInfluencersResponseConverter))]
 public sealed partial class GetInfluencersResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("count")]
 	public long Count { get; init; }
 
 	/// <summary>
@@ -36,6 +82,5 @@ public sealed partial class GetInfluencersResponse : ElasticsearchResponse
 	/// Array of influencer objects
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("influencers")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.MachineLearning.Influencer> Influencers { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/GetJobStatsResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/GetJobStatsResponse.g.cs
index 190a243cb18..81431c7f05b 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/GetJobStatsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/GetJobStatsResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
+internal sealed partial class GetJobStatsResponseConverter : System.Text.Json.Serialization.JsonConverter<GetJobStatsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCount = System.Text.Json.JsonEncodedText.Encode("count");
+	private static readonly System.Text.Json.JsonEncodedText PropJobs = System.Text.Json.JsonEncodedText.Encode("jobs");
+
+	public override GetJobStatsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<long> propCount = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.MachineLearning.JobStats>> propJobs = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCount.TryRead(ref reader, options, PropCount))
+			{
+				continue;
+			}
+
+			if (propJobs.TryRead(ref reader, options, PropJobs))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetJobStatsResponse
+		{
+			Count = propCount.Value
+,
+			Jobs = propJobs.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetJobStatsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCount, value.Count);
+		writer.WriteProperty(options, PropJobs, value.Jobs);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetJobStatsResponseConverter))]
 public sealed partial class GetJobStatsResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("count")]
 	public long Count { get; init; }
-	[JsonInclude, JsonPropertyName("jobs")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.MachineLearning.JobStats> Jobs { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/GetJobsResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/GetJobsResponse.g.cs
index 419693e599b..aeb38a27506 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/GetJobsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/GetJobsResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
+internal sealed partial class GetJobsResponseConverter : System.Text.Json.Serialization.JsonConverter<GetJobsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCount = System.Text.Json.JsonEncodedText.Encode("count");
+	private static readonly System.Text.Json.JsonEncodedText PropJobs = System.Text.Json.JsonEncodedText.Encode("jobs");
+
+	public override GetJobsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<long> propCount = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.MachineLearning.Job>> propJobs = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCount.TryRead(ref reader, options, PropCount))
+			{
+				continue;
+			}
+
+			if (propJobs.TryRead(ref reader, options, PropJobs))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetJobsResponse
+		{
+			Count = propCount.Value
+,
+			Jobs = propJobs.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetJobsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCount, value.Count);
+		writer.WriteProperty(options, PropJobs, value.Jobs);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetJobsResponseConverter))]
 public sealed partial class GetJobsResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("count")]
 	public long Count { get; init; }
-	[JsonInclude, JsonPropertyName("jobs")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.MachineLearning.Job> Jobs { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/GetMemoryStatsResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/GetMemoryStatsResponse.g.cs
index ebfed58ba91..f38ac57cde8 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/GetMemoryStatsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/GetMemoryStatsResponse.g.cs
@@ -18,20 +18,74 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
+internal sealed partial class GetMemoryStatsResponseConverter : System.Text.Json.Serialization.JsonConverter<GetMemoryStatsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropClusterName = System.Text.Json.JsonEncodedText.Encode("cluster_name");
+	private static readonly System.Text.Json.JsonEncodedText PropNodes = System.Text.Json.JsonEncodedText.Encode("nodes");
+	private static readonly System.Text.Json.JsonEncodedText PropNodeStatistics = System.Text.Json.JsonEncodedText.Encode("_nodes");
+
+	public override GetMemoryStatsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propClusterName = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.MachineLearning.Memory>> propNodes = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.NodeStatistics> propNodeStatistics = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propClusterName.TryRead(ref reader, options, PropClusterName))
+			{
+				continue;
+			}
+
+			if (propNodes.TryRead(ref reader, options, PropNodes))
+			{
+				continue;
+			}
+
+			if (propNodeStatistics.TryRead(ref reader, options, PropNodeStatistics))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetMemoryStatsResponse
+		{
+			ClusterName = propClusterName.Value
+,
+			Nodes = propNodes.Value
+,
+			NodeStatistics = propNodeStatistics.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetMemoryStatsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropClusterName, value.ClusterName);
+		writer.WriteProperty(options, PropNodes, value.Nodes);
+		writer.WriteProperty(options, PropNodeStatistics, value.NodeStatistics);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetMemoryStatsResponseConverter))]
 public sealed partial class GetMemoryStatsResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("cluster_name")]
 	public string ClusterName { get; init; }
-	[JsonInclude, JsonPropertyName("nodes")]
 	public IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.MachineLearning.Memory> Nodes { get; init; }
-	[JsonInclude, JsonPropertyName("_nodes")]
 	public Elastic.Clients.Elasticsearch.NodeStatistics NodeStatistics { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/GetModelSnapshotUpgradeStatsResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/GetModelSnapshotUpgradeStatsResponse.g.cs
index 45fd57704ca..e2dd9c93559 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/GetModelSnapshotUpgradeStatsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/GetModelSnapshotUpgradeStatsResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
+internal sealed partial class GetModelSnapshotUpgradeStatsResponseConverter : System.Text.Json.Serialization.JsonConverter<GetModelSnapshotUpgradeStatsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCount = System.Text.Json.JsonEncodedText.Encode("count");
+	private static readonly System.Text.Json.JsonEncodedText PropModelSnapshotUpgrades = System.Text.Json.JsonEncodedText.Encode("model_snapshot_upgrades");
+
+	public override GetModelSnapshotUpgradeStatsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<long> propCount = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.MachineLearning.ModelSnapshotUpgrade>> propModelSnapshotUpgrades = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCount.TryRead(ref reader, options, PropCount))
+			{
+				continue;
+			}
+
+			if (propModelSnapshotUpgrades.TryRead(ref reader, options, PropModelSnapshotUpgrades))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetModelSnapshotUpgradeStatsResponse
+		{
+			Count = propCount.Value
+,
+			ModelSnapshotUpgrades = propModelSnapshotUpgrades.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetModelSnapshotUpgradeStatsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCount, value.Count);
+		writer.WriteProperty(options, PropModelSnapshotUpgrades, value.ModelSnapshotUpgrades);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetModelSnapshotUpgradeStatsResponseConverter))]
 public sealed partial class GetModelSnapshotUpgradeStatsResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("count")]
 	public long Count { get; init; }
-	[JsonInclude, JsonPropertyName("model_snapshot_upgrades")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.MachineLearning.ModelSnapshotUpgrade> ModelSnapshotUpgrades { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/GetModelSnapshotsResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/GetModelSnapshotsResponse.g.cs
index b56ff39f247..233d7f5b372 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/GetModelSnapshotsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/GetModelSnapshotsResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
+internal sealed partial class GetModelSnapshotsResponseConverter : System.Text.Json.Serialization.JsonConverter<GetModelSnapshotsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCount = System.Text.Json.JsonEncodedText.Encode("count");
+	private static readonly System.Text.Json.JsonEncodedText PropModelSnapshots = System.Text.Json.JsonEncodedText.Encode("model_snapshots");
+
+	public override GetModelSnapshotsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<long> propCount = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.MachineLearning.ModelSnapshot>> propModelSnapshots = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCount.TryRead(ref reader, options, PropCount))
+			{
+				continue;
+			}
+
+			if (propModelSnapshots.TryRead(ref reader, options, PropModelSnapshots))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetModelSnapshotsResponse
+		{
+			Count = propCount.Value
+,
+			ModelSnapshots = propModelSnapshots.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetModelSnapshotsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCount, value.Count);
+		writer.WriteProperty(options, PropModelSnapshots, value.ModelSnapshots);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetModelSnapshotsResponseConverter))]
 public sealed partial class GetModelSnapshotsResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("count")]
 	public long Count { get; init; }
-	[JsonInclude, JsonPropertyName("model_snapshots")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.MachineLearning.ModelSnapshot> ModelSnapshots { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/GetOverallBucketsResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/GetOverallBucketsResponse.g.cs
index 341db374b03..3cbb5402847 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/GetOverallBucketsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/GetOverallBucketsResponse.g.cs
@@ -18,17 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
+internal sealed partial class GetOverallBucketsResponseConverter : System.Text.Json.Serialization.JsonConverter<GetOverallBucketsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCount = System.Text.Json.JsonEncodedText.Encode("count");
+	private static readonly System.Text.Json.JsonEncodedText PropOverallBuckets = System.Text.Json.JsonEncodedText.Encode("overall_buckets");
+
+	public override GetOverallBucketsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<long> propCount = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.MachineLearning.OverallBucket>> propOverallBuckets = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCount.TryRead(ref reader, options, PropCount))
+			{
+				continue;
+			}
+
+			if (propOverallBuckets.TryRead(ref reader, options, PropOverallBuckets))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetOverallBucketsResponse
+		{
+			Count = propCount.Value
+,
+			OverallBuckets = propOverallBuckets.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetOverallBucketsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCount, value.Count);
+		writer.WriteProperty(options, PropOverallBuckets, value.OverallBuckets);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetOverallBucketsResponseConverter))]
 public sealed partial class GetOverallBucketsResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("count")]
 	public long Count { get; init; }
 
 	/// <summary>
@@ -36,6 +82,5 @@ public sealed partial class GetOverallBucketsResponse : ElasticsearchResponse
 	/// Array of overall bucket objects
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("overall_buckets")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.MachineLearning.OverallBucket> OverallBuckets { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/GetRecordsResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/GetRecordsResponse.g.cs
index 10805cbe3fe..27ad3a6496b 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/GetRecordsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/GetRecordsResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
+internal sealed partial class GetRecordsResponseConverter : System.Text.Json.Serialization.JsonConverter<GetRecordsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCount = System.Text.Json.JsonEncodedText.Encode("count");
+	private static readonly System.Text.Json.JsonEncodedText PropRecords = System.Text.Json.JsonEncodedText.Encode("records");
+
+	public override GetRecordsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<long> propCount = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.MachineLearning.Anomaly>> propRecords = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCount.TryRead(ref reader, options, PropCount))
+			{
+				continue;
+			}
+
+			if (propRecords.TryRead(ref reader, options, PropRecords))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetRecordsResponse
+		{
+			Count = propCount.Value
+,
+			Records = propRecords.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetRecordsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCount, value.Count);
+		writer.WriteProperty(options, PropRecords, value.Records);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetRecordsResponseConverter))]
 public sealed partial class GetRecordsResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("count")]
 	public long Count { get; init; }
-	[JsonInclude, JsonPropertyName("records")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.MachineLearning.Anomaly> Records { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/GetTrainedModelsResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/GetTrainedModelsResponse.g.cs
index ec971e39178..0f3a9bc64fb 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/GetTrainedModelsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/GetTrainedModelsResponse.g.cs
@@ -18,17 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
+internal sealed partial class GetTrainedModelsResponseConverter : System.Text.Json.Serialization.JsonConverter<GetTrainedModelsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCount = System.Text.Json.JsonEncodedText.Encode("count");
+	private static readonly System.Text.Json.JsonEncodedText PropTrainedModelConfigs = System.Text.Json.JsonEncodedText.Encode("trained_model_configs");
+
+	public override GetTrainedModelsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<int> propCount = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.MachineLearning.TrainedModelConfig>> propTrainedModelConfigs = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCount.TryRead(ref reader, options, PropCount))
+			{
+				continue;
+			}
+
+			if (propTrainedModelConfigs.TryRead(ref reader, options, PropTrainedModelConfigs))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetTrainedModelsResponse
+		{
+			Count = propCount.Value
+,
+			TrainedModelConfigs = propTrainedModelConfigs.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetTrainedModelsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCount, value.Count);
+		writer.WriteProperty(options, PropTrainedModelConfigs, value.TrainedModelConfigs);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetTrainedModelsResponseConverter))]
 public sealed partial class GetTrainedModelsResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("count")]
 	public int Count { get; init; }
 
 	/// <summary>
@@ -36,6 +82,5 @@ public sealed partial class GetTrainedModelsResponse : ElasticsearchResponse
 	/// An array of trained model resources, which are sorted by the model_id value in ascending order.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("trained_model_configs")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.MachineLearning.TrainedModelConfig> TrainedModelConfigs { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/GetTrainedModelsStatsResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/GetTrainedModelsStatsResponse.g.cs
index d49b5734363..66d1090d068 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/GetTrainedModelsStatsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/GetTrainedModelsStatsResponse.g.cs
@@ -18,14 +18,61 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
+internal sealed partial class GetTrainedModelsStatsResponseConverter : System.Text.Json.Serialization.JsonConverter<GetTrainedModelsStatsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCount = System.Text.Json.JsonEncodedText.Encode("count");
+	private static readonly System.Text.Json.JsonEncodedText PropTrainedModelStats = System.Text.Json.JsonEncodedText.Encode("trained_model_stats");
+
+	public override GetTrainedModelsStatsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<int> propCount = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.MachineLearning.TrainedModelStats>> propTrainedModelStats = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCount.TryRead(ref reader, options, PropCount))
+			{
+				continue;
+			}
+
+			if (propTrainedModelStats.TryRead(ref reader, options, PropTrainedModelStats))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetTrainedModelsStatsResponse
+		{
+			Count = propCount.Value
+,
+			TrainedModelStats = propTrainedModelStats.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetTrainedModelsStatsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCount, value.Count);
+		writer.WriteProperty(options, PropTrainedModelStats, value.TrainedModelStats);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetTrainedModelsStatsResponseConverter))]
 public sealed partial class GetTrainedModelsStatsResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,7 +80,6 @@ public sealed partial class GetTrainedModelsStatsResponse : ElasticsearchRespons
 	/// The total number of trained model statistics that matched the requested ID patterns. Could be higher than the number of items in the trained_model_stats array as the size of the array is restricted by the supplied size parameter.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("count")]
 	public int Count { get; init; }
 
 	/// <summary>
@@ -41,6 +87,5 @@ public sealed partial class GetTrainedModelsStatsResponse : ElasticsearchRespons
 	/// An array of trained model statistics, which are sorted by the model_id value in ascending order.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("trained_model_stats")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.MachineLearning.TrainedModelStats> TrainedModelStats { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/InferTrainedModelResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/InferTrainedModelResponse.g.cs
index b9edc44911f..c6f88d47bcd 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/InferTrainedModelResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/InferTrainedModelResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
+internal sealed partial class InferTrainedModelResponseConverter : System.Text.Json.Serialization.JsonConverter<InferTrainedModelResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropInferenceResults = System.Text.Json.JsonEncodedText.Encode("inference_results");
+
+	public override InferTrainedModelResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.MachineLearning.InferenceResponseResult>> propInferenceResults = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propInferenceResults.TryRead(ref reader, options, PropInferenceResults))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new InferTrainedModelResponse
+		{
+			InferenceResults = propInferenceResults.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, InferTrainedModelResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropInferenceResults, value.InferenceResults);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(InferTrainedModelResponseConverter))]
 public sealed partial class InferTrainedModelResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("inference_results")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.MachineLearning.InferenceResponseResult> InferenceResults { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/MlInfoResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/MlInfoResponse.g.cs
index 7f86fd9da05..afc5a2f7b77 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/MlInfoResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/MlInfoResponse.g.cs
@@ -18,22 +18,85 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
+internal sealed partial class MlInfoResponseConverter : System.Text.Json.Serialization.JsonConverter<MlInfoResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropDefaults = System.Text.Json.JsonEncodedText.Encode("defaults");
+	private static readonly System.Text.Json.JsonEncodedText PropLimits = System.Text.Json.JsonEncodedText.Encode("limits");
+	private static readonly System.Text.Json.JsonEncodedText PropNativeCode = System.Text.Json.JsonEncodedText.Encode("native_code");
+	private static readonly System.Text.Json.JsonEncodedText PropUpgradeMode = System.Text.Json.JsonEncodedText.Encode("upgrade_mode");
+
+	public override MlInfoResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.MachineLearning.Defaults> propDefaults = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.MachineLearning.Limits> propLimits = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.MachineLearning.NativeCode> propNativeCode = default;
+		LocalJsonProperty<bool> propUpgradeMode = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propDefaults.TryRead(ref reader, options, PropDefaults))
+			{
+				continue;
+			}
+
+			if (propLimits.TryRead(ref reader, options, PropLimits))
+			{
+				continue;
+			}
+
+			if (propNativeCode.TryRead(ref reader, options, PropNativeCode))
+			{
+				continue;
+			}
+
+			if (propUpgradeMode.TryRead(ref reader, options, PropUpgradeMode))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new MlInfoResponse
+		{
+			Defaults = propDefaults.Value
+,
+			Limits = propLimits.Value
+,
+			NativeCode = propNativeCode.Value
+,
+			UpgradeMode = propUpgradeMode.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, MlInfoResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDefaults, value.Defaults);
+		writer.WriteProperty(options, PropLimits, value.Limits);
+		writer.WriteProperty(options, PropNativeCode, value.NativeCode);
+		writer.WriteProperty(options, PropUpgradeMode, value.UpgradeMode);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(MlInfoResponseConverter))]
 public sealed partial class MlInfoResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("defaults")]
 	public Elastic.Clients.Elasticsearch.MachineLearning.Defaults Defaults { get; init; }
-	[JsonInclude, JsonPropertyName("limits")]
 	public Elastic.Clients.Elasticsearch.MachineLearning.Limits Limits { get; init; }
-	[JsonInclude, JsonPropertyName("native_code")]
 	public Elastic.Clients.Elasticsearch.MachineLearning.NativeCode NativeCode { get; init; }
-	[JsonInclude, JsonPropertyName("upgrade_mode")]
 	public bool UpgradeMode { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/OpenJobResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/OpenJobResponse.g.cs
index af8427ee8e5..c796646fccd 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/OpenJobResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/OpenJobResponse.g.cs
@@ -18,14 +18,61 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
+internal sealed partial class OpenJobResponseConverter : System.Text.Json.Serialization.JsonConverter<OpenJobResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropNode = System.Text.Json.JsonEncodedText.Encode("node");
+	private static readonly System.Text.Json.JsonEncodedText PropOpened = System.Text.Json.JsonEncodedText.Encode("opened");
+
+	public override OpenJobResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propNode = default;
+		LocalJsonProperty<bool> propOpened = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propNode.TryRead(ref reader, options, PropNode))
+			{
+				continue;
+			}
+
+			if (propOpened.TryRead(ref reader, options, PropOpened))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new OpenJobResponse
+		{
+			Node = propNode.Value
+,
+			Opened = propOpened.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, OpenJobResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropNode, value.Node);
+		writer.WriteProperty(options, PropOpened, value.Opened);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(OpenJobResponseConverter))]
 public sealed partial class OpenJobResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -34,8 +81,6 @@ public sealed partial class OpenJobResponse : ElasticsearchResponse
 	/// If the job is allowed to open lazily and has not yet been assigned to a node, this value is an empty string.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("node")]
 	public string Node { get; init; }
-	[JsonInclude, JsonPropertyName("opened")]
 	public bool Opened { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/PostCalendarEventsResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/PostCalendarEventsResponse.g.cs
index e8742653958..5334a5a458e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/PostCalendarEventsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/PostCalendarEventsResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
+internal sealed partial class PostCalendarEventsResponseConverter : System.Text.Json.Serialization.JsonConverter<PostCalendarEventsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropEvents = System.Text.Json.JsonEncodedText.Encode("events");
+
+	public override PostCalendarEventsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.MachineLearning.CalendarEvent>> propEvents = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propEvents.TryRead(ref reader, options, PropEvents))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PostCalendarEventsResponse
+		{
+			Events = propEvents.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PostCalendarEventsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropEvents, value.Events);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PostCalendarEventsResponseConverter))]
 public sealed partial class PostCalendarEventsResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("events")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.MachineLearning.CalendarEvent> Events { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/PreviewDataFrameAnalyticsResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/PreviewDataFrameAnalyticsResponse.g.cs
index 3247772bece..bef3c5ec17e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/PreviewDataFrameAnalyticsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/PreviewDataFrameAnalyticsResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
+internal sealed partial class PreviewDataFrameAnalyticsResponseConverter : System.Text.Json.Serialization.JsonConverter<PreviewDataFrameAnalyticsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropFeatureValues = System.Text.Json.JsonEncodedText.Encode("feature_values");
+
+	public override PreviewDataFrameAnalyticsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<IReadOnlyDictionary<string, string>>> propFeatureValues = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propFeatureValues.TryRead(ref reader, options, PropFeatureValues))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PreviewDataFrameAnalyticsResponse
+		{
+			FeatureValues = propFeatureValues.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PreviewDataFrameAnalyticsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropFeatureValues, value.FeatureValues);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PreviewDataFrameAnalyticsResponseConverter))]
 public sealed partial class PreviewDataFrameAnalyticsResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class PreviewDataFrameAnalyticsResponse : ElasticsearchRes
 	/// An array of objects that contain feature name and value pairs. The features have been processed and indicate what will be sent to the model for training.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("feature_values")]
 	public IReadOnlyCollection<IReadOnlyDictionary<string, string>> FeatureValues { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/PutCalendarJobResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/PutCalendarJobResponse.g.cs
index 6c5d6e9ec7c..6719a06f7ca 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/PutCalendarJobResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/PutCalendarJobResponse.g.cs
@@ -18,14 +18,71 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
+internal sealed partial class PutCalendarJobResponseConverter : System.Text.Json.Serialization.JsonConverter<PutCalendarJobResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCalendarId = System.Text.Json.JsonEncodedText.Encode("calendar_id");
+	private static readonly System.Text.Json.JsonEncodedText PropDescription = System.Text.Json.JsonEncodedText.Encode("description");
+	private static readonly System.Text.Json.JsonEncodedText PropJobIds = System.Text.Json.JsonEncodedText.Encode("job_ids");
+
+	public override PutCalendarJobResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propCalendarId = default;
+		LocalJsonProperty<string?> propDescription = default;
+		LocalJsonProperty<IReadOnlyCollection<string>> propJobIds = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCalendarId.TryRead(ref reader, options, PropCalendarId))
+			{
+				continue;
+			}
+
+			if (propDescription.TryRead(ref reader, options, PropDescription))
+			{
+				continue;
+			}
+
+			if (propJobIds.TryRead(ref reader, options, PropJobIds, typeof(SingleOrManyMarker<IReadOnlyCollection<string>, string>)))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutCalendarJobResponse
+		{
+			CalendarId = propCalendarId.Value
+,
+			Description = propDescription.Value
+,
+			JobIds = propJobIds.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutCalendarJobResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCalendarId, value.CalendarId);
+		writer.WriteProperty(options, PropDescription, value.Description);
+		writer.WriteProperty(options, PropJobIds, value.JobIds, typeof(SingleOrManyMarker<IReadOnlyCollection<string>, string>));
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PutCalendarJobResponseConverter))]
 public sealed partial class PutCalendarJobResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,7 +90,6 @@ public sealed partial class PutCalendarJobResponse : ElasticsearchResponse
 	/// A string that uniquely identifies a calendar.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("calendar_id")]
 	public string CalendarId { get; init; }
 
 	/// <summary>
@@ -41,7 +97,6 @@ public sealed partial class PutCalendarJobResponse : ElasticsearchResponse
 	/// A description of the calendar.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("description")]
 	public string? Description { get; init; }
 
 	/// <summary>
@@ -49,7 +104,5 @@ public sealed partial class PutCalendarJobResponse : ElasticsearchResponse
 	/// A list of anomaly detection job identifiers or group names.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("job_ids")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public IReadOnlyCollection<string> JobIds { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/PutCalendarResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/PutCalendarResponse.g.cs
index 191a67ad6f5..08d75319938 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/PutCalendarResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/PutCalendarResponse.g.cs
@@ -18,14 +18,71 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
+internal sealed partial class PutCalendarResponseConverter : System.Text.Json.Serialization.JsonConverter<PutCalendarResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCalendarId = System.Text.Json.JsonEncodedText.Encode("calendar_id");
+	private static readonly System.Text.Json.JsonEncodedText PropDescription = System.Text.Json.JsonEncodedText.Encode("description");
+	private static readonly System.Text.Json.JsonEncodedText PropJobIds = System.Text.Json.JsonEncodedText.Encode("job_ids");
+
+	public override PutCalendarResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propCalendarId = default;
+		LocalJsonProperty<string?> propDescription = default;
+		LocalJsonProperty<IReadOnlyCollection<string>> propJobIds = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCalendarId.TryRead(ref reader, options, PropCalendarId))
+			{
+				continue;
+			}
+
+			if (propDescription.TryRead(ref reader, options, PropDescription))
+			{
+				continue;
+			}
+
+			if (propJobIds.TryRead(ref reader, options, PropJobIds, typeof(SingleOrManyMarker<IReadOnlyCollection<string>, string>)))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutCalendarResponse
+		{
+			CalendarId = propCalendarId.Value
+,
+			Description = propDescription.Value
+,
+			JobIds = propJobIds.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutCalendarResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCalendarId, value.CalendarId);
+		writer.WriteProperty(options, PropDescription, value.Description);
+		writer.WriteProperty(options, PropJobIds, value.JobIds, typeof(SingleOrManyMarker<IReadOnlyCollection<string>, string>));
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PutCalendarResponseConverter))]
 public sealed partial class PutCalendarResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,7 +90,6 @@ public sealed partial class PutCalendarResponse : ElasticsearchResponse
 	/// A string that uniquely identifies a calendar.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("calendar_id")]
 	public string CalendarId { get; init; }
 
 	/// <summary>
@@ -41,7 +97,6 @@ public sealed partial class PutCalendarResponse : ElasticsearchResponse
 	/// A description of the calendar.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("description")]
 	public string? Description { get; init; }
 
 	/// <summary>
@@ -49,7 +104,5 @@ public sealed partial class PutCalendarResponse : ElasticsearchResponse
 	/// A list of anomaly detection job identifiers or group names.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("job_ids")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public IReadOnlyCollection<string> JobIds { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/PutDataFrameAnalyticsResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/PutDataFrameAnalyticsResponse.g.cs
index f09a4e42769..ecd5d4543de 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/PutDataFrameAnalyticsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/PutDataFrameAnalyticsResponse.g.cs
@@ -18,40 +18,184 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
+internal sealed partial class PutDataFrameAnalyticsResponseConverter : System.Text.Json.Serialization.JsonConverter<PutDataFrameAnalyticsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAllowLazyStart = System.Text.Json.JsonEncodedText.Encode("allow_lazy_start");
+	private static readonly System.Text.Json.JsonEncodedText PropAnalysis = System.Text.Json.JsonEncodedText.Encode("analysis");
+	private static readonly System.Text.Json.JsonEncodedText PropAnalyzedFields = System.Text.Json.JsonEncodedText.Encode("analyzed_fields");
+	private static readonly System.Text.Json.JsonEncodedText PropAuthorization = System.Text.Json.JsonEncodedText.Encode("authorization");
+	private static readonly System.Text.Json.JsonEncodedText PropCreateTime = System.Text.Json.JsonEncodedText.Encode("create_time");
+	private static readonly System.Text.Json.JsonEncodedText PropDescription = System.Text.Json.JsonEncodedText.Encode("description");
+	private static readonly System.Text.Json.JsonEncodedText PropDest = System.Text.Json.JsonEncodedText.Encode("dest");
+	private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("id");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxNumThreads = System.Text.Json.JsonEncodedText.Encode("max_num_threads");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("_meta");
+	private static readonly System.Text.Json.JsonEncodedText PropModelMemoryLimit = System.Text.Json.JsonEncodedText.Encode("model_memory_limit");
+	private static readonly System.Text.Json.JsonEncodedText PropSource = System.Text.Json.JsonEncodedText.Encode("source");
+	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("version");
+
+	public override PutDataFrameAnalyticsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAllowLazyStart = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.MachineLearning.DataframeAnalysis> propAnalysis = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.MachineLearning.DataframeAnalysisAnalyzedFields?> propAnalyzedFields = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.MachineLearning.DataframeAnalyticsAuthorization?> propAuthorization = default;
+		LocalJsonProperty<long> propCreateTime = default;
+		LocalJsonProperty<string?> propDescription = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.MachineLearning.DataframeAnalyticsDestination> propDest = default;
+		LocalJsonProperty<string> propId = default;
+		LocalJsonProperty<int> propMaxNumThreads = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, object>?> propMeta = default;
+		LocalJsonProperty<string> propModelMemoryLimit = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.MachineLearning.DataframeAnalyticsSource> propSource = default;
+		LocalJsonProperty<string> propVersion = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAllowLazyStart.TryRead(ref reader, options, PropAllowLazyStart))
+			{
+				continue;
+			}
+
+			if (propAnalysis.TryRead(ref reader, options, PropAnalysis))
+			{
+				continue;
+			}
+
+			if (propAnalyzedFields.TryRead(ref reader, options, PropAnalyzedFields))
+			{
+				continue;
+			}
+
+			if (propAuthorization.TryRead(ref reader, options, PropAuthorization))
+			{
+				continue;
+			}
+
+			if (propCreateTime.TryRead(ref reader, options, PropCreateTime))
+			{
+				continue;
+			}
+
+			if (propDescription.TryRead(ref reader, options, PropDescription))
+			{
+				continue;
+			}
+
+			if (propDest.TryRead(ref reader, options, PropDest))
+			{
+				continue;
+			}
+
+			if (propId.TryRead(ref reader, options, PropId))
+			{
+				continue;
+			}
+
+			if (propMaxNumThreads.TryRead(ref reader, options, PropMaxNumThreads))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propModelMemoryLimit.TryRead(ref reader, options, PropModelMemoryLimit))
+			{
+				continue;
+			}
+
+			if (propSource.TryRead(ref reader, options, PropSource))
+			{
+				continue;
+			}
+
+			if (propVersion.TryRead(ref reader, options, PropVersion))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutDataFrameAnalyticsResponse
+		{
+			AllowLazyStart = propAllowLazyStart.Value
+,
+			Analysis = propAnalysis.Value
+,
+			AnalyzedFields = propAnalyzedFields.Value
+,
+			Authorization = propAuthorization.Value
+,
+			CreateTime = propCreateTime.Value
+,
+			Description = propDescription.Value
+,
+			Dest = propDest.Value
+,
+			Id = propId.Value
+,
+			MaxNumThreads = propMaxNumThreads.Value
+,
+			Meta = propMeta.Value
+,
+			ModelMemoryLimit = propModelMemoryLimit.Value
+,
+			Source = propSource.Value
+,
+			Version = propVersion.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutDataFrameAnalyticsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAllowLazyStart, value.AllowLazyStart);
+		writer.WriteProperty(options, PropAnalysis, value.Analysis);
+		writer.WriteProperty(options, PropAnalyzedFields, value.AnalyzedFields);
+		writer.WriteProperty(options, PropAuthorization, value.Authorization);
+		writer.WriteProperty(options, PropCreateTime, value.CreateTime);
+		writer.WriteProperty(options, PropDescription, value.Description);
+		writer.WriteProperty(options, PropDest, value.Dest);
+		writer.WriteProperty(options, PropId, value.Id);
+		writer.WriteProperty(options, PropMaxNumThreads, value.MaxNumThreads);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropModelMemoryLimit, value.ModelMemoryLimit);
+		writer.WriteProperty(options, PropSource, value.Source);
+		writer.WriteProperty(options, PropVersion, value.Version);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PutDataFrameAnalyticsResponseConverter))]
 public sealed partial class PutDataFrameAnalyticsResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("allow_lazy_start")]
 	public bool AllowLazyStart { get; init; }
-	[JsonInclude, JsonPropertyName("analysis")]
 	public Elastic.Clients.Elasticsearch.MachineLearning.DataframeAnalysis Analysis { get; init; }
-	[JsonInclude, JsonPropertyName("analyzed_fields")]
 	public Elastic.Clients.Elasticsearch.MachineLearning.DataframeAnalysisAnalyzedFields? AnalyzedFields { get; init; }
-	[JsonInclude, JsonPropertyName("authorization")]
 	public Elastic.Clients.Elasticsearch.MachineLearning.DataframeAnalyticsAuthorization? Authorization { get; init; }
-	[JsonInclude, JsonPropertyName("create_time")]
 	public long CreateTime { get; init; }
-	[JsonInclude, JsonPropertyName("description")]
 	public string? Description { get; init; }
-	[JsonInclude, JsonPropertyName("dest")]
 	public Elastic.Clients.Elasticsearch.MachineLearning.DataframeAnalyticsDestination Dest { get; init; }
-	[JsonInclude, JsonPropertyName("id")]
 	public string Id { get; init; }
-	[JsonInclude, JsonPropertyName("max_num_threads")]
 	public int MaxNumThreads { get; init; }
-	[JsonInclude, JsonPropertyName("_meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
-	[JsonInclude, JsonPropertyName("model_memory_limit")]
 	public string ModelMemoryLimit { get; init; }
-	[JsonInclude, JsonPropertyName("source")]
 	public Elastic.Clients.Elasticsearch.MachineLearning.DataframeAnalyticsSource Source { get; init; }
-	[JsonInclude, JsonPropertyName("version")]
 	public string Version { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/PutDatafeedRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/PutDatafeedRequest.g.cs
index 4640697d437..f3085820a25 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/PutDatafeedRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/PutDatafeedRequest.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport;
@@ -56,194 +57,167 @@ public sealed partial class PutDatafeedRequestParameters : RequestParameters
 	public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
 }
 
-internal sealed partial class PutDatafeedRequestConverter : JsonConverter<PutDatafeedRequest>
+internal sealed partial class PutDatafeedRequestConverter : System.Text.Json.Serialization.JsonConverter<PutDatafeedRequest>
 {
-	public override PutDatafeedRequest Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations1 = System.Text.Json.JsonEncodedText.Encode("aggs");
+	private static readonly System.Text.Json.JsonEncodedText PropChunkingConfig = System.Text.Json.JsonEncodedText.Encode("chunking_config");
+	private static readonly System.Text.Json.JsonEncodedText PropDelayedDataCheckConfig = System.Text.Json.JsonEncodedText.Encode("delayed_data_check_config");
+	private static readonly System.Text.Json.JsonEncodedText PropFrequency = System.Text.Json.JsonEncodedText.Encode("frequency");
+	private static readonly System.Text.Json.JsonEncodedText PropHeaders = System.Text.Json.JsonEncodedText.Encode("headers");
+	private static readonly System.Text.Json.JsonEncodedText PropIndices = System.Text.Json.JsonEncodedText.Encode("indices");
+	private static readonly System.Text.Json.JsonEncodedText PropIndices1 = System.Text.Json.JsonEncodedText.Encode("indexes");
+	private static readonly System.Text.Json.JsonEncodedText PropIndicesOptions = System.Text.Json.JsonEncodedText.Encode("indices_options");
+	private static readonly System.Text.Json.JsonEncodedText PropJobId = System.Text.Json.JsonEncodedText.Encode("job_id");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxEmptySearches = System.Text.Json.JsonEncodedText.Encode("max_empty_searches");
+	private static readonly System.Text.Json.JsonEncodedText PropQuery = System.Text.Json.JsonEncodedText.Encode("query");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryDelay = System.Text.Json.JsonEncodedText.Encode("query_delay");
+	private static readonly System.Text.Json.JsonEncodedText PropRuntimeMappings = System.Text.Json.JsonEncodedText.Encode("runtime_mappings");
+	private static readonly System.Text.Json.JsonEncodedText PropScriptFields = System.Text.Json.JsonEncodedText.Encode("script_fields");
+	private static readonly System.Text.Json.JsonEncodedText PropScrollSize = System.Text.Json.JsonEncodedText.Encode("scroll_size");
+
+	public override PutDatafeedRequest Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		var variant = new PutDatafeedRequest();
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IDictionary<string, Elastic.Clients.Elasticsearch.Aggregations.Aggregation>?> propAggregations = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.MachineLearning.ChunkingConfig?> propChunkingConfig = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.MachineLearning.DelayedDataCheckConfig?> propDelayedDataCheckConfig = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Duration?> propFrequency = default;
+		LocalJsonProperty<IDictionary<string, Union<string, ICollection<string>>>?> propHeaders = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Indices?> propIndices = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.IndicesOptions?> propIndicesOptions = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Id?> propJobId = default;
+		LocalJsonProperty<int?> propMaxEmptySearches = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.QueryDsl.Query?> propQuery = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Duration?> propQueryDelay = default;
+		LocalJsonProperty<IDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>?> propRuntimeMappings = default;
+		LocalJsonProperty<IDictionary<string, Elastic.Clients.Elasticsearch.ScriptField>?> propScriptFields = default;
+		LocalJsonProperty<int?> propScrollSize = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propAggregations.TryRead(ref reader, options, PropAggregations) || propAggregations.TryRead(ref reader, options, PropAggregations1))
 			{
-				var property = reader.GetString();
-				if (property == "aggregations" || property == "aggs")
-				{
-					variant.Aggregations = JsonSerializer.Deserialize<IDictionary<string, Elastic.Clients.Elasticsearch.Aggregations.Aggregation>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "chunking_config")
-				{
-					variant.ChunkingConfig = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.MachineLearning.ChunkingConfig?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "delayed_data_check_config")
-				{
-					variant.DelayedDataCheckConfig = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.MachineLearning.DelayedDataCheckConfig?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "frequency")
-				{
-					variant.Frequency = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Duration?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "headers")
-				{
-					variant.Headers = JsonSerializer.Deserialize<IDictionary<string, Union<string, ICollection<string>>>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "indices" || property == "indexes")
-				{
-					variant.Indices = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Indices?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "indices_options")
-				{
-					variant.IndicesOptions = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.IndicesOptions?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "job_id")
-				{
-					variant.JobId = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Id?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "max_empty_searches")
-				{
-					variant.MaxEmptySearches = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "query")
-				{
-					variant.Query = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.Query?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "query_delay")
-				{
-					variant.QueryDelay = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Duration?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "runtime_mappings")
-				{
-					variant.RuntimeMappings = JsonSerializer.Deserialize<IDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "script_fields")
-				{
-					variant.ScriptFields = JsonSerializer.Deserialize<IDictionary<string, Elastic.Clients.Elasticsearch.ScriptField>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "scroll_size")
-				{
-					variant.ScrollSize = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
+				continue;
 			}
-		}
 
-		return variant;
-	}
+			if (propChunkingConfig.TryRead(ref reader, options, PropChunkingConfig))
+			{
+				continue;
+			}
 
-	public override void Write(Utf8JsonWriter writer, PutDatafeedRequest value, JsonSerializerOptions options)
-	{
-		writer.WriteStartObject();
-		if (value.Aggregations is not null)
-		{
-			writer.WritePropertyName("aggregations");
-			JsonSerializer.Serialize(writer, value.Aggregations, options);
-		}
+			if (propDelayedDataCheckConfig.TryRead(ref reader, options, PropDelayedDataCheckConfig))
+			{
+				continue;
+			}
 
-		if (value.ChunkingConfig is not null)
-		{
-			writer.WritePropertyName("chunking_config");
-			JsonSerializer.Serialize(writer, value.ChunkingConfig, options);
-		}
+			if (propFrequency.TryRead(ref reader, options, PropFrequency))
+			{
+				continue;
+			}
 
-		if (value.DelayedDataCheckConfig is not null)
-		{
-			writer.WritePropertyName("delayed_data_check_config");
-			JsonSerializer.Serialize(writer, value.DelayedDataCheckConfig, options);
-		}
+			if (propHeaders.TryRead(ref reader, options, PropHeaders))
+			{
+				continue;
+			}
 
-		if (value.Frequency is not null)
-		{
-			writer.WritePropertyName("frequency");
-			JsonSerializer.Serialize(writer, value.Frequency, options);
-		}
+			if (propIndices.TryRead(ref reader, options, PropIndices) || propIndices.TryRead(ref reader, options, PropIndices1))
+			{
+				continue;
+			}
 
-		if (value.Headers is not null)
-		{
-			writer.WritePropertyName("headers");
-			JsonSerializer.Serialize(writer, value.Headers, options);
-		}
+			if (propIndicesOptions.TryRead(ref reader, options, PropIndicesOptions))
+			{
+				continue;
+			}
 
-		if (value.Indices is not null)
-		{
-			writer.WritePropertyName("indices");
-			JsonSerializer.Serialize(writer, value.Indices, options);
-		}
+			if (propJobId.TryRead(ref reader, options, PropJobId))
+			{
+				continue;
+			}
 
-		if (value.IndicesOptions is not null)
-		{
-			writer.WritePropertyName("indices_options");
-			JsonSerializer.Serialize(writer, value.IndicesOptions, options);
-		}
+			if (propMaxEmptySearches.TryRead(ref reader, options, PropMaxEmptySearches))
+			{
+				continue;
+			}
 
-		if (value.JobId is not null)
-		{
-			writer.WritePropertyName("job_id");
-			JsonSerializer.Serialize(writer, value.JobId, options);
-		}
+			if (propQuery.TryRead(ref reader, options, PropQuery))
+			{
+				continue;
+			}
 
-		if (value.MaxEmptySearches.HasValue)
-		{
-			writer.WritePropertyName("max_empty_searches");
-			writer.WriteNumberValue(value.MaxEmptySearches.Value);
-		}
+			if (propQueryDelay.TryRead(ref reader, options, PropQueryDelay))
+			{
+				continue;
+			}
 
-		if (value.Query is not null)
-		{
-			writer.WritePropertyName("query");
-			JsonSerializer.Serialize(writer, value.Query, options);
-		}
+			if (propRuntimeMappings.TryRead(ref reader, options, PropRuntimeMappings))
+			{
+				continue;
+			}
 
-		if (value.QueryDelay is not null)
-		{
-			writer.WritePropertyName("query_delay");
-			JsonSerializer.Serialize(writer, value.QueryDelay, options);
-		}
+			if (propScriptFields.TryRead(ref reader, options, PropScriptFields))
+			{
+				continue;
+			}
 
-		if (value.RuntimeMappings is not null)
-		{
-			writer.WritePropertyName("runtime_mappings");
-			JsonSerializer.Serialize(writer, value.RuntimeMappings, options);
-		}
+			if (propScrollSize.TryRead(ref reader, options, PropScrollSize))
+			{
+				continue;
+			}
 
-		if (value.ScriptFields is not null)
-		{
-			writer.WritePropertyName("script_fields");
-			JsonSerializer.Serialize(writer, value.ScriptFields, options);
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		if (value.ScrollSize.HasValue)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutDatafeedRequest
 		{
-			writer.WritePropertyName("scroll_size");
-			writer.WriteNumberValue(value.ScrollSize.Value);
-		}
+			Aggregations = propAggregations.Value
+	,
+			ChunkingConfig = propChunkingConfig.Value
+	,
+			DelayedDataCheckConfig = propDelayedDataCheckConfig.Value
+	,
+			Frequency = propFrequency.Value
+	,
+			Headers = propHeaders.Value
+	,
+			Indices = propIndices.Value
+	,
+			IndicesOptions = propIndicesOptions.Value
+	,
+			JobId = propJobId.Value
+	,
+			MaxEmptySearches = propMaxEmptySearches.Value
+	,
+			Query = propQuery.Value
+	,
+			QueryDelay = propQueryDelay.Value
+	,
+			RuntimeMappings = propRuntimeMappings.Value
+	,
+			ScriptFields = propScriptFields.Value
+	,
+			ScrollSize = propScrollSize.Value
+		};
+	}
 
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutDatafeedRequest value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAggregations, value.Aggregations);
+		writer.WriteProperty(options, PropChunkingConfig, value.ChunkingConfig);
+		writer.WriteProperty(options, PropDelayedDataCheckConfig, value.DelayedDataCheckConfig);
+		writer.WriteProperty(options, PropFrequency, value.Frequency);
+		writer.WriteProperty(options, PropHeaders, value.Headers);
+		writer.WriteProperty(options, PropIndices, value.Indices);
+		writer.WriteProperty(options, PropIndicesOptions, value.IndicesOptions);
+		writer.WriteProperty(options, PropJobId, value.JobId);
+		writer.WriteProperty(options, PropMaxEmptySearches, value.MaxEmptySearches);
+		writer.WriteProperty(options, PropQuery, value.Query);
+		writer.WriteProperty(options, PropQueryDelay, value.QueryDelay);
+		writer.WriteProperty(options, PropRuntimeMappings, value.RuntimeMappings);
+		writer.WriteProperty(options, PropScriptFields, value.ScriptFields);
+		writer.WriteProperty(options, PropScrollSize, value.ScrollSize);
 		writer.WriteEndObject();
 	}
 }
@@ -289,7 +263,6 @@ public PutDatafeedRequest()
 	/// string or when no indices are specified.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public bool? AllowNoIndices { get => Q<bool?>("allow_no_indices"); set => Q("allow_no_indices", value); }
 
 	/// <summary>
@@ -298,7 +271,6 @@ public PutDatafeedRequest()
 	/// whether wildcard expressions match hidden data streams. Supports comma-separated values.
 	/// </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>
@@ -306,7 +278,6 @@ public PutDatafeedRequest()
 	/// If true, unavailable indices (missing or closed) are ignored.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
 
 	/// <summary>
@@ -315,7 +286,6 @@ public PutDatafeedRequest()
 	/// Support for aggregations is limited and should be used only with low cardinality data.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("aggregations")]
 	public IDictionary<string, Elastic.Clients.Elasticsearch.Aggregations.Aggregation>? Aggregations { get; set; }
 
 	/// <summary>
@@ -326,7 +296,6 @@ public PutDatafeedRequest()
 	/// it is an advanced configuration option.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("chunking_config")]
 	public Elastic.Clients.Elasticsearch.MachineLearning.ChunkingConfig? ChunkingConfig { get; set; }
 
 	/// <summary>
@@ -338,7 +307,6 @@ public PutDatafeedRequest()
 	/// This check runs only on real-time datafeeds.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("delayed_data_check_config")]
 	public Elastic.Clients.Elasticsearch.MachineLearning.DelayedDataCheckConfig? DelayedDataCheckConfig { get; set; }
 
 	/// <summary>
@@ -350,9 +318,7 @@ public PutDatafeedRequest()
 	/// aggregations, this value must be divisible by the interval of the date histogram aggregation.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("frequency")]
 	public Elastic.Clients.Elasticsearch.Duration? Frequency { get; set; }
-	[JsonInclude, JsonPropertyName("headers")]
 	public IDictionary<string, Union<string, ICollection<string>>>? Headers { get; set; }
 
 	/// <summary>
@@ -361,7 +327,6 @@ public PutDatafeedRequest()
 	/// learning nodes must have the <c>remote_cluster_client</c> role.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("indices")]
 	public Elastic.Clients.Elasticsearch.Indices? Indices { get; set; }
 
 	/// <summary>
@@ -369,7 +334,6 @@ public PutDatafeedRequest()
 	/// Specifies index expansion options that are used during search
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("indices_options")]
 	public Elastic.Clients.Elasticsearch.IndicesOptions? IndicesOptions { get; set; }
 
 	/// <summary>
@@ -377,7 +341,6 @@ public PutDatafeedRequest()
 	/// Identifier for the anomaly detection job.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("job_id")]
 	public Elastic.Clients.Elasticsearch.Id? JobId { get; set; }
 
 	/// <summary>
@@ -388,7 +351,6 @@ public PutDatafeedRequest()
 	/// end time that sees no data remains started until it is explicitly stopped. By default, it is not set.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("max_empty_searches")]
 	public int? MaxEmptySearches { get; set; }
 
 	/// <summary>
@@ -398,7 +360,6 @@ public PutDatafeedRequest()
 	/// object is passed verbatim to Elasticsearch.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("query")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.Query? Query { get; set; }
 
 	/// <summary>
@@ -409,7 +370,6 @@ public PutDatafeedRequest()
 	/// when there are multiple jobs running on the same node.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("query_delay")]
 	public Elastic.Clients.Elasticsearch.Duration? QueryDelay { get; set; }
 
 	/// <summary>
@@ -417,7 +377,6 @@ public PutDatafeedRequest()
 	/// Specifies runtime fields for the datafeed search.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("runtime_mappings")]
 	public IDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>? RuntimeMappings { get; set; }
 
 	/// <summary>
@@ -426,7 +385,6 @@ public PutDatafeedRequest()
 	/// The detector configuration objects in a job can contain functions that use these script fields.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("script_fields")]
 	public IDictionary<string, Elastic.Clients.Elasticsearch.ScriptField>? ScriptFields { get; set; }
 
 	/// <summary>
@@ -435,7 +393,6 @@ public PutDatafeedRequest()
 	/// The maximum value is the value of <c>index.max_result_window</c>, which is 10,000 by default.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("scroll_size")]
 	public int? ScrollSize { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/PutDatafeedResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/PutDatafeedResponse.g.cs
index 0a02dd03b3c..fdc910c8e13 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/PutDatafeedResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/PutDatafeedResponse.g.cs
@@ -18,44 +18,206 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
+internal sealed partial class PutDatafeedResponseConverter : System.Text.Json.Serialization.JsonConverter<PutDatafeedResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropAuthorization = System.Text.Json.JsonEncodedText.Encode("authorization");
+	private static readonly System.Text.Json.JsonEncodedText PropChunkingConfig = System.Text.Json.JsonEncodedText.Encode("chunking_config");
+	private static readonly System.Text.Json.JsonEncodedText PropDatafeedId = System.Text.Json.JsonEncodedText.Encode("datafeed_id");
+	private static readonly System.Text.Json.JsonEncodedText PropDelayedDataCheckConfig = System.Text.Json.JsonEncodedText.Encode("delayed_data_check_config");
+	private static readonly System.Text.Json.JsonEncodedText PropFrequency = System.Text.Json.JsonEncodedText.Encode("frequency");
+	private static readonly System.Text.Json.JsonEncodedText PropIndices = System.Text.Json.JsonEncodedText.Encode("indices");
+	private static readonly System.Text.Json.JsonEncodedText PropIndicesOptions = System.Text.Json.JsonEncodedText.Encode("indices_options");
+	private static readonly System.Text.Json.JsonEncodedText PropJobId = System.Text.Json.JsonEncodedText.Encode("job_id");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxEmptySearches = System.Text.Json.JsonEncodedText.Encode("max_empty_searches");
+	private static readonly System.Text.Json.JsonEncodedText PropQuery = System.Text.Json.JsonEncodedText.Encode("query");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryDelay = System.Text.Json.JsonEncodedText.Encode("query_delay");
+	private static readonly System.Text.Json.JsonEncodedText PropRuntimeMappings = System.Text.Json.JsonEncodedText.Encode("runtime_mappings");
+	private static readonly System.Text.Json.JsonEncodedText PropScriptFields = System.Text.Json.JsonEncodedText.Encode("script_fields");
+	private static readonly System.Text.Json.JsonEncodedText PropScrollSize = System.Text.Json.JsonEncodedText.Encode("scroll_size");
+
+	public override PutDatafeedResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Aggregations.Aggregation>?> propAggregations = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.MachineLearning.DatafeedAuthorization?> propAuthorization = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.MachineLearning.ChunkingConfig> propChunkingConfig = default;
+		LocalJsonProperty<string> propDatafeedId = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.MachineLearning.DelayedDataCheckConfig?> propDelayedDataCheckConfig = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Duration?> propFrequency = default;
+		LocalJsonProperty<IReadOnlyCollection<string>> propIndices = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.IndicesOptions?> propIndicesOptions = default;
+		LocalJsonProperty<string> propJobId = default;
+		LocalJsonProperty<int?> propMaxEmptySearches = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.QueryDsl.Query> propQuery = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Duration> propQueryDelay = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>?> propRuntimeMappings = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.ScriptField>?> propScriptFields = default;
+		LocalJsonProperty<int> propScrollSize = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAggregations.TryRead(ref reader, options, PropAggregations))
+			{
+				continue;
+			}
+
+			if (propAuthorization.TryRead(ref reader, options, PropAuthorization))
+			{
+				continue;
+			}
+
+			if (propChunkingConfig.TryRead(ref reader, options, PropChunkingConfig))
+			{
+				continue;
+			}
+
+			if (propDatafeedId.TryRead(ref reader, options, PropDatafeedId))
+			{
+				continue;
+			}
+
+			if (propDelayedDataCheckConfig.TryRead(ref reader, options, PropDelayedDataCheckConfig))
+			{
+				continue;
+			}
+
+			if (propFrequency.TryRead(ref reader, options, PropFrequency))
+			{
+				continue;
+			}
+
+			if (propIndices.TryRead(ref reader, options, PropIndices))
+			{
+				continue;
+			}
+
+			if (propIndicesOptions.TryRead(ref reader, options, PropIndicesOptions))
+			{
+				continue;
+			}
+
+			if (propJobId.TryRead(ref reader, options, PropJobId))
+			{
+				continue;
+			}
+
+			if (propMaxEmptySearches.TryRead(ref reader, options, PropMaxEmptySearches))
+			{
+				continue;
+			}
+
+			if (propQuery.TryRead(ref reader, options, PropQuery))
+			{
+				continue;
+			}
+
+			if (propQueryDelay.TryRead(ref reader, options, PropQueryDelay))
+			{
+				continue;
+			}
+
+			if (propRuntimeMappings.TryRead(ref reader, options, PropRuntimeMappings))
+			{
+				continue;
+			}
+
+			if (propScriptFields.TryRead(ref reader, options, PropScriptFields))
+			{
+				continue;
+			}
+
+			if (propScrollSize.TryRead(ref reader, options, PropScrollSize))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutDatafeedResponse
+		{
+			Aggregations = propAggregations.Value
+,
+			Authorization = propAuthorization.Value
+,
+			ChunkingConfig = propChunkingConfig.Value
+,
+			DatafeedId = propDatafeedId.Value
+,
+			DelayedDataCheckConfig = propDelayedDataCheckConfig.Value
+,
+			Frequency = propFrequency.Value
+,
+			Indices = propIndices.Value
+,
+			IndicesOptions = propIndicesOptions.Value
+,
+			JobId = propJobId.Value
+,
+			MaxEmptySearches = propMaxEmptySearches.Value
+,
+			Query = propQuery.Value
+,
+			QueryDelay = propQueryDelay.Value
+,
+			RuntimeMappings = propRuntimeMappings.Value
+,
+			ScriptFields = propScriptFields.Value
+,
+			ScrollSize = propScrollSize.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutDatafeedResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAggregations, value.Aggregations);
+		writer.WriteProperty(options, PropAuthorization, value.Authorization);
+		writer.WriteProperty(options, PropChunkingConfig, value.ChunkingConfig);
+		writer.WriteProperty(options, PropDatafeedId, value.DatafeedId);
+		writer.WriteProperty(options, PropDelayedDataCheckConfig, value.DelayedDataCheckConfig);
+		writer.WriteProperty(options, PropFrequency, value.Frequency);
+		writer.WriteProperty(options, PropIndices, value.Indices);
+		writer.WriteProperty(options, PropIndicesOptions, value.IndicesOptions);
+		writer.WriteProperty(options, PropJobId, value.JobId);
+		writer.WriteProperty(options, PropMaxEmptySearches, value.MaxEmptySearches);
+		writer.WriteProperty(options, PropQuery, value.Query);
+		writer.WriteProperty(options, PropQueryDelay, value.QueryDelay);
+		writer.WriteProperty(options, PropRuntimeMappings, value.RuntimeMappings);
+		writer.WriteProperty(options, PropScriptFields, value.ScriptFields);
+		writer.WriteProperty(options, PropScrollSize, value.ScrollSize);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PutDatafeedResponseConverter))]
 public sealed partial class PutDatafeedResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("aggregations")]
 	public IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Aggregations.Aggregation>? Aggregations { get; init; }
-	[JsonInclude, JsonPropertyName("authorization")]
 	public Elastic.Clients.Elasticsearch.MachineLearning.DatafeedAuthorization? Authorization { get; init; }
-	[JsonInclude, JsonPropertyName("chunking_config")]
 	public Elastic.Clients.Elasticsearch.MachineLearning.ChunkingConfig ChunkingConfig { get; init; }
-	[JsonInclude, JsonPropertyName("datafeed_id")]
 	public string DatafeedId { get; init; }
-	[JsonInclude, JsonPropertyName("delayed_data_check_config")]
 	public Elastic.Clients.Elasticsearch.MachineLearning.DelayedDataCheckConfig? DelayedDataCheckConfig { get; init; }
-	[JsonInclude, JsonPropertyName("frequency")]
 	public Elastic.Clients.Elasticsearch.Duration? Frequency { get; init; }
-	[JsonInclude, JsonPropertyName("indices")]
 	public IReadOnlyCollection<string> Indices { get; init; }
-	[JsonInclude, JsonPropertyName("indices_options")]
 	public Elastic.Clients.Elasticsearch.IndicesOptions? IndicesOptions { get; init; }
-	[JsonInclude, JsonPropertyName("job_id")]
 	public string JobId { get; init; }
-	[JsonInclude, JsonPropertyName("max_empty_searches")]
 	public int? MaxEmptySearches { get; init; }
-	[JsonInclude, JsonPropertyName("query")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.Query Query { get; init; }
-	[JsonInclude, JsonPropertyName("query_delay")]
 	public Elastic.Clients.Elasticsearch.Duration QueryDelay { get; init; }
-	[JsonInclude, JsonPropertyName("runtime_mappings")]
 	public IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>? RuntimeMappings { get; init; }
-	[JsonInclude, JsonPropertyName("script_fields")]
 	public IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.ScriptField>? ScriptFields { get; init; }
-	[JsonInclude, JsonPropertyName("scroll_size")]
 	public int ScrollSize { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/PutFilterResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/PutFilterResponse.g.cs
index 03d0bc4ab06..da5a3cc1056 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/PutFilterResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/PutFilterResponse.g.cs
@@ -18,20 +18,74 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
+internal sealed partial class PutFilterResponseConverter : System.Text.Json.Serialization.JsonConverter<PutFilterResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropDescription = System.Text.Json.JsonEncodedText.Encode("description");
+	private static readonly System.Text.Json.JsonEncodedText PropFilterId = System.Text.Json.JsonEncodedText.Encode("filter_id");
+	private static readonly System.Text.Json.JsonEncodedText PropItems = System.Text.Json.JsonEncodedText.Encode("items");
+
+	public override PutFilterResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propDescription = default;
+		LocalJsonProperty<string> propFilterId = default;
+		LocalJsonProperty<IReadOnlyCollection<string>> propItems = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propDescription.TryRead(ref reader, options, PropDescription))
+			{
+				continue;
+			}
+
+			if (propFilterId.TryRead(ref reader, options, PropFilterId))
+			{
+				continue;
+			}
+
+			if (propItems.TryRead(ref reader, options, PropItems))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutFilterResponse
+		{
+			Description = propDescription.Value
+,
+			FilterId = propFilterId.Value
+,
+			Items = propItems.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutFilterResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDescription, value.Description);
+		writer.WriteProperty(options, PropFilterId, value.FilterId);
+		writer.WriteProperty(options, PropItems, value.Items);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PutFilterResponseConverter))]
 public sealed partial class PutFilterResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("description")]
 	public string Description { get; init; }
-	[JsonInclude, JsonPropertyName("filter_id")]
 	public string FilterId { get; init; }
-	[JsonInclude, JsonPropertyName("items")]
 	public IReadOnlyCollection<string> Items { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/PutJobResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/PutJobResponse.g.cs
index cd8cb1f1ccf..ed37bd96519 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/PutJobResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/PutJobResponse.g.cs
@@ -18,54 +18,261 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
+internal sealed partial class PutJobResponseConverter : System.Text.Json.Serialization.JsonConverter<PutJobResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAllowLazyOpen = System.Text.Json.JsonEncodedText.Encode("allow_lazy_open");
+	private static readonly System.Text.Json.JsonEncodedText PropAnalysisConfig = System.Text.Json.JsonEncodedText.Encode("analysis_config");
+	private static readonly System.Text.Json.JsonEncodedText PropAnalysisLimits = System.Text.Json.JsonEncodedText.Encode("analysis_limits");
+	private static readonly System.Text.Json.JsonEncodedText PropBackgroundPersistInterval = System.Text.Json.JsonEncodedText.Encode("background_persist_interval");
+	private static readonly System.Text.Json.JsonEncodedText PropCreateTime = System.Text.Json.JsonEncodedText.Encode("create_time");
+	private static readonly System.Text.Json.JsonEncodedText PropCustomSettings = System.Text.Json.JsonEncodedText.Encode("custom_settings");
+	private static readonly System.Text.Json.JsonEncodedText PropDailyModelSnapshotRetentionAfterDays = System.Text.Json.JsonEncodedText.Encode("daily_model_snapshot_retention_after_days");
+	private static readonly System.Text.Json.JsonEncodedText PropDataDescription = System.Text.Json.JsonEncodedText.Encode("data_description");
+	private static readonly System.Text.Json.JsonEncodedText PropDatafeedConfig = System.Text.Json.JsonEncodedText.Encode("datafeed_config");
+	private static readonly System.Text.Json.JsonEncodedText PropDescription = System.Text.Json.JsonEncodedText.Encode("description");
+	private static readonly System.Text.Json.JsonEncodedText PropGroups = System.Text.Json.JsonEncodedText.Encode("groups");
+	private static readonly System.Text.Json.JsonEncodedText PropJobId = System.Text.Json.JsonEncodedText.Encode("job_id");
+	private static readonly System.Text.Json.JsonEncodedText PropJobType = System.Text.Json.JsonEncodedText.Encode("job_type");
+	private static readonly System.Text.Json.JsonEncodedText PropJobVersion = System.Text.Json.JsonEncodedText.Encode("job_version");
+	private static readonly System.Text.Json.JsonEncodedText PropModelPlotConfig = System.Text.Json.JsonEncodedText.Encode("model_plot_config");
+	private static readonly System.Text.Json.JsonEncodedText PropModelSnapshotId = System.Text.Json.JsonEncodedText.Encode("model_snapshot_id");
+	private static readonly System.Text.Json.JsonEncodedText PropModelSnapshotRetentionDays = System.Text.Json.JsonEncodedText.Encode("model_snapshot_retention_days");
+	private static readonly System.Text.Json.JsonEncodedText PropRenormalizationWindowDays = System.Text.Json.JsonEncodedText.Encode("renormalization_window_days");
+	private static readonly System.Text.Json.JsonEncodedText PropResultsIndexName = System.Text.Json.JsonEncodedText.Encode("results_index_name");
+	private static readonly System.Text.Json.JsonEncodedText PropResultsRetentionDays = System.Text.Json.JsonEncodedText.Encode("results_retention_days");
+
+	public override PutJobResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAllowLazyOpen = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.MachineLearning.AnalysisConfigRead> propAnalysisConfig = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.MachineLearning.AnalysisLimits> propAnalysisLimits = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Duration?> propBackgroundPersistInterval = default;
+		LocalJsonProperty<DateTimeOffset> propCreateTime = default;
+		LocalJsonProperty<object?> propCustomSettings = default;
+		LocalJsonProperty<long> propDailyModelSnapshotRetentionAfterDays = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.MachineLearning.DataDescription> propDataDescription = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.MachineLearning.Datafeed?> propDatafeedConfig = default;
+		LocalJsonProperty<string?> propDescription = default;
+		LocalJsonProperty<IReadOnlyCollection<string>?> propGroups = default;
+		LocalJsonProperty<string> propJobId = default;
+		LocalJsonProperty<string> propJobType = default;
+		LocalJsonProperty<string> propJobVersion = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.MachineLearning.ModelPlotConfig?> propModelPlotConfig = default;
+		LocalJsonProperty<string?> propModelSnapshotId = default;
+		LocalJsonProperty<long> propModelSnapshotRetentionDays = default;
+		LocalJsonProperty<long?> propRenormalizationWindowDays = default;
+		LocalJsonProperty<string> propResultsIndexName = default;
+		LocalJsonProperty<long?> propResultsRetentionDays = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAllowLazyOpen.TryRead(ref reader, options, PropAllowLazyOpen))
+			{
+				continue;
+			}
+
+			if (propAnalysisConfig.TryRead(ref reader, options, PropAnalysisConfig))
+			{
+				continue;
+			}
+
+			if (propAnalysisLimits.TryRead(ref reader, options, PropAnalysisLimits))
+			{
+				continue;
+			}
+
+			if (propBackgroundPersistInterval.TryRead(ref reader, options, PropBackgroundPersistInterval))
+			{
+				continue;
+			}
+
+			if (propCreateTime.TryRead(ref reader, options, PropCreateTime))
+			{
+				continue;
+			}
+
+			if (propCustomSettings.TryRead(ref reader, options, PropCustomSettings))
+			{
+				continue;
+			}
+
+			if (propDailyModelSnapshotRetentionAfterDays.TryRead(ref reader, options, PropDailyModelSnapshotRetentionAfterDays))
+			{
+				continue;
+			}
+
+			if (propDataDescription.TryRead(ref reader, options, PropDataDescription))
+			{
+				continue;
+			}
+
+			if (propDatafeedConfig.TryRead(ref reader, options, PropDatafeedConfig))
+			{
+				continue;
+			}
+
+			if (propDescription.TryRead(ref reader, options, PropDescription))
+			{
+				continue;
+			}
+
+			if (propGroups.TryRead(ref reader, options, PropGroups))
+			{
+				continue;
+			}
+
+			if (propJobId.TryRead(ref reader, options, PropJobId))
+			{
+				continue;
+			}
+
+			if (propJobType.TryRead(ref reader, options, PropJobType))
+			{
+				continue;
+			}
+
+			if (propJobVersion.TryRead(ref reader, options, PropJobVersion))
+			{
+				continue;
+			}
+
+			if (propModelPlotConfig.TryRead(ref reader, options, PropModelPlotConfig))
+			{
+				continue;
+			}
+
+			if (propModelSnapshotId.TryRead(ref reader, options, PropModelSnapshotId))
+			{
+				continue;
+			}
+
+			if (propModelSnapshotRetentionDays.TryRead(ref reader, options, PropModelSnapshotRetentionDays))
+			{
+				continue;
+			}
+
+			if (propRenormalizationWindowDays.TryRead(ref reader, options, PropRenormalizationWindowDays))
+			{
+				continue;
+			}
+
+			if (propResultsIndexName.TryRead(ref reader, options, PropResultsIndexName))
+			{
+				continue;
+			}
+
+			if (propResultsRetentionDays.TryRead(ref reader, options, PropResultsRetentionDays))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutJobResponse
+		{
+			AllowLazyOpen = propAllowLazyOpen.Value
+,
+			AnalysisConfig = propAnalysisConfig.Value
+,
+			AnalysisLimits = propAnalysisLimits.Value
+,
+			BackgroundPersistInterval = propBackgroundPersistInterval.Value
+,
+			CreateTime = propCreateTime.Value
+,
+			CustomSettings = propCustomSettings.Value
+,
+			DailyModelSnapshotRetentionAfterDays = propDailyModelSnapshotRetentionAfterDays.Value
+,
+			DataDescription = propDataDescription.Value
+,
+			DatafeedConfig = propDatafeedConfig.Value
+,
+			Description = propDescription.Value
+,
+			Groups = propGroups.Value
+,
+			JobId = propJobId.Value
+,
+			JobType = propJobType.Value
+,
+			JobVersion = propJobVersion.Value
+,
+			ModelPlotConfig = propModelPlotConfig.Value
+,
+			ModelSnapshotId = propModelSnapshotId.Value
+,
+			ModelSnapshotRetentionDays = propModelSnapshotRetentionDays.Value
+,
+			RenormalizationWindowDays = propRenormalizationWindowDays.Value
+,
+			ResultsIndexName = propResultsIndexName.Value
+,
+			ResultsRetentionDays = propResultsRetentionDays.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutJobResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAllowLazyOpen, value.AllowLazyOpen);
+		writer.WriteProperty(options, PropAnalysisConfig, value.AnalysisConfig);
+		writer.WriteProperty(options, PropAnalysisLimits, value.AnalysisLimits);
+		writer.WriteProperty(options, PropBackgroundPersistInterval, value.BackgroundPersistInterval);
+		writer.WriteProperty(options, PropCreateTime, value.CreateTime);
+		writer.WriteProperty(options, PropCustomSettings, value.CustomSettings);
+		writer.WriteProperty(options, PropDailyModelSnapshotRetentionAfterDays, value.DailyModelSnapshotRetentionAfterDays);
+		writer.WriteProperty(options, PropDataDescription, value.DataDescription);
+		writer.WriteProperty(options, PropDatafeedConfig, value.DatafeedConfig);
+		writer.WriteProperty(options, PropDescription, value.Description);
+		writer.WriteProperty(options, PropGroups, value.Groups);
+		writer.WriteProperty(options, PropJobId, value.JobId);
+		writer.WriteProperty(options, PropJobType, value.JobType);
+		writer.WriteProperty(options, PropJobVersion, value.JobVersion);
+		writer.WriteProperty(options, PropModelPlotConfig, value.ModelPlotConfig);
+		writer.WriteProperty(options, PropModelSnapshotId, value.ModelSnapshotId);
+		writer.WriteProperty(options, PropModelSnapshotRetentionDays, value.ModelSnapshotRetentionDays);
+		writer.WriteProperty(options, PropRenormalizationWindowDays, value.RenormalizationWindowDays);
+		writer.WriteProperty(options, PropResultsIndexName, value.ResultsIndexName);
+		writer.WriteProperty(options, PropResultsRetentionDays, value.ResultsRetentionDays);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PutJobResponseConverter))]
 public sealed partial class PutJobResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("allow_lazy_open")]
 	public bool AllowLazyOpen { get; init; }
-	[JsonInclude, JsonPropertyName("analysis_config")]
 	public Elastic.Clients.Elasticsearch.MachineLearning.AnalysisConfigRead AnalysisConfig { get; init; }
-	[JsonInclude, JsonPropertyName("analysis_limits")]
 	public Elastic.Clients.Elasticsearch.MachineLearning.AnalysisLimits AnalysisLimits { get; init; }
-	[JsonInclude, JsonPropertyName("background_persist_interval")]
 	public Elastic.Clients.Elasticsearch.Duration? BackgroundPersistInterval { get; init; }
-	[JsonInclude, JsonPropertyName("create_time")]
 	public DateTimeOffset CreateTime { get; init; }
-	[JsonInclude, JsonPropertyName("custom_settings")]
 	public object? CustomSettings { get; init; }
-	[JsonInclude, JsonPropertyName("daily_model_snapshot_retention_after_days")]
 	public long DailyModelSnapshotRetentionAfterDays { get; init; }
-	[JsonInclude, JsonPropertyName("data_description")]
 	public Elastic.Clients.Elasticsearch.MachineLearning.DataDescription DataDescription { get; init; }
-	[JsonInclude, JsonPropertyName("datafeed_config")]
 	public Elastic.Clients.Elasticsearch.MachineLearning.Datafeed? DatafeedConfig { get; init; }
-	[JsonInclude, JsonPropertyName("description")]
 	public string? Description { get; init; }
-	[JsonInclude, JsonPropertyName("groups")]
 	public IReadOnlyCollection<string>? Groups { get; init; }
-	[JsonInclude, JsonPropertyName("job_id")]
 	public string JobId { get; init; }
-	[JsonInclude, JsonPropertyName("job_type")]
 	public string JobType { get; init; }
-	[JsonInclude, JsonPropertyName("job_version")]
 	public string JobVersion { get; init; }
-	[JsonInclude, JsonPropertyName("model_plot_config")]
 	public Elastic.Clients.Elasticsearch.MachineLearning.ModelPlotConfig? ModelPlotConfig { get; init; }
-	[JsonInclude, JsonPropertyName("model_snapshot_id")]
 	public string? ModelSnapshotId { get; init; }
-	[JsonInclude, JsonPropertyName("model_snapshot_retention_days")]
 	public long ModelSnapshotRetentionDays { get; init; }
-	[JsonInclude, JsonPropertyName("renormalization_window_days")]
 	public long? RenormalizationWindowDays { get; init; }
-	[JsonInclude, JsonPropertyName("results_index_name")]
 	public string ResultsIndexName { get; init; }
-	[JsonInclude, JsonPropertyName("results_retention_days")]
 	public long? ResultsRetentionDays { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/PutTrainedModelAliasResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/PutTrainedModelAliasResponse.g.cs
index 0e3e893281e..78717034a4b 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/PutTrainedModelAliasResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/PutTrainedModelAliasResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
+internal sealed partial class PutTrainedModelAliasResponseConverter : System.Text.Json.Serialization.JsonConverter<PutTrainedModelAliasResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override PutTrainedModelAliasResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutTrainedModelAliasResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutTrainedModelAliasResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PutTrainedModelAliasResponseConverter))]
 public sealed partial class PutTrainedModelAliasResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class PutTrainedModelAliasResponse : ElasticsearchResponse
 	/// 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/MachineLearning/PutTrainedModelDefinitionPartResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/PutTrainedModelDefinitionPartResponse.g.cs
index 683d8780c23..5198294413e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/PutTrainedModelDefinitionPartResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/PutTrainedModelDefinitionPartResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
+internal sealed partial class PutTrainedModelDefinitionPartResponseConverter : System.Text.Json.Serialization.JsonConverter<PutTrainedModelDefinitionPartResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override PutTrainedModelDefinitionPartResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutTrainedModelDefinitionPartResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutTrainedModelDefinitionPartResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PutTrainedModelDefinitionPartResponseConverter))]
 public sealed partial class PutTrainedModelDefinitionPartResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class PutTrainedModelDefinitionPartResponse : Elasticsearc
 	/// 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/MachineLearning/PutTrainedModelResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/PutTrainedModelResponse.g.cs
index cb1d77cd15a..1e71281da04 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/PutTrainedModelResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/PutTrainedModelResponse.g.cs
@@ -18,17 +18,243 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
+internal sealed partial class PutTrainedModelResponseConverter : System.Text.Json.Serialization.JsonConverter<PutTrainedModelResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCompressedDefinition = System.Text.Json.JsonEncodedText.Encode("compressed_definition");
+	private static readonly System.Text.Json.JsonEncodedText PropCreatedBy = System.Text.Json.JsonEncodedText.Encode("created_by");
+	private static readonly System.Text.Json.JsonEncodedText PropCreateTime = System.Text.Json.JsonEncodedText.Encode("create_time");
+	private static readonly System.Text.Json.JsonEncodedText PropDefaultFieldMap = System.Text.Json.JsonEncodedText.Encode("default_field_map");
+	private static readonly System.Text.Json.JsonEncodedText PropDescription = System.Text.Json.JsonEncodedText.Encode("description");
+	private static readonly System.Text.Json.JsonEncodedText PropEstimatedHeapMemoryUsageBytes = System.Text.Json.JsonEncodedText.Encode("estimated_heap_memory_usage_bytes");
+	private static readonly System.Text.Json.JsonEncodedText PropEstimatedOperations = System.Text.Json.JsonEncodedText.Encode("estimated_operations");
+	private static readonly System.Text.Json.JsonEncodedText PropFullyDefined = System.Text.Json.JsonEncodedText.Encode("fully_defined");
+	private static readonly System.Text.Json.JsonEncodedText PropInferenceConfig = System.Text.Json.JsonEncodedText.Encode("inference_config");
+	private static readonly System.Text.Json.JsonEncodedText PropInput = System.Text.Json.JsonEncodedText.Encode("input");
+	private static readonly System.Text.Json.JsonEncodedText PropLicenseLevel = System.Text.Json.JsonEncodedText.Encode("license_level");
+	private static readonly System.Text.Json.JsonEncodedText PropLocation = System.Text.Json.JsonEncodedText.Encode("location");
+	private static readonly System.Text.Json.JsonEncodedText PropMetadata = System.Text.Json.JsonEncodedText.Encode("metadata");
+	private static readonly System.Text.Json.JsonEncodedText PropModelId = System.Text.Json.JsonEncodedText.Encode("model_id");
+	private static readonly System.Text.Json.JsonEncodedText PropModelPackage = System.Text.Json.JsonEncodedText.Encode("model_package");
+	private static readonly System.Text.Json.JsonEncodedText PropModelSizeBytes = System.Text.Json.JsonEncodedText.Encode("model_size_bytes");
+	private static readonly System.Text.Json.JsonEncodedText PropModelType = System.Text.Json.JsonEncodedText.Encode("model_type");
+	private static readonly System.Text.Json.JsonEncodedText PropPrefixStrings = System.Text.Json.JsonEncodedText.Encode("prefix_strings");
+	private static readonly System.Text.Json.JsonEncodedText PropTags = System.Text.Json.JsonEncodedText.Encode("tags");
+	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("version");
+
+	public override PutTrainedModelResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string?> propCompressedDefinition = default;
+		LocalJsonProperty<string?> propCreatedBy = default;
+		LocalJsonProperty<DateTimeOffset?> propCreateTime = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, string>?> propDefaultFieldMap = default;
+		LocalJsonProperty<string?> propDescription = default;
+		LocalJsonProperty<int?> propEstimatedHeapMemoryUsageBytes = default;
+		LocalJsonProperty<int?> propEstimatedOperations = default;
+		LocalJsonProperty<bool?> propFullyDefined = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.MachineLearning.InferenceConfigCreate?> propInferenceConfig = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.MachineLearning.TrainedModelConfigInput> propInput = default;
+		LocalJsonProperty<string?> propLicenseLevel = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.MachineLearning.TrainedModelLocation?> propLocation = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.MachineLearning.TrainedModelConfigMetadata?> propMetadata = default;
+		LocalJsonProperty<string> propModelId = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.MachineLearning.ModelPackageConfig?> propModelPackage = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.ByteSize?> propModelSizeBytes = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.MachineLearning.TrainedModelType?> propModelType = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.MachineLearning.TrainedModelPrefixStrings?> propPrefixStrings = default;
+		LocalJsonProperty<IReadOnlyCollection<string>> propTags = default;
+		LocalJsonProperty<string?> propVersion = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCompressedDefinition.TryRead(ref reader, options, PropCompressedDefinition))
+			{
+				continue;
+			}
+
+			if (propCreatedBy.TryRead(ref reader, options, PropCreatedBy))
+			{
+				continue;
+			}
+
+			if (propCreateTime.TryRead(ref reader, options, PropCreateTime))
+			{
+				continue;
+			}
+
+			if (propDefaultFieldMap.TryRead(ref reader, options, PropDefaultFieldMap))
+			{
+				continue;
+			}
+
+			if (propDescription.TryRead(ref reader, options, PropDescription))
+			{
+				continue;
+			}
+
+			if (propEstimatedHeapMemoryUsageBytes.TryRead(ref reader, options, PropEstimatedHeapMemoryUsageBytes))
+			{
+				continue;
+			}
+
+			if (propEstimatedOperations.TryRead(ref reader, options, PropEstimatedOperations))
+			{
+				continue;
+			}
+
+			if (propFullyDefined.TryRead(ref reader, options, PropFullyDefined))
+			{
+				continue;
+			}
+
+			if (propInferenceConfig.TryRead(ref reader, options, PropInferenceConfig))
+			{
+				continue;
+			}
+
+			if (propInput.TryRead(ref reader, options, PropInput))
+			{
+				continue;
+			}
+
+			if (propLicenseLevel.TryRead(ref reader, options, PropLicenseLevel))
+			{
+				continue;
+			}
+
+			if (propLocation.TryRead(ref reader, options, PropLocation))
+			{
+				continue;
+			}
+
+			if (propMetadata.TryRead(ref reader, options, PropMetadata))
+			{
+				continue;
+			}
+
+			if (propModelId.TryRead(ref reader, options, PropModelId))
+			{
+				continue;
+			}
+
+			if (propModelPackage.TryRead(ref reader, options, PropModelPackage))
+			{
+				continue;
+			}
+
+			if (propModelSizeBytes.TryRead(ref reader, options, PropModelSizeBytes))
+			{
+				continue;
+			}
+
+			if (propModelType.TryRead(ref reader, options, PropModelType))
+			{
+				continue;
+			}
+
+			if (propPrefixStrings.TryRead(ref reader, options, PropPrefixStrings))
+			{
+				continue;
+			}
+
+			if (propTags.TryRead(ref reader, options, PropTags))
+			{
+				continue;
+			}
+
+			if (propVersion.TryRead(ref reader, options, PropVersion))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutTrainedModelResponse
+		{
+			CompressedDefinition = propCompressedDefinition.Value
+,
+			CreatedBy = propCreatedBy.Value
+,
+			CreateTime = propCreateTime.Value
+,
+			DefaultFieldMap = propDefaultFieldMap.Value
+,
+			Description = propDescription.Value
+,
+			EstimatedHeapMemoryUsageBytes = propEstimatedHeapMemoryUsageBytes.Value
+,
+			EstimatedOperations = propEstimatedOperations.Value
+,
+			FullyDefined = propFullyDefined.Value
+,
+			InferenceConfig = propInferenceConfig.Value
+,
+			Input = propInput.Value
+,
+			LicenseLevel = propLicenseLevel.Value
+,
+			Location = propLocation.Value
+,
+			Metadata = propMetadata.Value
+,
+			ModelId = propModelId.Value
+,
+			ModelPackage = propModelPackage.Value
+,
+			ModelSizeBytes = propModelSizeBytes.Value
+,
+			ModelType = propModelType.Value
+,
+			PrefixStrings = propPrefixStrings.Value
+,
+			Tags = propTags.Value
+,
+			Version = propVersion.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutTrainedModelResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCompressedDefinition, value.CompressedDefinition);
+		writer.WriteProperty(options, PropCreatedBy, value.CreatedBy);
+		writer.WriteProperty(options, PropCreateTime, value.CreateTime);
+		writer.WriteProperty(options, PropDefaultFieldMap, value.DefaultFieldMap);
+		writer.WriteProperty(options, PropDescription, value.Description);
+		writer.WriteProperty(options, PropEstimatedHeapMemoryUsageBytes, value.EstimatedHeapMemoryUsageBytes);
+		writer.WriteProperty(options, PropEstimatedOperations, value.EstimatedOperations);
+		writer.WriteProperty(options, PropFullyDefined, value.FullyDefined);
+		writer.WriteProperty(options, PropInferenceConfig, value.InferenceConfig);
+		writer.WriteProperty(options, PropInput, value.Input);
+		writer.WriteProperty(options, PropLicenseLevel, value.LicenseLevel);
+		writer.WriteProperty(options, PropLocation, value.Location);
+		writer.WriteProperty(options, PropMetadata, value.Metadata);
+		writer.WriteProperty(options, PropModelId, value.ModelId);
+		writer.WriteProperty(options, PropModelPackage, value.ModelPackage);
+		writer.WriteProperty(options, PropModelSizeBytes, value.ModelSizeBytes);
+		writer.WriteProperty(options, PropModelType, value.ModelType);
+		writer.WriteProperty(options, PropPrefixStrings, value.PrefixStrings);
+		writer.WriteProperty(options, PropTags, value.Tags);
+		writer.WriteProperty(options, PropVersion, value.Version);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PutTrainedModelResponseConverter))]
 public sealed partial class PutTrainedModelResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("compressed_definition")]
 	public string? CompressedDefinition { get; init; }
 
 	/// <summary>
@@ -36,7 +262,6 @@ public sealed partial class PutTrainedModelResponse : ElasticsearchResponse
 	/// Information on the creator of the trained model.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("created_by")]
 	public string? CreatedBy { get; init; }
 
 	/// <summary>
@@ -44,7 +269,6 @@ public sealed partial class PutTrainedModelResponse : ElasticsearchResponse
 	/// The time when the trained model was created.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("create_time")]
 	public DateTimeOffset? CreateTime { get; init; }
 
 	/// <summary>
@@ -52,7 +276,6 @@ public sealed partial class PutTrainedModelResponse : ElasticsearchResponse
 	/// Any field map described in the inference configuration takes precedence.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("default_field_map")]
 	public IReadOnlyDictionary<string, string>? DefaultFieldMap { get; init; }
 
 	/// <summary>
@@ -60,7 +283,6 @@ public sealed partial class PutTrainedModelResponse : ElasticsearchResponse
 	/// The free-text description of the trained model.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("description")]
 	public string? Description { get; init; }
 
 	/// <summary>
@@ -68,7 +290,6 @@ public sealed partial class PutTrainedModelResponse : ElasticsearchResponse
 	/// The estimated heap usage in bytes to keep the trained model in memory.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("estimated_heap_memory_usage_bytes")]
 	public int? EstimatedHeapMemoryUsageBytes { get; init; }
 
 	/// <summary>
@@ -76,7 +297,6 @@ public sealed partial class PutTrainedModelResponse : ElasticsearchResponse
 	/// The estimated number of operations to use the trained model.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("estimated_operations")]
 	public int? EstimatedOperations { get; init; }
 
 	/// <summary>
@@ -84,7 +304,6 @@ public sealed partial class PutTrainedModelResponse : ElasticsearchResponse
 	/// True if the full model definition is present.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("fully_defined")]
 	public bool? FullyDefined { get; init; }
 
 	/// <summary>
@@ -92,7 +311,6 @@ public sealed partial class PutTrainedModelResponse : ElasticsearchResponse
 	/// The default configuration for inference. This can be either a regression, classification, or one of the many NLP focused configurations. It must match the underlying definition.trained_model's target_type. For pre-packaged models such as ELSER the config is not required.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("inference_config")]
 	public Elastic.Clients.Elasticsearch.MachineLearning.InferenceConfigCreate? InferenceConfig { get; init; }
 
 	/// <summary>
@@ -100,7 +318,6 @@ public sealed partial class PutTrainedModelResponse : ElasticsearchResponse
 	/// The input field names for the model definition.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("input")]
 	public Elastic.Clients.Elasticsearch.MachineLearning.TrainedModelConfigInput Input { get; init; }
 
 	/// <summary>
@@ -108,9 +325,7 @@ public sealed partial class PutTrainedModelResponse : ElasticsearchResponse
 	/// The license level of the trained model.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("license_level")]
 	public string? LicenseLevel { get; init; }
-	[JsonInclude, JsonPropertyName("location")]
 	public Elastic.Clients.Elasticsearch.MachineLearning.TrainedModelLocation? Location { get; init; }
 
 	/// <summary>
@@ -118,7 +333,6 @@ public sealed partial class PutTrainedModelResponse : ElasticsearchResponse
 	/// An object containing metadata about the trained model. For example, models created by data frame analytics contain analysis_config and input objects.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("metadata")]
 	public Elastic.Clients.Elasticsearch.MachineLearning.TrainedModelConfigMetadata? Metadata { get; init; }
 
 	/// <summary>
@@ -126,11 +340,8 @@ public sealed partial class PutTrainedModelResponse : ElasticsearchResponse
 	/// Identifier for the trained model.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("model_id")]
 	public string ModelId { get; init; }
-	[JsonInclude, JsonPropertyName("model_package")]
 	public Elastic.Clients.Elasticsearch.MachineLearning.ModelPackageConfig? ModelPackage { get; init; }
-	[JsonInclude, JsonPropertyName("model_size_bytes")]
 	public Elastic.Clients.Elasticsearch.ByteSize? ModelSizeBytes { get; init; }
 
 	/// <summary>
@@ -138,9 +349,7 @@ public sealed partial class PutTrainedModelResponse : ElasticsearchResponse
 	/// The model type
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("model_type")]
 	public Elastic.Clients.Elasticsearch.MachineLearning.TrainedModelType? ModelType { get; init; }
-	[JsonInclude, JsonPropertyName("prefix_strings")]
 	public Elastic.Clients.Elasticsearch.MachineLearning.TrainedModelPrefixStrings? PrefixStrings { get; init; }
 
 	/// <summary>
@@ -148,7 +357,6 @@ public sealed partial class PutTrainedModelResponse : ElasticsearchResponse
 	/// A comma delimited string of tags. A trained model can have many tags, or none.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("tags")]
 	public IReadOnlyCollection<string> Tags { get; init; }
 
 	/// <summary>
@@ -156,6 +364,5 @@ public sealed partial class PutTrainedModelResponse : ElasticsearchResponse
 	/// The Elasticsearch version number in which the trained model was created.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/PutTrainedModelVocabularyResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/PutTrainedModelVocabularyResponse.g.cs
index ad429dd3de8..97867885d54 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/PutTrainedModelVocabularyResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/PutTrainedModelVocabularyResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
+internal sealed partial class PutTrainedModelVocabularyResponseConverter : System.Text.Json.Serialization.JsonConverter<PutTrainedModelVocabularyResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override PutTrainedModelVocabularyResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutTrainedModelVocabularyResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutTrainedModelVocabularyResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PutTrainedModelVocabularyResponseConverter))]
 public sealed partial class PutTrainedModelVocabularyResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class PutTrainedModelVocabularyResponse : ElasticsearchRes
 	/// 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/MachineLearning/ResetJobResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/ResetJobResponse.g.cs
index 1376dc1be33..d2bfd8164bb 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/ResetJobResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/ResetJobResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
+internal sealed partial class ResetJobResponseConverter : System.Text.Json.Serialization.JsonConverter<ResetJobResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override ResetJobResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ResetJobResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ResetJobResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ResetJobResponseConverter))]
 public sealed partial class ResetJobResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class ResetJobResponse : ElasticsearchResponse
 	/// 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/MachineLearning/RevertModelSnapshotResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/RevertModelSnapshotResponse.g.cs
index 845e682de52..1ce8d8f063c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/RevertModelSnapshotResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/RevertModelSnapshotResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
+internal sealed partial class RevertModelSnapshotResponseConverter : System.Text.Json.Serialization.JsonConverter<RevertModelSnapshotResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropModel = System.Text.Json.JsonEncodedText.Encode("model");
+
+	public override RevertModelSnapshotResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.MachineLearning.ModelSnapshot> propModel = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propModel.TryRead(ref reader, options, PropModel))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new RevertModelSnapshotResponse
+		{
+			Model = propModel.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, RevertModelSnapshotResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropModel, value.Model);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(RevertModelSnapshotResponseConverter))]
 public sealed partial class RevertModelSnapshotResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("model")]
 	public Elastic.Clients.Elasticsearch.MachineLearning.ModelSnapshot Model { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/SetUpgradeModeResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/SetUpgradeModeResponse.g.cs
index 2331ea78700..5456203e20f 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/SetUpgradeModeResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/SetUpgradeModeResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
+internal sealed partial class SetUpgradeModeResponseConverter : System.Text.Json.Serialization.JsonConverter<SetUpgradeModeResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override SetUpgradeModeResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SetUpgradeModeResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SetUpgradeModeResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(SetUpgradeModeResponseConverter))]
 public sealed partial class SetUpgradeModeResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class SetUpgradeModeResponse : ElasticsearchResponse
 	/// 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/MachineLearning/StartDataFrameAnalyticsResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/StartDataFrameAnalyticsResponse.g.cs
index 2285b69b809..3d318a8647b 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/StartDataFrameAnalyticsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/StartDataFrameAnalyticsResponse.g.cs
@@ -18,17 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
+internal sealed partial class StartDataFrameAnalyticsResponseConverter : System.Text.Json.Serialization.JsonConverter<StartDataFrameAnalyticsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+	private static readonly System.Text.Json.JsonEncodedText PropNode = System.Text.Json.JsonEncodedText.Encode("node");
+
+	public override StartDataFrameAnalyticsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		LocalJsonProperty<string> propNode = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			if (propNode.TryRead(ref reader, options, PropNode))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new StartDataFrameAnalyticsResponse
+		{
+			Acknowledged = propAcknowledged.Value
+,
+			Node = propNode.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, StartDataFrameAnalyticsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteProperty(options, PropNode, value.Node);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(StartDataFrameAnalyticsResponseConverter))]
 public sealed partial class StartDataFrameAnalyticsResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("acknowledged")]
 	public bool Acknowledged { get; init; }
 
 	/// <summary>
@@ -40,6 +86,5 @@ public sealed partial class StartDataFrameAnalyticsResponse : ElasticsearchRespo
 	/// node ID will be "serverless".
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("node")]
 	public string Node { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/StartDatafeedResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/StartDatafeedResponse.g.cs
index a8ff65cd2ea..593df5183e1 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/StartDatafeedResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/StartDatafeedResponse.g.cs
@@ -18,14 +18,61 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
+internal sealed partial class StartDatafeedResponseConverter : System.Text.Json.Serialization.JsonConverter<StartDatafeedResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropNode = System.Text.Json.JsonEncodedText.Encode("node");
+	private static readonly System.Text.Json.JsonEncodedText PropStarted = System.Text.Json.JsonEncodedText.Encode("started");
+
+	public override StartDatafeedResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<string>> propNode = default;
+		LocalJsonProperty<bool> propStarted = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propNode.TryRead(ref reader, options, PropNode, typeof(SingleOrManyMarker<IReadOnlyCollection<string>, string>)))
+			{
+				continue;
+			}
+
+			if (propStarted.TryRead(ref reader, options, PropStarted))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new StartDatafeedResponse
+		{
+			Node = propNode.Value
+,
+			Started = propStarted.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, StartDatafeedResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropNode, value.Node, typeof(SingleOrManyMarker<IReadOnlyCollection<string>, string>));
+		writer.WriteProperty(options, PropStarted, value.Started);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(StartDatafeedResponseConverter))]
 public sealed partial class StartDatafeedResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -34,8 +81,6 @@ public sealed partial class StartDatafeedResponse : ElasticsearchResponse
 	/// If the job is allowed to open lazily and has not yet been assigned to a node, this value is an empty string.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("node")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public IReadOnlyCollection<string> Node { get; init; }
 
 	/// <summary>
@@ -43,6 +88,5 @@ public sealed partial class StartDatafeedResponse : ElasticsearchResponse
 	/// For a successful response, this value is always <c>true</c>. On failure, an exception is returned instead.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("started")]
 	public bool Started { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/StartTrainedModelDeploymentResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/StartTrainedModelDeploymentResponse.g.cs
index de829f86d0b..8930c7d1d2c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/StartTrainedModelDeploymentResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/StartTrainedModelDeploymentResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
+internal sealed partial class StartTrainedModelDeploymentResponseConverter : System.Text.Json.Serialization.JsonConverter<StartTrainedModelDeploymentResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAssignment = System.Text.Json.JsonEncodedText.Encode("assignment");
+
+	public override StartTrainedModelDeploymentResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.MachineLearning.TrainedModelAssignment> propAssignment = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAssignment.TryRead(ref reader, options, PropAssignment))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new StartTrainedModelDeploymentResponse
+		{
+			Assignment = propAssignment.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, StartTrainedModelDeploymentResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAssignment, value.Assignment);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(StartTrainedModelDeploymentResponseConverter))]
 public sealed partial class StartTrainedModelDeploymentResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("assignment")]
 	public Elastic.Clients.Elasticsearch.MachineLearning.TrainedModelAssignment Assignment { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/StopDataFrameAnalyticsResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/StopDataFrameAnalyticsResponse.g.cs
index b367f3fd569..8c1d406a187 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/StopDataFrameAnalyticsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/StopDataFrameAnalyticsResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
+internal sealed partial class StopDataFrameAnalyticsResponseConverter : System.Text.Json.Serialization.JsonConverter<StopDataFrameAnalyticsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStopped = System.Text.Json.JsonEncodedText.Encode("stopped");
+
+	public override StopDataFrameAnalyticsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propStopped = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStopped.TryRead(ref reader, options, PropStopped))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new StopDataFrameAnalyticsResponse
+		{
+			Stopped = propStopped.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, StopDataFrameAnalyticsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStopped, value.Stopped);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(StopDataFrameAnalyticsResponseConverter))]
 public sealed partial class StopDataFrameAnalyticsResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("stopped")]
 	public bool Stopped { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/StopDatafeedResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/StopDatafeedResponse.g.cs
index 984d91eafa8..aa6ee1c4c7a 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/StopDatafeedResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/StopDatafeedResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
+internal sealed partial class StopDatafeedResponseConverter : System.Text.Json.Serialization.JsonConverter<StopDatafeedResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStopped = System.Text.Json.JsonEncodedText.Encode("stopped");
+
+	public override StopDatafeedResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propStopped = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStopped.TryRead(ref reader, options, PropStopped))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new StopDatafeedResponse
+		{
+			Stopped = propStopped.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, StopDatafeedResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStopped, value.Stopped);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(StopDatafeedResponseConverter))]
 public sealed partial class StopDatafeedResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("stopped")]
 	public bool Stopped { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/StopTrainedModelDeploymentResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/StopTrainedModelDeploymentResponse.g.cs
index b7e839abf4f..28aaf6f5ad6 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/StopTrainedModelDeploymentResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/StopTrainedModelDeploymentResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
+internal sealed partial class StopTrainedModelDeploymentResponseConverter : System.Text.Json.Serialization.JsonConverter<StopTrainedModelDeploymentResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStopped = System.Text.Json.JsonEncodedText.Encode("stopped");
+
+	public override StopTrainedModelDeploymentResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propStopped = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStopped.TryRead(ref reader, options, PropStopped))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new StopTrainedModelDeploymentResponse
+		{
+			Stopped = propStopped.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, StopTrainedModelDeploymentResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStopped, value.Stopped);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(StopTrainedModelDeploymentResponseConverter))]
 public sealed partial class StopTrainedModelDeploymentResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("stopped")]
 	public bool Stopped { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/UpdateDataFrameAnalyticsResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/UpdateDataFrameAnalyticsResponse.g.cs
index b1c66fc047e..7aefea908df 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/UpdateDataFrameAnalyticsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/UpdateDataFrameAnalyticsResponse.g.cs
@@ -18,38 +18,173 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
+internal sealed partial class UpdateDataFrameAnalyticsResponseConverter : System.Text.Json.Serialization.JsonConverter<UpdateDataFrameAnalyticsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAllowLazyStart = System.Text.Json.JsonEncodedText.Encode("allow_lazy_start");
+	private static readonly System.Text.Json.JsonEncodedText PropAnalysis = System.Text.Json.JsonEncodedText.Encode("analysis");
+	private static readonly System.Text.Json.JsonEncodedText PropAnalyzedFields = System.Text.Json.JsonEncodedText.Encode("analyzed_fields");
+	private static readonly System.Text.Json.JsonEncodedText PropAuthorization = System.Text.Json.JsonEncodedText.Encode("authorization");
+	private static readonly System.Text.Json.JsonEncodedText PropCreateTime = System.Text.Json.JsonEncodedText.Encode("create_time");
+	private static readonly System.Text.Json.JsonEncodedText PropDescription = System.Text.Json.JsonEncodedText.Encode("description");
+	private static readonly System.Text.Json.JsonEncodedText PropDest = System.Text.Json.JsonEncodedText.Encode("dest");
+	private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("id");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxNumThreads = System.Text.Json.JsonEncodedText.Encode("max_num_threads");
+	private static readonly System.Text.Json.JsonEncodedText PropModelMemoryLimit = System.Text.Json.JsonEncodedText.Encode("model_memory_limit");
+	private static readonly System.Text.Json.JsonEncodedText PropSource = System.Text.Json.JsonEncodedText.Encode("source");
+	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("version");
+
+	public override UpdateDataFrameAnalyticsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAllowLazyStart = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.MachineLearning.DataframeAnalysis> propAnalysis = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.MachineLearning.DataframeAnalysisAnalyzedFields?> propAnalyzedFields = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.MachineLearning.DataframeAnalyticsAuthorization?> propAuthorization = default;
+		LocalJsonProperty<long> propCreateTime = default;
+		LocalJsonProperty<string?> propDescription = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.MachineLearning.DataframeAnalyticsDestination> propDest = default;
+		LocalJsonProperty<string> propId = default;
+		LocalJsonProperty<int> propMaxNumThreads = default;
+		LocalJsonProperty<string> propModelMemoryLimit = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.MachineLearning.DataframeAnalyticsSource> propSource = default;
+		LocalJsonProperty<string> propVersion = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAllowLazyStart.TryRead(ref reader, options, PropAllowLazyStart))
+			{
+				continue;
+			}
+
+			if (propAnalysis.TryRead(ref reader, options, PropAnalysis))
+			{
+				continue;
+			}
+
+			if (propAnalyzedFields.TryRead(ref reader, options, PropAnalyzedFields))
+			{
+				continue;
+			}
+
+			if (propAuthorization.TryRead(ref reader, options, PropAuthorization))
+			{
+				continue;
+			}
+
+			if (propCreateTime.TryRead(ref reader, options, PropCreateTime))
+			{
+				continue;
+			}
+
+			if (propDescription.TryRead(ref reader, options, PropDescription))
+			{
+				continue;
+			}
+
+			if (propDest.TryRead(ref reader, options, PropDest))
+			{
+				continue;
+			}
+
+			if (propId.TryRead(ref reader, options, PropId))
+			{
+				continue;
+			}
+
+			if (propMaxNumThreads.TryRead(ref reader, options, PropMaxNumThreads))
+			{
+				continue;
+			}
+
+			if (propModelMemoryLimit.TryRead(ref reader, options, PropModelMemoryLimit))
+			{
+				continue;
+			}
+
+			if (propSource.TryRead(ref reader, options, PropSource))
+			{
+				continue;
+			}
+
+			if (propVersion.TryRead(ref reader, options, PropVersion))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new UpdateDataFrameAnalyticsResponse
+		{
+			AllowLazyStart = propAllowLazyStart.Value
+,
+			Analysis = propAnalysis.Value
+,
+			AnalyzedFields = propAnalyzedFields.Value
+,
+			Authorization = propAuthorization.Value
+,
+			CreateTime = propCreateTime.Value
+,
+			Description = propDescription.Value
+,
+			Dest = propDest.Value
+,
+			Id = propId.Value
+,
+			MaxNumThreads = propMaxNumThreads.Value
+,
+			ModelMemoryLimit = propModelMemoryLimit.Value
+,
+			Source = propSource.Value
+,
+			Version = propVersion.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, UpdateDataFrameAnalyticsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAllowLazyStart, value.AllowLazyStart);
+		writer.WriteProperty(options, PropAnalysis, value.Analysis);
+		writer.WriteProperty(options, PropAnalyzedFields, value.AnalyzedFields);
+		writer.WriteProperty(options, PropAuthorization, value.Authorization);
+		writer.WriteProperty(options, PropCreateTime, value.CreateTime);
+		writer.WriteProperty(options, PropDescription, value.Description);
+		writer.WriteProperty(options, PropDest, value.Dest);
+		writer.WriteProperty(options, PropId, value.Id);
+		writer.WriteProperty(options, PropMaxNumThreads, value.MaxNumThreads);
+		writer.WriteProperty(options, PropModelMemoryLimit, value.ModelMemoryLimit);
+		writer.WriteProperty(options, PropSource, value.Source);
+		writer.WriteProperty(options, PropVersion, value.Version);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(UpdateDataFrameAnalyticsResponseConverter))]
 public sealed partial class UpdateDataFrameAnalyticsResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("allow_lazy_start")]
 	public bool AllowLazyStart { get; init; }
-	[JsonInclude, JsonPropertyName("analysis")]
 	public Elastic.Clients.Elasticsearch.MachineLearning.DataframeAnalysis Analysis { get; init; }
-	[JsonInclude, JsonPropertyName("analyzed_fields")]
 	public Elastic.Clients.Elasticsearch.MachineLearning.DataframeAnalysisAnalyzedFields? AnalyzedFields { get; init; }
-	[JsonInclude, JsonPropertyName("authorization")]
 	public Elastic.Clients.Elasticsearch.MachineLearning.DataframeAnalyticsAuthorization? Authorization { get; init; }
-	[JsonInclude, JsonPropertyName("create_time")]
 	public long CreateTime { get; init; }
-	[JsonInclude, JsonPropertyName("description")]
 	public string? Description { get; init; }
-	[JsonInclude, JsonPropertyName("dest")]
 	public Elastic.Clients.Elasticsearch.MachineLearning.DataframeAnalyticsDestination Dest { get; init; }
-	[JsonInclude, JsonPropertyName("id")]
 	public string Id { get; init; }
-	[JsonInclude, JsonPropertyName("max_num_threads")]
 	public int MaxNumThreads { get; init; }
-	[JsonInclude, JsonPropertyName("model_memory_limit")]
 	public string ModelMemoryLimit { get; init; }
-	[JsonInclude, JsonPropertyName("source")]
 	public Elastic.Clients.Elasticsearch.MachineLearning.DataframeAnalyticsSource Source { get; init; }
-	[JsonInclude, JsonPropertyName("version")]
 	public string Version { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/UpdateDatafeedRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/UpdateDatafeedRequest.g.cs
index b7116b1731f..33db977c43c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/UpdateDatafeedRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/UpdateDatafeedRequest.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport;
@@ -83,182 +84,156 @@ public sealed partial class UpdateDatafeedRequestParameters : RequestParameters
 	public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
 }
 
-internal sealed partial class UpdateDatafeedRequestConverter : JsonConverter<UpdateDatafeedRequest>
+internal sealed partial class UpdateDatafeedRequestConverter : System.Text.Json.Serialization.JsonConverter<UpdateDatafeedRequest>
 {
-	public override UpdateDatafeedRequest Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropChunkingConfig = System.Text.Json.JsonEncodedText.Encode("chunking_config");
+	private static readonly System.Text.Json.JsonEncodedText PropDelayedDataCheckConfig = System.Text.Json.JsonEncodedText.Encode("delayed_data_check_config");
+	private static readonly System.Text.Json.JsonEncodedText PropFrequency = System.Text.Json.JsonEncodedText.Encode("frequency");
+	private static readonly System.Text.Json.JsonEncodedText PropIndices = System.Text.Json.JsonEncodedText.Encode("indices");
+	private static readonly System.Text.Json.JsonEncodedText PropIndices1 = System.Text.Json.JsonEncodedText.Encode("indexes");
+	private static readonly System.Text.Json.JsonEncodedText PropIndicesOptions = System.Text.Json.JsonEncodedText.Encode("indices_options");
+	private static readonly System.Text.Json.JsonEncodedText PropJobId = System.Text.Json.JsonEncodedText.Encode("job_id");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxEmptySearches = System.Text.Json.JsonEncodedText.Encode("max_empty_searches");
+	private static readonly System.Text.Json.JsonEncodedText PropQuery = System.Text.Json.JsonEncodedText.Encode("query");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryDelay = System.Text.Json.JsonEncodedText.Encode("query_delay");
+	private static readonly System.Text.Json.JsonEncodedText PropRuntimeMappings = System.Text.Json.JsonEncodedText.Encode("runtime_mappings");
+	private static readonly System.Text.Json.JsonEncodedText PropScriptFields = System.Text.Json.JsonEncodedText.Encode("script_fields");
+	private static readonly System.Text.Json.JsonEncodedText PropScrollSize = System.Text.Json.JsonEncodedText.Encode("scroll_size");
+
+	public override UpdateDatafeedRequest Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		var variant = new UpdateDatafeedRequest();
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IDictionary<string, Elastic.Clients.Elasticsearch.Aggregations.Aggregation>?> propAggregations = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.MachineLearning.ChunkingConfig?> propChunkingConfig = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.MachineLearning.DelayedDataCheckConfig?> propDelayedDataCheckConfig = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Duration?> propFrequency = default;
+		LocalJsonProperty<ICollection<string>?> propIndices = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.IndicesOptions?> propIndicesOptions = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Id?> propJobId = default;
+		LocalJsonProperty<int?> propMaxEmptySearches = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.QueryDsl.Query?> propQuery = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Duration?> propQueryDelay = default;
+		LocalJsonProperty<IDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>?> propRuntimeMappings = default;
+		LocalJsonProperty<IDictionary<string, Elastic.Clients.Elasticsearch.ScriptField>?> propScriptFields = default;
+		LocalJsonProperty<int?> propScrollSize = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propAggregations.TryRead(ref reader, options, PropAggregations))
 			{
-				var property = reader.GetString();
-				if (property == "aggregations")
-				{
-					variant.Aggregations = JsonSerializer.Deserialize<IDictionary<string, Elastic.Clients.Elasticsearch.Aggregations.Aggregation>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "chunking_config")
-				{
-					variant.ChunkingConfig = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.MachineLearning.ChunkingConfig?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "delayed_data_check_config")
-				{
-					variant.DelayedDataCheckConfig = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.MachineLearning.DelayedDataCheckConfig?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "frequency")
-				{
-					variant.Frequency = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Duration?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "indices" || property == "indexes")
-				{
-					variant.Indices = JsonSerializer.Deserialize<ICollection<string>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "indices_options")
-				{
-					variant.IndicesOptions = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.IndicesOptions?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "job_id")
-				{
-					variant.JobId = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Id?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "max_empty_searches")
-				{
-					variant.MaxEmptySearches = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "query")
-				{
-					variant.Query = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.Query?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "query_delay")
-				{
-					variant.QueryDelay = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Duration?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "runtime_mappings")
-				{
-					variant.RuntimeMappings = JsonSerializer.Deserialize<IDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "script_fields")
-				{
-					variant.ScriptFields = JsonSerializer.Deserialize<IDictionary<string, Elastic.Clients.Elasticsearch.ScriptField>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "scroll_size")
-				{
-					variant.ScrollSize = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
+				continue;
 			}
-		}
 
-		return variant;
-	}
+			if (propChunkingConfig.TryRead(ref reader, options, PropChunkingConfig))
+			{
+				continue;
+			}
 
-	public override void Write(Utf8JsonWriter writer, UpdateDatafeedRequest value, JsonSerializerOptions options)
-	{
-		writer.WriteStartObject();
-		if (value.Aggregations is not null)
-		{
-			writer.WritePropertyName("aggregations");
-			JsonSerializer.Serialize(writer, value.Aggregations, options);
-		}
+			if (propDelayedDataCheckConfig.TryRead(ref reader, options, PropDelayedDataCheckConfig))
+			{
+				continue;
+			}
 
-		if (value.ChunkingConfig is not null)
-		{
-			writer.WritePropertyName("chunking_config");
-			JsonSerializer.Serialize(writer, value.ChunkingConfig, options);
-		}
+			if (propFrequency.TryRead(ref reader, options, PropFrequency))
+			{
+				continue;
+			}
 
-		if (value.DelayedDataCheckConfig is not null)
-		{
-			writer.WritePropertyName("delayed_data_check_config");
-			JsonSerializer.Serialize(writer, value.DelayedDataCheckConfig, options);
-		}
+			if (propIndices.TryRead(ref reader, options, PropIndices) || propIndices.TryRead(ref reader, options, PropIndices1))
+			{
+				continue;
+			}
 
-		if (value.Frequency is not null)
-		{
-			writer.WritePropertyName("frequency");
-			JsonSerializer.Serialize(writer, value.Frequency, options);
-		}
+			if (propIndicesOptions.TryRead(ref reader, options, PropIndicesOptions))
+			{
+				continue;
+			}
 
-		if (value.Indices is not null)
-		{
-			writer.WritePropertyName("indices");
-			JsonSerializer.Serialize(writer, value.Indices, options);
-		}
+			if (propJobId.TryRead(ref reader, options, PropJobId))
+			{
+				continue;
+			}
 
-		if (value.IndicesOptions is not null)
-		{
-			writer.WritePropertyName("indices_options");
-			JsonSerializer.Serialize(writer, value.IndicesOptions, options);
-		}
+			if (propMaxEmptySearches.TryRead(ref reader, options, PropMaxEmptySearches))
+			{
+				continue;
+			}
 
-		if (value.JobId is not null)
-		{
-			writer.WritePropertyName("job_id");
-			JsonSerializer.Serialize(writer, value.JobId, options);
-		}
+			if (propQuery.TryRead(ref reader, options, PropQuery))
+			{
+				continue;
+			}
 
-		if (value.MaxEmptySearches.HasValue)
-		{
-			writer.WritePropertyName("max_empty_searches");
-			writer.WriteNumberValue(value.MaxEmptySearches.Value);
-		}
+			if (propQueryDelay.TryRead(ref reader, options, PropQueryDelay))
+			{
+				continue;
+			}
 
-		if (value.Query is not null)
-		{
-			writer.WritePropertyName("query");
-			JsonSerializer.Serialize(writer, value.Query, options);
-		}
+			if (propRuntimeMappings.TryRead(ref reader, options, PropRuntimeMappings))
+			{
+				continue;
+			}
 
-		if (value.QueryDelay is not null)
-		{
-			writer.WritePropertyName("query_delay");
-			JsonSerializer.Serialize(writer, value.QueryDelay, options);
-		}
+			if (propScriptFields.TryRead(ref reader, options, PropScriptFields))
+			{
+				continue;
+			}
 
-		if (value.RuntimeMappings is not null)
-		{
-			writer.WritePropertyName("runtime_mappings");
-			JsonSerializer.Serialize(writer, value.RuntimeMappings, options);
-		}
+			if (propScrollSize.TryRead(ref reader, options, PropScrollSize))
+			{
+				continue;
+			}
 
-		if (value.ScriptFields is not null)
-		{
-			writer.WritePropertyName("script_fields");
-			JsonSerializer.Serialize(writer, value.ScriptFields, options);
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		if (value.ScrollSize.HasValue)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new UpdateDatafeedRequest
 		{
-			writer.WritePropertyName("scroll_size");
-			writer.WriteNumberValue(value.ScrollSize.Value);
-		}
+			Aggregations = propAggregations.Value
+	,
+			ChunkingConfig = propChunkingConfig.Value
+	,
+			DelayedDataCheckConfig = propDelayedDataCheckConfig.Value
+	,
+			Frequency = propFrequency.Value
+	,
+			Indices = propIndices.Value
+	,
+			IndicesOptions = propIndicesOptions.Value
+	,
+			JobId = propJobId.Value
+	,
+			MaxEmptySearches = propMaxEmptySearches.Value
+	,
+			Query = propQuery.Value
+	,
+			QueryDelay = propQueryDelay.Value
+	,
+			RuntimeMappings = propRuntimeMappings.Value
+	,
+			ScriptFields = propScriptFields.Value
+	,
+			ScrollSize = propScrollSize.Value
+		};
+	}
 
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, UpdateDatafeedRequest value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAggregations, value.Aggregations);
+		writer.WriteProperty(options, PropChunkingConfig, value.ChunkingConfig);
+		writer.WriteProperty(options, PropDelayedDataCheckConfig, value.DelayedDataCheckConfig);
+		writer.WriteProperty(options, PropFrequency, value.Frequency);
+		writer.WriteProperty(options, PropIndices, value.Indices);
+		writer.WriteProperty(options, PropIndicesOptions, value.IndicesOptions);
+		writer.WriteProperty(options, PropJobId, value.JobId);
+		writer.WriteProperty(options, PropMaxEmptySearches, value.MaxEmptySearches);
+		writer.WriteProperty(options, PropQuery, value.Query);
+		writer.WriteProperty(options, PropQueryDelay, value.QueryDelay);
+		writer.WriteProperty(options, PropRuntimeMappings, value.RuntimeMappings);
+		writer.WriteProperty(options, PropScriptFields, value.ScriptFields);
+		writer.WriteProperty(options, PropScrollSize, value.ScrollSize);
 		writer.WriteEndObject();
 	}
 }
@@ -297,7 +272,6 @@ public UpdateDatafeedRequest()
 	/// <c>_all</c> string or when no indices are specified.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public bool? AllowNoIndices { get => Q<bool?>("allow_no_indices"); set => Q("allow_no_indices", value); }
 
 	/// <summary>
@@ -333,7 +307,6 @@ public UpdateDatafeedRequest()
 	/// </item>
 	/// </list>
 	/// </summary>
-	[JsonIgnore]
 	public ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? ExpandWildcards { get => Q<ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>?>("expand_wildcards"); set => Q("expand_wildcards", value); }
 
 	/// <summary>
@@ -341,7 +314,6 @@ public UpdateDatafeedRequest()
 	/// If <c>true</c>, unavailable indices (missing or closed) are ignored.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
 
 	/// <summary>
@@ -350,7 +322,6 @@ public UpdateDatafeedRequest()
 	/// with low cardinality data.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("aggregations")]
 	public IDictionary<string, Elastic.Clients.Elasticsearch.Aggregations.Aggregation>? Aggregations { get; set; }
 
 	/// <summary>
@@ -360,7 +331,6 @@ public UpdateDatafeedRequest()
 	/// these time chunks are calculated; it is an advanced configuration option.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("chunking_config")]
 	public Elastic.Clients.Elasticsearch.MachineLearning.ChunkingConfig? ChunkingConfig { get; set; }
 
 	/// <summary>
@@ -372,7 +342,6 @@ public UpdateDatafeedRequest()
 	/// datafeeds.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("delayed_data_check_config")]
 	public Elastic.Clients.Elasticsearch.MachineLearning.DelayedDataCheckConfig? DelayedDataCheckConfig { get; set; }
 
 	/// <summary>
@@ -384,7 +353,6 @@ public UpdateDatafeedRequest()
 	/// must be divisible by the interval of the date histogram aggregation.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("frequency")]
 	public Elastic.Clients.Elasticsearch.Duration? Frequency { get; set; }
 
 	/// <summary>
@@ -393,7 +361,6 @@ public UpdateDatafeedRequest()
 	/// learning nodes must have the <c>remote_cluster_client</c> role.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("indices")]
 	public ICollection<string>? Indices { get; set; }
 
 	/// <summary>
@@ -401,9 +368,7 @@ public UpdateDatafeedRequest()
 	/// Specifies index expansion options that are used during search.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("indices_options")]
 	public Elastic.Clients.Elasticsearch.IndicesOptions? IndicesOptions { get; set; }
-	[JsonInclude, JsonPropertyName("job_id")]
 	public Elastic.Clients.Elasticsearch.Id? JobId { get; set; }
 
 	/// <summary>
@@ -414,7 +379,6 @@ public UpdateDatafeedRequest()
 	/// end time that sees no data remains started until it is explicitly stopped. By default, it is not set.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("max_empty_searches")]
 	public int? MaxEmptySearches { get; set; }
 
 	/// <summary>
@@ -428,7 +392,6 @@ public UpdateDatafeedRequest()
 	/// when you are satisfied with the results of the job.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("query")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.Query? Query { get; set; }
 
 	/// <summary>
@@ -439,7 +402,6 @@ public UpdateDatafeedRequest()
 	/// when there are multiple jobs running on the same node.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("query_delay")]
 	public Elastic.Clients.Elasticsearch.Duration? QueryDelay { get; set; }
 
 	/// <summary>
@@ -447,7 +409,6 @@ public UpdateDatafeedRequest()
 	/// Specifies runtime fields for the datafeed search.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("runtime_mappings")]
 	public IDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>? RuntimeMappings { get; set; }
 
 	/// <summary>
@@ -456,7 +417,6 @@ public UpdateDatafeedRequest()
 	/// The detector configuration objects in a job can contain functions that use these script fields.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("script_fields")]
 	public IDictionary<string, Elastic.Clients.Elasticsearch.ScriptField>? ScriptFields { get; set; }
 
 	/// <summary>
@@ -465,7 +425,6 @@ public UpdateDatafeedRequest()
 	/// The maximum value is the value of <c>index.max_result_window</c>.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("scroll_size")]
 	public int? ScrollSize { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/UpdateDatafeedResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/UpdateDatafeedResponse.g.cs
index ebee97ee8e8..5c69b8f77d9 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/UpdateDatafeedResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/UpdateDatafeedResponse.g.cs
@@ -18,44 +18,206 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
+internal sealed partial class UpdateDatafeedResponseConverter : System.Text.Json.Serialization.JsonConverter<UpdateDatafeedResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropAuthorization = System.Text.Json.JsonEncodedText.Encode("authorization");
+	private static readonly System.Text.Json.JsonEncodedText PropChunkingConfig = System.Text.Json.JsonEncodedText.Encode("chunking_config");
+	private static readonly System.Text.Json.JsonEncodedText PropDatafeedId = System.Text.Json.JsonEncodedText.Encode("datafeed_id");
+	private static readonly System.Text.Json.JsonEncodedText PropDelayedDataCheckConfig = System.Text.Json.JsonEncodedText.Encode("delayed_data_check_config");
+	private static readonly System.Text.Json.JsonEncodedText PropFrequency = System.Text.Json.JsonEncodedText.Encode("frequency");
+	private static readonly System.Text.Json.JsonEncodedText PropIndices = System.Text.Json.JsonEncodedText.Encode("indices");
+	private static readonly System.Text.Json.JsonEncodedText PropIndicesOptions = System.Text.Json.JsonEncodedText.Encode("indices_options");
+	private static readonly System.Text.Json.JsonEncodedText PropJobId = System.Text.Json.JsonEncodedText.Encode("job_id");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxEmptySearches = System.Text.Json.JsonEncodedText.Encode("max_empty_searches");
+	private static readonly System.Text.Json.JsonEncodedText PropQuery = System.Text.Json.JsonEncodedText.Encode("query");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryDelay = System.Text.Json.JsonEncodedText.Encode("query_delay");
+	private static readonly System.Text.Json.JsonEncodedText PropRuntimeMappings = System.Text.Json.JsonEncodedText.Encode("runtime_mappings");
+	private static readonly System.Text.Json.JsonEncodedText PropScriptFields = System.Text.Json.JsonEncodedText.Encode("script_fields");
+	private static readonly System.Text.Json.JsonEncodedText PropScrollSize = System.Text.Json.JsonEncodedText.Encode("scroll_size");
+
+	public override UpdateDatafeedResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Aggregations.Aggregation>?> propAggregations = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.MachineLearning.DatafeedAuthorization?> propAuthorization = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.MachineLearning.ChunkingConfig> propChunkingConfig = default;
+		LocalJsonProperty<string> propDatafeedId = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.MachineLearning.DelayedDataCheckConfig?> propDelayedDataCheckConfig = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Duration?> propFrequency = default;
+		LocalJsonProperty<IReadOnlyCollection<string>> propIndices = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.IndicesOptions?> propIndicesOptions = default;
+		LocalJsonProperty<string> propJobId = default;
+		LocalJsonProperty<int?> propMaxEmptySearches = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.QueryDsl.Query> propQuery = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Duration> propQueryDelay = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>?> propRuntimeMappings = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.ScriptField>?> propScriptFields = default;
+		LocalJsonProperty<int> propScrollSize = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAggregations.TryRead(ref reader, options, PropAggregations))
+			{
+				continue;
+			}
+
+			if (propAuthorization.TryRead(ref reader, options, PropAuthorization))
+			{
+				continue;
+			}
+
+			if (propChunkingConfig.TryRead(ref reader, options, PropChunkingConfig))
+			{
+				continue;
+			}
+
+			if (propDatafeedId.TryRead(ref reader, options, PropDatafeedId))
+			{
+				continue;
+			}
+
+			if (propDelayedDataCheckConfig.TryRead(ref reader, options, PropDelayedDataCheckConfig))
+			{
+				continue;
+			}
+
+			if (propFrequency.TryRead(ref reader, options, PropFrequency))
+			{
+				continue;
+			}
+
+			if (propIndices.TryRead(ref reader, options, PropIndices))
+			{
+				continue;
+			}
+
+			if (propIndicesOptions.TryRead(ref reader, options, PropIndicesOptions))
+			{
+				continue;
+			}
+
+			if (propJobId.TryRead(ref reader, options, PropJobId))
+			{
+				continue;
+			}
+
+			if (propMaxEmptySearches.TryRead(ref reader, options, PropMaxEmptySearches))
+			{
+				continue;
+			}
+
+			if (propQuery.TryRead(ref reader, options, PropQuery))
+			{
+				continue;
+			}
+
+			if (propQueryDelay.TryRead(ref reader, options, PropQueryDelay))
+			{
+				continue;
+			}
+
+			if (propRuntimeMappings.TryRead(ref reader, options, PropRuntimeMappings))
+			{
+				continue;
+			}
+
+			if (propScriptFields.TryRead(ref reader, options, PropScriptFields))
+			{
+				continue;
+			}
+
+			if (propScrollSize.TryRead(ref reader, options, PropScrollSize))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new UpdateDatafeedResponse
+		{
+			Aggregations = propAggregations.Value
+,
+			Authorization = propAuthorization.Value
+,
+			ChunkingConfig = propChunkingConfig.Value
+,
+			DatafeedId = propDatafeedId.Value
+,
+			DelayedDataCheckConfig = propDelayedDataCheckConfig.Value
+,
+			Frequency = propFrequency.Value
+,
+			Indices = propIndices.Value
+,
+			IndicesOptions = propIndicesOptions.Value
+,
+			JobId = propJobId.Value
+,
+			MaxEmptySearches = propMaxEmptySearches.Value
+,
+			Query = propQuery.Value
+,
+			QueryDelay = propQueryDelay.Value
+,
+			RuntimeMappings = propRuntimeMappings.Value
+,
+			ScriptFields = propScriptFields.Value
+,
+			ScrollSize = propScrollSize.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, UpdateDatafeedResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAggregations, value.Aggregations);
+		writer.WriteProperty(options, PropAuthorization, value.Authorization);
+		writer.WriteProperty(options, PropChunkingConfig, value.ChunkingConfig);
+		writer.WriteProperty(options, PropDatafeedId, value.DatafeedId);
+		writer.WriteProperty(options, PropDelayedDataCheckConfig, value.DelayedDataCheckConfig);
+		writer.WriteProperty(options, PropFrequency, value.Frequency);
+		writer.WriteProperty(options, PropIndices, value.Indices);
+		writer.WriteProperty(options, PropIndicesOptions, value.IndicesOptions);
+		writer.WriteProperty(options, PropJobId, value.JobId);
+		writer.WriteProperty(options, PropMaxEmptySearches, value.MaxEmptySearches);
+		writer.WriteProperty(options, PropQuery, value.Query);
+		writer.WriteProperty(options, PropQueryDelay, value.QueryDelay);
+		writer.WriteProperty(options, PropRuntimeMappings, value.RuntimeMappings);
+		writer.WriteProperty(options, PropScriptFields, value.ScriptFields);
+		writer.WriteProperty(options, PropScrollSize, value.ScrollSize);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(UpdateDatafeedResponseConverter))]
 public sealed partial class UpdateDatafeedResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("aggregations")]
 	public IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Aggregations.Aggregation>? Aggregations { get; init; }
-	[JsonInclude, JsonPropertyName("authorization")]
 	public Elastic.Clients.Elasticsearch.MachineLearning.DatafeedAuthorization? Authorization { get; init; }
-	[JsonInclude, JsonPropertyName("chunking_config")]
 	public Elastic.Clients.Elasticsearch.MachineLearning.ChunkingConfig ChunkingConfig { get; init; }
-	[JsonInclude, JsonPropertyName("datafeed_id")]
 	public string DatafeedId { get; init; }
-	[JsonInclude, JsonPropertyName("delayed_data_check_config")]
 	public Elastic.Clients.Elasticsearch.MachineLearning.DelayedDataCheckConfig? DelayedDataCheckConfig { get; init; }
-	[JsonInclude, JsonPropertyName("frequency")]
 	public Elastic.Clients.Elasticsearch.Duration? Frequency { get; init; }
-	[JsonInclude, JsonPropertyName("indices")]
 	public IReadOnlyCollection<string> Indices { get; init; }
-	[JsonInclude, JsonPropertyName("indices_options")]
 	public Elastic.Clients.Elasticsearch.IndicesOptions? IndicesOptions { get; init; }
-	[JsonInclude, JsonPropertyName("job_id")]
 	public string JobId { get; init; }
-	[JsonInclude, JsonPropertyName("max_empty_searches")]
 	public int? MaxEmptySearches { get; init; }
-	[JsonInclude, JsonPropertyName("query")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.Query Query { get; init; }
-	[JsonInclude, JsonPropertyName("query_delay")]
 	public Elastic.Clients.Elasticsearch.Duration QueryDelay { get; init; }
-	[JsonInclude, JsonPropertyName("runtime_mappings")]
 	public IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>? RuntimeMappings { get; init; }
-	[JsonInclude, JsonPropertyName("script_fields")]
 	public IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.ScriptField>? ScriptFields { get; init; }
-	[JsonInclude, JsonPropertyName("scroll_size")]
 	public int ScrollSize { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/UpdateFilterResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/UpdateFilterResponse.g.cs
index 7cbe0f06cbc..431e7867b4f 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/UpdateFilterResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/UpdateFilterResponse.g.cs
@@ -18,20 +18,74 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
+internal sealed partial class UpdateFilterResponseConverter : System.Text.Json.Serialization.JsonConverter<UpdateFilterResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropDescription = System.Text.Json.JsonEncodedText.Encode("description");
+	private static readonly System.Text.Json.JsonEncodedText PropFilterId = System.Text.Json.JsonEncodedText.Encode("filter_id");
+	private static readonly System.Text.Json.JsonEncodedText PropItems = System.Text.Json.JsonEncodedText.Encode("items");
+
+	public override UpdateFilterResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propDescription = default;
+		LocalJsonProperty<string> propFilterId = default;
+		LocalJsonProperty<IReadOnlyCollection<string>> propItems = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propDescription.TryRead(ref reader, options, PropDescription))
+			{
+				continue;
+			}
+
+			if (propFilterId.TryRead(ref reader, options, PropFilterId))
+			{
+				continue;
+			}
+
+			if (propItems.TryRead(ref reader, options, PropItems))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new UpdateFilterResponse
+		{
+			Description = propDescription.Value
+,
+			FilterId = propFilterId.Value
+,
+			Items = propItems.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, UpdateFilterResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDescription, value.Description);
+		writer.WriteProperty(options, PropFilterId, value.FilterId);
+		writer.WriteProperty(options, PropItems, value.Items);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(UpdateFilterResponseConverter))]
 public sealed partial class UpdateFilterResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("description")]
 	public string Description { get; init; }
-	[JsonInclude, JsonPropertyName("filter_id")]
 	public string FilterId { get; init; }
-	[JsonInclude, JsonPropertyName("items")]
 	public IReadOnlyCollection<string> Items { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/UpdateJobResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/UpdateJobResponse.g.cs
index 0fbf50d92cd..79294e880fd 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/UpdateJobResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/UpdateJobResponse.g.cs
@@ -18,56 +18,272 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
+internal sealed partial class UpdateJobResponseConverter : System.Text.Json.Serialization.JsonConverter<UpdateJobResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAllowLazyOpen = System.Text.Json.JsonEncodedText.Encode("allow_lazy_open");
+	private static readonly System.Text.Json.JsonEncodedText PropAnalysisConfig = System.Text.Json.JsonEncodedText.Encode("analysis_config");
+	private static readonly System.Text.Json.JsonEncodedText PropAnalysisLimits = System.Text.Json.JsonEncodedText.Encode("analysis_limits");
+	private static readonly System.Text.Json.JsonEncodedText PropBackgroundPersistInterval = System.Text.Json.JsonEncodedText.Encode("background_persist_interval");
+	private static readonly System.Text.Json.JsonEncodedText PropCreateTime = System.Text.Json.JsonEncodedText.Encode("create_time");
+	private static readonly System.Text.Json.JsonEncodedText PropCustomSettings = System.Text.Json.JsonEncodedText.Encode("custom_settings");
+	private static readonly System.Text.Json.JsonEncodedText PropDailyModelSnapshotRetentionAfterDays = System.Text.Json.JsonEncodedText.Encode("daily_model_snapshot_retention_after_days");
+	private static readonly System.Text.Json.JsonEncodedText PropDataDescription = System.Text.Json.JsonEncodedText.Encode("data_description");
+	private static readonly System.Text.Json.JsonEncodedText PropDatafeedConfig = System.Text.Json.JsonEncodedText.Encode("datafeed_config");
+	private static readonly System.Text.Json.JsonEncodedText PropDescription = System.Text.Json.JsonEncodedText.Encode("description");
+	private static readonly System.Text.Json.JsonEncodedText PropFinishedTime = System.Text.Json.JsonEncodedText.Encode("finished_time");
+	private static readonly System.Text.Json.JsonEncodedText PropGroups = System.Text.Json.JsonEncodedText.Encode("groups");
+	private static readonly System.Text.Json.JsonEncodedText PropJobId = System.Text.Json.JsonEncodedText.Encode("job_id");
+	private static readonly System.Text.Json.JsonEncodedText PropJobType = System.Text.Json.JsonEncodedText.Encode("job_type");
+	private static readonly System.Text.Json.JsonEncodedText PropJobVersion = System.Text.Json.JsonEncodedText.Encode("job_version");
+	private static readonly System.Text.Json.JsonEncodedText PropModelPlotConfig = System.Text.Json.JsonEncodedText.Encode("model_plot_config");
+	private static readonly System.Text.Json.JsonEncodedText PropModelSnapshotId = System.Text.Json.JsonEncodedText.Encode("model_snapshot_id");
+	private static readonly System.Text.Json.JsonEncodedText PropModelSnapshotRetentionDays = System.Text.Json.JsonEncodedText.Encode("model_snapshot_retention_days");
+	private static readonly System.Text.Json.JsonEncodedText PropRenormalizationWindowDays = System.Text.Json.JsonEncodedText.Encode("renormalization_window_days");
+	private static readonly System.Text.Json.JsonEncodedText PropResultsIndexName = System.Text.Json.JsonEncodedText.Encode("results_index_name");
+	private static readonly System.Text.Json.JsonEncodedText PropResultsRetentionDays = System.Text.Json.JsonEncodedText.Encode("results_retention_days");
+
+	public override UpdateJobResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAllowLazyOpen = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.MachineLearning.AnalysisConfigRead> propAnalysisConfig = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.MachineLearning.AnalysisLimits> propAnalysisLimits = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Duration?> propBackgroundPersistInterval = default;
+		LocalJsonProperty<long> propCreateTime = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, string>?> propCustomSettings = default;
+		LocalJsonProperty<long> propDailyModelSnapshotRetentionAfterDays = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.MachineLearning.DataDescription> propDataDescription = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.MachineLearning.Datafeed?> propDatafeedConfig = default;
+		LocalJsonProperty<string?> propDescription = default;
+		LocalJsonProperty<long?> propFinishedTime = default;
+		LocalJsonProperty<IReadOnlyCollection<string>?> propGroups = default;
+		LocalJsonProperty<string> propJobId = default;
+		LocalJsonProperty<string> propJobType = default;
+		LocalJsonProperty<string> propJobVersion = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.MachineLearning.ModelPlotConfig?> propModelPlotConfig = default;
+		LocalJsonProperty<string?> propModelSnapshotId = default;
+		LocalJsonProperty<long> propModelSnapshotRetentionDays = default;
+		LocalJsonProperty<long?> propRenormalizationWindowDays = default;
+		LocalJsonProperty<string> propResultsIndexName = default;
+		LocalJsonProperty<long?> propResultsRetentionDays = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAllowLazyOpen.TryRead(ref reader, options, PropAllowLazyOpen))
+			{
+				continue;
+			}
+
+			if (propAnalysisConfig.TryRead(ref reader, options, PropAnalysisConfig))
+			{
+				continue;
+			}
+
+			if (propAnalysisLimits.TryRead(ref reader, options, PropAnalysisLimits))
+			{
+				continue;
+			}
+
+			if (propBackgroundPersistInterval.TryRead(ref reader, options, PropBackgroundPersistInterval))
+			{
+				continue;
+			}
+
+			if (propCreateTime.TryRead(ref reader, options, PropCreateTime))
+			{
+				continue;
+			}
+
+			if (propCustomSettings.TryRead(ref reader, options, PropCustomSettings))
+			{
+				continue;
+			}
+
+			if (propDailyModelSnapshotRetentionAfterDays.TryRead(ref reader, options, PropDailyModelSnapshotRetentionAfterDays))
+			{
+				continue;
+			}
+
+			if (propDataDescription.TryRead(ref reader, options, PropDataDescription))
+			{
+				continue;
+			}
+
+			if (propDatafeedConfig.TryRead(ref reader, options, PropDatafeedConfig))
+			{
+				continue;
+			}
+
+			if (propDescription.TryRead(ref reader, options, PropDescription))
+			{
+				continue;
+			}
+
+			if (propFinishedTime.TryRead(ref reader, options, PropFinishedTime))
+			{
+				continue;
+			}
+
+			if (propGroups.TryRead(ref reader, options, PropGroups))
+			{
+				continue;
+			}
+
+			if (propJobId.TryRead(ref reader, options, PropJobId))
+			{
+				continue;
+			}
+
+			if (propJobType.TryRead(ref reader, options, PropJobType))
+			{
+				continue;
+			}
+
+			if (propJobVersion.TryRead(ref reader, options, PropJobVersion))
+			{
+				continue;
+			}
+
+			if (propModelPlotConfig.TryRead(ref reader, options, PropModelPlotConfig))
+			{
+				continue;
+			}
+
+			if (propModelSnapshotId.TryRead(ref reader, options, PropModelSnapshotId))
+			{
+				continue;
+			}
+
+			if (propModelSnapshotRetentionDays.TryRead(ref reader, options, PropModelSnapshotRetentionDays))
+			{
+				continue;
+			}
+
+			if (propRenormalizationWindowDays.TryRead(ref reader, options, PropRenormalizationWindowDays))
+			{
+				continue;
+			}
+
+			if (propResultsIndexName.TryRead(ref reader, options, PropResultsIndexName))
+			{
+				continue;
+			}
+
+			if (propResultsRetentionDays.TryRead(ref reader, options, PropResultsRetentionDays))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new UpdateJobResponse
+		{
+			AllowLazyOpen = propAllowLazyOpen.Value
+,
+			AnalysisConfig = propAnalysisConfig.Value
+,
+			AnalysisLimits = propAnalysisLimits.Value
+,
+			BackgroundPersistInterval = propBackgroundPersistInterval.Value
+,
+			CreateTime = propCreateTime.Value
+,
+			CustomSettings = propCustomSettings.Value
+,
+			DailyModelSnapshotRetentionAfterDays = propDailyModelSnapshotRetentionAfterDays.Value
+,
+			DataDescription = propDataDescription.Value
+,
+			DatafeedConfig = propDatafeedConfig.Value
+,
+			Description = propDescription.Value
+,
+			FinishedTime = propFinishedTime.Value
+,
+			Groups = propGroups.Value
+,
+			JobId = propJobId.Value
+,
+			JobType = propJobType.Value
+,
+			JobVersion = propJobVersion.Value
+,
+			ModelPlotConfig = propModelPlotConfig.Value
+,
+			ModelSnapshotId = propModelSnapshotId.Value
+,
+			ModelSnapshotRetentionDays = propModelSnapshotRetentionDays.Value
+,
+			RenormalizationWindowDays = propRenormalizationWindowDays.Value
+,
+			ResultsIndexName = propResultsIndexName.Value
+,
+			ResultsRetentionDays = propResultsRetentionDays.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, UpdateJobResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAllowLazyOpen, value.AllowLazyOpen);
+		writer.WriteProperty(options, PropAnalysisConfig, value.AnalysisConfig);
+		writer.WriteProperty(options, PropAnalysisLimits, value.AnalysisLimits);
+		writer.WriteProperty(options, PropBackgroundPersistInterval, value.BackgroundPersistInterval);
+		writer.WriteProperty(options, PropCreateTime, value.CreateTime);
+		writer.WriteProperty(options, PropCustomSettings, value.CustomSettings);
+		writer.WriteProperty(options, PropDailyModelSnapshotRetentionAfterDays, value.DailyModelSnapshotRetentionAfterDays);
+		writer.WriteProperty(options, PropDataDescription, value.DataDescription);
+		writer.WriteProperty(options, PropDatafeedConfig, value.DatafeedConfig);
+		writer.WriteProperty(options, PropDescription, value.Description);
+		writer.WriteProperty(options, PropFinishedTime, value.FinishedTime);
+		writer.WriteProperty(options, PropGroups, value.Groups);
+		writer.WriteProperty(options, PropJobId, value.JobId);
+		writer.WriteProperty(options, PropJobType, value.JobType);
+		writer.WriteProperty(options, PropJobVersion, value.JobVersion);
+		writer.WriteProperty(options, PropModelPlotConfig, value.ModelPlotConfig);
+		writer.WriteProperty(options, PropModelSnapshotId, value.ModelSnapshotId);
+		writer.WriteProperty(options, PropModelSnapshotRetentionDays, value.ModelSnapshotRetentionDays);
+		writer.WriteProperty(options, PropRenormalizationWindowDays, value.RenormalizationWindowDays);
+		writer.WriteProperty(options, PropResultsIndexName, value.ResultsIndexName);
+		writer.WriteProperty(options, PropResultsRetentionDays, value.ResultsRetentionDays);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(UpdateJobResponseConverter))]
 public sealed partial class UpdateJobResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("allow_lazy_open")]
 	public bool AllowLazyOpen { get; init; }
-	[JsonInclude, JsonPropertyName("analysis_config")]
 	public Elastic.Clients.Elasticsearch.MachineLearning.AnalysisConfigRead AnalysisConfig { get; init; }
-	[JsonInclude, JsonPropertyName("analysis_limits")]
 	public Elastic.Clients.Elasticsearch.MachineLearning.AnalysisLimits AnalysisLimits { get; init; }
-	[JsonInclude, JsonPropertyName("background_persist_interval")]
 	public Elastic.Clients.Elasticsearch.Duration? BackgroundPersistInterval { get; init; }
-	[JsonInclude, JsonPropertyName("create_time")]
 	public long CreateTime { get; init; }
-	[JsonInclude, JsonPropertyName("custom_settings")]
 	public IReadOnlyDictionary<string, string>? CustomSettings { get; init; }
-	[JsonInclude, JsonPropertyName("daily_model_snapshot_retention_after_days")]
 	public long DailyModelSnapshotRetentionAfterDays { get; init; }
-	[JsonInclude, JsonPropertyName("data_description")]
 	public Elastic.Clients.Elasticsearch.MachineLearning.DataDescription DataDescription { get; init; }
-	[JsonInclude, JsonPropertyName("datafeed_config")]
 	public Elastic.Clients.Elasticsearch.MachineLearning.Datafeed? DatafeedConfig { get; init; }
-	[JsonInclude, JsonPropertyName("description")]
 	public string? Description { get; init; }
-	[JsonInclude, JsonPropertyName("finished_time")]
 	public long? FinishedTime { get; init; }
-	[JsonInclude, JsonPropertyName("groups")]
 	public IReadOnlyCollection<string>? Groups { get; init; }
-	[JsonInclude, JsonPropertyName("job_id")]
 	public string JobId { get; init; }
-	[JsonInclude, JsonPropertyName("job_type")]
 	public string JobType { get; init; }
-	[JsonInclude, JsonPropertyName("job_version")]
 	public string JobVersion { get; init; }
-	[JsonInclude, JsonPropertyName("model_plot_config")]
 	public Elastic.Clients.Elasticsearch.MachineLearning.ModelPlotConfig? ModelPlotConfig { get; init; }
-	[JsonInclude, JsonPropertyName("model_snapshot_id")]
 	public string? ModelSnapshotId { get; init; }
-	[JsonInclude, JsonPropertyName("model_snapshot_retention_days")]
 	public long ModelSnapshotRetentionDays { get; init; }
-	[JsonInclude, JsonPropertyName("renormalization_window_days")]
 	public long? RenormalizationWindowDays { get; init; }
-	[JsonInclude, JsonPropertyName("results_index_name")]
 	public string ResultsIndexName { get; init; }
-	[JsonInclude, JsonPropertyName("results_retention_days")]
 	public long? ResultsRetentionDays { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/UpdateModelSnapshotResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/UpdateModelSnapshotResponse.g.cs
index c5fb4fc4670..af066ef8b4f 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/UpdateModelSnapshotResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/UpdateModelSnapshotResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
+internal sealed partial class UpdateModelSnapshotResponseConverter : System.Text.Json.Serialization.JsonConverter<UpdateModelSnapshotResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+	private static readonly System.Text.Json.JsonEncodedText PropModel = System.Text.Json.JsonEncodedText.Encode("model");
+
+	public override UpdateModelSnapshotResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.MachineLearning.ModelSnapshot> propModel = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			if (propModel.TryRead(ref reader, options, PropModel))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new UpdateModelSnapshotResponse
+		{
+			Acknowledged = propAcknowledged.Value
+,
+			Model = propModel.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, UpdateModelSnapshotResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteProperty(options, PropModel, value.Model);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(UpdateModelSnapshotResponseConverter))]
 public sealed partial class UpdateModelSnapshotResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("acknowledged")]
 	public bool Acknowledged { get; init; }
-	[JsonInclude, JsonPropertyName("model")]
 	public Elastic.Clients.Elasticsearch.MachineLearning.ModelSnapshot Model { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/UpdateTrainedModelDeploymentResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/UpdateTrainedModelDeploymentResponse.g.cs
index 3ef93e48077..a6c1d2873e7 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/UpdateTrainedModelDeploymentResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/UpdateTrainedModelDeploymentResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
+internal sealed partial class UpdateTrainedModelDeploymentResponseConverter : System.Text.Json.Serialization.JsonConverter<UpdateTrainedModelDeploymentResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAssignment = System.Text.Json.JsonEncodedText.Encode("assignment");
+
+	public override UpdateTrainedModelDeploymentResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.MachineLearning.TrainedModelAssignment> propAssignment = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAssignment.TryRead(ref reader, options, PropAssignment))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new UpdateTrainedModelDeploymentResponse
+		{
+			Assignment = propAssignment.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, UpdateTrainedModelDeploymentResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAssignment, value.Assignment);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(UpdateTrainedModelDeploymentResponseConverter))]
 public sealed partial class UpdateTrainedModelDeploymentResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("assignment")]
 	public Elastic.Clients.Elasticsearch.MachineLearning.TrainedModelAssignment Assignment { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/UpgradeJobSnapshotResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/UpgradeJobSnapshotResponse.g.cs
index 95e29dedea5..a6ab6ab80a6 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/UpgradeJobSnapshotResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/UpgradeJobSnapshotResponse.g.cs
@@ -18,14 +18,61 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
+internal sealed partial class UpgradeJobSnapshotResponseConverter : System.Text.Json.Serialization.JsonConverter<UpgradeJobSnapshotResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCompleted = System.Text.Json.JsonEncodedText.Encode("completed");
+	private static readonly System.Text.Json.JsonEncodedText PropNode = System.Text.Json.JsonEncodedText.Encode("node");
+
+	public override UpgradeJobSnapshotResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propCompleted = default;
+		LocalJsonProperty<string> propNode = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCompleted.TryRead(ref reader, options, PropCompleted))
+			{
+				continue;
+			}
+
+			if (propNode.TryRead(ref reader, options, PropNode))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new UpgradeJobSnapshotResponse
+		{
+			Completed = propCompleted.Value
+,
+			Node = propNode.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, UpgradeJobSnapshotResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCompleted, value.Completed);
+		writer.WriteProperty(options, PropNode, value.Node);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(UpgradeJobSnapshotResponseConverter))]
 public sealed partial class UpgradeJobSnapshotResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,7 +80,6 @@ public sealed partial class UpgradeJobSnapshotResponse : ElasticsearchResponse
 	/// When true, this means the task is complete. When false, it is still running.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("completed")]
 	public bool Completed { get; init; }
 
 	/// <summary>
@@ -41,6 +87,5 @@ public sealed partial class UpgradeJobSnapshotResponse : ElasticsearchResponse
 	/// The ID of the node that the upgrade task was started on if it is still running. In serverless this will be the "serverless".
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("node")]
 	public string Node { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/ValidateDetectorRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/ValidateDetectorRequest.g.cs
index 0d1a079f90b..b7bb500c1c3 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/ValidateDetectorRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/ValidateDetectorRequest.g.cs
@@ -39,7 +39,7 @@ public sealed partial class ValidateDetectorRequestParameters : RequestParameter
 /// Validate an anomaly detection job.
 /// </para>
 /// </summary>
-public sealed partial class ValidateDetectorRequest : PlainRequest<ValidateDetectorRequestParameters>, ISelfSerializable
+public sealed partial class ValidateDetectorRequest : PlainRequest<ValidateDetectorRequestParameters>, ISelfTwoWaySerializable
 {
 	internal override ApiUrls ApiUrls => ApiUrlLookup.MachineLearningValidateDetector;
 
@@ -49,13 +49,17 @@ public sealed partial class ValidateDetectorRequest : PlainRequest<ValidateDetec
 
 	internal override string OperationName => "ml.validate_detector";
 
-	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.MachineLearning.Detector Detector { get; set; }
 
-	void ISelfSerializable.Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
+	void ISelfTwoWaySerializable.Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 	{
 		JsonSerializer.Serialize(writer, Detector, options);
 	}
+
+	void ISelfTwoWaySerializable.Deserialize(ref Utf8JsonReader reader, JsonSerializerOptions options, IElasticsearchClientSettings settings)
+	{
+		Detector = settings.RequestResponseSerializer.Deserialize<Elastic.Clients.Elasticsearch.MachineLearning.Detector>(ref reader);
+	}
 }
 
 /// <summary>
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/ValidateDetectorResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/ValidateDetectorResponse.g.cs
index 3b016da7f28..f6790d72019 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/ValidateDetectorResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/ValidateDetectorResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
+internal sealed partial class ValidateDetectorResponseConverter : System.Text.Json.Serialization.JsonConverter<ValidateDetectorResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override ValidateDetectorResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ValidateDetectorResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ValidateDetectorResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ValidateDetectorResponseConverter))]
 public sealed partial class ValidateDetectorResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class ValidateDetectorResponse : ElasticsearchResponse
 	/// 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/MachineLearning/ValidateResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/ValidateResponse.g.cs
index 09bd6cb03b7..762c45d9d07 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/ValidateResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MachineLearning/ValidateResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
+internal sealed partial class ValidateResponseConverter : System.Text.Json.Serialization.JsonConverter<ValidateResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override ValidateResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ValidateResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ValidateResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ValidateResponseConverter))]
 public sealed partial class ValidateResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class ValidateResponse : ElasticsearchResponse
 	/// 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/MultiGetResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MultiGetResponse.g.cs
index 13199e2f0a7..3dd09c6dcdf 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MultiGetResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MultiGetResponse.g.cs
@@ -18,16 +18,69 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch;
 
+internal sealed partial class MultiGetResponseConverter<TDocument> : System.Text.Json.Serialization.JsonConverter<MultiGetResponse<TDocument>>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropDocs = System.Text.Json.JsonEncodedText.Encode("docs");
+
+	public override MultiGetResponse<TDocument> Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Core.MGet.MultiGetResponseItem<TDocument>>> propDocs = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propDocs.TryRead(ref reader, options, PropDocs))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new MultiGetResponse<TDocument>
+		{
+			Docs = propDocs.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, MultiGetResponse<TDocument> value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDocs, value.Docs);
+		writer.WriteEndObject();
+	}
+}
+
+internal sealed partial class MultiGetResponseConverterFactory : System.Text.Json.Serialization.JsonConverterFactory
+{
+	public override bool CanConvert(System.Type typeToConvert)
+	{
+		return typeToConvert.IsGenericType && typeToConvert.GetGenericTypeDefinition() == typeof(MultiGetResponse<>);
+	}
+
+	public override System.Text.Json.Serialization.JsonConverter CreateConverter(System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		var args = typeToConvert.GetGenericArguments();
+#pragma warning disable IL3050
+		var converter = (System.Text.Json.Serialization.JsonConverter)System.Activator.CreateInstance(typeof(MultiGetResponseConverter<>).MakeGenericType(args[0]), System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public, binder: null, args: null, culture: null)!;
+#pragma warning restore IL3050
+		return converter;
+	}
+}
+
+[JsonConverter(typeof(MultiGetResponseConverterFactory))]
 public sealed partial class MultiGetResponse<TDocument> : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("docs")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Core.MGet.MultiGetResponseItem<TDocument>> Docs { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MultiSearchResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MultiSearchResponse.g.cs
index a942a757900..ed2856e12bb 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MultiSearchResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MultiSearchResponse.g.cs
@@ -18,18 +18,80 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch;
 
+internal sealed partial class MultiSearchResponseConverter<TDocument> : System.Text.Json.Serialization.JsonConverter<MultiSearchResponse<TDocument>>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropResponses = System.Text.Json.JsonEncodedText.Encode("responses");
+	private static readonly System.Text.Json.JsonEncodedText PropTook = System.Text.Json.JsonEncodedText.Encode("took");
+
+	public override MultiSearchResponse<TDocument> Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Core.MSearch.MultiSearchResponseItem<TDocument>>> propResponses = default;
+		LocalJsonProperty<long> propTook = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propResponses.TryRead(ref reader, options, PropResponses))
+			{
+				continue;
+			}
+
+			if (propTook.TryRead(ref reader, options, PropTook))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new MultiSearchResponse<TDocument>
+		{
+			Responses = propResponses.Value
+,
+			Took = propTook.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, MultiSearchResponse<TDocument> value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropResponses, value.Responses);
+		writer.WriteProperty(options, PropTook, value.Took);
+		writer.WriteEndObject();
+	}
+}
+
+internal sealed partial class MultiSearchResponseConverterFactory : System.Text.Json.Serialization.JsonConverterFactory
+{
+	public override bool CanConvert(System.Type typeToConvert)
+	{
+		return typeToConvert.IsGenericType && typeToConvert.GetGenericTypeDefinition() == typeof(MultiSearchResponse<>);
+	}
+
+	public override System.Text.Json.Serialization.JsonConverter CreateConverter(System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		var args = typeToConvert.GetGenericArguments();
+#pragma warning disable IL3050
+		var converter = (System.Text.Json.Serialization.JsonConverter)System.Activator.CreateInstance(typeof(MultiSearchResponseConverter<>).MakeGenericType(args[0]), System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public, binder: null, args: null, culture: null)!;
+#pragma warning restore IL3050
+		return converter;
+	}
+}
+
+[JsonConverter(typeof(MultiSearchResponseConverterFactory))]
 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/MultiSearchTemplateResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MultiSearchTemplateResponse.g.cs
index 061ee312555..340f42746b3 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MultiSearchTemplateResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MultiSearchTemplateResponse.g.cs
@@ -18,18 +18,80 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch;
 
+internal sealed partial class MultiSearchTemplateResponseConverter<TDocument> : System.Text.Json.Serialization.JsonConverter<MultiSearchTemplateResponse<TDocument>>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropResponses = System.Text.Json.JsonEncodedText.Encode("responses");
+	private static readonly System.Text.Json.JsonEncodedText PropTook = System.Text.Json.JsonEncodedText.Encode("took");
+
+	public override MultiSearchTemplateResponse<TDocument> Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Core.MSearch.MultiSearchResponseItem<TDocument>>> propResponses = default;
+		LocalJsonProperty<long> propTook = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propResponses.TryRead(ref reader, options, PropResponses))
+			{
+				continue;
+			}
+
+			if (propTook.TryRead(ref reader, options, PropTook))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new MultiSearchTemplateResponse<TDocument>
+		{
+			Responses = propResponses.Value
+,
+			Took = propTook.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, MultiSearchTemplateResponse<TDocument> value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropResponses, value.Responses);
+		writer.WriteProperty(options, PropTook, value.Took);
+		writer.WriteEndObject();
+	}
+}
+
+internal sealed partial class MultiSearchTemplateResponseConverterFactory : System.Text.Json.Serialization.JsonConverterFactory
+{
+	public override bool CanConvert(System.Type typeToConvert)
+	{
+		return typeToConvert.IsGenericType && typeToConvert.GetGenericTypeDefinition() == typeof(MultiSearchTemplateResponse<>);
+	}
+
+	public override System.Text.Json.Serialization.JsonConverter CreateConverter(System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		var args = typeToConvert.GetGenericArguments();
+#pragma warning disable IL3050
+		var converter = (System.Text.Json.Serialization.JsonConverter)System.Activator.CreateInstance(typeof(MultiSearchTemplateResponseConverter<>).MakeGenericType(args[0]), System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public, binder: null, args: null, culture: null)!;
+#pragma warning restore IL3050
+		return converter;
+	}
+}
+
+[JsonConverter(typeof(MultiSearchTemplateResponseConverterFactory))]
 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/MultiTermVectorsResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MultiTermVectorsResponse.g.cs
index 36c309f3cab..d8e8e1d8045 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MultiTermVectorsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MultiTermVectorsResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch;
 
+internal sealed partial class MultiTermVectorsResponseConverter : System.Text.Json.Serialization.JsonConverter<MultiTermVectorsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropDocs = System.Text.Json.JsonEncodedText.Encode("docs");
+
+	public override MultiTermVectorsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Core.Mtermvectors.MultiTermVectorsResult>> propDocs = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propDocs.TryRead(ref reader, options, PropDocs))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new MultiTermVectorsResponse
+		{
+			Docs = propDocs.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, MultiTermVectorsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDocs, value.Docs);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(MultiTermVectorsResponseConverter))]
 public sealed partial class MultiTermVectorsResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("docs")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Core.Mtermvectors.MultiTermVectorsResult> Docs { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Nodes/ClearRepositoriesMeteringArchiveResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Nodes/ClearRepositoriesMeteringArchiveResponse.g.cs
index 7e786c95929..45375fa6af5 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Nodes/ClearRepositoriesMeteringArchiveResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Nodes/ClearRepositoriesMeteringArchiveResponse.g.cs
@@ -18,14 +18,71 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Nodes;
 
+internal sealed partial class ClearRepositoriesMeteringArchiveResponseConverter : System.Text.Json.Serialization.JsonConverter<ClearRepositoriesMeteringArchiveResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropClusterName = System.Text.Json.JsonEncodedText.Encode("cluster_name");
+	private static readonly System.Text.Json.JsonEncodedText PropNodes = System.Text.Json.JsonEncodedText.Encode("nodes");
+	private static readonly System.Text.Json.JsonEncodedText PropNodeStats = System.Text.Json.JsonEncodedText.Encode("_nodes");
+
+	public override ClearRepositoriesMeteringArchiveResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propClusterName = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Nodes.RepositoryMeteringInformation>> propNodes = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.NodeStatistics?> propNodeStats = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propClusterName.TryRead(ref reader, options, PropClusterName))
+			{
+				continue;
+			}
+
+			if (propNodes.TryRead(ref reader, options, PropNodes))
+			{
+				continue;
+			}
+
+			if (propNodeStats.TryRead(ref reader, options, PropNodeStats))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ClearRepositoriesMeteringArchiveResponse
+		{
+			ClusterName = propClusterName.Value
+,
+			Nodes = propNodes.Value
+,
+			NodeStats = propNodeStats.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ClearRepositoriesMeteringArchiveResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropClusterName, value.ClusterName);
+		writer.WriteProperty(options, PropNodes, value.Nodes);
+		writer.WriteProperty(options, PropNodeStats, value.NodeStats);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ClearRepositoriesMeteringArchiveResponseConverter))]
 public sealed partial class ClearRepositoriesMeteringArchiveResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,7 +90,6 @@ public sealed partial class ClearRepositoriesMeteringArchiveResponse : Elasticse
 	/// Name of the cluster. Based on the <c>cluster.name</c> setting.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("cluster_name")]
 	public string ClusterName { get; init; }
 
 	/// <summary>
@@ -41,7 +97,6 @@ public sealed partial class ClearRepositoriesMeteringArchiveResponse : Elasticse
 	/// Contains repositories metering information for the nodes selected by the request.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("nodes")]
 	public IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Nodes.RepositoryMeteringInformation> Nodes { get; init; }
 
 	/// <summary>
@@ -49,6 +104,5 @@ public sealed partial class ClearRepositoriesMeteringArchiveResponse : Elasticse
 	/// Contains statistics about the number of nodes selected by the request’s node filters.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("_nodes")]
 	public Elastic.Clients.Elasticsearch.NodeStatistics? NodeStats { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Nodes/GetRepositoriesMeteringInfoResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Nodes/GetRepositoriesMeteringInfoResponse.g.cs
index cc5ce41da4b..0043c48ac0b 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Nodes/GetRepositoriesMeteringInfoResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Nodes/GetRepositoriesMeteringInfoResponse.g.cs
@@ -18,14 +18,71 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Nodes;
 
+internal sealed partial class GetRepositoriesMeteringInfoResponseConverter : System.Text.Json.Serialization.JsonConverter<GetRepositoriesMeteringInfoResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropClusterName = System.Text.Json.JsonEncodedText.Encode("cluster_name");
+	private static readonly System.Text.Json.JsonEncodedText PropNodes = System.Text.Json.JsonEncodedText.Encode("nodes");
+	private static readonly System.Text.Json.JsonEncodedText PropNodeStats = System.Text.Json.JsonEncodedText.Encode("_nodes");
+
+	public override GetRepositoriesMeteringInfoResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propClusterName = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Nodes.RepositoryMeteringInformation>> propNodes = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.NodeStatistics?> propNodeStats = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propClusterName.TryRead(ref reader, options, PropClusterName))
+			{
+				continue;
+			}
+
+			if (propNodes.TryRead(ref reader, options, PropNodes))
+			{
+				continue;
+			}
+
+			if (propNodeStats.TryRead(ref reader, options, PropNodeStats))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetRepositoriesMeteringInfoResponse
+		{
+			ClusterName = propClusterName.Value
+,
+			Nodes = propNodes.Value
+,
+			NodeStats = propNodeStats.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetRepositoriesMeteringInfoResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropClusterName, value.ClusterName);
+		writer.WriteProperty(options, PropNodes, value.Nodes);
+		writer.WriteProperty(options, PropNodeStats, value.NodeStats);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetRepositoriesMeteringInfoResponseConverter))]
 public sealed partial class GetRepositoriesMeteringInfoResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,7 +90,6 @@ public sealed partial class GetRepositoriesMeteringInfoResponse : ElasticsearchR
 	/// Name of the cluster. Based on the <c>cluster.name</c> setting.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("cluster_name")]
 	public string ClusterName { get; init; }
 
 	/// <summary>
@@ -41,7 +97,6 @@ public sealed partial class GetRepositoriesMeteringInfoResponse : ElasticsearchR
 	/// Contains repositories metering information for the nodes selected by the request.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("nodes")]
 	public IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Nodes.RepositoryMeteringInformation> Nodes { get; init; }
 
 	/// <summary>
@@ -49,6 +104,5 @@ public sealed partial class GetRepositoriesMeteringInfoResponse : ElasticsearchR
 	/// Contains statistics about the number of nodes selected by the request’s node filters.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("_nodes")]
 	public Elastic.Clients.Elasticsearch.NodeStatistics? NodeStats { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Nodes/HotThreadsResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Nodes/HotThreadsResponse.g.cs
index f1677d7d5c5..ba0eaec860d 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Nodes/HotThreadsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Nodes/HotThreadsResponse.g.cs
@@ -18,14 +18,39 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Nodes;
 
+internal sealed partial class HotThreadsResponseConverter : System.Text.Json.Serialization.JsonConverter<HotThreadsResponse>
+{
+	public override HotThreadsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new HotThreadsResponse { };
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, HotThreadsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(HotThreadsResponseConverter))]
 public sealed partial class HotThreadsResponse : ElasticsearchResponse
 {
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Nodes/NodesInfoResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Nodes/NodesInfoResponse.g.cs
index 5ca252fad2f..49785498ec4 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Nodes/NodesInfoResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Nodes/NodesInfoResponse.g.cs
@@ -18,19 +18,74 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Nodes;
 
+internal sealed partial class NodesInfoResponseConverter : System.Text.Json.Serialization.JsonConverter<NodesInfoResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropClusterName = System.Text.Json.JsonEncodedText.Encode("cluster_name");
+	private static readonly System.Text.Json.JsonEncodedText PropNodes = System.Text.Json.JsonEncodedText.Encode("nodes");
+	private static readonly System.Text.Json.JsonEncodedText PropNodeStats = System.Text.Json.JsonEncodedText.Encode("_nodes");
+
+	public override NodesInfoResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propClusterName = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Nodes.NodeInfo>> propNodes = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.NodeStatistics?> propNodeStats = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propClusterName.TryRead(ref reader, options, PropClusterName))
+			{
+				continue;
+			}
+
+			if (propNodes.TryRead(ref reader, options, PropNodes))
+			{
+				continue;
+			}
+
+			if (propNodeStats.TryRead(ref reader, options, PropNodeStats))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new NodesInfoResponse
+		{
+			ClusterName = propClusterName.Value
+,
+			Nodes = propNodes.Value
+,
+			NodeStats = propNodeStats.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, NodesInfoResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropClusterName, value.ClusterName);
+		writer.WriteProperty(options, PropNodes, value.Nodes);
+		writer.WriteProperty(options, PropNodeStats, value.NodeStats);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(NodesInfoResponseConverter))]
 public sealed partial class NodesInfoResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("cluster_name")]
 	public string ClusterName { get; init; }
-	[JsonInclude, JsonPropertyName("nodes")]
 	public IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Nodes.NodeInfo> Nodes { get; init; }
 
 	/// <summary>
@@ -38,6 +93,5 @@ public sealed partial class NodesInfoResponse : ElasticsearchResponse
 	/// Contains statistics about the number of nodes selected by the request’s node filters.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("_nodes")]
 	public Elastic.Clients.Elasticsearch.NodeStatistics? NodeStats { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Nodes/NodesStatsResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Nodes/NodesStatsResponse.g.cs
index cb917ccc1c0..6ffca6e31b3 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Nodes/NodesStatsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Nodes/NodesStatsResponse.g.cs
@@ -18,19 +18,74 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Nodes;
 
+internal sealed partial class NodesStatsResponseConverter : System.Text.Json.Serialization.JsonConverter<NodesStatsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropClusterName = System.Text.Json.JsonEncodedText.Encode("cluster_name");
+	private static readonly System.Text.Json.JsonEncodedText PropNodes = System.Text.Json.JsonEncodedText.Encode("nodes");
+	private static readonly System.Text.Json.JsonEncodedText PropNodeStats = System.Text.Json.JsonEncodedText.Encode("_nodes");
+
+	public override NodesStatsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string?> propClusterName = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Nodes.Stats>> propNodes = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.NodeStatistics?> propNodeStats = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propClusterName.TryRead(ref reader, options, PropClusterName))
+			{
+				continue;
+			}
+
+			if (propNodes.TryRead(ref reader, options, PropNodes))
+			{
+				continue;
+			}
+
+			if (propNodeStats.TryRead(ref reader, options, PropNodeStats))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new NodesStatsResponse
+		{
+			ClusterName = propClusterName.Value
+,
+			Nodes = propNodes.Value
+,
+			NodeStats = propNodeStats.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, NodesStatsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropClusterName, value.ClusterName);
+		writer.WriteProperty(options, PropNodes, value.Nodes);
+		writer.WriteProperty(options, PropNodeStats, value.NodeStats);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(NodesStatsResponseConverter))]
 public sealed partial class NodesStatsResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("cluster_name")]
 	public string? ClusterName { get; init; }
-	[JsonInclude, JsonPropertyName("nodes")]
 	public IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Nodes.Stats> Nodes { get; init; }
 
 	/// <summary>
@@ -38,6 +93,5 @@ public sealed partial class NodesStatsResponse : ElasticsearchResponse
 	/// Contains statistics about the number of nodes selected by the request’s node filters.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("_nodes")]
 	public Elastic.Clients.Elasticsearch.NodeStatistics? NodeStats { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Nodes/NodesUsageResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Nodes/NodesUsageResponse.g.cs
index daaa410f471..8b292f90f13 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Nodes/NodesUsageResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Nodes/NodesUsageResponse.g.cs
@@ -18,19 +18,74 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Nodes;
 
+internal sealed partial class NodesUsageResponseConverter : System.Text.Json.Serialization.JsonConverter<NodesUsageResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropClusterName = System.Text.Json.JsonEncodedText.Encode("cluster_name");
+	private static readonly System.Text.Json.JsonEncodedText PropNodes = System.Text.Json.JsonEncodedText.Encode("nodes");
+	private static readonly System.Text.Json.JsonEncodedText PropNodeStats = System.Text.Json.JsonEncodedText.Encode("_nodes");
+
+	public override NodesUsageResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propClusterName = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Nodes.NodeUsage>> propNodes = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.NodeStatistics?> propNodeStats = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propClusterName.TryRead(ref reader, options, PropClusterName))
+			{
+				continue;
+			}
+
+			if (propNodes.TryRead(ref reader, options, PropNodes))
+			{
+				continue;
+			}
+
+			if (propNodeStats.TryRead(ref reader, options, PropNodeStats))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new NodesUsageResponse
+		{
+			ClusterName = propClusterName.Value
+,
+			Nodes = propNodes.Value
+,
+			NodeStats = propNodeStats.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, NodesUsageResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropClusterName, value.ClusterName);
+		writer.WriteProperty(options, PropNodes, value.Nodes);
+		writer.WriteProperty(options, PropNodeStats, value.NodeStats);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(NodesUsageResponseConverter))]
 public sealed partial class NodesUsageResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("cluster_name")]
 	public string ClusterName { get; init; }
-	[JsonInclude, JsonPropertyName("nodes")]
 	public IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Nodes.NodeUsage> Nodes { get; init; }
 
 	/// <summary>
@@ -38,6 +93,5 @@ public sealed partial class NodesUsageResponse : ElasticsearchResponse
 	/// Contains statistics about the number of nodes selected by the request’s node filters.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("_nodes")]
 	public Elastic.Clients.Elasticsearch.NodeStatistics? NodeStats { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Nodes/ReloadSecureSettingsResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Nodes/ReloadSecureSettingsResponse.g.cs
index 0ad2ae88554..f5e04e7c9cb 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Nodes/ReloadSecureSettingsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Nodes/ReloadSecureSettingsResponse.g.cs
@@ -18,19 +18,74 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Nodes;
 
+internal sealed partial class ReloadSecureSettingsResponseConverter : System.Text.Json.Serialization.JsonConverter<ReloadSecureSettingsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropClusterName = System.Text.Json.JsonEncodedText.Encode("cluster_name");
+	private static readonly System.Text.Json.JsonEncodedText PropNodes = System.Text.Json.JsonEncodedText.Encode("nodes");
+	private static readonly System.Text.Json.JsonEncodedText PropNodeStats = System.Text.Json.JsonEncodedText.Encode("_nodes");
+
+	public override ReloadSecureSettingsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propClusterName = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Nodes.NodeReloadResult>> propNodes = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.NodeStatistics?> propNodeStats = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propClusterName.TryRead(ref reader, options, PropClusterName))
+			{
+				continue;
+			}
+
+			if (propNodes.TryRead(ref reader, options, PropNodes))
+			{
+				continue;
+			}
+
+			if (propNodeStats.TryRead(ref reader, options, PropNodeStats))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ReloadSecureSettingsResponse
+		{
+			ClusterName = propClusterName.Value
+,
+			Nodes = propNodes.Value
+,
+			NodeStats = propNodeStats.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ReloadSecureSettingsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropClusterName, value.ClusterName);
+		writer.WriteProperty(options, PropNodes, value.Nodes);
+		writer.WriteProperty(options, PropNodeStats, value.NodeStats);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ReloadSecureSettingsResponseConverter))]
 public sealed partial class ReloadSecureSettingsResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("cluster_name")]
 	public string ClusterName { get; init; }
-	[JsonInclude, JsonPropertyName("nodes")]
 	public IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Nodes.NodeReloadResult> Nodes { get; init; }
 
 	/// <summary>
@@ -38,6 +93,5 @@ public sealed partial class ReloadSecureSettingsResponse : ElasticsearchResponse
 	/// Contains statistics about the number of nodes selected by the request’s node filters.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("_nodes")]
 	public Elastic.Clients.Elasticsearch.NodeStatistics? NodeStats { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/OpenPointInTimeResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/OpenPointInTimeResponse.g.cs
index 1dd4dd1105d..36bf2640d08 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/OpenPointInTimeResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/OpenPointInTimeResponse.g.cs
@@ -18,17 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch;
 
+internal sealed partial class OpenPointInTimeResponseConverter : System.Text.Json.Serialization.JsonConverter<OpenPointInTimeResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("id");
+	private static readonly System.Text.Json.JsonEncodedText PropShards = System.Text.Json.JsonEncodedText.Encode("_shards");
+
+	public override OpenPointInTimeResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propId = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.ShardStatistics> propShards = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propId.TryRead(ref reader, options, PropId))
+			{
+				continue;
+			}
+
+			if (propShards.TryRead(ref reader, options, PropShards))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new OpenPointInTimeResponse
+		{
+			Id = propId.Value
+,
+			Shards = propShards.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, OpenPointInTimeResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropId, value.Id);
+		writer.WriteProperty(options, PropShards, value.Shards);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(OpenPointInTimeResponseConverter))]
 public sealed partial class OpenPointInTimeResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("id")]
 	public string Id { get; init; }
 
 	/// <summary>
@@ -36,6 +82,5 @@ public sealed partial class OpenPointInTimeResponse : ElasticsearchResponse
 	/// Shards used to create the PIT
 	/// </para>
 	/// </summary>
-	[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/PutScriptResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/PutScriptResponse.g.cs
index 7b863a48caa..ea88684cb8d 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/PutScriptResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/PutScriptResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch;
 
+internal sealed partial class PutScriptResponseConverter : System.Text.Json.Serialization.JsonConverter<PutScriptResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override PutScriptResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutScriptResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutScriptResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PutScriptResponseConverter))]
 public sealed partial class PutScriptResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class PutScriptResponse : ElasticsearchResponse
 	/// 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/QueryRules/DeleteRuleResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/QueryRules/DeleteRuleResponse.g.cs
index cd36153036e..e11b9cd9987 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/QueryRules/DeleteRuleResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/QueryRules/DeleteRuleResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.QueryRules;
 
+internal sealed partial class DeleteRuleResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteRuleResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override DeleteRuleResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteRuleResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteRuleResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteRuleResponseConverter))]
 public sealed partial class DeleteRuleResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class DeleteRuleResponse : ElasticsearchResponse
 	/// 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/QueryRules/DeleteRulesetResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/QueryRules/DeleteRulesetResponse.g.cs
index eb6ccc13ee9..dc7d6b7d8eb 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/QueryRules/DeleteRulesetResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/QueryRules/DeleteRulesetResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.QueryRules;
 
+internal sealed partial class DeleteRulesetResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteRulesetResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override DeleteRulesetResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteRulesetResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteRulesetResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteRulesetResponseConverter))]
 public sealed partial class DeleteRulesetResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class DeleteRulesetResponse : ElasticsearchResponse
 	/// 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/QueryRules/GetRuleResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/QueryRules/GetRuleResponse.g.cs
index b66e024dbbf..c45f65278c1 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/QueryRules/GetRuleResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/QueryRules/GetRuleResponse.g.cs
@@ -18,14 +18,91 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.QueryRules;
 
+internal sealed partial class GetRuleResponseConverter : System.Text.Json.Serialization.JsonConverter<GetRuleResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropActions = System.Text.Json.JsonEncodedText.Encode("actions");
+	private static readonly System.Text.Json.JsonEncodedText PropCriteria = System.Text.Json.JsonEncodedText.Encode("criteria");
+	private static readonly System.Text.Json.JsonEncodedText PropPriority = System.Text.Json.JsonEncodedText.Encode("priority");
+	private static readonly System.Text.Json.JsonEncodedText PropRuleId = System.Text.Json.JsonEncodedText.Encode("rule_id");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override GetRuleResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.QueryRules.QueryRuleActions> propActions = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.QueryRules.QueryRuleCriteria>> propCriteria = default;
+		LocalJsonProperty<int?> propPriority = default;
+		LocalJsonProperty<string> propRuleId = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.QueryRules.QueryRuleType> propType = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propActions.TryRead(ref reader, options, PropActions))
+			{
+				continue;
+			}
+
+			if (propCriteria.TryRead(ref reader, options, PropCriteria, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.QueryRules.QueryRuleCriteria>, Elastic.Clients.Elasticsearch.QueryRules.QueryRuleCriteria>)))
+			{
+				continue;
+			}
+
+			if (propPriority.TryRead(ref reader, options, PropPriority))
+			{
+				continue;
+			}
+
+			if (propRuleId.TryRead(ref reader, options, PropRuleId))
+			{
+				continue;
+			}
+
+			if (propType.TryRead(ref reader, options, PropType))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetRuleResponse
+		{
+			Actions = propActions.Value
+,
+			Criteria = propCriteria.Value
+,
+			Priority = propPriority.Value
+,
+			RuleId = propRuleId.Value
+,
+			Type = propType.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetRuleResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropActions, value.Actions);
+		writer.WriteProperty(options, PropCriteria, value.Criteria, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.QueryRules.QueryRuleCriteria>, Elastic.Clients.Elasticsearch.QueryRules.QueryRuleCriteria>));
+		writer.WriteProperty(options, PropPriority, value.Priority);
+		writer.WriteProperty(options, PropRuleId, value.RuleId);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetRuleResponseConverter))]
 public sealed partial class GetRuleResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -34,7 +111,6 @@ public sealed partial class GetRuleResponse : ElasticsearchResponse
 	/// The format of this action depends on the rule type.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("actions")]
 	public Elastic.Clients.Elasticsearch.QueryRules.QueryRuleActions Actions { get; init; }
 
 	/// <summary>
@@ -43,10 +119,7 @@ public sealed partial class GetRuleResponse : ElasticsearchResponse
 	/// If multiple criteria are specified for a rule, all criteria must be met for the rule to be applied.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("criteria")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.QueryRules.QueryRuleCriteria))]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.QueryRules.QueryRuleCriteria> Criteria { get; init; }
-	[JsonInclude, JsonPropertyName("priority")]
 	public int? Priority { get; init; }
 
 	/// <summary>
@@ -54,7 +127,6 @@ public sealed partial class GetRuleResponse : ElasticsearchResponse
 	/// A unique identifier for the rule.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("rule_id")]
 	public string RuleId { get; init; }
 
 	/// <summary>
@@ -64,6 +136,5 @@ public sealed partial class GetRuleResponse : ElasticsearchResponse
 	/// <c>exclude</c> will exclude specific documents from search results.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("type")]
 	public Elastic.Clients.Elasticsearch.QueryRules.QueryRuleType Type { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/QueryRules/GetRulesetResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/QueryRules/GetRulesetResponse.g.cs
index d4cef289e17..3647b8c8637 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/QueryRules/GetRulesetResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/QueryRules/GetRulesetResponse.g.cs
@@ -18,14 +18,61 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.QueryRules;
 
+internal sealed partial class GetRulesetResponseConverter : System.Text.Json.Serialization.JsonConverter<GetRulesetResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropRules = System.Text.Json.JsonEncodedText.Encode("rules");
+	private static readonly System.Text.Json.JsonEncodedText PropRulesetId = System.Text.Json.JsonEncodedText.Encode("ruleset_id");
+
+	public override GetRulesetResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.QueryRules.QueryRule>> propRules = default;
+		LocalJsonProperty<string> propRulesetId = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propRules.TryRead(ref reader, options, PropRules))
+			{
+				continue;
+			}
+
+			if (propRulesetId.TryRead(ref reader, options, PropRulesetId))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetRulesetResponse
+		{
+			Rules = propRules.Value
+,
+			RulesetId = propRulesetId.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetRulesetResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropRules, value.Rules);
+		writer.WriteProperty(options, PropRulesetId, value.RulesetId);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetRulesetResponseConverter))]
 public sealed partial class GetRulesetResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,7 +80,6 @@ public sealed partial class GetRulesetResponse : ElasticsearchResponse
 	/// Rules associated with the query ruleset.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("rules")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.QueryRules.QueryRule> Rules { get; init; }
 
 	/// <summary>
@@ -41,6 +87,5 @@ public sealed partial class GetRulesetResponse : ElasticsearchResponse
 	/// A unique identifier for the ruleset.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("ruleset_id")]
 	public string RulesetId { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/QueryRules/ListRulesetsResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/QueryRules/ListRulesetsResponse.g.cs
index dc7e677080a..1e1a223ce08 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/QueryRules/ListRulesetsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/QueryRules/ListRulesetsResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.QueryRules;
 
+internal sealed partial class ListRulesetsResponseConverter : System.Text.Json.Serialization.JsonConverter<ListRulesetsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCount = System.Text.Json.JsonEncodedText.Encode("count");
+	private static readonly System.Text.Json.JsonEncodedText PropResults = System.Text.Json.JsonEncodedText.Encode("results");
+
+	public override ListRulesetsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<long> propCount = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.QueryRules.QueryRulesetListItem>> propResults = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCount.TryRead(ref reader, options, PropCount))
+			{
+				continue;
+			}
+
+			if (propResults.TryRead(ref reader, options, PropResults))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ListRulesetsResponse
+		{
+			Count = propCount.Value
+,
+			Results = propResults.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ListRulesetsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCount, value.Count);
+		writer.WriteProperty(options, PropResults, value.Results);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ListRulesetsResponseConverter))]
 public sealed partial class ListRulesetsResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("count")]
 	public long Count { get; init; }
-	[JsonInclude, JsonPropertyName("results")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.QueryRules.QueryRulesetListItem> Results { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/QueryRules/PutRuleRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/QueryRules/PutRuleRequest.g.cs
index 0fd2174e097..fcbe2f9cb40 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/QueryRules/PutRuleRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/QueryRules/PutRuleRequest.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport;
@@ -34,6 +35,69 @@ public sealed partial class PutRuleRequestParameters : RequestParameters
 {
 }
 
+internal sealed partial class PutRuleRequestConverter : System.Text.Json.Serialization.JsonConverter<PutRuleRequest>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropActions = System.Text.Json.JsonEncodedText.Encode("actions");
+	private static readonly System.Text.Json.JsonEncodedText PropCriteria = System.Text.Json.JsonEncodedText.Encode("criteria");
+	private static readonly System.Text.Json.JsonEncodedText PropPriority = System.Text.Json.JsonEncodedText.Encode("priority");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override PutRuleRequest Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.QueryRules.QueryRuleActions> propActions = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.QueryRules.QueryRuleCriteria>> propCriteria = default;
+		LocalJsonProperty<int?> propPriority = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.QueryRules.QueryRuleType> propType = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propActions.TryRead(ref reader, options, PropActions))
+			{
+				continue;
+			}
+
+			if (propCriteria.TryRead(ref reader, options, PropCriteria, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.QueryRules.QueryRuleCriteria>, Elastic.Clients.Elasticsearch.QueryRules.QueryRuleCriteria>)))
+			{
+				continue;
+			}
+
+			if (propPriority.TryRead(ref reader, options, PropPriority))
+			{
+				continue;
+			}
+
+			if (propType.TryRead(ref reader, options, PropType))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutRuleRequest
+		{
+			Actions = propActions.Value
+,
+			Criteria = propCriteria.Value
+,
+			Priority = propPriority.Value
+,
+			Type = propType.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutRuleRequest value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropActions, value.Actions);
+		writer.WriteProperty(options, PropCriteria, value.Criteria, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.QueryRules.QueryRuleCriteria>, Elastic.Clients.Elasticsearch.QueryRules.QueryRuleCriteria>));
+		writer.WriteProperty(options, PropPriority, value.Priority);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
 /// <summary>
 /// <para>
 /// Create or update a query rule.
@@ -46,6 +110,7 @@ public sealed partial class PutRuleRequestParameters : RequestParameters
 /// If multiple matching rules pin more than 100 documents, only the first 100 documents are pinned in the order they are specified in the ruleset.
 /// </para>
 /// </summary>
+[JsonConverter(typeof(PutRuleRequestConverter))]
 public sealed partial class PutRuleRequest : PlainRequest<PutRuleRequestParameters>
 {
 	public PutRuleRequest(Elastic.Clients.Elasticsearch.Id rulesetId, Elastic.Clients.Elasticsearch.Id ruleId) : base(r => r.Required("ruleset_id", rulesetId).Required("rule_id", ruleId))
@@ -66,7 +131,6 @@ public PutRuleRequest(Elastic.Clients.Elasticsearch.Id rulesetId, Elastic.Client
 	/// The format of this action depends on the rule type.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("actions")]
 	public Elastic.Clients.Elasticsearch.QueryRules.QueryRuleActions Actions { get; set; }
 
 	/// <summary>
@@ -75,10 +139,7 @@ public PutRuleRequest(Elastic.Clients.Elasticsearch.Id rulesetId, Elastic.Client
 	/// If multiple criteria are specified for a rule, all criteria must be met for the rule to be applied.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("criteria")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.QueryRules.QueryRuleCriteria))]
 	public ICollection<Elastic.Clients.Elasticsearch.QueryRules.QueryRuleCriteria> Criteria { get; set; }
-	[JsonInclude, JsonPropertyName("priority")]
 	public int? Priority { get; set; }
 
 	/// <summary>
@@ -86,7 +147,6 @@ public PutRuleRequest(Elastic.Clients.Elasticsearch.Id rulesetId, Elastic.Client
 	/// The type of rule.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("type")]
 	public Elastic.Clients.Elasticsearch.QueryRules.QueryRuleType Type { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/QueryRules/PutRuleResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/QueryRules/PutRuleResponse.g.cs
index b0df637361d..0d2e81ca3b0 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/QueryRules/PutRuleResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/QueryRules/PutRuleResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.QueryRules;
 
+internal sealed partial class PutRuleResponseConverter : System.Text.Json.Serialization.JsonConverter<PutRuleResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropResult = System.Text.Json.JsonEncodedText.Encode("result");
+
+	public override PutRuleResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Result> propResult = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propResult.TryRead(ref reader, options, PropResult))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutRuleResponse
+		{
+			Result = propResult.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutRuleResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropResult, value.Result);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PutRuleResponseConverter))]
 public sealed partial class PutRuleResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("result")]
 	public Elastic.Clients.Elasticsearch.Result Result { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/QueryRules/PutRulesetRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/QueryRules/PutRulesetRequest.g.cs
index 86ddbaede4e..344452250fb 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/QueryRules/PutRulesetRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/QueryRules/PutRulesetRequest.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport;
@@ -34,6 +35,39 @@ public sealed partial class PutRulesetRequestParameters : RequestParameters
 {
 }
 
+internal sealed partial class PutRulesetRequestConverter : System.Text.Json.Serialization.JsonConverter<PutRulesetRequest>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropRules = System.Text.Json.JsonEncodedText.Encode("rules");
+
+	public override PutRulesetRequest Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.QueryRules.QueryRule>> propRules = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propRules.TryRead(ref reader, options, PropRules, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.QueryRules.QueryRule>, Elastic.Clients.Elasticsearch.QueryRules.QueryRule>)))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutRulesetRequest
+		{
+			Rules = propRules.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutRulesetRequest value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropRules, value.Rules, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.QueryRules.QueryRule>, Elastic.Clients.Elasticsearch.QueryRules.QueryRule>));
+		writer.WriteEndObject();
+	}
+}
+
 /// <summary>
 /// <para>
 /// Create or update a query ruleset.
@@ -47,6 +81,7 @@ public sealed partial class PutRulesetRequestParameters : RequestParameters
 /// If multiple matching rules pin more than 100 documents, only the first 100 documents are pinned in the order they are specified in the ruleset.
 /// </para>
 /// </summary>
+[JsonConverter(typeof(PutRulesetRequestConverter))]
 public sealed partial class PutRulesetRequest : PlainRequest<PutRulesetRequestParameters>
 {
 	public PutRulesetRequest(Elastic.Clients.Elasticsearch.Id rulesetId) : base(r => r.Required("ruleset_id", rulesetId))
@@ -61,8 +96,6 @@ public PutRulesetRequest(Elastic.Clients.Elasticsearch.Id rulesetId) : base(r =>
 
 	internal override string OperationName => "query_rules.put_ruleset";
 
-	[JsonInclude, JsonPropertyName("rules")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.QueryRules.QueryRule))]
 	public ICollection<Elastic.Clients.Elasticsearch.QueryRules.QueryRule> Rules { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/QueryRules/PutRulesetResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/QueryRules/PutRulesetResponse.g.cs
index 23c35068711..55cb71bf504 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/QueryRules/PutRulesetResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/QueryRules/PutRulesetResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.QueryRules;
 
+internal sealed partial class PutRulesetResponseConverter : System.Text.Json.Serialization.JsonConverter<PutRulesetResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropResult = System.Text.Json.JsonEncodedText.Encode("result");
+
+	public override PutRulesetResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Result> propResult = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propResult.TryRead(ref reader, options, PropResult))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutRulesetResponse
+		{
+			Result = propResult.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutRulesetResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropResult, value.Result);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PutRulesetResponseConverter))]
 public sealed partial class PutRulesetResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("result")]
 	public Elastic.Clients.Elasticsearch.Result Result { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/QueryRules/TestResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/QueryRules/TestResponse.g.cs
index 6afa8a862e7..85f672f8365 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/QueryRules/TestResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/QueryRules/TestResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.QueryRules;
 
+internal sealed partial class TestResponseConverter : System.Text.Json.Serialization.JsonConverter<TestResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropMatchedRules = System.Text.Json.JsonEncodedText.Encode("matched_rules");
+	private static readonly System.Text.Json.JsonEncodedText PropTotalMatchedRules = System.Text.Json.JsonEncodedText.Encode("total_matched_rules");
+
+	public override TestResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.QueryRules.QueryRulesetMatchedRule>> propMatchedRules = default;
+		LocalJsonProperty<int> propTotalMatchedRules = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propMatchedRules.TryRead(ref reader, options, PropMatchedRules))
+			{
+				continue;
+			}
+
+			if (propTotalMatchedRules.TryRead(ref reader, options, PropTotalMatchedRules))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new TestResponse
+		{
+			MatchedRules = propMatchedRules.Value
+,
+			TotalMatchedRules = propTotalMatchedRules.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, TestResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropMatchedRules, value.MatchedRules);
+		writer.WriteProperty(options, PropTotalMatchedRules, value.TotalMatchedRules);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(TestResponseConverter))]
 public sealed partial class TestResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("matched_rules")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.QueryRules.QueryRulesetMatchedRule> MatchedRules { get; init; }
-	[JsonInclude, JsonPropertyName("total_matched_rules")]
 	public int TotalMatchedRules { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/RankEvalResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/RankEvalResponse.g.cs
index c8fffdd414c..812de5f8d24 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/RankEvalResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/RankEvalResponse.g.cs
@@ -18,14 +18,71 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch;
 
+internal sealed partial class RankEvalResponseConverter : System.Text.Json.Serialization.JsonConverter<RankEvalResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropDetails = System.Text.Json.JsonEncodedText.Encode("details");
+	private static readonly System.Text.Json.JsonEncodedText PropFailures = System.Text.Json.JsonEncodedText.Encode("failures");
+	private static readonly System.Text.Json.JsonEncodedText PropMetricScore = System.Text.Json.JsonEncodedText.Encode("metric_score");
+
+	public override RankEvalResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Core.RankEval.RankEvalMetricDetail>> propDetails = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, object>> propFailures = default;
+		LocalJsonProperty<double> propMetricScore = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propDetails.TryRead(ref reader, options, PropDetails))
+			{
+				continue;
+			}
+
+			if (propFailures.TryRead(ref reader, options, PropFailures))
+			{
+				continue;
+			}
+
+			if (propMetricScore.TryRead(ref reader, options, PropMetricScore))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new RankEvalResponse
+		{
+			Details = propDetails.Value
+,
+			Failures = propFailures.Value
+,
+			MetricScore = propMetricScore.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, RankEvalResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDetails, value.Details);
+		writer.WriteProperty(options, PropFailures, value.Failures);
+		writer.WriteProperty(options, PropMetricScore, value.MetricScore);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(RankEvalResponseConverter))]
 public sealed partial class RankEvalResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,9 +90,7 @@ public sealed partial class RankEvalResponse : ElasticsearchResponse
 	/// 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<string, Elastic.Clients.Elasticsearch.Core.RankEval.RankEvalMetricDetail> Details { get; init; }
-	[JsonInclude, JsonPropertyName("failures")]
 	public IReadOnlyDictionary<string, object> Failures { get; init; }
 
 	/// <summary>
@@ -43,6 +98,5 @@ public sealed partial class RankEvalResponse : ElasticsearchResponse
 	/// 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/ReindexResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/ReindexResponse.g.cs
index 615f5821c06..bfa83adaa1e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/ReindexResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/ReindexResponse.g.cs
@@ -18,46 +18,217 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch;
 
+internal sealed partial class ReindexResponseConverter : System.Text.Json.Serialization.JsonConverter<ReindexResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropBatches = System.Text.Json.JsonEncodedText.Encode("batches");
+	private static readonly System.Text.Json.JsonEncodedText PropCreated = System.Text.Json.JsonEncodedText.Encode("created");
+	private static readonly System.Text.Json.JsonEncodedText PropDeleted = System.Text.Json.JsonEncodedText.Encode("deleted");
+	private static readonly System.Text.Json.JsonEncodedText PropFailures = System.Text.Json.JsonEncodedText.Encode("failures");
+	private static readonly System.Text.Json.JsonEncodedText PropNoops = System.Text.Json.JsonEncodedText.Encode("noops");
+	private static readonly System.Text.Json.JsonEncodedText PropRequestsPerSecond = System.Text.Json.JsonEncodedText.Encode("requests_per_second");
+	private static readonly System.Text.Json.JsonEncodedText PropRetries = System.Text.Json.JsonEncodedText.Encode("retries");
+	private static readonly System.Text.Json.JsonEncodedText PropSliceId = System.Text.Json.JsonEncodedText.Encode("slice_id");
+	private static readonly System.Text.Json.JsonEncodedText PropTask = System.Text.Json.JsonEncodedText.Encode("task");
+	private static readonly System.Text.Json.JsonEncodedText PropThrottledMillis = System.Text.Json.JsonEncodedText.Encode("throttled_millis");
+	private static readonly System.Text.Json.JsonEncodedText PropThrottledUntilMillis = System.Text.Json.JsonEncodedText.Encode("throttled_until_millis");
+	private static readonly System.Text.Json.JsonEncodedText PropTimedOut = System.Text.Json.JsonEncodedText.Encode("timed_out");
+	private static readonly System.Text.Json.JsonEncodedText PropTook = System.Text.Json.JsonEncodedText.Encode("took");
+	private static readonly System.Text.Json.JsonEncodedText PropTotal = System.Text.Json.JsonEncodedText.Encode("total");
+	private static readonly System.Text.Json.JsonEncodedText PropUpdated = System.Text.Json.JsonEncodedText.Encode("updated");
+	private static readonly System.Text.Json.JsonEncodedText PropVersionConflicts = System.Text.Json.JsonEncodedText.Encode("version_conflicts");
+
+	public override ReindexResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<long?> propBatches = default;
+		LocalJsonProperty<long?> propCreated = default;
+		LocalJsonProperty<long?> propDeleted = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.BulkIndexByScrollFailure>?> propFailures = default;
+		LocalJsonProperty<long?> propNoops = default;
+		LocalJsonProperty<float?> propRequestsPerSecond = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Retries?> propRetries = default;
+		LocalJsonProperty<int?> propSliceId = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.TaskId?> propTask = default;
+		LocalJsonProperty<long?> propThrottledMillis = default;
+		LocalJsonProperty<long?> propThrottledUntilMillis = default;
+		LocalJsonProperty<bool?> propTimedOut = default;
+		LocalJsonProperty<long?> propTook = default;
+		LocalJsonProperty<long?> propTotal = default;
+		LocalJsonProperty<long?> propUpdated = default;
+		LocalJsonProperty<long?> propVersionConflicts = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBatches.TryRead(ref reader, options, PropBatches))
+			{
+				continue;
+			}
+
+			if (propCreated.TryRead(ref reader, options, PropCreated))
+			{
+				continue;
+			}
+
+			if (propDeleted.TryRead(ref reader, options, PropDeleted))
+			{
+				continue;
+			}
+
+			if (propFailures.TryRead(ref reader, options, PropFailures))
+			{
+				continue;
+			}
+
+			if (propNoops.TryRead(ref reader, options, PropNoops))
+			{
+				continue;
+			}
+
+			if (propRequestsPerSecond.TryRead(ref reader, options, PropRequestsPerSecond))
+			{
+				continue;
+			}
+
+			if (propRetries.TryRead(ref reader, options, PropRetries))
+			{
+				continue;
+			}
+
+			if (propSliceId.TryRead(ref reader, options, PropSliceId))
+			{
+				continue;
+			}
+
+			if (propTask.TryRead(ref reader, options, PropTask))
+			{
+				continue;
+			}
+
+			if (propThrottledMillis.TryRead(ref reader, options, PropThrottledMillis))
+			{
+				continue;
+			}
+
+			if (propThrottledUntilMillis.TryRead(ref reader, options, PropThrottledUntilMillis))
+			{
+				continue;
+			}
+
+			if (propTimedOut.TryRead(ref reader, options, PropTimedOut))
+			{
+				continue;
+			}
+
+			if (propTook.TryRead(ref reader, options, PropTook))
+			{
+				continue;
+			}
+
+			if (propTotal.TryRead(ref reader, options, PropTotal))
+			{
+				continue;
+			}
+
+			if (propUpdated.TryRead(ref reader, options, PropUpdated))
+			{
+				continue;
+			}
+
+			if (propVersionConflicts.TryRead(ref reader, options, PropVersionConflicts))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ReindexResponse
+		{
+			Batches = propBatches.Value
+,
+			Created = propCreated.Value
+,
+			Deleted = propDeleted.Value
+,
+			Failures = propFailures.Value
+,
+			Noops = propNoops.Value
+,
+			RequestsPerSecond = propRequestsPerSecond.Value
+,
+			Retries = propRetries.Value
+,
+			SliceId = propSliceId.Value
+,
+			Task = propTask.Value
+,
+			ThrottledMillis = propThrottledMillis.Value
+,
+			ThrottledUntilMillis = propThrottledUntilMillis.Value
+,
+			TimedOut = propTimedOut.Value
+,
+			Took = propTook.Value
+,
+			Total = propTotal.Value
+,
+			Updated = propUpdated.Value
+,
+			VersionConflicts = propVersionConflicts.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ReindexResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBatches, value.Batches);
+		writer.WriteProperty(options, PropCreated, value.Created);
+		writer.WriteProperty(options, PropDeleted, value.Deleted);
+		writer.WriteProperty(options, PropFailures, value.Failures);
+		writer.WriteProperty(options, PropNoops, value.Noops);
+		writer.WriteProperty(options, PropRequestsPerSecond, value.RequestsPerSecond);
+		writer.WriteProperty(options, PropRetries, value.Retries);
+		writer.WriteProperty(options, PropSliceId, value.SliceId);
+		writer.WriteProperty(options, PropTask, value.Task);
+		writer.WriteProperty(options, PropThrottledMillis, value.ThrottledMillis);
+		writer.WriteProperty(options, PropThrottledUntilMillis, value.ThrottledUntilMillis);
+		writer.WriteProperty(options, PropTimedOut, value.TimedOut);
+		writer.WriteProperty(options, PropTook, value.Took);
+		writer.WriteProperty(options, PropTotal, value.Total);
+		writer.WriteProperty(options, PropUpdated, value.Updated);
+		writer.WriteProperty(options, PropVersionConflicts, value.VersionConflicts);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ReindexResponseConverter))]
 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/ReindexRethrottleResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/ReindexRethrottleResponse.g.cs
index eb0a0d689a5..7fbc77f34d5 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/ReindexRethrottleResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/ReindexRethrottleResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch;
 
+internal sealed partial class ReindexRethrottleResponseConverter : System.Text.Json.Serialization.JsonConverter<ReindexRethrottleResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropNodes = System.Text.Json.JsonEncodedText.Encode("nodes");
+
+	public override ReindexRethrottleResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Core.ReindexRethrottle.ReindexNode>> propNodes = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propNodes.TryRead(ref reader, options, PropNodes))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ReindexRethrottleResponse
+		{
+			Nodes = propNodes.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ReindexRethrottleResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropNodes, value.Nodes);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ReindexRethrottleResponseConverter))]
 public sealed partial class ReindexRethrottleResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("nodes")]
 	public IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Core.ReindexRethrottle.ReindexNode> Nodes { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/RenderSearchTemplateResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/RenderSearchTemplateResponse.g.cs
index 9fba7ed830c..b41c91cf3d2 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/RenderSearchTemplateResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/RenderSearchTemplateResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch;
 
+internal sealed partial class RenderSearchTemplateResponseConverter : System.Text.Json.Serialization.JsonConverter<RenderSearchTemplateResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropTemplateOutput = System.Text.Json.JsonEncodedText.Encode("template_output");
+
+	public override RenderSearchTemplateResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyDictionary<string, object>> propTemplateOutput = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propTemplateOutput.TryRead(ref reader, options, PropTemplateOutput))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new RenderSearchTemplateResponse
+		{
+			TemplateOutput = propTemplateOutput.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, RenderSearchTemplateResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropTemplateOutput, value.TemplateOutput);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(RenderSearchTemplateResponseConverter))]
 public sealed partial class RenderSearchTemplateResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("template_output")]
 	public IReadOnlyDictionary<string, object> TemplateOutput { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Rollup/DeleteJobResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Rollup/DeleteJobResponse.g.cs
index ecf093b6b08..305088fe4a4 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Rollup/DeleteJobResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Rollup/DeleteJobResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Rollup;
 
+internal sealed partial class DeleteJobResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteJobResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+	private static readonly System.Text.Json.JsonEncodedText PropTaskFailures = System.Text.Json.JsonEncodedText.Encode("task_failures");
+
+	public override DeleteJobResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.TaskFailure>?> propTaskFailures = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			if (propTaskFailures.TryRead(ref reader, options, PropTaskFailures))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteJobResponse
+		{
+			Acknowledged = propAcknowledged.Value
+,
+			TaskFailures = propTaskFailures.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteJobResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteProperty(options, PropTaskFailures, value.TaskFailures);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteJobResponseConverter))]
 public sealed partial class DeleteJobResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("acknowledged")]
 	public bool Acknowledged { get; init; }
-	[JsonInclude, JsonPropertyName("task_failures")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.TaskFailure>? TaskFailures { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Rollup/GetJobsResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Rollup/GetJobsResponse.g.cs
index 94884fe565a..9288b4b0560 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Rollup/GetJobsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Rollup/GetJobsResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Rollup;
 
+internal sealed partial class GetJobsResponseConverter : System.Text.Json.Serialization.JsonConverter<GetJobsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropJobs = System.Text.Json.JsonEncodedText.Encode("jobs");
+
+	public override GetJobsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Rollup.RollupJob>> propJobs = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propJobs.TryRead(ref reader, options, PropJobs))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetJobsResponse
+		{
+			Jobs = propJobs.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetJobsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropJobs, value.Jobs);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetJobsResponseConverter))]
 public sealed partial class GetJobsResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("jobs")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Rollup.RollupJob> Jobs { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Rollup/PutJobResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Rollup/PutJobResponse.g.cs
index 4182c776136..4451dd6666a 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Rollup/PutJobResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Rollup/PutJobResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Rollup;
 
+internal sealed partial class PutJobResponseConverter : System.Text.Json.Serialization.JsonConverter<PutJobResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override PutJobResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutJobResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutJobResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PutJobResponseConverter))]
 public sealed partial class PutJobResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class PutJobResponse : ElasticsearchResponse
 	/// 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/Rollup/RollupSearchRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Rollup/RollupSearchRequest.g.cs
index e81b3267e9e..2330e6002a3 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Rollup/RollupSearchRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Rollup/RollupSearchRequest.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport;
@@ -47,62 +48,56 @@ public sealed partial class RollupSearchRequestParameters : RequestParameters
 	public bool? TypedKeys { get => Q<bool?>("typed_keys"); set => Q("typed_keys", value); }
 }
 
-internal sealed partial class RollupSearchRequestConverter : JsonConverter<RollupSearchRequest>
+internal sealed partial class RollupSearchRequestConverter : System.Text.Json.Serialization.JsonConverter<RollupSearchRequest>
 {
-	public override RollupSearchRequest Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations1 = System.Text.Json.JsonEncodedText.Encode("aggs");
+	private static readonly System.Text.Json.JsonEncodedText PropQuery = System.Text.Json.JsonEncodedText.Encode("query");
+	private static readonly System.Text.Json.JsonEncodedText PropSize = System.Text.Json.JsonEncodedText.Encode("size");
+
+	public override RollupSearchRequest Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		var variant = new RollupSearchRequest();
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IDictionary<string, Elastic.Clients.Elasticsearch.Aggregations.Aggregation>?> propAggregations = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.QueryDsl.Query?> propQuery = default;
+		LocalJsonProperty<int?> propSize = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propAggregations.TryRead(ref reader, options, PropAggregations) || propAggregations.TryRead(ref reader, options, PropAggregations1))
 			{
-				var property = reader.GetString();
-				if (property == "aggregations" || property == "aggs")
-				{
-					variant.Aggregations = JsonSerializer.Deserialize<IDictionary<string, Elastic.Clients.Elasticsearch.Aggregations.Aggregation>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "query")
-				{
-					variant.Query = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.Query?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "size")
-				{
-					variant.Size = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
+				continue;
 			}
-		}
 
-		return variant;
-	}
+			if (propQuery.TryRead(ref reader, options, PropQuery))
+			{
+				continue;
+			}
 
-	public override void Write(Utf8JsonWriter writer, RollupSearchRequest value, JsonSerializerOptions options)
-	{
-		writer.WriteStartObject();
-		if (value.Aggregations is not null)
-		{
-			writer.WritePropertyName("aggregations");
-			JsonSerializer.Serialize(writer, value.Aggregations, options);
-		}
+			if (propSize.TryRead(ref reader, options, PropSize))
+			{
+				continue;
+			}
 
-		if (value.Query is not null)
-		{
-			writer.WritePropertyName("query");
-			JsonSerializer.Serialize(writer, value.Query, options);
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		if (value.Size.HasValue)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new RollupSearchRequest
 		{
-			writer.WritePropertyName("size");
-			writer.WriteNumberValue(value.Size.Value);
-		}
+			Aggregations = propAggregations.Value
+	,
+			Query = propQuery.Value
+	,
+			Size = propSize.Value
+		};
+	}
 
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, RollupSearchRequest value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAggregations, value.Aggregations);
+		writer.WriteProperty(options, PropQuery, value.Query);
+		writer.WriteProperty(options, PropSize, value.Size);
 		writer.WriteEndObject();
 	}
 }
@@ -185,7 +180,6 @@ public RollupSearchRequest()
 	/// 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>
@@ -193,7 +187,6 @@ public RollupSearchRequest()
 	/// 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>
@@ -201,7 +194,6 @@ public RollupSearchRequest()
 	/// Specifies aggregations.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("aggregations")]
 	public IDictionary<string, Elastic.Clients.Elasticsearch.Aggregations.Aggregation>? Aggregations { get; set; }
 
 	/// <summary>
@@ -209,7 +201,6 @@ public RollupSearchRequest()
 	/// Specifies a DSL query that is subject to some limitations.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("query")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.Query? Query { get; set; }
 
 	/// <summary>
@@ -217,7 +208,6 @@ public RollupSearchRequest()
 	/// Must be zero if set, as rollups work on pre-aggregated data.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("size")]
 	public int? Size { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Rollup/RollupSearchResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Rollup/RollupSearchResponse.g.cs
index 16d3e49bdad..83db03ef86f 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Rollup/RollupSearchResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Rollup/RollupSearchResponse.g.cs
@@ -18,26 +18,124 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Rollup;
 
+internal sealed partial class RollupSearchResponseConverter<TDocument> : System.Text.Json.Serialization.JsonConverter<RollupSearchResponse<TDocument>>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropHits = System.Text.Json.JsonEncodedText.Encode("hits");
+	private static readonly System.Text.Json.JsonEncodedText PropShards = System.Text.Json.JsonEncodedText.Encode("_shards");
+	private static readonly System.Text.Json.JsonEncodedText PropTerminatedEarly = System.Text.Json.JsonEncodedText.Encode("terminated_early");
+	private static readonly System.Text.Json.JsonEncodedText PropTimedOut = System.Text.Json.JsonEncodedText.Encode("timed_out");
+	private static readonly System.Text.Json.JsonEncodedText PropTook = System.Text.Json.JsonEncodedText.Encode("took");
+
+	public override RollupSearchResponse<TDocument> Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary?> propAggregations = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Core.Search.HitsMetadata<TDocument>> propHits = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.ShardStatistics> propShards = default;
+		LocalJsonProperty<bool?> propTerminatedEarly = default;
+		LocalJsonProperty<bool> propTimedOut = default;
+		LocalJsonProperty<long> propTook = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAggregations.TryRead(ref reader, options, PropAggregations))
+			{
+				continue;
+			}
+
+			if (propHits.TryRead(ref reader, options, PropHits))
+			{
+				continue;
+			}
+
+			if (propShards.TryRead(ref reader, options, PropShards))
+			{
+				continue;
+			}
+
+			if (propTerminatedEarly.TryRead(ref reader, options, PropTerminatedEarly))
+			{
+				continue;
+			}
+
+			if (propTimedOut.TryRead(ref reader, options, PropTimedOut))
+			{
+				continue;
+			}
+
+			if (propTook.TryRead(ref reader, options, PropTook))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new RollupSearchResponse<TDocument>
+		{
+			Aggregations = propAggregations.Value
+,
+			Hits = propHits.Value
+,
+			Shards = propShards.Value
+,
+			TerminatedEarly = propTerminatedEarly.Value
+,
+			TimedOut = propTimedOut.Value
+,
+			Took = propTook.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, RollupSearchResponse<TDocument> value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAggregations, value.Aggregations);
+		writer.WriteProperty(options, PropHits, value.Hits);
+		writer.WriteProperty(options, PropShards, value.Shards);
+		writer.WriteProperty(options, PropTerminatedEarly, value.TerminatedEarly);
+		writer.WriteProperty(options, PropTimedOut, value.TimedOut);
+		writer.WriteProperty(options, PropTook, value.Took);
+		writer.WriteEndObject();
+	}
+}
+
+internal sealed partial class RollupSearchResponseConverterFactory : System.Text.Json.Serialization.JsonConverterFactory
+{
+	public override bool CanConvert(System.Type typeToConvert)
+	{
+		return typeToConvert.IsGenericType && typeToConvert.GetGenericTypeDefinition() == typeof(RollupSearchResponse<>);
+	}
+
+	public override System.Text.Json.Serialization.JsonConverter CreateConverter(System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		var args = typeToConvert.GetGenericArguments();
+#pragma warning disable IL3050
+		var converter = (System.Text.Json.Serialization.JsonConverter)System.Activator.CreateInstance(typeof(RollupSearchResponseConverter<>).MakeGenericType(args[0]), System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public, binder: null, args: null, culture: null)!;
+#pragma warning restore IL3050
+		return converter;
+	}
+}
+
+[JsonConverter(typeof(RollupSearchResponseConverterFactory))]
 public sealed partial class RollupSearchResponse<TDocument> : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("aggregations")]
 	public Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary? Aggregations { get; init; }
-	[JsonInclude, JsonPropertyName("hits")]
 	public Elastic.Clients.Elasticsearch.Core.Search.HitsMetadata<TDocument> Hits { 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/Rollup/StartJobResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Rollup/StartJobResponse.g.cs
index 1d6d05f4ff7..e7f45568e6b 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Rollup/StartJobResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Rollup/StartJobResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Rollup;
 
+internal sealed partial class StartJobResponseConverter : System.Text.Json.Serialization.JsonConverter<StartJobResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStarted = System.Text.Json.JsonEncodedText.Encode("started");
+
+	public override StartJobResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propStarted = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStarted.TryRead(ref reader, options, PropStarted))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new StartJobResponse
+		{
+			Started = propStarted.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, StartJobResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStarted, value.Started);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(StartJobResponseConverter))]
 public sealed partial class StartJobResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("started")]
 	public bool Started { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Rollup/StopJobResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Rollup/StopJobResponse.g.cs
index 9f696d586bc..984f09e98c9 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Rollup/StopJobResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Rollup/StopJobResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Rollup;
 
+internal sealed partial class StopJobResponseConverter : System.Text.Json.Serialization.JsonConverter<StopJobResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStopped = System.Text.Json.JsonEncodedText.Encode("stopped");
+
+	public override StopJobResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propStopped = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStopped.TryRead(ref reader, options, PropStopped))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new StopJobResponse
+		{
+			Stopped = propStopped.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, StopJobResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStopped, value.Stopped);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(StopJobResponseConverter))]
 public sealed partial class StopJobResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("stopped")]
 	public bool Stopped { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/ScriptsPainlessExecuteResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/ScriptsPainlessExecuteResponse.g.cs
index d2c5569f64c..8145c88b30a 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/ScriptsPainlessExecuteResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/ScriptsPainlessExecuteResponse.g.cs
@@ -18,17 +18,69 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch;
 
+internal sealed partial class ScriptsPainlessExecuteResponseConverter<TResult> : System.Text.Json.Serialization.JsonConverter<ScriptsPainlessExecuteResponse<TResult>>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropResult = System.Text.Json.JsonEncodedText.Encode("result");
+
+	public override ScriptsPainlessExecuteResponse<TResult> Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<TResult> propResult = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propResult.TryRead(ref reader, options, PropResult, typeof(SourceMarker<TResult>)))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ScriptsPainlessExecuteResponse<TResult>
+		{
+			Result = propResult.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ScriptsPainlessExecuteResponse<TResult> value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropResult, value.Result, typeof(SourceMarker<TResult>));
+		writer.WriteEndObject();
+	}
+}
+
+internal sealed partial class ScriptsPainlessExecuteResponseConverterFactory : System.Text.Json.Serialization.JsonConverterFactory
+{
+	public override bool CanConvert(System.Type typeToConvert)
+	{
+		return typeToConvert.IsGenericType && typeToConvert.GetGenericTypeDefinition() == typeof(ScriptsPainlessExecuteResponse<>);
+	}
+
+	public override System.Text.Json.Serialization.JsonConverter CreateConverter(System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		var args = typeToConvert.GetGenericArguments();
+#pragma warning disable IL3050
+		var converter = (System.Text.Json.Serialization.JsonConverter)System.Activator.CreateInstance(typeof(ScriptsPainlessExecuteResponseConverter<>).MakeGenericType(args[0]), System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public, binder: null, args: null, culture: null)!;
+#pragma warning restore IL3050
+		return converter;
+	}
+}
+
+[JsonConverter(typeof(ScriptsPainlessExecuteResponseConverterFactory))]
 public sealed partial class ScriptsPainlessExecuteResponse<TResult> : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("result")]
-	[SourceConverter]
 	public TResult Result { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/ScrollResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/ScrollResponse.g.cs
index 056d1985d46..007aed41cfc 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/ScrollResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/ScrollResponse.g.cs
@@ -18,42 +18,212 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch;
 
+internal sealed partial class ScrollResponseConverter<TDocument> : System.Text.Json.Serialization.JsonConverter<ScrollResponse<TDocument>>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropClusters = System.Text.Json.JsonEncodedText.Encode("_clusters");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropHitsMetadata = System.Text.Json.JsonEncodedText.Encode("hits");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxScore = System.Text.Json.JsonEncodedText.Encode("max_score");
+	private static readonly System.Text.Json.JsonEncodedText PropNumReducePhases = System.Text.Json.JsonEncodedText.Encode("num_reduce_phases");
+	private static readonly System.Text.Json.JsonEncodedText PropPitId = System.Text.Json.JsonEncodedText.Encode("pit_id");
+	private static readonly System.Text.Json.JsonEncodedText PropProfile = System.Text.Json.JsonEncodedText.Encode("profile");
+	private static readonly System.Text.Json.JsonEncodedText PropScrollId = System.Text.Json.JsonEncodedText.Encode("_scroll_id");
+	private static readonly System.Text.Json.JsonEncodedText PropShards = System.Text.Json.JsonEncodedText.Encode("_shards");
+	private static readonly System.Text.Json.JsonEncodedText PropSuggest = System.Text.Json.JsonEncodedText.Encode("suggest");
+	private static readonly System.Text.Json.JsonEncodedText PropTerminatedEarly = System.Text.Json.JsonEncodedText.Encode("terminated_early");
+	private static readonly System.Text.Json.JsonEncodedText PropTimedOut = System.Text.Json.JsonEncodedText.Encode("timed_out");
+	private static readonly System.Text.Json.JsonEncodedText PropTook = System.Text.Json.JsonEncodedText.Encode("took");
+
+	public override ScrollResponse<TDocument> Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary?> propAggregations = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.ClusterStatistics?> propClusters = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, object>?> propFields = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Core.Search.HitsMetadata<TDocument>> propHitsMetadata = default;
+		LocalJsonProperty<double?> propMaxScore = default;
+		LocalJsonProperty<long?> propNumReducePhases = default;
+		LocalJsonProperty<string?> propPitId = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Core.Search.Profile?> propProfile = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.ScrollId?> propScrollId = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.ShardStatistics> propShards = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Core.Search.SuggestDictionary<TDocument>?> propSuggest = default;
+		LocalJsonProperty<bool?> propTerminatedEarly = default;
+		LocalJsonProperty<bool> propTimedOut = default;
+		LocalJsonProperty<long> propTook = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAggregations.TryRead(ref reader, options, PropAggregations))
+			{
+				continue;
+			}
+
+			if (propClusters.TryRead(ref reader, options, PropClusters))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propHitsMetadata.TryRead(ref reader, options, PropHitsMetadata))
+			{
+				continue;
+			}
+
+			if (propMaxScore.TryRead(ref reader, options, PropMaxScore))
+			{
+				continue;
+			}
+
+			if (propNumReducePhases.TryRead(ref reader, options, PropNumReducePhases))
+			{
+				continue;
+			}
+
+			if (propPitId.TryRead(ref reader, options, PropPitId))
+			{
+				continue;
+			}
+
+			if (propProfile.TryRead(ref reader, options, PropProfile))
+			{
+				continue;
+			}
+
+			if (propScrollId.TryRead(ref reader, options, PropScrollId))
+			{
+				continue;
+			}
+
+			if (propShards.TryRead(ref reader, options, PropShards))
+			{
+				continue;
+			}
+
+			if (propSuggest.TryRead(ref reader, options, PropSuggest))
+			{
+				continue;
+			}
+
+			if (propTerminatedEarly.TryRead(ref reader, options, PropTerminatedEarly))
+			{
+				continue;
+			}
+
+			if (propTimedOut.TryRead(ref reader, options, PropTimedOut))
+			{
+				continue;
+			}
+
+			if (propTook.TryRead(ref reader, options, PropTook))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ScrollResponse<TDocument>
+		{
+			Aggregations = propAggregations.Value
+,
+			Clusters = propClusters.Value
+,
+			Fields = propFields.Value
+,
+			HitsMetadata = propHitsMetadata.Value
+,
+			MaxScore = propMaxScore.Value
+,
+			NumReducePhases = propNumReducePhases.Value
+,
+			PitId = propPitId.Value
+,
+			Profile = propProfile.Value
+,
+			ScrollId = propScrollId.Value
+,
+			Shards = propShards.Value
+,
+			Suggest = propSuggest.Value
+,
+			TerminatedEarly = propTerminatedEarly.Value
+,
+			TimedOut = propTimedOut.Value
+,
+			Took = propTook.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ScrollResponse<TDocument> value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAggregations, value.Aggregations);
+		writer.WriteProperty(options, PropClusters, value.Clusters);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropHitsMetadata, value.HitsMetadata);
+		writer.WriteProperty(options, PropMaxScore, value.MaxScore);
+		writer.WriteProperty(options, PropNumReducePhases, value.NumReducePhases);
+		writer.WriteProperty(options, PropPitId, value.PitId);
+		writer.WriteProperty(options, PropProfile, value.Profile);
+		writer.WriteProperty(options, PropScrollId, value.ScrollId);
+		writer.WriteProperty(options, PropShards, value.Shards);
+		writer.WriteProperty(options, PropSuggest, value.Suggest);
+		writer.WriteProperty(options, PropTerminatedEarly, value.TerminatedEarly);
+		writer.WriteProperty(options, PropTimedOut, value.TimedOut);
+		writer.WriteProperty(options, PropTook, value.Took);
+		writer.WriteEndObject();
+	}
+}
+
+internal sealed partial class ScrollResponseConverterFactory : System.Text.Json.Serialization.JsonConverterFactory
+{
+	public override bool CanConvert(System.Type typeToConvert)
+	{
+		return typeToConvert.IsGenericType && typeToConvert.GetGenericTypeDefinition() == typeof(ScrollResponse<>);
+	}
+
+	public override System.Text.Json.Serialization.JsonConverter CreateConverter(System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		var args = typeToConvert.GetGenericArguments();
+#pragma warning disable IL3050
+		var converter = (System.Text.Json.Serialization.JsonConverter)System.Activator.CreateInstance(typeof(ScrollResponseConverter<>).MakeGenericType(args[0]), System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public, binder: null, args: null, culture: null)!;
+#pragma warning restore IL3050
+		return converter;
+	}
+}
+
+[JsonConverter(typeof(ScrollResponseConverterFactory))]
 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("suggest")]
 	public Elastic.Clients.Elasticsearch.Core.Search.SuggestDictionary<TDocument>? Suggest { 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/SearchApplication/DeleteBehavioralAnalyticsResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchApplication/DeleteBehavioralAnalyticsResponse.g.cs
index 815097e6f70..7b0901ef8a3 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchApplication/DeleteBehavioralAnalyticsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchApplication/DeleteBehavioralAnalyticsResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.SearchApplication;
 
+internal sealed partial class DeleteBehavioralAnalyticsResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteBehavioralAnalyticsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override DeleteBehavioralAnalyticsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteBehavioralAnalyticsResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteBehavioralAnalyticsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteBehavioralAnalyticsResponseConverter))]
 public sealed partial class DeleteBehavioralAnalyticsResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class DeleteBehavioralAnalyticsResponse : ElasticsearchRes
 	/// 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/SearchApplication/DeleteSearchApplicationResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchApplication/DeleteSearchApplicationResponse.g.cs
index 25ab747e186..b54821b14f6 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchApplication/DeleteSearchApplicationResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchApplication/DeleteSearchApplicationResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.SearchApplication;
 
+internal sealed partial class DeleteSearchApplicationResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteSearchApplicationResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override DeleteSearchApplicationResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteSearchApplicationResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteSearchApplicationResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteSearchApplicationResponseConverter))]
 public sealed partial class DeleteSearchApplicationResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class DeleteSearchApplicationResponse : ElasticsearchRespo
 	/// 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/SearchApplication/GetSearchApplicationResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchApplication/GetSearchApplicationResponse.g.cs
index e8dfe37f8c5..5adcae66344 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchApplication/GetSearchApplicationResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchApplication/GetSearchApplicationResponse.g.cs
@@ -18,14 +18,91 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.SearchApplication;
 
+internal sealed partial class GetSearchApplicationResponseConverter : System.Text.Json.Serialization.JsonConverter<GetSearchApplicationResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAnalyticsCollectionName = System.Text.Json.JsonEncodedText.Encode("analytics_collection_name");
+	private static readonly System.Text.Json.JsonEncodedText PropIndices = System.Text.Json.JsonEncodedText.Encode("indices");
+	private static readonly System.Text.Json.JsonEncodedText PropName = System.Text.Json.JsonEncodedText.Encode("name");
+	private static readonly System.Text.Json.JsonEncodedText PropTemplate = System.Text.Json.JsonEncodedText.Encode("template");
+	private static readonly System.Text.Json.JsonEncodedText PropUpdatedAtMillis = System.Text.Json.JsonEncodedText.Encode("updated_at_millis");
+
+	public override GetSearchApplicationResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string?> propAnalyticsCollectionName = default;
+		LocalJsonProperty<IReadOnlyCollection<string>> propIndices = default;
+		LocalJsonProperty<string> propName = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.SearchApplication.SearchApplicationTemplate?> propTemplate = default;
+		LocalJsonProperty<long> propUpdatedAtMillis = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAnalyticsCollectionName.TryRead(ref reader, options, PropAnalyticsCollectionName))
+			{
+				continue;
+			}
+
+			if (propIndices.TryRead(ref reader, options, PropIndices))
+			{
+				continue;
+			}
+
+			if (propName.TryRead(ref reader, options, PropName))
+			{
+				continue;
+			}
+
+			if (propTemplate.TryRead(ref reader, options, PropTemplate))
+			{
+				continue;
+			}
+
+			if (propUpdatedAtMillis.TryRead(ref reader, options, PropUpdatedAtMillis))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetSearchApplicationResponse
+		{
+			AnalyticsCollectionName = propAnalyticsCollectionName.Value
+,
+			Indices = propIndices.Value
+,
+			Name = propName.Value
+,
+			Template = propTemplate.Value
+,
+			UpdatedAtMillis = propUpdatedAtMillis.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetSearchApplicationResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAnalyticsCollectionName, value.AnalyticsCollectionName);
+		writer.WriteProperty(options, PropIndices, value.Indices);
+		writer.WriteProperty(options, PropName, value.Name);
+		writer.WriteProperty(options, PropTemplate, value.Template);
+		writer.WriteProperty(options, PropUpdatedAtMillis, value.UpdatedAtMillis);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetSearchApplicationResponseConverter))]
 public sealed partial class GetSearchApplicationResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,7 +110,6 @@ public sealed partial class GetSearchApplicationResponse : ElasticsearchResponse
 	/// Analytics collection associated to the Search Application.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("analytics_collection_name")]
 	public string? AnalyticsCollectionName { get; init; }
 
 	/// <summary>
@@ -41,7 +117,6 @@ public sealed partial class GetSearchApplicationResponse : ElasticsearchResponse
 	/// Indices that are part of the Search Application.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("indices")]
 	public IReadOnlyCollection<string> Indices { get; init; }
 
 	/// <summary>
@@ -49,7 +124,6 @@ public sealed partial class GetSearchApplicationResponse : ElasticsearchResponse
 	/// Search Application name
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("name")]
 	public string Name { get; init; }
 
 	/// <summary>
@@ -57,7 +131,6 @@ public sealed partial class GetSearchApplicationResponse : ElasticsearchResponse
 	/// Search template to use on search operations.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("template")]
 	public Elastic.Clients.Elasticsearch.SearchApplication.SearchApplicationTemplate? Template { get; init; }
 
 	/// <summary>
@@ -65,6 +138,5 @@ public sealed partial class GetSearchApplicationResponse : ElasticsearchResponse
 	/// Last time the Search Application was updated.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("updated_at_millis")]
 	public long UpdatedAtMillis { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchApplication/ListResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchApplication/ListResponse.g.cs
index c1945b4a695..19456d30cb1 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchApplication/ListResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchApplication/ListResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.SearchApplication;
 
+internal sealed partial class ListResponseConverter : System.Text.Json.Serialization.JsonConverter<ListResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCount = System.Text.Json.JsonEncodedText.Encode("count");
+	private static readonly System.Text.Json.JsonEncodedText PropResults = System.Text.Json.JsonEncodedText.Encode("results");
+
+	public override ListResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<long> propCount = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.SearchApplication.SearchApplication>> propResults = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCount.TryRead(ref reader, options, PropCount))
+			{
+				continue;
+			}
+
+			if (propResults.TryRead(ref reader, options, PropResults))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ListResponse
+		{
+			Count = propCount.Value
+,
+			Results = propResults.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ListResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCount, value.Count);
+		writer.WriteProperty(options, PropResults, value.Results);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ListResponseConverter))]
 public sealed partial class ListResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("count")]
 	public long Count { get; init; }
-	[JsonInclude, JsonPropertyName("results")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.SearchApplication.SearchApplication> Results { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchApplication/PostBehavioralAnalyticsEventResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchApplication/PostBehavioralAnalyticsEventResponse.g.cs
index c9fbc6dc44e..e1ade4e0b8e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchApplication/PostBehavioralAnalyticsEventResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchApplication/PostBehavioralAnalyticsEventResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.SearchApplication;
 
+internal sealed partial class PostBehavioralAnalyticsEventResponseConverter : System.Text.Json.Serialization.JsonConverter<PostBehavioralAnalyticsEventResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAccepted = System.Text.Json.JsonEncodedText.Encode("accepted");
+	private static readonly System.Text.Json.JsonEncodedText PropEvent = System.Text.Json.JsonEncodedText.Encode("event");
+
+	public override PostBehavioralAnalyticsEventResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAccepted = default;
+		LocalJsonProperty<object?> propEvent = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAccepted.TryRead(ref reader, options, PropAccepted))
+			{
+				continue;
+			}
+
+			if (propEvent.TryRead(ref reader, options, PropEvent))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PostBehavioralAnalyticsEventResponse
+		{
+			Accepted = propAccepted.Value
+,
+			Event = propEvent.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PostBehavioralAnalyticsEventResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAccepted, value.Accepted);
+		writer.WriteProperty(options, PropEvent, value.Event);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PostBehavioralAnalyticsEventResponseConverter))]
 public sealed partial class PostBehavioralAnalyticsEventResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("accepted")]
 	public bool Accepted { get; init; }
-	[JsonInclude, JsonPropertyName("event")]
 	public object? Event { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchApplication/PutBehavioralAnalyticsResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchApplication/PutBehavioralAnalyticsResponse.g.cs
index 9ef176986b8..504b35db3b0 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchApplication/PutBehavioralAnalyticsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchApplication/PutBehavioralAnalyticsResponse.g.cs
@@ -18,14 +18,61 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.SearchApplication;
 
+internal sealed partial class PutBehavioralAnalyticsResponseConverter : System.Text.Json.Serialization.JsonConverter<PutBehavioralAnalyticsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+	private static readonly System.Text.Json.JsonEncodedText PropName = System.Text.Json.JsonEncodedText.Encode("name");
+
+	public override PutBehavioralAnalyticsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		LocalJsonProperty<string> propName = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			if (propName.TryRead(ref reader, options, PropName))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutBehavioralAnalyticsResponse
+		{
+			Acknowledged = propAcknowledged.Value
+,
+			Name = propName.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutBehavioralAnalyticsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteProperty(options, PropName, value.Name);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PutBehavioralAnalyticsResponseConverter))]
 public sealed partial class PutBehavioralAnalyticsResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,7 +80,6 @@ public sealed partial class PutBehavioralAnalyticsResponse : ElasticsearchRespon
 	/// 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; }
 
 	/// <summary>
@@ -41,6 +87,5 @@ public sealed partial class PutBehavioralAnalyticsResponse : ElasticsearchRespon
 	/// The name of the analytics collection created or updated
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("name")]
 	public string Name { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchApplication/PutSearchApplicationRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchApplication/PutSearchApplicationRequest.g.cs
index 09736ffa1d9..616ddb15dcb 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchApplication/PutSearchApplicationRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchApplication/PutSearchApplicationRequest.g.cs
@@ -45,7 +45,7 @@ public sealed partial class PutSearchApplicationRequestParameters : RequestParam
 /// Create or update a search application.
 /// </para>
 /// </summary>
-public sealed partial class PutSearchApplicationRequest : PlainRequest<PutSearchApplicationRequestParameters>, ISelfSerializable
+public sealed partial class PutSearchApplicationRequest : PlainRequest<PutSearchApplicationRequestParameters>, ISelfTwoWaySerializable
 {
 	public PutSearchApplicationRequest(Elastic.Clients.Elasticsearch.Name name) : base(r => r.Required("name", name))
 	{
@@ -66,13 +66,17 @@ public PutSearchApplicationRequest(Elastic.Clients.Elasticsearch.Name name) : ba
 	/// </summary>
 	[JsonIgnore]
 	public bool? Create { get => Q<bool?>("create"); set => Q("create", value); }
-	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.SearchApplication.SearchApplicationParameters SearchApplication { get; set; }
 
-	void ISelfSerializable.Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
+	void ISelfTwoWaySerializable.Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 	{
 		JsonSerializer.Serialize(writer, SearchApplication, options);
 	}
+
+	void ISelfTwoWaySerializable.Deserialize(ref Utf8JsonReader reader, JsonSerializerOptions options, IElasticsearchClientSettings settings)
+	{
+		SearchApplication = settings.RequestResponseSerializer.Deserialize<Elastic.Clients.Elasticsearch.SearchApplication.SearchApplicationParameters>(ref reader);
+	}
 }
 
 /// <summary>
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchApplication/PutSearchApplicationResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchApplication/PutSearchApplicationResponse.g.cs
index 142ce716eb0..cc96d2cff44 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchApplication/PutSearchApplicationResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchApplication/PutSearchApplicationResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.SearchApplication;
 
+internal sealed partial class PutSearchApplicationResponseConverter : System.Text.Json.Serialization.JsonConverter<PutSearchApplicationResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropResult = System.Text.Json.JsonEncodedText.Encode("result");
+
+	public override PutSearchApplicationResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Result> propResult = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propResult.TryRead(ref reader, options, PropResult))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutSearchApplicationResponse
+		{
+			Result = propResult.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutSearchApplicationResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropResult, value.Result);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PutSearchApplicationResponseConverter))]
 public sealed partial class PutSearchApplicationResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("result")]
 	public Elastic.Clients.Elasticsearch.Result Result { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchApplication/RenderQueryResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchApplication/RenderQueryResponse.g.cs
index 1e3ecd37ae6..867e717877f 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchApplication/RenderQueryResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchApplication/RenderQueryResponse.g.cs
@@ -18,14 +18,39 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.SearchApplication;
 
+internal sealed partial class RenderQueryResponseConverter : System.Text.Json.Serialization.JsonConverter<RenderQueryResponse>
+{
+	public override RenderQueryResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new RenderQueryResponse { };
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, RenderQueryResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(RenderQueryResponseConverter))]
 public sealed partial class RenderQueryResponse : ElasticsearchResponse
 {
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchApplication/SearchApplicationSearchResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchApplication/SearchApplicationSearchResponse.g.cs
index 65205873d88..6f6d032257e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchApplication/SearchApplicationSearchResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchApplication/SearchApplicationSearchResponse.g.cs
@@ -18,42 +18,212 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.SearchApplication;
 
+internal sealed partial class SearchApplicationSearchResponseConverter<TDocument> : System.Text.Json.Serialization.JsonConverter<SearchApplicationSearchResponse<TDocument>>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropClusters = System.Text.Json.JsonEncodedText.Encode("_clusters");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropHitsMetadata = System.Text.Json.JsonEncodedText.Encode("hits");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxScore = System.Text.Json.JsonEncodedText.Encode("max_score");
+	private static readonly System.Text.Json.JsonEncodedText PropNumReducePhases = System.Text.Json.JsonEncodedText.Encode("num_reduce_phases");
+	private static readonly System.Text.Json.JsonEncodedText PropPitId = System.Text.Json.JsonEncodedText.Encode("pit_id");
+	private static readonly System.Text.Json.JsonEncodedText PropProfile = System.Text.Json.JsonEncodedText.Encode("profile");
+	private static readonly System.Text.Json.JsonEncodedText PropScrollId = System.Text.Json.JsonEncodedText.Encode("_scroll_id");
+	private static readonly System.Text.Json.JsonEncodedText PropShards = System.Text.Json.JsonEncodedText.Encode("_shards");
+	private static readonly System.Text.Json.JsonEncodedText PropSuggest = System.Text.Json.JsonEncodedText.Encode("suggest");
+	private static readonly System.Text.Json.JsonEncodedText PropTerminatedEarly = System.Text.Json.JsonEncodedText.Encode("terminated_early");
+	private static readonly System.Text.Json.JsonEncodedText PropTimedOut = System.Text.Json.JsonEncodedText.Encode("timed_out");
+	private static readonly System.Text.Json.JsonEncodedText PropTook = System.Text.Json.JsonEncodedText.Encode("took");
+
+	public override SearchApplicationSearchResponse<TDocument> Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary?> propAggregations = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.ClusterStatistics?> propClusters = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, object>?> propFields = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Core.Search.HitsMetadata<TDocument>> propHitsMetadata = default;
+		LocalJsonProperty<double?> propMaxScore = default;
+		LocalJsonProperty<long?> propNumReducePhases = default;
+		LocalJsonProperty<string?> propPitId = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Core.Search.Profile?> propProfile = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.ScrollId?> propScrollId = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.ShardStatistics> propShards = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Core.Search.SuggestDictionary<TDocument>?> propSuggest = default;
+		LocalJsonProperty<bool?> propTerminatedEarly = default;
+		LocalJsonProperty<bool> propTimedOut = default;
+		LocalJsonProperty<long> propTook = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAggregations.TryRead(ref reader, options, PropAggregations))
+			{
+				continue;
+			}
+
+			if (propClusters.TryRead(ref reader, options, PropClusters))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propHitsMetadata.TryRead(ref reader, options, PropHitsMetadata))
+			{
+				continue;
+			}
+
+			if (propMaxScore.TryRead(ref reader, options, PropMaxScore))
+			{
+				continue;
+			}
+
+			if (propNumReducePhases.TryRead(ref reader, options, PropNumReducePhases))
+			{
+				continue;
+			}
+
+			if (propPitId.TryRead(ref reader, options, PropPitId))
+			{
+				continue;
+			}
+
+			if (propProfile.TryRead(ref reader, options, PropProfile))
+			{
+				continue;
+			}
+
+			if (propScrollId.TryRead(ref reader, options, PropScrollId))
+			{
+				continue;
+			}
+
+			if (propShards.TryRead(ref reader, options, PropShards))
+			{
+				continue;
+			}
+
+			if (propSuggest.TryRead(ref reader, options, PropSuggest))
+			{
+				continue;
+			}
+
+			if (propTerminatedEarly.TryRead(ref reader, options, PropTerminatedEarly))
+			{
+				continue;
+			}
+
+			if (propTimedOut.TryRead(ref reader, options, PropTimedOut))
+			{
+				continue;
+			}
+
+			if (propTook.TryRead(ref reader, options, PropTook))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SearchApplicationSearchResponse<TDocument>
+		{
+			Aggregations = propAggregations.Value
+,
+			Clusters = propClusters.Value
+,
+			Fields = propFields.Value
+,
+			HitsMetadata = propHitsMetadata.Value
+,
+			MaxScore = propMaxScore.Value
+,
+			NumReducePhases = propNumReducePhases.Value
+,
+			PitId = propPitId.Value
+,
+			Profile = propProfile.Value
+,
+			ScrollId = propScrollId.Value
+,
+			Shards = propShards.Value
+,
+			Suggest = propSuggest.Value
+,
+			TerminatedEarly = propTerminatedEarly.Value
+,
+			TimedOut = propTimedOut.Value
+,
+			Took = propTook.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SearchApplicationSearchResponse<TDocument> value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAggregations, value.Aggregations);
+		writer.WriteProperty(options, PropClusters, value.Clusters);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropHitsMetadata, value.HitsMetadata);
+		writer.WriteProperty(options, PropMaxScore, value.MaxScore);
+		writer.WriteProperty(options, PropNumReducePhases, value.NumReducePhases);
+		writer.WriteProperty(options, PropPitId, value.PitId);
+		writer.WriteProperty(options, PropProfile, value.Profile);
+		writer.WriteProperty(options, PropScrollId, value.ScrollId);
+		writer.WriteProperty(options, PropShards, value.Shards);
+		writer.WriteProperty(options, PropSuggest, value.Suggest);
+		writer.WriteProperty(options, PropTerminatedEarly, value.TerminatedEarly);
+		writer.WriteProperty(options, PropTimedOut, value.TimedOut);
+		writer.WriteProperty(options, PropTook, value.Took);
+		writer.WriteEndObject();
+	}
+}
+
+internal sealed partial class SearchApplicationSearchResponseConverterFactory : System.Text.Json.Serialization.JsonConverterFactory
+{
+	public override bool CanConvert(System.Type typeToConvert)
+	{
+		return typeToConvert.IsGenericType && typeToConvert.GetGenericTypeDefinition() == typeof(SearchApplicationSearchResponse<>);
+	}
+
+	public override System.Text.Json.Serialization.JsonConverter CreateConverter(System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		var args = typeToConvert.GetGenericArguments();
+#pragma warning disable IL3050
+		var converter = (System.Text.Json.Serialization.JsonConverter)System.Activator.CreateInstance(typeof(SearchApplicationSearchResponseConverter<>).MakeGenericType(args[0]), System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public, binder: null, args: null, culture: null)!;
+#pragma warning restore IL3050
+		return converter;
+	}
+}
+
+[JsonConverter(typeof(SearchApplicationSearchResponseConverterFactory))]
 public sealed partial class SearchApplicationSearchResponse<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("suggest")]
 	public Elastic.Clients.Elasticsearch.Core.Search.SuggestDictionary<TDocument>? Suggest { 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/SearchMvtRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchMvtRequest.g.cs
index 2863e257262..3b156442ba6 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchMvtRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchMvtRequest.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport;
@@ -34,6 +35,169 @@ public sealed partial class SearchMvtRequestParameters : RequestParameters
 {
 }
 
+internal sealed partial class SearchMvtRequestConverter : System.Text.Json.Serialization.JsonConverter<SearchMvtRequest>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAggs = System.Text.Json.JsonEncodedText.Encode("aggs");
+	private static readonly System.Text.Json.JsonEncodedText PropBuffer = System.Text.Json.JsonEncodedText.Encode("buffer");
+	private static readonly System.Text.Json.JsonEncodedText PropExactBounds = System.Text.Json.JsonEncodedText.Encode("exact_bounds");
+	private static readonly System.Text.Json.JsonEncodedText PropExtent = System.Text.Json.JsonEncodedText.Encode("extent");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropGridAgg = System.Text.Json.JsonEncodedText.Encode("grid_agg");
+	private static readonly System.Text.Json.JsonEncodedText PropGridPrecision = System.Text.Json.JsonEncodedText.Encode("grid_precision");
+	private static readonly System.Text.Json.JsonEncodedText PropGridType = System.Text.Json.JsonEncodedText.Encode("grid_type");
+	private static readonly System.Text.Json.JsonEncodedText PropQuery = System.Text.Json.JsonEncodedText.Encode("query");
+	private static readonly System.Text.Json.JsonEncodedText PropRuntimeMappings = System.Text.Json.JsonEncodedText.Encode("runtime_mappings");
+	private static readonly System.Text.Json.JsonEncodedText PropSize = System.Text.Json.JsonEncodedText.Encode("size");
+	private static readonly System.Text.Json.JsonEncodedText PropSort = System.Text.Json.JsonEncodedText.Encode("sort");
+	private static readonly System.Text.Json.JsonEncodedText PropTrackTotalHits = System.Text.Json.JsonEncodedText.Encode("track_total_hits");
+	private static readonly System.Text.Json.JsonEncodedText PropWithLabels = System.Text.Json.JsonEncodedText.Encode("with_labels");
+
+	public override SearchMvtRequest Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IDictionary<string, Elastic.Clients.Elasticsearch.Aggregations.Aggregation>?> propAggs = default;
+		LocalJsonProperty<int?> propBuffer = default;
+		LocalJsonProperty<bool?> propExactBounds = default;
+		LocalJsonProperty<int?> propExtent = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Fields?> propFields = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Core.SearchMvt.GridAggregationType?> propGridAgg = default;
+		LocalJsonProperty<int?> propGridPrecision = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Core.SearchMvt.GridType?> propGridType = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.QueryDsl.Query?> propQuery = default;
+		LocalJsonProperty<IDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>?> propRuntimeMappings = default;
+		LocalJsonProperty<int?> propSize = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.SortOptions>?> propSort = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Core.Search.TrackHits?> propTrackTotalHits = default;
+		LocalJsonProperty<bool?> propWithLabels = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAggs.TryRead(ref reader, options, PropAggs))
+			{
+				continue;
+			}
+
+			if (propBuffer.TryRead(ref reader, options, PropBuffer))
+			{
+				continue;
+			}
+
+			if (propExactBounds.TryRead(ref reader, options, PropExactBounds))
+			{
+				continue;
+			}
+
+			if (propExtent.TryRead(ref reader, options, PropExtent))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propGridAgg.TryRead(ref reader, options, PropGridAgg))
+			{
+				continue;
+			}
+
+			if (propGridPrecision.TryRead(ref reader, options, PropGridPrecision))
+			{
+				continue;
+			}
+
+			if (propGridType.TryRead(ref reader, options, PropGridType))
+			{
+				continue;
+			}
+
+			if (propQuery.TryRead(ref reader, options, PropQuery))
+			{
+				continue;
+			}
+
+			if (propRuntimeMappings.TryRead(ref reader, options, PropRuntimeMappings))
+			{
+				continue;
+			}
+
+			if (propSize.TryRead(ref reader, options, PropSize))
+			{
+				continue;
+			}
+
+			if (propSort.TryRead(ref reader, options, PropSort, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.SortOptions>?, Elastic.Clients.Elasticsearch.SortOptions>)))
+			{
+				continue;
+			}
+
+			if (propTrackTotalHits.TryRead(ref reader, options, PropTrackTotalHits))
+			{
+				continue;
+			}
+
+			if (propWithLabels.TryRead(ref reader, options, PropWithLabels))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SearchMvtRequest
+		{
+			Aggs = propAggs.Value
+,
+			Buffer = propBuffer.Value
+,
+			ExactBounds = propExactBounds.Value
+,
+			Extent = propExtent.Value
+,
+			Fields = propFields.Value
+,
+			GridAgg = propGridAgg.Value
+,
+			GridPrecision = propGridPrecision.Value
+,
+			GridType = propGridType.Value
+,
+			Query = propQuery.Value
+,
+			RuntimeMappings = propRuntimeMappings.Value
+,
+			Size = propSize.Value
+,
+			Sort = propSort.Value
+,
+			TrackTotalHits = propTrackTotalHits.Value
+,
+			WithLabels = propWithLabels.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SearchMvtRequest value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAggs, value.Aggs);
+		writer.WriteProperty(options, PropBuffer, value.Buffer);
+		writer.WriteProperty(options, PropExactBounds, value.ExactBounds);
+		writer.WriteProperty(options, PropExtent, value.Extent);
+		writer.WriteProperty(options, PropFields, value.Fields, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropGridAgg, value.GridAgg);
+		writer.WriteProperty(options, PropGridPrecision, value.GridPrecision);
+		writer.WriteProperty(options, PropGridType, value.GridType);
+		writer.WriteProperty(options, PropQuery, value.Query);
+		writer.WriteProperty(options, PropRuntimeMappings, value.RuntimeMappings);
+		writer.WriteProperty(options, PropSize, value.Size);
+		writer.WriteProperty(options, PropSort, value.Sort, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.SortOptions>?, Elastic.Clients.Elasticsearch.SortOptions>));
+		writer.WriteProperty(options, PropTrackTotalHits, value.TrackTotalHits);
+		writer.WriteProperty(options, PropWithLabels, value.WithLabels);
+		writer.WriteEndObject();
+	}
+}
+
 /// <summary>
 /// <para>
 /// Search a vector tile.
@@ -42,6 +206,7 @@ public sealed partial class SearchMvtRequestParameters : RequestParameters
 /// Search a vector tile for geospatial values.
 /// </para>
 /// </summary>
+[JsonConverter(typeof(SearchMvtRequestConverter))]
 public sealed partial class SearchMvtRequest : PlainRequest<SearchMvtRequestParameters>
 {
 	public SearchMvtRequest(Elastic.Clients.Elasticsearch.Indices indices, Elastic.Clients.Elasticsearch.Field field, int zoom, int x, int y) : base(r => r.Required("index", indices).Required("field", field).Required("zoom", zoom).Required("x", x).Required("y", y))
@@ -91,7 +256,6 @@ public SearchMvtRequest(Elastic.Clients.Elasticsearch.Indices indices, Elastic.C
 	/// </item>
 	/// </list>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("aggs")]
 	public IDictionary<string, Elastic.Clients.Elasticsearch.Aggregations.Aggregation>? Aggs { get; set; }
 
 	/// <summary>
@@ -100,7 +264,6 @@ public SearchMvtRequest(Elastic.Clients.Elasticsearch.Indices indices, Elastic.C
 	/// to avoid outline artifacts from geometries that extend past the extent of the tile.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("buffer")]
 	public int? Buffer { get; set; }
 
 	/// <summary>
@@ -112,7 +275,6 @@ public SearchMvtRequest(Elastic.Clients.Elasticsearch.Indices indices, Elastic.C
 	/// bounding box may be larger than the vector tile.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("exact_bounds")]
 	public bool? ExactBounds { get; set; }
 
 	/// <summary>
@@ -120,7 +282,6 @@ public SearchMvtRequest(Elastic.Clients.Elasticsearch.Indices indices, Elastic.C
 	/// Size, in pixels, of a side of the tile. Vector tiles are square with equal sides.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("extent")]
 	public int? Extent { get; set; }
 
 	/// <summary>
@@ -130,8 +291,6 @@ public SearchMvtRequest(Elastic.Clients.Elasticsearch.Indices indices, Elastic.C
 	/// values may return inconsistent results.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("fields")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Fields? Fields { get; set; }
 
 	/// <summary>
@@ -139,7 +298,6 @@ public SearchMvtRequest(Elastic.Clients.Elasticsearch.Indices indices, Elastic.C
 	/// Aggregation used to create a grid for the <c>field</c>.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("grid_agg")]
 	public Elastic.Clients.Elasticsearch.Core.SearchMvt.GridAggregationType? GridAgg { get; set; }
 
 	/// <summary>
@@ -149,7 +307,6 @@ public SearchMvtRequest(Elastic.Clients.Elasticsearch.Indices indices, Elastic.C
 	/// don’t include the aggs layer.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("grid_precision")]
 	public int? GridPrecision { get; set; }
 
 	/// <summary>
@@ -160,7 +317,6 @@ public SearchMvtRequest(Elastic.Clients.Elasticsearch.Indices indices, Elastic.C
 	/// of the cell.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("grid_type")]
 	public Elastic.Clients.Elasticsearch.Core.SearchMvt.GridType? GridType { get; set; }
 
 	/// <summary>
@@ -168,7 +324,6 @@ public SearchMvtRequest(Elastic.Clients.Elasticsearch.Indices indices, Elastic.C
 	/// Query DSL used to filter documents for the search.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("query")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.Query? Query { get; set; }
 
 	/// <summary>
@@ -177,7 +332,6 @@ public SearchMvtRequest(Elastic.Clients.Elasticsearch.Indices indices, Elastic.C
 	/// 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>
@@ -186,7 +340,6 @@ public SearchMvtRequest(Elastic.Clients.Elasticsearch.Indices indices, Elastic.C
 	/// If 0, results don’t include the hits layer.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("size")]
 	public int? Size { get; set; }
 
 	/// <summary>
@@ -196,8 +349,6 @@ public SearchMvtRequest(Elastic.Clients.Elasticsearch.Indices indices, Elastic.C
 	/// from longest to shortest.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("sort")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.SortOptions))]
 	public ICollection<Elastic.Clients.Elasticsearch.SortOptions>? Sort { get; set; }
 
 	/// <summary>
@@ -207,7 +358,6 @@ public SearchMvtRequest(Elastic.Clients.Elasticsearch.Indices indices, Elastic.C
 	/// not include the total number of hits matching the query.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("track_total_hits")]
 	public Elastic.Clients.Elasticsearch.Core.Search.TrackHits? TrackTotalHits { get; set; }
 
 	/// <summary>
@@ -216,7 +366,6 @@ public SearchMvtRequest(Elastic.Clients.Elasticsearch.Indices indices, Elastic.C
 	/// suggested label positions for the original features.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("with_labels")]
 	public bool? WithLabels { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchRequest.g.cs
index 7c11901438f..48bf72babd5 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchRequest.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport;
@@ -273,434 +274,366 @@ public sealed partial class SearchRequestParameters : RequestParameters
 	public bool? TypedKeys { get => Q<bool?>("typed_keys"); set => Q("typed_keys", value); }
 }
 
-internal sealed partial class SearchRequestConverter : JsonConverter<SearchRequest>
+internal sealed partial class SearchRequestConverter : System.Text.Json.Serialization.JsonConverter<SearchRequest>
 {
-	public override SearchRequest Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		var variant = new SearchRequest();
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
-		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations1 = System.Text.Json.JsonEncodedText.Encode("aggs");
+	private static readonly System.Text.Json.JsonEncodedText PropCollapse = System.Text.Json.JsonEncodedText.Encode("collapse");
+	private static readonly System.Text.Json.JsonEncodedText PropDocvalueFields = System.Text.Json.JsonEncodedText.Encode("docvalue_fields");
+	private static readonly System.Text.Json.JsonEncodedText PropExplain = System.Text.Json.JsonEncodedText.Encode("explain");
+	private static readonly System.Text.Json.JsonEncodedText PropExt = System.Text.Json.JsonEncodedText.Encode("ext");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropFrom = System.Text.Json.JsonEncodedText.Encode("from");
+	private static readonly System.Text.Json.JsonEncodedText PropHighlight = System.Text.Json.JsonEncodedText.Encode("highlight");
+	private static readonly System.Text.Json.JsonEncodedText PropIndicesBoost = System.Text.Json.JsonEncodedText.Encode("indices_boost");
+	private static readonly System.Text.Json.JsonEncodedText PropKnn = System.Text.Json.JsonEncodedText.Encode("knn");
+	private static readonly System.Text.Json.JsonEncodedText PropMinScore = System.Text.Json.JsonEncodedText.Encode("min_score");
+	private static readonly System.Text.Json.JsonEncodedText PropPit = System.Text.Json.JsonEncodedText.Encode("pit");
+	private static readonly System.Text.Json.JsonEncodedText PropPostFilter = System.Text.Json.JsonEncodedText.Encode("post_filter");
+	private static readonly System.Text.Json.JsonEncodedText PropProfile = System.Text.Json.JsonEncodedText.Encode("profile");
+	private static readonly System.Text.Json.JsonEncodedText PropQuery = System.Text.Json.JsonEncodedText.Encode("query");
+	private static readonly System.Text.Json.JsonEncodedText PropRank = System.Text.Json.JsonEncodedText.Encode("rank");
+	private static readonly System.Text.Json.JsonEncodedText PropRescore = System.Text.Json.JsonEncodedText.Encode("rescore");
+	private static readonly System.Text.Json.JsonEncodedText PropRetriever = System.Text.Json.JsonEncodedText.Encode("retriever");
+	private static readonly System.Text.Json.JsonEncodedText PropRuntimeMappings = System.Text.Json.JsonEncodedText.Encode("runtime_mappings");
+	private static readonly System.Text.Json.JsonEncodedText PropScriptFields = System.Text.Json.JsonEncodedText.Encode("script_fields");
+	private static readonly System.Text.Json.JsonEncodedText PropSearchAfter = System.Text.Json.JsonEncodedText.Encode("search_after");
+	private static readonly System.Text.Json.JsonEncodedText PropSeqNoPrimaryTerm = System.Text.Json.JsonEncodedText.Encode("seq_no_primary_term");
+	private static readonly System.Text.Json.JsonEncodedText PropSize = System.Text.Json.JsonEncodedText.Encode("size");
+	private static readonly System.Text.Json.JsonEncodedText PropSlice = System.Text.Json.JsonEncodedText.Encode("slice");
+	private static readonly System.Text.Json.JsonEncodedText PropSort = System.Text.Json.JsonEncodedText.Encode("sort");
+	private static readonly System.Text.Json.JsonEncodedText PropSource = System.Text.Json.JsonEncodedText.Encode("_source");
+	private static readonly System.Text.Json.JsonEncodedText PropStats = System.Text.Json.JsonEncodedText.Encode("stats");
+	private static readonly System.Text.Json.JsonEncodedText PropStoredFields = System.Text.Json.JsonEncodedText.Encode("stored_fields");
+	private static readonly System.Text.Json.JsonEncodedText PropSuggest = System.Text.Json.JsonEncodedText.Encode("suggest");
+	private static readonly System.Text.Json.JsonEncodedText PropTerminateAfter = System.Text.Json.JsonEncodedText.Encode("terminate_after");
+	private static readonly System.Text.Json.JsonEncodedText PropTimeout = System.Text.Json.JsonEncodedText.Encode("timeout");
+	private static readonly System.Text.Json.JsonEncodedText PropTrackScores = System.Text.Json.JsonEncodedText.Encode("track_scores");
+	private static readonly System.Text.Json.JsonEncodedText PropTrackTotalHits = System.Text.Json.JsonEncodedText.Encode("track_total_hits");
+	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("version");
+
+	public override SearchRequest Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IDictionary<string, Elastic.Clients.Elasticsearch.Aggregations.Aggregation>?> propAggregations = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Core.Search.FieldCollapse?> propCollapse = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.QueryDsl.FieldAndFormat>?> propDocvalueFields = default;
+		LocalJsonProperty<bool?> propExplain = default;
+		LocalJsonProperty<IDictionary<string, object>?> propExt = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.QueryDsl.FieldAndFormat>?> propFields = default;
+		LocalJsonProperty<int?> propFrom = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Core.Search.Highlight?> propHighlight = default;
+		LocalJsonProperty<ICollection<IDictionary<Elastic.Clients.Elasticsearch.IndexName, double>>?> propIndicesBoost = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.KnnSearch>?> propKnn = default;
+		LocalJsonProperty<double?> propMinScore = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Core.Search.PointInTimeReference?> propPit = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.QueryDsl.Query?> propPostFilter = default;
+		LocalJsonProperty<bool?> propProfile = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.QueryDsl.Query?> propQuery = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Rank?> propRank = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Core.Search.Rescore>?> propRescore = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Retriever?> propRetriever = default;
+		LocalJsonProperty<IDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>?> propRuntimeMappings = default;
+		LocalJsonProperty<IDictionary<string, Elastic.Clients.Elasticsearch.ScriptField>?> propScriptFields = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.FieldValue>?> propSearchAfter = default;
+		LocalJsonProperty<bool?> propSeqNoPrimaryTerm = default;
+		LocalJsonProperty<int?> propSize = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.SlicedScroll?> propSlice = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.SortOptions>?> propSort = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Core.Search.SourceConfig?> propSource = default;
+		LocalJsonProperty<ICollection<string>?> propStats = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Fields?> propStoredFields = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Core.Search.Suggester?> propSuggest = default;
+		LocalJsonProperty<long?> propTerminateAfter = default;
+		LocalJsonProperty<string?> propTimeout = default;
+		LocalJsonProperty<bool?> propTrackScores = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Core.Search.TrackHits?> propTrackTotalHits = default;
+		LocalJsonProperty<bool?> propVersion = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAggregations.TryRead(ref reader, options, PropAggregations) || propAggregations.TryRead(ref reader, options, PropAggregations1))
 			{
-				var property = reader.GetString();
-				if (property == "aggregations" || property == "aggs")
-				{
-					variant.Aggregations = JsonSerializer.Deserialize<IDictionary<string, Elastic.Clients.Elasticsearch.Aggregations.Aggregation>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "collapse")
-				{
-					variant.Collapse = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Core.Search.FieldCollapse?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "docvalue_fields")
-				{
-					variant.DocvalueFields = JsonSerializer.Deserialize<ICollection<Elastic.Clients.Elasticsearch.QueryDsl.FieldAndFormat>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "explain")
-				{
-					variant.Explain = JsonSerializer.Deserialize<bool?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "ext")
-				{
-					variant.Ext = JsonSerializer.Deserialize<IDictionary<string, object>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "fields")
-				{
-					variant.Fields = JsonSerializer.Deserialize<ICollection<Elastic.Clients.Elasticsearch.QueryDsl.FieldAndFormat>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "from")
-				{
-					variant.From = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "highlight")
-				{
-					variant.Highlight = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Core.Search.Highlight?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "indices_boost")
-				{
-					variant.IndicesBoost = JsonSerializer.Deserialize<ICollection<IDictionary<Elastic.Clients.Elasticsearch.IndexName, double>>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "knn")
-				{
-					variant.Knn = JsonSerializer.Deserialize<ICollection<Elastic.Clients.Elasticsearch.KnnSearch>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "min_score")
-				{
-					variant.MinScore = JsonSerializer.Deserialize<double?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "pit")
-				{
-					variant.Pit = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Core.Search.PointInTimeReference?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "post_filter")
-				{
-					variant.PostFilter = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.Query?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "profile")
-				{
-					variant.Profile = JsonSerializer.Deserialize<bool?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "query")
-				{
-					variant.Query = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.Query?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "rank")
-				{
-					variant.Rank = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Rank?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "rescore")
-				{
-					variant.Rescore = JsonSerializer.Deserialize<ICollection<Elastic.Clients.Elasticsearch.Core.Search.Rescore>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "retriever")
-				{
-					variant.Retriever = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Retriever?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "runtime_mappings")
-				{
-					variant.RuntimeMappings = JsonSerializer.Deserialize<IDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "script_fields")
-				{
-					variant.ScriptFields = JsonSerializer.Deserialize<IDictionary<string, Elastic.Clients.Elasticsearch.ScriptField>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "search_after")
-				{
-					variant.SearchAfter = JsonSerializer.Deserialize<ICollection<Elastic.Clients.Elasticsearch.FieldValue>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "seq_no_primary_term")
-				{
-					variant.SeqNoPrimaryTerm = JsonSerializer.Deserialize<bool?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "size")
-				{
-					variant.Size = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "slice")
-				{
-					variant.Slice = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.SlicedScroll?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "sort")
-				{
-					variant.Sort = JsonSerializer.Deserialize<ICollection<Elastic.Clients.Elasticsearch.SortOptions>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "_source")
-				{
-					variant.Source = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Core.Search.SourceConfig?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "stats")
-				{
-					variant.Stats = JsonSerializer.Deserialize<ICollection<string>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "stored_fields")
-				{
-					variant.StoredFields = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Fields?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "suggest")
-				{
-					variant.Suggest = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Core.Search.Suggester?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "terminate_after")
-				{
-					variant.TerminateAfter = JsonSerializer.Deserialize<long?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "timeout")
-				{
-					variant.Timeout = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "track_scores")
-				{
-					variant.TrackScores = JsonSerializer.Deserialize<bool?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "track_total_hits")
-				{
-					variant.TrackTotalHits = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Core.Search.TrackHits?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "version")
-				{
-					variant.Version = JsonSerializer.Deserialize<bool?>(ref reader, options);
-					continue;
-				}
+				continue;
 			}
-		}
-
-		return variant;
-	}
-
-	public override void Write(Utf8JsonWriter writer, SearchRequest value, JsonSerializerOptions options)
-	{
-		writer.WriteStartObject();
-		if (value.Aggregations is not null)
-		{
-			writer.WritePropertyName("aggregations");
-			JsonSerializer.Serialize(writer, value.Aggregations, options);
-		}
 
-		if (value.Collapse is not null)
-		{
-			writer.WritePropertyName("collapse");
-			JsonSerializer.Serialize(writer, value.Collapse, options);
-		}
+			if (propCollapse.TryRead(ref reader, options, PropCollapse))
+			{
+				continue;
+			}
 
-		if (value.DocvalueFields is not null)
-		{
-			writer.WritePropertyName("docvalue_fields");
-			JsonSerializer.Serialize(writer, value.DocvalueFields, options);
-		}
+			if (propDocvalueFields.TryRead(ref reader, options, PropDocvalueFields))
+			{
+				continue;
+			}
 
-		if (value.Explain.HasValue)
-		{
-			writer.WritePropertyName("explain");
-			writer.WriteBooleanValue(value.Explain.Value);
-		}
+			if (propExplain.TryRead(ref reader, options, PropExplain))
+			{
+				continue;
+			}
 
-		if (value.Ext is not null)
-		{
-			writer.WritePropertyName("ext");
-			JsonSerializer.Serialize(writer, value.Ext, options);
-		}
+			if (propExt.TryRead(ref reader, options, PropExt))
+			{
+				continue;
+			}
 
-		if (value.Fields is not null)
-		{
-			writer.WritePropertyName("fields");
-			JsonSerializer.Serialize(writer, value.Fields, options);
-		}
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
 
-		if (value.From.HasValue)
-		{
-			writer.WritePropertyName("from");
-			writer.WriteNumberValue(value.From.Value);
-		}
+			if (propFrom.TryRead(ref reader, options, PropFrom))
+			{
+				continue;
+			}
 
-		if (value.Highlight is not null)
-		{
-			writer.WritePropertyName("highlight");
-			JsonSerializer.Serialize(writer, value.Highlight, options);
-		}
+			if (propHighlight.TryRead(ref reader, options, PropHighlight))
+			{
+				continue;
+			}
 
-		if (value.IndicesBoost is not null)
-		{
-			writer.WritePropertyName("indices_boost");
-			JsonSerializer.Serialize(writer, value.IndicesBoost, options);
-		}
+			if (propIndicesBoost.TryRead(ref reader, options, PropIndicesBoost))
+			{
+				continue;
+			}
 
-		if (value.Knn is not null)
-		{
-			writer.WritePropertyName("knn");
-			JsonSerializer.Serialize(writer, value.Knn, options);
-		}
+			if (propKnn.TryRead(ref reader, options, PropKnn, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.KnnSearch>?, Elastic.Clients.Elasticsearch.KnnSearch>)))
+			{
+				continue;
+			}
 
-		if (value.MinScore.HasValue)
-		{
-			writer.WritePropertyName("min_score");
-			writer.WriteNumberValue(value.MinScore.Value);
-		}
+			if (propMinScore.TryRead(ref reader, options, PropMinScore))
+			{
+				continue;
+			}
 
-		if (value.Pit is not null)
-		{
-			writer.WritePropertyName("pit");
-			JsonSerializer.Serialize(writer, value.Pit, options);
-		}
+			if (propPit.TryRead(ref reader, options, PropPit))
+			{
+				continue;
+			}
 
-		if (value.PostFilter is not null)
-		{
-			writer.WritePropertyName("post_filter");
-			JsonSerializer.Serialize(writer, value.PostFilter, options);
-		}
+			if (propPostFilter.TryRead(ref reader, options, PropPostFilter))
+			{
+				continue;
+			}
 
-		if (value.Profile.HasValue)
-		{
-			writer.WritePropertyName("profile");
-			writer.WriteBooleanValue(value.Profile.Value);
-		}
+			if (propProfile.TryRead(ref reader, options, PropProfile))
+			{
+				continue;
+			}
 
-		if (value.Query is not null)
-		{
-			writer.WritePropertyName("query");
-			JsonSerializer.Serialize(writer, value.Query, options);
-		}
+			if (propQuery.TryRead(ref reader, options, PropQuery))
+			{
+				continue;
+			}
 
-		if (value.Rank is not null)
-		{
-			writer.WritePropertyName("rank");
-			JsonSerializer.Serialize(writer, value.Rank, options);
-		}
+			if (propRank.TryRead(ref reader, options, PropRank))
+			{
+				continue;
+			}
 
-		if (value.Rescore is not null)
-		{
-			writer.WritePropertyName("rescore");
-			JsonSerializer.Serialize(writer, value.Rescore, options);
-		}
+			if (propRescore.TryRead(ref reader, options, PropRescore, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Core.Search.Rescore>?, Elastic.Clients.Elasticsearch.Core.Search.Rescore>)))
+			{
+				continue;
+			}
 
-		if (value.Retriever is not null)
-		{
-			writer.WritePropertyName("retriever");
-			JsonSerializer.Serialize(writer, value.Retriever, options);
-		}
+			if (propRetriever.TryRead(ref reader, options, PropRetriever))
+			{
+				continue;
+			}
 
-		if (value.RuntimeMappings is not null)
-		{
-			writer.WritePropertyName("runtime_mappings");
-			JsonSerializer.Serialize(writer, value.RuntimeMappings, options);
-		}
+			if (propRuntimeMappings.TryRead(ref reader, options, PropRuntimeMappings))
+			{
+				continue;
+			}
 
-		if (value.ScriptFields is not null)
-		{
-			writer.WritePropertyName("script_fields");
-			JsonSerializer.Serialize(writer, value.ScriptFields, options);
-		}
+			if (propScriptFields.TryRead(ref reader, options, PropScriptFields))
+			{
+				continue;
+			}
 
-		if (value.SearchAfter is not null)
-		{
-			writer.WritePropertyName("search_after");
-			JsonSerializer.Serialize(writer, value.SearchAfter, options);
-		}
+			if (propSearchAfter.TryRead(ref reader, options, PropSearchAfter))
+			{
+				continue;
+			}
 
-		if (value.SeqNoPrimaryTerm.HasValue)
-		{
-			writer.WritePropertyName("seq_no_primary_term");
-			writer.WriteBooleanValue(value.SeqNoPrimaryTerm.Value);
-		}
+			if (propSeqNoPrimaryTerm.TryRead(ref reader, options, PropSeqNoPrimaryTerm))
+			{
+				continue;
+			}
 
-		if (value.Size.HasValue)
-		{
-			writer.WritePropertyName("size");
-			writer.WriteNumberValue(value.Size.Value);
-		}
+			if (propSize.TryRead(ref reader, options, PropSize))
+			{
+				continue;
+			}
 
-		if (value.Slice is not null)
-		{
-			writer.WritePropertyName("slice");
-			JsonSerializer.Serialize(writer, value.Slice, options);
-		}
+			if (propSlice.TryRead(ref reader, options, PropSlice))
+			{
+				continue;
+			}
 
-		if (value.Sort is not null)
-		{
-			writer.WritePropertyName("sort");
-			JsonSerializer.Serialize(writer, value.Sort, options);
-		}
+			if (propSort.TryRead(ref reader, options, PropSort, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.SortOptions>?, Elastic.Clients.Elasticsearch.SortOptions>)))
+			{
+				continue;
+			}
 
-		if (value.Source is not null)
-		{
-			writer.WritePropertyName("_source");
-			JsonSerializer.Serialize(writer, value.Source, options);
-		}
+			if (propSource.TryRead(ref reader, options, PropSource))
+			{
+				continue;
+			}
 
-		if (value.Stats is not null)
-		{
-			writer.WritePropertyName("stats");
-			JsonSerializer.Serialize(writer, value.Stats, options);
-		}
+			if (propStats.TryRead(ref reader, options, PropStats))
+			{
+				continue;
+			}
 
-		if (value.StoredFields is not null)
-		{
-			writer.WritePropertyName("stored_fields");
-			new FieldsConverter().Write(writer, value.StoredFields, options);
-		}
+			if (propStoredFields.TryRead(ref reader, options, PropStoredFields, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
 
-		if (value.Suggest is not null)
-		{
-			writer.WritePropertyName("suggest");
-			JsonSerializer.Serialize(writer, value.Suggest, options);
-		}
+			if (propSuggest.TryRead(ref reader, options, PropSuggest))
+			{
+				continue;
+			}
 
-		if (value.TerminateAfter.HasValue)
-		{
-			writer.WritePropertyName("terminate_after");
-			writer.WriteNumberValue(value.TerminateAfter.Value);
-		}
+			if (propTerminateAfter.TryRead(ref reader, options, PropTerminateAfter))
+			{
+				continue;
+			}
 
-		if (!string.IsNullOrEmpty(value.Timeout))
-		{
-			writer.WritePropertyName("timeout");
-			writer.WriteStringValue(value.Timeout);
-		}
+			if (propTimeout.TryRead(ref reader, options, PropTimeout))
+			{
+				continue;
+			}
 
-		if (value.TrackScores.HasValue)
-		{
-			writer.WritePropertyName("track_scores");
-			writer.WriteBooleanValue(value.TrackScores.Value);
-		}
+			if (propTrackScores.TryRead(ref reader, options, PropTrackScores))
+			{
+				continue;
+			}
 
-		if (value.TrackTotalHits is not null)
-		{
-			writer.WritePropertyName("track_total_hits");
-			JsonSerializer.Serialize(writer, value.TrackTotalHits, options);
-		}
+			if (propTrackTotalHits.TryRead(ref reader, options, PropTrackTotalHits))
+			{
+				continue;
+			}
 
-		if (value.Version.HasValue)
-		{
-			writer.WritePropertyName("version");
-			writer.WriteBooleanValue(value.Version.Value);
-		}
+			if (propVersion.TryRead(ref reader, options, PropVersion))
+			{
+				continue;
+			}
 
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SearchRequest
+		{
+			Aggregations = propAggregations.Value
+	,
+			Collapse = propCollapse.Value
+	,
+			DocvalueFields = propDocvalueFields.Value
+	,
+			Explain = propExplain.Value
+	,
+			Ext = propExt.Value
+	,
+			Fields = propFields.Value
+	,
+			From = propFrom.Value
+	,
+			Highlight = propHighlight.Value
+	,
+			IndicesBoost = propIndicesBoost.Value
+	,
+			Knn = propKnn.Value
+	,
+			MinScore = propMinScore.Value
+	,
+			Pit = propPit.Value
+	,
+			PostFilter = propPostFilter.Value
+	,
+			Profile = propProfile.Value
+	,
+			Query = propQuery.Value
+	,
+			Rank = propRank.Value
+	,
+			Rescore = propRescore.Value
+	,
+			Retriever = propRetriever.Value
+	,
+			RuntimeMappings = propRuntimeMappings.Value
+	,
+			ScriptFields = propScriptFields.Value
+	,
+			SearchAfter = propSearchAfter.Value
+	,
+			SeqNoPrimaryTerm = propSeqNoPrimaryTerm.Value
+	,
+			Size = propSize.Value
+	,
+			Slice = propSlice.Value
+	,
+			Sort = propSort.Value
+	,
+			Source = propSource.Value
+	,
+			Stats = propStats.Value
+	,
+			StoredFields = propStoredFields.Value
+	,
+			Suggest = propSuggest.Value
+	,
+			TerminateAfter = propTerminateAfter.Value
+	,
+			Timeout = propTimeout.Value
+	,
+			TrackScores = propTrackScores.Value
+	,
+			TrackTotalHits = propTrackTotalHits.Value
+	,
+			Version = propVersion.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SearchRequest value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAggregations, value.Aggregations);
+		writer.WriteProperty(options, PropCollapse, value.Collapse);
+		writer.WriteProperty(options, PropDocvalueFields, value.DocvalueFields);
+		writer.WriteProperty(options, PropExplain, value.Explain);
+		writer.WriteProperty(options, PropExt, value.Ext);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropFrom, value.From);
+		writer.WriteProperty(options, PropHighlight, value.Highlight);
+		writer.WriteProperty(options, PropIndicesBoost, value.IndicesBoost);
+		writer.WriteProperty(options, PropKnn, value.Knn, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.KnnSearch>?, Elastic.Clients.Elasticsearch.KnnSearch>));
+		writer.WriteProperty(options, PropMinScore, value.MinScore);
+		writer.WriteProperty(options, PropPit, value.Pit);
+		writer.WriteProperty(options, PropPostFilter, value.PostFilter);
+		writer.WriteProperty(options, PropProfile, value.Profile);
+		writer.WriteProperty(options, PropQuery, value.Query);
+		writer.WriteProperty(options, PropRank, value.Rank);
+		writer.WriteProperty(options, PropRescore, value.Rescore, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Core.Search.Rescore>?, Elastic.Clients.Elasticsearch.Core.Search.Rescore>));
+		writer.WriteProperty(options, PropRetriever, value.Retriever);
+		writer.WriteProperty(options, PropRuntimeMappings, value.RuntimeMappings);
+		writer.WriteProperty(options, PropScriptFields, value.ScriptFields);
+		writer.WriteProperty(options, PropSearchAfter, value.SearchAfter);
+		writer.WriteProperty(options, PropSeqNoPrimaryTerm, value.SeqNoPrimaryTerm);
+		writer.WriteProperty(options, PropSize, value.Size);
+		writer.WriteProperty(options, PropSlice, value.Slice);
+		writer.WriteProperty(options, PropSort, value.Sort, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.SortOptions>?, Elastic.Clients.Elasticsearch.SortOptions>));
+		writer.WriteProperty(options, PropSource, value.Source);
+		writer.WriteProperty(options, PropStats, value.Stats);
+		writer.WriteProperty(options, PropStoredFields, value.StoredFields, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropSuggest, value.Suggest);
+		writer.WriteProperty(options, PropTerminateAfter, value.TerminateAfter);
+		writer.WriteProperty(options, PropTimeout, value.Timeout);
+		writer.WriteProperty(options, PropTrackScores, value.TrackScores);
+		writer.WriteProperty(options, PropTrackTotalHits, value.TrackTotalHits);
+		writer.WriteProperty(options, PropVersion, value.Version);
 		writer.WriteEndObject();
 	}
 }
@@ -741,7 +674,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r =>
 	/// For example, a request targeting <c>foo*,bar*</c> returns an error if an index starts with <c>foo</c> but no index starts with <c>bar</c>.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public bool? AllowNoIndices { get => Q<bool?>("allow_no_indices"); set => Q("allow_no_indices", value); }
 
 	/// <summary>
@@ -749,7 +681,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r =>
 	/// If true, returns partial results if there are shard request timeouts or shard failures. If false, returns an error with no partial results.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public bool? AllowPartialSearchResults { get => Q<bool?>("allow_partial_search_results"); set => Q("allow_partial_search_results", value); }
 
 	/// <summary>
@@ -758,7 +689,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r =>
 	/// This parameter can only be used when the q query string parameter is specified.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public string? Analyzer { get => Q<string?>("analyzer"); set => Q("analyzer", value); }
 
 	/// <summary>
@@ -767,7 +697,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r =>
 	/// This parameter can only be used when the q query string parameter is specified.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public bool? AnalyzeWildcard { get => Q<bool?>("analyze_wildcard"); set => Q("analyze_wildcard", value); }
 
 	/// <summary>
@@ -776,7 +705,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r =>
 	/// 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>
@@ -784,7 +712,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r =>
 	/// If true, network round-trips between the coordinating node and the remote clusters are minimized when executing cross-cluster search (CCS) requests.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public bool? CcsMinimizeRoundtrips { get => Q<bool?>("ccs_minimize_roundtrips"); set => Q("ccs_minimize_roundtrips", value); }
 
 	/// <summary>
@@ -793,7 +720,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r =>
 	/// This parameter can only be used when the <c>q</c> query string parameter is specified.
 	/// </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>
@@ -802,7 +728,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r =>
 	/// This parameter can only be used when the q query string parameter is specified.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public string? Df { get => Q<string?>("df"); set => Q("df", value); }
 
 	/// <summary>
@@ -812,7 +737,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r =>
 	/// Supports comma-separated values, such as <c>open,hidden</c>.
 	/// </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>
@@ -822,7 +746,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r =>
 	/// Fetches with this enabled will be slower the enabling synthetic source natively in the index.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public bool? ForceSyntheticSource { get => Q<bool?>("force_synthetic_source"); set => Q("force_synthetic_source", value); }
 
 	/// <summary>
@@ -830,7 +753,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r =>
 	/// If <c>true</c>, concrete, expanded or aliased indices will be ignored when frozen.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public bool? IgnoreThrottled { get => Q<bool?>("ignore_throttled"); set => Q("ignore_throttled", value); }
 
 	/// <summary>
@@ -838,7 +760,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r =>
 	/// If <c>false</c>, the request returns an error if it targets a missing or closed index.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
 
 	/// <summary>
@@ -847,7 +768,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r =>
 	/// This parameter can only be used when the <c>q</c> query string parameter is specified.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public bool? Lenient { get => Q<bool?>("lenient"); set => Q("lenient", value); }
 
 	/// <summary>
@@ -856,7 +776,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r =>
 	/// 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>
@@ -871,7 +790,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r =>
 	/// <c>&lt;custom-string></c> (any string that does not start with <c>_</c>) to route searches with the same <c>&lt;custom-string></c> to the same shards in the same order.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public string? Preference { get => Q<string?>("preference"); set => Q("preference", value); }
 
 	/// <summary>
@@ -884,7 +802,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r =>
 	/// the primary sort of the query targets an indexed field.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public long? PreFilterShardSize { get => Q<long?>("pre_filter_shard_size"); set => Q("pre_filter_shard_size", value); }
 
 	/// <summary>
@@ -893,7 +810,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r =>
 	/// Query parameter searches do not support the full Elasticsearch Query DSL but are handy for testing.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public string? QueryLuceneSyntax { get => Q<string?>("q"); set => Q("q", value); }
 
 	/// <summary>
@@ -902,7 +818,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r =>
 	/// Defaults to index level settings.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public bool? RequestCache { get => Q<bool?>("request_cache"); set => Q("request_cache", value); }
 
 	/// <summary>
@@ -910,7 +825,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r =>
 	/// Indicates whether <c>hits.total</c> 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>
@@ -918,7 +832,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r =>
 	/// 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>
@@ -928,7 +841,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r =>
 	/// You can change this limit using the <c>search.max_keep_alive</c> cluster-level setting.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration? Scroll { get => Q<Elastic.Clients.Elasticsearch.Duration?>("scroll"); set => Q("scroll", value); }
 
 	/// <summary>
@@ -936,7 +848,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r =>
 	/// How distributed term frequencies are calculated for relevance scoring.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.SearchType? SearchType { get => Q<Elastic.Clients.Elasticsearch.SearchType?>("search_type"); set => Q("search_type", value); }
 
 	/// <summary>
@@ -946,7 +857,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r =>
 	/// If the <c>_source</c> parameter is <c>false</c>, this parameter is ignored.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Fields? SourceExcludes { get => Q<Elastic.Clients.Elasticsearch.Fields?>("_source_excludes"); set => Q("_source_excludes", value); }
 
 	/// <summary>
@@ -957,7 +867,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r =>
 	/// If the <c>_source</c> parameter is <c>false</c>, 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>
@@ -965,7 +874,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r =>
 	/// 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>
@@ -974,7 +882,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r =>
 	/// This parameter can only be used when the <c>suggest_field</c> and <c>suggest_text</c> query string parameters are specified.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.SuggestMode? SuggestMode { get => Q<Elastic.Clients.Elasticsearch.SuggestMode?>("suggest_mode"); set => Q("suggest_mode", value); }
 
 	/// <summary>
@@ -983,7 +890,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r =>
 	/// This parameter can only be used when the <c>suggest_field</c> and <c>suggest_text</c> query string parameters are specified.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public long? SuggestSize { get => Q<long?>("suggest_size"); set => Q("suggest_size", value); }
 
 	/// <summary>
@@ -992,7 +898,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r =>
 	/// This parameter can only be used when the <c>suggest_field</c> and <c>suggest_text</c> query string parameters are specified.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public string? SuggestText { get => Q<string?>("suggest_text"); set => Q("suggest_text", value); }
 
 	/// <summary>
@@ -1000,7 +905,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r =>
 	/// If <c>true</c>, aggregation and suggester names are 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>
@@ -1008,7 +912,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r =>
 	/// Defines the aggregations that are run as part of the search request.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("aggregations")]
 	public IDictionary<string, Elastic.Clients.Elasticsearch.Aggregations.Aggregation>? Aggregations { get; set; }
 
 	/// <summary>
@@ -1016,7 +919,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r =>
 	/// Collapses search results the values of the specified field.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("collapse")]
 	public Elastic.Clients.Elasticsearch.Core.Search.FieldCollapse? Collapse { get; set; }
 
 	/// <summary>
@@ -1025,7 +927,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r =>
 	/// The request returns doc values for field names matching these patterns in the <c>hits.fields</c> property of the response.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("docvalue_fields")]
 	public ICollection<Elastic.Clients.Elasticsearch.QueryDsl.FieldAndFormat>? DocvalueFields { get; set; }
 
 	/// <summary>
@@ -1033,7 +934,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r =>
 	/// If true, returns detailed information about score computation as part of a hit.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("explain")]
 	public bool? Explain { get; set; }
 
 	/// <summary>
@@ -1041,7 +941,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r =>
 	/// Configuration of search extensions defined by Elasticsearch plugins.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("ext")]
 	public IDictionary<string, object>? Ext { get; set; }
 
 	/// <summary>
@@ -1050,7 +949,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r =>
 	/// The request returns values for field names matching these patterns in the <c>hits.fields</c> property of the response.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("fields")]
 	public ICollection<Elastic.Clients.Elasticsearch.QueryDsl.FieldAndFormat>? Fields { get; set; }
 
 	/// <summary>
@@ -1061,7 +959,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r =>
 	/// To page through more hits, use the <c>search_after</c> parameter.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("from")]
 	public int? From { get; set; }
 
 	/// <summary>
@@ -1069,7 +966,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r =>
 	/// Specifies the highlighter to use for retrieving highlighted snippets from one or more fields in your search results.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("highlight")]
 	public Elastic.Clients.Elasticsearch.Core.Search.Highlight? Highlight { get; set; }
 
 	/// <summary>
@@ -1077,7 +973,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r =>
 	/// 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>
@@ -1085,8 +980,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r =>
 	/// Defines the approximate kNN search to run.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("knn")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.KnnSearch))]
 	public ICollection<Elastic.Clients.Elasticsearch.KnnSearch>? Knn { get; set; }
 
 	/// <summary>
@@ -1095,7 +988,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r =>
 	/// Documents with a lower <c>_score</c> are not included in the search results.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("min_score")]
 	public double? MinScore { get; set; }
 
 	/// <summary>
@@ -1104,7 +996,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r =>
 	/// If you provide a PIT, you cannot specify an <c>&lt;index></c> in the request path.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("pit")]
 	public Elastic.Clients.Elasticsearch.Core.Search.PointInTimeReference? Pit { get; set; }
 
 	/// <summary>
@@ -1114,7 +1005,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r =>
 	/// A post filter has no impact on the aggregation results.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("post_filter")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.Query? PostFilter { get; set; }
 
 	/// <summary>
@@ -1123,7 +1013,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r =>
 	/// NOTE: This is a debugging tool and adds significant overhead to search execution.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("profile")]
 	public bool? Profile { get; set; }
 
 	/// <summary>
@@ -1131,7 +1020,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r =>
 	/// Defines the search definition using the Query DSL.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("query")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.Query? Query { get; set; }
 
 	/// <summary>
@@ -1139,7 +1027,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r =>
 	/// Defines the Reciprocal Rank Fusion (RRF) to use.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("rank")]
 	public Elastic.Clients.Elasticsearch.Rank? Rank { get; set; }
 
 	/// <summary>
@@ -1147,8 +1034,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r =>
 	/// Can be used to improve precision by reordering just the top (for example 100 - 500) documents returned by the <c>query</c> and <c>post_filter</c> phases.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("rescore")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.Core.Search.Rescore))]
 	public ICollection<Elastic.Clients.Elasticsearch.Core.Search.Rescore>? Rescore { get; set; }
 
 	/// <summary>
@@ -1156,7 +1041,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r =>
 	/// A retriever is a specification to describe top documents returned from a search. A retriever replaces other elements of the search API that also return top documents such as query and knn.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("retriever")]
 	public Elastic.Clients.Elasticsearch.Retriever? Retriever { get; set; }
 
 	/// <summary>
@@ -1165,7 +1049,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r =>
 	/// These fields take 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>
@@ -1173,7 +1056,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r =>
 	/// 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; }
 
 	/// <summary>
@@ -1181,7 +1063,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r =>
 	/// Used to retrieve the next page of hits using a set of sort values from the previous page.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("search_after")]
 	public ICollection<Elastic.Clients.Elasticsearch.FieldValue>? SearchAfter { get; set; }
 
 	/// <summary>
@@ -1189,7 +1070,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r =>
 	/// If <c>true</c>, returns sequence number and primary term of the last modification of each hit.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("seq_no_primary_term")]
 	public bool? SeqNoPrimaryTerm { get; set; }
 
 	/// <summary>
@@ -1199,7 +1079,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r =>
 	/// To page through more hits, use the <c>search_after</c> parameter.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("size")]
 	public int? Size { get; set; }
 
 	/// <summary>
@@ -1207,7 +1086,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r =>
 	/// Can be used to split a scrolled search into multiple slices that can be consumed independently.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("slice")]
 	public Elastic.Clients.Elasticsearch.SlicedScroll? Slice { get; set; }
 
 	/// <summary>
@@ -1215,8 +1093,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r =>
 	/// A comma-separated list of &lt;field>:&lt;direction> pairs.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("sort")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.SortOptions))]
 	public ICollection<Elastic.Clients.Elasticsearch.SortOptions>? Sort { get; set; }
 
 	/// <summary>
@@ -1225,7 +1101,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r =>
 	/// These 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>
@@ -1235,7 +1110,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r =>
 	/// You can retrieve these stats using the indices stats API.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("stats")]
 	public ICollection<string>? Stats { get; set; }
 
 	/// <summary>
@@ -1246,8 +1120,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r =>
 	/// You can pass <c>_source: true</c> to return both source fields and stored fields in the search response.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("stored_fields")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Fields? StoredFields { get; set; }
 
 	/// <summary>
@@ -1255,7 +1127,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r =>
 	/// Defines a suggester that provides similar looking terms based on a provided text.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("suggest")]
 	public Elastic.Clients.Elasticsearch.Core.Search.Suggester? Suggest { get; set; }
 
 	/// <summary>
@@ -1270,7 +1141,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r =>
 	/// If set to <c>0</c> (default), the query does not terminate early.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("terminate_after")]
 	public long? TerminateAfter { get; set; }
 
 	/// <summary>
@@ -1280,7 +1150,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r =>
 	/// Defaults to no timeout.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("timeout")]
 	public string? Timeout { get; set; }
 
 	/// <summary>
@@ -1288,7 +1157,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r =>
 	/// 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>
@@ -1298,7 +1166,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r =>
 	/// If <c>false</c>, the  response does not include the total number of hits matching the query.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("track_total_hits")]
 	public Elastic.Clients.Elasticsearch.Core.Search.TrackHits? TrackTotalHits { get; set; }
 
 	/// <summary>
@@ -1306,7 +1173,6 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r =>
 	/// If true, returns document version as part of a hit.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("version")]
 	public bool? Version { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchResponse.g.cs
index 2d2eba622c5..2f7b2810ff1 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchResponse.g.cs
@@ -18,42 +18,212 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch;
 
+internal sealed partial class SearchResponseConverter<TDocument> : System.Text.Json.Serialization.JsonConverter<SearchResponse<TDocument>>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropClusters = System.Text.Json.JsonEncodedText.Encode("_clusters");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropHitsMetadata = System.Text.Json.JsonEncodedText.Encode("hits");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxScore = System.Text.Json.JsonEncodedText.Encode("max_score");
+	private static readonly System.Text.Json.JsonEncodedText PropNumReducePhases = System.Text.Json.JsonEncodedText.Encode("num_reduce_phases");
+	private static readonly System.Text.Json.JsonEncodedText PropPitId = System.Text.Json.JsonEncodedText.Encode("pit_id");
+	private static readonly System.Text.Json.JsonEncodedText PropProfile = System.Text.Json.JsonEncodedText.Encode("profile");
+	private static readonly System.Text.Json.JsonEncodedText PropScrollId = System.Text.Json.JsonEncodedText.Encode("_scroll_id");
+	private static readonly System.Text.Json.JsonEncodedText PropShards = System.Text.Json.JsonEncodedText.Encode("_shards");
+	private static readonly System.Text.Json.JsonEncodedText PropSuggest = System.Text.Json.JsonEncodedText.Encode("suggest");
+	private static readonly System.Text.Json.JsonEncodedText PropTerminatedEarly = System.Text.Json.JsonEncodedText.Encode("terminated_early");
+	private static readonly System.Text.Json.JsonEncodedText PropTimedOut = System.Text.Json.JsonEncodedText.Encode("timed_out");
+	private static readonly System.Text.Json.JsonEncodedText PropTook = System.Text.Json.JsonEncodedText.Encode("took");
+
+	public override SearchResponse<TDocument> Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary?> propAggregations = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.ClusterStatistics?> propClusters = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, object>?> propFields = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Core.Search.HitsMetadata<TDocument>> propHitsMetadata = default;
+		LocalJsonProperty<double?> propMaxScore = default;
+		LocalJsonProperty<long?> propNumReducePhases = default;
+		LocalJsonProperty<string?> propPitId = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Core.Search.Profile?> propProfile = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.ScrollId?> propScrollId = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.ShardStatistics> propShards = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Core.Search.SuggestDictionary<TDocument>?> propSuggest = default;
+		LocalJsonProperty<bool?> propTerminatedEarly = default;
+		LocalJsonProperty<bool> propTimedOut = default;
+		LocalJsonProperty<long> propTook = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAggregations.TryRead(ref reader, options, PropAggregations))
+			{
+				continue;
+			}
+
+			if (propClusters.TryRead(ref reader, options, PropClusters))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propHitsMetadata.TryRead(ref reader, options, PropHitsMetadata))
+			{
+				continue;
+			}
+
+			if (propMaxScore.TryRead(ref reader, options, PropMaxScore))
+			{
+				continue;
+			}
+
+			if (propNumReducePhases.TryRead(ref reader, options, PropNumReducePhases))
+			{
+				continue;
+			}
+
+			if (propPitId.TryRead(ref reader, options, PropPitId))
+			{
+				continue;
+			}
+
+			if (propProfile.TryRead(ref reader, options, PropProfile))
+			{
+				continue;
+			}
+
+			if (propScrollId.TryRead(ref reader, options, PropScrollId))
+			{
+				continue;
+			}
+
+			if (propShards.TryRead(ref reader, options, PropShards))
+			{
+				continue;
+			}
+
+			if (propSuggest.TryRead(ref reader, options, PropSuggest))
+			{
+				continue;
+			}
+
+			if (propTerminatedEarly.TryRead(ref reader, options, PropTerminatedEarly))
+			{
+				continue;
+			}
+
+			if (propTimedOut.TryRead(ref reader, options, PropTimedOut))
+			{
+				continue;
+			}
+
+			if (propTook.TryRead(ref reader, options, PropTook))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SearchResponse<TDocument>
+		{
+			Aggregations = propAggregations.Value
+,
+			Clusters = propClusters.Value
+,
+			Fields = propFields.Value
+,
+			HitsMetadata = propHitsMetadata.Value
+,
+			MaxScore = propMaxScore.Value
+,
+			NumReducePhases = propNumReducePhases.Value
+,
+			PitId = propPitId.Value
+,
+			Profile = propProfile.Value
+,
+			ScrollId = propScrollId.Value
+,
+			Shards = propShards.Value
+,
+			Suggest = propSuggest.Value
+,
+			TerminatedEarly = propTerminatedEarly.Value
+,
+			TimedOut = propTimedOut.Value
+,
+			Took = propTook.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SearchResponse<TDocument> value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAggregations, value.Aggregations);
+		writer.WriteProperty(options, PropClusters, value.Clusters);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropHitsMetadata, value.HitsMetadata);
+		writer.WriteProperty(options, PropMaxScore, value.MaxScore);
+		writer.WriteProperty(options, PropNumReducePhases, value.NumReducePhases);
+		writer.WriteProperty(options, PropPitId, value.PitId);
+		writer.WriteProperty(options, PropProfile, value.Profile);
+		writer.WriteProperty(options, PropScrollId, value.ScrollId);
+		writer.WriteProperty(options, PropShards, value.Shards);
+		writer.WriteProperty(options, PropSuggest, value.Suggest);
+		writer.WriteProperty(options, PropTerminatedEarly, value.TerminatedEarly);
+		writer.WriteProperty(options, PropTimedOut, value.TimedOut);
+		writer.WriteProperty(options, PropTook, value.Took);
+		writer.WriteEndObject();
+	}
+}
+
+internal sealed partial class SearchResponseConverterFactory : System.Text.Json.Serialization.JsonConverterFactory
+{
+	public override bool CanConvert(System.Type typeToConvert)
+	{
+		return typeToConvert.IsGenericType && typeToConvert.GetGenericTypeDefinition() == typeof(SearchResponse<>);
+	}
+
+	public override System.Text.Json.Serialization.JsonConverter CreateConverter(System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		var args = typeToConvert.GetGenericArguments();
+#pragma warning disable IL3050
+		var converter = (System.Text.Json.Serialization.JsonConverter)System.Activator.CreateInstance(typeof(SearchResponseConverter<>).MakeGenericType(args[0]), System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public, binder: null, args: null, culture: null)!;
+#pragma warning restore IL3050
+		return converter;
+	}
+}
+
+[JsonConverter(typeof(SearchResponseConverterFactory))]
 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("suggest")]
 	public Elastic.Clients.Elasticsearch.Core.Search.SuggestDictionary<TDocument>? Suggest { 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/SearchShardsResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchShardsResponse.g.cs
index 2914a6a88f7..a20b56d3f4c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchShardsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchShardsResponse.g.cs
@@ -18,21 +18,74 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch;
 
+internal sealed partial class SearchShardsResponseConverter : System.Text.Json.Serialization.JsonConverter<SearchShardsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropIndices = System.Text.Json.JsonEncodedText.Encode("indices");
+	private static readonly System.Text.Json.JsonEncodedText PropNodes = System.Text.Json.JsonEncodedText.Encode("nodes");
+	private static readonly System.Text.Json.JsonEncodedText PropShards = System.Text.Json.JsonEncodedText.Encode("shards");
+
+	public override SearchShardsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyDictionary<Elastic.Clients.Elasticsearch.IndexName, Elastic.Clients.Elasticsearch.Core.SearchShards.ShardStoreIndex>> propIndices = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Core.SearchShards.SearchShardsNodeAttributes>> propNodes = default;
+		LocalJsonProperty<IReadOnlyCollection<IReadOnlyCollection<Elastic.Clients.Elasticsearch.NodeShard>>> propShards = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propIndices.TryRead(ref reader, options, PropIndices))
+			{
+				continue;
+			}
+
+			if (propNodes.TryRead(ref reader, options, PropNodes))
+			{
+				continue;
+			}
+
+			if (propShards.TryRead(ref reader, options, PropShards))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SearchShardsResponse
+		{
+			Indices = propIndices.Value
+,
+			Nodes = propNodes.Value
+,
+			Shards = propShards.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SearchShardsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropIndices, value.Indices);
+		writer.WriteProperty(options, PropNodes, value.Nodes);
+		writer.WriteProperty(options, PropShards, value.Shards);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(SearchShardsResponseConverter))]
 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.Core.SearchShards.SearchShardsNodeAttributes> 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/SearchTemplateResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchTemplateResponse.g.cs
index 051c600694e..17e8e63908a 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchTemplateResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchTemplateResponse.g.cs
@@ -18,42 +18,212 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch;
 
+internal sealed partial class SearchTemplateResponseConverter<TDocument> : System.Text.Json.Serialization.JsonConverter<SearchTemplateResponse<TDocument>>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropClusters = System.Text.Json.JsonEncodedText.Encode("_clusters");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropHits = System.Text.Json.JsonEncodedText.Encode("hits");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxScore = System.Text.Json.JsonEncodedText.Encode("max_score");
+	private static readonly System.Text.Json.JsonEncodedText PropNumReducePhases = System.Text.Json.JsonEncodedText.Encode("num_reduce_phases");
+	private static readonly System.Text.Json.JsonEncodedText PropPitId = System.Text.Json.JsonEncodedText.Encode("pit_id");
+	private static readonly System.Text.Json.JsonEncodedText PropProfile = System.Text.Json.JsonEncodedText.Encode("profile");
+	private static readonly System.Text.Json.JsonEncodedText PropScrollId = System.Text.Json.JsonEncodedText.Encode("_scroll_id");
+	private static readonly System.Text.Json.JsonEncodedText PropShards = System.Text.Json.JsonEncodedText.Encode("_shards");
+	private static readonly System.Text.Json.JsonEncodedText PropSuggest = System.Text.Json.JsonEncodedText.Encode("suggest");
+	private static readonly System.Text.Json.JsonEncodedText PropTerminatedEarly = System.Text.Json.JsonEncodedText.Encode("terminated_early");
+	private static readonly System.Text.Json.JsonEncodedText PropTimedOut = System.Text.Json.JsonEncodedText.Encode("timed_out");
+	private static readonly System.Text.Json.JsonEncodedText PropTook = System.Text.Json.JsonEncodedText.Encode("took");
+
+	public override SearchTemplateResponse<TDocument> Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary?> propAggregations = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.ClusterStatistics?> propClusters = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, object>?> propFields = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Core.Search.HitsMetadata<TDocument>> propHits = default;
+		LocalJsonProperty<double?> propMaxScore = default;
+		LocalJsonProperty<long?> propNumReducePhases = default;
+		LocalJsonProperty<string?> propPitId = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Core.Search.Profile?> propProfile = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.ScrollId?> propScrollId = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.ShardStatistics> propShards = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Core.Search.SuggestDictionary<TDocument>?> propSuggest = default;
+		LocalJsonProperty<bool?> propTerminatedEarly = default;
+		LocalJsonProperty<bool> propTimedOut = default;
+		LocalJsonProperty<long> propTook = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAggregations.TryRead(ref reader, options, PropAggregations))
+			{
+				continue;
+			}
+
+			if (propClusters.TryRead(ref reader, options, PropClusters))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propHits.TryRead(ref reader, options, PropHits))
+			{
+				continue;
+			}
+
+			if (propMaxScore.TryRead(ref reader, options, PropMaxScore))
+			{
+				continue;
+			}
+
+			if (propNumReducePhases.TryRead(ref reader, options, PropNumReducePhases))
+			{
+				continue;
+			}
+
+			if (propPitId.TryRead(ref reader, options, PropPitId))
+			{
+				continue;
+			}
+
+			if (propProfile.TryRead(ref reader, options, PropProfile))
+			{
+				continue;
+			}
+
+			if (propScrollId.TryRead(ref reader, options, PropScrollId))
+			{
+				continue;
+			}
+
+			if (propShards.TryRead(ref reader, options, PropShards))
+			{
+				continue;
+			}
+
+			if (propSuggest.TryRead(ref reader, options, PropSuggest))
+			{
+				continue;
+			}
+
+			if (propTerminatedEarly.TryRead(ref reader, options, PropTerminatedEarly))
+			{
+				continue;
+			}
+
+			if (propTimedOut.TryRead(ref reader, options, PropTimedOut))
+			{
+				continue;
+			}
+
+			if (propTook.TryRead(ref reader, options, PropTook))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SearchTemplateResponse<TDocument>
+		{
+			Aggregations = propAggregations.Value
+,
+			Clusters = propClusters.Value
+,
+			Fields = propFields.Value
+,
+			Hits = propHits.Value
+,
+			MaxScore = propMaxScore.Value
+,
+			NumReducePhases = propNumReducePhases.Value
+,
+			PitId = propPitId.Value
+,
+			Profile = propProfile.Value
+,
+			ScrollId = propScrollId.Value
+,
+			Shards = propShards.Value
+,
+			Suggest = propSuggest.Value
+,
+			TerminatedEarly = propTerminatedEarly.Value
+,
+			TimedOut = propTimedOut.Value
+,
+			Took = propTook.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SearchTemplateResponse<TDocument> value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAggregations, value.Aggregations);
+		writer.WriteProperty(options, PropClusters, value.Clusters);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropHits, value.Hits);
+		writer.WriteProperty(options, PropMaxScore, value.MaxScore);
+		writer.WriteProperty(options, PropNumReducePhases, value.NumReducePhases);
+		writer.WriteProperty(options, PropPitId, value.PitId);
+		writer.WriteProperty(options, PropProfile, value.Profile);
+		writer.WriteProperty(options, PropScrollId, value.ScrollId);
+		writer.WriteProperty(options, PropShards, value.Shards);
+		writer.WriteProperty(options, PropSuggest, value.Suggest);
+		writer.WriteProperty(options, PropTerminatedEarly, value.TerminatedEarly);
+		writer.WriteProperty(options, PropTimedOut, value.TimedOut);
+		writer.WriteProperty(options, PropTook, value.Took);
+		writer.WriteEndObject();
+	}
+}
+
+internal sealed partial class SearchTemplateResponseConverterFactory : System.Text.Json.Serialization.JsonConverterFactory
+{
+	public override bool CanConvert(System.Type typeToConvert)
+	{
+		return typeToConvert.IsGenericType && typeToConvert.GetGenericTypeDefinition() == typeof(SearchTemplateResponse<>);
+	}
+
+	public override System.Text.Json.Serialization.JsonConverter CreateConverter(System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		var args = typeToConvert.GetGenericArguments();
+#pragma warning disable IL3050
+		var converter = (System.Text.Json.Serialization.JsonConverter)System.Activator.CreateInstance(typeof(SearchTemplateResponseConverter<>).MakeGenericType(args[0]), System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public, binder: null, args: null, culture: null)!;
+#pragma warning restore IL3050
+		return converter;
+	}
+}
+
+[JsonConverter(typeof(SearchTemplateResponseConverterFactory))]
 public sealed partial class SearchTemplateResponse<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> Hits { 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("suggest")]
 	public Elastic.Clients.Elasticsearch.Core.Search.SuggestDictionary<TDocument>? Suggest { 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/SearchableSnapshots/CacheStatsResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchableSnapshots/CacheStatsResponse.g.cs
index 6b810e01d41..ac0ad3b9d34 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchableSnapshots/CacheStatsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchableSnapshots/CacheStatsResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.SearchableSnapshots;
 
+internal sealed partial class CacheStatsResponseConverter : System.Text.Json.Serialization.JsonConverter<CacheStatsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropNodes = System.Text.Json.JsonEncodedText.Encode("nodes");
+
+	public override CacheStatsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.SearchableSnapshots.Node>> propNodes = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propNodes.TryRead(ref reader, options, PropNodes))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new CacheStatsResponse
+		{
+			Nodes = propNodes.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, CacheStatsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropNodes, value.Nodes);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(CacheStatsResponseConverter))]
 public sealed partial class CacheStatsResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("nodes")]
 	public IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.SearchableSnapshots.Node> Nodes { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchableSnapshots/MountResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchableSnapshots/MountResponse.g.cs
index 9ae28a8c3cf..cfb9f4783e6 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchableSnapshots/MountResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchableSnapshots/MountResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.SearchableSnapshots;
 
+internal sealed partial class MountResponseConverter : System.Text.Json.Serialization.JsonConverter<MountResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropSnapshot = System.Text.Json.JsonEncodedText.Encode("snapshot");
+
+	public override MountResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.SearchableSnapshots.MountedSnapshot> propSnapshot = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propSnapshot.TryRead(ref reader, options, PropSnapshot))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new MountResponse
+		{
+			Snapshot = propSnapshot.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, MountResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropSnapshot, value.Snapshot);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(MountResponseConverter))]
 public sealed partial class MountResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("snapshot")]
 	public Elastic.Clients.Elasticsearch.SearchableSnapshots.MountedSnapshot Snapshot { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchableSnapshots/SearchableSnapshotsStatsResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchableSnapshots/SearchableSnapshotsStatsResponse.g.cs
index fc66cfe509e..138e560b95a 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchableSnapshots/SearchableSnapshotsStatsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchableSnapshots/SearchableSnapshotsStatsResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.SearchableSnapshots;
 
+internal sealed partial class SearchableSnapshotsStatsResponseConverter : System.Text.Json.Serialization.JsonConverter<SearchableSnapshotsStatsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStats = System.Text.Json.JsonEncodedText.Encode("stats");
+	private static readonly System.Text.Json.JsonEncodedText PropTotal = System.Text.Json.JsonEncodedText.Encode("total");
+
+	public override SearchableSnapshotsStatsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<object> propStats = default;
+		LocalJsonProperty<object> propTotal = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStats.TryRead(ref reader, options, PropStats))
+			{
+				continue;
+			}
+
+			if (propTotal.TryRead(ref reader, options, PropTotal))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SearchableSnapshotsStatsResponse
+		{
+			Stats = propStats.Value
+,
+			Total = propTotal.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SearchableSnapshotsStatsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStats, value.Stats);
+		writer.WriteProperty(options, PropTotal, value.Total);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(SearchableSnapshotsStatsResponseConverter))]
 public sealed partial class SearchableSnapshotsStatsResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("stats")]
 	public object Stats { get; init; }
-	[JsonInclude, JsonPropertyName("total")]
 	public object Total { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/ActivateUserProfileResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/ActivateUserProfileResponse.g.cs
index e3935e35022..4e21af99297 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/ActivateUserProfileResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/ActivateUserProfileResponse.g.cs
@@ -18,28 +18,118 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Security;
 
+internal sealed partial class ActivateUserProfileResponseConverter : System.Text.Json.Serialization.JsonConverter<ActivateUserProfileResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropData = System.Text.Json.JsonEncodedText.Encode("data");
+	private static readonly System.Text.Json.JsonEncodedText PropDoc = System.Text.Json.JsonEncodedText.Encode("_doc");
+	private static readonly System.Text.Json.JsonEncodedText PropEnabled = System.Text.Json.JsonEncodedText.Encode("enabled");
+	private static readonly System.Text.Json.JsonEncodedText PropLabels = System.Text.Json.JsonEncodedText.Encode("labels");
+	private static readonly System.Text.Json.JsonEncodedText PropLastSynchronized = System.Text.Json.JsonEncodedText.Encode("last_synchronized");
+	private static readonly System.Text.Json.JsonEncodedText PropUid = System.Text.Json.JsonEncodedText.Encode("uid");
+	private static readonly System.Text.Json.JsonEncodedText PropUser = System.Text.Json.JsonEncodedText.Encode("user");
+
+	public override ActivateUserProfileResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyDictionary<string, object>> propData = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Security.UserProfileHitMetadata> propDoc = default;
+		LocalJsonProperty<bool?> propEnabled = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, object>> propLabels = default;
+		LocalJsonProperty<long> propLastSynchronized = default;
+		LocalJsonProperty<string> propUid = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Security.UserProfileUser> propUser = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propData.TryRead(ref reader, options, PropData))
+			{
+				continue;
+			}
+
+			if (propDoc.TryRead(ref reader, options, PropDoc))
+			{
+				continue;
+			}
+
+			if (propEnabled.TryRead(ref reader, options, PropEnabled))
+			{
+				continue;
+			}
+
+			if (propLabels.TryRead(ref reader, options, PropLabels))
+			{
+				continue;
+			}
+
+			if (propLastSynchronized.TryRead(ref reader, options, PropLastSynchronized))
+			{
+				continue;
+			}
+
+			if (propUid.TryRead(ref reader, options, PropUid))
+			{
+				continue;
+			}
+
+			if (propUser.TryRead(ref reader, options, PropUser))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ActivateUserProfileResponse
+		{
+			Data = propData.Value
+,
+			Doc = propDoc.Value
+,
+			Enabled = propEnabled.Value
+,
+			Labels = propLabels.Value
+,
+			LastSynchronized = propLastSynchronized.Value
+,
+			Uid = propUid.Value
+,
+			User = propUser.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ActivateUserProfileResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropData, value.Data);
+		writer.WriteProperty(options, PropDoc, value.Doc);
+		writer.WriteProperty(options, PropEnabled, value.Enabled);
+		writer.WriteProperty(options, PropLabels, value.Labels);
+		writer.WriteProperty(options, PropLastSynchronized, value.LastSynchronized);
+		writer.WriteProperty(options, PropUid, value.Uid);
+		writer.WriteProperty(options, PropUser, value.User);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ActivateUserProfileResponseConverter))]
 public sealed partial class ActivateUserProfileResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("data")]
 	public IReadOnlyDictionary<string, object> Data { get; init; }
-	[JsonInclude, JsonPropertyName("_doc")]
 	public Elastic.Clients.Elasticsearch.Security.UserProfileHitMetadata Doc { get; init; }
-	[JsonInclude, JsonPropertyName("enabled")]
 	public bool? Enabled { get; init; }
-	[JsonInclude, JsonPropertyName("labels")]
 	public IReadOnlyDictionary<string, object> Labels { get; init; }
-	[JsonInclude, JsonPropertyName("last_synchronized")]
 	public long LastSynchronized { get; init; }
-	[JsonInclude, JsonPropertyName("uid")]
 	public string Uid { get; init; }
-	[JsonInclude, JsonPropertyName("user")]
 	public Elastic.Clients.Elasticsearch.Security.UserProfileUser User { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/AuthenticateResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/AuthenticateResponse.g.cs
index 0ce01ead1df..7824344e80b 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/AuthenticateResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/AuthenticateResponse.g.cs
@@ -18,36 +18,162 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Security;
 
+internal sealed partial class AuthenticateResponseConverter : System.Text.Json.Serialization.JsonConverter<AuthenticateResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropApiKey = System.Text.Json.JsonEncodedText.Encode("api_key");
+	private static readonly System.Text.Json.JsonEncodedText PropAuthenticationRealm = System.Text.Json.JsonEncodedText.Encode("authentication_realm");
+	private static readonly System.Text.Json.JsonEncodedText PropAuthenticationType = System.Text.Json.JsonEncodedText.Encode("authentication_type");
+	private static readonly System.Text.Json.JsonEncodedText PropEmail = System.Text.Json.JsonEncodedText.Encode("email");
+	private static readonly System.Text.Json.JsonEncodedText PropEnabled = System.Text.Json.JsonEncodedText.Encode("enabled");
+	private static readonly System.Text.Json.JsonEncodedText PropFullName = System.Text.Json.JsonEncodedText.Encode("full_name");
+	private static readonly System.Text.Json.JsonEncodedText PropLookupRealm = System.Text.Json.JsonEncodedText.Encode("lookup_realm");
+	private static readonly System.Text.Json.JsonEncodedText PropMetadata = System.Text.Json.JsonEncodedText.Encode("metadata");
+	private static readonly System.Text.Json.JsonEncodedText PropRoles = System.Text.Json.JsonEncodedText.Encode("roles");
+	private static readonly System.Text.Json.JsonEncodedText PropToken = System.Text.Json.JsonEncodedText.Encode("token");
+	private static readonly System.Text.Json.JsonEncodedText PropUsername = System.Text.Json.JsonEncodedText.Encode("username");
+
+	public override AuthenticateResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Security.AuthenticateApiKey?> propApiKey = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Security.RealmInfo> propAuthenticationRealm = default;
+		LocalJsonProperty<string> propAuthenticationType = default;
+		LocalJsonProperty<string?> propEmail = default;
+		LocalJsonProperty<bool> propEnabled = default;
+		LocalJsonProperty<string?> propFullName = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Security.RealmInfo> propLookupRealm = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, object>> propMetadata = default;
+		LocalJsonProperty<IReadOnlyCollection<string>> propRoles = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Security.AuthenticateToken?> propToken = default;
+		LocalJsonProperty<string> propUsername = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propApiKey.TryRead(ref reader, options, PropApiKey))
+			{
+				continue;
+			}
+
+			if (propAuthenticationRealm.TryRead(ref reader, options, PropAuthenticationRealm))
+			{
+				continue;
+			}
+
+			if (propAuthenticationType.TryRead(ref reader, options, PropAuthenticationType))
+			{
+				continue;
+			}
+
+			if (propEmail.TryRead(ref reader, options, PropEmail))
+			{
+				continue;
+			}
+
+			if (propEnabled.TryRead(ref reader, options, PropEnabled))
+			{
+				continue;
+			}
+
+			if (propFullName.TryRead(ref reader, options, PropFullName))
+			{
+				continue;
+			}
+
+			if (propLookupRealm.TryRead(ref reader, options, PropLookupRealm))
+			{
+				continue;
+			}
+
+			if (propMetadata.TryRead(ref reader, options, PropMetadata))
+			{
+				continue;
+			}
+
+			if (propRoles.TryRead(ref reader, options, PropRoles))
+			{
+				continue;
+			}
+
+			if (propToken.TryRead(ref reader, options, PropToken))
+			{
+				continue;
+			}
+
+			if (propUsername.TryRead(ref reader, options, PropUsername))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new AuthenticateResponse
+		{
+			ApiKey = propApiKey.Value
+,
+			AuthenticationRealm = propAuthenticationRealm.Value
+,
+			AuthenticationType = propAuthenticationType.Value
+,
+			Email = propEmail.Value
+,
+			Enabled = propEnabled.Value
+,
+			FullName = propFullName.Value
+,
+			LookupRealm = propLookupRealm.Value
+,
+			Metadata = propMetadata.Value
+,
+			Roles = propRoles.Value
+,
+			Token = propToken.Value
+,
+			Username = propUsername.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, AuthenticateResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropApiKey, value.ApiKey);
+		writer.WriteProperty(options, PropAuthenticationRealm, value.AuthenticationRealm);
+		writer.WriteProperty(options, PropAuthenticationType, value.AuthenticationType);
+		writer.WriteProperty(options, PropEmail, value.Email);
+		writer.WriteProperty(options, PropEnabled, value.Enabled);
+		writer.WriteProperty(options, PropFullName, value.FullName);
+		writer.WriteProperty(options, PropLookupRealm, value.LookupRealm);
+		writer.WriteProperty(options, PropMetadata, value.Metadata);
+		writer.WriteProperty(options, PropRoles, value.Roles);
+		writer.WriteProperty(options, PropToken, value.Token);
+		writer.WriteProperty(options, PropUsername, value.Username);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(AuthenticateResponseConverter))]
 public sealed partial class AuthenticateResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("api_key")]
 	public Elastic.Clients.Elasticsearch.Security.AuthenticateApiKey? ApiKey { get; init; }
-	[JsonInclude, JsonPropertyName("authentication_realm")]
 	public Elastic.Clients.Elasticsearch.Security.RealmInfo AuthenticationRealm { get; init; }
-	[JsonInclude, JsonPropertyName("authentication_type")]
 	public string AuthenticationType { get; init; }
-	[JsonInclude, JsonPropertyName("email")]
 	public string? Email { get; init; }
-	[JsonInclude, JsonPropertyName("enabled")]
 	public bool Enabled { get; init; }
-	[JsonInclude, JsonPropertyName("full_name")]
 	public string? FullName { get; init; }
-	[JsonInclude, JsonPropertyName("lookup_realm")]
 	public Elastic.Clients.Elasticsearch.Security.RealmInfo LookupRealm { get; init; }
-	[JsonInclude, JsonPropertyName("metadata")]
 	public IReadOnlyDictionary<string, object> Metadata { get; init; }
-	[JsonInclude, JsonPropertyName("roles")]
 	public IReadOnlyCollection<string> Roles { get; init; }
-	[JsonInclude, JsonPropertyName("token")]
 	public Elastic.Clients.Elasticsearch.Security.AuthenticateToken? Token { get; init; }
-	[JsonInclude, JsonPropertyName("username")]
 	public string Username { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/BulkDeleteRoleResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/BulkDeleteRoleResponse.g.cs
index c09c14e8c35..169ada0bab1 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/BulkDeleteRoleResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/BulkDeleteRoleResponse.g.cs
@@ -18,14 +18,71 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Security;
 
+internal sealed partial class BulkDeleteRoleResponseConverter : System.Text.Json.Serialization.JsonConverter<BulkDeleteRoleResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropDeleted = System.Text.Json.JsonEncodedText.Encode("deleted");
+	private static readonly System.Text.Json.JsonEncodedText PropErrors = System.Text.Json.JsonEncodedText.Encode("errors");
+	private static readonly System.Text.Json.JsonEncodedText PropNotFound = System.Text.Json.JsonEncodedText.Encode("not_found");
+
+	public override BulkDeleteRoleResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<string>?> propDeleted = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Security.BulkError?> propErrors = default;
+		LocalJsonProperty<IReadOnlyCollection<string>?> propNotFound = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propDeleted.TryRead(ref reader, options, PropDeleted))
+			{
+				continue;
+			}
+
+			if (propErrors.TryRead(ref reader, options, PropErrors))
+			{
+				continue;
+			}
+
+			if (propNotFound.TryRead(ref reader, options, PropNotFound))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new BulkDeleteRoleResponse
+		{
+			Deleted = propDeleted.Value
+,
+			Errors = propErrors.Value
+,
+			NotFound = propNotFound.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, BulkDeleteRoleResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDeleted, value.Deleted);
+		writer.WriteProperty(options, PropErrors, value.Errors);
+		writer.WriteProperty(options, PropNotFound, value.NotFound);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(BulkDeleteRoleResponseConverter))]
 public sealed partial class BulkDeleteRoleResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,7 +90,6 @@ public sealed partial class BulkDeleteRoleResponse : ElasticsearchResponse
 	/// Array of deleted roles
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("deleted")]
 	public IReadOnlyCollection<string>? Deleted { get; init; }
 
 	/// <summary>
@@ -41,7 +97,6 @@ public sealed partial class BulkDeleteRoleResponse : ElasticsearchResponse
 	/// Present if any deletes resulted in errors
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("errors")]
 	public Elastic.Clients.Elasticsearch.Security.BulkError? Errors { get; init; }
 
 	/// <summary>
@@ -49,6 +104,5 @@ public sealed partial class BulkDeleteRoleResponse : ElasticsearchResponse
 	/// Array of roles that could not be found
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("not_found")]
 	public IReadOnlyCollection<string>? NotFound { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/BulkPutRoleResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/BulkPutRoleResponse.g.cs
index 82e4e4312b5..bc2a96ee79f 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/BulkPutRoleResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/BulkPutRoleResponse.g.cs
@@ -18,14 +18,81 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Security;
 
+internal sealed partial class BulkPutRoleResponseConverter : System.Text.Json.Serialization.JsonConverter<BulkPutRoleResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCreated = System.Text.Json.JsonEncodedText.Encode("created");
+	private static readonly System.Text.Json.JsonEncodedText PropErrors = System.Text.Json.JsonEncodedText.Encode("errors");
+	private static readonly System.Text.Json.JsonEncodedText PropNoop = System.Text.Json.JsonEncodedText.Encode("noop");
+	private static readonly System.Text.Json.JsonEncodedText PropUpdated = System.Text.Json.JsonEncodedText.Encode("updated");
+
+	public override BulkPutRoleResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<string>?> propCreated = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Security.BulkError?> propErrors = default;
+		LocalJsonProperty<IReadOnlyCollection<string>?> propNoop = default;
+		LocalJsonProperty<IReadOnlyCollection<string>?> propUpdated = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCreated.TryRead(ref reader, options, PropCreated))
+			{
+				continue;
+			}
+
+			if (propErrors.TryRead(ref reader, options, PropErrors))
+			{
+				continue;
+			}
+
+			if (propNoop.TryRead(ref reader, options, PropNoop))
+			{
+				continue;
+			}
+
+			if (propUpdated.TryRead(ref reader, options, PropUpdated))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new BulkPutRoleResponse
+		{
+			Created = propCreated.Value
+,
+			Errors = propErrors.Value
+,
+			Noop = propNoop.Value
+,
+			Updated = propUpdated.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, BulkPutRoleResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCreated, value.Created);
+		writer.WriteProperty(options, PropErrors, value.Errors);
+		writer.WriteProperty(options, PropNoop, value.Noop);
+		writer.WriteProperty(options, PropUpdated, value.Updated);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(BulkPutRoleResponseConverter))]
 public sealed partial class BulkPutRoleResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,7 +100,6 @@ public sealed partial class BulkPutRoleResponse : ElasticsearchResponse
 	/// Array of created roles
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("created")]
 	public IReadOnlyCollection<string>? Created { get; init; }
 
 	/// <summary>
@@ -41,7 +107,6 @@ public sealed partial class BulkPutRoleResponse : ElasticsearchResponse
 	/// Present if any updates resulted in errors
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("errors")]
 	public Elastic.Clients.Elasticsearch.Security.BulkError? Errors { get; init; }
 
 	/// <summary>
@@ -49,7 +114,6 @@ public sealed partial class BulkPutRoleResponse : ElasticsearchResponse
 	/// Array of role names without any changes
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("noop")]
 	public IReadOnlyCollection<string>? Noop { get; init; }
 
 	/// <summary>
@@ -57,6 +121,5 @@ public sealed partial class BulkPutRoleResponse : ElasticsearchResponse
 	/// Array of updated roles
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("updated")]
 	public IReadOnlyCollection<string>? Updated { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/BulkUpdateApiKeysRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/BulkUpdateApiKeysRequest.g.cs
index c0d3ded7557..0f7df94fb34 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/BulkUpdateApiKeysRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/BulkUpdateApiKeysRequest.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport;
@@ -34,6 +35,69 @@ public sealed partial class BulkUpdateApiKeysRequestParameters : RequestParamete
 {
 }
 
+internal sealed partial class BulkUpdateApiKeysRequestConverter : System.Text.Json.Serialization.JsonConverter<BulkUpdateApiKeysRequest>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropExpiration = System.Text.Json.JsonEncodedText.Encode("expiration");
+	private static readonly System.Text.Json.JsonEncodedText PropIds = System.Text.Json.JsonEncodedText.Encode("ids");
+	private static readonly System.Text.Json.JsonEncodedText PropMetadata = System.Text.Json.JsonEncodedText.Encode("metadata");
+	private static readonly System.Text.Json.JsonEncodedText PropRoleDescriptors = System.Text.Json.JsonEncodedText.Encode("role_descriptors");
+
+	public override BulkUpdateApiKeysRequest Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Duration?> propExpiration = default;
+		LocalJsonProperty<ICollection<string>> propIds = default;
+		LocalJsonProperty<IDictionary<string, object>?> propMetadata = default;
+		LocalJsonProperty<IDictionary<string, Elastic.Clients.Elasticsearch.Security.RoleDescriptor>?> propRoleDescriptors = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propExpiration.TryRead(ref reader, options, PropExpiration))
+			{
+				continue;
+			}
+
+			if (propIds.TryRead(ref reader, options, PropIds, typeof(SingleOrManyMarker<IReadOnlyCollection<string>, string>)))
+			{
+				continue;
+			}
+
+			if (propMetadata.TryRead(ref reader, options, PropMetadata))
+			{
+				continue;
+			}
+
+			if (propRoleDescriptors.TryRead(ref reader, options, PropRoleDescriptors))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new BulkUpdateApiKeysRequest
+		{
+			Expiration = propExpiration.Value
+,
+			Ids = propIds.Value
+,
+			Metadata = propMetadata.Value
+,
+			RoleDescriptors = propRoleDescriptors.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, BulkUpdateApiKeysRequest value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropExpiration, value.Expiration);
+		writer.WriteProperty(options, PropIds, value.Ids, typeof(SingleOrManyMarker<IReadOnlyCollection<string>, string>));
+		writer.WriteProperty(options, PropMetadata, value.Metadata);
+		writer.WriteProperty(options, PropRoleDescriptors, value.RoleDescriptors);
+		writer.WriteEndObject();
+	}
+}
+
 /// <summary>
 /// <para>
 /// Bulk update API keys.
@@ -60,6 +124,7 @@ public sealed partial class BulkUpdateApiKeysRequestParameters : RequestParamete
 /// A successful request returns a JSON structure that contains the IDs of all updated API keys, the IDs of API keys that already had the requested changes and did not require an update, and error details for any failed update.
 /// </para>
 /// </summary>
+[JsonConverter(typeof(BulkUpdateApiKeysRequestConverter))]
 public sealed partial class BulkUpdateApiKeysRequest : PlainRequest<BulkUpdateApiKeysRequestParameters>
 {
 	internal override ApiUrls ApiUrls => ApiUrlLookup.SecurityBulkUpdateApiKeys;
@@ -77,7 +142,6 @@ public sealed partial class BulkUpdateApiKeysRequest : PlainRequest<BulkUpdateAp
 	/// This property can be omitted to leave the value unchanged.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("expiration")]
 	public Elastic.Clients.Elasticsearch.Duration? Expiration { get; set; }
 
 	/// <summary>
@@ -85,8 +149,6 @@ public sealed partial class BulkUpdateApiKeysRequest : PlainRequest<BulkUpdateAp
 	/// The API key identifiers.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("ids")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string> Ids { get; set; }
 
 	/// <summary>
@@ -96,7 +158,6 @@ public sealed partial class BulkUpdateApiKeysRequest : PlainRequest<BulkUpdateAp
 	/// Any information specified with this parameter fully replaces metadata previously associated with the API key.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("metadata")]
 	public IDictionary<string, object>? Metadata { get; set; }
 
 	/// <summary>
@@ -110,7 +171,6 @@ public sealed partial class BulkUpdateApiKeysRequest : PlainRequest<BulkUpdateAp
 	/// The structure of a role descriptor is the same as the request for the create API keys API.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("role_descriptors")]
 	public IDictionary<string, Elastic.Clients.Elasticsearch.Security.RoleDescriptor>? RoleDescriptors { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/BulkUpdateApiKeysResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/BulkUpdateApiKeysResponse.g.cs
index 2cd808cde1d..47f92fd01bc 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/BulkUpdateApiKeysResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/BulkUpdateApiKeysResponse.g.cs
@@ -18,20 +18,74 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Security;
 
+internal sealed partial class BulkUpdateApiKeysResponseConverter : System.Text.Json.Serialization.JsonConverter<BulkUpdateApiKeysResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropErrors = System.Text.Json.JsonEncodedText.Encode("errors");
+	private static readonly System.Text.Json.JsonEncodedText PropNoops = System.Text.Json.JsonEncodedText.Encode("noops");
+	private static readonly System.Text.Json.JsonEncodedText PropUpdated = System.Text.Json.JsonEncodedText.Encode("updated");
+
+	public override BulkUpdateApiKeysResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Security.BulkError?> propErrors = default;
+		LocalJsonProperty<IReadOnlyCollection<string>> propNoops = default;
+		LocalJsonProperty<IReadOnlyCollection<string>> propUpdated = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propErrors.TryRead(ref reader, options, PropErrors))
+			{
+				continue;
+			}
+
+			if (propNoops.TryRead(ref reader, options, PropNoops))
+			{
+				continue;
+			}
+
+			if (propUpdated.TryRead(ref reader, options, PropUpdated))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new BulkUpdateApiKeysResponse
+		{
+			Errors = propErrors.Value
+,
+			Noops = propNoops.Value
+,
+			Updated = propUpdated.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, BulkUpdateApiKeysResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropErrors, value.Errors);
+		writer.WriteProperty(options, PropNoops, value.Noops);
+		writer.WriteProperty(options, PropUpdated, value.Updated);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(BulkUpdateApiKeysResponseConverter))]
 public sealed partial class BulkUpdateApiKeysResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("errors")]
 	public Elastic.Clients.Elasticsearch.Security.BulkError? Errors { get; init; }
-	[JsonInclude, JsonPropertyName("noops")]
 	public IReadOnlyCollection<string> Noops { get; init; }
-	[JsonInclude, JsonPropertyName("updated")]
 	public IReadOnlyCollection<string> Updated { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/ChangePasswordResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/ChangePasswordResponse.g.cs
index 00c66d00ff6..2802f3dd4f9 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/ChangePasswordResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/ChangePasswordResponse.g.cs
@@ -18,14 +18,39 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Security;
 
+internal sealed partial class ChangePasswordResponseConverter : System.Text.Json.Serialization.JsonConverter<ChangePasswordResponse>
+{
+	public override ChangePasswordResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ChangePasswordResponse { };
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ChangePasswordResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ChangePasswordResponseConverter))]
 public sealed partial class ChangePasswordResponse : ElasticsearchResponse
 {
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/ClearApiKeyCacheResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/ClearApiKeyCacheResponse.g.cs
index 65cdf04e9b0..5060bc9caf9 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/ClearApiKeyCacheResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/ClearApiKeyCacheResponse.g.cs
@@ -18,20 +18,74 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Security;
 
+internal sealed partial class ClearApiKeyCacheResponseConverter : System.Text.Json.Serialization.JsonConverter<ClearApiKeyCacheResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropClusterName = System.Text.Json.JsonEncodedText.Encode("cluster_name");
+	private static readonly System.Text.Json.JsonEncodedText PropNodes = System.Text.Json.JsonEncodedText.Encode("nodes");
+	private static readonly System.Text.Json.JsonEncodedText PropNodeStats = System.Text.Json.JsonEncodedText.Encode("_nodes");
+
+	public override ClearApiKeyCacheResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propClusterName = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Security.ClusterNode>> propNodes = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.NodeStatistics> propNodeStats = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propClusterName.TryRead(ref reader, options, PropClusterName))
+			{
+				continue;
+			}
+
+			if (propNodes.TryRead(ref reader, options, PropNodes))
+			{
+				continue;
+			}
+
+			if (propNodeStats.TryRead(ref reader, options, PropNodeStats))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ClearApiKeyCacheResponse
+		{
+			ClusterName = propClusterName.Value
+,
+			Nodes = propNodes.Value
+,
+			NodeStats = propNodeStats.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ClearApiKeyCacheResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropClusterName, value.ClusterName);
+		writer.WriteProperty(options, PropNodes, value.Nodes);
+		writer.WriteProperty(options, PropNodeStats, value.NodeStats);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ClearApiKeyCacheResponseConverter))]
 public sealed partial class ClearApiKeyCacheResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("cluster_name")]
 	public string ClusterName { get; init; }
-	[JsonInclude, JsonPropertyName("nodes")]
 	public IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Security.ClusterNode> Nodes { get; init; }
-	[JsonInclude, JsonPropertyName("_nodes")]
 	public Elastic.Clients.Elasticsearch.NodeStatistics NodeStats { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/ClearCachedPrivilegesResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/ClearCachedPrivilegesResponse.g.cs
index d912eaa3cfd..98626b25bde 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/ClearCachedPrivilegesResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/ClearCachedPrivilegesResponse.g.cs
@@ -18,20 +18,74 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Security;
 
+internal sealed partial class ClearCachedPrivilegesResponseConverter : System.Text.Json.Serialization.JsonConverter<ClearCachedPrivilegesResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropClusterName = System.Text.Json.JsonEncodedText.Encode("cluster_name");
+	private static readonly System.Text.Json.JsonEncodedText PropNodes = System.Text.Json.JsonEncodedText.Encode("nodes");
+	private static readonly System.Text.Json.JsonEncodedText PropNodeStats = System.Text.Json.JsonEncodedText.Encode("_nodes");
+
+	public override ClearCachedPrivilegesResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propClusterName = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Security.ClusterNode>> propNodes = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.NodeStatistics> propNodeStats = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propClusterName.TryRead(ref reader, options, PropClusterName))
+			{
+				continue;
+			}
+
+			if (propNodes.TryRead(ref reader, options, PropNodes))
+			{
+				continue;
+			}
+
+			if (propNodeStats.TryRead(ref reader, options, PropNodeStats))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ClearCachedPrivilegesResponse
+		{
+			ClusterName = propClusterName.Value
+,
+			Nodes = propNodes.Value
+,
+			NodeStats = propNodeStats.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ClearCachedPrivilegesResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropClusterName, value.ClusterName);
+		writer.WriteProperty(options, PropNodes, value.Nodes);
+		writer.WriteProperty(options, PropNodeStats, value.NodeStats);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ClearCachedPrivilegesResponseConverter))]
 public sealed partial class ClearCachedPrivilegesResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("cluster_name")]
 	public string ClusterName { get; init; }
-	[JsonInclude, JsonPropertyName("nodes")]
 	public IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Security.ClusterNode> Nodes { get; init; }
-	[JsonInclude, JsonPropertyName("_nodes")]
 	public Elastic.Clients.Elasticsearch.NodeStatistics NodeStats { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/ClearCachedRealmsResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/ClearCachedRealmsResponse.g.cs
index 7f2e195891e..feab9be0b5c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/ClearCachedRealmsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/ClearCachedRealmsResponse.g.cs
@@ -18,20 +18,74 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Security;
 
+internal sealed partial class ClearCachedRealmsResponseConverter : System.Text.Json.Serialization.JsonConverter<ClearCachedRealmsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropClusterName = System.Text.Json.JsonEncodedText.Encode("cluster_name");
+	private static readonly System.Text.Json.JsonEncodedText PropNodes = System.Text.Json.JsonEncodedText.Encode("nodes");
+	private static readonly System.Text.Json.JsonEncodedText PropNodeStats = System.Text.Json.JsonEncodedText.Encode("_nodes");
+
+	public override ClearCachedRealmsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propClusterName = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Security.ClusterNode>> propNodes = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.NodeStatistics> propNodeStats = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propClusterName.TryRead(ref reader, options, PropClusterName))
+			{
+				continue;
+			}
+
+			if (propNodes.TryRead(ref reader, options, PropNodes))
+			{
+				continue;
+			}
+
+			if (propNodeStats.TryRead(ref reader, options, PropNodeStats))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ClearCachedRealmsResponse
+		{
+			ClusterName = propClusterName.Value
+,
+			Nodes = propNodes.Value
+,
+			NodeStats = propNodeStats.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ClearCachedRealmsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropClusterName, value.ClusterName);
+		writer.WriteProperty(options, PropNodes, value.Nodes);
+		writer.WriteProperty(options, PropNodeStats, value.NodeStats);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ClearCachedRealmsResponseConverter))]
 public sealed partial class ClearCachedRealmsResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("cluster_name")]
 	public string ClusterName { get; init; }
-	[JsonInclude, JsonPropertyName("nodes")]
 	public IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Security.ClusterNode> Nodes { get; init; }
-	[JsonInclude, JsonPropertyName("_nodes")]
 	public Elastic.Clients.Elasticsearch.NodeStatistics NodeStats { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/ClearCachedRolesResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/ClearCachedRolesResponse.g.cs
index 5257f5d7b69..d401a5ea3d6 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/ClearCachedRolesResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/ClearCachedRolesResponse.g.cs
@@ -18,20 +18,74 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Security;
 
+internal sealed partial class ClearCachedRolesResponseConverter : System.Text.Json.Serialization.JsonConverter<ClearCachedRolesResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropClusterName = System.Text.Json.JsonEncodedText.Encode("cluster_name");
+	private static readonly System.Text.Json.JsonEncodedText PropNodes = System.Text.Json.JsonEncodedText.Encode("nodes");
+	private static readonly System.Text.Json.JsonEncodedText PropNodeStats = System.Text.Json.JsonEncodedText.Encode("_nodes");
+
+	public override ClearCachedRolesResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propClusterName = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Security.ClusterNode>> propNodes = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.NodeStatistics> propNodeStats = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propClusterName.TryRead(ref reader, options, PropClusterName))
+			{
+				continue;
+			}
+
+			if (propNodes.TryRead(ref reader, options, PropNodes))
+			{
+				continue;
+			}
+
+			if (propNodeStats.TryRead(ref reader, options, PropNodeStats))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ClearCachedRolesResponse
+		{
+			ClusterName = propClusterName.Value
+,
+			Nodes = propNodes.Value
+,
+			NodeStats = propNodeStats.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ClearCachedRolesResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropClusterName, value.ClusterName);
+		writer.WriteProperty(options, PropNodes, value.Nodes);
+		writer.WriteProperty(options, PropNodeStats, value.NodeStats);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ClearCachedRolesResponseConverter))]
 public sealed partial class ClearCachedRolesResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("cluster_name")]
 	public string ClusterName { get; init; }
-	[JsonInclude, JsonPropertyName("nodes")]
 	public IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Security.ClusterNode> Nodes { get; init; }
-	[JsonInclude, JsonPropertyName("_nodes")]
 	public Elastic.Clients.Elasticsearch.NodeStatistics NodeStats { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/ClearCachedServiceTokensResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/ClearCachedServiceTokensResponse.g.cs
index b1b33e09cf9..bce75cafb77 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/ClearCachedServiceTokensResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/ClearCachedServiceTokensResponse.g.cs
@@ -18,20 +18,74 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Security;
 
+internal sealed partial class ClearCachedServiceTokensResponseConverter : System.Text.Json.Serialization.JsonConverter<ClearCachedServiceTokensResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropClusterName = System.Text.Json.JsonEncodedText.Encode("cluster_name");
+	private static readonly System.Text.Json.JsonEncodedText PropNodes = System.Text.Json.JsonEncodedText.Encode("nodes");
+	private static readonly System.Text.Json.JsonEncodedText PropNodeStats = System.Text.Json.JsonEncodedText.Encode("_nodes");
+
+	public override ClearCachedServiceTokensResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propClusterName = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Security.ClusterNode>> propNodes = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.NodeStatistics> propNodeStats = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propClusterName.TryRead(ref reader, options, PropClusterName))
+			{
+				continue;
+			}
+
+			if (propNodes.TryRead(ref reader, options, PropNodes))
+			{
+				continue;
+			}
+
+			if (propNodeStats.TryRead(ref reader, options, PropNodeStats))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ClearCachedServiceTokensResponse
+		{
+			ClusterName = propClusterName.Value
+,
+			Nodes = propNodes.Value
+,
+			NodeStats = propNodeStats.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ClearCachedServiceTokensResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropClusterName, value.ClusterName);
+		writer.WriteProperty(options, PropNodes, value.Nodes);
+		writer.WriteProperty(options, PropNodeStats, value.NodeStats);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ClearCachedServiceTokensResponseConverter))]
 public sealed partial class ClearCachedServiceTokensResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("cluster_name")]
 	public string ClusterName { get; init; }
-	[JsonInclude, JsonPropertyName("nodes")]
 	public IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Security.ClusterNode> Nodes { get; init; }
-	[JsonInclude, JsonPropertyName("_nodes")]
 	public Elastic.Clients.Elasticsearch.NodeStatistics NodeStats { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/CreateApiKeyResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/CreateApiKeyResponse.g.cs
index 440179df1b5..493b4238545 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/CreateApiKeyResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/CreateApiKeyResponse.g.cs
@@ -18,14 +18,91 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Security;
 
+internal sealed partial class CreateApiKeyResponseConverter : System.Text.Json.Serialization.JsonConverter<CreateApiKeyResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropApiKey = System.Text.Json.JsonEncodedText.Encode("api_key");
+	private static readonly System.Text.Json.JsonEncodedText PropEncoded = System.Text.Json.JsonEncodedText.Encode("encoded");
+	private static readonly System.Text.Json.JsonEncodedText PropExpiration = System.Text.Json.JsonEncodedText.Encode("expiration");
+	private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("id");
+	private static readonly System.Text.Json.JsonEncodedText PropName = System.Text.Json.JsonEncodedText.Encode("name");
+
+	public override CreateApiKeyResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propApiKey = default;
+		LocalJsonProperty<string> propEncoded = default;
+		LocalJsonProperty<long?> propExpiration = default;
+		LocalJsonProperty<string> propId = default;
+		LocalJsonProperty<string> propName = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propApiKey.TryRead(ref reader, options, PropApiKey))
+			{
+				continue;
+			}
+
+			if (propEncoded.TryRead(ref reader, options, PropEncoded))
+			{
+				continue;
+			}
+
+			if (propExpiration.TryRead(ref reader, options, PropExpiration))
+			{
+				continue;
+			}
+
+			if (propId.TryRead(ref reader, options, PropId))
+			{
+				continue;
+			}
+
+			if (propName.TryRead(ref reader, options, PropName))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new CreateApiKeyResponse
+		{
+			ApiKey = propApiKey.Value
+,
+			Encoded = propEncoded.Value
+,
+			Expiration = propExpiration.Value
+,
+			Id = propId.Value
+,
+			Name = propName.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, CreateApiKeyResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropApiKey, value.ApiKey);
+		writer.WriteProperty(options, PropEncoded, value.Encoded);
+		writer.WriteProperty(options, PropExpiration, value.Expiration);
+		writer.WriteProperty(options, PropId, value.Id);
+		writer.WriteProperty(options, PropName, value.Name);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(CreateApiKeyResponseConverter))]
 public sealed partial class CreateApiKeyResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,7 +110,6 @@ public sealed partial class CreateApiKeyResponse : ElasticsearchResponse
 	/// Generated API key.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("api_key")]
 	public string ApiKey { get; init; }
 
 	/// <summary>
@@ -43,7 +119,6 @@ public sealed partial class CreateApiKeyResponse : ElasticsearchResponse
 	/// by a colon (<c>:</c>).
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("encoded")]
 	public string Encoded { get; init; }
 
 	/// <summary>
@@ -51,7 +126,6 @@ public sealed partial class CreateApiKeyResponse : ElasticsearchResponse
 	/// Expiration in milliseconds for the API key.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("expiration")]
 	public long? Expiration { get; init; }
 
 	/// <summary>
@@ -59,7 +133,6 @@ public sealed partial class CreateApiKeyResponse : ElasticsearchResponse
 	/// Unique ID for this API key.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("id")]
 	public string Id { get; init; }
 
 	/// <summary>
@@ -67,6 +140,5 @@ public sealed partial class CreateApiKeyResponse : ElasticsearchResponse
 	/// Specifies the name for this API key.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("name")]
 	public string Name { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/CreateCrossClusterApiKeyResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/CreateCrossClusterApiKeyResponse.g.cs
index 3dcac6531a1..3d95aa84336 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/CreateCrossClusterApiKeyResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/CreateCrossClusterApiKeyResponse.g.cs
@@ -18,14 +18,91 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Security;
 
+internal sealed partial class CreateCrossClusterApiKeyResponseConverter : System.Text.Json.Serialization.JsonConverter<CreateCrossClusterApiKeyResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropApiKey = System.Text.Json.JsonEncodedText.Encode("api_key");
+	private static readonly System.Text.Json.JsonEncodedText PropEncoded = System.Text.Json.JsonEncodedText.Encode("encoded");
+	private static readonly System.Text.Json.JsonEncodedText PropExpiration = System.Text.Json.JsonEncodedText.Encode("expiration");
+	private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("id");
+	private static readonly System.Text.Json.JsonEncodedText PropName = System.Text.Json.JsonEncodedText.Encode("name");
+
+	public override CreateCrossClusterApiKeyResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propApiKey = default;
+		LocalJsonProperty<string> propEncoded = default;
+		LocalJsonProperty<long?> propExpiration = default;
+		LocalJsonProperty<string> propId = default;
+		LocalJsonProperty<string> propName = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propApiKey.TryRead(ref reader, options, PropApiKey))
+			{
+				continue;
+			}
+
+			if (propEncoded.TryRead(ref reader, options, PropEncoded))
+			{
+				continue;
+			}
+
+			if (propExpiration.TryRead(ref reader, options, PropExpiration))
+			{
+				continue;
+			}
+
+			if (propId.TryRead(ref reader, options, PropId))
+			{
+				continue;
+			}
+
+			if (propName.TryRead(ref reader, options, PropName))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new CreateCrossClusterApiKeyResponse
+		{
+			ApiKey = propApiKey.Value
+,
+			Encoded = propEncoded.Value
+,
+			Expiration = propExpiration.Value
+,
+			Id = propId.Value
+,
+			Name = propName.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, CreateCrossClusterApiKeyResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropApiKey, value.ApiKey);
+		writer.WriteProperty(options, PropEncoded, value.Encoded);
+		writer.WriteProperty(options, PropExpiration, value.Expiration);
+		writer.WriteProperty(options, PropId, value.Id);
+		writer.WriteProperty(options, PropName, value.Name);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(CreateCrossClusterApiKeyResponseConverter))]
 public sealed partial class CreateCrossClusterApiKeyResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,7 +110,6 @@ public sealed partial class CreateCrossClusterApiKeyResponse : ElasticsearchResp
 	/// Generated API key.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("api_key")]
 	public string ApiKey { get; init; }
 
 	/// <summary>
@@ -43,7 +119,6 @@ public sealed partial class CreateCrossClusterApiKeyResponse : ElasticsearchResp
 	/// by a colon (<c>:</c>).
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("encoded")]
 	public string Encoded { get; init; }
 
 	/// <summary>
@@ -51,7 +126,6 @@ public sealed partial class CreateCrossClusterApiKeyResponse : ElasticsearchResp
 	/// Expiration in milliseconds for the API key.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("expiration")]
 	public long? Expiration { get; init; }
 
 	/// <summary>
@@ -59,7 +133,6 @@ public sealed partial class CreateCrossClusterApiKeyResponse : ElasticsearchResp
 	/// Unique ID for this API key.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("id")]
 	public string Id { get; init; }
 
 	/// <summary>
@@ -67,6 +140,5 @@ public sealed partial class CreateCrossClusterApiKeyResponse : ElasticsearchResp
 	/// Specifies the name for this API key.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("name")]
 	public string Name { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/CreateServiceTokenResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/CreateServiceTokenResponse.g.cs
index 925204e9e00..8686cac1232 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/CreateServiceTokenResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/CreateServiceTokenResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Security;
 
+internal sealed partial class CreateServiceTokenResponseConverter : System.Text.Json.Serialization.JsonConverter<CreateServiceTokenResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCreated = System.Text.Json.JsonEncodedText.Encode("created");
+	private static readonly System.Text.Json.JsonEncodedText PropToken = System.Text.Json.JsonEncodedText.Encode("token");
+
+	public override CreateServiceTokenResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propCreated = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Security.ServiceToken> propToken = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCreated.TryRead(ref reader, options, PropCreated))
+			{
+				continue;
+			}
+
+			if (propToken.TryRead(ref reader, options, PropToken))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new CreateServiceTokenResponse
+		{
+			Created = propCreated.Value
+,
+			Token = propToken.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, CreateServiceTokenResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCreated, value.Created);
+		writer.WriteProperty(options, PropToken, value.Token);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(CreateServiceTokenResponseConverter))]
 public sealed partial class CreateServiceTokenResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("created")]
 	public bool Created { get; init; }
-	[JsonInclude, JsonPropertyName("token")]
 	public Elastic.Clients.Elasticsearch.Security.ServiceToken Token { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/DelegatePkiResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/DelegatePkiResponse.g.cs
index c92c3b2f2ea..75fcf161306 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/DelegatePkiResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/DelegatePkiResponse.g.cs
@@ -18,14 +18,81 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Security;
 
+internal sealed partial class DelegatePkiResponseConverter : System.Text.Json.Serialization.JsonConverter<DelegatePkiResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAccessToken = System.Text.Json.JsonEncodedText.Encode("access_token");
+	private static readonly System.Text.Json.JsonEncodedText PropAuthentication = System.Text.Json.JsonEncodedText.Encode("authentication");
+	private static readonly System.Text.Json.JsonEncodedText PropExpiresIn = System.Text.Json.JsonEncodedText.Encode("expires_in");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override DelegatePkiResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propAccessToken = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Security.Authentication?> propAuthentication = default;
+		LocalJsonProperty<long> propExpiresIn = default;
+		LocalJsonProperty<string> propType = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAccessToken.TryRead(ref reader, options, PropAccessToken))
+			{
+				continue;
+			}
+
+			if (propAuthentication.TryRead(ref reader, options, PropAuthentication))
+			{
+				continue;
+			}
+
+			if (propExpiresIn.TryRead(ref reader, options, PropExpiresIn))
+			{
+				continue;
+			}
+
+			if (propType.TryRead(ref reader, options, PropType))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DelegatePkiResponse
+		{
+			AccessToken = propAccessToken.Value
+,
+			Authentication = propAuthentication.Value
+,
+			ExpiresIn = propExpiresIn.Value
+,
+			Type = propType.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DelegatePkiResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAccessToken, value.AccessToken);
+		writer.WriteProperty(options, PropAuthentication, value.Authentication);
+		writer.WriteProperty(options, PropExpiresIn, value.ExpiresIn);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DelegatePkiResponseConverter))]
 public sealed partial class DelegatePkiResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,9 +100,7 @@ public sealed partial class DelegatePkiResponse : ElasticsearchResponse
 	/// An access token associated with the subject distinguished name of the client's certificate.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("access_token")]
 	public string AccessToken { get; init; }
-	[JsonInclude, JsonPropertyName("authentication")]
 	public Elastic.Clients.Elasticsearch.Security.Authentication? Authentication { get; init; }
 
 	/// <summary>
@@ -43,7 +108,6 @@ public sealed partial class DelegatePkiResponse : ElasticsearchResponse
 	/// The amount of time (in seconds) before the token expires.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("expires_in")]
 	public long ExpiresIn { get; init; }
 
 	/// <summary>
@@ -51,6 +115,5 @@ public sealed partial class DelegatePkiResponse : ElasticsearchResponse
 	/// The type of token.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/DeleteRoleMappingResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/DeleteRoleMappingResponse.g.cs
index ba9829eeecf..2cf07384e18 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/DeleteRoleMappingResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/DeleteRoleMappingResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Security;
 
+internal sealed partial class DeleteRoleMappingResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteRoleMappingResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropFound = System.Text.Json.JsonEncodedText.Encode("found");
+
+	public override DeleteRoleMappingResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propFound = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propFound.TryRead(ref reader, options, PropFound))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteRoleMappingResponse
+		{
+			Found = propFound.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteRoleMappingResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropFound, value.Found);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteRoleMappingResponseConverter))]
 public sealed partial class DeleteRoleMappingResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("found")]
 	public bool Found { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/DeleteRoleResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/DeleteRoleResponse.g.cs
index 8733410e218..4205581d358 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/DeleteRoleResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/DeleteRoleResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Security;
 
+internal sealed partial class DeleteRoleResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteRoleResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropFound = System.Text.Json.JsonEncodedText.Encode("found");
+
+	public override DeleteRoleResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propFound = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propFound.TryRead(ref reader, options, PropFound))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteRoleResponse
+		{
+			Found = propFound.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteRoleResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropFound, value.Found);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteRoleResponseConverter))]
 public sealed partial class DeleteRoleResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("found")]
 	public bool Found { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/DeleteServiceTokenResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/DeleteServiceTokenResponse.g.cs
index a9ad6329929..00a481c6aaf 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/DeleteServiceTokenResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/DeleteServiceTokenResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Security;
 
+internal sealed partial class DeleteServiceTokenResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteServiceTokenResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropFound = System.Text.Json.JsonEncodedText.Encode("found");
+
+	public override DeleteServiceTokenResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propFound = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propFound.TryRead(ref reader, options, PropFound))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteServiceTokenResponse
+		{
+			Found = propFound.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteServiceTokenResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropFound, value.Found);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteServiceTokenResponseConverter))]
 public sealed partial class DeleteServiceTokenResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("found")]
 	public bool Found { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/DeleteUserResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/DeleteUserResponse.g.cs
index 3ccd3bafba1..54462957bb0 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/DeleteUserResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/DeleteUserResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Security;
 
+internal sealed partial class DeleteUserResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteUserResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropFound = System.Text.Json.JsonEncodedText.Encode("found");
+
+	public override DeleteUserResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propFound = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propFound.TryRead(ref reader, options, PropFound))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteUserResponse
+		{
+			Found = propFound.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteUserResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropFound, value.Found);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteUserResponseConverter))]
 public sealed partial class DeleteUserResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("found")]
 	public bool Found { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/DisableUserProfileResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/DisableUserProfileResponse.g.cs
index b6a983cec33..b9b377650da 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/DisableUserProfileResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/DisableUserProfileResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Security;
 
+internal sealed partial class DisableUserProfileResponseConverter : System.Text.Json.Serialization.JsonConverter<DisableUserProfileResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override DisableUserProfileResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DisableUserProfileResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DisableUserProfileResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DisableUserProfileResponseConverter))]
 public sealed partial class DisableUserProfileResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class DisableUserProfileResponse : ElasticsearchResponse
 	/// 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/Security/DisableUserResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/DisableUserResponse.g.cs
index 91cd0736f94..354aebf6284 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/DisableUserResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/DisableUserResponse.g.cs
@@ -18,14 +18,39 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Security;
 
+internal sealed partial class DisableUserResponseConverter : System.Text.Json.Serialization.JsonConverter<DisableUserResponse>
+{
+	public override DisableUserResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DisableUserResponse { };
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DisableUserResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DisableUserResponseConverter))]
 public sealed partial class DisableUserResponse : ElasticsearchResponse
 {
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/EnableUserProfileResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/EnableUserProfileResponse.g.cs
index 01d90498655..73614e5a4fe 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/EnableUserProfileResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/EnableUserProfileResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Security;
 
+internal sealed partial class EnableUserProfileResponseConverter : System.Text.Json.Serialization.JsonConverter<EnableUserProfileResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override EnableUserProfileResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new EnableUserProfileResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, EnableUserProfileResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(EnableUserProfileResponseConverter))]
 public sealed partial class EnableUserProfileResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class EnableUserProfileResponse : ElasticsearchResponse
 	/// 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/Security/EnableUserResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/EnableUserResponse.g.cs
index e839c5abf6f..d8d6919c9ed 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/EnableUserResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/EnableUserResponse.g.cs
@@ -18,14 +18,39 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Security;
 
+internal sealed partial class EnableUserResponseConverter : System.Text.Json.Serialization.JsonConverter<EnableUserResponse>
+{
+	public override EnableUserResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new EnableUserResponse { };
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, EnableUserResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(EnableUserResponseConverter))]
 public sealed partial class EnableUserResponse : ElasticsearchResponse
 {
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/EnrollKibanaResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/EnrollKibanaResponse.g.cs
index 79907207140..9148f586869 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/EnrollKibanaResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/EnrollKibanaResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Security;
 
+internal sealed partial class EnrollKibanaResponseConverter : System.Text.Json.Serialization.JsonConverter<EnrollKibanaResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropHttpCa = System.Text.Json.JsonEncodedText.Encode("http_ca");
+	private static readonly System.Text.Json.JsonEncodedText PropToken = System.Text.Json.JsonEncodedText.Encode("token");
+
+	public override EnrollKibanaResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propHttpCa = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Security.KibanaToken> propToken = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propHttpCa.TryRead(ref reader, options, PropHttpCa))
+			{
+				continue;
+			}
+
+			if (propToken.TryRead(ref reader, options, PropToken))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new EnrollKibanaResponse
+		{
+			HttpCa = propHttpCa.Value
+,
+			Token = propToken.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, EnrollKibanaResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropHttpCa, value.HttpCa);
+		writer.WriteProperty(options, PropToken, value.Token);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(EnrollKibanaResponseConverter))]
 public sealed partial class EnrollKibanaResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("http_ca")]
 	public string HttpCa { get; init; }
-	[JsonInclude, JsonPropertyName("token")]
 	public Elastic.Clients.Elasticsearch.Security.KibanaToken Token { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/EnrollNodeResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/EnrollNodeResponse.g.cs
index 5d34b09a546..77a9fe2ffac 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/EnrollNodeResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/EnrollNodeResponse.g.cs
@@ -18,26 +18,107 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Security;
 
+internal sealed partial class EnrollNodeResponseConverter : System.Text.Json.Serialization.JsonConverter<EnrollNodeResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropHttpCaCert = System.Text.Json.JsonEncodedText.Encode("http_ca_cert");
+	private static readonly System.Text.Json.JsonEncodedText PropHttpCaKey = System.Text.Json.JsonEncodedText.Encode("http_ca_key");
+	private static readonly System.Text.Json.JsonEncodedText PropNodesAddresses = System.Text.Json.JsonEncodedText.Encode("nodes_addresses");
+	private static readonly System.Text.Json.JsonEncodedText PropTransportCaCert = System.Text.Json.JsonEncodedText.Encode("transport_ca_cert");
+	private static readonly System.Text.Json.JsonEncodedText PropTransportCert = System.Text.Json.JsonEncodedText.Encode("transport_cert");
+	private static readonly System.Text.Json.JsonEncodedText PropTransportKey = System.Text.Json.JsonEncodedText.Encode("transport_key");
+
+	public override EnrollNodeResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propHttpCaCert = default;
+		LocalJsonProperty<string> propHttpCaKey = default;
+		LocalJsonProperty<IReadOnlyCollection<string>> propNodesAddresses = default;
+		LocalJsonProperty<string> propTransportCaCert = default;
+		LocalJsonProperty<string> propTransportCert = default;
+		LocalJsonProperty<string> propTransportKey = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propHttpCaCert.TryRead(ref reader, options, PropHttpCaCert))
+			{
+				continue;
+			}
+
+			if (propHttpCaKey.TryRead(ref reader, options, PropHttpCaKey))
+			{
+				continue;
+			}
+
+			if (propNodesAddresses.TryRead(ref reader, options, PropNodesAddresses))
+			{
+				continue;
+			}
+
+			if (propTransportCaCert.TryRead(ref reader, options, PropTransportCaCert))
+			{
+				continue;
+			}
+
+			if (propTransportCert.TryRead(ref reader, options, PropTransportCert))
+			{
+				continue;
+			}
+
+			if (propTransportKey.TryRead(ref reader, options, PropTransportKey))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new EnrollNodeResponse
+		{
+			HttpCaCert = propHttpCaCert.Value
+,
+			HttpCaKey = propHttpCaKey.Value
+,
+			NodesAddresses = propNodesAddresses.Value
+,
+			TransportCaCert = propTransportCaCert.Value
+,
+			TransportCert = propTransportCert.Value
+,
+			TransportKey = propTransportKey.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, EnrollNodeResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropHttpCaCert, value.HttpCaCert);
+		writer.WriteProperty(options, PropHttpCaKey, value.HttpCaKey);
+		writer.WriteProperty(options, PropNodesAddresses, value.NodesAddresses);
+		writer.WriteProperty(options, PropTransportCaCert, value.TransportCaCert);
+		writer.WriteProperty(options, PropTransportCert, value.TransportCert);
+		writer.WriteProperty(options, PropTransportKey, value.TransportKey);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(EnrollNodeResponseConverter))]
 public sealed partial class EnrollNodeResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("http_ca_cert")]
 	public string HttpCaCert { get; init; }
-	[JsonInclude, JsonPropertyName("http_ca_key")]
 	public string HttpCaKey { get; init; }
-	[JsonInclude, JsonPropertyName("nodes_addresses")]
 	public IReadOnlyCollection<string> NodesAddresses { get; init; }
-	[JsonInclude, JsonPropertyName("transport_ca_cert")]
 	public string TransportCaCert { get; init; }
-	[JsonInclude, JsonPropertyName("transport_cert")]
 	public string TransportCert { get; init; }
-	[JsonInclude, JsonPropertyName("transport_key")]
 	public string TransportKey { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/GetApiKeyResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/GetApiKeyResponse.g.cs
index 39e7a09e307..13425e2c375 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/GetApiKeyResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/GetApiKeyResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Security;
 
+internal sealed partial class GetApiKeyResponseConverter : System.Text.Json.Serialization.JsonConverter<GetApiKeyResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropApiKeys = System.Text.Json.JsonEncodedText.Encode("api_keys");
+
+	public override GetApiKeyResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Security.ApiKey>> propApiKeys = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propApiKeys.TryRead(ref reader, options, PropApiKeys))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetApiKeyResponse
+		{
+			ApiKeys = propApiKeys.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetApiKeyResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropApiKeys, value.ApiKeys);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetApiKeyResponseConverter))]
 public sealed partial class GetApiKeyResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("api_keys")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Security.ApiKey> ApiKeys { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/GetBuiltinPrivilegesResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/GetBuiltinPrivilegesResponse.g.cs
index 2410a2d7776..da6e346b32b 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/GetBuiltinPrivilegesResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/GetBuiltinPrivilegesResponse.g.cs
@@ -18,20 +18,74 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Security;
 
+internal sealed partial class GetBuiltinPrivilegesResponseConverter : System.Text.Json.Serialization.JsonConverter<GetBuiltinPrivilegesResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCluster = System.Text.Json.JsonEncodedText.Encode("cluster");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropRemoteCluster = System.Text.Json.JsonEncodedText.Encode("remote_cluster");
+
+	public override GetBuiltinPrivilegesResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Security.ClusterPrivilege>> propCluster = default;
+		LocalJsonProperty<IReadOnlyCollection<string>> propIndex = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Security.RemoteClusterPrivilege>> propRemoteCluster = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCluster.TryRead(ref reader, options, PropCluster))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propRemoteCluster.TryRead(ref reader, options, PropRemoteCluster))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetBuiltinPrivilegesResponse
+		{
+			Cluster = propCluster.Value
+,
+			Index = propIndex.Value
+,
+			RemoteCluster = propRemoteCluster.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetBuiltinPrivilegesResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCluster, value.Cluster);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropRemoteCluster, value.RemoteCluster);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetBuiltinPrivilegesResponseConverter))]
 public sealed partial class GetBuiltinPrivilegesResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("cluster")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Security.ClusterPrivilege> Cluster { get; init; }
-	[JsonInclude, JsonPropertyName("index")]
 	public IReadOnlyCollection<string> Index { get; init; }
-	[JsonInclude, JsonPropertyName("remote_cluster")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Security.RemoteClusterPrivilege> RemoteCluster { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/GetServiceCredentialsResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/GetServiceCredentialsResponse.g.cs
index 7fa558776e9..b86140e2d98 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/GetServiceCredentialsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/GetServiceCredentialsResponse.g.cs
@@ -18,17 +18,83 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Security;
 
+internal sealed partial class GetServiceCredentialsResponseConverter : System.Text.Json.Serialization.JsonConverter<GetServiceCredentialsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCount = System.Text.Json.JsonEncodedText.Encode("count");
+	private static readonly System.Text.Json.JsonEncodedText PropNodesCredentials = System.Text.Json.JsonEncodedText.Encode("nodes_credentials");
+	private static readonly System.Text.Json.JsonEncodedText PropServiceAccount = System.Text.Json.JsonEncodedText.Encode("service_account");
+	private static readonly System.Text.Json.JsonEncodedText PropTokens = System.Text.Json.JsonEncodedText.Encode("tokens");
+
+	public override GetServiceCredentialsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<int> propCount = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Security.NodesCredentials> propNodesCredentials = default;
+		LocalJsonProperty<string> propServiceAccount = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, IReadOnlyDictionary<string, object>>> propTokens = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCount.TryRead(ref reader, options, PropCount))
+			{
+				continue;
+			}
+
+			if (propNodesCredentials.TryRead(ref reader, options, PropNodesCredentials))
+			{
+				continue;
+			}
+
+			if (propServiceAccount.TryRead(ref reader, options, PropServiceAccount))
+			{
+				continue;
+			}
+
+			if (propTokens.TryRead(ref reader, options, PropTokens))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetServiceCredentialsResponse
+		{
+			Count = propCount.Value
+,
+			NodesCredentials = propNodesCredentials.Value
+,
+			ServiceAccount = propServiceAccount.Value
+,
+			Tokens = propTokens.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetServiceCredentialsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCount, value.Count);
+		writer.WriteProperty(options, PropNodesCredentials, value.NodesCredentials);
+		writer.WriteProperty(options, PropServiceAccount, value.ServiceAccount);
+		writer.WriteProperty(options, PropTokens, value.Tokens);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetServiceCredentialsResponseConverter))]
 public sealed partial class GetServiceCredentialsResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("count")]
 	public int Count { get; init; }
 
 	/// <summary>
@@ -36,10 +102,7 @@ public sealed partial class GetServiceCredentialsResponse : ElasticsearchRespons
 	/// Contains service account credentials collected from all nodes of the cluster
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("nodes_credentials")]
 	public Elastic.Clients.Elasticsearch.Security.NodesCredentials NodesCredentials { get; init; }
-	[JsonInclude, JsonPropertyName("service_account")]
 	public string ServiceAccount { get; init; }
-	[JsonInclude, JsonPropertyName("tokens")]
 	public IReadOnlyDictionary<string, IReadOnlyDictionary<string, object>> Tokens { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/GetTokenResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/GetTokenResponse.g.cs
index 07fd75ec184..dee7421a1bd 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/GetTokenResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/GetTokenResponse.g.cs
@@ -18,28 +18,118 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Security;
 
+internal sealed partial class GetTokenResponseConverter : System.Text.Json.Serialization.JsonConverter<GetTokenResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAccessToken = System.Text.Json.JsonEncodedText.Encode("access_token");
+	private static readonly System.Text.Json.JsonEncodedText PropAuthentication = System.Text.Json.JsonEncodedText.Encode("authentication");
+	private static readonly System.Text.Json.JsonEncodedText PropExpiresIn = System.Text.Json.JsonEncodedText.Encode("expires_in");
+	private static readonly System.Text.Json.JsonEncodedText PropKerberosAuthenticationResponseToken = System.Text.Json.JsonEncodedText.Encode("kerberos_authentication_response_token");
+	private static readonly System.Text.Json.JsonEncodedText PropRefreshToken = System.Text.Json.JsonEncodedText.Encode("refresh_token");
+	private static readonly System.Text.Json.JsonEncodedText PropScope = System.Text.Json.JsonEncodedText.Encode("scope");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override GetTokenResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propAccessToken = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Security.AuthenticatedUser> propAuthentication = default;
+		LocalJsonProperty<long> propExpiresIn = default;
+		LocalJsonProperty<string?> propKerberosAuthenticationResponseToken = default;
+		LocalJsonProperty<string?> propRefreshToken = default;
+		LocalJsonProperty<string?> propScope = default;
+		LocalJsonProperty<string> propType = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAccessToken.TryRead(ref reader, options, PropAccessToken))
+			{
+				continue;
+			}
+
+			if (propAuthentication.TryRead(ref reader, options, PropAuthentication))
+			{
+				continue;
+			}
+
+			if (propExpiresIn.TryRead(ref reader, options, PropExpiresIn))
+			{
+				continue;
+			}
+
+			if (propKerberosAuthenticationResponseToken.TryRead(ref reader, options, PropKerberosAuthenticationResponseToken))
+			{
+				continue;
+			}
+
+			if (propRefreshToken.TryRead(ref reader, options, PropRefreshToken))
+			{
+				continue;
+			}
+
+			if (propScope.TryRead(ref reader, options, PropScope))
+			{
+				continue;
+			}
+
+			if (propType.TryRead(ref reader, options, PropType))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetTokenResponse
+		{
+			AccessToken = propAccessToken.Value
+,
+			Authentication = propAuthentication.Value
+,
+			ExpiresIn = propExpiresIn.Value
+,
+			KerberosAuthenticationResponseToken = propKerberosAuthenticationResponseToken.Value
+,
+			RefreshToken = propRefreshToken.Value
+,
+			Scope = propScope.Value
+,
+			Type = propType.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetTokenResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAccessToken, value.AccessToken);
+		writer.WriteProperty(options, PropAuthentication, value.Authentication);
+		writer.WriteProperty(options, PropExpiresIn, value.ExpiresIn);
+		writer.WriteProperty(options, PropKerberosAuthenticationResponseToken, value.KerberosAuthenticationResponseToken);
+		writer.WriteProperty(options, PropRefreshToken, value.RefreshToken);
+		writer.WriteProperty(options, PropScope, value.Scope);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetTokenResponseConverter))]
 public sealed partial class GetTokenResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("access_token")]
 	public string AccessToken { get; init; }
-	[JsonInclude, JsonPropertyName("authentication")]
 	public Elastic.Clients.Elasticsearch.Security.AuthenticatedUser Authentication { get; init; }
-	[JsonInclude, JsonPropertyName("expires_in")]
 	public long ExpiresIn { get; init; }
-	[JsonInclude, JsonPropertyName("kerberos_authentication_response_token")]
 	public string? KerberosAuthenticationResponseToken { get; init; }
-	[JsonInclude, JsonPropertyName("refresh_token")]
 	public string? RefreshToken { get; init; }
-	[JsonInclude, JsonPropertyName("scope")]
 	public string? Scope { get; init; }
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/GetUserPrivilegesResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/GetUserPrivilegesResponse.g.cs
index 521ec2a00f5..d39be636eb8 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/GetUserPrivilegesResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/GetUserPrivilegesResponse.g.cs
@@ -18,24 +18,96 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Security;
 
+internal sealed partial class GetUserPrivilegesResponseConverter : System.Text.Json.Serialization.JsonConverter<GetUserPrivilegesResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropApplications = System.Text.Json.JsonEncodedText.Encode("applications");
+	private static readonly System.Text.Json.JsonEncodedText PropCluster = System.Text.Json.JsonEncodedText.Encode("cluster");
+	private static readonly System.Text.Json.JsonEncodedText PropGlobal = System.Text.Json.JsonEncodedText.Encode("global");
+	private static readonly System.Text.Json.JsonEncodedText PropIndices = System.Text.Json.JsonEncodedText.Encode("indices");
+	private static readonly System.Text.Json.JsonEncodedText PropRunAs = System.Text.Json.JsonEncodedText.Encode("run_as");
+
+	public override GetUserPrivilegesResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Security.ApplicationPrivileges>> propApplications = default;
+		LocalJsonProperty<IReadOnlyCollection<string>> propCluster = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Security.GlobalPrivilege>> propGlobal = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Security.UserIndicesPrivileges>> propIndices = default;
+		LocalJsonProperty<IReadOnlyCollection<string>> propRunAs = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propApplications.TryRead(ref reader, options, PropApplications))
+			{
+				continue;
+			}
+
+			if (propCluster.TryRead(ref reader, options, PropCluster))
+			{
+				continue;
+			}
+
+			if (propGlobal.TryRead(ref reader, options, PropGlobal))
+			{
+				continue;
+			}
+
+			if (propIndices.TryRead(ref reader, options, PropIndices))
+			{
+				continue;
+			}
+
+			if (propRunAs.TryRead(ref reader, options, PropRunAs))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetUserPrivilegesResponse
+		{
+			Applications = propApplications.Value
+,
+			Cluster = propCluster.Value
+,
+			Global = propGlobal.Value
+,
+			Indices = propIndices.Value
+,
+			RunAs = propRunAs.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetUserPrivilegesResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropApplications, value.Applications);
+		writer.WriteProperty(options, PropCluster, value.Cluster);
+		writer.WriteProperty(options, PropGlobal, value.Global);
+		writer.WriteProperty(options, PropIndices, value.Indices);
+		writer.WriteProperty(options, PropRunAs, value.RunAs);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetUserPrivilegesResponseConverter))]
 public sealed partial class GetUserPrivilegesResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("applications")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Security.ApplicationPrivileges> Applications { get; init; }
-	[JsonInclude, JsonPropertyName("cluster")]
 	public IReadOnlyCollection<string> Cluster { get; init; }
-	[JsonInclude, JsonPropertyName("global")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Security.GlobalPrivilege> Global { get; init; }
-	[JsonInclude, JsonPropertyName("indices")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Security.UserIndicesPrivileges> Indices { get; init; }
-	[JsonInclude, JsonPropertyName("run_as")]
 	public IReadOnlyCollection<string> RunAs { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/GetUserProfileResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/GetUserProfileResponse.g.cs
index 71e2118cb2b..e1c2de8f0ce 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/GetUserProfileResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/GetUserProfileResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Security;
 
+internal sealed partial class GetUserProfileResponseConverter : System.Text.Json.Serialization.JsonConverter<GetUserProfileResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropErrors = System.Text.Json.JsonEncodedText.Encode("errors");
+	private static readonly System.Text.Json.JsonEncodedText PropProfiles = System.Text.Json.JsonEncodedText.Encode("profiles");
+
+	public override GetUserProfileResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Security.GetUserProfileErrors?> propErrors = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Security.UserProfileWithMetadata>> propProfiles = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propErrors.TryRead(ref reader, options, PropErrors))
+			{
+				continue;
+			}
+
+			if (propProfiles.TryRead(ref reader, options, PropProfiles))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetUserProfileResponse
+		{
+			Errors = propErrors.Value
+,
+			Profiles = propProfiles.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetUserProfileResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropErrors, value.Errors);
+		writer.WriteProperty(options, PropProfiles, value.Profiles);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetUserProfileResponseConverter))]
 public sealed partial class GetUserProfileResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("errors")]
 	public Elastic.Clients.Elasticsearch.Security.GetUserProfileErrors? Errors { get; init; }
-	[JsonInclude, JsonPropertyName("profiles")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Security.UserProfileWithMetadata> Profiles { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/GrantApiKeyResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/GrantApiKeyResponse.g.cs
index 9644b9b2a5a..29c9cc00042 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/GrantApiKeyResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/GrantApiKeyResponse.g.cs
@@ -18,24 +18,96 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Security;
 
+internal sealed partial class GrantApiKeyResponseConverter : System.Text.Json.Serialization.JsonConverter<GrantApiKeyResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropApiKey = System.Text.Json.JsonEncodedText.Encode("api_key");
+	private static readonly System.Text.Json.JsonEncodedText PropEncoded = System.Text.Json.JsonEncodedText.Encode("encoded");
+	private static readonly System.Text.Json.JsonEncodedText PropExpiration = System.Text.Json.JsonEncodedText.Encode("expiration");
+	private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("id");
+	private static readonly System.Text.Json.JsonEncodedText PropName = System.Text.Json.JsonEncodedText.Encode("name");
+
+	public override GrantApiKeyResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propApiKey = default;
+		LocalJsonProperty<string> propEncoded = default;
+		LocalJsonProperty<long?> propExpiration = default;
+		LocalJsonProperty<string> propId = default;
+		LocalJsonProperty<string> propName = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propApiKey.TryRead(ref reader, options, PropApiKey))
+			{
+				continue;
+			}
+
+			if (propEncoded.TryRead(ref reader, options, PropEncoded))
+			{
+				continue;
+			}
+
+			if (propExpiration.TryRead(ref reader, options, PropExpiration))
+			{
+				continue;
+			}
+
+			if (propId.TryRead(ref reader, options, PropId))
+			{
+				continue;
+			}
+
+			if (propName.TryRead(ref reader, options, PropName))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GrantApiKeyResponse
+		{
+			ApiKey = propApiKey.Value
+,
+			Encoded = propEncoded.Value
+,
+			Expiration = propExpiration.Value
+,
+			Id = propId.Value
+,
+			Name = propName.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GrantApiKeyResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropApiKey, value.ApiKey);
+		writer.WriteProperty(options, PropEncoded, value.Encoded);
+		writer.WriteProperty(options, PropExpiration, value.Expiration);
+		writer.WriteProperty(options, PropId, value.Id);
+		writer.WriteProperty(options, PropName, value.Name);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GrantApiKeyResponseConverter))]
 public sealed partial class GrantApiKeyResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("api_key")]
 	public string ApiKey { get; init; }
-	[JsonInclude, JsonPropertyName("encoded")]
 	public string Encoded { get; init; }
-	[JsonInclude, JsonPropertyName("expiration")]
 	public long? Expiration { get; init; }
-	[JsonInclude, JsonPropertyName("id")]
 	public string Id { get; init; }
-	[JsonInclude, JsonPropertyName("name")]
 	public string Name { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/HasPrivilegesResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/HasPrivilegesResponse.g.cs
index 024488da85d..d6a0789e680 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/HasPrivilegesResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/HasPrivilegesResponse.g.cs
@@ -18,25 +18,96 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Security;
 
+internal sealed partial class HasPrivilegesResponseConverter : System.Text.Json.Serialization.JsonConverter<HasPrivilegesResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropApplication = System.Text.Json.JsonEncodedText.Encode("application");
+	private static readonly System.Text.Json.JsonEncodedText PropCluster = System.Text.Json.JsonEncodedText.Encode("cluster");
+	private static readonly System.Text.Json.JsonEncodedText PropHasAllRequested = System.Text.Json.JsonEncodedText.Encode("has_all_requested");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropUsername = System.Text.Json.JsonEncodedText.Encode("username");
+
+	public override HasPrivilegesResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyDictionary<string, IReadOnlyDictionary<string, IReadOnlyDictionary<string, bool>>>> propApplication = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, bool>> propCluster = default;
+		LocalJsonProperty<bool> propHasAllRequested = default;
+		LocalJsonProperty<IReadOnlyDictionary<Elastic.Clients.Elasticsearch.IndexName, IReadOnlyDictionary<string, bool>>> propIndex = default;
+		LocalJsonProperty<string> propUsername = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propApplication.TryRead(ref reader, options, PropApplication))
+			{
+				continue;
+			}
+
+			if (propCluster.TryRead(ref reader, options, PropCluster))
+			{
+				continue;
+			}
+
+			if (propHasAllRequested.TryRead(ref reader, options, PropHasAllRequested))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propUsername.TryRead(ref reader, options, PropUsername))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new HasPrivilegesResponse
+		{
+			Application = propApplication.Value
+,
+			Cluster = propCluster.Value
+,
+			HasAllRequested = propHasAllRequested.Value
+,
+			Index = propIndex.Value
+,
+			Username = propUsername.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, HasPrivilegesResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropApplication, value.Application);
+		writer.WriteProperty(options, PropCluster, value.Cluster);
+		writer.WriteProperty(options, PropHasAllRequested, value.HasAllRequested);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropUsername, value.Username);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(HasPrivilegesResponseConverter))]
 public sealed partial class HasPrivilegesResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("application")]
 	public IReadOnlyDictionary<string, IReadOnlyDictionary<string, IReadOnlyDictionary<string, bool>>> Application { get; init; }
-	[JsonInclude, JsonPropertyName("cluster")]
 	public IReadOnlyDictionary<string, bool> Cluster { get; init; }
-	[JsonInclude, JsonPropertyName("has_all_requested")]
 	public bool HasAllRequested { get; init; }
-	[JsonInclude, JsonPropertyName("index")]
-	[ReadOnlyIndexNameDictionaryConverter(typeof(IReadOnlyDictionary<string, bool>))]
 	public IReadOnlyDictionary<Elastic.Clients.Elasticsearch.IndexName, IReadOnlyDictionary<string, bool>> Index { get; init; }
-	[JsonInclude, JsonPropertyName("username")]
 	public string Username { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/HasPrivilegesUserProfileResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/HasPrivilegesUserProfileResponse.g.cs
index 04b7b2fd847..55a77fcc364 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/HasPrivilegesUserProfileResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/HasPrivilegesUserProfileResponse.g.cs
@@ -18,14 +18,61 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Security;
 
+internal sealed partial class HasPrivilegesUserProfileResponseConverter : System.Text.Json.Serialization.JsonConverter<HasPrivilegesUserProfileResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropErrors = System.Text.Json.JsonEncodedText.Encode("errors");
+	private static readonly System.Text.Json.JsonEncodedText PropHasPrivilegeUids = System.Text.Json.JsonEncodedText.Encode("has_privilege_uids");
+
+	public override HasPrivilegesUserProfileResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Security.HasPrivilegesUserProfileErrors?> propErrors = default;
+		LocalJsonProperty<IReadOnlyCollection<string>> propHasPrivilegeUids = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propErrors.TryRead(ref reader, options, PropErrors))
+			{
+				continue;
+			}
+
+			if (propHasPrivilegeUids.TryRead(ref reader, options, PropHasPrivilegeUids))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new HasPrivilegesUserProfileResponse
+		{
+			Errors = propErrors.Value
+,
+			HasPrivilegeUids = propHasPrivilegeUids.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, HasPrivilegesUserProfileResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropErrors, value.Errors);
+		writer.WriteProperty(options, PropHasPrivilegeUids, value.HasPrivilegeUids);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(HasPrivilegesUserProfileResponseConverter))]
 public sealed partial class HasPrivilegesUserProfileResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -36,7 +83,6 @@ public sealed partial class HasPrivilegesUserProfileResponse : ElasticsearchResp
 	/// requested privileges. This field is absent if empty.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("errors")]
 	public Elastic.Clients.Elasticsearch.Security.HasPrivilegesUserProfileErrors? Errors { get; init; }
 
 	/// <summary>
@@ -45,6 +91,5 @@ public sealed partial class HasPrivilegesUserProfileResponse : ElasticsearchResp
 	/// have all the requested privileges.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("has_privilege_uids")]
 	public IReadOnlyCollection<string> HasPrivilegeUids { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/InvalidateApiKeyResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/InvalidateApiKeyResponse.g.cs
index c46e96aaf8b..1d2003e43a9 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/InvalidateApiKeyResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/InvalidateApiKeyResponse.g.cs
@@ -18,22 +18,85 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Security;
 
+internal sealed partial class InvalidateApiKeyResponseConverter : System.Text.Json.Serialization.JsonConverter<InvalidateApiKeyResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropErrorCount = System.Text.Json.JsonEncodedText.Encode("error_count");
+	private static readonly System.Text.Json.JsonEncodedText PropErrorDetails = System.Text.Json.JsonEncodedText.Encode("error_details");
+	private static readonly System.Text.Json.JsonEncodedText PropInvalidatedApiKeys = System.Text.Json.JsonEncodedText.Encode("invalidated_api_keys");
+	private static readonly System.Text.Json.JsonEncodedText PropPreviouslyInvalidatedApiKeys = System.Text.Json.JsonEncodedText.Encode("previously_invalidated_api_keys");
+
+	public override InvalidateApiKeyResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<int> propErrorCount = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.ErrorCause>?> propErrorDetails = default;
+		LocalJsonProperty<IReadOnlyCollection<string>> propInvalidatedApiKeys = default;
+		LocalJsonProperty<IReadOnlyCollection<string>> propPreviouslyInvalidatedApiKeys = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propErrorCount.TryRead(ref reader, options, PropErrorCount))
+			{
+				continue;
+			}
+
+			if (propErrorDetails.TryRead(ref reader, options, PropErrorDetails))
+			{
+				continue;
+			}
+
+			if (propInvalidatedApiKeys.TryRead(ref reader, options, PropInvalidatedApiKeys))
+			{
+				continue;
+			}
+
+			if (propPreviouslyInvalidatedApiKeys.TryRead(ref reader, options, PropPreviouslyInvalidatedApiKeys))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new InvalidateApiKeyResponse
+		{
+			ErrorCount = propErrorCount.Value
+,
+			ErrorDetails = propErrorDetails.Value
+,
+			InvalidatedApiKeys = propInvalidatedApiKeys.Value
+,
+			PreviouslyInvalidatedApiKeys = propPreviouslyInvalidatedApiKeys.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, InvalidateApiKeyResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropErrorCount, value.ErrorCount);
+		writer.WriteProperty(options, PropErrorDetails, value.ErrorDetails);
+		writer.WriteProperty(options, PropInvalidatedApiKeys, value.InvalidatedApiKeys);
+		writer.WriteProperty(options, PropPreviouslyInvalidatedApiKeys, value.PreviouslyInvalidatedApiKeys);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(InvalidateApiKeyResponseConverter))]
 public sealed partial class InvalidateApiKeyResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("error_count")]
 	public int ErrorCount { get; init; }
-	[JsonInclude, JsonPropertyName("error_details")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.ErrorCause>? ErrorDetails { get; init; }
-	[JsonInclude, JsonPropertyName("invalidated_api_keys")]
 	public IReadOnlyCollection<string> InvalidatedApiKeys { get; init; }
-	[JsonInclude, JsonPropertyName("previously_invalidated_api_keys")]
 	public IReadOnlyCollection<string> PreviouslyInvalidatedApiKeys { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/InvalidateTokenResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/InvalidateTokenResponse.g.cs
index d014871850b..c813c624677 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/InvalidateTokenResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/InvalidateTokenResponse.g.cs
@@ -18,22 +18,85 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Security;
 
+internal sealed partial class InvalidateTokenResponseConverter : System.Text.Json.Serialization.JsonConverter<InvalidateTokenResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropErrorCount = System.Text.Json.JsonEncodedText.Encode("error_count");
+	private static readonly System.Text.Json.JsonEncodedText PropErrorDetails = System.Text.Json.JsonEncodedText.Encode("error_details");
+	private static readonly System.Text.Json.JsonEncodedText PropInvalidatedTokens = System.Text.Json.JsonEncodedText.Encode("invalidated_tokens");
+	private static readonly System.Text.Json.JsonEncodedText PropPreviouslyInvalidatedTokens = System.Text.Json.JsonEncodedText.Encode("previously_invalidated_tokens");
+
+	public override InvalidateTokenResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<long> propErrorCount = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.ErrorCause>?> propErrorDetails = default;
+		LocalJsonProperty<long> propInvalidatedTokens = default;
+		LocalJsonProperty<long> propPreviouslyInvalidatedTokens = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propErrorCount.TryRead(ref reader, options, PropErrorCount))
+			{
+				continue;
+			}
+
+			if (propErrorDetails.TryRead(ref reader, options, PropErrorDetails))
+			{
+				continue;
+			}
+
+			if (propInvalidatedTokens.TryRead(ref reader, options, PropInvalidatedTokens))
+			{
+				continue;
+			}
+
+			if (propPreviouslyInvalidatedTokens.TryRead(ref reader, options, PropPreviouslyInvalidatedTokens))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new InvalidateTokenResponse
+		{
+			ErrorCount = propErrorCount.Value
+,
+			ErrorDetails = propErrorDetails.Value
+,
+			InvalidatedTokens = propInvalidatedTokens.Value
+,
+			PreviouslyInvalidatedTokens = propPreviouslyInvalidatedTokens.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, InvalidateTokenResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropErrorCount, value.ErrorCount);
+		writer.WriteProperty(options, PropErrorDetails, value.ErrorDetails);
+		writer.WriteProperty(options, PropInvalidatedTokens, value.InvalidatedTokens);
+		writer.WriteProperty(options, PropPreviouslyInvalidatedTokens, value.PreviouslyInvalidatedTokens);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(InvalidateTokenResponseConverter))]
 public sealed partial class InvalidateTokenResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("error_count")]
 	public long ErrorCount { get; init; }
-	[JsonInclude, JsonPropertyName("error_details")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.ErrorCause>? ErrorDetails { get; init; }
-	[JsonInclude, JsonPropertyName("invalidated_tokens")]
 	public long InvalidatedTokens { get; init; }
-	[JsonInclude, JsonPropertyName("previously_invalidated_tokens")]
 	public long PreviouslyInvalidatedTokens { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/OidcAuthenticateResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/OidcAuthenticateResponse.g.cs
index 3e2363e1ca6..daca31ef54f 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/OidcAuthenticateResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/OidcAuthenticateResponse.g.cs
@@ -18,14 +18,81 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Security;
 
+internal sealed partial class OidcAuthenticateResponseConverter : System.Text.Json.Serialization.JsonConverter<OidcAuthenticateResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAccessToken = System.Text.Json.JsonEncodedText.Encode("access_token");
+	private static readonly System.Text.Json.JsonEncodedText PropExpiresIn = System.Text.Json.JsonEncodedText.Encode("expires_in");
+	private static readonly System.Text.Json.JsonEncodedText PropRefreshToken = System.Text.Json.JsonEncodedText.Encode("refresh_token");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override OidcAuthenticateResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propAccessToken = default;
+		LocalJsonProperty<int> propExpiresIn = default;
+		LocalJsonProperty<string> propRefreshToken = default;
+		LocalJsonProperty<string> propType = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAccessToken.TryRead(ref reader, options, PropAccessToken))
+			{
+				continue;
+			}
+
+			if (propExpiresIn.TryRead(ref reader, options, PropExpiresIn))
+			{
+				continue;
+			}
+
+			if (propRefreshToken.TryRead(ref reader, options, PropRefreshToken))
+			{
+				continue;
+			}
+
+			if (propType.TryRead(ref reader, options, PropType))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new OidcAuthenticateResponse
+		{
+			AccessToken = propAccessToken.Value
+,
+			ExpiresIn = propExpiresIn.Value
+,
+			RefreshToken = propRefreshToken.Value
+,
+			Type = propType.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, OidcAuthenticateResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAccessToken, value.AccessToken);
+		writer.WriteProperty(options, PropExpiresIn, value.ExpiresIn);
+		writer.WriteProperty(options, PropRefreshToken, value.RefreshToken);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(OidcAuthenticateResponseConverter))]
 public sealed partial class OidcAuthenticateResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,7 +100,6 @@ public sealed partial class OidcAuthenticateResponse : ElasticsearchResponse
 	/// The Elasticsearch access token.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("access_token")]
 	public string AccessToken { get; init; }
 
 	/// <summary>
@@ -41,7 +107,6 @@ public sealed partial class OidcAuthenticateResponse : ElasticsearchResponse
 	/// The duration (in seconds) of the tokens.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("expires_in")]
 	public int ExpiresIn { get; init; }
 
 	/// <summary>
@@ -49,7 +114,6 @@ public sealed partial class OidcAuthenticateResponse : ElasticsearchResponse
 	/// The Elasticsearch refresh token.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("refresh_token")]
 	public string RefreshToken { get; init; }
 
 	/// <summary>
@@ -57,6 +121,5 @@ public sealed partial class OidcAuthenticateResponse : ElasticsearchResponse
 	/// The type of token.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/OidcLogoutResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/OidcLogoutResponse.g.cs
index a0952e506fb..201503c7885 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/OidcLogoutResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/OidcLogoutResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Security;
 
+internal sealed partial class OidcLogoutResponseConverter : System.Text.Json.Serialization.JsonConverter<OidcLogoutResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropRedirect = System.Text.Json.JsonEncodedText.Encode("redirect");
+
+	public override OidcLogoutResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propRedirect = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propRedirect.TryRead(ref reader, options, PropRedirect))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new OidcLogoutResponse
+		{
+			Redirect = propRedirect.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, OidcLogoutResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropRedirect, value.Redirect);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(OidcLogoutResponseConverter))]
 public sealed partial class OidcLogoutResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class OidcLogoutResponse : ElasticsearchResponse
 	/// A URI that points to the end session endpoint of the OpenID Connect Provider with all the parameters of the logout request as HTTP GET parameters.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("redirect")]
 	public string Redirect { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/OidcPrepareAuthenticationResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/OidcPrepareAuthenticationResponse.g.cs
index 39e1e97d39e..03569f79249 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/OidcPrepareAuthenticationResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/OidcPrepareAuthenticationResponse.g.cs
@@ -18,19 +18,84 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Security;
 
+internal sealed partial class OidcPrepareAuthenticationResponseConverter : System.Text.Json.Serialization.JsonConverter<OidcPrepareAuthenticationResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropNonce = System.Text.Json.JsonEncodedText.Encode("nonce");
+	private static readonly System.Text.Json.JsonEncodedText PropRealm = System.Text.Json.JsonEncodedText.Encode("realm");
+	private static readonly System.Text.Json.JsonEncodedText PropRedirect = System.Text.Json.JsonEncodedText.Encode("redirect");
+	private static readonly System.Text.Json.JsonEncodedText PropState = System.Text.Json.JsonEncodedText.Encode("state");
+
+	public override OidcPrepareAuthenticationResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propNonce = default;
+		LocalJsonProperty<string> propRealm = default;
+		LocalJsonProperty<string> propRedirect = default;
+		LocalJsonProperty<string> propState = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propNonce.TryRead(ref reader, options, PropNonce))
+			{
+				continue;
+			}
+
+			if (propRealm.TryRead(ref reader, options, PropRealm))
+			{
+				continue;
+			}
+
+			if (propRedirect.TryRead(ref reader, options, PropRedirect))
+			{
+				continue;
+			}
+
+			if (propState.TryRead(ref reader, options, PropState))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new OidcPrepareAuthenticationResponse
+		{
+			Nonce = propNonce.Value
+,
+			Realm = propRealm.Value
+,
+			Redirect = propRedirect.Value
+,
+			State = propState.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, OidcPrepareAuthenticationResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropNonce, value.Nonce);
+		writer.WriteProperty(options, PropRealm, value.Realm);
+		writer.WriteProperty(options, PropRedirect, value.Redirect);
+		writer.WriteProperty(options, PropState, value.State);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(OidcPrepareAuthenticationResponseConverter))]
 public sealed partial class OidcPrepareAuthenticationResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("nonce")]
 	public string Nonce { get; init; }
-	[JsonInclude, JsonPropertyName("realm")]
 	public string Realm { get; init; }
 
 	/// <summary>
@@ -38,8 +103,6 @@ public sealed partial class OidcPrepareAuthenticationResponse : ElasticsearchRes
 	/// A URI that points to the authorization endpoint of the OpenID Connect Provider with all the parameters of the authentication request as HTTP GET parameters.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("redirect")]
 	public string Redirect { get; init; }
-	[JsonInclude, JsonPropertyName("state")]
 	public string State { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/PutPrivilegesRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/PutPrivilegesRequest.g.cs
index 9ba02c01239..190e41375a8 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/PutPrivilegesRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/PutPrivilegesRequest.g.cs
@@ -47,7 +47,7 @@ public sealed partial class PutPrivilegesRequestParameters : RequestParameters
 /// Create or update application privileges.
 /// </para>
 /// </summary>
-public sealed partial class PutPrivilegesRequest : PlainRequest<PutPrivilegesRequestParameters>, ISelfSerializable
+public sealed partial class PutPrivilegesRequest : PlainRequest<PutPrivilegesRequestParameters>, ISelfTwoWaySerializable
 {
 	internal override ApiUrls ApiUrls => ApiUrlLookup.SecurityPutPrivileges;
 
@@ -66,10 +66,15 @@ public sealed partial class PutPrivilegesRequest : PlainRequest<PutPrivilegesReq
 	public Elastic.Clients.Elasticsearch.Refresh? Refresh { get => Q<Elastic.Clients.Elasticsearch.Refresh?>("refresh"); set => Q("refresh", value); }
 	public Dictionary<string, Dictionary<string, Elastic.Clients.Elasticsearch.Security.PrivilegeActions>> Privileges { get; set; }
 
-	void ISelfSerializable.Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
+	void ISelfTwoWaySerializable.Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 	{
 		JsonSerializer.Serialize(writer, Privileges, options);
 	}
+
+	void ISelfTwoWaySerializable.Deserialize(ref Utf8JsonReader reader, JsonSerializerOptions options, IElasticsearchClientSettings settings)
+	{
+		Privileges = settings.RequestResponseSerializer.Deserialize<Dictionary<string, Dictionary<string, Elastic.Clients.Elasticsearch.Security.PrivilegeActions>>>(ref reader);
+	}
 }
 
 /// <summary>
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/PutRoleMappingResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/PutRoleMappingResponse.g.cs
index c3a0d4a12ce..69c91894bff 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/PutRoleMappingResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/PutRoleMappingResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Security;
 
+internal sealed partial class PutRoleMappingResponseConverter : System.Text.Json.Serialization.JsonConverter<PutRoleMappingResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCreated = System.Text.Json.JsonEncodedText.Encode("created");
+	private static readonly System.Text.Json.JsonEncodedText PropRoleMapping = System.Text.Json.JsonEncodedText.Encode("role_mapping");
+
+	public override PutRoleMappingResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool?> propCreated = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Security.CreatedStatus> propRoleMapping = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCreated.TryRead(ref reader, options, PropCreated))
+			{
+				continue;
+			}
+
+			if (propRoleMapping.TryRead(ref reader, options, PropRoleMapping))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutRoleMappingResponse
+		{
+			Created = propCreated.Value
+,
+			RoleMapping = propRoleMapping.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutRoleMappingResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCreated, value.Created);
+		writer.WriteProperty(options, PropRoleMapping, value.RoleMapping);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PutRoleMappingResponseConverter))]
 public sealed partial class PutRoleMappingResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("created")]
 	public bool? Created { get; init; }
-	[JsonInclude, JsonPropertyName("role_mapping")]
 	public Elastic.Clients.Elasticsearch.Security.CreatedStatus RoleMapping { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/PutRoleResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/PutRoleResponse.g.cs
index 6c6b329cdb4..edd5f9ba53b 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/PutRoleResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/PutRoleResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Security;
 
+internal sealed partial class PutRoleResponseConverter : System.Text.Json.Serialization.JsonConverter<PutRoleResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropRole = System.Text.Json.JsonEncodedText.Encode("role");
+
+	public override PutRoleResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Security.CreatedStatus> propRole = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propRole.TryRead(ref reader, options, PropRole))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutRoleResponse
+		{
+			Role = propRole.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutRoleResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropRole, value.Role);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PutRoleResponseConverter))]
 public sealed partial class PutRoleResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("role")]
 	public Elastic.Clients.Elasticsearch.Security.CreatedStatus Role { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/PutUserResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/PutUserResponse.g.cs
index 5941437d1cc..22b7453c64a 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/PutUserResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/PutUserResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Security;
 
+internal sealed partial class PutUserResponseConverter : System.Text.Json.Serialization.JsonConverter<PutUserResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCreated = System.Text.Json.JsonEncodedText.Encode("created");
+
+	public override PutUserResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propCreated = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCreated.TryRead(ref reader, options, PropCreated))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutUserResponse
+		{
+			Created = propCreated.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutUserResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCreated, value.Created);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PutUserResponseConverter))]
 public sealed partial class PutUserResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("created")]
 	public bool Created { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/QueryApiKeysRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/QueryApiKeysRequest.g.cs
index fdd42b6136d..0ca2961b98f 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/QueryApiKeysRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/QueryApiKeysRequest.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport;
@@ -55,98 +56,86 @@ public sealed partial class QueryApiKeysRequestParameters : RequestParameters
 	public bool? WithProfileUid { get => Q<bool?>("with_profile_uid"); set => Q("with_profile_uid", value); }
 }
 
-internal sealed partial class QueryApiKeysRequestConverter : JsonConverter<QueryApiKeysRequest>
+internal sealed partial class QueryApiKeysRequestConverter : System.Text.Json.Serialization.JsonConverter<QueryApiKeysRequest>
 {
-	public override QueryApiKeysRequest Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations1 = System.Text.Json.JsonEncodedText.Encode("aggs");
+	private static readonly System.Text.Json.JsonEncodedText PropFrom = System.Text.Json.JsonEncodedText.Encode("from");
+	private static readonly System.Text.Json.JsonEncodedText PropQuery = System.Text.Json.JsonEncodedText.Encode("query");
+	private static readonly System.Text.Json.JsonEncodedText PropSearchAfter = System.Text.Json.JsonEncodedText.Encode("search_after");
+	private static readonly System.Text.Json.JsonEncodedText PropSize = System.Text.Json.JsonEncodedText.Encode("size");
+	private static readonly System.Text.Json.JsonEncodedText PropSort = System.Text.Json.JsonEncodedText.Encode("sort");
+
+	public override QueryApiKeysRequest Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		var variant = new QueryApiKeysRequest();
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IDictionary<string, Elastic.Clients.Elasticsearch.Security.ApiKeyAggregation>?> propAggregations = default;
+		LocalJsonProperty<int?> propFrom = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Security.ApiKeyQuery?> propQuery = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.FieldValue>?> propSearchAfter = default;
+		LocalJsonProperty<int?> propSize = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.SortOptions>?> propSort = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propAggregations.TryRead(ref reader, options, PropAggregations) || propAggregations.TryRead(ref reader, options, PropAggregations1))
 			{
-				var property = reader.GetString();
-				if (property == "aggregations" || property == "aggs")
-				{
-					variant.Aggregations = JsonSerializer.Deserialize<IDictionary<string, Elastic.Clients.Elasticsearch.Security.ApiKeyAggregation>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "from")
-				{
-					variant.From = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "query")
-				{
-					variant.Query = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Security.ApiKeyQuery?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "search_after")
-				{
-					variant.SearchAfter = JsonSerializer.Deserialize<ICollection<Elastic.Clients.Elasticsearch.FieldValue>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "size")
-				{
-					variant.Size = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "sort")
-				{
-					variant.Sort = JsonSerializer.Deserialize<ICollection<Elastic.Clients.Elasticsearch.SortOptions>?>(ref reader, options);
-					continue;
-				}
+				continue;
 			}
-		}
 
-		return variant;
-	}
+			if (propFrom.TryRead(ref reader, options, PropFrom))
+			{
+				continue;
+			}
 
-	public override void Write(Utf8JsonWriter writer, QueryApiKeysRequest value, JsonSerializerOptions options)
-	{
-		writer.WriteStartObject();
-		if (value.Aggregations is not null)
-		{
-			writer.WritePropertyName("aggregations");
-			JsonSerializer.Serialize(writer, value.Aggregations, options);
-		}
+			if (propQuery.TryRead(ref reader, options, PropQuery))
+			{
+				continue;
+			}
 
-		if (value.From.HasValue)
-		{
-			writer.WritePropertyName("from");
-			writer.WriteNumberValue(value.From.Value);
-		}
+			if (propSearchAfter.TryRead(ref reader, options, PropSearchAfter))
+			{
+				continue;
+			}
 
-		if (value.Query is not null)
-		{
-			writer.WritePropertyName("query");
-			JsonSerializer.Serialize(writer, value.Query, options);
-		}
+			if (propSize.TryRead(ref reader, options, PropSize))
+			{
+				continue;
+			}
 
-		if (value.SearchAfter is not null)
-		{
-			writer.WritePropertyName("search_after");
-			JsonSerializer.Serialize(writer, value.SearchAfter, options);
-		}
+			if (propSort.TryRead(ref reader, options, PropSort, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.SortOptions>?, Elastic.Clients.Elasticsearch.SortOptions>)))
+			{
+				continue;
+			}
 
-		if (value.Size.HasValue)
-		{
-			writer.WritePropertyName("size");
-			writer.WriteNumberValue(value.Size.Value);
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		if (value.Sort is not null)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new QueryApiKeysRequest
 		{
-			writer.WritePropertyName("sort");
-			JsonSerializer.Serialize(writer, value.Sort, options);
-		}
+			Aggregations = propAggregations.Value
+	,
+			From = propFrom.Value
+	,
+			Query = propQuery.Value
+	,
+			SearchAfter = propSearchAfter.Value
+	,
+			Size = propSize.Value
+	,
+			Sort = propSort.Value
+		};
+	}
 
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, QueryApiKeysRequest value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAggregations, value.Aggregations);
+		writer.WriteProperty(options, PropFrom, value.From);
+		writer.WriteProperty(options, PropQuery, value.Query);
+		writer.WriteProperty(options, PropSearchAfter, value.SearchAfter);
+		writer.WriteProperty(options, PropSize, value.Size);
+		writer.WriteProperty(options, PropSort, value.Sort, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.SortOptions>?, Elastic.Clients.Elasticsearch.SortOptions>));
 		writer.WriteEndObject();
 	}
 }
@@ -179,7 +168,6 @@ public QueryApiKeysRequest()
 	/// Determines whether aggregation names are 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>
@@ -188,7 +176,6 @@ public QueryApiKeysRequest()
 	/// An API key's actual permission is the intersection of its assigned role descriptors and the owner user's role descriptors.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public bool? WithLimitedBy { get => Q<bool?>("with_limited_by"); set => Q("with_limited_by", value); }
 
 	/// <summary>
@@ -196,7 +183,6 @@ public QueryApiKeysRequest()
 	/// Determines whether to also retrieve the profile uid, for the API key owner principal, if it exists.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public bool? WithProfileUid { get => Q<bool?>("with_profile_uid"); set => Q("with_profile_uid", value); }
 
 	/// <summary>
@@ -208,7 +194,6 @@ public QueryApiKeysRequest()
 	/// Additionally, aggregations only run over the same subset of fields that query works with.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("aggregations")]
 	public IDictionary<string, Elastic.Clients.Elasticsearch.Security.ApiKeyAggregation>? Aggregations { get; set; }
 
 	/// <summary>
@@ -218,7 +203,6 @@ public QueryApiKeysRequest()
 	/// To page through more hits, use the <c>search_after</c> parameter.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("from")]
 	public int? From { get; set; }
 
 	/// <summary>
@@ -231,7 +215,6 @@ public QueryApiKeysRequest()
 	/// <c>creation</c>, <c>expiration</c>, <c>invalidated</c>, <c>invalidation</c>, <c>username</c>, <c>realm</c>, and <c>metadata</c>.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("query")]
 	public Elastic.Clients.Elasticsearch.Security.ApiKeyQuery? Query { get; set; }
 
 	/// <summary>
@@ -239,7 +222,6 @@ public QueryApiKeysRequest()
 	/// Search after definition
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("search_after")]
 	public ICollection<Elastic.Clients.Elasticsearch.FieldValue>? SearchAfter { get; set; }
 
 	/// <summary>
@@ -249,7 +231,6 @@ public QueryApiKeysRequest()
 	/// To page through more hits, use the <c>search_after</c> parameter.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("size")]
 	public int? Size { get; set; }
 
 	/// <summary>
@@ -258,8 +239,6 @@ public QueryApiKeysRequest()
 	/// In addition, sort can also be applied to the <c>_doc</c> field to sort by index order.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("sort")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.SortOptions))]
 	public ICollection<Elastic.Clients.Elasticsearch.SortOptions>? Sort { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/QueryApiKeysResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/QueryApiKeysResponse.g.cs
index 89b4746dbc8..de27ca8d659 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/QueryApiKeysResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/QueryApiKeysResponse.g.cs
@@ -18,14 +18,81 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Security;
 
+internal sealed partial class QueryApiKeysResponseConverter : System.Text.Json.Serialization.JsonConverter<QueryApiKeysResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropApiKeys = System.Text.Json.JsonEncodedText.Encode("api_keys");
+	private static readonly System.Text.Json.JsonEncodedText PropCount = System.Text.Json.JsonEncodedText.Encode("count");
+	private static readonly System.Text.Json.JsonEncodedText PropTotal = System.Text.Json.JsonEncodedText.Encode("total");
+
+	public override QueryApiKeysResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary?> propAggregations = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Security.ApiKey>> propApiKeys = default;
+		LocalJsonProperty<int> propCount = default;
+		LocalJsonProperty<int> propTotal = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAggregations.TryRead(ref reader, options, PropAggregations))
+			{
+				continue;
+			}
+
+			if (propApiKeys.TryRead(ref reader, options, PropApiKeys))
+			{
+				continue;
+			}
+
+			if (propCount.TryRead(ref reader, options, PropCount))
+			{
+				continue;
+			}
+
+			if (propTotal.TryRead(ref reader, options, PropTotal))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new QueryApiKeysResponse
+		{
+			Aggregations = propAggregations.Value
+,
+			ApiKeys = propApiKeys.Value
+,
+			Count = propCount.Value
+,
+			Total = propTotal.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, QueryApiKeysResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAggregations, value.Aggregations);
+		writer.WriteProperty(options, PropApiKeys, value.ApiKeys);
+		writer.WriteProperty(options, PropCount, value.Count);
+		writer.WriteProperty(options, PropTotal, value.Total);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(QueryApiKeysResponseConverter))]
 public sealed partial class QueryApiKeysResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,7 +100,6 @@ public sealed partial class QueryApiKeysResponse : ElasticsearchResponse
 	/// The aggregations result, if requested.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("aggregations")]
 	public Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary? Aggregations { get; init; }
 
 	/// <summary>
@@ -41,7 +107,6 @@ public sealed partial class QueryApiKeysResponse : ElasticsearchResponse
 	/// A list of API key information.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("api_keys")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Security.ApiKey> ApiKeys { get; init; }
 
 	/// <summary>
@@ -49,7 +114,6 @@ public sealed partial class QueryApiKeysResponse : ElasticsearchResponse
 	/// The number of API keys returned in the response.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("count")]
 	public int Count { get; init; }
 
 	/// <summary>
@@ -57,6 +121,5 @@ public sealed partial class QueryApiKeysResponse : ElasticsearchResponse
 	/// The total number of API keys found.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("total")]
 	public int Total { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/QueryRoleRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/QueryRoleRequest.g.cs
index e55732256d7..b79d0756796 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/QueryRoleRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/QueryRoleRequest.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport;
@@ -34,6 +35,79 @@ public sealed partial class QueryRoleRequestParameters : RequestParameters
 {
 }
 
+internal sealed partial class QueryRoleRequestConverter : System.Text.Json.Serialization.JsonConverter<QueryRoleRequest>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropFrom = System.Text.Json.JsonEncodedText.Encode("from");
+	private static readonly System.Text.Json.JsonEncodedText PropQuery = System.Text.Json.JsonEncodedText.Encode("query");
+	private static readonly System.Text.Json.JsonEncodedText PropSearchAfter = System.Text.Json.JsonEncodedText.Encode("search_after");
+	private static readonly System.Text.Json.JsonEncodedText PropSize = System.Text.Json.JsonEncodedText.Encode("size");
+	private static readonly System.Text.Json.JsonEncodedText PropSort = System.Text.Json.JsonEncodedText.Encode("sort");
+
+	public override QueryRoleRequest Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<int?> propFrom = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Security.RoleQuery?> propQuery = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.FieldValue>?> propSearchAfter = default;
+		LocalJsonProperty<int?> propSize = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.SortOptions>?> propSort = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propFrom.TryRead(ref reader, options, PropFrom))
+			{
+				continue;
+			}
+
+			if (propQuery.TryRead(ref reader, options, PropQuery))
+			{
+				continue;
+			}
+
+			if (propSearchAfter.TryRead(ref reader, options, PropSearchAfter))
+			{
+				continue;
+			}
+
+			if (propSize.TryRead(ref reader, options, PropSize))
+			{
+				continue;
+			}
+
+			if (propSort.TryRead(ref reader, options, PropSort, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.SortOptions>?, Elastic.Clients.Elasticsearch.SortOptions>)))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new QueryRoleRequest
+		{
+			From = propFrom.Value
+,
+			Query = propQuery.Value
+,
+			SearchAfter = propSearchAfter.Value
+,
+			Size = propSize.Value
+,
+			Sort = propSort.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, QueryRoleRequest value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropFrom, value.From);
+		writer.WriteProperty(options, PropQuery, value.Query);
+		writer.WriteProperty(options, PropSearchAfter, value.SearchAfter);
+		writer.WriteProperty(options, PropSize, value.Size);
+		writer.WriteProperty(options, PropSort, value.Sort, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.SortOptions>?, Elastic.Clients.Elasticsearch.SortOptions>));
+		writer.WriteEndObject();
+	}
+}
+
 /// <summary>
 /// <para>
 /// Find roles with a query.
@@ -42,6 +116,7 @@ public sealed partial class QueryRoleRequestParameters : RequestParameters
 /// Get roles in a paginated manner. You can optionally filter the results with a query.
 /// </para>
 /// </summary>
+[JsonConverter(typeof(QueryRoleRequestConverter))]
 public sealed partial class QueryRoleRequest : PlainRequest<QueryRoleRequestParameters>
 {
 	internal override ApiUrls ApiUrls => ApiUrlLookup.SecurityQueryRole;
@@ -59,7 +134,6 @@ public sealed partial class QueryRoleRequest : PlainRequest<QueryRoleRequestPara
 	/// To page through more hits, use the <c>search_after</c> parameter.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("from")]
 	public int? From { get; set; }
 
 	/// <summary>
@@ -72,7 +146,6 @@ public sealed partial class QueryRoleRequest : PlainRequest<QueryRoleRequestPara
 	/// <c>applications.application</c>, <c>applications.privileges</c>, <c>applications.resources</c>.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("query")]
 	public Elastic.Clients.Elasticsearch.Security.RoleQuery? Query { get; set; }
 
 	/// <summary>
@@ -80,7 +153,6 @@ public sealed partial class QueryRoleRequest : PlainRequest<QueryRoleRequestPara
 	/// Search after definition
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("search_after")]
 	public ICollection<Elastic.Clients.Elasticsearch.FieldValue>? SearchAfter { get; set; }
 
 	/// <summary>
@@ -90,7 +162,6 @@ public sealed partial class QueryRoleRequest : PlainRequest<QueryRoleRequestPara
 	/// To page through more hits, use the <c>search_after</c> parameter.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("size")]
 	public int? Size { get; set; }
 
 	/// <summary>
@@ -99,8 +170,6 @@ public sealed partial class QueryRoleRequest : PlainRequest<QueryRoleRequestPara
 	/// In addition, sort can also be applied to the <c>_doc</c> field to sort by index order.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("sort")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.SortOptions))]
 	public ICollection<Elastic.Clients.Elasticsearch.SortOptions>? Sort { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/QueryRoleResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/QueryRoleResponse.g.cs
index dab72c52d73..1663ea4f846 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/QueryRoleResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/QueryRoleResponse.g.cs
@@ -18,14 +18,71 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Security;
 
+internal sealed partial class QueryRoleResponseConverter : System.Text.Json.Serialization.JsonConverter<QueryRoleResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCount = System.Text.Json.JsonEncodedText.Encode("count");
+	private static readonly System.Text.Json.JsonEncodedText PropRoles = System.Text.Json.JsonEncodedText.Encode("roles");
+	private static readonly System.Text.Json.JsonEncodedText PropTotal = System.Text.Json.JsonEncodedText.Encode("total");
+
+	public override QueryRoleResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<int> propCount = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Security.QueryRole>> propRoles = default;
+		LocalJsonProperty<int> propTotal = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCount.TryRead(ref reader, options, PropCount))
+			{
+				continue;
+			}
+
+			if (propRoles.TryRead(ref reader, options, PropRoles))
+			{
+				continue;
+			}
+
+			if (propTotal.TryRead(ref reader, options, PropTotal))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new QueryRoleResponse
+		{
+			Count = propCount.Value
+,
+			Roles = propRoles.Value
+,
+			Total = propTotal.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, QueryRoleResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCount, value.Count);
+		writer.WriteProperty(options, PropRoles, value.Roles);
+		writer.WriteProperty(options, PropTotal, value.Total);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(QueryRoleResponseConverter))]
 public sealed partial class QueryRoleResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,7 +90,6 @@ public sealed partial class QueryRoleResponse : ElasticsearchResponse
 	/// The number of roles returned in the response.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("count")]
 	public int Count { get; init; }
 
 	/// <summary>
@@ -41,7 +97,6 @@ public sealed partial class QueryRoleResponse : ElasticsearchResponse
 	/// The list of roles.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("roles")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Security.QueryRole> Roles { get; init; }
 
 	/// <summary>
@@ -49,6 +104,5 @@ public sealed partial class QueryRoleResponse : ElasticsearchResponse
 	/// The total number of roles found.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("total")]
 	public int Total { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/QueryUserRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/QueryUserRequest.g.cs
index c5d98d22452..7a7015bb6de 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/QueryUserRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/QueryUserRequest.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport;
@@ -40,6 +41,79 @@ public sealed partial class QueryUserRequestParameters : RequestParameters
 	public bool? WithProfileUid { get => Q<bool?>("with_profile_uid"); set => Q("with_profile_uid", value); }
 }
 
+internal sealed partial class QueryUserRequestConverter : System.Text.Json.Serialization.JsonConverter<QueryUserRequest>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropFrom = System.Text.Json.JsonEncodedText.Encode("from");
+	private static readonly System.Text.Json.JsonEncodedText PropQuery = System.Text.Json.JsonEncodedText.Encode("query");
+	private static readonly System.Text.Json.JsonEncodedText PropSearchAfter = System.Text.Json.JsonEncodedText.Encode("search_after");
+	private static readonly System.Text.Json.JsonEncodedText PropSize = System.Text.Json.JsonEncodedText.Encode("size");
+	private static readonly System.Text.Json.JsonEncodedText PropSort = System.Text.Json.JsonEncodedText.Encode("sort");
+
+	public override QueryUserRequest Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<int?> propFrom = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Security.UserQuery?> propQuery = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.FieldValue>?> propSearchAfter = default;
+		LocalJsonProperty<int?> propSize = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.SortOptions>?> propSort = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propFrom.TryRead(ref reader, options, PropFrom))
+			{
+				continue;
+			}
+
+			if (propQuery.TryRead(ref reader, options, PropQuery))
+			{
+				continue;
+			}
+
+			if (propSearchAfter.TryRead(ref reader, options, PropSearchAfter))
+			{
+				continue;
+			}
+
+			if (propSize.TryRead(ref reader, options, PropSize))
+			{
+				continue;
+			}
+
+			if (propSort.TryRead(ref reader, options, PropSort, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.SortOptions>?, Elastic.Clients.Elasticsearch.SortOptions>)))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new QueryUserRequest
+		{
+			From = propFrom.Value
+	,
+			Query = propQuery.Value
+	,
+			SearchAfter = propSearchAfter.Value
+	,
+			Size = propSize.Value
+	,
+			Sort = propSort.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, QueryUserRequest value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropFrom, value.From);
+		writer.WriteProperty(options, PropQuery, value.Query);
+		writer.WriteProperty(options, PropSearchAfter, value.SearchAfter);
+		writer.WriteProperty(options, PropSize, value.Size);
+		writer.WriteProperty(options, PropSort, value.Sort, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.SortOptions>?, Elastic.Clients.Elasticsearch.SortOptions>));
+		writer.WriteEndObject();
+	}
+}
+
 /// <summary>
 /// <para>
 /// Find users with a query.
@@ -49,6 +123,7 @@ public sealed partial class QueryUserRequestParameters : RequestParameters
 /// You can optionally filter the results with a query.
 /// </para>
 /// </summary>
+[JsonConverter(typeof(QueryUserRequestConverter))]
 public sealed partial class QueryUserRequest : PlainRequest<QueryUserRequestParameters>
 {
 	internal override ApiUrls ApiUrls => ApiUrlLookup.SecurityQueryUser;
@@ -64,7 +139,6 @@ public sealed partial class QueryUserRequest : PlainRequest<QueryUserRequestPara
 	/// If true will return the User Profile ID for the users in the query result, if any.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public bool? WithProfileUid { get => Q<bool?>("with_profile_uid"); set => Q("with_profile_uid", value); }
 
 	/// <summary>
@@ -74,7 +148,6 @@ public sealed partial class QueryUserRequest : PlainRequest<QueryUserRequestPara
 	/// To page through more hits, use the <c>search_after</c> parameter.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("from")]
 	public int? From { get; set; }
 
 	/// <summary>
@@ -86,7 +159,6 @@ public sealed partial class QueryUserRequest : PlainRequest<QueryUserRequestPara
 	/// You can query the following information associated with user: <c>username</c>, <c>roles</c>, <c>enabled</c>
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("query")]
 	public Elastic.Clients.Elasticsearch.Security.UserQuery? Query { get; set; }
 
 	/// <summary>
@@ -94,7 +166,6 @@ public sealed partial class QueryUserRequest : PlainRequest<QueryUserRequestPara
 	/// Search after definition
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("search_after")]
 	public ICollection<Elastic.Clients.Elasticsearch.FieldValue>? SearchAfter { get; set; }
 
 	/// <summary>
@@ -104,7 +175,6 @@ public sealed partial class QueryUserRequest : PlainRequest<QueryUserRequestPara
 	/// To page through more hits, use the <c>search_after</c> parameter.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("size")]
 	public int? Size { get; set; }
 
 	/// <summary>
@@ -113,8 +183,6 @@ public sealed partial class QueryUserRequest : PlainRequest<QueryUserRequestPara
 	/// In addition, sort can also be applied to the <c>_doc</c> field to sort by index order.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("sort")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.SortOptions))]
 	public ICollection<Elastic.Clients.Elasticsearch.SortOptions>? Sort { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/QueryUserResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/QueryUserResponse.g.cs
index 36090081fc3..7a9d3b0f5da 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/QueryUserResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/QueryUserResponse.g.cs
@@ -18,14 +18,71 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Security;
 
+internal sealed partial class QueryUserResponseConverter : System.Text.Json.Serialization.JsonConverter<QueryUserResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCount = System.Text.Json.JsonEncodedText.Encode("count");
+	private static readonly System.Text.Json.JsonEncodedText PropTotal = System.Text.Json.JsonEncodedText.Encode("total");
+	private static readonly System.Text.Json.JsonEncodedText PropUsers = System.Text.Json.JsonEncodedText.Encode("users");
+
+	public override QueryUserResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<int> propCount = default;
+		LocalJsonProperty<int> propTotal = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Security.QueryUser>> propUsers = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCount.TryRead(ref reader, options, PropCount))
+			{
+				continue;
+			}
+
+			if (propTotal.TryRead(ref reader, options, PropTotal))
+			{
+				continue;
+			}
+
+			if (propUsers.TryRead(ref reader, options, PropUsers))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new QueryUserResponse
+		{
+			Count = propCount.Value
+,
+			Total = propTotal.Value
+,
+			Users = propUsers.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, QueryUserResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCount, value.Count);
+		writer.WriteProperty(options, PropTotal, value.Total);
+		writer.WriteProperty(options, PropUsers, value.Users);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(QueryUserResponseConverter))]
 public sealed partial class QueryUserResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,7 +90,6 @@ public sealed partial class QueryUserResponse : ElasticsearchResponse
 	/// The number of users returned in the response.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("count")]
 	public int Count { get; init; }
 
 	/// <summary>
@@ -41,7 +97,6 @@ public sealed partial class QueryUserResponse : ElasticsearchResponse
 	/// The total number of users found.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("total")]
 	public int Total { get; init; }
 
 	/// <summary>
@@ -49,6 +104,5 @@ public sealed partial class QueryUserResponse : ElasticsearchResponse
 	/// A list of user information.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("users")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Security.QueryUser> Users { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/SamlAuthenticateResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/SamlAuthenticateResponse.g.cs
index 563c505d691..4deccd0a0f0 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/SamlAuthenticateResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/SamlAuthenticateResponse.g.cs
@@ -18,24 +18,96 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Security;
 
+internal sealed partial class SamlAuthenticateResponseConverter : System.Text.Json.Serialization.JsonConverter<SamlAuthenticateResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAccessToken = System.Text.Json.JsonEncodedText.Encode("access_token");
+	private static readonly System.Text.Json.JsonEncodedText PropExpiresIn = System.Text.Json.JsonEncodedText.Encode("expires_in");
+	private static readonly System.Text.Json.JsonEncodedText PropRealm = System.Text.Json.JsonEncodedText.Encode("realm");
+	private static readonly System.Text.Json.JsonEncodedText PropRefreshToken = System.Text.Json.JsonEncodedText.Encode("refresh_token");
+	private static readonly System.Text.Json.JsonEncodedText PropUsername = System.Text.Json.JsonEncodedText.Encode("username");
+
+	public override SamlAuthenticateResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propAccessToken = default;
+		LocalJsonProperty<int> propExpiresIn = default;
+		LocalJsonProperty<string> propRealm = default;
+		LocalJsonProperty<string> propRefreshToken = default;
+		LocalJsonProperty<string> propUsername = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAccessToken.TryRead(ref reader, options, PropAccessToken))
+			{
+				continue;
+			}
+
+			if (propExpiresIn.TryRead(ref reader, options, PropExpiresIn))
+			{
+				continue;
+			}
+
+			if (propRealm.TryRead(ref reader, options, PropRealm))
+			{
+				continue;
+			}
+
+			if (propRefreshToken.TryRead(ref reader, options, PropRefreshToken))
+			{
+				continue;
+			}
+
+			if (propUsername.TryRead(ref reader, options, PropUsername))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SamlAuthenticateResponse
+		{
+			AccessToken = propAccessToken.Value
+,
+			ExpiresIn = propExpiresIn.Value
+,
+			Realm = propRealm.Value
+,
+			RefreshToken = propRefreshToken.Value
+,
+			Username = propUsername.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SamlAuthenticateResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAccessToken, value.AccessToken);
+		writer.WriteProperty(options, PropExpiresIn, value.ExpiresIn);
+		writer.WriteProperty(options, PropRealm, value.Realm);
+		writer.WriteProperty(options, PropRefreshToken, value.RefreshToken);
+		writer.WriteProperty(options, PropUsername, value.Username);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(SamlAuthenticateResponseConverter))]
 public sealed partial class SamlAuthenticateResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("access_token")]
 	public string AccessToken { get; init; }
-	[JsonInclude, JsonPropertyName("expires_in")]
 	public int ExpiresIn { get; init; }
-	[JsonInclude, JsonPropertyName("realm")]
 	public string Realm { get; init; }
-	[JsonInclude, JsonPropertyName("refresh_token")]
 	public string RefreshToken { get; init; }
-	[JsonInclude, JsonPropertyName("username")]
 	public string Username { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/SamlInvalidateResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/SamlInvalidateResponse.g.cs
index afb8237ad22..380c94267cf 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/SamlInvalidateResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/SamlInvalidateResponse.g.cs
@@ -18,20 +18,74 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Security;
 
+internal sealed partial class SamlInvalidateResponseConverter : System.Text.Json.Serialization.JsonConverter<SamlInvalidateResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropInvalidated = System.Text.Json.JsonEncodedText.Encode("invalidated");
+	private static readonly System.Text.Json.JsonEncodedText PropRealm = System.Text.Json.JsonEncodedText.Encode("realm");
+	private static readonly System.Text.Json.JsonEncodedText PropRedirect = System.Text.Json.JsonEncodedText.Encode("redirect");
+
+	public override SamlInvalidateResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<int> propInvalidated = default;
+		LocalJsonProperty<string> propRealm = default;
+		LocalJsonProperty<string> propRedirect = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propInvalidated.TryRead(ref reader, options, PropInvalidated))
+			{
+				continue;
+			}
+
+			if (propRealm.TryRead(ref reader, options, PropRealm))
+			{
+				continue;
+			}
+
+			if (propRedirect.TryRead(ref reader, options, PropRedirect))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SamlInvalidateResponse
+		{
+			Invalidated = propInvalidated.Value
+,
+			Realm = propRealm.Value
+,
+			Redirect = propRedirect.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SamlInvalidateResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropInvalidated, value.Invalidated);
+		writer.WriteProperty(options, PropRealm, value.Realm);
+		writer.WriteProperty(options, PropRedirect, value.Redirect);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(SamlInvalidateResponseConverter))]
 public sealed partial class SamlInvalidateResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("invalidated")]
 	public int Invalidated { get; init; }
-	[JsonInclude, JsonPropertyName("realm")]
 	public string Realm { get; init; }
-	[JsonInclude, JsonPropertyName("redirect")]
 	public string Redirect { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/SamlLogoutResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/SamlLogoutResponse.g.cs
index 07e111b2a2b..ca82224b0e8 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/SamlLogoutResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/SamlLogoutResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Security;
 
+internal sealed partial class SamlLogoutResponseConverter : System.Text.Json.Serialization.JsonConverter<SamlLogoutResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropRedirect = System.Text.Json.JsonEncodedText.Encode("redirect");
+
+	public override SamlLogoutResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propRedirect = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propRedirect.TryRead(ref reader, options, PropRedirect))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SamlLogoutResponse
+		{
+			Redirect = propRedirect.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SamlLogoutResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropRedirect, value.Redirect);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(SamlLogoutResponseConverter))]
 public sealed partial class SamlLogoutResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("redirect")]
 	public string Redirect { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/SamlPrepareAuthenticationResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/SamlPrepareAuthenticationResponse.g.cs
index dd6dd3b5d56..2b287c082ff 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/SamlPrepareAuthenticationResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/SamlPrepareAuthenticationResponse.g.cs
@@ -18,20 +18,74 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Security;
 
+internal sealed partial class SamlPrepareAuthenticationResponseConverter : System.Text.Json.Serialization.JsonConverter<SamlPrepareAuthenticationResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("id");
+	private static readonly System.Text.Json.JsonEncodedText PropRealm = System.Text.Json.JsonEncodedText.Encode("realm");
+	private static readonly System.Text.Json.JsonEncodedText PropRedirect = System.Text.Json.JsonEncodedText.Encode("redirect");
+
+	public override SamlPrepareAuthenticationResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propId = default;
+		LocalJsonProperty<string> propRealm = default;
+		LocalJsonProperty<string> propRedirect = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propId.TryRead(ref reader, options, PropId))
+			{
+				continue;
+			}
+
+			if (propRealm.TryRead(ref reader, options, PropRealm))
+			{
+				continue;
+			}
+
+			if (propRedirect.TryRead(ref reader, options, PropRedirect))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SamlPrepareAuthenticationResponse
+		{
+			Id = propId.Value
+,
+			Realm = propRealm.Value
+,
+			Redirect = propRedirect.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SamlPrepareAuthenticationResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropId, value.Id);
+		writer.WriteProperty(options, PropRealm, value.Realm);
+		writer.WriteProperty(options, PropRedirect, value.Redirect);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(SamlPrepareAuthenticationResponseConverter))]
 public sealed partial class SamlPrepareAuthenticationResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("id")]
 	public string Id { get; init; }
-	[JsonInclude, JsonPropertyName("realm")]
 	public string Realm { get; init; }
-	[JsonInclude, JsonPropertyName("redirect")]
 	public string Redirect { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/SamlServiceProviderMetadataResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/SamlServiceProviderMetadataResponse.g.cs
index b64c8776d95..bbfbd88d850 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/SamlServiceProviderMetadataResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/SamlServiceProviderMetadataResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Security;
 
+internal sealed partial class SamlServiceProviderMetadataResponseConverter : System.Text.Json.Serialization.JsonConverter<SamlServiceProviderMetadataResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropMetadata = System.Text.Json.JsonEncodedText.Encode("metadata");
+
+	public override SamlServiceProviderMetadataResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propMetadata = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propMetadata.TryRead(ref reader, options, PropMetadata))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SamlServiceProviderMetadataResponse
+		{
+			Metadata = propMetadata.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SamlServiceProviderMetadataResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropMetadata, value.Metadata);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(SamlServiceProviderMetadataResponseConverter))]
 public sealed partial class SamlServiceProviderMetadataResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("metadata")]
 	public string Metadata { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/SuggestUserProfilesRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/SuggestUserProfilesRequest.g.cs
index c6596d47ecb..d5bc2b682a9 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/SuggestUserProfilesRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/SuggestUserProfilesRequest.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport;
@@ -34,6 +35,69 @@ public sealed partial class SuggestUserProfilesRequestParameters : RequestParame
 {
 }
 
+internal sealed partial class SuggestUserProfilesRequestConverter : System.Text.Json.Serialization.JsonConverter<SuggestUserProfilesRequest>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropData = System.Text.Json.JsonEncodedText.Encode("data");
+	private static readonly System.Text.Json.JsonEncodedText PropHint = System.Text.Json.JsonEncodedText.Encode("hint");
+	private static readonly System.Text.Json.JsonEncodedText PropName = System.Text.Json.JsonEncodedText.Encode("name");
+	private static readonly System.Text.Json.JsonEncodedText PropSize = System.Text.Json.JsonEncodedText.Encode("size");
+
+	public override SuggestUserProfilesRequest Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propData = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Security.Hint?> propHint = default;
+		LocalJsonProperty<string?> propName = default;
+		LocalJsonProperty<long?> propSize = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propData.TryRead(ref reader, options, PropData, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propHint.TryRead(ref reader, options, PropHint))
+			{
+				continue;
+			}
+
+			if (propName.TryRead(ref reader, options, PropName))
+			{
+				continue;
+			}
+
+			if (propSize.TryRead(ref reader, options, PropSize))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SuggestUserProfilesRequest
+		{
+			Data = propData.Value
+,
+			Hint = propHint.Value
+,
+			Name = propName.Value
+,
+			Size = propSize.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SuggestUserProfilesRequest value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropData, value.Data, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropHint, value.Hint);
+		writer.WriteProperty(options, PropName, value.Name);
+		writer.WriteProperty(options, PropSize, value.Size);
+		writer.WriteEndObject();
+	}
+}
+
 /// <summary>
 /// <para>
 /// Suggest a user profile.
@@ -42,6 +106,7 @@ public sealed partial class SuggestUserProfilesRequestParameters : RequestParame
 /// Get suggestions for user profiles that match specified search criteria.
 /// </para>
 /// </summary>
+[JsonConverter(typeof(SuggestUserProfilesRequestConverter))]
 public sealed partial class SuggestUserProfilesRequest : PlainRequest<SuggestUserProfilesRequestParameters>
 {
 	internal override ApiUrls ApiUrls => ApiUrlLookup.SecuritySuggestUserProfiles;
@@ -60,8 +125,6 @@ public sealed partial class SuggestUserProfilesRequest : PlainRequest<SuggestUse
 	/// By default returns no <c>data</c> content.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("data")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Data { get; set; }
 
 	/// <summary>
@@ -72,7 +135,6 @@ public sealed partial class SuggestUserProfilesRequest : PlainRequest<SuggestUse
 	/// as long as the profile matches the <c>name</c> field query.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("hint")]
 	public Elastic.Clients.Elasticsearch.Security.Hint? Hint { get; set; }
 
 	/// <summary>
@@ -81,7 +143,6 @@ public sealed partial class SuggestUserProfilesRequest : PlainRequest<SuggestUse
 	/// Name-related fields are the user's <c>username</c>, <c>full_name</c>, and <c>email</c>.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("name")]
 	public string? Name { get; set; }
 
 	/// <summary>
@@ -89,7 +150,6 @@ public sealed partial class SuggestUserProfilesRequest : PlainRequest<SuggestUse
 	/// Number of profiles to return.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("size")]
 	public long? Size { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/SuggestUserProfilesResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/SuggestUserProfilesResponse.g.cs
index 9ab634abb11..224ad10f21e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/SuggestUserProfilesResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/SuggestUserProfilesResponse.g.cs
@@ -18,20 +18,74 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Security;
 
+internal sealed partial class SuggestUserProfilesResponseConverter : System.Text.Json.Serialization.JsonConverter<SuggestUserProfilesResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropProfiles = System.Text.Json.JsonEncodedText.Encode("profiles");
+	private static readonly System.Text.Json.JsonEncodedText PropTook = System.Text.Json.JsonEncodedText.Encode("took");
+	private static readonly System.Text.Json.JsonEncodedText PropTotal = System.Text.Json.JsonEncodedText.Encode("total");
+
+	public override SuggestUserProfilesResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Security.UserProfile>> propProfiles = default;
+		LocalJsonProperty<long> propTook = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Security.TotalUserProfiles> propTotal = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propProfiles.TryRead(ref reader, options, PropProfiles))
+			{
+				continue;
+			}
+
+			if (propTook.TryRead(ref reader, options, PropTook))
+			{
+				continue;
+			}
+
+			if (propTotal.TryRead(ref reader, options, PropTotal))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SuggestUserProfilesResponse
+		{
+			Profiles = propProfiles.Value
+,
+			Took = propTook.Value
+,
+			Total = propTotal.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SuggestUserProfilesResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropProfiles, value.Profiles);
+		writer.WriteProperty(options, PropTook, value.Took);
+		writer.WriteProperty(options, PropTotal, value.Total);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(SuggestUserProfilesResponseConverter))]
 public sealed partial class SuggestUserProfilesResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("profiles")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Security.UserProfile> Profiles { get; init; }
-	[JsonInclude, JsonPropertyName("took")]
 	public long Took { get; init; }
-	[JsonInclude, JsonPropertyName("total")]
 	public Elastic.Clients.Elasticsearch.Security.TotalUserProfiles Total { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/UpdateApiKeyResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/UpdateApiKeyResponse.g.cs
index ceeb922e33e..258dc88156f 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/UpdateApiKeyResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/UpdateApiKeyResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Security;
 
+internal sealed partial class UpdateApiKeyResponseConverter : System.Text.Json.Serialization.JsonConverter<UpdateApiKeyResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropUpdated = System.Text.Json.JsonEncodedText.Encode("updated");
+
+	public override UpdateApiKeyResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propUpdated = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propUpdated.TryRead(ref reader, options, PropUpdated))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new UpdateApiKeyResponse
+		{
+			Updated = propUpdated.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, UpdateApiKeyResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropUpdated, value.Updated);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(UpdateApiKeyResponseConverter))]
 public sealed partial class UpdateApiKeyResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -34,6 +71,5 @@ public sealed partial class UpdateApiKeyResponse : ElasticsearchResponse
 	/// If <c>false</c>, the API key didn’t change because no change was detected.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("updated")]
 	public bool Updated { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/UpdateCrossClusterApiKeyResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/UpdateCrossClusterApiKeyResponse.g.cs
index d884f62166e..1cc5ab29639 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/UpdateCrossClusterApiKeyResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/UpdateCrossClusterApiKeyResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Security;
 
+internal sealed partial class UpdateCrossClusterApiKeyResponseConverter : System.Text.Json.Serialization.JsonConverter<UpdateCrossClusterApiKeyResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropUpdated = System.Text.Json.JsonEncodedText.Encode("updated");
+
+	public override UpdateCrossClusterApiKeyResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propUpdated = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propUpdated.TryRead(ref reader, options, PropUpdated))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new UpdateCrossClusterApiKeyResponse
+		{
+			Updated = propUpdated.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, UpdateCrossClusterApiKeyResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropUpdated, value.Updated);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(UpdateCrossClusterApiKeyResponseConverter))]
 public sealed partial class UpdateCrossClusterApiKeyResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -34,6 +71,5 @@ public sealed partial class UpdateCrossClusterApiKeyResponse : ElasticsearchResp
 	/// If <c>false</c>, the API key didn’t change because no change was detected.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("updated")]
 	public bool Updated { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/UpdateUserProfileDataResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/UpdateUserProfileDataResponse.g.cs
index 1d47f41e31d..eded57570e1 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/UpdateUserProfileDataResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/UpdateUserProfileDataResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Security;
 
+internal sealed partial class UpdateUserProfileDataResponseConverter : System.Text.Json.Serialization.JsonConverter<UpdateUserProfileDataResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override UpdateUserProfileDataResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new UpdateUserProfileDataResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, UpdateUserProfileDataResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(UpdateUserProfileDataResponseConverter))]
 public sealed partial class UpdateUserProfileDataResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class UpdateUserProfileDataResponse : ElasticsearchRespons
 	/// 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/Simulate/IngestResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Simulate/IngestResponse.g.cs
index 9f9c91e696c..3ca31bff925 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Simulate/IngestResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Simulate/IngestResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Simulate;
 
+internal sealed partial class IngestResponseConverter : System.Text.Json.Serialization.JsonConverter<IngestResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropDocs = System.Text.Json.JsonEncodedText.Encode("docs");
+
+	public override IngestResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Ingest.SimulateDocumentResult>> propDocs = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propDocs.TryRead(ref reader, options, PropDocs))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new IngestResponse
+		{
+			Docs = propDocs.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IngestResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDocs, value.Docs);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(IngestResponseConverter))]
 public sealed partial class IngestResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("docs")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Ingest.SimulateDocumentResult> Docs { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/CleanupRepositoryResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/CleanupRepositoryResponse.g.cs
index 7a5a0dd0e26..f030b2a351b 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/CleanupRepositoryResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/CleanupRepositoryResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Snapshot;
 
+internal sealed partial class CleanupRepositoryResponseConverter : System.Text.Json.Serialization.JsonConverter<CleanupRepositoryResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropResults = System.Text.Json.JsonEncodedText.Encode("results");
+
+	public override CleanupRepositoryResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Snapshot.CleanupRepositoryResults> propResults = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propResults.TryRead(ref reader, options, PropResults))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new CleanupRepositoryResponse
+		{
+			Results = propResults.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, CleanupRepositoryResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropResults, value.Results);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(CleanupRepositoryResponseConverter))]
 public sealed partial class CleanupRepositoryResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class CleanupRepositoryResponse : ElasticsearchResponse
 	/// Statistics for cleanup operations.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("results")]
 	public Elastic.Clients.Elasticsearch.Snapshot.CleanupRepositoryResults Results { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/CloneSnapshotResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/CloneSnapshotResponse.g.cs
index 28a6abe2a04..2e8fb24124a 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/CloneSnapshotResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/CloneSnapshotResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Snapshot;
 
+internal sealed partial class CloneSnapshotResponseConverter : System.Text.Json.Serialization.JsonConverter<CloneSnapshotResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override CloneSnapshotResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new CloneSnapshotResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, CloneSnapshotResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(CloneSnapshotResponseConverter))]
 public sealed partial class CloneSnapshotResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class CloneSnapshotResponse : ElasticsearchResponse
 	/// 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/Snapshot/CreateRepositoryRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/CreateRepositoryRequest.g.cs
index 469dd8a41a8..2b44ee08575 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/CreateRepositoryRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/CreateRepositoryRequest.g.cs
@@ -72,7 +72,7 @@ public sealed partial class CreateRepositoryRequestParameters : RequestParameter
 /// If both parameters are specified, only the query parameter is used.
 /// </para>
 /// </summary>
-public sealed partial class CreateRepositoryRequest : PlainRequest<CreateRepositoryRequestParameters>, ISelfSerializable
+public sealed partial class CreateRepositoryRequest : PlainRequest<CreateRepositoryRequestParameters>, ISelfTwoWaySerializable
 {
 	public CreateRepositoryRequest(Elastic.Clients.Elasticsearch.Name name) : base(r => r.Required("repository", name))
 	{
@@ -115,13 +115,17 @@ public CreateRepositoryRequest(Elastic.Clients.Elasticsearch.Name name) : base(r
 	/// </summary>
 	[JsonIgnore]
 	public bool? Verify { get => Q<bool?>("verify"); set => Q("verify", value); }
-	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Snapshot.IRepository Repository { get; set; }
 
-	void ISelfSerializable.Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
+	void ISelfTwoWaySerializable.Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 	{
 		JsonSerializer.Serialize(writer, Repository, options);
 	}
+
+	void ISelfTwoWaySerializable.Deserialize(ref Utf8JsonReader reader, JsonSerializerOptions options, IElasticsearchClientSettings settings)
+	{
+		Repository = settings.RequestResponseSerializer.Deserialize<Elastic.Clients.Elasticsearch.Snapshot.IRepository>(ref reader);
+	}
 }
 
 /// <summary>
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/CreateRepositoryResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/CreateRepositoryResponse.g.cs
index cfe979a738f..1b9cc37837d 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/CreateRepositoryResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/CreateRepositoryResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Snapshot;
 
+internal sealed partial class CreateRepositoryResponseConverter : System.Text.Json.Serialization.JsonConverter<CreateRepositoryResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override CreateRepositoryResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new CreateRepositoryResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, CreateRepositoryResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(CreateRepositoryResponseConverter))]
 public sealed partial class CreateRepositoryResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class CreateRepositoryResponse : ElasticsearchResponse
 	/// 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/Snapshot/CreateSnapshotRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/CreateSnapshotRequest.g.cs
index 8bd26c7c0bc..22cd5560469 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/CreateSnapshotRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/CreateSnapshotRequest.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport;
@@ -49,12 +50,106 @@ public sealed partial class CreateSnapshotRequestParameters : RequestParameters
 	public bool? WaitForCompletion { get => Q<bool?>("wait_for_completion"); set => Q("wait_for_completion", value); }
 }
 
+internal sealed partial class CreateSnapshotRequestConverter : System.Text.Json.Serialization.JsonConverter<CreateSnapshotRequest>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropExpandWildcards = System.Text.Json.JsonEncodedText.Encode("expand_wildcards");
+	private static readonly System.Text.Json.JsonEncodedText PropFeatureStates = System.Text.Json.JsonEncodedText.Encode("feature_states");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreUnavailable = System.Text.Json.JsonEncodedText.Encode("ignore_unavailable");
+	private static readonly System.Text.Json.JsonEncodedText PropIncludeGlobalState = System.Text.Json.JsonEncodedText.Encode("include_global_state");
+	private static readonly System.Text.Json.JsonEncodedText PropIndices = System.Text.Json.JsonEncodedText.Encode("indices");
+	private static readonly System.Text.Json.JsonEncodedText PropMetadata = System.Text.Json.JsonEncodedText.Encode("metadata");
+	private static readonly System.Text.Json.JsonEncodedText PropPartial = System.Text.Json.JsonEncodedText.Encode("partial");
+
+	public override CreateSnapshotRequest Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>?> propExpandWildcards = default;
+		LocalJsonProperty<ICollection<string>?> propFeatureStates = default;
+		LocalJsonProperty<bool?> propIgnoreUnavailable = default;
+		LocalJsonProperty<bool?> propIncludeGlobalState = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Indices?> propIndices = default;
+		LocalJsonProperty<IDictionary<string, object>?> propMetadata = default;
+		LocalJsonProperty<bool?> propPartial = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propExpandWildcards.TryRead(ref reader, options, PropExpandWildcards, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.ExpandWildcard>?, Elastic.Clients.Elasticsearch.ExpandWildcard>)))
+			{
+				continue;
+			}
+
+			if (propFeatureStates.TryRead(ref reader, options, PropFeatureStates))
+			{
+				continue;
+			}
+
+			if (propIgnoreUnavailable.TryRead(ref reader, options, PropIgnoreUnavailable))
+			{
+				continue;
+			}
+
+			if (propIncludeGlobalState.TryRead(ref reader, options, PropIncludeGlobalState))
+			{
+				continue;
+			}
+
+			if (propIndices.TryRead(ref reader, options, PropIndices))
+			{
+				continue;
+			}
+
+			if (propMetadata.TryRead(ref reader, options, PropMetadata))
+			{
+				continue;
+			}
+
+			if (propPartial.TryRead(ref reader, options, PropPartial))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new CreateSnapshotRequest
+		{
+			ExpandWildcards = propExpandWildcards.Value
+	,
+			FeatureStates = propFeatureStates.Value
+	,
+			IgnoreUnavailable = propIgnoreUnavailable.Value
+	,
+			IncludeGlobalState = propIncludeGlobalState.Value
+	,
+			Indices = propIndices.Value
+	,
+			Metadata = propMetadata.Value
+	,
+			Partial = propPartial.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, CreateSnapshotRequest value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropExpandWildcards, value.ExpandWildcards, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.ExpandWildcard>?, Elastic.Clients.Elasticsearch.ExpandWildcard>));
+		writer.WriteProperty(options, PropFeatureStates, value.FeatureStates);
+		writer.WriteProperty(options, PropIgnoreUnavailable, value.IgnoreUnavailable);
+		writer.WriteProperty(options, PropIncludeGlobalState, value.IncludeGlobalState);
+		writer.WriteProperty(options, PropIndices, value.Indices);
+		writer.WriteProperty(options, PropMetadata, value.Metadata);
+		writer.WriteProperty(options, PropPartial, value.Partial);
+		writer.WriteEndObject();
+	}
+}
+
 /// <summary>
 /// <para>
 /// Create a snapshot.
 /// Take a snapshot of a cluster or of data streams and indices.
 /// </para>
 /// </summary>
+[JsonConverter(typeof(CreateSnapshotRequestConverter))]
 public sealed partial class CreateSnapshotRequest : PlainRequest<CreateSnapshotRequestParameters>
 {
 	public CreateSnapshotRequest(Elastic.Clients.Elasticsearch.Name repository, Elastic.Clients.Elasticsearch.Name snapshot) : base(r => r.Required("repository", repository).Required("snapshot", snapshot))
@@ -75,7 +170,6 @@ public CreateSnapshotRequest(Elastic.Clients.Elasticsearch.Name repository, Elas
 	/// 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>
@@ -84,7 +178,6 @@ public CreateSnapshotRequest(Elastic.Clients.Elasticsearch.Name repository, Elas
 	/// If <c>false</c>, the request returns a response when the snapshot initializes.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public bool? WaitForCompletion { get => Q<bool?>("wait_for_completion"); set => Q("wait_for_completion", value); }
 
 	/// <summary>
@@ -93,8 +186,6 @@ public CreateSnapshotRequest(Elastic.Clients.Elasticsearch.Name repository, Elas
 	/// It supports comma-separated values such as <c>open,hidden</c>.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("expand_wildcards")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.ExpandWildcard))]
 	public ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? ExpandWildcards { get; set; }
 
 	/// <summary>
@@ -112,7 +203,6 @@ public CreateSnapshotRequest(Elastic.Clients.Elasticsearch.Name repository, Elas
 	/// To exclude all feature states, regardless of the <c>include_global_state</c> value, specify an array with only the value <c>none</c> (<c>["none"]</c>).
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("feature_states")]
 	public ICollection<string>? FeatureStates { get; set; }
 
 	/// <summary>
@@ -121,7 +211,6 @@ public CreateSnapshotRequest(Elastic.Clients.Elasticsearch.Name repository, Elas
 	/// If <c>false</c>, the request returns an error for any data stream or index that is missing or closed.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("ignore_unavailable")]
 	public bool? IgnoreUnavailable { get; set; }
 
 	/// <summary>
@@ -131,7 +220,6 @@ public CreateSnapshotRequest(Elastic.Clients.Elasticsearch.Name repository, Elas
 	/// It also includes data stored in system indices, such as Watches and task records (configurable via <c>feature_states</c>).
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("include_global_state")]
 	public bool? IncludeGlobalState { get; set; }
 
 	/// <summary>
@@ -146,7 +234,6 @@ public CreateSnapshotRequest(Elastic.Clients.Elasticsearch.Name repository, Elas
 	/// Use <c>feature_states</c> instead.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("indices")]
 	public Elastic.Clients.Elasticsearch.Indices? Indices { get; set; }
 
 	/// <summary>
@@ -156,7 +243,6 @@ public CreateSnapshotRequest(Elastic.Clients.Elasticsearch.Name repository, Elas
 	/// This information is not automatically generated by Elasticsearch.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("metadata")]
 	public IDictionary<string, object>? Metadata { get; set; }
 
 	/// <summary>
@@ -169,7 +255,6 @@ public CreateSnapshotRequest(Elastic.Clients.Elasticsearch.Name repository, Elas
 	/// If <c>false</c>, the entire restore operation will fail if one or more indices included in the snapshot do not have all primary shards available.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("partial")]
 	public bool? Partial { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/CreateSnapshotResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/CreateSnapshotResponse.g.cs
index 3afcb6e1a68..02c4244617c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/CreateSnapshotResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/CreateSnapshotResponse.g.cs
@@ -18,14 +18,61 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Snapshot;
 
+internal sealed partial class CreateSnapshotResponseConverter : System.Text.Json.Serialization.JsonConverter<CreateSnapshotResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAccepted = System.Text.Json.JsonEncodedText.Encode("accepted");
+	private static readonly System.Text.Json.JsonEncodedText PropSnapshot = System.Text.Json.JsonEncodedText.Encode("snapshot");
+
+	public override CreateSnapshotResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool?> propAccepted = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Snapshot.SnapshotInfo?> propSnapshot = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAccepted.TryRead(ref reader, options, PropAccepted))
+			{
+				continue;
+			}
+
+			if (propSnapshot.TryRead(ref reader, options, PropSnapshot))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new CreateSnapshotResponse
+		{
+			Accepted = propAccepted.Value
+,
+			Snapshot = propSnapshot.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, CreateSnapshotResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAccepted, value.Accepted);
+		writer.WriteProperty(options, PropSnapshot, value.Snapshot);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(CreateSnapshotResponseConverter))]
 public sealed partial class CreateSnapshotResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,7 +80,6 @@ public sealed partial class CreateSnapshotResponse : ElasticsearchResponse
 	/// Equals <c>true</c> if the snapshot was accepted. Present when the request had <c>wait_for_completion</c> set to <c>false</c>
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("accepted")]
 	public bool? Accepted { get; init; }
 
 	/// <summary>
@@ -41,6 +87,5 @@ public sealed partial class CreateSnapshotResponse : ElasticsearchResponse
 	/// Snapshot information. Present when the request had <c>wait_for_completion</c> set to <c>true</c>
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("snapshot")]
 	public Elastic.Clients.Elasticsearch.Snapshot.SnapshotInfo? Snapshot { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/DeleteRepositoryResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/DeleteRepositoryResponse.g.cs
index 0c043369220..6a6f46b7604 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/DeleteRepositoryResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/DeleteRepositoryResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Snapshot;
 
+internal sealed partial class DeleteRepositoryResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteRepositoryResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override DeleteRepositoryResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteRepositoryResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteRepositoryResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteRepositoryResponseConverter))]
 public sealed partial class DeleteRepositoryResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class DeleteRepositoryResponse : ElasticsearchResponse
 	/// 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/Snapshot/DeleteSnapshotResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/DeleteSnapshotResponse.g.cs
index e1a69227318..7821c213e56 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/DeleteSnapshotResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/DeleteSnapshotResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Snapshot;
 
+internal sealed partial class DeleteSnapshotResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteSnapshotResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override DeleteSnapshotResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteSnapshotResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteSnapshotResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteSnapshotResponseConverter))]
 public sealed partial class DeleteSnapshotResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class DeleteSnapshotResponse : ElasticsearchResponse
 	/// 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/Snapshot/GetSnapshotResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/GetSnapshotResponse.g.cs
index f4efbdcf5eb..2e774f51705 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/GetSnapshotResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/GetSnapshotResponse.g.cs
@@ -18,14 +18,91 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Snapshot;
 
+internal sealed partial class GetSnapshotResponseConverter : System.Text.Json.Serialization.JsonConverter<GetSnapshotResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropNext = System.Text.Json.JsonEncodedText.Encode("next");
+	private static readonly System.Text.Json.JsonEncodedText PropRemaining = System.Text.Json.JsonEncodedText.Encode("remaining");
+	private static readonly System.Text.Json.JsonEncodedText PropResponses = System.Text.Json.JsonEncodedText.Encode("responses");
+	private static readonly System.Text.Json.JsonEncodedText PropSnapshots = System.Text.Json.JsonEncodedText.Encode("snapshots");
+	private static readonly System.Text.Json.JsonEncodedText PropTotal = System.Text.Json.JsonEncodedText.Encode("total");
+
+	public override GetSnapshotResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string?> propNext = default;
+		LocalJsonProperty<int> propRemaining = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Snapshot.SnapshotResponseItem>?> propResponses = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Snapshot.SnapshotInfo>?> propSnapshots = default;
+		LocalJsonProperty<int> propTotal = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propNext.TryRead(ref reader, options, PropNext))
+			{
+				continue;
+			}
+
+			if (propRemaining.TryRead(ref reader, options, PropRemaining))
+			{
+				continue;
+			}
+
+			if (propResponses.TryRead(ref reader, options, PropResponses))
+			{
+				continue;
+			}
+
+			if (propSnapshots.TryRead(ref reader, options, PropSnapshots))
+			{
+				continue;
+			}
+
+			if (propTotal.TryRead(ref reader, options, PropTotal))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetSnapshotResponse
+		{
+			Next = propNext.Value
+,
+			Remaining = propRemaining.Value
+,
+			Responses = propResponses.Value
+,
+			Snapshots = propSnapshots.Value
+,
+			Total = propTotal.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetSnapshotResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropNext, value.Next);
+		writer.WriteProperty(options, PropRemaining, value.Remaining);
+		writer.WriteProperty(options, PropResponses, value.Responses);
+		writer.WriteProperty(options, PropSnapshots, value.Snapshots);
+		writer.WriteProperty(options, PropTotal, value.Total);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetSnapshotResponseConverter))]
 public sealed partial class GetSnapshotResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -34,7 +111,6 @@ public sealed partial class GetSnapshotResponse : ElasticsearchResponse
 	/// It can be used as the <c>after</c> query parameter to fetch additional results.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("next")]
 	public string? Next { get; init; }
 
 	/// <summary>
@@ -42,11 +118,8 @@ public sealed partial class GetSnapshotResponse : ElasticsearchResponse
 	/// The number of remaining snapshots that were not returned due to size limits and that can be fetched by additional requests using the <c>next</c> field value.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("remaining")]
 	public int Remaining { get; init; }
-	[JsonInclude, JsonPropertyName("responses")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Snapshot.SnapshotResponseItem>? Responses { get; init; }
-	[JsonInclude, JsonPropertyName("snapshots")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Snapshot.SnapshotInfo>? Snapshots { get; init; }
 
 	/// <summary>
@@ -54,6 +127,5 @@ public sealed partial class GetSnapshotResponse : ElasticsearchResponse
 	/// The total number of snapshots that match the request when ignoring the size limit or <c>after</c> query parameter.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("total")]
 	public int Total { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/RestoreResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/RestoreResponse.g.cs
index 1bf5db7079d..8a46b6b90c9 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/RestoreResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/RestoreResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Snapshot;
 
+internal sealed partial class RestoreResponseConverter : System.Text.Json.Serialization.JsonConverter<RestoreResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAccepted = System.Text.Json.JsonEncodedText.Encode("accepted");
+	private static readonly System.Text.Json.JsonEncodedText PropSnapshot = System.Text.Json.JsonEncodedText.Encode("snapshot");
+
+	public override RestoreResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool?> propAccepted = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Snapshot.SnapshotRestore?> propSnapshot = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAccepted.TryRead(ref reader, options, PropAccepted))
+			{
+				continue;
+			}
+
+			if (propSnapshot.TryRead(ref reader, options, PropSnapshot))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new RestoreResponse
+		{
+			Accepted = propAccepted.Value
+,
+			Snapshot = propSnapshot.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, RestoreResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAccepted, value.Accepted);
+		writer.WriteProperty(options, PropSnapshot, value.Snapshot);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(RestoreResponseConverter))]
 public sealed partial class RestoreResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("accepted")]
 	public bool? Accepted { get; init; }
-	[JsonInclude, JsonPropertyName("snapshot")]
 	public Elastic.Clients.Elasticsearch.Snapshot.SnapshotRestore? Snapshot { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/SnapshotStatusResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/SnapshotStatusResponse.g.cs
index e77aa967106..9f47e9b6864 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/SnapshotStatusResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/SnapshotStatusResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Snapshot;
 
+internal sealed partial class SnapshotStatusResponseConverter : System.Text.Json.Serialization.JsonConverter<SnapshotStatusResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropSnapshots = System.Text.Json.JsonEncodedText.Encode("snapshots");
+
+	public override SnapshotStatusResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Snapshot.Status>> propSnapshots = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propSnapshots.TryRead(ref reader, options, PropSnapshots))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SnapshotStatusResponse
+		{
+			Snapshots = propSnapshots.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SnapshotStatusResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropSnapshots, value.Snapshots);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(SnapshotStatusResponseConverter))]
 public sealed partial class SnapshotStatusResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("snapshots")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Snapshot.Status> Snapshots { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/VerifyRepositoryResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/VerifyRepositoryResponse.g.cs
index 14e937b74cb..cdd1def3867 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/VerifyRepositoryResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/VerifyRepositoryResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Snapshot;
 
+internal sealed partial class VerifyRepositoryResponseConverter : System.Text.Json.Serialization.JsonConverter<VerifyRepositoryResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropNodes = System.Text.Json.JsonEncodedText.Encode("nodes");
+
+	public override VerifyRepositoryResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Snapshot.CompactNodeInfo>> propNodes = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propNodes.TryRead(ref reader, options, PropNodes))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new VerifyRepositoryResponse
+		{
+			Nodes = propNodes.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, VerifyRepositoryResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropNodes, value.Nodes);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(VerifyRepositoryResponseConverter))]
 public sealed partial class VerifyRepositoryResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -34,6 +71,5 @@ public sealed partial class VerifyRepositoryResponse : ElasticsearchResponse
 	/// The key is the ID of the node.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("nodes")]
 	public IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Snapshot.CompactNodeInfo> Nodes { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/SnapshotLifecycleManagement/DeleteLifecycleResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/SnapshotLifecycleManagement/DeleteLifecycleResponse.g.cs
index ca9286d517a..06f9068ce34 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/SnapshotLifecycleManagement/DeleteLifecycleResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/SnapshotLifecycleManagement/DeleteLifecycleResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.SnapshotLifecycleManagement;
 
+internal sealed partial class DeleteLifecycleResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteLifecycleResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override DeleteLifecycleResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteLifecycleResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteLifecycleResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteLifecycleResponseConverter))]
 public sealed partial class DeleteLifecycleResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class DeleteLifecycleResponse : ElasticsearchResponse
 	/// 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/SnapshotLifecycleManagement/ExecuteLifecycleResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/SnapshotLifecycleManagement/ExecuteLifecycleResponse.g.cs
index ef39b567457..0bd152b375a 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/SnapshotLifecycleManagement/ExecuteLifecycleResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/SnapshotLifecycleManagement/ExecuteLifecycleResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.SnapshotLifecycleManagement;
 
+internal sealed partial class ExecuteLifecycleResponseConverter : System.Text.Json.Serialization.JsonConverter<ExecuteLifecycleResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropSnapshotName = System.Text.Json.JsonEncodedText.Encode("snapshot_name");
+
+	public override ExecuteLifecycleResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propSnapshotName = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propSnapshotName.TryRead(ref reader, options, PropSnapshotName))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ExecuteLifecycleResponse
+		{
+			SnapshotName = propSnapshotName.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ExecuteLifecycleResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropSnapshotName, value.SnapshotName);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ExecuteLifecycleResponseConverter))]
 public sealed partial class ExecuteLifecycleResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("snapshot_name")]
 	public string SnapshotName { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/SnapshotLifecycleManagement/ExecuteRetentionResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/SnapshotLifecycleManagement/ExecuteRetentionResponse.g.cs
index 42e6e3e5727..66ae532cfc3 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/SnapshotLifecycleManagement/ExecuteRetentionResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/SnapshotLifecycleManagement/ExecuteRetentionResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.SnapshotLifecycleManagement;
 
+internal sealed partial class ExecuteRetentionResponseConverter : System.Text.Json.Serialization.JsonConverter<ExecuteRetentionResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override ExecuteRetentionResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ExecuteRetentionResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ExecuteRetentionResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ExecuteRetentionResponseConverter))]
 public sealed partial class ExecuteRetentionResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class ExecuteRetentionResponse : ElasticsearchResponse
 	/// 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/SnapshotLifecycleManagement/GetSlmStatusResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/SnapshotLifecycleManagement/GetSlmStatusResponse.g.cs
index c2cc6418284..138d70dd726 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/SnapshotLifecycleManagement/GetSlmStatusResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/SnapshotLifecycleManagement/GetSlmStatusResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.SnapshotLifecycleManagement;
 
+internal sealed partial class GetSlmStatusResponseConverter : System.Text.Json.Serialization.JsonConverter<GetSlmStatusResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropOperationMode = System.Text.Json.JsonEncodedText.Encode("operation_mode");
+
+	public override GetSlmStatusResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.LifecycleOperationMode> propOperationMode = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propOperationMode.TryRead(ref reader, options, PropOperationMode))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetSlmStatusResponse
+		{
+			OperationMode = propOperationMode.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetSlmStatusResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropOperationMode, value.OperationMode);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetSlmStatusResponseConverter))]
 public sealed partial class GetSlmStatusResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("operation_mode")]
 	public Elastic.Clients.Elasticsearch.LifecycleOperationMode OperationMode { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/SnapshotLifecycleManagement/GetStatsResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/SnapshotLifecycleManagement/GetStatsResponse.g.cs
index 7174da48a8a..c219dfa4825 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/SnapshotLifecycleManagement/GetStatsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/SnapshotLifecycleManagement/GetStatsResponse.g.cs
@@ -18,34 +18,151 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.SnapshotLifecycleManagement;
 
+internal sealed partial class GetStatsResponseConverter : System.Text.Json.Serialization.JsonConverter<GetStatsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropPolicyStats = System.Text.Json.JsonEncodedText.Encode("policy_stats");
+	private static readonly System.Text.Json.JsonEncodedText PropRetentionDeletionTime = System.Text.Json.JsonEncodedText.Encode("retention_deletion_time");
+	private static readonly System.Text.Json.JsonEncodedText PropRetentionDeletionTimeMillis = System.Text.Json.JsonEncodedText.Encode("retention_deletion_time_millis");
+	private static readonly System.Text.Json.JsonEncodedText PropRetentionFailed = System.Text.Json.JsonEncodedText.Encode("retention_failed");
+	private static readonly System.Text.Json.JsonEncodedText PropRetentionRuns = System.Text.Json.JsonEncodedText.Encode("retention_runs");
+	private static readonly System.Text.Json.JsonEncodedText PropRetentionTimedOut = System.Text.Json.JsonEncodedText.Encode("retention_timed_out");
+	private static readonly System.Text.Json.JsonEncodedText PropTotalSnapshotDeletionFailures = System.Text.Json.JsonEncodedText.Encode("total_snapshot_deletion_failures");
+	private static readonly System.Text.Json.JsonEncodedText PropTotalSnapshotsDeleted = System.Text.Json.JsonEncodedText.Encode("total_snapshots_deleted");
+	private static readonly System.Text.Json.JsonEncodedText PropTotalSnapshotsFailed = System.Text.Json.JsonEncodedText.Encode("total_snapshots_failed");
+	private static readonly System.Text.Json.JsonEncodedText PropTotalSnapshotsTaken = System.Text.Json.JsonEncodedText.Encode("total_snapshots_taken");
+
+	public override GetStatsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<string>> propPolicyStats = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Duration> propRetentionDeletionTime = default;
+		LocalJsonProperty<long> propRetentionDeletionTimeMillis = default;
+		LocalJsonProperty<long> propRetentionFailed = default;
+		LocalJsonProperty<long> propRetentionRuns = default;
+		LocalJsonProperty<long> propRetentionTimedOut = default;
+		LocalJsonProperty<long> propTotalSnapshotDeletionFailures = default;
+		LocalJsonProperty<long> propTotalSnapshotsDeleted = default;
+		LocalJsonProperty<long> propTotalSnapshotsFailed = default;
+		LocalJsonProperty<long> propTotalSnapshotsTaken = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propPolicyStats.TryRead(ref reader, options, PropPolicyStats))
+			{
+				continue;
+			}
+
+			if (propRetentionDeletionTime.TryRead(ref reader, options, PropRetentionDeletionTime))
+			{
+				continue;
+			}
+
+			if (propRetentionDeletionTimeMillis.TryRead(ref reader, options, PropRetentionDeletionTimeMillis))
+			{
+				continue;
+			}
+
+			if (propRetentionFailed.TryRead(ref reader, options, PropRetentionFailed))
+			{
+				continue;
+			}
+
+			if (propRetentionRuns.TryRead(ref reader, options, PropRetentionRuns))
+			{
+				continue;
+			}
+
+			if (propRetentionTimedOut.TryRead(ref reader, options, PropRetentionTimedOut))
+			{
+				continue;
+			}
+
+			if (propTotalSnapshotDeletionFailures.TryRead(ref reader, options, PropTotalSnapshotDeletionFailures))
+			{
+				continue;
+			}
+
+			if (propTotalSnapshotsDeleted.TryRead(ref reader, options, PropTotalSnapshotsDeleted))
+			{
+				continue;
+			}
+
+			if (propTotalSnapshotsFailed.TryRead(ref reader, options, PropTotalSnapshotsFailed))
+			{
+				continue;
+			}
+
+			if (propTotalSnapshotsTaken.TryRead(ref reader, options, PropTotalSnapshotsTaken))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetStatsResponse
+		{
+			PolicyStats = propPolicyStats.Value
+,
+			RetentionDeletionTime = propRetentionDeletionTime.Value
+,
+			RetentionDeletionTimeMillis = propRetentionDeletionTimeMillis.Value
+,
+			RetentionFailed = propRetentionFailed.Value
+,
+			RetentionRuns = propRetentionRuns.Value
+,
+			RetentionTimedOut = propRetentionTimedOut.Value
+,
+			TotalSnapshotDeletionFailures = propTotalSnapshotDeletionFailures.Value
+,
+			TotalSnapshotsDeleted = propTotalSnapshotsDeleted.Value
+,
+			TotalSnapshotsFailed = propTotalSnapshotsFailed.Value
+,
+			TotalSnapshotsTaken = propTotalSnapshotsTaken.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetStatsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropPolicyStats, value.PolicyStats);
+		writer.WriteProperty(options, PropRetentionDeletionTime, value.RetentionDeletionTime);
+		writer.WriteProperty(options, PropRetentionDeletionTimeMillis, value.RetentionDeletionTimeMillis);
+		writer.WriteProperty(options, PropRetentionFailed, value.RetentionFailed);
+		writer.WriteProperty(options, PropRetentionRuns, value.RetentionRuns);
+		writer.WriteProperty(options, PropRetentionTimedOut, value.RetentionTimedOut);
+		writer.WriteProperty(options, PropTotalSnapshotDeletionFailures, value.TotalSnapshotDeletionFailures);
+		writer.WriteProperty(options, PropTotalSnapshotsDeleted, value.TotalSnapshotsDeleted);
+		writer.WriteProperty(options, PropTotalSnapshotsFailed, value.TotalSnapshotsFailed);
+		writer.WriteProperty(options, PropTotalSnapshotsTaken, value.TotalSnapshotsTaken);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetStatsResponseConverter))]
 public sealed partial class GetStatsResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("policy_stats")]
 	public IReadOnlyCollection<string> PolicyStats { get; init; }
-	[JsonInclude, JsonPropertyName("retention_deletion_time")]
 	public Elastic.Clients.Elasticsearch.Duration RetentionDeletionTime { get; init; }
-	[JsonInclude, JsonPropertyName("retention_deletion_time_millis")]
 	public long RetentionDeletionTimeMillis { get; init; }
-	[JsonInclude, JsonPropertyName("retention_failed")]
 	public long RetentionFailed { get; init; }
-	[JsonInclude, JsonPropertyName("retention_runs")]
 	public long RetentionRuns { get; init; }
-	[JsonInclude, JsonPropertyName("retention_timed_out")]
 	public long RetentionTimedOut { get; init; }
-	[JsonInclude, JsonPropertyName("total_snapshot_deletion_failures")]
 	public long TotalSnapshotDeletionFailures { get; init; }
-	[JsonInclude, JsonPropertyName("total_snapshots_deleted")]
 	public long TotalSnapshotsDeleted { get; init; }
-	[JsonInclude, JsonPropertyName("total_snapshots_failed")]
 	public long TotalSnapshotsFailed { get; init; }
-	[JsonInclude, JsonPropertyName("total_snapshots_taken")]
 	public long TotalSnapshotsTaken { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/SnapshotLifecycleManagement/PutLifecycleResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/SnapshotLifecycleManagement/PutLifecycleResponse.g.cs
index e9eaecf826f..2f0948a52b9 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/SnapshotLifecycleManagement/PutLifecycleResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/SnapshotLifecycleManagement/PutLifecycleResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.SnapshotLifecycleManagement;
 
+internal sealed partial class PutLifecycleResponseConverter : System.Text.Json.Serialization.JsonConverter<PutLifecycleResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override PutLifecycleResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutLifecycleResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutLifecycleResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PutLifecycleResponseConverter))]
 public sealed partial class PutLifecycleResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class PutLifecycleResponse : ElasticsearchResponse
 	/// 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/SnapshotLifecycleManagement/StartSlmResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/SnapshotLifecycleManagement/StartSlmResponse.g.cs
index 8ebc963e7ac..84fb27570c8 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/SnapshotLifecycleManagement/StartSlmResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/SnapshotLifecycleManagement/StartSlmResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.SnapshotLifecycleManagement;
 
+internal sealed partial class StartSlmResponseConverter : System.Text.Json.Serialization.JsonConverter<StartSlmResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override StartSlmResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new StartSlmResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, StartSlmResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(StartSlmResponseConverter))]
 public sealed partial class StartSlmResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class StartSlmResponse : ElasticsearchResponse
 	/// 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/SnapshotLifecycleManagement/StopSlmResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/SnapshotLifecycleManagement/StopSlmResponse.g.cs
index c7f3fd2cc66..0b0d4b83f88 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/SnapshotLifecycleManagement/StopSlmResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/SnapshotLifecycleManagement/StopSlmResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.SnapshotLifecycleManagement;
 
+internal sealed partial class StopSlmResponseConverter : System.Text.Json.Serialization.JsonConverter<StopSlmResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override StopSlmResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new StopSlmResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, StopSlmResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(StopSlmResponseConverter))]
 public sealed partial class StopSlmResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class StopSlmResponse : ElasticsearchResponse
 	/// 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/ClearCursorResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/ClearCursorResponse.g.cs
index a57592eeeb5..aaf817b1050 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/ClearCursorResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/ClearCursorResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Sql;
 
+internal sealed partial class ClearCursorResponseConverter : System.Text.Json.Serialization.JsonConverter<ClearCursorResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropSucceeded = System.Text.Json.JsonEncodedText.Encode("succeeded");
+
+	public override ClearCursorResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propSucceeded = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propSucceeded.TryRead(ref reader, options, PropSucceeded))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ClearCursorResponse
+		{
+			Succeeded = propSucceeded.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ClearCursorResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropSucceeded, value.Succeeded);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ClearCursorResponseConverter))]
 public sealed partial class ClearCursorResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("succeeded")]
 	public bool Succeeded { get; init; }
 }
\ No newline at end of file
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 29fa3e3e14d..d8841a4137f 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/DeleteAsyncResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/DeleteAsyncResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Sql;
 
+internal sealed partial class DeleteAsyncResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteAsyncResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override DeleteAsyncResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteAsyncResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteAsyncResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteAsyncResponseConverter))]
 public sealed partial class DeleteAsyncResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class DeleteAsyncResponse : ElasticsearchResponse
 	/// 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/GetAsyncResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/GetAsyncResponse.g.cs
index 9762bd7bd96..0026dd8fd86 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/GetAsyncResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/GetAsyncResponse.g.cs
@@ -18,14 +18,91 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Sql;
 
+internal sealed partial class GetAsyncResponseConverter : System.Text.Json.Serialization.JsonConverter<GetAsyncResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropColumns = System.Text.Json.JsonEncodedText.Encode("columns");
+	private static readonly System.Text.Json.JsonEncodedText PropCursor = System.Text.Json.JsonEncodedText.Encode("cursor");
+	private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("id");
+	private static readonly System.Text.Json.JsonEncodedText PropIsPartial = System.Text.Json.JsonEncodedText.Encode("is_partial");
+	private static readonly System.Text.Json.JsonEncodedText PropIsRunning = System.Text.Json.JsonEncodedText.Encode("is_running");
+
+	public override GetAsyncResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Sql.Column>?> propColumns = default;
+		LocalJsonProperty<string?> propCursor = default;
+		LocalJsonProperty<string> propId = default;
+		LocalJsonProperty<bool> propIsPartial = default;
+		LocalJsonProperty<bool> propIsRunning = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propColumns.TryRead(ref reader, options, PropColumns))
+			{
+				continue;
+			}
+
+			if (propCursor.TryRead(ref reader, options, PropCursor))
+			{
+				continue;
+			}
+
+			if (propId.TryRead(ref reader, options, PropId))
+			{
+				continue;
+			}
+
+			if (propIsPartial.TryRead(ref reader, options, PropIsPartial))
+			{
+				continue;
+			}
+
+			if (propIsRunning.TryRead(ref reader, options, PropIsRunning))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetAsyncResponse
+		{
+			Columns = propColumns.Value
+,
+			Cursor = propCursor.Value
+,
+			Id = propId.Value
+,
+			IsPartial = propIsPartial.Value
+,
+			IsRunning = propIsRunning.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetAsyncResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropColumns, value.Columns);
+		writer.WriteProperty(options, PropCursor, value.Cursor);
+		writer.WriteProperty(options, PropId, value.Id);
+		writer.WriteProperty(options, PropIsPartial, value.IsPartial);
+		writer.WriteProperty(options, PropIsRunning, value.IsRunning);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetAsyncResponseConverter))]
 public sealed partial class GetAsyncResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,7 +110,6 @@ public sealed partial class GetAsyncResponse : ElasticsearchResponse
 	/// 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>
@@ -42,7 +118,6 @@ public sealed partial class GetAsyncResponse : ElasticsearchResponse
 	/// TXT responses, this value is returned in the <c>Cursor</c> HTTP header.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("cursor")]
 	public string? Cursor { get; init; }
 
 	/// <summary>
@@ -52,7 +127,6 @@ public sealed partial class GetAsyncResponse : ElasticsearchResponse
 	/// in the <c>Async-ID</c> HTTP header.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("id")]
 	public string Id { get; init; }
 
 	/// <summary>
@@ -64,7 +138,6 @@ public sealed partial class GetAsyncResponse : ElasticsearchResponse
 	/// For CSV, TSV, and TXT responses, this value is returned in the <c>Async-partial</c> HTTP header.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("is_partial")]
 	public bool IsPartial { get; init; }
 
 	/// <summary>
@@ -75,6 +148,5 @@ public sealed partial class GetAsyncResponse : ElasticsearchResponse
 	/// 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/GetAsyncStatusResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/GetAsyncStatusResponse.g.cs
index 8dd9a09e22b..e1bfa46f14d 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/GetAsyncStatusResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/GetAsyncStatusResponse.g.cs
@@ -18,14 +18,101 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Sql;
 
+internal sealed partial class GetAsyncStatusResponseConverter : System.Text.Json.Serialization.JsonConverter<GetAsyncStatusResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCompletionStatus = System.Text.Json.JsonEncodedText.Encode("completion_status");
+	private static readonly System.Text.Json.JsonEncodedText PropExpirationTimeInMillis = System.Text.Json.JsonEncodedText.Encode("expiration_time_in_millis");
+	private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("id");
+	private static readonly System.Text.Json.JsonEncodedText PropIsPartial = System.Text.Json.JsonEncodedText.Encode("is_partial");
+	private static readonly System.Text.Json.JsonEncodedText PropIsRunning = System.Text.Json.JsonEncodedText.Encode("is_running");
+	private static readonly System.Text.Json.JsonEncodedText PropStartTimeInMillis = System.Text.Json.JsonEncodedText.Encode("start_time_in_millis");
+
+	public override GetAsyncStatusResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<int?> propCompletionStatus = default;
+		LocalJsonProperty<long> propExpirationTimeInMillis = default;
+		LocalJsonProperty<string> propId = default;
+		LocalJsonProperty<bool> propIsPartial = default;
+		LocalJsonProperty<bool> propIsRunning = default;
+		LocalJsonProperty<long> propStartTimeInMillis = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCompletionStatus.TryRead(ref reader, options, PropCompletionStatus))
+			{
+				continue;
+			}
+
+			if (propExpirationTimeInMillis.TryRead(ref reader, options, PropExpirationTimeInMillis))
+			{
+				continue;
+			}
+
+			if (propId.TryRead(ref reader, options, PropId))
+			{
+				continue;
+			}
+
+			if (propIsPartial.TryRead(ref reader, options, PropIsPartial))
+			{
+				continue;
+			}
+
+			if (propIsRunning.TryRead(ref reader, options, PropIsRunning))
+			{
+				continue;
+			}
+
+			if (propStartTimeInMillis.TryRead(ref reader, options, PropStartTimeInMillis))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetAsyncStatusResponse
+		{
+			CompletionStatus = propCompletionStatus.Value
+,
+			ExpirationTimeInMillis = propExpirationTimeInMillis.Value
+,
+			Id = propId.Value
+,
+			IsPartial = propIsPartial.Value
+,
+			IsRunning = propIsRunning.Value
+,
+			StartTimeInMillis = propStartTimeInMillis.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetAsyncStatusResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCompletionStatus, value.CompletionStatus);
+		writer.WriteProperty(options, PropExpirationTimeInMillis, value.ExpirationTimeInMillis);
+		writer.WriteProperty(options, PropId, value.Id);
+		writer.WriteProperty(options, PropIsPartial, value.IsPartial);
+		writer.WriteProperty(options, PropIsRunning, value.IsRunning);
+		writer.WriteProperty(options, PropStartTimeInMillis, value.StartTimeInMillis);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetAsyncStatusResponseConverter))]
 public sealed partial class GetAsyncStatusResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,7 +120,6 @@ public sealed partial class GetAsyncStatusResponse : ElasticsearchResponse
 	/// 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>
@@ -42,7 +128,6 @@ public sealed partial class GetAsyncStatusResponse : ElasticsearchResponse
 	/// 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>
@@ -50,7 +135,6 @@ public sealed partial class GetAsyncStatusResponse : ElasticsearchResponse
 	/// Identifier for the search.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("id")]
 	public string Id { get; init; }
 
 	/// <summary>
@@ -61,7 +145,6 @@ public sealed partial class GetAsyncStatusResponse : ElasticsearchResponse
 	/// timeout.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("is_partial")]
 	public bool IsPartial { get; init; }
 
 	/// <summary>
@@ -69,7 +152,6 @@ public sealed partial class GetAsyncStatusResponse : ElasticsearchResponse
 	/// If <c>true</c>, the search is still running. If <c>false</c>, the search has finished.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("is_running")]
 	public bool IsRunning { get; init; }
 
 	/// <summary>
@@ -78,6 +160,5 @@ public sealed partial class GetAsyncStatusResponse : ElasticsearchResponse
 	/// 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/QueryResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/QueryResponse.g.cs
index 68a8c3c72ca..0777fd42a2c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/QueryResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/QueryResponse.g.cs
@@ -18,14 +18,91 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Sql;
 
+internal sealed partial class QueryResponseConverter : System.Text.Json.Serialization.JsonConverter<QueryResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropColumns = System.Text.Json.JsonEncodedText.Encode("columns");
+	private static readonly System.Text.Json.JsonEncodedText PropCursor = System.Text.Json.JsonEncodedText.Encode("cursor");
+	private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("id");
+	private static readonly System.Text.Json.JsonEncodedText PropIsPartial = System.Text.Json.JsonEncodedText.Encode("is_partial");
+	private static readonly System.Text.Json.JsonEncodedText PropIsRunning = System.Text.Json.JsonEncodedText.Encode("is_running");
+
+	public override QueryResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Sql.Column>?> propColumns = default;
+		LocalJsonProperty<string?> propCursor = default;
+		LocalJsonProperty<string?> propId = default;
+		LocalJsonProperty<bool?> propIsPartial = default;
+		LocalJsonProperty<bool?> propIsRunning = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propColumns.TryRead(ref reader, options, PropColumns))
+			{
+				continue;
+			}
+
+			if (propCursor.TryRead(ref reader, options, PropCursor))
+			{
+				continue;
+			}
+
+			if (propId.TryRead(ref reader, options, PropId))
+			{
+				continue;
+			}
+
+			if (propIsPartial.TryRead(ref reader, options, PropIsPartial))
+			{
+				continue;
+			}
+
+			if (propIsRunning.TryRead(ref reader, options, PropIsRunning))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new QueryResponse
+		{
+			Columns = propColumns.Value
+,
+			Cursor = propCursor.Value
+,
+			Id = propId.Value
+,
+			IsPartial = propIsPartial.Value
+,
+			IsRunning = propIsRunning.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, QueryResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropColumns, value.Columns);
+		writer.WriteProperty(options, PropCursor, value.Cursor);
+		writer.WriteProperty(options, PropId, value.Id);
+		writer.WriteProperty(options, PropIsPartial, value.IsPartial);
+		writer.WriteProperty(options, PropIsRunning, value.IsRunning);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(QueryResponseConverter))]
 public sealed partial class QueryResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,7 +110,6 @@ public sealed partial class QueryResponse : ElasticsearchResponse
 	/// 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>
@@ -42,7 +118,6 @@ public sealed partial class QueryResponse : ElasticsearchResponse
 	/// TXT responses, this value is returned in the <c>Cursor</c> HTTP header.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("cursor")]
 	public string? Cursor { get; init; }
 
 	/// <summary>
@@ -52,7 +127,6 @@ public sealed partial class QueryResponse : ElasticsearchResponse
 	/// in the <c>Async-ID</c> HTTP header.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("id")]
 	public string? Id { get; init; }
 
 	/// <summary>
@@ -64,7 +138,6 @@ public sealed partial class QueryResponse : ElasticsearchResponse
 	/// For CSV, TSV, and TXT responses, this value is returned in the <c>Async-partial</c> HTTP header.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("is_partial")]
 	public bool? IsPartial { get; init; }
 
 	/// <summary>
@@ -75,6 +148,5 @@ public sealed partial class QueryResponse : ElasticsearchResponse
 	/// 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/TranslateResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/TranslateResponse.g.cs
index 583441e33fb..c240b8fdee9 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/TranslateResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/TranslateResponse.g.cs
@@ -18,27 +18,107 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Sql;
 
+internal sealed partial class TranslateResponseConverter : System.Text.Json.Serialization.JsonConverter<TranslateResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropQuery = System.Text.Json.JsonEncodedText.Encode("query");
+	private static readonly System.Text.Json.JsonEncodedText PropSize = System.Text.Json.JsonEncodedText.Encode("size");
+	private static readonly System.Text.Json.JsonEncodedText PropSort = System.Text.Json.JsonEncodedText.Encode("sort");
+	private static readonly System.Text.Json.JsonEncodedText PropSource = System.Text.Json.JsonEncodedText.Encode("_source");
+
+	public override TranslateResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Aggregations.Aggregation>?> propAggregations = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.QueryDsl.FieldAndFormat>?> propFields = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.QueryDsl.Query?> propQuery = default;
+		LocalJsonProperty<long?> propSize = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.SortOptions>?> propSort = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Core.Search.SourceConfig?> propSource = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAggregations.TryRead(ref reader, options, PropAggregations))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propQuery.TryRead(ref reader, options, PropQuery))
+			{
+				continue;
+			}
+
+			if (propSize.TryRead(ref reader, options, PropSize))
+			{
+				continue;
+			}
+
+			if (propSort.TryRead(ref reader, options, PropSort, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.SortOptions>?, Elastic.Clients.Elasticsearch.SortOptions>)))
+			{
+				continue;
+			}
+
+			if (propSource.TryRead(ref reader, options, PropSource))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new TranslateResponse
+		{
+			Aggregations = propAggregations.Value
+,
+			Fields = propFields.Value
+,
+			Query = propQuery.Value
+,
+			Size = propSize.Value
+,
+			Sort = propSort.Value
+,
+			Source = propSource.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, TranslateResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAggregations, value.Aggregations);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropQuery, value.Query);
+		writer.WriteProperty(options, PropSize, value.Size);
+		writer.WriteProperty(options, PropSort, value.Sort, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.SortOptions>?, Elastic.Clients.Elasticsearch.SortOptions>));
+		writer.WriteProperty(options, PropSource, value.Source);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(TranslateResponseConverter))]
 public sealed partial class TranslateResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("aggregations")]
 	public IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Aggregations.Aggregation>? Aggregations { get; init; }
-	[JsonInclude, JsonPropertyName("fields")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.QueryDsl.FieldAndFormat>? Fields { get; init; }
-	[JsonInclude, JsonPropertyName("query")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.Query? Query { get; init; }
-	[JsonInclude, JsonPropertyName("size")]
 	public long? Size { get; init; }
-	[JsonInclude, JsonPropertyName("sort")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.SortOptions))]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.SortOptions>? Sort { get; init; }
-	[JsonInclude, JsonPropertyName("_source")]
 	public Elastic.Clients.Elasticsearch.Core.Search.SourceConfig? Source { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Synonyms/DeleteSynonymResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Synonyms/DeleteSynonymResponse.g.cs
index 484ef271a05..1b16cc26265 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Synonyms/DeleteSynonymResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Synonyms/DeleteSynonymResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Synonyms;
 
+internal sealed partial class DeleteSynonymResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteSynonymResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override DeleteSynonymResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteSynonymResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteSynonymResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteSynonymResponseConverter))]
 public sealed partial class DeleteSynonymResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class DeleteSynonymResponse : ElasticsearchResponse
 	/// 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/Synonyms/DeleteSynonymRuleResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Synonyms/DeleteSynonymRuleResponse.g.cs
index 7a128cafa53..a2b4c1e5774 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Synonyms/DeleteSynonymRuleResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Synonyms/DeleteSynonymRuleResponse.g.cs
@@ -18,14 +18,61 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Synonyms;
 
+internal sealed partial class DeleteSynonymRuleResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteSynonymRuleResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropReloadAnalyzersDetails = System.Text.Json.JsonEncodedText.Encode("reload_analyzers_details");
+	private static readonly System.Text.Json.JsonEncodedText PropResult = System.Text.Json.JsonEncodedText.Encode("result");
+
+	public override DeleteSynonymRuleResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.IndexManagement.ReloadResult> propReloadAnalyzersDetails = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Result> propResult = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propReloadAnalyzersDetails.TryRead(ref reader, options, PropReloadAnalyzersDetails))
+			{
+				continue;
+			}
+
+			if (propResult.TryRead(ref reader, options, PropResult))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteSynonymRuleResponse
+		{
+			ReloadAnalyzersDetails = propReloadAnalyzersDetails.Value
+,
+			Result = propResult.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteSynonymRuleResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropReloadAnalyzersDetails, value.ReloadAnalyzersDetails);
+		writer.WriteProperty(options, PropResult, value.Result);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteSynonymRuleResponseConverter))]
 public sealed partial class DeleteSynonymRuleResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -34,7 +81,6 @@ public sealed partial class DeleteSynonymRuleResponse : ElasticsearchResponse
 	/// This is the analyzers reloading result
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("reload_analyzers_details")]
 	public Elastic.Clients.Elasticsearch.IndexManagement.ReloadResult ReloadAnalyzersDetails { get; init; }
 
 	/// <summary>
@@ -42,6 +88,5 @@ public sealed partial class DeleteSynonymRuleResponse : ElasticsearchResponse
 	/// Update operation result
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("result")]
 	public Elastic.Clients.Elasticsearch.Result Result { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Synonyms/GetSynonymResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Synonyms/GetSynonymResponse.g.cs
index e61b17766d2..59ac87f6df2 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Synonyms/GetSynonymResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Synonyms/GetSynonymResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Synonyms;
 
+internal sealed partial class GetSynonymResponseConverter : System.Text.Json.Serialization.JsonConverter<GetSynonymResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCount = System.Text.Json.JsonEncodedText.Encode("count");
+	private static readonly System.Text.Json.JsonEncodedText PropSynonymsSet = System.Text.Json.JsonEncodedText.Encode("synonyms_set");
+
+	public override GetSynonymResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<int> propCount = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Synonyms.SynonymRuleRead>> propSynonymsSet = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCount.TryRead(ref reader, options, PropCount))
+			{
+				continue;
+			}
+
+			if (propSynonymsSet.TryRead(ref reader, options, PropSynonymsSet))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetSynonymResponse
+		{
+			Count = propCount.Value
+,
+			SynonymsSet = propSynonymsSet.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetSynonymResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCount, value.Count);
+		writer.WriteProperty(options, PropSynonymsSet, value.SynonymsSet);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetSynonymResponseConverter))]
 public sealed partial class GetSynonymResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("count")]
 	public int Count { get; init; }
-	[JsonInclude, JsonPropertyName("synonyms_set")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Synonyms.SynonymRuleRead> SynonymsSet { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Synonyms/GetSynonymRuleResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Synonyms/GetSynonymRuleResponse.g.cs
index a6fc0854ce0..3968a7a11d2 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Synonyms/GetSynonymRuleResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Synonyms/GetSynonymRuleResponse.g.cs
@@ -18,14 +18,61 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Synonyms;
 
+internal sealed partial class GetSynonymRuleResponseConverter : System.Text.Json.Serialization.JsonConverter<GetSynonymRuleResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("id");
+	private static readonly System.Text.Json.JsonEncodedText PropSynonyms = System.Text.Json.JsonEncodedText.Encode("synonyms");
+
+	public override GetSynonymRuleResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propId = default;
+		LocalJsonProperty<string> propSynonyms = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propId.TryRead(ref reader, options, PropId))
+			{
+				continue;
+			}
+
+			if (propSynonyms.TryRead(ref reader, options, PropSynonyms))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetSynonymRuleResponse
+		{
+			Id = propId.Value
+,
+			Synonyms = propSynonyms.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetSynonymRuleResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropId, value.Id);
+		writer.WriteProperty(options, PropSynonyms, value.Synonyms);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetSynonymRuleResponseConverter))]
 public sealed partial class GetSynonymRuleResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,7 +80,6 @@ public sealed partial class GetSynonymRuleResponse : ElasticsearchResponse
 	/// Synonym Rule identifier
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("id")]
 	public string Id { get; init; }
 
 	/// <summary>
@@ -41,6 +87,5 @@ public sealed partial class GetSynonymRuleResponse : ElasticsearchResponse
 	/// Synonyms, in Solr format, that conform the synonym rule. See https://www.elastic.co/guide/en/elasticsearch/reference/current/analysis-synonym-graph-tokenfilter.html#_solr_synonyms_2
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("synonyms")]
 	public string Synonyms { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Synonyms/GetSynonymsSetsResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Synonyms/GetSynonymsSetsResponse.g.cs
index 62143e3725b..931a5df2d1d 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Synonyms/GetSynonymsSetsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Synonyms/GetSynonymsSetsResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Synonyms;
 
+internal sealed partial class GetSynonymsSetsResponseConverter : System.Text.Json.Serialization.JsonConverter<GetSynonymsSetsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCount = System.Text.Json.JsonEncodedText.Encode("count");
+	private static readonly System.Text.Json.JsonEncodedText PropResults = System.Text.Json.JsonEncodedText.Encode("results");
+
+	public override GetSynonymsSetsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<int> propCount = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Synonyms.SynonymsSetItem>> propResults = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCount.TryRead(ref reader, options, PropCount))
+			{
+				continue;
+			}
+
+			if (propResults.TryRead(ref reader, options, PropResults))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetSynonymsSetsResponse
+		{
+			Count = propCount.Value
+,
+			Results = propResults.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetSynonymsSetsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCount, value.Count);
+		writer.WriteProperty(options, PropResults, value.Results);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetSynonymsSetsResponseConverter))]
 public sealed partial class GetSynonymsSetsResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("count")]
 	public int Count { get; init; }
-	[JsonInclude, JsonPropertyName("results")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Synonyms.SynonymsSetItem> Results { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Synonyms/PutSynonymRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Synonyms/PutSynonymRequest.g.cs
index ebde087aa42..98c96ffdf9c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Synonyms/PutSynonymRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Synonyms/PutSynonymRequest.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport;
@@ -34,6 +35,39 @@ public sealed partial class PutSynonymRequestParameters : RequestParameters
 {
 }
 
+internal sealed partial class PutSynonymRequestConverter : System.Text.Json.Serialization.JsonConverter<PutSynonymRequest>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropSynonymsSet = System.Text.Json.JsonEncodedText.Encode("synonyms_set");
+
+	public override PutSynonymRequest Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Synonyms.SynonymRule>> propSynonymsSet = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propSynonymsSet.TryRead(ref reader, options, PropSynonymsSet, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Synonyms.SynonymRule>, Elastic.Clients.Elasticsearch.Synonyms.SynonymRule>)))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutSynonymRequest
+		{
+			SynonymsSet = propSynonymsSet.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutSynonymRequest value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropSynonymsSet, value.SynonymsSet, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Synonyms.SynonymRule>, Elastic.Clients.Elasticsearch.Synonyms.SynonymRule>));
+		writer.WriteEndObject();
+	}
+}
+
 /// <summary>
 /// <para>
 /// Create or update a synonym set.
@@ -41,6 +75,7 @@ public sealed partial class PutSynonymRequestParameters : RequestParameters
 /// If you need to manage more synonym rules, you can create multiple synonym sets.
 /// </para>
 /// </summary>
+[JsonConverter(typeof(PutSynonymRequestConverter))]
 public sealed partial class PutSynonymRequest : PlainRequest<PutSynonymRequestParameters>
 {
 	public PutSynonymRequest(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id))
@@ -60,8 +95,6 @@ public PutSynonymRequest(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Requ
 	/// The synonym set information to update
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("synonyms_set")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.Synonyms.SynonymRule))]
 	public ICollection<Elastic.Clients.Elasticsearch.Synonyms.SynonymRule> SynonymsSet { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Synonyms/PutSynonymResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Synonyms/PutSynonymResponse.g.cs
index 21b5b6c1093..052e5b772d5 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Synonyms/PutSynonymResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Synonyms/PutSynonymResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Synonyms;
 
+internal sealed partial class PutSynonymResponseConverter : System.Text.Json.Serialization.JsonConverter<PutSynonymResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropReloadAnalyzersDetails = System.Text.Json.JsonEncodedText.Encode("reload_analyzers_details");
+	private static readonly System.Text.Json.JsonEncodedText PropResult = System.Text.Json.JsonEncodedText.Encode("result");
+
+	public override PutSynonymResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.IndexManagement.ReloadResult> propReloadAnalyzersDetails = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Result> propResult = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propReloadAnalyzersDetails.TryRead(ref reader, options, PropReloadAnalyzersDetails))
+			{
+				continue;
+			}
+
+			if (propResult.TryRead(ref reader, options, PropResult))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutSynonymResponse
+		{
+			ReloadAnalyzersDetails = propReloadAnalyzersDetails.Value
+,
+			Result = propResult.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutSynonymResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropReloadAnalyzersDetails, value.ReloadAnalyzersDetails);
+		writer.WriteProperty(options, PropResult, value.Result);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PutSynonymResponseConverter))]
 public sealed partial class PutSynonymResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("reload_analyzers_details")]
 	public Elastic.Clients.Elasticsearch.IndexManagement.ReloadResult ReloadAnalyzersDetails { get; init; }
-	[JsonInclude, JsonPropertyName("result")]
 	public Elastic.Clients.Elasticsearch.Result Result { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Synonyms/PutSynonymRuleResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Synonyms/PutSynonymRuleResponse.g.cs
index 652aebc8333..edd71815134 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Synonyms/PutSynonymRuleResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Synonyms/PutSynonymRuleResponse.g.cs
@@ -18,14 +18,61 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Synonyms;
 
+internal sealed partial class PutSynonymRuleResponseConverter : System.Text.Json.Serialization.JsonConverter<PutSynonymRuleResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropReloadAnalyzersDetails = System.Text.Json.JsonEncodedText.Encode("reload_analyzers_details");
+	private static readonly System.Text.Json.JsonEncodedText PropResult = System.Text.Json.JsonEncodedText.Encode("result");
+
+	public override PutSynonymRuleResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.IndexManagement.ReloadResult> propReloadAnalyzersDetails = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Result> propResult = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propReloadAnalyzersDetails.TryRead(ref reader, options, PropReloadAnalyzersDetails))
+			{
+				continue;
+			}
+
+			if (propResult.TryRead(ref reader, options, PropResult))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutSynonymRuleResponse
+		{
+			ReloadAnalyzersDetails = propReloadAnalyzersDetails.Value
+,
+			Result = propResult.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutSynonymRuleResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropReloadAnalyzersDetails, value.ReloadAnalyzersDetails);
+		writer.WriteProperty(options, PropResult, value.Result);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PutSynonymRuleResponseConverter))]
 public sealed partial class PutSynonymRuleResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -34,7 +81,6 @@ public sealed partial class PutSynonymRuleResponse : ElasticsearchResponse
 	/// This is the analyzers reloading result
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("reload_analyzers_details")]
 	public Elastic.Clients.Elasticsearch.IndexManagement.ReloadResult ReloadAnalyzersDetails { get; init; }
 
 	/// <summary>
@@ -42,6 +88,5 @@ public sealed partial class PutSynonymRuleResponse : ElasticsearchResponse
 	/// Update operation result
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("result")]
 	public Elastic.Clients.Elasticsearch.Result Result { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Tasks/CancelResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Tasks/CancelResponse.g.cs
index 42734dac9ee..e6f6cf3a3c7 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Tasks/CancelResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Tasks/CancelResponse.g.cs
@@ -18,17 +18,83 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Tasks;
 
+internal sealed partial class CancelResponseConverter : System.Text.Json.Serialization.JsonConverter<CancelResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropNodeFailures = System.Text.Json.JsonEncodedText.Encode("node_failures");
+	private static readonly System.Text.Json.JsonEncodedText PropNodes = System.Text.Json.JsonEncodedText.Encode("nodes");
+	private static readonly System.Text.Json.JsonEncodedText PropTaskFailures = System.Text.Json.JsonEncodedText.Encode("task_failures");
+	private static readonly System.Text.Json.JsonEncodedText PropTasks = System.Text.Json.JsonEncodedText.Encode("tasks");
+
+	public override CancelResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.ErrorCause>?> propNodeFailures = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Tasks.NodeTasks>?> propNodes = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.TaskFailure>?> propTaskFailures = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Tasks.TaskInfos?> propTasks = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propNodeFailures.TryRead(ref reader, options, PropNodeFailures))
+			{
+				continue;
+			}
+
+			if (propNodes.TryRead(ref reader, options, PropNodes))
+			{
+				continue;
+			}
+
+			if (propTaskFailures.TryRead(ref reader, options, PropTaskFailures))
+			{
+				continue;
+			}
+
+			if (propTasks.TryRead(ref reader, options, PropTasks))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new CancelResponse
+		{
+			NodeFailures = propNodeFailures.Value
+,
+			Nodes = propNodes.Value
+,
+			TaskFailures = propTaskFailures.Value
+,
+			Tasks = propTasks.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, CancelResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropNodeFailures, value.NodeFailures);
+		writer.WriteProperty(options, PropNodes, value.Nodes);
+		writer.WriteProperty(options, PropTaskFailures, value.TaskFailures);
+		writer.WriteProperty(options, PropTasks, value.Tasks);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(CancelResponseConverter))]
 public sealed partial class CancelResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("node_failures")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.ErrorCause>? NodeFailures { get; init; }
 
 	/// <summary>
@@ -36,9 +102,7 @@ public sealed partial class CancelResponse : ElasticsearchResponse
 	/// Task information grouped by node, if <c>group_by</c> was set to <c>node</c> (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>
@@ -47,6 +111,5 @@ public sealed partial class CancelResponse : ElasticsearchResponse
 	/// <c>group_by</c> was set to <c>parents</c>.
 	/// </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/Tasks/GetTasksResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Tasks/GetTasksResponse.g.cs
index cd9c953e47f..d177a4cf485 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Tasks/GetTasksResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Tasks/GetTasksResponse.g.cs
@@ -18,22 +18,85 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Tasks;
 
+internal sealed partial class GetTasksResponseConverter : System.Text.Json.Serialization.JsonConverter<GetTasksResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCompleted = System.Text.Json.JsonEncodedText.Encode("completed");
+	private static readonly System.Text.Json.JsonEncodedText PropError = System.Text.Json.JsonEncodedText.Encode("error");
+	private static readonly System.Text.Json.JsonEncodedText PropResponse = System.Text.Json.JsonEncodedText.Encode("response");
+	private static readonly System.Text.Json.JsonEncodedText PropTask = System.Text.Json.JsonEncodedText.Encode("task");
+
+	public override GetTasksResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propCompleted = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.ErrorCause?> propError = default;
+		LocalJsonProperty<object?> propResponse = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Tasks.TaskInfo> propTask = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCompleted.TryRead(ref reader, options, PropCompleted))
+			{
+				continue;
+			}
+
+			if (propError.TryRead(ref reader, options, PropError))
+			{
+				continue;
+			}
+
+			if (propResponse.TryRead(ref reader, options, PropResponse))
+			{
+				continue;
+			}
+
+			if (propTask.TryRead(ref reader, options, PropTask))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetTasksResponse
+		{
+			Completed = propCompleted.Value
+,
+			Error = propError.Value
+,
+			Response = propResponse.Value
+,
+			Task = propTask.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetTasksResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCompleted, value.Completed);
+		writer.WriteProperty(options, PropError, value.Error);
+		writer.WriteProperty(options, PropResponse, value.Response);
+		writer.WriteProperty(options, PropTask, value.Task);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetTasksResponseConverter))]
 public sealed partial class GetTasksResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("completed")]
 	public bool Completed { get; init; }
-	[JsonInclude, JsonPropertyName("error")]
 	public Elastic.Clients.Elasticsearch.ErrorCause? Error { get; init; }
-	[JsonInclude, JsonPropertyName("response")]
 	public object? Response { get; init; }
-	[JsonInclude, JsonPropertyName("task")]
 	public Elastic.Clients.Elasticsearch.Tasks.TaskInfo Task { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Tasks/ListResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Tasks/ListResponse.g.cs
index 6eec10fe844..31768483771 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Tasks/ListResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Tasks/ListResponse.g.cs
@@ -18,17 +18,83 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Tasks;
 
+internal sealed partial class ListResponseConverter : System.Text.Json.Serialization.JsonConverter<ListResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropNodeFailures = System.Text.Json.JsonEncodedText.Encode("node_failures");
+	private static readonly System.Text.Json.JsonEncodedText PropNodes = System.Text.Json.JsonEncodedText.Encode("nodes");
+	private static readonly System.Text.Json.JsonEncodedText PropTaskFailures = System.Text.Json.JsonEncodedText.Encode("task_failures");
+	private static readonly System.Text.Json.JsonEncodedText PropTasks = System.Text.Json.JsonEncodedText.Encode("tasks");
+
+	public override ListResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.ErrorCause>?> propNodeFailures = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Tasks.NodeTasks>?> propNodes = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.TaskFailure>?> propTaskFailures = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Tasks.TaskInfos?> propTasks = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propNodeFailures.TryRead(ref reader, options, PropNodeFailures))
+			{
+				continue;
+			}
+
+			if (propNodes.TryRead(ref reader, options, PropNodes))
+			{
+				continue;
+			}
+
+			if (propTaskFailures.TryRead(ref reader, options, PropTaskFailures))
+			{
+				continue;
+			}
+
+			if (propTasks.TryRead(ref reader, options, PropTasks))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ListResponse
+		{
+			NodeFailures = propNodeFailures.Value
+,
+			Nodes = propNodes.Value
+,
+			TaskFailures = propTaskFailures.Value
+,
+			Tasks = propTasks.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ListResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropNodeFailures, value.NodeFailures);
+		writer.WriteProperty(options, PropNodes, value.Nodes);
+		writer.WriteProperty(options, PropTaskFailures, value.TaskFailures);
+		writer.WriteProperty(options, PropTasks, value.Tasks);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ListResponseConverter))]
 public sealed partial class ListResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("node_failures")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.ErrorCause>? NodeFailures { get; init; }
 
 	/// <summary>
@@ -36,9 +102,7 @@ public sealed partial class ListResponse : ElasticsearchResponse
 	/// Task information grouped by node, if <c>group_by</c> was set to <c>node</c> (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>
@@ -47,6 +111,5 @@ public sealed partial class ListResponse : ElasticsearchResponse
 	/// <c>group_by</c> was set to <c>parents</c>.
 	/// </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/TermVectorsRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/TermVectorsRequest.g.cs
index f9052ff3303..44ffc959289 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/TermVectorsRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/TermVectorsRequest.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport;
@@ -112,6 +113,76 @@ public sealed partial class TermVectorsRequestParameters : RequestParameters
 	public Elastic.Clients.Elasticsearch.VersionType? VersionType { get => Q<Elastic.Clients.Elasticsearch.VersionType?>("version_type"); set => Q("version_type", value); }
 }
 
+internal sealed partial class TermVectorsRequestConverter<TDocument> : System.Text.Json.Serialization.JsonConverter<TermVectorsRequest<TDocument>>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropDoc = System.Text.Json.JsonEncodedText.Encode("doc");
+	private static readonly System.Text.Json.JsonEncodedText PropFilter = System.Text.Json.JsonEncodedText.Encode("filter");
+	private static readonly System.Text.Json.JsonEncodedText PropPerFieldAnalyzer = System.Text.Json.JsonEncodedText.Encode("per_field_analyzer");
+
+	public override TermVectorsRequest<TDocument> Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<TDocument?> propDoc = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Core.TermVectors.Filter?> propFilter = default;
+		LocalJsonProperty<IDictionary<Elastic.Clients.Elasticsearch.Field, string>?> propPerFieldAnalyzer = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propDoc.TryRead(ref reader, options, PropDoc, typeof(SourceMarker<TDocument?>)))
+			{
+				continue;
+			}
+
+			if (propFilter.TryRead(ref reader, options, PropFilter))
+			{
+				continue;
+			}
+
+			if (propPerFieldAnalyzer.TryRead(ref reader, options, PropPerFieldAnalyzer))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new TermVectorsRequest<TDocument>
+		{
+			Doc = propDoc.Value
+	,
+			Filter = propFilter.Value
+	,
+			PerFieldAnalyzer = propPerFieldAnalyzer.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, TermVectorsRequest<TDocument> value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDoc, value.Doc, typeof(SourceMarker<TDocument?>));
+		writer.WriteProperty(options, PropFilter, value.Filter);
+		writer.WriteProperty(options, PropPerFieldAnalyzer, value.PerFieldAnalyzer);
+		writer.WriteEndObject();
+	}
+}
+
+internal sealed partial class TermVectorsRequestConverterFactory : System.Text.Json.Serialization.JsonConverterFactory
+{
+	public override bool CanConvert(System.Type typeToConvert)
+	{
+		return typeToConvert.IsGenericType && typeToConvert.GetGenericTypeDefinition() == typeof(TermVectorsRequest<>);
+	}
+
+	public override System.Text.Json.Serialization.JsonConverter CreateConverter(System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		var args = typeToConvert.GetGenericArguments();
+#pragma warning disable IL3050
+		var converter = (System.Text.Json.Serialization.JsonConverter)System.Activator.CreateInstance(typeof(TermVectorsRequestConverter<>).MakeGenericType(args[0]), System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public, binder: null, args: null, culture: null)!;
+#pragma warning restore IL3050
+		return converter;
+	}
+}
+
 /// <summary>
 /// <para>
 /// Get term vector information.
@@ -120,6 +191,7 @@ public sealed partial class TermVectorsRequestParameters : RequestParameters
 /// Get information and statistics about terms in the fields of a particular document.
 /// </para>
 /// </summary>
+[JsonConverter(typeof(TermVectorsRequestConverterFactory))]
 public sealed partial class TermVectorsRequest<TDocument> : PlainRequest<TermVectorsRequestParameters>
 {
 	public TermVectorsRequest(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.Id? id) : base(r => r.Required("index", index).Optional("id", id))
@@ -144,7 +216,6 @@ public TermVectorsRequest(Elastic.Clients.Elasticsearch.IndexName index) : base(
 	/// Used as the default list unless a specific field list is provided in the <c>completion_fields</c> or <c>fielddata_fields</c> parameters.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Fields? Fields { get => Q<Elastic.Clients.Elasticsearch.Fields?>("fields"); set => Q("fields", value); }
 
 	/// <summary>
@@ -152,7 +223,6 @@ public TermVectorsRequest(Elastic.Clients.Elasticsearch.IndexName index) : base(
 	/// If <c>true</c>, the response includes the document count, sum of document frequencies, and sum of total term frequencies.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public bool? FieldStatistics { get => Q<bool?>("field_statistics"); set => Q("field_statistics", value); }
 
 	/// <summary>
@@ -160,7 +230,6 @@ public TermVectorsRequest(Elastic.Clients.Elasticsearch.IndexName index) : base(
 	/// If <c>true</c>, the response includes term offsets.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public bool? Offsets { get => Q<bool?>("offsets"); set => Q("offsets", value); }
 
 	/// <summary>
@@ -168,7 +237,6 @@ public TermVectorsRequest(Elastic.Clients.Elasticsearch.IndexName index) : base(
 	/// If <c>true</c>, the response includes term payloads.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public bool? Payloads { get => Q<bool?>("payloads"); set => Q("payloads", value); }
 
 	/// <summary>
@@ -176,7 +244,6 @@ public TermVectorsRequest(Elastic.Clients.Elasticsearch.IndexName index) : base(
 	/// If <c>true</c>, the response includes term positions.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public bool? Positions { get => Q<bool?>("positions"); set => Q("positions", value); }
 
 	/// <summary>
@@ -185,7 +252,6 @@ public TermVectorsRequest(Elastic.Clients.Elasticsearch.IndexName index) : base(
 	/// Random by default.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public string? Preference { get => Q<string?>("preference"); set => Q("preference", value); }
 
 	/// <summary>
@@ -193,7 +259,6 @@ public TermVectorsRequest(Elastic.Clients.Elasticsearch.IndexName index) : base(
 	/// 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>
@@ -201,7 +266,6 @@ public TermVectorsRequest(Elastic.Clients.Elasticsearch.IndexName index) : base(
 	/// 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>
@@ -209,7 +273,6 @@ public TermVectorsRequest(Elastic.Clients.Elasticsearch.IndexName index) : base(
 	/// If <c>true</c>, the response includes term frequency and document frequency.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public bool? TermStatistics { get => Q<bool?>("term_statistics"); set => Q("term_statistics", value); }
 
 	/// <summary>
@@ -217,7 +280,6 @@ public TermVectorsRequest(Elastic.Clients.Elasticsearch.IndexName index) : base(
 	/// If <c>true</c>, returns the document version as part of a hit.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public long? Version { get => Q<long?>("version"); set => Q("version", value); }
 
 	/// <summary>
@@ -225,7 +287,6 @@ public TermVectorsRequest(Elastic.Clients.Elasticsearch.IndexName index) : base(
 	/// 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>
@@ -233,8 +294,6 @@ public TermVectorsRequest(Elastic.Clients.Elasticsearch.IndexName index) : base(
 	/// An artificial document (a document not present in the index) for which you want to retrieve term vectors.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("doc")]
-	[SourceConverter]
 	public TDocument? Doc { get; set; }
 
 	/// <summary>
@@ -242,7 +301,6 @@ public TermVectorsRequest(Elastic.Clients.Elasticsearch.IndexName index) : base(
 	/// Filter terms based on their tf-idf scores.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("filter")]
 	public Elastic.Clients.Elasticsearch.Core.TermVectors.Filter? Filter { get; set; }
 
 	/// <summary>
@@ -250,7 +308,6 @@ public TermVectorsRequest(Elastic.Clients.Elasticsearch.IndexName index) : base(
 	/// Overrides the default per-field analyzer.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("per_field_analyzer")]
 	public IDictionary<Elastic.Clients.Elasticsearch.Field, string>? PerFieldAnalyzer { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/TermVectorsResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/TermVectorsResponse.g.cs
index 530b3a6d741..f683d1ec148 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/TermVectorsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/TermVectorsResponse.g.cs
@@ -18,27 +18,107 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch;
 
+internal sealed partial class TermVectorsResponseConverter : System.Text.Json.Serialization.JsonConverter<TermVectorsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropFound = System.Text.Json.JsonEncodedText.Encode("found");
+	private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("_id");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("_index");
+	private static readonly System.Text.Json.JsonEncodedText PropTermVectors = System.Text.Json.JsonEncodedText.Encode("term_vectors");
+	private static readonly System.Text.Json.JsonEncodedText PropTook = System.Text.Json.JsonEncodedText.Encode("took");
+	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("_version");
+
+	public override TermVectorsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propFound = default;
+		LocalJsonProperty<string?> propId = default;
+		LocalJsonProperty<string> propIndex = default;
+		LocalJsonProperty<IReadOnlyDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Core.TermVectors.TermVector>?> propTermVectors = default;
+		LocalJsonProperty<long> propTook = default;
+		LocalJsonProperty<long> propVersion = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propFound.TryRead(ref reader, options, PropFound))
+			{
+				continue;
+			}
+
+			if (propId.TryRead(ref reader, options, PropId))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propTermVectors.TryRead(ref reader, options, PropTermVectors))
+			{
+				continue;
+			}
+
+			if (propTook.TryRead(ref reader, options, PropTook))
+			{
+				continue;
+			}
+
+			if (propVersion.TryRead(ref reader, options, PropVersion))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new TermVectorsResponse
+		{
+			Found = propFound.Value
+,
+			Id = propId.Value
+,
+			Index = propIndex.Value
+,
+			TermVectors = propTermVectors.Value
+,
+			Took = propTook.Value
+,
+			Version = propVersion.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, TermVectorsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropFound, value.Found);
+		writer.WriteProperty(options, PropId, value.Id);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropTermVectors, value.TermVectors);
+		writer.WriteProperty(options, PropTook, value.Took);
+		writer.WriteProperty(options, PropVersion, value.Version);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(TermVectorsResponseConverter))]
 public sealed partial class TermVectorsResponse : ElasticsearchResponse
 {
-	[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("term_vectors")]
-	[ReadOnlyFieldDictionaryConverter(typeof(Elastic.Clients.Elasticsearch.Core.TermVectors.TermVector))]
 	public IReadOnlyDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Core.TermVectors.TermVector>? TermVectors { get; init; }
-	[JsonInclude, JsonPropertyName("took")]
 	public long Took { 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/TermsEnumResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/TermsEnumResponse.g.cs
index 0c18094311e..3e4458a5729 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/TermsEnumResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/TermsEnumResponse.g.cs
@@ -18,20 +18,74 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch;
 
+internal sealed partial class TermsEnumResponseConverter : System.Text.Json.Serialization.JsonConverter<TermsEnumResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropComplete = System.Text.Json.JsonEncodedText.Encode("complete");
+	private static readonly System.Text.Json.JsonEncodedText PropShards = System.Text.Json.JsonEncodedText.Encode("_shards");
+	private static readonly System.Text.Json.JsonEncodedText PropTerms = System.Text.Json.JsonEncodedText.Encode("terms");
+
+	public override TermsEnumResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propComplete = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.ShardStatistics> propShards = default;
+		LocalJsonProperty<IReadOnlyCollection<string>> propTerms = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propComplete.TryRead(ref reader, options, PropComplete))
+			{
+				continue;
+			}
+
+			if (propShards.TryRead(ref reader, options, PropShards))
+			{
+				continue;
+			}
+
+			if (propTerms.TryRead(ref reader, options, PropTerms))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new TermsEnumResponse
+		{
+			Complete = propComplete.Value
+,
+			Shards = propShards.Value
+,
+			Terms = propTerms.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, TermsEnumResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropComplete, value.Complete);
+		writer.WriteProperty(options, PropShards, value.Shards);
+		writer.WriteProperty(options, PropTerms, value.Terms);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(TermsEnumResponseConverter))]
 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/TextStructure/FindFieldStructureResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/TextStructure/FindFieldStructureResponse.g.cs
index 432ca254f96..76a4314b391 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/TextStructure/FindFieldStructureResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/TextStructure/FindFieldStructureResponse.g.cs
@@ -18,45 +18,206 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.TextStructure;
 
+internal sealed partial class FindFieldStructureResponseConverter : System.Text.Json.Serialization.JsonConverter<FindFieldStructureResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCharset = System.Text.Json.JsonEncodedText.Encode("charset");
+	private static readonly System.Text.Json.JsonEncodedText PropEcsCompatibility = System.Text.Json.JsonEncodedText.Encode("ecs_compatibility");
+	private static readonly System.Text.Json.JsonEncodedText PropFieldStats = System.Text.Json.JsonEncodedText.Encode("field_stats");
+	private static readonly System.Text.Json.JsonEncodedText PropFormat = System.Text.Json.JsonEncodedText.Encode("format");
+	private static readonly System.Text.Json.JsonEncodedText PropGrokPattern = System.Text.Json.JsonEncodedText.Encode("grok_pattern");
+	private static readonly System.Text.Json.JsonEncodedText PropIngestPipeline = System.Text.Json.JsonEncodedText.Encode("ingest_pipeline");
+	private static readonly System.Text.Json.JsonEncodedText PropJavaTimestampFormats = System.Text.Json.JsonEncodedText.Encode("java_timestamp_formats");
+	private static readonly System.Text.Json.JsonEncodedText PropJodaTimestampFormats = System.Text.Json.JsonEncodedText.Encode("joda_timestamp_formats");
+	private static readonly System.Text.Json.JsonEncodedText PropMappings = System.Text.Json.JsonEncodedText.Encode("mappings");
+	private static readonly System.Text.Json.JsonEncodedText PropMultilineStartPattern = System.Text.Json.JsonEncodedText.Encode("multiline_start_pattern");
+	private static readonly System.Text.Json.JsonEncodedText PropNeedClientTimezone = System.Text.Json.JsonEncodedText.Encode("need_client_timezone");
+	private static readonly System.Text.Json.JsonEncodedText PropNumLinesAnalyzed = System.Text.Json.JsonEncodedText.Encode("num_lines_analyzed");
+	private static readonly System.Text.Json.JsonEncodedText PropNumMessagesAnalyzed = System.Text.Json.JsonEncodedText.Encode("num_messages_analyzed");
+	private static readonly System.Text.Json.JsonEncodedText PropSampleStart = System.Text.Json.JsonEncodedText.Encode("sample_start");
+	private static readonly System.Text.Json.JsonEncodedText PropTimestampField = System.Text.Json.JsonEncodedText.Encode("timestamp_field");
+
+	public override FindFieldStructureResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propCharset = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.TextStructure.EcsCompatibilityType?> propEcsCompatibility = default;
+		LocalJsonProperty<IReadOnlyDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.TextStructure.FieldStat>> propFieldStats = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.TextStructure.FormatType> propFormat = default;
+		LocalJsonProperty<string?> propGrokPattern = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Ingest.PipelineConfig> propIngestPipeline = default;
+		LocalJsonProperty<IReadOnlyCollection<string>?> propJavaTimestampFormats = default;
+		LocalJsonProperty<IReadOnlyCollection<string>?> propJodaTimestampFormats = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.TypeMapping> propMappings = default;
+		LocalJsonProperty<string?> propMultilineStartPattern = default;
+		LocalJsonProperty<bool> propNeedClientTimezone = default;
+		LocalJsonProperty<int> propNumLinesAnalyzed = default;
+		LocalJsonProperty<int> propNumMessagesAnalyzed = default;
+		LocalJsonProperty<string> propSampleStart = default;
+		LocalJsonProperty<string?> propTimestampField = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCharset.TryRead(ref reader, options, PropCharset))
+			{
+				continue;
+			}
+
+			if (propEcsCompatibility.TryRead(ref reader, options, PropEcsCompatibility))
+			{
+				continue;
+			}
+
+			if (propFieldStats.TryRead(ref reader, options, PropFieldStats))
+			{
+				continue;
+			}
+
+			if (propFormat.TryRead(ref reader, options, PropFormat))
+			{
+				continue;
+			}
+
+			if (propGrokPattern.TryRead(ref reader, options, PropGrokPattern))
+			{
+				continue;
+			}
+
+			if (propIngestPipeline.TryRead(ref reader, options, PropIngestPipeline))
+			{
+				continue;
+			}
+
+			if (propJavaTimestampFormats.TryRead(ref reader, options, PropJavaTimestampFormats))
+			{
+				continue;
+			}
+
+			if (propJodaTimestampFormats.TryRead(ref reader, options, PropJodaTimestampFormats))
+			{
+				continue;
+			}
+
+			if (propMappings.TryRead(ref reader, options, PropMappings))
+			{
+				continue;
+			}
+
+			if (propMultilineStartPattern.TryRead(ref reader, options, PropMultilineStartPattern))
+			{
+				continue;
+			}
+
+			if (propNeedClientTimezone.TryRead(ref reader, options, PropNeedClientTimezone))
+			{
+				continue;
+			}
+
+			if (propNumLinesAnalyzed.TryRead(ref reader, options, PropNumLinesAnalyzed))
+			{
+				continue;
+			}
+
+			if (propNumMessagesAnalyzed.TryRead(ref reader, options, PropNumMessagesAnalyzed))
+			{
+				continue;
+			}
+
+			if (propSampleStart.TryRead(ref reader, options, PropSampleStart))
+			{
+				continue;
+			}
+
+			if (propTimestampField.TryRead(ref reader, options, PropTimestampField))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new FindFieldStructureResponse
+		{
+			Charset = propCharset.Value
+,
+			EcsCompatibility = propEcsCompatibility.Value
+,
+			FieldStats = propFieldStats.Value
+,
+			Format = propFormat.Value
+,
+			GrokPattern = propGrokPattern.Value
+,
+			IngestPipeline = propIngestPipeline.Value
+,
+			JavaTimestampFormats = propJavaTimestampFormats.Value
+,
+			JodaTimestampFormats = propJodaTimestampFormats.Value
+,
+			Mappings = propMappings.Value
+,
+			MultilineStartPattern = propMultilineStartPattern.Value
+,
+			NeedClientTimezone = propNeedClientTimezone.Value
+,
+			NumLinesAnalyzed = propNumLinesAnalyzed.Value
+,
+			NumMessagesAnalyzed = propNumMessagesAnalyzed.Value
+,
+			SampleStart = propSampleStart.Value
+,
+			TimestampField = propTimestampField.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, FindFieldStructureResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCharset, value.Charset);
+		writer.WriteProperty(options, PropEcsCompatibility, value.EcsCompatibility);
+		writer.WriteProperty(options, PropFieldStats, value.FieldStats);
+		writer.WriteProperty(options, PropFormat, value.Format);
+		writer.WriteProperty(options, PropGrokPattern, value.GrokPattern);
+		writer.WriteProperty(options, PropIngestPipeline, value.IngestPipeline);
+		writer.WriteProperty(options, PropJavaTimestampFormats, value.JavaTimestampFormats);
+		writer.WriteProperty(options, PropJodaTimestampFormats, value.JodaTimestampFormats);
+		writer.WriteProperty(options, PropMappings, value.Mappings);
+		writer.WriteProperty(options, PropMultilineStartPattern, value.MultilineStartPattern);
+		writer.WriteProperty(options, PropNeedClientTimezone, value.NeedClientTimezone);
+		writer.WriteProperty(options, PropNumLinesAnalyzed, value.NumLinesAnalyzed);
+		writer.WriteProperty(options, PropNumMessagesAnalyzed, value.NumMessagesAnalyzed);
+		writer.WriteProperty(options, PropSampleStart, value.SampleStart);
+		writer.WriteProperty(options, PropTimestampField, value.TimestampField);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(FindFieldStructureResponseConverter))]
 public sealed partial class FindFieldStructureResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("charset")]
 	public string Charset { get; init; }
-	[JsonInclude, JsonPropertyName("ecs_compatibility")]
 	public Elastic.Clients.Elasticsearch.TextStructure.EcsCompatibilityType? EcsCompatibility { get; init; }
-	[JsonInclude, JsonPropertyName("field_stats")]
-	[ReadOnlyFieldDictionaryConverter(typeof(Elastic.Clients.Elasticsearch.TextStructure.FieldStat))]
 	public IReadOnlyDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.TextStructure.FieldStat> FieldStats { get; init; }
-	[JsonInclude, JsonPropertyName("format")]
 	public Elastic.Clients.Elasticsearch.TextStructure.FormatType Format { get; init; }
-	[JsonInclude, JsonPropertyName("grok_pattern")]
 	public string? GrokPattern { get; init; }
-	[JsonInclude, JsonPropertyName("ingest_pipeline")]
 	public Elastic.Clients.Elasticsearch.Ingest.PipelineConfig IngestPipeline { get; init; }
-	[JsonInclude, JsonPropertyName("java_timestamp_formats")]
 	public IReadOnlyCollection<string>? JavaTimestampFormats { get; init; }
-	[JsonInclude, JsonPropertyName("joda_timestamp_formats")]
 	public IReadOnlyCollection<string>? JodaTimestampFormats { get; init; }
-	[JsonInclude, JsonPropertyName("mappings")]
 	public Elastic.Clients.Elasticsearch.Mapping.TypeMapping Mappings { get; init; }
-	[JsonInclude, JsonPropertyName("multiline_start_pattern")]
 	public string? MultilineStartPattern { get; init; }
-	[JsonInclude, JsonPropertyName("need_client_timezone")]
 	public bool NeedClientTimezone { get; init; }
-	[JsonInclude, JsonPropertyName("num_lines_analyzed")]
 	public int NumLinesAnalyzed { get; init; }
-	[JsonInclude, JsonPropertyName("num_messages_analyzed")]
 	public int NumMessagesAnalyzed { get; init; }
-	[JsonInclude, JsonPropertyName("sample_start")]
 	public string SampleStart { get; init; }
-	[JsonInclude, JsonPropertyName("timestamp_field")]
 	public string? TimestampField { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/TextStructure/FindMessageStructureResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/TextStructure/FindMessageStructureResponse.g.cs
index 922ef596371..c62f35938df 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/TextStructure/FindMessageStructureResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/TextStructure/FindMessageStructureResponse.g.cs
@@ -18,45 +18,206 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.TextStructure;
 
+internal sealed partial class FindMessageStructureResponseConverter : System.Text.Json.Serialization.JsonConverter<FindMessageStructureResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCharset = System.Text.Json.JsonEncodedText.Encode("charset");
+	private static readonly System.Text.Json.JsonEncodedText PropEcsCompatibility = System.Text.Json.JsonEncodedText.Encode("ecs_compatibility");
+	private static readonly System.Text.Json.JsonEncodedText PropFieldStats = System.Text.Json.JsonEncodedText.Encode("field_stats");
+	private static readonly System.Text.Json.JsonEncodedText PropFormat = System.Text.Json.JsonEncodedText.Encode("format");
+	private static readonly System.Text.Json.JsonEncodedText PropGrokPattern = System.Text.Json.JsonEncodedText.Encode("grok_pattern");
+	private static readonly System.Text.Json.JsonEncodedText PropIngestPipeline = System.Text.Json.JsonEncodedText.Encode("ingest_pipeline");
+	private static readonly System.Text.Json.JsonEncodedText PropJavaTimestampFormats = System.Text.Json.JsonEncodedText.Encode("java_timestamp_formats");
+	private static readonly System.Text.Json.JsonEncodedText PropJodaTimestampFormats = System.Text.Json.JsonEncodedText.Encode("joda_timestamp_formats");
+	private static readonly System.Text.Json.JsonEncodedText PropMappings = System.Text.Json.JsonEncodedText.Encode("mappings");
+	private static readonly System.Text.Json.JsonEncodedText PropMultilineStartPattern = System.Text.Json.JsonEncodedText.Encode("multiline_start_pattern");
+	private static readonly System.Text.Json.JsonEncodedText PropNeedClientTimezone = System.Text.Json.JsonEncodedText.Encode("need_client_timezone");
+	private static readonly System.Text.Json.JsonEncodedText PropNumLinesAnalyzed = System.Text.Json.JsonEncodedText.Encode("num_lines_analyzed");
+	private static readonly System.Text.Json.JsonEncodedText PropNumMessagesAnalyzed = System.Text.Json.JsonEncodedText.Encode("num_messages_analyzed");
+	private static readonly System.Text.Json.JsonEncodedText PropSampleStart = System.Text.Json.JsonEncodedText.Encode("sample_start");
+	private static readonly System.Text.Json.JsonEncodedText PropTimestampField = System.Text.Json.JsonEncodedText.Encode("timestamp_field");
+
+	public override FindMessageStructureResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propCharset = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.TextStructure.EcsCompatibilityType?> propEcsCompatibility = default;
+		LocalJsonProperty<IReadOnlyDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.TextStructure.FieldStat>> propFieldStats = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.TextStructure.FormatType> propFormat = default;
+		LocalJsonProperty<string?> propGrokPattern = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Ingest.PipelineConfig> propIngestPipeline = default;
+		LocalJsonProperty<IReadOnlyCollection<string>?> propJavaTimestampFormats = default;
+		LocalJsonProperty<IReadOnlyCollection<string>?> propJodaTimestampFormats = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.TypeMapping> propMappings = default;
+		LocalJsonProperty<string?> propMultilineStartPattern = default;
+		LocalJsonProperty<bool> propNeedClientTimezone = default;
+		LocalJsonProperty<int> propNumLinesAnalyzed = default;
+		LocalJsonProperty<int> propNumMessagesAnalyzed = default;
+		LocalJsonProperty<string> propSampleStart = default;
+		LocalJsonProperty<string?> propTimestampField = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCharset.TryRead(ref reader, options, PropCharset))
+			{
+				continue;
+			}
+
+			if (propEcsCompatibility.TryRead(ref reader, options, PropEcsCompatibility))
+			{
+				continue;
+			}
+
+			if (propFieldStats.TryRead(ref reader, options, PropFieldStats))
+			{
+				continue;
+			}
+
+			if (propFormat.TryRead(ref reader, options, PropFormat))
+			{
+				continue;
+			}
+
+			if (propGrokPattern.TryRead(ref reader, options, PropGrokPattern))
+			{
+				continue;
+			}
+
+			if (propIngestPipeline.TryRead(ref reader, options, PropIngestPipeline))
+			{
+				continue;
+			}
+
+			if (propJavaTimestampFormats.TryRead(ref reader, options, PropJavaTimestampFormats))
+			{
+				continue;
+			}
+
+			if (propJodaTimestampFormats.TryRead(ref reader, options, PropJodaTimestampFormats))
+			{
+				continue;
+			}
+
+			if (propMappings.TryRead(ref reader, options, PropMappings))
+			{
+				continue;
+			}
+
+			if (propMultilineStartPattern.TryRead(ref reader, options, PropMultilineStartPattern))
+			{
+				continue;
+			}
+
+			if (propNeedClientTimezone.TryRead(ref reader, options, PropNeedClientTimezone))
+			{
+				continue;
+			}
+
+			if (propNumLinesAnalyzed.TryRead(ref reader, options, PropNumLinesAnalyzed))
+			{
+				continue;
+			}
+
+			if (propNumMessagesAnalyzed.TryRead(ref reader, options, PropNumMessagesAnalyzed))
+			{
+				continue;
+			}
+
+			if (propSampleStart.TryRead(ref reader, options, PropSampleStart))
+			{
+				continue;
+			}
+
+			if (propTimestampField.TryRead(ref reader, options, PropTimestampField))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new FindMessageStructureResponse
+		{
+			Charset = propCharset.Value
+,
+			EcsCompatibility = propEcsCompatibility.Value
+,
+			FieldStats = propFieldStats.Value
+,
+			Format = propFormat.Value
+,
+			GrokPattern = propGrokPattern.Value
+,
+			IngestPipeline = propIngestPipeline.Value
+,
+			JavaTimestampFormats = propJavaTimestampFormats.Value
+,
+			JodaTimestampFormats = propJodaTimestampFormats.Value
+,
+			Mappings = propMappings.Value
+,
+			MultilineStartPattern = propMultilineStartPattern.Value
+,
+			NeedClientTimezone = propNeedClientTimezone.Value
+,
+			NumLinesAnalyzed = propNumLinesAnalyzed.Value
+,
+			NumMessagesAnalyzed = propNumMessagesAnalyzed.Value
+,
+			SampleStart = propSampleStart.Value
+,
+			TimestampField = propTimestampField.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, FindMessageStructureResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCharset, value.Charset);
+		writer.WriteProperty(options, PropEcsCompatibility, value.EcsCompatibility);
+		writer.WriteProperty(options, PropFieldStats, value.FieldStats);
+		writer.WriteProperty(options, PropFormat, value.Format);
+		writer.WriteProperty(options, PropGrokPattern, value.GrokPattern);
+		writer.WriteProperty(options, PropIngestPipeline, value.IngestPipeline);
+		writer.WriteProperty(options, PropJavaTimestampFormats, value.JavaTimestampFormats);
+		writer.WriteProperty(options, PropJodaTimestampFormats, value.JodaTimestampFormats);
+		writer.WriteProperty(options, PropMappings, value.Mappings);
+		writer.WriteProperty(options, PropMultilineStartPattern, value.MultilineStartPattern);
+		writer.WriteProperty(options, PropNeedClientTimezone, value.NeedClientTimezone);
+		writer.WriteProperty(options, PropNumLinesAnalyzed, value.NumLinesAnalyzed);
+		writer.WriteProperty(options, PropNumMessagesAnalyzed, value.NumMessagesAnalyzed);
+		writer.WriteProperty(options, PropSampleStart, value.SampleStart);
+		writer.WriteProperty(options, PropTimestampField, value.TimestampField);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(FindMessageStructureResponseConverter))]
 public sealed partial class FindMessageStructureResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("charset")]
 	public string Charset { get; init; }
-	[JsonInclude, JsonPropertyName("ecs_compatibility")]
 	public Elastic.Clients.Elasticsearch.TextStructure.EcsCompatibilityType? EcsCompatibility { get; init; }
-	[JsonInclude, JsonPropertyName("field_stats")]
-	[ReadOnlyFieldDictionaryConverter(typeof(Elastic.Clients.Elasticsearch.TextStructure.FieldStat))]
 	public IReadOnlyDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.TextStructure.FieldStat> FieldStats { get; init; }
-	[JsonInclude, JsonPropertyName("format")]
 	public Elastic.Clients.Elasticsearch.TextStructure.FormatType Format { get; init; }
-	[JsonInclude, JsonPropertyName("grok_pattern")]
 	public string? GrokPattern { get; init; }
-	[JsonInclude, JsonPropertyName("ingest_pipeline")]
 	public Elastic.Clients.Elasticsearch.Ingest.PipelineConfig IngestPipeline { get; init; }
-	[JsonInclude, JsonPropertyName("java_timestamp_formats")]
 	public IReadOnlyCollection<string>? JavaTimestampFormats { get; init; }
-	[JsonInclude, JsonPropertyName("joda_timestamp_formats")]
 	public IReadOnlyCollection<string>? JodaTimestampFormats { get; init; }
-	[JsonInclude, JsonPropertyName("mappings")]
 	public Elastic.Clients.Elasticsearch.Mapping.TypeMapping Mappings { get; init; }
-	[JsonInclude, JsonPropertyName("multiline_start_pattern")]
 	public string? MultilineStartPattern { get; init; }
-	[JsonInclude, JsonPropertyName("need_client_timezone")]
 	public bool NeedClientTimezone { get; init; }
-	[JsonInclude, JsonPropertyName("num_lines_analyzed")]
 	public int NumLinesAnalyzed { get; init; }
-	[JsonInclude, JsonPropertyName("num_messages_analyzed")]
 	public int NumMessagesAnalyzed { get; init; }
-	[JsonInclude, JsonPropertyName("sample_start")]
 	public string SampleStart { get; init; }
-	[JsonInclude, JsonPropertyName("timestamp_field")]
 	public string? TimestampField { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/TextStructure/TestGrokPatternResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/TextStructure/TestGrokPatternResponse.g.cs
index 50646b97f83..e9601e2f4c5 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/TextStructure/TestGrokPatternResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/TextStructure/TestGrokPatternResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.TextStructure;
 
+internal sealed partial class TestGrokPatternResponseConverter : System.Text.Json.Serialization.JsonConverter<TestGrokPatternResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropMatches = System.Text.Json.JsonEncodedText.Encode("matches");
+
+	public override TestGrokPatternResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.TextStructure.MatchedText>> propMatches = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propMatches.TryRead(ref reader, options, PropMatches))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new TestGrokPatternResponse
+		{
+			Matches = propMatches.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, TestGrokPatternResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropMatches, value.Matches);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(TestGrokPatternResponseConverter))]
 public sealed partial class TestGrokPatternResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("matches")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.TextStructure.MatchedText> Matches { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/TransformManagement/DeleteTransformResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/TransformManagement/DeleteTransformResponse.g.cs
index afcb0daed68..21fbbc150ac 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/TransformManagement/DeleteTransformResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/TransformManagement/DeleteTransformResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.TransformManagement;
 
+internal sealed partial class DeleteTransformResponseConverter : System.Text.Json.Serialization.JsonConverter<DeleteTransformResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override DeleteTransformResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DeleteTransformResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeleteTransformResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DeleteTransformResponseConverter))]
 public sealed partial class DeleteTransformResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class DeleteTransformResponse : ElasticsearchResponse
 	/// 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/TransformManagement/GetTransformResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/TransformManagement/GetTransformResponse.g.cs
index a9ade3c0e06..02ecf97c0a0 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/TransformManagement/GetTransformResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/TransformManagement/GetTransformResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.TransformManagement;
 
+internal sealed partial class GetTransformResponseConverter : System.Text.Json.Serialization.JsonConverter<GetTransformResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCount = System.Text.Json.JsonEncodedText.Encode("count");
+	private static readonly System.Text.Json.JsonEncodedText PropTransforms = System.Text.Json.JsonEncodedText.Encode("transforms");
+
+	public override GetTransformResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<long> propCount = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.TransformManagement.TransformSummary>> propTransforms = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCount.TryRead(ref reader, options, PropCount))
+			{
+				continue;
+			}
+
+			if (propTransforms.TryRead(ref reader, options, PropTransforms))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetTransformResponse
+		{
+			Count = propCount.Value
+,
+			Transforms = propTransforms.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetTransformResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCount, value.Count);
+		writer.WriteProperty(options, PropTransforms, value.Transforms);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetTransformResponseConverter))]
 public sealed partial class GetTransformResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("count")]
 	public long Count { get; init; }
-	[JsonInclude, JsonPropertyName("transforms")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.TransformManagement.TransformSummary> Transforms { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/TransformManagement/GetTransformStatsResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/TransformManagement/GetTransformStatsResponse.g.cs
index 463e3808c08..5f26b643f60 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/TransformManagement/GetTransformStatsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/TransformManagement/GetTransformStatsResponse.g.cs
@@ -18,18 +18,63 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.TransformManagement;
 
+internal sealed partial class GetTransformStatsResponseConverter : System.Text.Json.Serialization.JsonConverter<GetTransformStatsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCount = System.Text.Json.JsonEncodedText.Encode("count");
+	private static readonly System.Text.Json.JsonEncodedText PropTransforms = System.Text.Json.JsonEncodedText.Encode("transforms");
+
+	public override GetTransformStatsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<long> propCount = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.TransformManagement.TransformStats>> propTransforms = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCount.TryRead(ref reader, options, PropCount))
+			{
+				continue;
+			}
+
+			if (propTransforms.TryRead(ref reader, options, PropTransforms))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetTransformStatsResponse
+		{
+			Count = propCount.Value
+,
+			Transforms = propTransforms.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetTransformStatsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCount, value.Count);
+		writer.WriteProperty(options, PropTransforms, value.Transforms);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GetTransformStatsResponseConverter))]
 public sealed partial class GetTransformStatsResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("count")]
 	public long Count { get; init; }
-	[JsonInclude, JsonPropertyName("transforms")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.TransformManagement.TransformStats> Transforms { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/TransformManagement/PreviewTransformResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/TransformManagement/PreviewTransformResponse.g.cs
index 3deeb3c40ce..f5b47ad7513 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/TransformManagement/PreviewTransformResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/TransformManagement/PreviewTransformResponse.g.cs
@@ -18,18 +18,80 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.TransformManagement;
 
+internal sealed partial class PreviewTransformResponseConverter<TTransform> : System.Text.Json.Serialization.JsonConverter<PreviewTransformResponse<TTransform>>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropGeneratedDestIndex = System.Text.Json.JsonEncodedText.Encode("generated_dest_index");
+	private static readonly System.Text.Json.JsonEncodedText PropPreview = System.Text.Json.JsonEncodedText.Encode("preview");
+
+	public override PreviewTransformResponse<TTransform> Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.IndexManagement.IndexState> propGeneratedDestIndex = default;
+		LocalJsonProperty<IReadOnlyCollection<TTransform>> propPreview = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propGeneratedDestIndex.TryRead(ref reader, options, PropGeneratedDestIndex))
+			{
+				continue;
+			}
+
+			if (propPreview.TryRead(ref reader, options, PropPreview))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PreviewTransformResponse<TTransform>
+		{
+			GeneratedDestIndex = propGeneratedDestIndex.Value
+,
+			Preview = propPreview.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PreviewTransformResponse<TTransform> value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropGeneratedDestIndex, value.GeneratedDestIndex);
+		writer.WriteProperty(options, PropPreview, value.Preview);
+		writer.WriteEndObject();
+	}
+}
+
+internal sealed partial class PreviewTransformResponseConverterFactory : System.Text.Json.Serialization.JsonConverterFactory
+{
+	public override bool CanConvert(System.Type typeToConvert)
+	{
+		return typeToConvert.IsGenericType && typeToConvert.GetGenericTypeDefinition() == typeof(PreviewTransformResponse<>);
+	}
+
+	public override System.Text.Json.Serialization.JsonConverter CreateConverter(System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		var args = typeToConvert.GetGenericArguments();
+#pragma warning disable IL3050
+		var converter = (System.Text.Json.Serialization.JsonConverter)System.Activator.CreateInstance(typeof(PreviewTransformResponseConverter<>).MakeGenericType(args[0]), System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public, binder: null, args: null, culture: null)!;
+#pragma warning restore IL3050
+		return converter;
+	}
+}
+
+[JsonConverter(typeof(PreviewTransformResponseConverterFactory))]
 public sealed partial class PreviewTransformResponse<TTransform> : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("generated_dest_index")]
 	public Elastic.Clients.Elasticsearch.IndexManagement.IndexState GeneratedDestIndex { get; init; }
-	[JsonInclude, JsonPropertyName("preview")]
 	public IReadOnlyCollection<TTransform> Preview { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/TransformManagement/PutTransformResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/TransformManagement/PutTransformResponse.g.cs
index 10f7f7ec4f7..367a612216e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/TransformManagement/PutTransformResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/TransformManagement/PutTransformResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.TransformManagement;
 
+internal sealed partial class PutTransformResponseConverter : System.Text.Json.Serialization.JsonConverter<PutTransformResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override PutTransformResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PutTransformResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PutTransformResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PutTransformResponseConverter))]
 public sealed partial class PutTransformResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class PutTransformResponse : ElasticsearchResponse
 	/// 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/TransformManagement/ResetTransformResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/TransformManagement/ResetTransformResponse.g.cs
index fa10ee989c7..f0b5b47ddf7 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/TransformManagement/ResetTransformResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/TransformManagement/ResetTransformResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.TransformManagement;
 
+internal sealed partial class ResetTransformResponseConverter : System.Text.Json.Serialization.JsonConverter<ResetTransformResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override ResetTransformResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ResetTransformResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ResetTransformResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ResetTransformResponseConverter))]
 public sealed partial class ResetTransformResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class ResetTransformResponse : ElasticsearchResponse
 	/// 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/TransformManagement/ScheduleNowTransformResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/TransformManagement/ScheduleNowTransformResponse.g.cs
index 93f527a6b0c..7b57a7b7046 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/TransformManagement/ScheduleNowTransformResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/TransformManagement/ScheduleNowTransformResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.TransformManagement;
 
+internal sealed partial class ScheduleNowTransformResponseConverter : System.Text.Json.Serialization.JsonConverter<ScheduleNowTransformResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override ScheduleNowTransformResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ScheduleNowTransformResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ScheduleNowTransformResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ScheduleNowTransformResponseConverter))]
 public sealed partial class ScheduleNowTransformResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class ScheduleNowTransformResponse : ElasticsearchResponse
 	/// 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/TransformManagement/StartTransformResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/TransformManagement/StartTransformResponse.g.cs
index 04f75c1be41..2280c5612f2 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/TransformManagement/StartTransformResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/TransformManagement/StartTransformResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.TransformManagement;
 
+internal sealed partial class StartTransformResponseConverter : System.Text.Json.Serialization.JsonConverter<StartTransformResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override StartTransformResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new StartTransformResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, StartTransformResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(StartTransformResponseConverter))]
 public sealed partial class StartTransformResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class StartTransformResponse : ElasticsearchResponse
 	/// 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/TransformManagement/StopTransformResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/TransformManagement/StopTransformResponse.g.cs
index 05fbc4e6609..e6e96dbc861 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/TransformManagement/StopTransformResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/TransformManagement/StopTransformResponse.g.cs
@@ -18,14 +18,51 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.TransformManagement;
 
+internal sealed partial class StopTransformResponseConverter : System.Text.Json.Serialization.JsonConverter<StopTransformResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAcknowledged = System.Text.Json.JsonEncodedText.Encode("acknowledged");
+
+	public override StopTransformResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAcknowledged = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAcknowledged.TryRead(ref reader, options, PropAcknowledged))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new StopTransformResponse
+		{
+			Acknowledged = propAcknowledged.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, StopTransformResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAcknowledged, value.Acknowledged);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(StopTransformResponseConverter))]
 public sealed partial class StopTransformResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,6 +70,5 @@ public sealed partial class StopTransformResponse : ElasticsearchResponse
 	/// 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/TransformManagement/UpdateTransformResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/TransformManagement/UpdateTransformResponse.g.cs
index 0dda6e4d96f..6f1296027e8 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/TransformManagement/UpdateTransformResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/TransformManagement/UpdateTransformResponse.g.cs
@@ -18,42 +18,195 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.TransformManagement;
 
+internal sealed partial class UpdateTransformResponseConverter : System.Text.Json.Serialization.JsonConverter<UpdateTransformResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAuthorization = System.Text.Json.JsonEncodedText.Encode("authorization");
+	private static readonly System.Text.Json.JsonEncodedText PropCreateTime = System.Text.Json.JsonEncodedText.Encode("create_time");
+	private static readonly System.Text.Json.JsonEncodedText PropDescription = System.Text.Json.JsonEncodedText.Encode("description");
+	private static readonly System.Text.Json.JsonEncodedText PropDest = System.Text.Json.JsonEncodedText.Encode("dest");
+	private static readonly System.Text.Json.JsonEncodedText PropFrequency = System.Text.Json.JsonEncodedText.Encode("frequency");
+	private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("id");
+	private static readonly System.Text.Json.JsonEncodedText PropLatest = System.Text.Json.JsonEncodedText.Encode("latest");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("_meta");
+	private static readonly System.Text.Json.JsonEncodedText PropPivot = System.Text.Json.JsonEncodedText.Encode("pivot");
+	private static readonly System.Text.Json.JsonEncodedText PropRetentionPolicy = System.Text.Json.JsonEncodedText.Encode("retention_policy");
+	private static readonly System.Text.Json.JsonEncodedText PropSettings = System.Text.Json.JsonEncodedText.Encode("settings");
+	private static readonly System.Text.Json.JsonEncodedText PropSource = System.Text.Json.JsonEncodedText.Encode("source");
+	private static readonly System.Text.Json.JsonEncodedText PropSync = System.Text.Json.JsonEncodedText.Encode("sync");
+	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("version");
+
+	public override UpdateTransformResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.MachineLearning.TransformAuthorization?> propAuthorization = default;
+		LocalJsonProperty<long> propCreateTime = default;
+		LocalJsonProperty<string> propDescription = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Core.Reindex.Destination> propDest = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Duration?> propFrequency = default;
+		LocalJsonProperty<string> propId = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.TransformManagement.Latest?> propLatest = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, object>?> propMeta = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.TransformManagement.Pivot?> propPivot = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.TransformManagement.RetentionPolicy?> propRetentionPolicy = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.TransformManagement.Settings> propSettings = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Core.Reindex.Source> propSource = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.TransformManagement.Sync?> propSync = default;
+		LocalJsonProperty<string> propVersion = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAuthorization.TryRead(ref reader, options, PropAuthorization))
+			{
+				continue;
+			}
+
+			if (propCreateTime.TryRead(ref reader, options, PropCreateTime))
+			{
+				continue;
+			}
+
+			if (propDescription.TryRead(ref reader, options, PropDescription))
+			{
+				continue;
+			}
+
+			if (propDest.TryRead(ref reader, options, PropDest))
+			{
+				continue;
+			}
+
+			if (propFrequency.TryRead(ref reader, options, PropFrequency))
+			{
+				continue;
+			}
+
+			if (propId.TryRead(ref reader, options, PropId))
+			{
+				continue;
+			}
+
+			if (propLatest.TryRead(ref reader, options, PropLatest))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propPivot.TryRead(ref reader, options, PropPivot))
+			{
+				continue;
+			}
+
+			if (propRetentionPolicy.TryRead(ref reader, options, PropRetentionPolicy))
+			{
+				continue;
+			}
+
+			if (propSettings.TryRead(ref reader, options, PropSettings))
+			{
+				continue;
+			}
+
+			if (propSource.TryRead(ref reader, options, PropSource))
+			{
+				continue;
+			}
+
+			if (propSync.TryRead(ref reader, options, PropSync))
+			{
+				continue;
+			}
+
+			if (propVersion.TryRead(ref reader, options, PropVersion))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new UpdateTransformResponse
+		{
+			Authorization = propAuthorization.Value
+,
+			CreateTime = propCreateTime.Value
+,
+			Description = propDescription.Value
+,
+			Dest = propDest.Value
+,
+			Frequency = propFrequency.Value
+,
+			Id = propId.Value
+,
+			Latest = propLatest.Value
+,
+			Meta = propMeta.Value
+,
+			Pivot = propPivot.Value
+,
+			RetentionPolicy = propRetentionPolicy.Value
+,
+			Settings = propSettings.Value
+,
+			Source = propSource.Value
+,
+			Sync = propSync.Value
+,
+			Version = propVersion.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, UpdateTransformResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAuthorization, value.Authorization);
+		writer.WriteProperty(options, PropCreateTime, value.CreateTime);
+		writer.WriteProperty(options, PropDescription, value.Description);
+		writer.WriteProperty(options, PropDest, value.Dest);
+		writer.WriteProperty(options, PropFrequency, value.Frequency);
+		writer.WriteProperty(options, PropId, value.Id);
+		writer.WriteProperty(options, PropLatest, value.Latest);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropPivot, value.Pivot);
+		writer.WriteProperty(options, PropRetentionPolicy, value.RetentionPolicy);
+		writer.WriteProperty(options, PropSettings, value.Settings);
+		writer.WriteProperty(options, PropSource, value.Source);
+		writer.WriteProperty(options, PropSync, value.Sync);
+		writer.WriteProperty(options, PropVersion, value.Version);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(UpdateTransformResponseConverter))]
 public sealed partial class UpdateTransformResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("authorization")]
 	public Elastic.Clients.Elasticsearch.MachineLearning.TransformAuthorization? Authorization { get; init; }
-	[JsonInclude, JsonPropertyName("create_time")]
 	public long CreateTime { get; init; }
-	[JsonInclude, JsonPropertyName("description")]
 	public string Description { get; init; }
-	[JsonInclude, JsonPropertyName("dest")]
 	public Elastic.Clients.Elasticsearch.Core.Reindex.Destination Dest { get; init; }
-	[JsonInclude, JsonPropertyName("frequency")]
 	public Elastic.Clients.Elasticsearch.Duration? Frequency { get; init; }
-	[JsonInclude, JsonPropertyName("id")]
 	public string Id { get; init; }
-	[JsonInclude, JsonPropertyName("latest")]
 	public Elastic.Clients.Elasticsearch.TransformManagement.Latest? Latest { get; init; }
-	[JsonInclude, JsonPropertyName("_meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
-	[JsonInclude, JsonPropertyName("pivot")]
 	public Elastic.Clients.Elasticsearch.TransformManagement.Pivot? Pivot { get; init; }
-	[JsonInclude, JsonPropertyName("retention_policy")]
 	public Elastic.Clients.Elasticsearch.TransformManagement.RetentionPolicy? RetentionPolicy { get; init; }
-	[JsonInclude, JsonPropertyName("settings")]
 	public Elastic.Clients.Elasticsearch.TransformManagement.Settings Settings { get; init; }
-	[JsonInclude, JsonPropertyName("source")]
 	public Elastic.Clients.Elasticsearch.Core.Reindex.Source Source { get; init; }
-	[JsonInclude, JsonPropertyName("sync")]
 	public Elastic.Clients.Elasticsearch.TransformManagement.Sync? Sync { get; init; }
-	[JsonInclude, JsonPropertyName("version")]
 	public string Version { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/TransformManagement/UpgradeTransformsResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/TransformManagement/UpgradeTransformsResponse.g.cs
index d2e39135530..6193971db70 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/TransformManagement/UpgradeTransformsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/TransformManagement/UpgradeTransformsResponse.g.cs
@@ -18,14 +18,71 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.TransformManagement;
 
+internal sealed partial class UpgradeTransformsResponseConverter : System.Text.Json.Serialization.JsonConverter<UpgradeTransformsResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropNeedsUpdate = System.Text.Json.JsonEncodedText.Encode("needs_update");
+	private static readonly System.Text.Json.JsonEncodedText PropNoAction = System.Text.Json.JsonEncodedText.Encode("no_action");
+	private static readonly System.Text.Json.JsonEncodedText PropUpdated = System.Text.Json.JsonEncodedText.Encode("updated");
+
+	public override UpgradeTransformsResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<int> propNeedsUpdate = default;
+		LocalJsonProperty<int> propNoAction = default;
+		LocalJsonProperty<int> propUpdated = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propNeedsUpdate.TryRead(ref reader, options, PropNeedsUpdate))
+			{
+				continue;
+			}
+
+			if (propNoAction.TryRead(ref reader, options, PropNoAction))
+			{
+				continue;
+			}
+
+			if (propUpdated.TryRead(ref reader, options, PropUpdated))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new UpgradeTransformsResponse
+		{
+			NeedsUpdate = propNeedsUpdate.Value
+,
+			NoAction = propNoAction.Value
+,
+			Updated = propUpdated.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, UpgradeTransformsResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropNeedsUpdate, value.NeedsUpdate);
+		writer.WriteProperty(options, PropNoAction, value.NoAction);
+		writer.WriteProperty(options, PropUpdated, value.Updated);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(UpgradeTransformsResponseConverter))]
 public sealed partial class UpgradeTransformsResponse : ElasticsearchResponse
 {
 	/// <summary>
@@ -33,7 +90,6 @@ public sealed partial class UpgradeTransformsResponse : ElasticsearchResponse
 	/// The number of transforms that need to be upgraded.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("needs_update")]
 	public int NeedsUpdate { get; init; }
 
 	/// <summary>
@@ -41,7 +97,6 @@ public sealed partial class UpgradeTransformsResponse : ElasticsearchResponse
 	/// The number of transforms that don’t require upgrading.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("no_action")]
 	public int NoAction { get; init; }
 
 	/// <summary>
@@ -49,6 +104,5 @@ public sealed partial class UpgradeTransformsResponse : ElasticsearchResponse
 	/// The number of transforms that have been upgraded.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("updated")]
 	public int Updated { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/UpdateByQueryResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/UpdateByQueryResponse.g.cs
index c08f04aa435..63e780925d5 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/UpdateByQueryResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/UpdateByQueryResponse.g.cs
@@ -18,46 +18,217 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch;
 
+internal sealed partial class UpdateByQueryResponseConverter : System.Text.Json.Serialization.JsonConverter<UpdateByQueryResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropBatches = System.Text.Json.JsonEncodedText.Encode("batches");
+	private static readonly System.Text.Json.JsonEncodedText PropDeleted = System.Text.Json.JsonEncodedText.Encode("deleted");
+	private static readonly System.Text.Json.JsonEncodedText PropFailures = System.Text.Json.JsonEncodedText.Encode("failures");
+	private static readonly System.Text.Json.JsonEncodedText PropNoops = System.Text.Json.JsonEncodedText.Encode("noops");
+	private static readonly System.Text.Json.JsonEncodedText PropRequestsPerSecond = System.Text.Json.JsonEncodedText.Encode("requests_per_second");
+	private static readonly System.Text.Json.JsonEncodedText PropRetries = System.Text.Json.JsonEncodedText.Encode("retries");
+	private static readonly System.Text.Json.JsonEncodedText PropTask = System.Text.Json.JsonEncodedText.Encode("task");
+	private static readonly System.Text.Json.JsonEncodedText PropThrottled = System.Text.Json.JsonEncodedText.Encode("throttled");
+	private static readonly System.Text.Json.JsonEncodedText PropThrottledMillis = System.Text.Json.JsonEncodedText.Encode("throttled_millis");
+	private static readonly System.Text.Json.JsonEncodedText PropThrottledUntil = System.Text.Json.JsonEncodedText.Encode("throttled_until");
+	private static readonly System.Text.Json.JsonEncodedText PropThrottledUntilMillis = System.Text.Json.JsonEncodedText.Encode("throttled_until_millis");
+	private static readonly System.Text.Json.JsonEncodedText PropTimedOut = System.Text.Json.JsonEncodedText.Encode("timed_out");
+	private static readonly System.Text.Json.JsonEncodedText PropTook = System.Text.Json.JsonEncodedText.Encode("took");
+	private static readonly System.Text.Json.JsonEncodedText PropTotal = System.Text.Json.JsonEncodedText.Encode("total");
+	private static readonly System.Text.Json.JsonEncodedText PropUpdated = System.Text.Json.JsonEncodedText.Encode("updated");
+	private static readonly System.Text.Json.JsonEncodedText PropVersionConflicts = System.Text.Json.JsonEncodedText.Encode("version_conflicts");
+
+	public override UpdateByQueryResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<long?> propBatches = default;
+		LocalJsonProperty<long?> propDeleted = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.BulkIndexByScrollFailure>?> propFailures = default;
+		LocalJsonProperty<long?> propNoops = default;
+		LocalJsonProperty<float?> propRequestsPerSecond = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Retries?> propRetries = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.TaskId?> propTask = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Duration?> propThrottled = default;
+		LocalJsonProperty<long?> propThrottledMillis = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Duration?> propThrottledUntil = default;
+		LocalJsonProperty<long?> propThrottledUntilMillis = default;
+		LocalJsonProperty<bool?> propTimedOut = default;
+		LocalJsonProperty<long?> propTook = default;
+		LocalJsonProperty<long?> propTotal = default;
+		LocalJsonProperty<long?> propUpdated = default;
+		LocalJsonProperty<long?> propVersionConflicts = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBatches.TryRead(ref reader, options, PropBatches))
+			{
+				continue;
+			}
+
+			if (propDeleted.TryRead(ref reader, options, PropDeleted))
+			{
+				continue;
+			}
+
+			if (propFailures.TryRead(ref reader, options, PropFailures))
+			{
+				continue;
+			}
+
+			if (propNoops.TryRead(ref reader, options, PropNoops))
+			{
+				continue;
+			}
+
+			if (propRequestsPerSecond.TryRead(ref reader, options, PropRequestsPerSecond))
+			{
+				continue;
+			}
+
+			if (propRetries.TryRead(ref reader, options, PropRetries))
+			{
+				continue;
+			}
+
+			if (propTask.TryRead(ref reader, options, PropTask))
+			{
+				continue;
+			}
+
+			if (propThrottled.TryRead(ref reader, options, PropThrottled))
+			{
+				continue;
+			}
+
+			if (propThrottledMillis.TryRead(ref reader, options, PropThrottledMillis))
+			{
+				continue;
+			}
+
+			if (propThrottledUntil.TryRead(ref reader, options, PropThrottledUntil))
+			{
+				continue;
+			}
+
+			if (propThrottledUntilMillis.TryRead(ref reader, options, PropThrottledUntilMillis))
+			{
+				continue;
+			}
+
+			if (propTimedOut.TryRead(ref reader, options, PropTimedOut))
+			{
+				continue;
+			}
+
+			if (propTook.TryRead(ref reader, options, PropTook))
+			{
+				continue;
+			}
+
+			if (propTotal.TryRead(ref reader, options, PropTotal))
+			{
+				continue;
+			}
+
+			if (propUpdated.TryRead(ref reader, options, PropUpdated))
+			{
+				continue;
+			}
+
+			if (propVersionConflicts.TryRead(ref reader, options, PropVersionConflicts))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new UpdateByQueryResponse
+		{
+			Batches = propBatches.Value
+,
+			Deleted = propDeleted.Value
+,
+			Failures = propFailures.Value
+,
+			Noops = propNoops.Value
+,
+			RequestsPerSecond = propRequestsPerSecond.Value
+,
+			Retries = propRetries.Value
+,
+			Task = propTask.Value
+,
+			Throttled = propThrottled.Value
+,
+			ThrottledMillis = propThrottledMillis.Value
+,
+			ThrottledUntil = propThrottledUntil.Value
+,
+			ThrottledUntilMillis = propThrottledUntilMillis.Value
+,
+			TimedOut = propTimedOut.Value
+,
+			Took = propTook.Value
+,
+			Total = propTotal.Value
+,
+			Updated = propUpdated.Value
+,
+			VersionConflicts = propVersionConflicts.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, UpdateByQueryResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBatches, value.Batches);
+		writer.WriteProperty(options, PropDeleted, value.Deleted);
+		writer.WriteProperty(options, PropFailures, value.Failures);
+		writer.WriteProperty(options, PropNoops, value.Noops);
+		writer.WriteProperty(options, PropRequestsPerSecond, value.RequestsPerSecond);
+		writer.WriteProperty(options, PropRetries, value.Retries);
+		writer.WriteProperty(options, PropTask, value.Task);
+		writer.WriteProperty(options, PropThrottled, value.Throttled);
+		writer.WriteProperty(options, PropThrottledMillis, value.ThrottledMillis);
+		writer.WriteProperty(options, PropThrottledUntil, value.ThrottledUntil);
+		writer.WriteProperty(options, PropThrottledUntilMillis, value.ThrottledUntilMillis);
+		writer.WriteProperty(options, PropTimedOut, value.TimedOut);
+		writer.WriteProperty(options, PropTook, value.Took);
+		writer.WriteProperty(options, PropTotal, value.Total);
+		writer.WriteProperty(options, PropUpdated, value.Updated);
+		writer.WriteProperty(options, PropVersionConflicts, value.VersionConflicts);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(UpdateByQueryResponseConverter))]
 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/UpdateByQueryRethrottleResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/UpdateByQueryRethrottleResponse.g.cs
index ed940ed3d73..7d0c22ef518 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/UpdateByQueryRethrottleResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/UpdateByQueryRethrottleResponse.g.cs
@@ -18,16 +18,52 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch;
 
+internal sealed partial class UpdateByQueryRethrottleResponseConverter : System.Text.Json.Serialization.JsonConverter<UpdateByQueryRethrottleResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropNodes = System.Text.Json.JsonEncodedText.Encode("nodes");
+
+	public override UpdateByQueryRethrottleResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Core.UpdateByQueryRethrottle.UpdateByQueryRethrottleNode>> propNodes = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propNodes.TryRead(ref reader, options, PropNodes))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new UpdateByQueryRethrottleResponse
+		{
+			Nodes = propNodes.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, UpdateByQueryRethrottleResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropNodes, value.Nodes);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(UpdateByQueryRethrottleResponseConverter))]
 public sealed partial class UpdateByQueryRethrottleResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("nodes")]
 	public IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Core.UpdateByQueryRethrottle.UpdateByQueryRethrottleNode> Nodes { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/UpdateRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/UpdateRequest.g.cs
index 2b7fb9ce352..e7f6b004ab6 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/UpdateRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/UpdateRequest.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport;
@@ -116,12 +117,123 @@ public sealed partial class UpdateRequestParameters : RequestParameters
 	public Elastic.Clients.Elasticsearch.WaitForActiveShards? WaitForActiveShards { get => Q<Elastic.Clients.Elasticsearch.WaitForActiveShards?>("wait_for_active_shards"); set => Q("wait_for_active_shards", value); }
 }
 
+internal sealed partial class UpdateRequestConverter<TDocument, TPartialDocument> : System.Text.Json.Serialization.JsonConverter<UpdateRequest<TDocument, TPartialDocument>>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropDetectNoop = System.Text.Json.JsonEncodedText.Encode("detect_noop");
+	private static readonly System.Text.Json.JsonEncodedText PropDoc = System.Text.Json.JsonEncodedText.Encode("doc");
+	private static readonly System.Text.Json.JsonEncodedText PropDocAsUpsert = System.Text.Json.JsonEncodedText.Encode("doc_as_upsert");
+	private static readonly System.Text.Json.JsonEncodedText PropScript = System.Text.Json.JsonEncodedText.Encode("script");
+	private static readonly System.Text.Json.JsonEncodedText PropScriptedUpsert = System.Text.Json.JsonEncodedText.Encode("scripted_upsert");
+	private static readonly System.Text.Json.JsonEncodedText PropSource = System.Text.Json.JsonEncodedText.Encode("_source");
+	private static readonly System.Text.Json.JsonEncodedText PropUpsert = System.Text.Json.JsonEncodedText.Encode("upsert");
+
+	public override UpdateRequest<TDocument, TPartialDocument> Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool?> propDetectNoop = default;
+		LocalJsonProperty<TPartialDocument?> propDoc = default;
+		LocalJsonProperty<bool?> propDocAsUpsert = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Script?> propScript = default;
+		LocalJsonProperty<bool?> propScriptedUpsert = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Core.Search.SourceConfig?> propSource = default;
+		LocalJsonProperty<TDocument?> propUpsert = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propDetectNoop.TryRead(ref reader, options, PropDetectNoop))
+			{
+				continue;
+			}
+
+			if (propDoc.TryRead(ref reader, options, PropDoc, typeof(SourceMarker<TPartialDocument?>)))
+			{
+				continue;
+			}
+
+			if (propDocAsUpsert.TryRead(ref reader, options, PropDocAsUpsert))
+			{
+				continue;
+			}
+
+			if (propScript.TryRead(ref reader, options, PropScript))
+			{
+				continue;
+			}
+
+			if (propScriptedUpsert.TryRead(ref reader, options, PropScriptedUpsert))
+			{
+				continue;
+			}
+
+			if (propSource.TryRead(ref reader, options, PropSource))
+			{
+				continue;
+			}
+
+			if (propUpsert.TryRead(ref reader, options, PropUpsert, typeof(SourceMarker<TDocument?>)))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new UpdateRequest<TDocument, TPartialDocument>
+		{
+			DetectNoop = propDetectNoop.Value
+	,
+			Doc = propDoc.Value
+	,
+			DocAsUpsert = propDocAsUpsert.Value
+	,
+			Script = propScript.Value
+	,
+			ScriptedUpsert = propScriptedUpsert.Value
+	,
+			Source = propSource.Value
+	,
+			Upsert = propUpsert.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, UpdateRequest<TDocument, TPartialDocument> value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDetectNoop, value.DetectNoop);
+		writer.WriteProperty(options, PropDoc, value.Doc, typeof(SourceMarker<TPartialDocument?>));
+		writer.WriteProperty(options, PropDocAsUpsert, value.DocAsUpsert);
+		writer.WriteProperty(options, PropScript, value.Script);
+		writer.WriteProperty(options, PropScriptedUpsert, value.ScriptedUpsert);
+		writer.WriteProperty(options, PropSource, value.Source);
+		writer.WriteProperty(options, PropUpsert, value.Upsert, typeof(SourceMarker<TDocument?>));
+		writer.WriteEndObject();
+	}
+}
+
+internal sealed partial class UpdateRequestConverterFactory : System.Text.Json.Serialization.JsonConverterFactory
+{
+	public override bool CanConvert(System.Type typeToConvert)
+	{
+		return typeToConvert.IsGenericType && typeToConvert.GetGenericTypeDefinition() == typeof(UpdateRequest<,>);
+	}
+
+	public override System.Text.Json.Serialization.JsonConverter CreateConverter(System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		var args = typeToConvert.GetGenericArguments();
+#pragma warning disable IL3050
+		var converter = (System.Text.Json.Serialization.JsonConverter)System.Activator.CreateInstance(typeof(UpdateRequestConverter<,>).MakeGenericType(args[0], args[1]), System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public, binder: null, args: null, culture: null)!;
+#pragma warning restore IL3050
+		return converter;
+	}
+}
+
 /// <summary>
 /// <para>
 /// Update a document.
 /// Updates a document by running a script or passing a partial document.
 /// </para>
 /// </summary>
+[JsonConverter(typeof(UpdateRequestConverterFactory))]
 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))
@@ -141,7 +253,6 @@ public UpdateRequest(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clie
 	/// 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>
@@ -149,7 +260,6 @@ public UpdateRequest(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clie
 	/// 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>
@@ -157,7 +267,6 @@ public UpdateRequest(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clie
 	/// The script language.
 	/// </para>
 	/// </summary>
-	[JsonIgnore]
 	public string? Lang { get => Q<string?>("lang"); set => Q("lang", value); }
 
 	/// <summary>
@@ -167,7 +276,6 @@ public UpdateRequest(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clie
 	/// 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>
@@ -175,7 +283,6 @@ public UpdateRequest(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clie
 	/// 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>
@@ -183,7 +290,6 @@ public UpdateRequest(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clie
 	/// 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>
@@ -191,7 +297,6 @@ public UpdateRequest(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clie
 	/// 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>
@@ -199,7 +304,6 @@ public UpdateRequest(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clie
 	/// 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>
@@ -207,7 +311,6 @@ public UpdateRequest(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clie
 	/// 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>
@@ -217,7 +320,6 @@ public UpdateRequest(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clie
 	/// 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>
@@ -227,7 +329,6 @@ public UpdateRequest(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clie
 	/// (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>
@@ -236,7 +337,6 @@ public UpdateRequest(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clie
 	/// to 'noop' if no change to the document occurred.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("detect_noop")]
 	public bool? DetectNoop { get; set; }
 
 	/// <summary>
@@ -244,8 +344,6 @@ public UpdateRequest(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clie
 	/// A partial update to an existing document.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("doc")]
-	[SourceConverter]
 	public TPartialDocument? Doc { get; set; }
 
 	/// <summary>
@@ -253,7 +351,6 @@ public UpdateRequest(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clie
 	/// 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>
@@ -261,7 +358,6 @@ public UpdateRequest(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clie
 	/// Script to execute to update the document.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("script")]
 	public Elastic.Clients.Elasticsearch.Script? Script { get; set; }
 
 	/// <summary>
@@ -269,7 +365,6 @@ public UpdateRequest(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clie
 	/// 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>
@@ -278,7 +373,6 @@ public UpdateRequest(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clie
 	/// list of the fields you want to retrieve.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("_source")]
 	public Elastic.Clients.Elasticsearch.Core.Search.SourceConfig? Source { get; set; }
 
 	/// <summary>
@@ -287,8 +381,6 @@ public UpdateRequest(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clie
 	/// new document. If the document exists, the 'script' is executed.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("upsert")]
-	[SourceConverter]
 	public TDocument? Upsert { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/UpdateResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/UpdateResponse.g.cs
index fb1f7195afe..7f4aca9830c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/UpdateResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/UpdateResponse.g.cs
@@ -18,32 +18,157 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch;
 
+internal sealed partial class UpdateResponseConverter<TDocument> : System.Text.Json.Serialization.JsonConverter<UpdateResponse<TDocument>>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropForcedRefresh = System.Text.Json.JsonEncodedText.Encode("forced_refresh");
+	private static readonly System.Text.Json.JsonEncodedText PropGet = System.Text.Json.JsonEncodedText.Encode("get");
+	private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("_id");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("_index");
+	private static readonly System.Text.Json.JsonEncodedText PropPrimaryTerm = System.Text.Json.JsonEncodedText.Encode("_primary_term");
+	private static readonly System.Text.Json.JsonEncodedText PropResult = System.Text.Json.JsonEncodedText.Encode("result");
+	private static readonly System.Text.Json.JsonEncodedText PropSeqNo = System.Text.Json.JsonEncodedText.Encode("_seq_no");
+	private static readonly System.Text.Json.JsonEncodedText PropShards = System.Text.Json.JsonEncodedText.Encode("_shards");
+	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("_version");
+
+	public override UpdateResponse<TDocument> Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool?> propForcedRefresh = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.InlineGet<TDocument>?> propGet = default;
+		LocalJsonProperty<string> propId = default;
+		LocalJsonProperty<string> propIndex = default;
+		LocalJsonProperty<long?> propPrimaryTerm = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Result> propResult = default;
+		LocalJsonProperty<long?> propSeqNo = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.ShardStatistics> propShards = default;
+		LocalJsonProperty<long> propVersion = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propForcedRefresh.TryRead(ref reader, options, PropForcedRefresh))
+			{
+				continue;
+			}
+
+			if (propGet.TryRead(ref reader, options, PropGet))
+			{
+				continue;
+			}
+
+			if (propId.TryRead(ref reader, options, PropId))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propPrimaryTerm.TryRead(ref reader, options, PropPrimaryTerm))
+			{
+				continue;
+			}
+
+			if (propResult.TryRead(ref reader, options, PropResult))
+			{
+				continue;
+			}
+
+			if (propSeqNo.TryRead(ref reader, options, PropSeqNo))
+			{
+				continue;
+			}
+
+			if (propShards.TryRead(ref reader, options, PropShards))
+			{
+				continue;
+			}
+
+			if (propVersion.TryRead(ref reader, options, PropVersion))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new UpdateResponse<TDocument>
+		{
+			ForcedRefresh = propForcedRefresh.Value
+,
+			Get = propGet.Value
+,
+			Id = propId.Value
+,
+			Index = propIndex.Value
+,
+			PrimaryTerm = propPrimaryTerm.Value
+,
+			Result = propResult.Value
+,
+			SeqNo = propSeqNo.Value
+,
+			Shards = propShards.Value
+,
+			Version = propVersion.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, UpdateResponse<TDocument> value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropForcedRefresh, value.ForcedRefresh);
+		writer.WriteProperty(options, PropGet, value.Get);
+		writer.WriteProperty(options, PropId, value.Id);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropPrimaryTerm, value.PrimaryTerm);
+		writer.WriteProperty(options, PropResult, value.Result);
+		writer.WriteProperty(options, PropSeqNo, value.SeqNo);
+		writer.WriteProperty(options, PropShards, value.Shards);
+		writer.WriteProperty(options, PropVersion, value.Version);
+		writer.WriteEndObject();
+	}
+}
+
+internal sealed partial class UpdateResponseConverterFactory : System.Text.Json.Serialization.JsonConverterFactory
+{
+	public override bool CanConvert(System.Type typeToConvert)
+	{
+		return typeToConvert.IsGenericType && typeToConvert.GetGenericTypeDefinition() == typeof(UpdateResponse<>);
+	}
+
+	public override System.Text.Json.Serialization.JsonConverter CreateConverter(System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		var args = typeToConvert.GetGenericArguments();
+#pragma warning disable IL3050
+		var converter = (System.Text.Json.Serialization.JsonConverter)System.Activator.CreateInstance(typeof(UpdateResponseConverter<>).MakeGenericType(args[0]), System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public, binder: null, args: null, culture: null)!;
+#pragma warning restore IL3050
+		return converter;
+	}
+}
+
+[JsonConverter(typeof(UpdateResponseConverterFactory))]
 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/Api/Xpack/XpackInfoResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Xpack/XpackInfoResponse.g.cs
index 6b636e1191f..311f2229981 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Xpack/XpackInfoResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Xpack/XpackInfoResponse.g.cs
@@ -18,22 +18,85 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Xpack;
 
+internal sealed partial class XpackInfoResponseConverter : System.Text.Json.Serialization.JsonConverter<XpackInfoResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropBuild = System.Text.Json.JsonEncodedText.Encode("build");
+	private static readonly System.Text.Json.JsonEncodedText PropFeatures = System.Text.Json.JsonEncodedText.Encode("features");
+	private static readonly System.Text.Json.JsonEncodedText PropLicense = System.Text.Json.JsonEncodedText.Encode("license");
+	private static readonly System.Text.Json.JsonEncodedText PropTagline = System.Text.Json.JsonEncodedText.Encode("tagline");
+
+	public override XpackInfoResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Xpack.BuildInformation> propBuild = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Xpack.Features> propFeatures = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Xpack.MinimalLicenseInformation> propLicense = default;
+		LocalJsonProperty<string> propTagline = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBuild.TryRead(ref reader, options, PropBuild))
+			{
+				continue;
+			}
+
+			if (propFeatures.TryRead(ref reader, options, PropFeatures))
+			{
+				continue;
+			}
+
+			if (propLicense.TryRead(ref reader, options, PropLicense))
+			{
+				continue;
+			}
+
+			if (propTagline.TryRead(ref reader, options, PropTagline))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new XpackInfoResponse
+		{
+			Build = propBuild.Value
+,
+			Features = propFeatures.Value
+,
+			License = propLicense.Value
+,
+			Tagline = propTagline.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, XpackInfoResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBuild, value.Build);
+		writer.WriteProperty(options, PropFeatures, value.Features);
+		writer.WriteProperty(options, PropLicense, value.License);
+		writer.WriteProperty(options, PropTagline, value.Tagline);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(XpackInfoResponseConverter))]
 public sealed partial class XpackInfoResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("build")]
 	public Elastic.Clients.Elasticsearch.Xpack.BuildInformation Build { get; init; }
-	[JsonInclude, JsonPropertyName("features")]
 	public Elastic.Clients.Elasticsearch.Xpack.Features Features { get; init; }
-	[JsonInclude, JsonPropertyName("license")]
 	public Elastic.Clients.Elasticsearch.Xpack.MinimalLicenseInformation License { get; init; }
-	[JsonInclude, JsonPropertyName("tagline")]
 	public string Tagline { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Xpack/XpackUsageResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Xpack/XpackUsageResponse.g.cs
index 347789ed115..63b05330f07 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Xpack/XpackUsageResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Xpack/XpackUsageResponse.g.cs
@@ -18,72 +18,360 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Elastic.Clients.Elasticsearch.Xpack;
 
+internal sealed partial class XpackUsageResponseConverter : System.Text.Json.Serialization.JsonConverter<XpackUsageResponse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAggregateMetric = System.Text.Json.JsonEncodedText.Encode("aggregate_metric");
+	private static readonly System.Text.Json.JsonEncodedText PropAnalytics = System.Text.Json.JsonEncodedText.Encode("analytics");
+	private static readonly System.Text.Json.JsonEncodedText PropArchive = System.Text.Json.JsonEncodedText.Encode("archive");
+	private static readonly System.Text.Json.JsonEncodedText PropCcr = System.Text.Json.JsonEncodedText.Encode("ccr");
+	private static readonly System.Text.Json.JsonEncodedText PropDataFrame = System.Text.Json.JsonEncodedText.Encode("data_frame");
+	private static readonly System.Text.Json.JsonEncodedText PropDataScience = System.Text.Json.JsonEncodedText.Encode("data_science");
+	private static readonly System.Text.Json.JsonEncodedText PropDataStreams = System.Text.Json.JsonEncodedText.Encode("data_streams");
+	private static readonly System.Text.Json.JsonEncodedText PropDataTiers = System.Text.Json.JsonEncodedText.Encode("data_tiers");
+	private static readonly System.Text.Json.JsonEncodedText PropEnrich = System.Text.Json.JsonEncodedText.Encode("enrich");
+	private static readonly System.Text.Json.JsonEncodedText PropEql = System.Text.Json.JsonEncodedText.Encode("eql");
+	private static readonly System.Text.Json.JsonEncodedText PropFlattened = System.Text.Json.JsonEncodedText.Encode("flattened");
+	private static readonly System.Text.Json.JsonEncodedText PropFrozenIndices = System.Text.Json.JsonEncodedText.Encode("frozen_indices");
+	private static readonly System.Text.Json.JsonEncodedText PropGraph = System.Text.Json.JsonEncodedText.Encode("graph");
+	private static readonly System.Text.Json.JsonEncodedText PropHealthApi = System.Text.Json.JsonEncodedText.Encode("health_api");
+	private static readonly System.Text.Json.JsonEncodedText PropIlm = System.Text.Json.JsonEncodedText.Encode("ilm");
+	private static readonly System.Text.Json.JsonEncodedText PropLogstash = System.Text.Json.JsonEncodedText.Encode("logstash");
+	private static readonly System.Text.Json.JsonEncodedText PropMl = System.Text.Json.JsonEncodedText.Encode("ml");
+	private static readonly System.Text.Json.JsonEncodedText PropMonitoring = System.Text.Json.JsonEncodedText.Encode("monitoring");
+	private static readonly System.Text.Json.JsonEncodedText PropRollup = System.Text.Json.JsonEncodedText.Encode("rollup");
+	private static readonly System.Text.Json.JsonEncodedText PropRuntimeFields = System.Text.Json.JsonEncodedText.Encode("runtime_fields");
+	private static readonly System.Text.Json.JsonEncodedText PropSearchableSnapshots = System.Text.Json.JsonEncodedText.Encode("searchable_snapshots");
+	private static readonly System.Text.Json.JsonEncodedText PropSecurity = System.Text.Json.JsonEncodedText.Encode("security");
+	private static readonly System.Text.Json.JsonEncodedText PropSlm = System.Text.Json.JsonEncodedText.Encode("slm");
+	private static readonly System.Text.Json.JsonEncodedText PropSpatial = System.Text.Json.JsonEncodedText.Encode("spatial");
+	private static readonly System.Text.Json.JsonEncodedText PropSql = System.Text.Json.JsonEncodedText.Encode("sql");
+	private static readonly System.Text.Json.JsonEncodedText PropTransform = System.Text.Json.JsonEncodedText.Encode("transform");
+	private static readonly System.Text.Json.JsonEncodedText PropVectors = System.Text.Json.JsonEncodedText.Encode("vectors");
+	private static readonly System.Text.Json.JsonEncodedText PropVotingOnly = System.Text.Json.JsonEncodedText.Encode("voting_only");
+	private static readonly System.Text.Json.JsonEncodedText PropWatcher = System.Text.Json.JsonEncodedText.Encode("watcher");
+
+	public override XpackUsageResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Xpack.Base> propAggregateMetric = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Xpack.Analytics> propAnalytics = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Xpack.Archive> propArchive = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Xpack.Ccr> propCcr = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Xpack.Base?> propDataFrame = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Xpack.Base?> propDataScience = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Xpack.DataStreams?> propDataStreams = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Xpack.DataTiers> propDataTiers = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Xpack.Base?> propEnrich = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Xpack.Eql> propEql = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Xpack.Flattened?> propFlattened = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Xpack.FrozenIndices> propFrozenIndices = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Xpack.Base> propGraph = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Xpack.HealthStatistics?> propHealthApi = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Xpack.Ilm> propIlm = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Xpack.Base> propLogstash = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Xpack.MachineLearning> propMl = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Xpack.Monitoring> propMonitoring = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Xpack.Base> propRollup = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Xpack.RuntimeFieldTypes?> propRuntimeFields = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Xpack.SearchableSnapshots> propSearchableSnapshots = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Xpack.Security> propSecurity = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Xpack.Slm> propSlm = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Xpack.Base> propSpatial = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Xpack.Sql> propSql = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Xpack.Base> propTransform = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Xpack.Vector?> propVectors = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Xpack.Base> propVotingOnly = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Xpack.Watcher> propWatcher = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAggregateMetric.TryRead(ref reader, options, PropAggregateMetric))
+			{
+				continue;
+			}
+
+			if (propAnalytics.TryRead(ref reader, options, PropAnalytics))
+			{
+				continue;
+			}
+
+			if (propArchive.TryRead(ref reader, options, PropArchive))
+			{
+				continue;
+			}
+
+			if (propCcr.TryRead(ref reader, options, PropCcr))
+			{
+				continue;
+			}
+
+			if (propDataFrame.TryRead(ref reader, options, PropDataFrame))
+			{
+				continue;
+			}
+
+			if (propDataScience.TryRead(ref reader, options, PropDataScience))
+			{
+				continue;
+			}
+
+			if (propDataStreams.TryRead(ref reader, options, PropDataStreams))
+			{
+				continue;
+			}
+
+			if (propDataTiers.TryRead(ref reader, options, PropDataTiers))
+			{
+				continue;
+			}
+
+			if (propEnrich.TryRead(ref reader, options, PropEnrich))
+			{
+				continue;
+			}
+
+			if (propEql.TryRead(ref reader, options, PropEql))
+			{
+				continue;
+			}
+
+			if (propFlattened.TryRead(ref reader, options, PropFlattened))
+			{
+				continue;
+			}
+
+			if (propFrozenIndices.TryRead(ref reader, options, PropFrozenIndices))
+			{
+				continue;
+			}
+
+			if (propGraph.TryRead(ref reader, options, PropGraph))
+			{
+				continue;
+			}
+
+			if (propHealthApi.TryRead(ref reader, options, PropHealthApi))
+			{
+				continue;
+			}
+
+			if (propIlm.TryRead(ref reader, options, PropIlm))
+			{
+				continue;
+			}
+
+			if (propLogstash.TryRead(ref reader, options, PropLogstash))
+			{
+				continue;
+			}
+
+			if (propMl.TryRead(ref reader, options, PropMl))
+			{
+				continue;
+			}
+
+			if (propMonitoring.TryRead(ref reader, options, PropMonitoring))
+			{
+				continue;
+			}
+
+			if (propRollup.TryRead(ref reader, options, PropRollup))
+			{
+				continue;
+			}
+
+			if (propRuntimeFields.TryRead(ref reader, options, PropRuntimeFields))
+			{
+				continue;
+			}
+
+			if (propSearchableSnapshots.TryRead(ref reader, options, PropSearchableSnapshots))
+			{
+				continue;
+			}
+
+			if (propSecurity.TryRead(ref reader, options, PropSecurity))
+			{
+				continue;
+			}
+
+			if (propSlm.TryRead(ref reader, options, PropSlm))
+			{
+				continue;
+			}
+
+			if (propSpatial.TryRead(ref reader, options, PropSpatial))
+			{
+				continue;
+			}
+
+			if (propSql.TryRead(ref reader, options, PropSql))
+			{
+				continue;
+			}
+
+			if (propTransform.TryRead(ref reader, options, PropTransform))
+			{
+				continue;
+			}
+
+			if (propVectors.TryRead(ref reader, options, PropVectors))
+			{
+				continue;
+			}
+
+			if (propVotingOnly.TryRead(ref reader, options, PropVotingOnly))
+			{
+				continue;
+			}
+
+			if (propWatcher.TryRead(ref reader, options, PropWatcher))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new XpackUsageResponse
+		{
+			AggregateMetric = propAggregateMetric.Value
+,
+			Analytics = propAnalytics.Value
+,
+			Archive = propArchive.Value
+,
+			Ccr = propCcr.Value
+,
+			DataFrame = propDataFrame.Value
+,
+			DataScience = propDataScience.Value
+,
+			DataStreams = propDataStreams.Value
+,
+			DataTiers = propDataTiers.Value
+,
+			Enrich = propEnrich.Value
+,
+			Eql = propEql.Value
+,
+			Flattened = propFlattened.Value
+,
+			FrozenIndices = propFrozenIndices.Value
+,
+			Graph = propGraph.Value
+,
+			HealthApi = propHealthApi.Value
+,
+			Ilm = propIlm.Value
+,
+			Logstash = propLogstash.Value
+,
+			Ml = propMl.Value
+,
+			Monitoring = propMonitoring.Value
+,
+			Rollup = propRollup.Value
+,
+			RuntimeFields = propRuntimeFields.Value
+,
+			SearchableSnapshots = propSearchableSnapshots.Value
+,
+			Security = propSecurity.Value
+,
+			Slm = propSlm.Value
+,
+			Spatial = propSpatial.Value
+,
+			Sql = propSql.Value
+,
+			Transform = propTransform.Value
+,
+			Vectors = propVectors.Value
+,
+			VotingOnly = propVotingOnly.Value
+,
+			Watcher = propWatcher.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, XpackUsageResponse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAggregateMetric, value.AggregateMetric);
+		writer.WriteProperty(options, PropAnalytics, value.Analytics);
+		writer.WriteProperty(options, PropArchive, value.Archive);
+		writer.WriteProperty(options, PropCcr, value.Ccr);
+		writer.WriteProperty(options, PropDataFrame, value.DataFrame);
+		writer.WriteProperty(options, PropDataScience, value.DataScience);
+		writer.WriteProperty(options, PropDataStreams, value.DataStreams);
+		writer.WriteProperty(options, PropDataTiers, value.DataTiers);
+		writer.WriteProperty(options, PropEnrich, value.Enrich);
+		writer.WriteProperty(options, PropEql, value.Eql);
+		writer.WriteProperty(options, PropFlattened, value.Flattened);
+		writer.WriteProperty(options, PropFrozenIndices, value.FrozenIndices);
+		writer.WriteProperty(options, PropGraph, value.Graph);
+		writer.WriteProperty(options, PropHealthApi, value.HealthApi);
+		writer.WriteProperty(options, PropIlm, value.Ilm);
+		writer.WriteProperty(options, PropLogstash, value.Logstash);
+		writer.WriteProperty(options, PropMl, value.Ml);
+		writer.WriteProperty(options, PropMonitoring, value.Monitoring);
+		writer.WriteProperty(options, PropRollup, value.Rollup);
+		writer.WriteProperty(options, PropRuntimeFields, value.RuntimeFields);
+		writer.WriteProperty(options, PropSearchableSnapshots, value.SearchableSnapshots);
+		writer.WriteProperty(options, PropSecurity, value.Security);
+		writer.WriteProperty(options, PropSlm, value.Slm);
+		writer.WriteProperty(options, PropSpatial, value.Spatial);
+		writer.WriteProperty(options, PropSql, value.Sql);
+		writer.WriteProperty(options, PropTransform, value.Transform);
+		writer.WriteProperty(options, PropVectors, value.Vectors);
+		writer.WriteProperty(options, PropVotingOnly, value.VotingOnly);
+		writer.WriteProperty(options, PropWatcher, value.Watcher);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(XpackUsageResponseConverter))]
 public sealed partial class XpackUsageResponse : ElasticsearchResponse
 {
-	[JsonInclude, JsonPropertyName("aggregate_metric")]
 	public Elastic.Clients.Elasticsearch.Xpack.Base AggregateMetric { get; init; }
-	[JsonInclude, JsonPropertyName("analytics")]
 	public Elastic.Clients.Elasticsearch.Xpack.Analytics Analytics { get; init; }
-	[JsonInclude, JsonPropertyName("archive")]
 	public Elastic.Clients.Elasticsearch.Xpack.Archive Archive { get; init; }
-	[JsonInclude, JsonPropertyName("ccr")]
 	public Elastic.Clients.Elasticsearch.Xpack.Ccr Ccr { get; init; }
-	[JsonInclude, JsonPropertyName("data_frame")]
 	public Elastic.Clients.Elasticsearch.Xpack.Base? DataFrame { get; init; }
-	[JsonInclude, JsonPropertyName("data_science")]
 	public Elastic.Clients.Elasticsearch.Xpack.Base? DataScience { get; init; }
-	[JsonInclude, JsonPropertyName("data_streams")]
 	public Elastic.Clients.Elasticsearch.Xpack.DataStreams? DataStreams { get; init; }
-	[JsonInclude, JsonPropertyName("data_tiers")]
 	public Elastic.Clients.Elasticsearch.Xpack.DataTiers DataTiers { get; init; }
-	[JsonInclude, JsonPropertyName("enrich")]
 	public Elastic.Clients.Elasticsearch.Xpack.Base? Enrich { get; init; }
-	[JsonInclude, JsonPropertyName("eql")]
 	public Elastic.Clients.Elasticsearch.Xpack.Eql Eql { get; init; }
-	[JsonInclude, JsonPropertyName("flattened")]
 	public Elastic.Clients.Elasticsearch.Xpack.Flattened? Flattened { get; init; }
-	[JsonInclude, JsonPropertyName("frozen_indices")]
 	public Elastic.Clients.Elasticsearch.Xpack.FrozenIndices FrozenIndices { get; init; }
-	[JsonInclude, JsonPropertyName("graph")]
 	public Elastic.Clients.Elasticsearch.Xpack.Base Graph { get; init; }
-	[JsonInclude, JsonPropertyName("health_api")]
 	public Elastic.Clients.Elasticsearch.Xpack.HealthStatistics? HealthApi { get; init; }
-	[JsonInclude, JsonPropertyName("ilm")]
 	public Elastic.Clients.Elasticsearch.Xpack.Ilm Ilm { get; init; }
-	[JsonInclude, JsonPropertyName("logstash")]
 	public Elastic.Clients.Elasticsearch.Xpack.Base Logstash { get; init; }
-	[JsonInclude, JsonPropertyName("ml")]
 	public Elastic.Clients.Elasticsearch.Xpack.MachineLearning Ml { get; init; }
-	[JsonInclude, JsonPropertyName("monitoring")]
 	public Elastic.Clients.Elasticsearch.Xpack.Monitoring Monitoring { get; init; }
-	[JsonInclude, JsonPropertyName("rollup")]
 	public Elastic.Clients.Elasticsearch.Xpack.Base Rollup { get; init; }
-	[JsonInclude, JsonPropertyName("runtime_fields")]
 	public Elastic.Clients.Elasticsearch.Xpack.RuntimeFieldTypes? RuntimeFields { get; init; }
-	[JsonInclude, JsonPropertyName("searchable_snapshots")]
 	public Elastic.Clients.Elasticsearch.Xpack.SearchableSnapshots SearchableSnapshots { get; init; }
-	[JsonInclude, JsonPropertyName("security")]
 	public Elastic.Clients.Elasticsearch.Xpack.Security Security { get; init; }
-	[JsonInclude, JsonPropertyName("slm")]
 	public Elastic.Clients.Elasticsearch.Xpack.Slm Slm { get; init; }
-	[JsonInclude, JsonPropertyName("spatial")]
 	public Elastic.Clients.Elasticsearch.Xpack.Base Spatial { get; init; }
-	[JsonInclude, JsonPropertyName("sql")]
 	public Elastic.Clients.Elasticsearch.Xpack.Sql Sql { get; init; }
-	[JsonInclude, JsonPropertyName("transform")]
 	public Elastic.Clients.Elasticsearch.Xpack.Base Transform { get; init; }
-	[JsonInclude, JsonPropertyName("vectors")]
 	public Elastic.Clients.Elasticsearch.Xpack.Vector? Vectors { get; init; }
-	[JsonInclude, JsonPropertyName("voting_only")]
 	public Elastic.Clients.Elasticsearch.Xpack.Base VotingOnly { get; init; }
-	[JsonInclude, JsonPropertyName("watcher")]
 	public Elastic.Clients.Elasticsearch.Xpack.Watcher Watcher { get; init; }
 }
\ 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 5b0e0007e35..a2965704b6e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/AdjacencyMatrixAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/AdjacencyMatrixAggregate.g.cs
@@ -33,4 +33,6 @@ public sealed partial class AdjacencyMatrixAggregate : IAggregate
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Aggregations.AdjacencyMatrixBucket> Buckets { get; init; }
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
+
+	string IAggregate.Type => "adjacency_matrix";
 }
\ No newline at end of file
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 f238c0e248c..f9e15104317 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/AdjacencyMatrixBucket.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/AdjacencyMatrixBucket.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,49 +28,60 @@
 
 namespace Elastic.Clients.Elasticsearch.Aggregations;
 
-internal sealed partial class AdjacencyMatrixBucketConverter : JsonConverter<AdjacencyMatrixBucket>
+internal sealed partial class AdjacencyMatrixBucketConverter : System.Text.Json.Serialization.JsonConverter<AdjacencyMatrixBucket>
 {
-	public override AdjacencyMatrixBucket Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropDocCount = System.Text.Json.JsonEncodedText.Encode("doc_count");
+	private static readonly System.Text.Json.JsonEncodedText PropKey = System.Text.Json.JsonEncodedText.Encode("key");
+
+	public override AdjacencyMatrixBucket Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		long docCount = default;
-		string key = default;
-		Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate> propAggregations = default;
+		LocalJsonProperty<long> propDocCount = default;
+		LocalJsonProperty<string> propKey = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propDocCount.TryRead(ref reader, options, PropDocCount))
 			{
-				var property = reader.GetString();
-				if (property == "doc_count")
-				{
-					docCount = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "key")
-				{
-					key = JsonSerializer.Deserialize<string>(ref reader, options);
-					continue;
-				}
-
-				if (property.Contains("#"))
-				{
-					additionalProperties ??= new Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate>();
-					AggregateDictionaryConverter.ReadItem(ref reader, options, additionalProperties, property);
-					continue;
-				}
+				continue;
+			}
 
-				throw new JsonException("Unknown property read from JSON.");
+			if (propKey.TryRead(ref reader, options, PropKey))
+			{
+				continue;
 			}
+
+			propAggregations ??= new System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate>();
+			Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionaryConverter.ReadItem(ref reader, options, out string key, out Elastic.Clients.Elasticsearch.Aggregations.IAggregate value);
+			propAggregations[key] = value;
 		}
 
-		return new AdjacencyMatrixBucket { Aggregations = new Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary(additionalProperties), DocCount = docCount, Key = key };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new AdjacencyMatrixBucket
+		{
+			Aggregations = new Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary(propAggregations)
+,
+			DocCount = propDocCount.Value
+,
+			Key = propKey.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, AdjacencyMatrixBucket value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, AdjacencyMatrixBucket value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'AdjacencyMatrixBucket' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDocCount, value.DocCount);
+		writer.WriteProperty(options, PropKey, value.Key);
+		if (value.Aggregations is not null)
+		{
+			foreach (var item in value.Aggregations)
+			{
+				Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionaryConverter.WriteItem(writer, options, item.Key, item.Value);
+			}
+		}
+
+		writer.WriteEndObject();
 	}
 }
 
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 6198ae808d5..28d8b307ce0 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/AggregateDictionary.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/AggregateDictionary.g.cs
@@ -19,6 +19,7 @@
 
 using Elastic.Clients.Elasticsearch.Core;
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport;
 using System;
@@ -33,6 +34,7 @@ namespace Elastic.Clients.Elasticsearch.Aggregations;
 
 public partial interface IAggregate
 {
+	public string? Type { get; }
 }
 
 [JsonConverter(typeof(AggregateDictionaryConverter))]
@@ -115,530 +117,338 @@ public AggregateDictionary(IReadOnlyDictionary<string, IAggregate> backingDictio
 	private T? TryGet<T>(string key) where T : class, IAggregate => BackingDictionary.TryGetValue(key, out var value) ? value as T : null;
 }
 
-internal sealed partial class AggregateDictionaryConverter : JsonConverter<AggregateDictionary>
+internal sealed partial class AggregateDictionaryConverter : System.Text.Json.Serialization.JsonConverter<AggregateDictionary>
 {
-	public override AggregateDictionary Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	public override AggregateDictionary Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var dictionary = new Dictionary<string, IAggregate>();
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException($"Expected {JsonTokenType.StartObject} but read {reader.TokenType}.");
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		var dictionary = new System.Collections.Generic.Dictionary<string, IAggregate>();
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
-				throw new JsonException($"Expected {JsonTokenType.PropertyName} but read {reader.TokenType}.");
-			var name = reader.GetString();
-			reader.Read();
-			ReadItem(ref reader, options, dictionary, name);
+			ReadItem(ref reader, options, out string name, out IAggregate value);
+			dictionary[name] = value;
 		}
 
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
 		return new AggregateDictionary(dictionary);
 	}
 
-	public override void Write(Utf8JsonWriter writer, AggregateDictionary value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, AggregateDictionary value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'AggregateDictionary' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		foreach (var pair in value)
+		{
+			WriteItem(writer, options, pair.Key, pair.Value);
+		}
+
+		writer.WriteEndObject();
 	}
 
-	public static void ReadItem(ref Utf8JsonReader reader, JsonSerializerOptions options, Dictionary<string, IAggregate> dictionary, string name)
+	internal static void ReadItem(ref System.Text.Json.Utf8JsonReader reader, System.Text.Json.JsonSerializerOptions options, out string name, out IAggregate value)
 	{
-		var nameParts = name.Split('#');
-		if (nameParts.Length != 2)
-			throw new JsonException($"Unable to parse typed-key '{name}'.");
-		var type = nameParts[0];
-		switch (type)
+		reader.ReadPropertyName(options, out string key);
+		reader.Read();
+		var parts = key.Split('#');
+		if (parts.Length != 2)
 		{
-			case "adjacency_matrix":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.AdjacencyMatrixAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "auto_date_histogram":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.AutoDateHistogramAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "avg":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.AverageAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "boxplot":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.BoxplotAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "bucket_metric_value":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.BucketMetricValueAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "cardinality":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.CardinalityAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "children":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.ChildrenAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "composite":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.CompositeAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "simple_long_value":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.CumulativeCardinalityAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "date_histogram":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.DateHistogramAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "date_range":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.DateRangeAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "derivative":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.DerivativeAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "dterms":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.DoubleTermsAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "extended_stats":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.ExtendedStatsAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "extended_stats_bucket":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.ExtendedStatsBucketAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "filter":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.FilterAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "filters":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.FiltersAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "frequent_item_sets":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.FrequentItemSetsAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "geo_bounds":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.GeoBoundsAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "geo_centroid":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.GeoCentroidAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "geo_distance":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.GeoDistanceAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "geohash_grid":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.GeohashGridAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "geohex_grid":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.GeohexGridAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "geo_line":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.GeoLineAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "geotile_grid":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.GeotileGridAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "global":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.GlobalAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "hdr_percentile_ranks":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.HdrPercentileRanksAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "hdr_percentiles":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.HdrPercentilesAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "histogram":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.HistogramAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "inference":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.InferenceAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "ip_prefix":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.IpPrefixAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "ip_range":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.IpRangeAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "lrareterms":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.LongRareTermsAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "lterms":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.LongTermsAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "matrix_stats":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.MatrixStatsAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "max":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.MaxAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "median_absolute_deviation":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.MedianAbsoluteDeviationAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "min":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.MinAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "missing":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.MissingAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "multi_terms":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.MultiTermsAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "nested":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.NestedAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "parent":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.ParentAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "percentiles_bucket":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.PercentilesBucketAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "range":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.RangeAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "rate":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.RateAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "reverse_nested":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.ReverseNestedAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "sampler":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.SamplerAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "scripted_metric":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.ScriptedMetricAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "siglterms":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.SignificantLongTermsAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "sigsterms":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.SignificantStringTermsAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "simple_value":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.SimpleValueAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "stats":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.StatsAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "stats_bucket":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.StatsBucketAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "srareterms":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.StringRareTermsAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "string_stats":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.StringStatsAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "sterms":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.StringTermsAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "sum":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.SumAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "tdigest_percentile_ranks":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.TDigestPercentileRanksAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "tdigest_percentiles":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.TDigestPercentilesAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "time_series":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.TimeSeriesAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "top_hits":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.TopHitsAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "top_metrics":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.TopMetricsAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "t_test":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.TTestAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "umrareterms":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.UnmappedRareTermsAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "unmapped_sampler":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.UnmappedSamplerAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "umsigterms":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.UnmappedSignificantTermsAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "umterms":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.UnmappedTermsAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "value_count":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.ValueCountAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "variable_width_histogram":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.VariableWidthHistogramAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
+			throw new System.Text.Json.JsonException($"Unable to parse typed-key '{key}' for variant '{nameof(IAggregate)}'.");
+		}
 
-			case "weighted_avg":
-				{
-					var item = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.WeightedAverageAggregate>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
+		var discriminator = parts[0];
+		name = parts[1];
+		value = discriminator switch
+		{
+			"adjacency_matrix" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.AdjacencyMatrixAggregate>(options),
+			"auto_date_histogram" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.AutoDateHistogramAggregate>(options),
+			"avg" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.AverageAggregate>(options),
+			"boxplot" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.BoxplotAggregate>(options),
+			"bucket_metric_value" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.BucketMetricValueAggregate>(options),
+			"cardinality" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.CardinalityAggregate>(options),
+			"children" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.ChildrenAggregate>(options),
+			"composite" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.CompositeAggregate>(options),
+			"simple_long_value" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.CumulativeCardinalityAggregate>(options),
+			"date_histogram" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.DateHistogramAggregate>(options),
+			"date_range" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.DateRangeAggregate>(options),
+			"derivative" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.DerivativeAggregate>(options),
+			"dterms" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.DoubleTermsAggregate>(options),
+			"extended_stats" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.ExtendedStatsAggregate>(options),
+			"extended_stats_bucket" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.ExtendedStatsBucketAggregate>(options),
+			"filter" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.FilterAggregate>(options),
+			"filters" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.FiltersAggregate>(options),
+			"frequent_item_sets" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.FrequentItemSetsAggregate>(options),
+			"geo_bounds" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.GeoBoundsAggregate>(options),
+			"geo_centroid" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.GeoCentroidAggregate>(options),
+			"geo_distance" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.GeoDistanceAggregate>(options),
+			"geohash_grid" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.GeohashGridAggregate>(options),
+			"geohex_grid" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.GeohexGridAggregate>(options),
+			"geo_line" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.GeoLineAggregate>(options),
+			"geotile_grid" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.GeotileGridAggregate>(options),
+			"global" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.GlobalAggregate>(options),
+			"hdr_percentile_ranks" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.HdrPercentileRanksAggregate>(options),
+			"hdr_percentiles" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.HdrPercentilesAggregate>(options),
+			"histogram" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.HistogramAggregate>(options),
+			"inference" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.InferenceAggregate>(options),
+			"ip_prefix" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.IpPrefixAggregate>(options),
+			"ip_range" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.IpRangeAggregate>(options),
+			"lrareterms" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.LongRareTermsAggregate>(options),
+			"lterms" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.LongTermsAggregate>(options),
+			"matrix_stats" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.MatrixStatsAggregate>(options),
+			"max" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.MaxAggregate>(options),
+			"median_absolute_deviation" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.MedianAbsoluteDeviationAggregate>(options),
+			"min" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.MinAggregate>(options),
+			"missing" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.MissingAggregate>(options),
+			"multi_terms" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.MultiTermsAggregate>(options),
+			"nested" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.NestedAggregate>(options),
+			"parent" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.ParentAggregate>(options),
+			"percentiles_bucket" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.PercentilesBucketAggregate>(options),
+			"range" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.RangeAggregate>(options),
+			"rate" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.RateAggregate>(options),
+			"reverse_nested" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.ReverseNestedAggregate>(options),
+			"sampler" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.SamplerAggregate>(options),
+			"scripted_metric" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.ScriptedMetricAggregate>(options),
+			"siglterms" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.SignificantLongTermsAggregate>(options),
+			"sigsterms" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.SignificantStringTermsAggregate>(options),
+			"simple_value" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.SimpleValueAggregate>(options),
+			"stats" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.StatsAggregate>(options),
+			"stats_bucket" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.StatsBucketAggregate>(options),
+			"srareterms" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.StringRareTermsAggregate>(options),
+			"string_stats" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.StringStatsAggregate>(options),
+			"sterms" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.StringTermsAggregate>(options),
+			"sum" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.SumAggregate>(options),
+			"tdigest_percentile_ranks" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.TDigestPercentileRanksAggregate>(options),
+			"tdigest_percentiles" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.TDigestPercentilesAggregate>(options),
+			"time_series" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.TimeSeriesAggregate>(options),
+			"top_hits" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.TopHitsAggregate>(options),
+			"top_metrics" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.TopMetricsAggregate>(options),
+			"t_test" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.TTestAggregate>(options),
+			"umrareterms" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.UnmappedRareTermsAggregate>(options),
+			"unmapped_sampler" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.UnmappedSamplerAggregate>(options),
+			"umsigterms" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.UnmappedSignificantTermsAggregate>(options),
+			"umterms" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.UnmappedTermsAggregate>(options),
+			"value_count" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.ValueCountAggregate>(options),
+			"variable_width_histogram" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.VariableWidthHistogramAggregate>(options),
+			"weighted_avg" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.WeightedAverageAggregate>(options),
+			_ => throw new System.Text.Json.JsonException($"Variant '{discriminator}' is not supported for type '{nameof(IAggregate)}'.")
+		};
+	}
 
+	internal static void WriteItem(System.Text.Json.Utf8JsonWriter writer, System.Text.Json.JsonSerializerOptions options, string name, IAggregate value)
+	{
+		var key = value.Type + '#' + name;
+		switch (value)
+		{
+			case Elastic.Clients.Elasticsearch.Aggregations.AdjacencyMatrixAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Aggregations.AutoDateHistogramAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Aggregations.AverageAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Aggregations.BoxplotAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Aggregations.BucketMetricValueAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Aggregations.CardinalityAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Aggregations.ChildrenAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Aggregations.CompositeAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Aggregations.CumulativeCardinalityAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Aggregations.DateHistogramAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Aggregations.DateRangeAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Aggregations.DerivativeAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Aggregations.DoubleTermsAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Aggregations.ExtendedStatsAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Aggregations.ExtendedStatsBucketAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Aggregations.FilterAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Aggregations.FiltersAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Aggregations.FrequentItemSetsAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Aggregations.GeoBoundsAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Aggregations.GeoCentroidAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Aggregations.GeoDistanceAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Aggregations.GeohashGridAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Aggregations.GeohexGridAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Aggregations.GeoLineAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Aggregations.GeotileGridAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Aggregations.GlobalAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Aggregations.HdrPercentileRanksAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Aggregations.HdrPercentilesAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Aggregations.HistogramAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Aggregations.InferenceAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Aggregations.IpPrefixAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Aggregations.IpRangeAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Aggregations.LongRareTermsAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Aggregations.LongTermsAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Aggregations.MatrixStatsAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Aggregations.MaxAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Aggregations.MedianAbsoluteDeviationAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Aggregations.MinAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Aggregations.MissingAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Aggregations.MultiTermsAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Aggregations.NestedAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Aggregations.ParentAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Aggregations.PercentilesBucketAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Aggregations.RangeAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Aggregations.RateAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Aggregations.ReverseNestedAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Aggregations.SamplerAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Aggregations.ScriptedMetricAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Aggregations.SignificantLongTermsAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Aggregations.SignificantStringTermsAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Aggregations.SimpleValueAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Aggregations.StatsAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Aggregations.StatsBucketAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Aggregations.StringRareTermsAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Aggregations.StringStatsAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Aggregations.StringTermsAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Aggregations.SumAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Aggregations.TDigestPercentileRanksAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Aggregations.TDigestPercentilesAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Aggregations.TimeSeriesAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Aggregations.TopHitsAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Aggregations.TopMetricsAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Aggregations.TTestAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Aggregations.UnmappedRareTermsAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Aggregations.UnmappedSamplerAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Aggregations.UnmappedSignificantTermsAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Aggregations.UnmappedTermsAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Aggregations.ValueCountAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Aggregations.VariableWidthHistogramAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case Elastic.Clients.Elasticsearch.Aggregations.WeightedAverageAggregate v:
+				writer.WriteProperty(options, key, v);
+				break;
 			default:
-				throw new NotSupportedException($"The tagged variant '{type}' is currently not supported.");
+				throw new System.Text.Json.JsonException($"Variant '{0}' is not supported for type '{nameof(IAggregate)}'.");
 		}
 	}
 }
\ 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 3ce7c7ac1d7..32151a0470c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/Aggregation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/Aggregation.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -39,12 +40,16 @@ internal Aggregation(string variantName, object variant)
 			throw new ArgumentNullException(nameof(variant));
 		if (string.IsNullOrWhiteSpace(variantName))
 			throw new ArgumentException("Variant name must not be empty or whitespace.");
-		VariantName = variantName;
+		VariantType = variantName;
 		Variant = variant;
 	}
 
-	internal object Variant { get; }
-	internal string VariantName { get; }
+	internal Aggregation()
+	{
+	}
+
+	public object Variant { get; internal set; }
+	public string VariantType { get; internal set; }
 
 	public static Aggregation AdjacencyMatrix(Elastic.Clients.Elasticsearch.Aggregations.AdjacencyMatrixAggregation adjacencyMatrixAggregation) => new Aggregation("adjacency_matrix", adjacencyMatrixAggregation);
 	public static Aggregation AutoDateHistogram(Elastic.Clients.Elasticsearch.Aggregations.AutoDateHistogramAggregation autoDateHistogramAggregation) => new Aggregation("auto_date_histogram", autoDateHistogramAggregation);
@@ -148,847 +153,982 @@ public bool TryGet<T>([NotNullWhen(true)] out T? result) where T : class
 	}
 }
 
-internal sealed partial class AggregationConverter : JsonConverter<Aggregation>
+internal sealed partial class AggregationConverter : System.Text.Json.Serialization.JsonConverter<Aggregation>
 {
-	public override Aggregation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations1 = System.Text.Json.JsonEncodedText.Encode("aggs");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText VariantAdjacencyMatrix = System.Text.Json.JsonEncodedText.Encode("adjacency_matrix");
+	private static readonly System.Text.Json.JsonEncodedText VariantAutoDateHistogram = System.Text.Json.JsonEncodedText.Encode("auto_date_histogram");
+	private static readonly System.Text.Json.JsonEncodedText VariantAvg = System.Text.Json.JsonEncodedText.Encode("avg");
+	private static readonly System.Text.Json.JsonEncodedText VariantAvgBucket = System.Text.Json.JsonEncodedText.Encode("avg_bucket");
+	private static readonly System.Text.Json.JsonEncodedText VariantBoxplot = System.Text.Json.JsonEncodedText.Encode("boxplot");
+	private static readonly System.Text.Json.JsonEncodedText VariantBucketCorrelation = System.Text.Json.JsonEncodedText.Encode("bucket_correlation");
+	private static readonly System.Text.Json.JsonEncodedText VariantBucketCountKsTest = System.Text.Json.JsonEncodedText.Encode("bucket_count_ks_test");
+	private static readonly System.Text.Json.JsonEncodedText VariantBucketScript = System.Text.Json.JsonEncodedText.Encode("bucket_script");
+	private static readonly System.Text.Json.JsonEncodedText VariantBucketSelector = System.Text.Json.JsonEncodedText.Encode("bucket_selector");
+	private static readonly System.Text.Json.JsonEncodedText VariantBucketSort = System.Text.Json.JsonEncodedText.Encode("bucket_sort");
+	private static readonly System.Text.Json.JsonEncodedText VariantCardinality = System.Text.Json.JsonEncodedText.Encode("cardinality");
+	private static readonly System.Text.Json.JsonEncodedText VariantCategorizeText = System.Text.Json.JsonEncodedText.Encode("categorize_text");
+	private static readonly System.Text.Json.JsonEncodedText VariantChildren = System.Text.Json.JsonEncodedText.Encode("children");
+	private static readonly System.Text.Json.JsonEncodedText VariantComposite = System.Text.Json.JsonEncodedText.Encode("composite");
+	private static readonly System.Text.Json.JsonEncodedText VariantCumulativeCardinality = System.Text.Json.JsonEncodedText.Encode("cumulative_cardinality");
+	private static readonly System.Text.Json.JsonEncodedText VariantCumulativeSum = System.Text.Json.JsonEncodedText.Encode("cumulative_sum");
+	private static readonly System.Text.Json.JsonEncodedText VariantDateHistogram = System.Text.Json.JsonEncodedText.Encode("date_histogram");
+	private static readonly System.Text.Json.JsonEncodedText VariantDateRange = System.Text.Json.JsonEncodedText.Encode("date_range");
+	private static readonly System.Text.Json.JsonEncodedText VariantDerivative = System.Text.Json.JsonEncodedText.Encode("derivative");
+	private static readonly System.Text.Json.JsonEncodedText VariantDiversifiedSampler = System.Text.Json.JsonEncodedText.Encode("diversified_sampler");
+	private static readonly System.Text.Json.JsonEncodedText VariantExtendedStats = System.Text.Json.JsonEncodedText.Encode("extended_stats");
+	private static readonly System.Text.Json.JsonEncodedText VariantExtendedStatsBucket = System.Text.Json.JsonEncodedText.Encode("extended_stats_bucket");
+	private static readonly System.Text.Json.JsonEncodedText VariantFilter = System.Text.Json.JsonEncodedText.Encode("filter");
+	private static readonly System.Text.Json.JsonEncodedText VariantFilters = System.Text.Json.JsonEncodedText.Encode("filters");
+	private static readonly System.Text.Json.JsonEncodedText VariantFrequentItemSets = System.Text.Json.JsonEncodedText.Encode("frequent_item_sets");
+	private static readonly System.Text.Json.JsonEncodedText VariantGeoBounds = System.Text.Json.JsonEncodedText.Encode("geo_bounds");
+	private static readonly System.Text.Json.JsonEncodedText VariantGeoCentroid = System.Text.Json.JsonEncodedText.Encode("geo_centroid");
+	private static readonly System.Text.Json.JsonEncodedText VariantGeoDistance = System.Text.Json.JsonEncodedText.Encode("geo_distance");
+	private static readonly System.Text.Json.JsonEncodedText VariantGeohashGrid = System.Text.Json.JsonEncodedText.Encode("geohash_grid");
+	private static readonly System.Text.Json.JsonEncodedText VariantGeohexGrid = System.Text.Json.JsonEncodedText.Encode("geohex_grid");
+	private static readonly System.Text.Json.JsonEncodedText VariantGeoLine = System.Text.Json.JsonEncodedText.Encode("geo_line");
+	private static readonly System.Text.Json.JsonEncodedText VariantGeotileGrid = System.Text.Json.JsonEncodedText.Encode("geotile_grid");
+	private static readonly System.Text.Json.JsonEncodedText VariantGlobal = System.Text.Json.JsonEncodedText.Encode("global");
+	private static readonly System.Text.Json.JsonEncodedText VariantHistogram = System.Text.Json.JsonEncodedText.Encode("histogram");
+	private static readonly System.Text.Json.JsonEncodedText VariantInference = System.Text.Json.JsonEncodedText.Encode("inference");
+	private static readonly System.Text.Json.JsonEncodedText VariantIpPrefix = System.Text.Json.JsonEncodedText.Encode("ip_prefix");
+	private static readonly System.Text.Json.JsonEncodedText VariantIpRange = System.Text.Json.JsonEncodedText.Encode("ip_range");
+	private static readonly System.Text.Json.JsonEncodedText VariantLine = System.Text.Json.JsonEncodedText.Encode("line");
+	private static readonly System.Text.Json.JsonEncodedText VariantMatrixStats = System.Text.Json.JsonEncodedText.Encode("matrix_stats");
+	private static readonly System.Text.Json.JsonEncodedText VariantMax = System.Text.Json.JsonEncodedText.Encode("max");
+	private static readonly System.Text.Json.JsonEncodedText VariantMaxBucket = System.Text.Json.JsonEncodedText.Encode("max_bucket");
+	private static readonly System.Text.Json.JsonEncodedText VariantMedianAbsoluteDeviation = System.Text.Json.JsonEncodedText.Encode("median_absolute_deviation");
+	private static readonly System.Text.Json.JsonEncodedText VariantMin = System.Text.Json.JsonEncodedText.Encode("min");
+	private static readonly System.Text.Json.JsonEncodedText VariantMinBucket = System.Text.Json.JsonEncodedText.Encode("min_bucket");
+	private static readonly System.Text.Json.JsonEncodedText VariantMissing = System.Text.Json.JsonEncodedText.Encode("missing");
+	private static readonly System.Text.Json.JsonEncodedText VariantMovingFn = System.Text.Json.JsonEncodedText.Encode("moving_fn");
+	private static readonly System.Text.Json.JsonEncodedText VariantMovingPercentiles = System.Text.Json.JsonEncodedText.Encode("moving_percentiles");
+	private static readonly System.Text.Json.JsonEncodedText VariantMultiTerms = System.Text.Json.JsonEncodedText.Encode("multi_terms");
+	private static readonly System.Text.Json.JsonEncodedText VariantNested = System.Text.Json.JsonEncodedText.Encode("nested");
+	private static readonly System.Text.Json.JsonEncodedText VariantNormalize = System.Text.Json.JsonEncodedText.Encode("normalize");
+	private static readonly System.Text.Json.JsonEncodedText VariantParent = System.Text.Json.JsonEncodedText.Encode("parent");
+	private static readonly System.Text.Json.JsonEncodedText VariantPercentileRanks = System.Text.Json.JsonEncodedText.Encode("percentile_ranks");
+	private static readonly System.Text.Json.JsonEncodedText VariantPercentiles = System.Text.Json.JsonEncodedText.Encode("percentiles");
+	private static readonly System.Text.Json.JsonEncodedText VariantPercentilesBucket = System.Text.Json.JsonEncodedText.Encode("percentiles_bucket");
+	private static readonly System.Text.Json.JsonEncodedText VariantRandomSampler = System.Text.Json.JsonEncodedText.Encode("random_sampler");
+	private static readonly System.Text.Json.JsonEncodedText VariantRange = System.Text.Json.JsonEncodedText.Encode("range");
+	private static readonly System.Text.Json.JsonEncodedText VariantRareTerms = System.Text.Json.JsonEncodedText.Encode("rare_terms");
+	private static readonly System.Text.Json.JsonEncodedText VariantRate = System.Text.Json.JsonEncodedText.Encode("rate");
+	private static readonly System.Text.Json.JsonEncodedText VariantReverseNested = System.Text.Json.JsonEncodedText.Encode("reverse_nested");
+	private static readonly System.Text.Json.JsonEncodedText VariantSampler = System.Text.Json.JsonEncodedText.Encode("sampler");
+	private static readonly System.Text.Json.JsonEncodedText VariantScriptedMetric = System.Text.Json.JsonEncodedText.Encode("scripted_metric");
+	private static readonly System.Text.Json.JsonEncodedText VariantSerialDiff = System.Text.Json.JsonEncodedText.Encode("serial_diff");
+	private static readonly System.Text.Json.JsonEncodedText VariantSignificantTerms = System.Text.Json.JsonEncodedText.Encode("significant_terms");
+	private static readonly System.Text.Json.JsonEncodedText VariantSignificantText = System.Text.Json.JsonEncodedText.Encode("significant_text");
+	private static readonly System.Text.Json.JsonEncodedText VariantStats = System.Text.Json.JsonEncodedText.Encode("stats");
+	private static readonly System.Text.Json.JsonEncodedText VariantStatsBucket = System.Text.Json.JsonEncodedText.Encode("stats_bucket");
+	private static readonly System.Text.Json.JsonEncodedText VariantStringStats = System.Text.Json.JsonEncodedText.Encode("string_stats");
+	private static readonly System.Text.Json.JsonEncodedText VariantSum = System.Text.Json.JsonEncodedText.Encode("sum");
+	private static readonly System.Text.Json.JsonEncodedText VariantSumBucket = System.Text.Json.JsonEncodedText.Encode("sum_bucket");
+	private static readonly System.Text.Json.JsonEncodedText VariantTerms = System.Text.Json.JsonEncodedText.Encode("terms");
+	private static readonly System.Text.Json.JsonEncodedText VariantTimeSeries = System.Text.Json.JsonEncodedText.Encode("time_series");
+	private static readonly System.Text.Json.JsonEncodedText VariantTopHits = System.Text.Json.JsonEncodedText.Encode("top_hits");
+	private static readonly System.Text.Json.JsonEncodedText VariantTopMetrics = System.Text.Json.JsonEncodedText.Encode("top_metrics");
+	private static readonly System.Text.Json.JsonEncodedText VariantTTest = System.Text.Json.JsonEncodedText.Encode("t_test");
+	private static readonly System.Text.Json.JsonEncodedText VariantValueCount = System.Text.Json.JsonEncodedText.Encode("value_count");
+	private static readonly System.Text.Json.JsonEncodedText VariantVariableWidthHistogram = System.Text.Json.JsonEncodedText.Encode("variable_width_histogram");
+	private static readonly System.Text.Json.JsonEncodedText VariantWeightedAvg = System.Text.Json.JsonEncodedText.Encode("weighted_avg");
+
+	public override Aggregation Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-		{
-			throw new JsonException("Expected start token.");
-		}
-
-		object? variantValue = default;
-		string? variantNameValue = default;
-		IDictionary<string, Elastic.Clients.Elasticsearch.Aggregations.Aggregation>? aggregationsValue = default;
-		IDictionary<string, object>? metaValue = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IDictionary<string, Elastic.Clients.Elasticsearch.Aggregations.Aggregation>?> propAggregations = default;
+		LocalJsonProperty<IDictionary<string, object>?> propMeta = default;
+		var variantType = string.Empty;
+		object? variant = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token.");
-			}
-
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token representing the name of an Elasticsearch field.");
-			}
-
-			var propertyName = reader.GetString();
-			reader.Read();
-			if (propertyName == "aggregations")
+			if (propAggregations.TryRead(ref reader, options, PropAggregations) || propAggregations.TryRead(ref reader, options, PropAggregations1))
 			{
-				aggregationsValue = JsonSerializer.Deserialize<IDictionary<string, Elastic.Clients.Elasticsearch.Aggregations.Aggregation>?>(ref reader, options);
 				continue;
 			}
 
-			if (propertyName == "meta")
+			if (propMeta.TryRead(ref reader, options, PropMeta))
 			{
-				metaValue = JsonSerializer.Deserialize<IDictionary<string, object>?>(ref reader, options);
 				continue;
 			}
 
-			if (propertyName == "adjacency_matrix")
+			if (reader.ValueTextEquals(VariantAdjacencyMatrix))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.AdjacencyMatrixAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantAdjacencyMatrix.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.AdjacencyMatrixAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "auto_date_histogram")
+			if (reader.ValueTextEquals(VariantAutoDateHistogram))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.AutoDateHistogramAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantAutoDateHistogram.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.AutoDateHistogramAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "avg")
+			if (reader.ValueTextEquals(VariantAvg))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.AverageAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantAvg.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.AverageAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "avg_bucket")
+			if (reader.ValueTextEquals(VariantAvgBucket))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.AverageBucketAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantAvgBucket.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.AverageBucketAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "boxplot")
+			if (reader.ValueTextEquals(VariantBoxplot))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.BoxplotAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantBoxplot.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.BoxplotAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "bucket_correlation")
+			if (reader.ValueTextEquals(VariantBucketCorrelation))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.BucketCorrelationAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantBucketCorrelation.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.BucketCorrelationAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "bucket_count_ks_test")
+			if (reader.ValueTextEquals(VariantBucketCountKsTest))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.BucketKsAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantBucketCountKsTest.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.BucketKsAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "bucket_script")
+			if (reader.ValueTextEquals(VariantBucketScript))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.BucketScriptAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantBucketScript.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.BucketScriptAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "bucket_selector")
+			if (reader.ValueTextEquals(VariantBucketSelector))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.BucketSelectorAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantBucketSelector.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.BucketSelectorAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "bucket_sort")
+			if (reader.ValueTextEquals(VariantBucketSort))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.BucketSortAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantBucketSort.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.BucketSortAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "cardinality")
+			if (reader.ValueTextEquals(VariantCardinality))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.CardinalityAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantCardinality.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.CardinalityAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "categorize_text")
+			if (reader.ValueTextEquals(VariantCategorizeText))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.CategorizeTextAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantCategorizeText.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.CategorizeTextAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "children")
+			if (reader.ValueTextEquals(VariantChildren))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.ChildrenAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantChildren.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.ChildrenAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "composite")
+			if (reader.ValueTextEquals(VariantComposite))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.CompositeAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantComposite.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.CompositeAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "cumulative_cardinality")
+			if (reader.ValueTextEquals(VariantCumulativeCardinality))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.CumulativeCardinalityAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantCumulativeCardinality.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.CumulativeCardinalityAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "cumulative_sum")
+			if (reader.ValueTextEquals(VariantCumulativeSum))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.CumulativeSumAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantCumulativeSum.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.CumulativeSumAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "date_histogram")
+			if (reader.ValueTextEquals(VariantDateHistogram))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.DateHistogramAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantDateHistogram.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.DateHistogramAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "date_range")
+			if (reader.ValueTextEquals(VariantDateRange))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.DateRangeAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantDateRange.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.DateRangeAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "derivative")
+			if (reader.ValueTextEquals(VariantDerivative))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.DerivativeAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantDerivative.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.DerivativeAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "diversified_sampler")
+			if (reader.ValueTextEquals(VariantDiversifiedSampler))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.DiversifiedSamplerAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantDiversifiedSampler.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.DiversifiedSamplerAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "extended_stats")
+			if (reader.ValueTextEquals(VariantExtendedStats))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.ExtendedStatsAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantExtendedStats.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.ExtendedStatsAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "extended_stats_bucket")
+			if (reader.ValueTextEquals(VariantExtendedStatsBucket))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.ExtendedStatsBucketAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantExtendedStatsBucket.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.ExtendedStatsBucketAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "filter")
+			if (reader.ValueTextEquals(VariantFilter))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.Query?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantFilter.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.Query?>(options);
 				continue;
 			}
 
-			if (propertyName == "filters")
+			if (reader.ValueTextEquals(VariantFilters))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.FiltersAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantFilters.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.FiltersAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "frequent_item_sets")
+			if (reader.ValueTextEquals(VariantFrequentItemSets))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.FrequentItemSetsAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantFrequentItemSets.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.FrequentItemSetsAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "geo_bounds")
+			if (reader.ValueTextEquals(VariantGeoBounds))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.GeoBoundsAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantGeoBounds.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.GeoBoundsAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "geo_centroid")
+			if (reader.ValueTextEquals(VariantGeoCentroid))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.GeoCentroidAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantGeoCentroid.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.GeoCentroidAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "geo_distance")
+			if (reader.ValueTextEquals(VariantGeoDistance))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.GeoDistanceAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantGeoDistance.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.GeoDistanceAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "geohash_grid")
+			if (reader.ValueTextEquals(VariantGeohashGrid))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.GeohashGridAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantGeohashGrid.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.GeohashGridAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "geohex_grid")
+			if (reader.ValueTextEquals(VariantGeohexGrid))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.GeohexGridAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantGeohexGrid.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.GeohexGridAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "geo_line")
+			if (reader.ValueTextEquals(VariantGeoLine))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.GeoLineAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantGeoLine.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.GeoLineAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "geotile_grid")
+			if (reader.ValueTextEquals(VariantGeotileGrid))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.GeotileGridAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantGeotileGrid.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.GeotileGridAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "global")
+			if (reader.ValueTextEquals(VariantGlobal))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.GlobalAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantGlobal.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.GlobalAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "histogram")
+			if (reader.ValueTextEquals(VariantHistogram))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.HistogramAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantHistogram.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.HistogramAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "inference")
+			if (reader.ValueTextEquals(VariantInference))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.InferenceAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantInference.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.InferenceAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "ip_prefix")
+			if (reader.ValueTextEquals(VariantIpPrefix))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.IpPrefixAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantIpPrefix.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.IpPrefixAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "ip_range")
+			if (reader.ValueTextEquals(VariantIpRange))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.IpRangeAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantIpRange.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.IpRangeAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "line")
+			if (reader.ValueTextEquals(VariantLine))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.GeoLineAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantLine.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.GeoLineAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "matrix_stats")
+			if (reader.ValueTextEquals(VariantMatrixStats))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.MatrixStatsAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantMatrixStats.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.MatrixStatsAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "max")
+			if (reader.ValueTextEquals(VariantMax))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.MaxAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantMax.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.MaxAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "max_bucket")
+			if (reader.ValueTextEquals(VariantMaxBucket))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.MaxBucketAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantMaxBucket.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.MaxBucketAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "median_absolute_deviation")
+			if (reader.ValueTextEquals(VariantMedianAbsoluteDeviation))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.MedianAbsoluteDeviationAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantMedianAbsoluteDeviation.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.MedianAbsoluteDeviationAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "min")
+			if (reader.ValueTextEquals(VariantMin))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.MinAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantMin.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.MinAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "min_bucket")
+			if (reader.ValueTextEquals(VariantMinBucket))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.MinBucketAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantMinBucket.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.MinBucketAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "missing")
+			if (reader.ValueTextEquals(VariantMissing))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.MissingAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantMissing.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.MissingAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "moving_fn")
+			if (reader.ValueTextEquals(VariantMovingFn))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.MovingFunctionAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantMovingFn.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.MovingFunctionAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "moving_percentiles")
+			if (reader.ValueTextEquals(VariantMovingPercentiles))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.MovingPercentilesAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantMovingPercentiles.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.MovingPercentilesAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "multi_terms")
+			if (reader.ValueTextEquals(VariantMultiTerms))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.MultiTermsAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantMultiTerms.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.MultiTermsAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "nested")
+			if (reader.ValueTextEquals(VariantNested))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.NestedAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantNested.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.NestedAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "normalize")
+			if (reader.ValueTextEquals(VariantNormalize))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.NormalizeAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantNormalize.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.NormalizeAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "parent")
+			if (reader.ValueTextEquals(VariantParent))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.ParentAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantParent.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.ParentAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "percentile_ranks")
+			if (reader.ValueTextEquals(VariantPercentileRanks))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.PercentileRanksAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantPercentileRanks.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.PercentileRanksAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "percentiles")
+			if (reader.ValueTextEquals(VariantPercentiles))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.PercentilesAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantPercentiles.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.PercentilesAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "percentiles_bucket")
+			if (reader.ValueTextEquals(VariantPercentilesBucket))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.PercentilesBucketAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantPercentilesBucket.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.PercentilesBucketAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "random_sampler")
+			if (reader.ValueTextEquals(VariantRandomSampler))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.RandomSamplerAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantRandomSampler.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.RandomSamplerAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "range")
+			if (reader.ValueTextEquals(VariantRange))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.RangeAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantRange.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.RangeAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "rare_terms")
+			if (reader.ValueTextEquals(VariantRareTerms))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.RareTermsAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantRareTerms.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.RareTermsAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "rate")
+			if (reader.ValueTextEquals(VariantRate))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.RateAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantRate.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.RateAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "reverse_nested")
+			if (reader.ValueTextEquals(VariantReverseNested))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.ReverseNestedAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantReverseNested.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.ReverseNestedAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "sampler")
+			if (reader.ValueTextEquals(VariantSampler))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.SamplerAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantSampler.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.SamplerAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "scripted_metric")
+			if (reader.ValueTextEquals(VariantScriptedMetric))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.ScriptedMetricAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantScriptedMetric.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.ScriptedMetricAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "serial_diff")
+			if (reader.ValueTextEquals(VariantSerialDiff))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.SerialDifferencingAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantSerialDiff.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.SerialDifferencingAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "significant_terms")
+			if (reader.ValueTextEquals(VariantSignificantTerms))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.SignificantTermsAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantSignificantTerms.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.SignificantTermsAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "significant_text")
+			if (reader.ValueTextEquals(VariantSignificantText))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.SignificantTextAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantSignificantText.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.SignificantTextAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "stats")
+			if (reader.ValueTextEquals(VariantStats))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.StatsAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantStats.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.StatsAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "stats_bucket")
+			if (reader.ValueTextEquals(VariantStatsBucket))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.StatsBucketAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantStatsBucket.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.StatsBucketAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "string_stats")
+			if (reader.ValueTextEquals(VariantStringStats))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.StringStatsAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantStringStats.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.StringStatsAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "sum")
+			if (reader.ValueTextEquals(VariantSum))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.SumAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantSum.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.SumAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "sum_bucket")
+			if (reader.ValueTextEquals(VariantSumBucket))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.SumBucketAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantSumBucket.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.SumBucketAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "terms")
+			if (reader.ValueTextEquals(VariantTerms))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.TermsAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantTerms.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.TermsAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "time_series")
+			if (reader.ValueTextEquals(VariantTimeSeries))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.TimeSeriesAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantTimeSeries.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.TimeSeriesAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "top_hits")
+			if (reader.ValueTextEquals(VariantTopHits))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.TopHitsAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantTopHits.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.TopHitsAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "top_metrics")
+			if (reader.ValueTextEquals(VariantTopMetrics))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.TopMetricsAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantTopMetrics.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.TopMetricsAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "t_test")
+			if (reader.ValueTextEquals(VariantTTest))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.TTestAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantTTest.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.TTestAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "value_count")
+			if (reader.ValueTextEquals(VariantValueCount))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.ValueCountAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantValueCount.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.ValueCountAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "variable_width_histogram")
+			if (reader.ValueTextEquals(VariantVariableWidthHistogram))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.VariableWidthHistogramAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantVariableWidthHistogram.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.VariableWidthHistogramAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "weighted_avg")
+			if (reader.ValueTextEquals(VariantWeightedAvg))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.WeightedAverageAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantWeightedAvg.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.WeightedAverageAggregation?>(options);
 				continue;
 			}
 
-			throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'Aggregation' from the response.");
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		var result = new Aggregation(variantNameValue, variantValue);
-		result.Aggregations = aggregationsValue;
-		result.Meta = metaValue;
-		return result;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new Aggregation
+		{
+			VariantType = variantType,
+			Variant = variant,
+			Aggregations = propAggregations.Value
+	,
+			Meta = propMeta.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, Aggregation value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, Aggregation value, System.Text.Json.JsonSerializerOptions options)
 	{
 		writer.WriteStartObject();
-		if (value.Aggregations is not null)
-		{
-			writer.WritePropertyName("aggregations");
-			JsonSerializer.Serialize(writer, value.Aggregations, options);
-		}
-
-		if (value.Meta is not null)
+		switch (value.VariantType)
 		{
-			writer.WritePropertyName("meta");
-			JsonSerializer.Serialize(writer, value.Meta, options);
-		}
-
-		if (value.VariantName is not null && value.Variant is not null)
-		{
-			writer.WritePropertyName(value.VariantName);
-			switch (value.VariantName)
-			{
-				case "adjacency_matrix":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.AdjacencyMatrixAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.AdjacencyMatrixAggregation)value.Variant, options);
-					break;
-				case "auto_date_histogram":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.AutoDateHistogramAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.AutoDateHistogramAggregation)value.Variant, options);
-					break;
-				case "avg":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.AverageAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.AverageAggregation)value.Variant, options);
-					break;
-				case "avg_bucket":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.AverageBucketAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.AverageBucketAggregation)value.Variant, options);
-					break;
-				case "boxplot":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.BoxplotAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.BoxplotAggregation)value.Variant, options);
-					break;
-				case "bucket_correlation":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.BucketCorrelationAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.BucketCorrelationAggregation)value.Variant, options);
-					break;
-				case "bucket_count_ks_test":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.BucketKsAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.BucketKsAggregation)value.Variant, options);
-					break;
-				case "bucket_script":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.BucketScriptAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.BucketScriptAggregation)value.Variant, options);
-					break;
-				case "bucket_selector":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.BucketSelectorAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.BucketSelectorAggregation)value.Variant, options);
-					break;
-				case "bucket_sort":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.BucketSortAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.BucketSortAggregation)value.Variant, options);
-					break;
-				case "cardinality":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.CardinalityAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.CardinalityAggregation)value.Variant, options);
-					break;
-				case "categorize_text":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.CategorizeTextAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.CategorizeTextAggregation)value.Variant, options);
-					break;
-				case "children":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.ChildrenAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.ChildrenAggregation)value.Variant, options);
-					break;
-				case "composite":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.CompositeAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.CompositeAggregation)value.Variant, options);
-					break;
-				case "cumulative_cardinality":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.CumulativeCardinalityAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.CumulativeCardinalityAggregation)value.Variant, options);
-					break;
-				case "cumulative_sum":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.CumulativeSumAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.CumulativeSumAggregation)value.Variant, options);
-					break;
-				case "date_histogram":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.DateHistogramAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.DateHistogramAggregation)value.Variant, options);
-					break;
-				case "date_range":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.DateRangeAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.DateRangeAggregation)value.Variant, options);
-					break;
-				case "derivative":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.DerivativeAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.DerivativeAggregation)value.Variant, options);
-					break;
-				case "diversified_sampler":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.DiversifiedSamplerAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.DiversifiedSamplerAggregation)value.Variant, options);
-					break;
-				case "extended_stats":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.ExtendedStatsAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.ExtendedStatsAggregation)value.Variant, options);
-					break;
-				case "extended_stats_bucket":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.ExtendedStatsBucketAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.ExtendedStatsBucketAggregation)value.Variant, options);
-					break;
-				case "filter":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.Query>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.Query)value.Variant, options);
-					break;
-				case "filters":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.FiltersAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.FiltersAggregation)value.Variant, options);
-					break;
-				case "frequent_item_sets":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.FrequentItemSetsAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.FrequentItemSetsAggregation)value.Variant, options);
-					break;
-				case "geo_bounds":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.GeoBoundsAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.GeoBoundsAggregation)value.Variant, options);
-					break;
-				case "geo_centroid":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.GeoCentroidAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.GeoCentroidAggregation)value.Variant, options);
-					break;
-				case "geo_distance":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.GeoDistanceAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.GeoDistanceAggregation)value.Variant, options);
-					break;
-				case "geohash_grid":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.GeohashGridAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.GeohashGridAggregation)value.Variant, options);
-					break;
-				case "geohex_grid":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.GeohexGridAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.GeohexGridAggregation)value.Variant, options);
-					break;
-				case "geo_line":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.GeoLineAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.GeoLineAggregation)value.Variant, options);
-					break;
-				case "geotile_grid":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.GeotileGridAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.GeotileGridAggregation)value.Variant, options);
-					break;
-				case "global":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.GlobalAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.GlobalAggregation)value.Variant, options);
-					break;
-				case "histogram":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.HistogramAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.HistogramAggregation)value.Variant, options);
-					break;
-				case "inference":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.InferenceAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.InferenceAggregation)value.Variant, options);
-					break;
-				case "ip_prefix":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.IpPrefixAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.IpPrefixAggregation)value.Variant, options);
-					break;
-				case "ip_range":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.IpRangeAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.IpRangeAggregation)value.Variant, options);
-					break;
-				case "line":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.GeoLineAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.GeoLineAggregation)value.Variant, options);
-					break;
-				case "matrix_stats":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.MatrixStatsAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.MatrixStatsAggregation)value.Variant, options);
-					break;
-				case "max":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.MaxAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.MaxAggregation)value.Variant, options);
-					break;
-				case "max_bucket":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.MaxBucketAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.MaxBucketAggregation)value.Variant, options);
-					break;
-				case "median_absolute_deviation":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.MedianAbsoluteDeviationAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.MedianAbsoluteDeviationAggregation)value.Variant, options);
-					break;
-				case "min":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.MinAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.MinAggregation)value.Variant, options);
-					break;
-				case "min_bucket":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.MinBucketAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.MinBucketAggregation)value.Variant, options);
-					break;
-				case "missing":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.MissingAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.MissingAggregation)value.Variant, options);
-					break;
-				case "moving_fn":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.MovingFunctionAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.MovingFunctionAggregation)value.Variant, options);
-					break;
-				case "moving_percentiles":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.MovingPercentilesAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.MovingPercentilesAggregation)value.Variant, options);
-					break;
-				case "multi_terms":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.MultiTermsAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.MultiTermsAggregation)value.Variant, options);
-					break;
-				case "nested":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.NestedAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.NestedAggregation)value.Variant, options);
-					break;
-				case "normalize":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.NormalizeAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.NormalizeAggregation)value.Variant, options);
-					break;
-				case "parent":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.ParentAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.ParentAggregation)value.Variant, options);
-					break;
-				case "percentile_ranks":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.PercentileRanksAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.PercentileRanksAggregation)value.Variant, options);
-					break;
-				case "percentiles":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.PercentilesAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.PercentilesAggregation)value.Variant, options);
-					break;
-				case "percentiles_bucket":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.PercentilesBucketAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.PercentilesBucketAggregation)value.Variant, options);
-					break;
-				case "random_sampler":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.RandomSamplerAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.RandomSamplerAggregation)value.Variant, options);
-					break;
-				case "range":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.RangeAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.RangeAggregation)value.Variant, options);
-					break;
-				case "rare_terms":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.RareTermsAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.RareTermsAggregation)value.Variant, options);
-					break;
-				case "rate":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.RateAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.RateAggregation)value.Variant, options);
-					break;
-				case "reverse_nested":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.ReverseNestedAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.ReverseNestedAggregation)value.Variant, options);
-					break;
-				case "sampler":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.SamplerAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.SamplerAggregation)value.Variant, options);
-					break;
-				case "scripted_metric":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.ScriptedMetricAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.ScriptedMetricAggregation)value.Variant, options);
-					break;
-				case "serial_diff":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.SerialDifferencingAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.SerialDifferencingAggregation)value.Variant, options);
-					break;
-				case "significant_terms":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.SignificantTermsAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.SignificantTermsAggregation)value.Variant, options);
-					break;
-				case "significant_text":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.SignificantTextAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.SignificantTextAggregation)value.Variant, options);
-					break;
-				case "stats":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.StatsAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.StatsAggregation)value.Variant, options);
-					break;
-				case "stats_bucket":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.StatsBucketAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.StatsBucketAggregation)value.Variant, options);
-					break;
-				case "string_stats":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.StringStatsAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.StringStatsAggregation)value.Variant, options);
-					break;
-				case "sum":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.SumAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.SumAggregation)value.Variant, options);
-					break;
-				case "sum_bucket":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.SumBucketAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.SumBucketAggregation)value.Variant, options);
-					break;
-				case "terms":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.TermsAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.TermsAggregation)value.Variant, options);
-					break;
-				case "time_series":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.TimeSeriesAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.TimeSeriesAggregation)value.Variant, options);
-					break;
-				case "top_hits":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.TopHitsAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.TopHitsAggregation)value.Variant, options);
-					break;
-				case "top_metrics":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.TopMetricsAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.TopMetricsAggregation)value.Variant, options);
-					break;
-				case "t_test":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.TTestAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.TTestAggregation)value.Variant, options);
-					break;
-				case "value_count":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.ValueCountAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.ValueCountAggregation)value.Variant, options);
-					break;
-				case "variable_width_histogram":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.VariableWidthHistogramAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.VariableWidthHistogramAggregation)value.Variant, options);
-					break;
-				case "weighted_avg":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.WeightedAverageAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.WeightedAverageAggregation)value.Variant, options);
-					break;
-			}
+			case "":
+				break;
+			case "adjacency_matrix":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.AdjacencyMatrixAggregation?)value.Variant);
+				break;
+			case "auto_date_histogram":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.AutoDateHistogramAggregation?)value.Variant);
+				break;
+			case "avg":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.AverageAggregation?)value.Variant);
+				break;
+			case "avg_bucket":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.AverageBucketAggregation?)value.Variant);
+				break;
+			case "boxplot":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.BoxplotAggregation?)value.Variant);
+				break;
+			case "bucket_correlation":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.BucketCorrelationAggregation?)value.Variant);
+				break;
+			case "bucket_count_ks_test":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.BucketKsAggregation?)value.Variant);
+				break;
+			case "bucket_script":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.BucketScriptAggregation?)value.Variant);
+				break;
+			case "bucket_selector":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.BucketSelectorAggregation?)value.Variant);
+				break;
+			case "bucket_sort":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.BucketSortAggregation?)value.Variant);
+				break;
+			case "cardinality":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.CardinalityAggregation?)value.Variant);
+				break;
+			case "categorize_text":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.CategorizeTextAggregation?)value.Variant);
+				break;
+			case "children":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.ChildrenAggregation?)value.Variant);
+				break;
+			case "composite":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.CompositeAggregation?)value.Variant);
+				break;
+			case "cumulative_cardinality":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.CumulativeCardinalityAggregation?)value.Variant);
+				break;
+			case "cumulative_sum":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.CumulativeSumAggregation?)value.Variant);
+				break;
+			case "date_histogram":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.DateHistogramAggregation?)value.Variant);
+				break;
+			case "date_range":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.DateRangeAggregation?)value.Variant);
+				break;
+			case "derivative":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.DerivativeAggregation?)value.Variant);
+				break;
+			case "diversified_sampler":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.DiversifiedSamplerAggregation?)value.Variant);
+				break;
+			case "extended_stats":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.ExtendedStatsAggregation?)value.Variant);
+				break;
+			case "extended_stats_bucket":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.ExtendedStatsBucketAggregation?)value.Variant);
+				break;
+			case "filter":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.Query?)value.Variant);
+				break;
+			case "filters":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.FiltersAggregation?)value.Variant);
+				break;
+			case "frequent_item_sets":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.FrequentItemSetsAggregation?)value.Variant);
+				break;
+			case "geo_bounds":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.GeoBoundsAggregation?)value.Variant);
+				break;
+			case "geo_centroid":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.GeoCentroidAggregation?)value.Variant);
+				break;
+			case "geo_distance":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.GeoDistanceAggregation?)value.Variant);
+				break;
+			case "geohash_grid":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.GeohashGridAggregation?)value.Variant);
+				break;
+			case "geohex_grid":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.GeohexGridAggregation?)value.Variant);
+				break;
+			case "geo_line":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.GeoLineAggregation?)value.Variant);
+				break;
+			case "geotile_grid":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.GeotileGridAggregation?)value.Variant);
+				break;
+			case "global":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.GlobalAggregation?)value.Variant);
+				break;
+			case "histogram":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.HistogramAggregation?)value.Variant);
+				break;
+			case "inference":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.InferenceAggregation?)value.Variant);
+				break;
+			case "ip_prefix":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.IpPrefixAggregation?)value.Variant);
+				break;
+			case "ip_range":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.IpRangeAggregation?)value.Variant);
+				break;
+			case "line":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.GeoLineAggregation?)value.Variant);
+				break;
+			case "matrix_stats":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.MatrixStatsAggregation?)value.Variant);
+				break;
+			case "max":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.MaxAggregation?)value.Variant);
+				break;
+			case "max_bucket":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.MaxBucketAggregation?)value.Variant);
+				break;
+			case "median_absolute_deviation":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.MedianAbsoluteDeviationAggregation?)value.Variant);
+				break;
+			case "min":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.MinAggregation?)value.Variant);
+				break;
+			case "min_bucket":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.MinBucketAggregation?)value.Variant);
+				break;
+			case "missing":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.MissingAggregation?)value.Variant);
+				break;
+			case "moving_fn":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.MovingFunctionAggregation?)value.Variant);
+				break;
+			case "moving_percentiles":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.MovingPercentilesAggregation?)value.Variant);
+				break;
+			case "multi_terms":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.MultiTermsAggregation?)value.Variant);
+				break;
+			case "nested":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.NestedAggregation?)value.Variant);
+				break;
+			case "normalize":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.NormalizeAggregation?)value.Variant);
+				break;
+			case "parent":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.ParentAggregation?)value.Variant);
+				break;
+			case "percentile_ranks":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.PercentileRanksAggregation?)value.Variant);
+				break;
+			case "percentiles":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.PercentilesAggregation?)value.Variant);
+				break;
+			case "percentiles_bucket":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.PercentilesBucketAggregation?)value.Variant);
+				break;
+			case "random_sampler":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.RandomSamplerAggregation?)value.Variant);
+				break;
+			case "range":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.RangeAggregation?)value.Variant);
+				break;
+			case "rare_terms":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.RareTermsAggregation?)value.Variant);
+				break;
+			case "rate":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.RateAggregation?)value.Variant);
+				break;
+			case "reverse_nested":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.ReverseNestedAggregation?)value.Variant);
+				break;
+			case "sampler":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.SamplerAggregation?)value.Variant);
+				break;
+			case "scripted_metric":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.ScriptedMetricAggregation?)value.Variant);
+				break;
+			case "serial_diff":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.SerialDifferencingAggregation?)value.Variant);
+				break;
+			case "significant_terms":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.SignificantTermsAggregation?)value.Variant);
+				break;
+			case "significant_text":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.SignificantTextAggregation?)value.Variant);
+				break;
+			case "stats":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.StatsAggregation?)value.Variant);
+				break;
+			case "stats_bucket":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.StatsBucketAggregation?)value.Variant);
+				break;
+			case "string_stats":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.StringStatsAggregation?)value.Variant);
+				break;
+			case "sum":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.SumAggregation?)value.Variant);
+				break;
+			case "sum_bucket":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.SumBucketAggregation?)value.Variant);
+				break;
+			case "terms":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.TermsAggregation?)value.Variant);
+				break;
+			case "time_series":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.TimeSeriesAggregation?)value.Variant);
+				break;
+			case "top_hits":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.TopHitsAggregation?)value.Variant);
+				break;
+			case "top_metrics":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.TopMetricsAggregation?)value.Variant);
+				break;
+			case "t_test":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.TTestAggregation?)value.Variant);
+				break;
+			case "value_count":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.ValueCountAggregation?)value.Variant);
+				break;
+			case "variable_width_histogram":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.VariableWidthHistogramAggregation?)value.Variant);
+				break;
+			case "weighted_avg":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.WeightedAverageAggregation?)value.Variant);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.VariantType}' is not supported for type '{nameof(Aggregation)}'.");
 		}
 
+		writer.WriteProperty(options, PropAggregations, value.Aggregations);
+		writer.WriteProperty(options, PropMeta, value.Meta);
 		writer.WriteEndObject();
 	}
 }
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 3119d139dbc..6b9756f8e69 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/AutoDateHistogramAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/AutoDateHistogramAggregate.g.cs
@@ -35,4 +35,6 @@ public sealed partial class AutoDateHistogramAggregate : IAggregate
 	public string Interval { get; init; }
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
+
+	string IAggregate.Type => "auto_date_histogram";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/AverageAggregate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/AverageAggregate.g.cs
index c143e3b2a1b..ab3c7a298ea 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/AverageAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/AverageAggregate.g.cs
@@ -42,4 +42,6 @@ public sealed partial class AverageAggregate : IAggregate
 	public double? Value { get; init; }
 	[JsonInclude, JsonPropertyName("value_as_string")]
 	public string? ValueAsString { get; init; }
+
+	string IAggregate.Type => "avg";
 }
\ 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 66c8eb6edfa..fe20d867b44 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/BoxplotAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/BoxplotAggregate.g.cs
@@ -59,4 +59,6 @@ public sealed partial class BoxplotAggregate : IAggregate
 	public double Upper { get; init; }
 	[JsonInclude, JsonPropertyName("upper_as_string")]
 	public string? UpperAsString { get; init; }
+
+	string IAggregate.Type => "boxplot";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/BucketMetricValueAggregate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/BucketMetricValueAggregate.g.cs
index 1a32f623f8b..66853388aba 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/BucketMetricValueAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/BucketMetricValueAggregate.g.cs
@@ -44,4 +44,6 @@ public sealed partial class BucketMetricValueAggregate : IAggregate
 	public double? Value { get; init; }
 	[JsonInclude, JsonPropertyName("value_as_string")]
 	public string? ValueAsString { get; init; }
+
+	string IAggregate.Type => "bucket_metric_value";
 }
\ No newline at end of file
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 85b70e68f2b..ab37345293a 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/BucketSortAggregation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/BucketSortAggregation.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,70 @@
 
 namespace Elastic.Clients.Elasticsearch.Aggregations;
 
+internal sealed partial class BucketSortAggregationConverter : System.Text.Json.Serialization.JsonConverter<BucketSortAggregation>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropFrom = System.Text.Json.JsonEncodedText.Encode("from");
+	private static readonly System.Text.Json.JsonEncodedText PropGapPolicy = System.Text.Json.JsonEncodedText.Encode("gap_policy");
+	private static readonly System.Text.Json.JsonEncodedText PropSize = System.Text.Json.JsonEncodedText.Encode("size");
+	private static readonly System.Text.Json.JsonEncodedText PropSort = System.Text.Json.JsonEncodedText.Encode("sort");
+
+	public override BucketSortAggregation Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<int?> propFrom = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Aggregations.GapPolicy?> propGapPolicy = default;
+		LocalJsonProperty<int?> propSize = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.SortOptions>?> propSort = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propFrom.TryRead(ref reader, options, PropFrom))
+			{
+				continue;
+			}
+
+			if (propGapPolicy.TryRead(ref reader, options, PropGapPolicy))
+			{
+				continue;
+			}
+
+			if (propSize.TryRead(ref reader, options, PropSize))
+			{
+				continue;
+			}
+
+			if (propSort.TryRead(ref reader, options, PropSort, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.SortOptions>?, Elastic.Clients.Elasticsearch.SortOptions>)))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new BucketSortAggregation
+		{
+			From = propFrom.Value
+,
+			GapPolicy = propGapPolicy.Value
+,
+			Size = propSize.Value
+,
+			Sort = propSort.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, BucketSortAggregation value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropFrom, value.From);
+		writer.WriteProperty(options, PropGapPolicy, value.GapPolicy);
+		writer.WriteProperty(options, PropSize, value.Size);
+		writer.WriteProperty(options, PropSort, value.Sort, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.SortOptions>?, Elastic.Clients.Elasticsearch.SortOptions>));
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(BucketSortAggregationConverter))]
 public sealed partial class BucketSortAggregation
 {
 	/// <summary>
@@ -34,7 +99,6 @@ public sealed partial class BucketSortAggregation
 	/// Buckets in positions prior to <c>from</c> will be truncated.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("from")]
 	public int? From { get; set; }
 
 	/// <summary>
@@ -42,7 +106,6 @@ public sealed partial class BucketSortAggregation
 	/// The policy to apply when gaps are found in the data.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("gap_policy")]
 	public Elastic.Clients.Elasticsearch.Aggregations.GapPolicy? GapPolicy { get; set; }
 
 	/// <summary>
@@ -51,7 +114,6 @@ public sealed partial class BucketSortAggregation
 	/// Defaults to all buckets of the parent aggregation.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("size")]
 	public int? Size { get; set; }
 
 	/// <summary>
@@ -59,8 +121,6 @@ public sealed partial class BucketSortAggregation
 	/// The list of fields to sort on.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("sort")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.SortOptions))]
 	public ICollection<Elastic.Clients.Elasticsearch.SortOptions>? Sort { get; set; }
 
 	public static implicit operator Elastic.Clients.Elasticsearch.Aggregations.Aggregation(BucketSortAggregation bucketSortAggregation) => Elastic.Clients.Elasticsearch.Aggregations.Aggregation.BucketSort(bucketSortAggregation);
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 945b2e1ae39..2da809d9617 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/CardinalityAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/CardinalityAggregate.g.cs
@@ -33,4 +33,6 @@ public sealed partial class CardinalityAggregate : IAggregate
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
 	[JsonInclude, JsonPropertyName("value")]
 	public long Value { get; init; }
+
+	string IAggregate.Type => "cardinality";
 }
\ No newline at end of file
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 072e2c3f5ca..4157ea04407 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ChildrenAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ChildrenAggregate.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,49 +28,60 @@
 
 namespace Elastic.Clients.Elasticsearch.Aggregations;
 
-internal sealed partial class ChildrenAggregateConverter : JsonConverter<ChildrenAggregate>
+internal sealed partial class ChildrenAggregateConverter : System.Text.Json.Serialization.JsonConverter<ChildrenAggregate>
 {
-	public override ChildrenAggregate Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropDocCount = System.Text.Json.JsonEncodedText.Encode("doc_count");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+
+	public override ChildrenAggregate Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		long docCount = default;
-		IReadOnlyDictionary<string, object>? meta = default;
-		Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate> propAggregations = default;
+		LocalJsonProperty<long> propDocCount = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, object>?> propMeta = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propDocCount.TryRead(ref reader, options, PropDocCount))
 			{
-				var property = reader.GetString();
-				if (property == "doc_count")
-				{
-					docCount = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "meta")
-				{
-					meta = JsonSerializer.Deserialize<IReadOnlyDictionary<string, object>?>(ref reader, options);
-					continue;
-				}
-
-				if (property.Contains("#"))
-				{
-					additionalProperties ??= new Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate>();
-					AggregateDictionaryConverter.ReadItem(ref reader, options, additionalProperties, property);
-					continue;
-				}
+				continue;
+			}
 
-				throw new JsonException("Unknown property read from JSON.");
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
 			}
+
+			propAggregations ??= new System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate>();
+			Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionaryConverter.ReadItem(ref reader, options, out string key, out Elastic.Clients.Elasticsearch.Aggregations.IAggregate value);
+			propAggregations[key] = value;
 		}
 
-		return new ChildrenAggregate { Aggregations = new Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary(additionalProperties), DocCount = docCount, Meta = meta };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ChildrenAggregate
+		{
+			Aggregations = new Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary(propAggregations)
+,
+			DocCount = propDocCount.Value
+,
+			Meta = propMeta.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, ChildrenAggregate value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ChildrenAggregate value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'ChildrenAggregate' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDocCount, value.DocCount);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		if (value.Aggregations is not null)
+		{
+			foreach (var item in value.Aggregations)
+			{
+				Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionaryConverter.WriteItem(writer, options, item.Key, item.Value);
+			}
+		}
+
+		writer.WriteEndObject();
 	}
 }
 
@@ -84,4 +96,6 @@ public sealed partial class ChildrenAggregate : IAggregate
 	public Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary Aggregations { get; init; }
 	public long DocCount { get; init; }
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
+
+	string IAggregate.Type => "children";
 }
\ No newline at end of file
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 600426a0e04..cc7615b34d9 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/CompositeAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/CompositeAggregate.g.cs
@@ -35,4 +35,6 @@ public sealed partial class CompositeAggregate : IAggregate
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Aggregations.CompositeBucket> Buckets { get; init; }
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
+
+	string IAggregate.Type => "composite";
 }
\ No newline at end of file
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 42e67f51da3..d5f43c54d55 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/CompositeBucket.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/CompositeBucket.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,49 +28,60 @@
 
 namespace Elastic.Clients.Elasticsearch.Aggregations;
 
-internal sealed partial class CompositeBucketConverter : JsonConverter<CompositeBucket>
+internal sealed partial class CompositeBucketConverter : System.Text.Json.Serialization.JsonConverter<CompositeBucket>
 {
-	public override CompositeBucket Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropDocCount = System.Text.Json.JsonEncodedText.Encode("doc_count");
+	private static readonly System.Text.Json.JsonEncodedText PropKey = System.Text.Json.JsonEncodedText.Encode("key");
+
+	public override CompositeBucket Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		long docCount = default;
-		IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.FieldValue> key = default;
-		Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate> propAggregations = default;
+		LocalJsonProperty<long> propDocCount = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.FieldValue>> propKey = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propDocCount.TryRead(ref reader, options, PropDocCount))
 			{
-				var property = reader.GetString();
-				if (property == "doc_count")
-				{
-					docCount = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "key")
-				{
-					key = JsonSerializer.Deserialize<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.FieldValue>>(ref reader, options);
-					continue;
-				}
-
-				if (property.Contains("#"))
-				{
-					additionalProperties ??= new Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate>();
-					AggregateDictionaryConverter.ReadItem(ref reader, options, additionalProperties, property);
-					continue;
-				}
+				continue;
+			}
 
-				throw new JsonException("Unknown property read from JSON.");
+			if (propKey.TryRead(ref reader, options, PropKey))
+			{
+				continue;
 			}
+
+			propAggregations ??= new System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate>();
+			Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionaryConverter.ReadItem(ref reader, options, out string key, out Elastic.Clients.Elasticsearch.Aggregations.IAggregate value);
+			propAggregations[key] = value;
 		}
 
-		return new CompositeBucket { Aggregations = new Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary(additionalProperties), DocCount = docCount, Key = key };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new CompositeBucket
+		{
+			Aggregations = new Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary(propAggregations)
+,
+			DocCount = propDocCount.Value
+,
+			Key = propKey.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, CompositeBucket value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, CompositeBucket value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'CompositeBucket' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDocCount, value.DocCount);
+		writer.WriteProperty(options, PropKey, value.Key);
+		if (value.Aggregations is not null)
+		{
+			foreach (var item in value.Aggregations)
+			{
+				Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionaryConverter.WriteItem(writer, options, item.Key, item.Value);
+			}
+		}
+
+		writer.WriteEndObject();
 	}
 }
 
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 5c0dcba229a..bc805586808 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/CumulativeCardinalityAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/CumulativeCardinalityAggregate.g.cs
@@ -40,4 +40,6 @@ public sealed partial class CumulativeCardinalityAggregate : IAggregate
 	public long Value { get; init; }
 	[JsonInclude, JsonPropertyName("value_as_string")]
 	public string? ValueAsString { get; init; }
+
+	string IAggregate.Type => "simple_long_value";
 }
\ No newline at end of file
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 f1e0896cdb3..6221ed36a4a 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/DateHistogramAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/DateHistogramAggregate.g.cs
@@ -33,4 +33,6 @@ public sealed partial class DateHistogramAggregate : IAggregate
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Aggregations.DateHistogramBucket> Buckets { get; init; }
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
+
+	string IAggregate.Type => "date_histogram";
 }
\ 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 a42bd78fdb7..c395f2be46e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/DateHistogramAggregation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/DateHistogramAggregation.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,160 @@
 
 namespace Elastic.Clients.Elasticsearch.Aggregations;
 
+internal sealed partial class DateHistogramAggregationConverter : System.Text.Json.Serialization.JsonConverter<DateHistogramAggregation>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCalendarInterval = System.Text.Json.JsonEncodedText.Encode("calendar_interval");
+	private static readonly System.Text.Json.JsonEncodedText PropExtendedBounds = System.Text.Json.JsonEncodedText.Encode("extended_bounds");
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropFixedInterval = System.Text.Json.JsonEncodedText.Encode("fixed_interval");
+	private static readonly System.Text.Json.JsonEncodedText PropFormat = System.Text.Json.JsonEncodedText.Encode("format");
+	private static readonly System.Text.Json.JsonEncodedText PropHardBounds = System.Text.Json.JsonEncodedText.Encode("hard_bounds");
+	private static readonly System.Text.Json.JsonEncodedText PropMinDocCount = System.Text.Json.JsonEncodedText.Encode("min_doc_count");
+	private static readonly System.Text.Json.JsonEncodedText PropMissing = System.Text.Json.JsonEncodedText.Encode("missing");
+	private static readonly System.Text.Json.JsonEncodedText PropOffset = System.Text.Json.JsonEncodedText.Encode("offset");
+	private static readonly System.Text.Json.JsonEncodedText PropOrder = System.Text.Json.JsonEncodedText.Encode("order");
+	private static readonly System.Text.Json.JsonEncodedText PropParams = System.Text.Json.JsonEncodedText.Encode("params");
+	private static readonly System.Text.Json.JsonEncodedText PropScript = System.Text.Json.JsonEncodedText.Encode("script");
+	private static readonly System.Text.Json.JsonEncodedText PropTimeZone = System.Text.Json.JsonEncodedText.Encode("time_zone");
+
+	public override DateHistogramAggregation Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Aggregations.CalendarInterval?> propCalendarInterval = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Aggregations.ExtendedBoundsDate?> propExtendedBounds = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Field?> propField = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Duration?> propFixedInterval = default;
+		LocalJsonProperty<string?> propFormat = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Aggregations.ExtendedBoundsDate?> propHardBounds = default;
+		LocalJsonProperty<int?> propMinDocCount = default;
+		LocalJsonProperty<DateTimeOffset?> propMissing = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Duration?> propOffset = default;
+		LocalJsonProperty<ICollection<KeyValuePair<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.SortOrder>>?> propOrder = default;
+		LocalJsonProperty<IDictionary<string, object>?> propParams = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Script?> propScript = default;
+		LocalJsonProperty<string?> propTimeZone = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCalendarInterval.TryRead(ref reader, options, PropCalendarInterval))
+			{
+				continue;
+			}
+
+			if (propExtendedBounds.TryRead(ref reader, options, PropExtendedBounds))
+			{
+				continue;
+			}
+
+			if (propField.TryRead(ref reader, options, PropField))
+			{
+				continue;
+			}
+
+			if (propFixedInterval.TryRead(ref reader, options, PropFixedInterval))
+			{
+				continue;
+			}
+
+			if (propFormat.TryRead(ref reader, options, PropFormat))
+			{
+				continue;
+			}
+
+			if (propHardBounds.TryRead(ref reader, options, PropHardBounds))
+			{
+				continue;
+			}
+
+			if (propMinDocCount.TryRead(ref reader, options, PropMinDocCount))
+			{
+				continue;
+			}
+
+			if (propMissing.TryRead(ref reader, options, PropMissing))
+			{
+				continue;
+			}
+
+			if (propOffset.TryRead(ref reader, options, PropOffset))
+			{
+				continue;
+			}
+
+			if (propOrder.TryRead(ref reader, options, PropOrder, typeof(SingleOrManyMarker<IReadOnlyCollection<KeyValuePair<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.SortOrder>>?, KeyValuePair<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.SortOrder>>)))
+			{
+				continue;
+			}
+
+			if (propParams.TryRead(ref reader, options, PropParams))
+			{
+				continue;
+			}
+
+			if (propScript.TryRead(ref reader, options, PropScript))
+			{
+				continue;
+			}
+
+			if (propTimeZone.TryRead(ref reader, options, PropTimeZone))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DateHistogramAggregation
+		{
+			CalendarInterval = propCalendarInterval.Value
+,
+			ExtendedBounds = propExtendedBounds.Value
+,
+			Field = propField.Value
+,
+			FixedInterval = propFixedInterval.Value
+,
+			Format = propFormat.Value
+,
+			HardBounds = propHardBounds.Value
+,
+			MinDocCount = propMinDocCount.Value
+,
+			Missing = propMissing.Value
+,
+			Offset = propOffset.Value
+,
+			Order = propOrder.Value
+,
+			Params = propParams.Value
+,
+			Script = propScript.Value
+,
+			TimeZone = propTimeZone.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DateHistogramAggregation value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCalendarInterval, value.CalendarInterval);
+		writer.WriteProperty(options, PropExtendedBounds, value.ExtendedBounds);
+		writer.WriteProperty(options, PropField, value.Field);
+		writer.WriteProperty(options, PropFixedInterval, value.FixedInterval);
+		writer.WriteProperty(options, PropFormat, value.Format);
+		writer.WriteProperty(options, PropHardBounds, value.HardBounds);
+		writer.WriteProperty(options, PropMinDocCount, value.MinDocCount);
+		writer.WriteProperty(options, PropMissing, value.Missing);
+		writer.WriteProperty(options, PropOffset, value.Offset);
+		writer.WriteProperty(options, PropOrder, value.Order, typeof(SingleOrManyMarker<IReadOnlyCollection<KeyValuePair<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.SortOrder>>?, KeyValuePair<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.SortOrder>>));
+		writer.WriteProperty(options, PropParams, value.Params);
+		writer.WriteProperty(options, PropScript, value.Script);
+		writer.WriteProperty(options, PropTimeZone, value.TimeZone);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DateHistogramAggregationConverter))]
 public sealed partial class DateHistogramAggregation
 {
 	/// <summary>
@@ -35,7 +190,6 @@ public sealed partial class DateHistogramAggregation
 	/// Can be specified using the unit name, such as <c>month</c>, or as a single unit quantity, such as <c>1M</c>.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("calendar_interval")]
 	public Elastic.Clients.Elasticsearch.Aggregations.CalendarInterval? CalendarInterval { get; set; }
 
 	/// <summary>
@@ -43,7 +197,6 @@ public sealed partial class DateHistogramAggregation
 	/// Enables extending the bounds of the histogram beyond the data itself.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("extended_bounds")]
 	public Elastic.Clients.Elasticsearch.Aggregations.ExtendedBoundsDate? ExtendedBounds { get; set; }
 
 	/// <summary>
@@ -51,7 +204,6 @@ public sealed partial class DateHistogramAggregation
 	/// The date field whose values are use to build a histogram.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("field")]
 	public Elastic.Clients.Elasticsearch.Field? Field { get; set; }
 
 	/// <summary>
@@ -59,7 +211,6 @@ public sealed partial class DateHistogramAggregation
 	/// Fixed intervals: a fixed number of SI units and never deviate, regardless of where they fall on the calendar.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("fixed_interval")]
 	public Elastic.Clients.Elasticsearch.Duration? FixedInterval { get; set; }
 
 	/// <summary>
@@ -68,7 +219,6 @@ public sealed partial class DateHistogramAggregation
 	/// If no <c>format</c> is specified, the first date format specified in the field mapping is used.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("format")]
 	public string? Format { get; set; }
 
 	/// <summary>
@@ -76,7 +226,6 @@ public sealed partial class DateHistogramAggregation
 	/// Limits the histogram to specified bounds.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("hard_bounds")]
 	public Elastic.Clients.Elasticsearch.Aggregations.ExtendedBoundsDate? HardBounds { get; set; }
 
 	/// <summary>
@@ -85,7 +234,6 @@ public sealed partial class DateHistogramAggregation
 	/// By default, all buckets between the first bucket that matches documents and the last one are returned.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("min_doc_count")]
 	public int? MinDocCount { get; set; }
 
 	/// <summary>
@@ -94,7 +242,6 @@ public sealed partial class DateHistogramAggregation
 	/// By default, documents without a value are ignored.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("missing")]
 	public DateTimeOffset? Missing { get; set; }
 
 	/// <summary>
@@ -102,7 +249,6 @@ public sealed partial class DateHistogramAggregation
 	/// Changes the start value of each bucket by the specified positive (<c>+</c>) or negative offset (<c>-</c>) duration.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("offset")]
 	public Elastic.Clients.Elasticsearch.Duration? Offset { get; set; }
 
 	/// <summary>
@@ -110,12 +256,8 @@ public sealed partial class DateHistogramAggregation
 	/// The sort order of the returned buckets.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("order")]
-	[SingleOrManyCollectionConverter(typeof(KeyValuePair<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.SortOrder>))]
 	public ICollection<KeyValuePair<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.SortOrder>>? Order { get; set; }
-	[JsonInclude, JsonPropertyName("params")]
 	public IDictionary<string, object>? Params { get; set; }
-	[JsonInclude, JsonPropertyName("script")]
 	public Elastic.Clients.Elasticsearch.Script? Script { get; set; }
 
 	/// <summary>
@@ -124,7 +266,6 @@ public sealed partial class DateHistogramAggregation
 	/// Defaults to Coordinated Universal Time (UTC).
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("time_zone")]
 	public string? TimeZone { get; set; }
 
 	public static implicit operator Elastic.Clients.Elasticsearch.Aggregations.Aggregation(DateHistogramAggregation dateHistogramAggregation) => Elastic.Clients.Elasticsearch.Aggregations.Aggregation.DateHistogram(dateHistogramAggregation);
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 1c4587a37dd..322dca304b6 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/DateHistogramBucket.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/DateHistogramBucket.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,56 +28,70 @@
 
 namespace Elastic.Clients.Elasticsearch.Aggregations;
 
-internal sealed partial class DateHistogramBucketConverter : JsonConverter<DateHistogramBucket>
+internal sealed partial class DateHistogramBucketConverter : System.Text.Json.Serialization.JsonConverter<DateHistogramBucket>
 {
-	public override DateHistogramBucket Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropDocCount = System.Text.Json.JsonEncodedText.Encode("doc_count");
+	private static readonly System.Text.Json.JsonEncodedText PropKey = System.Text.Json.JsonEncodedText.Encode("key");
+	private static readonly System.Text.Json.JsonEncodedText PropKeyAsString = System.Text.Json.JsonEncodedText.Encode("key_as_string");
+
+	public override DateHistogramBucket Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		long docCount = default;
-		long key = default;
-		string? keyAsString = default;
-		Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate> propAggregations = default;
+		LocalJsonProperty<long> propDocCount = default;
+		LocalJsonProperty<long> propKey = default;
+		LocalJsonProperty<string?> propKeyAsString = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propDocCount.TryRead(ref reader, options, PropDocCount))
 			{
-				var property = reader.GetString();
-				if (property == "doc_count")
-				{
-					docCount = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "key")
-				{
-					key = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "key_as_string")
-				{
-					keyAsString = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
+				continue;
+			}
 
-				if (property.Contains("#"))
-				{
-					additionalProperties ??= new Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate>();
-					AggregateDictionaryConverter.ReadItem(ref reader, options, additionalProperties, property);
-					continue;
-				}
+			if (propKey.TryRead(ref reader, options, PropKey))
+			{
+				continue;
+			}
 
-				throw new JsonException("Unknown property read from JSON.");
+			if (propKeyAsString.TryRead(ref reader, options, PropKeyAsString))
+			{
+				continue;
 			}
+
+			propAggregations ??= new System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate>();
+			Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionaryConverter.ReadItem(ref reader, options, out string key, out Elastic.Clients.Elasticsearch.Aggregations.IAggregate value);
+			propAggregations[key] = value;
 		}
 
-		return new DateHistogramBucket { Aggregations = new Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary(additionalProperties), DocCount = docCount, Key = key, KeyAsString = keyAsString };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DateHistogramBucket
+		{
+			Aggregations = new Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary(propAggregations)
+,
+			DocCount = propDocCount.Value
+,
+			Key = propKey.Value
+,
+			KeyAsString = propKeyAsString.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, DateHistogramBucket value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DateHistogramBucket value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'DateHistogramBucket' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDocCount, value.DocCount);
+		writer.WriteProperty(options, PropKey, value.Key);
+		writer.WriteProperty(options, PropKeyAsString, value.KeyAsString);
+		if (value.Aggregations is not null)
+		{
+			foreach (var item in value.Aggregations)
+			{
+				Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionaryConverter.WriteItem(writer, options, item.Key, item.Value);
+			}
+		}
+
+		writer.WriteEndObject();
 	}
 }
 
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 7c01bcdd83e..e68c891098e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/DateRangeAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/DateRangeAggregate.g.cs
@@ -39,4 +39,6 @@ public sealed partial class DateRangeAggregate : IAggregate
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Aggregations.RangeBucket> Buckets { get; init; }
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
+
+	string IAggregate.Type => "date_range";
 }
\ No newline at end of file
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 6773162c7ea..4518efd8ec8 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/DerivativeAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/DerivativeAggregate.g.cs
@@ -46,4 +46,6 @@ public sealed partial class DerivativeAggregate : IAggregate
 	public double? Value { get; init; }
 	[JsonInclude, JsonPropertyName("value_as_string")]
 	public string? ValueAsString { get; init; }
+
+	string IAggregate.Type => "derivative";
 }
\ No newline at end of file
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 cab1c43b3f6..6f5e6ebb498 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/DoubleTermsAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/DoubleTermsAggregate.g.cs
@@ -42,4 +42,6 @@ public sealed partial class DoubleTermsAggregate : IAggregate
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
 	[JsonInclude, JsonPropertyName("sum_other_doc_count")]
 	public long? SumOtherDocCount { get; init; }
+
+	string IAggregate.Type => "dterms";
 }
\ 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 7b41be3afc5..b34e33f0671 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/DoubleTermsBucket.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/DoubleTermsBucket.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,63 +28,80 @@
 
 namespace Elastic.Clients.Elasticsearch.Aggregations;
 
-internal sealed partial class DoubleTermsBucketConverter : JsonConverter<DoubleTermsBucket>
+internal sealed partial class DoubleTermsBucketConverter : System.Text.Json.Serialization.JsonConverter<DoubleTermsBucket>
 {
-	public override DoubleTermsBucket Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropDocCount = System.Text.Json.JsonEncodedText.Encode("doc_count");
+	private static readonly System.Text.Json.JsonEncodedText PropDocCountErrorUpperBound = System.Text.Json.JsonEncodedText.Encode("doc_count_error_upper_bound");
+	private static readonly System.Text.Json.JsonEncodedText PropKey = System.Text.Json.JsonEncodedText.Encode("key");
+	private static readonly System.Text.Json.JsonEncodedText PropKeyAsString = System.Text.Json.JsonEncodedText.Encode("key_as_string");
+
+	public override DoubleTermsBucket Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		long docCount = default;
-		long? docCountErrorUpperBound = default;
-		double key = default;
-		string? keyAsString = default;
-		Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate> propAggregations = default;
+		LocalJsonProperty<long> propDocCount = default;
+		LocalJsonProperty<long?> propDocCountErrorUpperBound = default;
+		LocalJsonProperty<double> propKey = default;
+		LocalJsonProperty<string?> propKeyAsString = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propDocCount.TryRead(ref reader, options, PropDocCount))
 			{
-				var property = reader.GetString();
-				if (property == "doc_count")
-				{
-					docCount = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "doc_count_error_upper_bound")
-				{
-					docCountErrorUpperBound = JsonSerializer.Deserialize<long?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "key")
-				{
-					key = JsonSerializer.Deserialize<double>(ref reader, options);
-					continue;
-				}
+				continue;
+			}
 
-				if (property == "key_as_string")
-				{
-					keyAsString = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
+			if (propDocCountErrorUpperBound.TryRead(ref reader, options, PropDocCountErrorUpperBound))
+			{
+				continue;
+			}
 
-				if (property.Contains("#"))
-				{
-					additionalProperties ??= new Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate>();
-					AggregateDictionaryConverter.ReadItem(ref reader, options, additionalProperties, property);
-					continue;
-				}
+			if (propKey.TryRead(ref reader, options, PropKey))
+			{
+				continue;
+			}
 
-				throw new JsonException("Unknown property read from JSON.");
+			if (propKeyAsString.TryRead(ref reader, options, PropKeyAsString))
+			{
+				continue;
 			}
+
+			propAggregations ??= new System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate>();
+			Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionaryConverter.ReadItem(ref reader, options, out string key, out Elastic.Clients.Elasticsearch.Aggregations.IAggregate value);
+			propAggregations[key] = value;
 		}
 
-		return new DoubleTermsBucket { Aggregations = new Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary(additionalProperties), DocCount = docCount, DocCountErrorUpperBound = docCountErrorUpperBound, Key = key, KeyAsString = keyAsString };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DoubleTermsBucket
+		{
+			Aggregations = new Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary(propAggregations)
+,
+			DocCount = propDocCount.Value
+,
+			DocCountErrorUpperBound = propDocCountErrorUpperBound.Value
+,
+			Key = propKey.Value
+,
+			KeyAsString = propKeyAsString.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, DoubleTermsBucket value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DoubleTermsBucket value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'DoubleTermsBucket' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDocCount, value.DocCount);
+		writer.WriteProperty(options, PropDocCountErrorUpperBound, value.DocCountErrorUpperBound);
+		writer.WriteProperty(options, PropKey, value.Key);
+		writer.WriteProperty(options, PropKeyAsString, value.KeyAsString);
+		if (value.Aggregations is not null)
+		{
+			foreach (var item in value.Aggregations)
+			{
+				Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionaryConverter.WriteItem(writer, options, item.Key, item.Value);
+			}
+		}
+
+		writer.WriteEndObject();
 	}
 }
 
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 bac3a657435..ab8f6273664 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ExtendedStatsAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ExtendedStatsAggregate.g.cs
@@ -77,4 +77,6 @@ public sealed partial class ExtendedStatsAggregate : IAggregate
 	public double? VarianceSampling { get; init; }
 	[JsonInclude, JsonPropertyName("variance_sampling_as_string")]
 	public string? VarianceSamplingAsString { get; init; }
+
+	string IAggregate.Type => "extended_stats";
 }
\ No newline at end of file
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 745361506c4..675a13cef90 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ExtendedStatsBucketAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ExtendedStatsBucketAggregate.g.cs
@@ -77,4 +77,6 @@ public sealed partial class ExtendedStatsBucketAggregate : IAggregate
 	public double? VarianceSampling { get; init; }
 	[JsonInclude, JsonPropertyName("variance_sampling_as_string")]
 	public string? VarianceSamplingAsString { get; init; }
+
+	string IAggregate.Type => "extended_stats_bucket";
 }
\ No newline at end of file
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 20dac2acc0f..f20f905ca6a 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/FilterAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/FilterAggregate.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,49 +28,60 @@
 
 namespace Elastic.Clients.Elasticsearch.Aggregations;
 
-internal sealed partial class FilterAggregateConverter : JsonConverter<FilterAggregate>
+internal sealed partial class FilterAggregateConverter : System.Text.Json.Serialization.JsonConverter<FilterAggregate>
 {
-	public override FilterAggregate Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropDocCount = System.Text.Json.JsonEncodedText.Encode("doc_count");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+
+	public override FilterAggregate Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		long docCount = default;
-		IReadOnlyDictionary<string, object>? meta = default;
-		Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate> propAggregations = default;
+		LocalJsonProperty<long> propDocCount = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, object>?> propMeta = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propDocCount.TryRead(ref reader, options, PropDocCount))
 			{
-				var property = reader.GetString();
-				if (property == "doc_count")
-				{
-					docCount = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "meta")
-				{
-					meta = JsonSerializer.Deserialize<IReadOnlyDictionary<string, object>?>(ref reader, options);
-					continue;
-				}
-
-				if (property.Contains("#"))
-				{
-					additionalProperties ??= new Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate>();
-					AggregateDictionaryConverter.ReadItem(ref reader, options, additionalProperties, property);
-					continue;
-				}
+				continue;
+			}
 
-				throw new JsonException("Unknown property read from JSON.");
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
 			}
+
+			propAggregations ??= new System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate>();
+			Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionaryConverter.ReadItem(ref reader, options, out string key, out Elastic.Clients.Elasticsearch.Aggregations.IAggregate value);
+			propAggregations[key] = value;
 		}
 
-		return new FilterAggregate { Aggregations = new Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary(additionalProperties), DocCount = docCount, Meta = meta };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new FilterAggregate
+		{
+			Aggregations = new Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary(propAggregations)
+,
+			DocCount = propDocCount.Value
+,
+			Meta = propMeta.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, FilterAggregate value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, FilterAggregate value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'FilterAggregate' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDocCount, value.DocCount);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		if (value.Aggregations is not null)
+		{
+			foreach (var item in value.Aggregations)
+			{
+				Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionaryConverter.WriteItem(writer, options, item.Key, item.Value);
+			}
+		}
+
+		writer.WriteEndObject();
 	}
 }
 
@@ -84,4 +96,6 @@ public sealed partial class FilterAggregate : IAggregate
 	public Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary Aggregations { get; init; }
 	public long DocCount { get; init; }
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
+
+	string IAggregate.Type => "filter";
 }
\ No newline at end of file
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 7dcc5086217..92f3527f2d0 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/FiltersAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/FiltersAggregate.g.cs
@@ -33,4 +33,6 @@ public sealed partial class FiltersAggregate : IAggregate
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Aggregations.FiltersBucket> Buckets { get; init; }
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
+
+	string IAggregate.Type => "filters";
 }
\ No newline at end of file
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 3551b48bfdb..d2291e440c8 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/FiltersBucket.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/FiltersBucket.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,42 +28,50 @@
 
 namespace Elastic.Clients.Elasticsearch.Aggregations;
 
-internal sealed partial class FiltersBucketConverter : JsonConverter<FiltersBucket>
+internal sealed partial class FiltersBucketConverter : System.Text.Json.Serialization.JsonConverter<FiltersBucket>
 {
-	public override FiltersBucket Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropDocCount = System.Text.Json.JsonEncodedText.Encode("doc_count");
+
+	public override FiltersBucket Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		long docCount = default;
-		Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate> propAggregations = default;
+		LocalJsonProperty<long> propDocCount = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propDocCount.TryRead(ref reader, options, PropDocCount))
 			{
-				var property = reader.GetString();
-				if (property == "doc_count")
-				{
-					docCount = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property.Contains("#"))
-				{
-					additionalProperties ??= new Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate>();
-					AggregateDictionaryConverter.ReadItem(ref reader, options, additionalProperties, property);
-					continue;
-				}
-
-				throw new JsonException("Unknown property read from JSON.");
+				continue;
 			}
+
+			propAggregations ??= new System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate>();
+			Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionaryConverter.ReadItem(ref reader, options, out string key, out Elastic.Clients.Elasticsearch.Aggregations.IAggregate value);
+			propAggregations[key] = value;
 		}
 
-		return new FiltersBucket { Aggregations = new Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary(additionalProperties), DocCount = docCount };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new FiltersBucket
+		{
+			Aggregations = new Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary(propAggregations)
+,
+			DocCount = propDocCount.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, FiltersBucket value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, FiltersBucket value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'FiltersBucket' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDocCount, value.DocCount);
+		if (value.Aggregations is not null)
+		{
+			foreach (var item in value.Aggregations)
+			{
+				Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionaryConverter.WriteItem(writer, options, item.Key, item.Value);
+			}
+		}
+
+		writer.WriteEndObject();
 	}
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/FrequentItemSetsAggregate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/FrequentItemSetsAggregate.g.cs
index 10bd279d590..1f74798ffd2 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/FrequentItemSetsAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/FrequentItemSetsAggregate.g.cs
@@ -33,4 +33,6 @@ public sealed partial class FrequentItemSetsAggregate : IAggregate
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Aggregations.FrequentItemSetsBucket> Buckets { get; init; }
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
+
+	string IAggregate.Type => "frequent_item_sets";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/FrequentItemSetsBucket.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/FrequentItemSetsBucket.g.cs
index 88ff41a35f0..27144ccd79a 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/FrequentItemSetsBucket.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/FrequentItemSetsBucket.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,56 +28,70 @@
 
 namespace Elastic.Clients.Elasticsearch.Aggregations;
 
-internal sealed partial class FrequentItemSetsBucketConverter : JsonConverter<FrequentItemSetsBucket>
+internal sealed partial class FrequentItemSetsBucketConverter : System.Text.Json.Serialization.JsonConverter<FrequentItemSetsBucket>
 {
-	public override FrequentItemSetsBucket Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropDocCount = System.Text.Json.JsonEncodedText.Encode("doc_count");
+	private static readonly System.Text.Json.JsonEncodedText PropKey = System.Text.Json.JsonEncodedText.Encode("key");
+	private static readonly System.Text.Json.JsonEncodedText PropSupport = System.Text.Json.JsonEncodedText.Encode("support");
+
+	public override FrequentItemSetsBucket Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		long docCount = default;
-		IReadOnlyDictionary<Elastic.Clients.Elasticsearch.Field, IReadOnlyCollection<string>> key = default;
-		double support = default;
-		Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate> propAggregations = default;
+		LocalJsonProperty<long> propDocCount = default;
+		LocalJsonProperty<IReadOnlyDictionary<Elastic.Clients.Elasticsearch.Field, IReadOnlyCollection<string>>> propKey = default;
+		LocalJsonProperty<double> propSupport = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propDocCount.TryRead(ref reader, options, PropDocCount))
 			{
-				var property = reader.GetString();
-				if (property == "doc_count")
-				{
-					docCount = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "key")
-				{
-					key = JsonSerializer.Deserialize<IReadOnlyDictionary<Elastic.Clients.Elasticsearch.Field, IReadOnlyCollection<string>>>(ref reader, options);
-					continue;
-				}
-
-				if (property == "support")
-				{
-					support = JsonSerializer.Deserialize<double>(ref reader, options);
-					continue;
-				}
+				continue;
+			}
 
-				if (property.Contains("#"))
-				{
-					additionalProperties ??= new Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate>();
-					AggregateDictionaryConverter.ReadItem(ref reader, options, additionalProperties, property);
-					continue;
-				}
+			if (propKey.TryRead(ref reader, options, PropKey))
+			{
+				continue;
+			}
 
-				throw new JsonException("Unknown property read from JSON.");
+			if (propSupport.TryRead(ref reader, options, PropSupport))
+			{
+				continue;
 			}
+
+			propAggregations ??= new System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate>();
+			Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionaryConverter.ReadItem(ref reader, options, out string key, out Elastic.Clients.Elasticsearch.Aggregations.IAggregate value);
+			propAggregations[key] = value;
 		}
 
-		return new FrequentItemSetsBucket { Aggregations = new Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary(additionalProperties), DocCount = docCount, Key = key, Support = support };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new FrequentItemSetsBucket
+		{
+			Aggregations = new Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary(propAggregations)
+,
+			DocCount = propDocCount.Value
+,
+			Key = propKey.Value
+,
+			Support = propSupport.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, FrequentItemSetsBucket value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, FrequentItemSetsBucket value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'FrequentItemSetsBucket' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDocCount, value.DocCount);
+		writer.WriteProperty(options, PropKey, value.Key);
+		writer.WriteProperty(options, PropSupport, value.Support);
+		if (value.Aggregations is not null)
+		{
+			foreach (var item in value.Aggregations)
+			{
+				Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionaryConverter.WriteItem(writer, options, item.Key, item.Value);
+			}
+		}
+
+		writer.WriteEndObject();
 	}
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/GeoBoundsAggregate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/GeoBoundsAggregate.g.cs
index ddc34a2eb4e..d32da055e1e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/GeoBoundsAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/GeoBoundsAggregate.g.cs
@@ -33,4 +33,6 @@ public sealed partial class GeoBoundsAggregate : IAggregate
 	public Elastic.Clients.Elasticsearch.GeoBounds? Bounds { get; init; }
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
+
+	string IAggregate.Type => "geo_bounds";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/GeoCentroidAggregate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/GeoCentroidAggregate.g.cs
index 4be076472e7..094be70d111 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/GeoCentroidAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/GeoCentroidAggregate.g.cs
@@ -35,4 +35,6 @@ public sealed partial class GeoCentroidAggregate : IAggregate
 	public Elastic.Clients.Elasticsearch.GeoLocation? Location { get; init; }
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
+
+	string IAggregate.Type => "geo_centroid";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/GeoDistanceAggregate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/GeoDistanceAggregate.g.cs
index b3d316f4f5e..65021295d16 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/GeoDistanceAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/GeoDistanceAggregate.g.cs
@@ -38,4 +38,6 @@ public sealed partial class GeoDistanceAggregate : IAggregate
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Aggregations.RangeBucket> Buckets { get; init; }
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
+
+	string IAggregate.Type => "geo_distance";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/GeoLineAggregate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/GeoLineAggregate.g.cs
index 5191273fae9..b10bbf7fd47 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/GeoLineAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/GeoLineAggregate.g.cs
@@ -37,4 +37,6 @@ public sealed partial class GeoLineAggregate : IAggregate
 	public object Properties { get; init; }
 	[JsonInclude, JsonPropertyName("type")]
 	public string Type { get; init; }
+
+	string IAggregate.Type => "geo_line";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/GeohashGridAggregate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/GeohashGridAggregate.g.cs
index 5b7c3c64f79..71da7edf506 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/GeohashGridAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/GeohashGridAggregate.g.cs
@@ -33,4 +33,6 @@ public sealed partial class GeohashGridAggregate : IAggregate
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Aggregations.GeohashGridBucket> Buckets { get; init; }
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
+
+	string IAggregate.Type => "geohash_grid";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/GeohashGridBucket.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/GeohashGridBucket.g.cs
index 8a8a6bc482c..340d85ecc18 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/GeohashGridBucket.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/GeohashGridBucket.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,49 +28,60 @@
 
 namespace Elastic.Clients.Elasticsearch.Aggregations;
 
-internal sealed partial class GeohashGridBucketConverter : JsonConverter<GeohashGridBucket>
+internal sealed partial class GeohashGridBucketConverter : System.Text.Json.Serialization.JsonConverter<GeohashGridBucket>
 {
-	public override GeohashGridBucket Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropDocCount = System.Text.Json.JsonEncodedText.Encode("doc_count");
+	private static readonly System.Text.Json.JsonEncodedText PropKey = System.Text.Json.JsonEncodedText.Encode("key");
+
+	public override GeohashGridBucket Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		long docCount = default;
-		string key = default;
-		Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate> propAggregations = default;
+		LocalJsonProperty<long> propDocCount = default;
+		LocalJsonProperty<string> propKey = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propDocCount.TryRead(ref reader, options, PropDocCount))
 			{
-				var property = reader.GetString();
-				if (property == "doc_count")
-				{
-					docCount = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "key")
-				{
-					key = JsonSerializer.Deserialize<string>(ref reader, options);
-					continue;
-				}
-
-				if (property.Contains("#"))
-				{
-					additionalProperties ??= new Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate>();
-					AggregateDictionaryConverter.ReadItem(ref reader, options, additionalProperties, property);
-					continue;
-				}
+				continue;
+			}
 
-				throw new JsonException("Unknown property read from JSON.");
+			if (propKey.TryRead(ref reader, options, PropKey))
+			{
+				continue;
 			}
+
+			propAggregations ??= new System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate>();
+			Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionaryConverter.ReadItem(ref reader, options, out string key, out Elastic.Clients.Elasticsearch.Aggregations.IAggregate value);
+			propAggregations[key] = value;
 		}
 
-		return new GeohashGridBucket { Aggregations = new Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary(additionalProperties), DocCount = docCount, Key = key };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GeohashGridBucket
+		{
+			Aggregations = new Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary(propAggregations)
+,
+			DocCount = propDocCount.Value
+,
+			Key = propKey.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, GeohashGridBucket value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GeohashGridBucket value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'GeohashGridBucket' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDocCount, value.DocCount);
+		writer.WriteProperty(options, PropKey, value.Key);
+		if (value.Aggregations is not null)
+		{
+			foreach (var item in value.Aggregations)
+			{
+				Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionaryConverter.WriteItem(writer, options, item.Key, item.Value);
+			}
+		}
+
+		writer.WriteEndObject();
 	}
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/GeohexGridAggregate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/GeohexGridAggregate.g.cs
index b70f968b98f..dcee019a9fe 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/GeohexGridAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/GeohexGridAggregate.g.cs
@@ -33,4 +33,6 @@ public sealed partial class GeohexGridAggregate : IAggregate
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Aggregations.GeohexGridBucket> Buckets { get; init; }
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
+
+	string IAggregate.Type => "geohex_grid";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/GeohexGridBucket.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/GeohexGridBucket.g.cs
index 4863f027671..6c23ee23b8c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/GeohexGridBucket.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/GeohexGridBucket.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,49 +28,60 @@
 
 namespace Elastic.Clients.Elasticsearch.Aggregations;
 
-internal sealed partial class GeohexGridBucketConverter : JsonConverter<GeohexGridBucket>
+internal sealed partial class GeohexGridBucketConverter : System.Text.Json.Serialization.JsonConverter<GeohexGridBucket>
 {
-	public override GeohexGridBucket Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropDocCount = System.Text.Json.JsonEncodedText.Encode("doc_count");
+	private static readonly System.Text.Json.JsonEncodedText PropKey = System.Text.Json.JsonEncodedText.Encode("key");
+
+	public override GeohexGridBucket Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		long docCount = default;
-		string key = default;
-		Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate> propAggregations = default;
+		LocalJsonProperty<long> propDocCount = default;
+		LocalJsonProperty<string> propKey = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propDocCount.TryRead(ref reader, options, PropDocCount))
 			{
-				var property = reader.GetString();
-				if (property == "doc_count")
-				{
-					docCount = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "key")
-				{
-					key = JsonSerializer.Deserialize<string>(ref reader, options);
-					continue;
-				}
-
-				if (property.Contains("#"))
-				{
-					additionalProperties ??= new Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate>();
-					AggregateDictionaryConverter.ReadItem(ref reader, options, additionalProperties, property);
-					continue;
-				}
+				continue;
+			}
 
-				throw new JsonException("Unknown property read from JSON.");
+			if (propKey.TryRead(ref reader, options, PropKey))
+			{
+				continue;
 			}
+
+			propAggregations ??= new System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate>();
+			Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionaryConverter.ReadItem(ref reader, options, out string key, out Elastic.Clients.Elasticsearch.Aggregations.IAggregate value);
+			propAggregations[key] = value;
 		}
 
-		return new GeohexGridBucket { Aggregations = new Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary(additionalProperties), DocCount = docCount, Key = key };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GeohexGridBucket
+		{
+			Aggregations = new Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary(propAggregations)
+,
+			DocCount = propDocCount.Value
+,
+			Key = propKey.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, GeohexGridBucket value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GeohexGridBucket value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'GeohexGridBucket' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDocCount, value.DocCount);
+		writer.WriteProperty(options, PropKey, value.Key);
+		if (value.Aggregations is not null)
+		{
+			foreach (var item in value.Aggregations)
+			{
+				Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionaryConverter.WriteItem(writer, options, item.Key, item.Value);
+			}
+		}
+
+		writer.WriteEndObject();
 	}
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/GeotileGridAggregate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/GeotileGridAggregate.g.cs
index ff2bbda7bd4..25650a1c804 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/GeotileGridAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/GeotileGridAggregate.g.cs
@@ -33,4 +33,6 @@ public sealed partial class GeotileGridAggregate : IAggregate
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Aggregations.GeotileGridBucket> Buckets { get; init; }
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
+
+	string IAggregate.Type => "geotile_grid";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/GeotileGridBucket.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/GeotileGridBucket.g.cs
index 8c03fbf568d..8f57f982d88 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/GeotileGridBucket.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/GeotileGridBucket.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,49 +28,60 @@
 
 namespace Elastic.Clients.Elasticsearch.Aggregations;
 
-internal sealed partial class GeotileGridBucketConverter : JsonConverter<GeotileGridBucket>
+internal sealed partial class GeotileGridBucketConverter : System.Text.Json.Serialization.JsonConverter<GeotileGridBucket>
 {
-	public override GeotileGridBucket Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropDocCount = System.Text.Json.JsonEncodedText.Encode("doc_count");
+	private static readonly System.Text.Json.JsonEncodedText PropKey = System.Text.Json.JsonEncodedText.Encode("key");
+
+	public override GeotileGridBucket Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		long docCount = default;
-		string key = default;
-		Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate> propAggregations = default;
+		LocalJsonProperty<long> propDocCount = default;
+		LocalJsonProperty<string> propKey = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propDocCount.TryRead(ref reader, options, PropDocCount))
 			{
-				var property = reader.GetString();
-				if (property == "doc_count")
-				{
-					docCount = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "key")
-				{
-					key = JsonSerializer.Deserialize<string>(ref reader, options);
-					continue;
-				}
-
-				if (property.Contains("#"))
-				{
-					additionalProperties ??= new Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate>();
-					AggregateDictionaryConverter.ReadItem(ref reader, options, additionalProperties, property);
-					continue;
-				}
+				continue;
+			}
 
-				throw new JsonException("Unknown property read from JSON.");
+			if (propKey.TryRead(ref reader, options, PropKey))
+			{
+				continue;
 			}
+
+			propAggregations ??= new System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate>();
+			Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionaryConverter.ReadItem(ref reader, options, out string key, out Elastic.Clients.Elasticsearch.Aggregations.IAggregate value);
+			propAggregations[key] = value;
 		}
 
-		return new GeotileGridBucket { Aggregations = new Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary(additionalProperties), DocCount = docCount, Key = key };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GeotileGridBucket
+		{
+			Aggregations = new Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary(propAggregations)
+,
+			DocCount = propDocCount.Value
+,
+			Key = propKey.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, GeotileGridBucket value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GeotileGridBucket value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'GeotileGridBucket' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDocCount, value.DocCount);
+		writer.WriteProperty(options, PropKey, value.Key);
+		if (value.Aggregations is not null)
+		{
+			foreach (var item in value.Aggregations)
+			{
+				Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionaryConverter.WriteItem(writer, options, item.Key, item.Value);
+			}
+		}
+
+		writer.WriteEndObject();
 	}
 }
 
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 6ba1c78191d..cc97e332ee0 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/GlobalAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/GlobalAggregate.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,49 +28,60 @@
 
 namespace Elastic.Clients.Elasticsearch.Aggregations;
 
-internal sealed partial class GlobalAggregateConverter : JsonConverter<GlobalAggregate>
+internal sealed partial class GlobalAggregateConverter : System.Text.Json.Serialization.JsonConverter<GlobalAggregate>
 {
-	public override GlobalAggregate Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropDocCount = System.Text.Json.JsonEncodedText.Encode("doc_count");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+
+	public override GlobalAggregate Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		long docCount = default;
-		IReadOnlyDictionary<string, object>? meta = default;
-		Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate> propAggregations = default;
+		LocalJsonProperty<long> propDocCount = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, object>?> propMeta = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propDocCount.TryRead(ref reader, options, PropDocCount))
 			{
-				var property = reader.GetString();
-				if (property == "doc_count")
-				{
-					docCount = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "meta")
-				{
-					meta = JsonSerializer.Deserialize<IReadOnlyDictionary<string, object>?>(ref reader, options);
-					continue;
-				}
-
-				if (property.Contains("#"))
-				{
-					additionalProperties ??= new Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate>();
-					AggregateDictionaryConverter.ReadItem(ref reader, options, additionalProperties, property);
-					continue;
-				}
+				continue;
+			}
 
-				throw new JsonException("Unknown property read from JSON.");
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
 			}
+
+			propAggregations ??= new System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate>();
+			Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionaryConverter.ReadItem(ref reader, options, out string key, out Elastic.Clients.Elasticsearch.Aggregations.IAggregate value);
+			propAggregations[key] = value;
 		}
 
-		return new GlobalAggregate { Aggregations = new Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary(additionalProperties), DocCount = docCount, Meta = meta };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GlobalAggregate
+		{
+			Aggregations = new Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary(propAggregations)
+,
+			DocCount = propDocCount.Value
+,
+			Meta = propMeta.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, GlobalAggregate value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GlobalAggregate value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'GlobalAggregate' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDocCount, value.DocCount);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		if (value.Aggregations is not null)
+		{
+			foreach (var item in value.Aggregations)
+			{
+				Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionaryConverter.WriteItem(writer, options, item.Key, item.Value);
+			}
+		}
+
+		writer.WriteEndObject();
 	}
 }
 
@@ -84,4 +96,6 @@ public sealed partial class GlobalAggregate : IAggregate
 	public Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary Aggregations { get; init; }
 	public long DocCount { get; init; }
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
+
+	string IAggregate.Type => "global";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/HdrPercentileRanksAggregate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/HdrPercentileRanksAggregate.g.cs
index dcf051f90b2..6441261ca4a 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/HdrPercentileRanksAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/HdrPercentileRanksAggregate.g.cs
@@ -33,4 +33,6 @@ public sealed partial class HdrPercentileRanksAggregate : IAggregate
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
 	[JsonInclude, JsonPropertyName("values")]
 	public Elastic.Clients.Elasticsearch.Aggregations.Percentiles Values { get; init; }
+
+	string IAggregate.Type => "hdr_percentile_ranks";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/HdrPercentilesAggregate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/HdrPercentilesAggregate.g.cs
index f82bc12e77d..0ad880053f6 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/HdrPercentilesAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/HdrPercentilesAggregate.g.cs
@@ -33,4 +33,6 @@ public sealed partial class HdrPercentilesAggregate : IAggregate
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
 	[JsonInclude, JsonPropertyName("values")]
 	public Elastic.Clients.Elasticsearch.Aggregations.Percentiles Values { get; init; }
+
+	string IAggregate.Type => "hdr_percentiles";
 }
\ No newline at end of file
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 e96f1a21eda..01cd6fbc1d8 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/HistogramAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/HistogramAggregate.g.cs
@@ -33,4 +33,6 @@ public sealed partial class HistogramAggregate : IAggregate
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Aggregations.HistogramBucket> Buckets { get; init; }
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
+
+	string IAggregate.Type => "histogram";
 }
\ 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 cd3c90e0d08..6416f7ab1e6 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/HistogramAggregation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/HistogramAggregation.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,130 @@
 
 namespace Elastic.Clients.Elasticsearch.Aggregations;
 
+internal sealed partial class HistogramAggregationConverter : System.Text.Json.Serialization.JsonConverter<HistogramAggregation>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropExtendedBounds = System.Text.Json.JsonEncodedText.Encode("extended_bounds");
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropFormat = System.Text.Json.JsonEncodedText.Encode("format");
+	private static readonly System.Text.Json.JsonEncodedText PropHardBounds = System.Text.Json.JsonEncodedText.Encode("hard_bounds");
+	private static readonly System.Text.Json.JsonEncodedText PropInterval = System.Text.Json.JsonEncodedText.Encode("interval");
+	private static readonly System.Text.Json.JsonEncodedText PropMinDocCount = System.Text.Json.JsonEncodedText.Encode("min_doc_count");
+	private static readonly System.Text.Json.JsonEncodedText PropMissing = System.Text.Json.JsonEncodedText.Encode("missing");
+	private static readonly System.Text.Json.JsonEncodedText PropOffset = System.Text.Json.JsonEncodedText.Encode("offset");
+	private static readonly System.Text.Json.JsonEncodedText PropOrder = System.Text.Json.JsonEncodedText.Encode("order");
+	private static readonly System.Text.Json.JsonEncodedText PropScript = System.Text.Json.JsonEncodedText.Encode("script");
+
+	public override HistogramAggregation Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Aggregations.ExtendedBoundsFloat?> propExtendedBounds = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Field?> propField = default;
+		LocalJsonProperty<string?> propFormat = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Aggregations.ExtendedBoundsFloat?> propHardBounds = default;
+		LocalJsonProperty<double?> propInterval = default;
+		LocalJsonProperty<int?> propMinDocCount = default;
+		LocalJsonProperty<double?> propMissing = default;
+		LocalJsonProperty<double?> propOffset = default;
+		LocalJsonProperty<ICollection<KeyValuePair<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.SortOrder>>?> propOrder = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Script?> propScript = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propExtendedBounds.TryRead(ref reader, options, PropExtendedBounds))
+			{
+				continue;
+			}
+
+			if (propField.TryRead(ref reader, options, PropField))
+			{
+				continue;
+			}
+
+			if (propFormat.TryRead(ref reader, options, PropFormat))
+			{
+				continue;
+			}
+
+			if (propHardBounds.TryRead(ref reader, options, PropHardBounds))
+			{
+				continue;
+			}
+
+			if (propInterval.TryRead(ref reader, options, PropInterval))
+			{
+				continue;
+			}
+
+			if (propMinDocCount.TryRead(ref reader, options, PropMinDocCount))
+			{
+				continue;
+			}
+
+			if (propMissing.TryRead(ref reader, options, PropMissing))
+			{
+				continue;
+			}
+
+			if (propOffset.TryRead(ref reader, options, PropOffset))
+			{
+				continue;
+			}
+
+			if (propOrder.TryRead(ref reader, options, PropOrder, typeof(SingleOrManyMarker<IReadOnlyCollection<KeyValuePair<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.SortOrder>>?, KeyValuePair<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.SortOrder>>)))
+			{
+				continue;
+			}
+
+			if (propScript.TryRead(ref reader, options, PropScript))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new HistogramAggregation
+		{
+			ExtendedBounds = propExtendedBounds.Value
+,
+			Field = propField.Value
+,
+			Format = propFormat.Value
+,
+			HardBounds = propHardBounds.Value
+,
+			Interval = propInterval.Value
+,
+			MinDocCount = propMinDocCount.Value
+,
+			Missing = propMissing.Value
+,
+			Offset = propOffset.Value
+,
+			Order = propOrder.Value
+,
+			Script = propScript.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, HistogramAggregation value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropExtendedBounds, value.ExtendedBounds);
+		writer.WriteProperty(options, PropField, value.Field);
+		writer.WriteProperty(options, PropFormat, value.Format);
+		writer.WriteProperty(options, PropHardBounds, value.HardBounds);
+		writer.WriteProperty(options, PropInterval, value.Interval);
+		writer.WriteProperty(options, PropMinDocCount, value.MinDocCount);
+		writer.WriteProperty(options, PropMissing, value.Missing);
+		writer.WriteProperty(options, PropOffset, value.Offset);
+		writer.WriteProperty(options, PropOrder, value.Order, typeof(SingleOrManyMarker<IReadOnlyCollection<KeyValuePair<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.SortOrder>>?, KeyValuePair<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.SortOrder>>));
+		writer.WriteProperty(options, PropScript, value.Script);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(HistogramAggregationConverter))]
 public sealed partial class HistogramAggregation
 {
 	/// <summary>
@@ -34,7 +159,6 @@ public sealed partial class HistogramAggregation
 	/// Enables extending the bounds of the histogram beyond the data itself.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("extended_bounds")]
 	public Elastic.Clients.Elasticsearch.Aggregations.ExtendedBoundsFloat? ExtendedBounds { get; set; }
 
 	/// <summary>
@@ -42,9 +166,7 @@ public sealed partial class HistogramAggregation
 	/// The name of the field to aggregate on.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("field")]
 	public Elastic.Clients.Elasticsearch.Field? Field { get; set; }
-	[JsonInclude, JsonPropertyName("format")]
 	public string? Format { get; set; }
 
 	/// <summary>
@@ -53,7 +175,6 @@ public sealed partial class HistogramAggregation
 	/// It is particularly useful in the case of open data ranges that can result in a very large number of buckets.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("hard_bounds")]
 	public Elastic.Clients.Elasticsearch.Aggregations.ExtendedBoundsFloat? HardBounds { get; set; }
 
 	/// <summary>
@@ -62,7 +183,6 @@ public sealed partial class HistogramAggregation
 	/// Must be a positive decimal.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("interval")]
 	public double? Interval { get; set; }
 
 	/// <summary>
@@ -71,7 +191,6 @@ public sealed partial class HistogramAggregation
 	/// By default, the response will fill gaps in the histogram with empty buckets.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("min_doc_count")]
 	public int? MinDocCount { get; set; }
 
 	/// <summary>
@@ -80,7 +199,6 @@ public sealed partial class HistogramAggregation
 	/// By default, documents without a value are ignored.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("missing")]
 	public double? Missing { get; set; }
 
 	/// <summary>
@@ -89,7 +207,6 @@ public sealed partial class HistogramAggregation
 	/// The bucket boundaries can be shifted by using the <c>offset</c> option.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("offset")]
 	public double? Offset { get; set; }
 
 	/// <summary>
@@ -98,10 +215,7 @@ public sealed partial class HistogramAggregation
 	/// By default, the returned buckets are sorted by their key ascending.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("order")]
-	[SingleOrManyCollectionConverter(typeof(KeyValuePair<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.SortOrder>))]
 	public ICollection<KeyValuePair<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.SortOrder>>? Order { get; set; }
-	[JsonInclude, JsonPropertyName("script")]
 	public Elastic.Clients.Elasticsearch.Script? Script { get; set; }
 
 	public static implicit operator Elastic.Clients.Elasticsearch.Aggregations.Aggregation(HistogramAggregation histogramAggregation) => Elastic.Clients.Elasticsearch.Aggregations.Aggregation.Histogram(histogramAggregation);
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 e1641587177..bfaa50485cd 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/HistogramBucket.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/HistogramBucket.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,56 +28,70 @@
 
 namespace Elastic.Clients.Elasticsearch.Aggregations;
 
-internal sealed partial class HistogramBucketConverter : JsonConverter<HistogramBucket>
+internal sealed partial class HistogramBucketConverter : System.Text.Json.Serialization.JsonConverter<HistogramBucket>
 {
-	public override HistogramBucket Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropDocCount = System.Text.Json.JsonEncodedText.Encode("doc_count");
+	private static readonly System.Text.Json.JsonEncodedText PropKey = System.Text.Json.JsonEncodedText.Encode("key");
+	private static readonly System.Text.Json.JsonEncodedText PropKeyAsString = System.Text.Json.JsonEncodedText.Encode("key_as_string");
+
+	public override HistogramBucket Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		long docCount = default;
-		double key = default;
-		string? keyAsString = default;
-		Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate> propAggregations = default;
+		LocalJsonProperty<long> propDocCount = default;
+		LocalJsonProperty<double> propKey = default;
+		LocalJsonProperty<string?> propKeyAsString = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propDocCount.TryRead(ref reader, options, PropDocCount))
 			{
-				var property = reader.GetString();
-				if (property == "doc_count")
-				{
-					docCount = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "key")
-				{
-					key = JsonSerializer.Deserialize<double>(ref reader, options);
-					continue;
-				}
-
-				if (property == "key_as_string")
-				{
-					keyAsString = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
+				continue;
+			}
 
-				if (property.Contains("#"))
-				{
-					additionalProperties ??= new Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate>();
-					AggregateDictionaryConverter.ReadItem(ref reader, options, additionalProperties, property);
-					continue;
-				}
+			if (propKey.TryRead(ref reader, options, PropKey))
+			{
+				continue;
+			}
 
-				throw new JsonException("Unknown property read from JSON.");
+			if (propKeyAsString.TryRead(ref reader, options, PropKeyAsString))
+			{
+				continue;
 			}
+
+			propAggregations ??= new System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate>();
+			Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionaryConverter.ReadItem(ref reader, options, out string key, out Elastic.Clients.Elasticsearch.Aggregations.IAggregate value);
+			propAggregations[key] = value;
 		}
 
-		return new HistogramBucket { Aggregations = new Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary(additionalProperties), DocCount = docCount, Key = key, KeyAsString = keyAsString };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new HistogramBucket
+		{
+			Aggregations = new Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary(propAggregations)
+,
+			DocCount = propDocCount.Value
+,
+			Key = propKey.Value
+,
+			KeyAsString = propKeyAsString.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, HistogramBucket value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, HistogramBucket value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'HistogramBucket' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDocCount, value.DocCount);
+		writer.WriteProperty(options, PropKey, value.Key);
+		writer.WriteProperty(options, PropKeyAsString, value.KeyAsString);
+		if (value.Aggregations is not null)
+		{
+			foreach (var item in value.Aggregations)
+			{
+				Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionaryConverter.WriteItem(writer, options, item.Key, item.Value);
+			}
+		}
+
+		writer.WriteEndObject();
 	}
 }
 
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 19e7421f99a..67955038967 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/InferenceAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/InferenceAggregate.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,65 +28,90 @@
 
 namespace Elastic.Clients.Elasticsearch.Aggregations;
 
-internal sealed partial class InferenceAggregateConverter : JsonConverter<InferenceAggregate>
+internal sealed partial class InferenceAggregateConverter : System.Text.Json.Serialization.JsonConverter<InferenceAggregate>
 {
-	public override InferenceAggregate Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropData = System.Text.Json.JsonEncodedText.Encode("data");
+	private static readonly System.Text.Json.JsonEncodedText PropFeatureImportance = System.Text.Json.JsonEncodedText.Encode("feature_importance");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropTopClasses = System.Text.Json.JsonEncodedText.Encode("top_classes");
+	private static readonly System.Text.Json.JsonEncodedText PropValue = System.Text.Json.JsonEncodedText.Encode("value");
+	private static readonly System.Text.Json.JsonEncodedText PropWarning = System.Text.Json.JsonEncodedText.Encode("warning");
+
+	public override InferenceAggregate Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		IReadOnlyCollection<Elastic.Clients.Elasticsearch.Aggregations.InferenceFeatureImportance>? featureImportance = default;
-		IReadOnlyDictionary<string, object>? meta = default;
-		IReadOnlyCollection<Elastic.Clients.Elasticsearch.Aggregations.InferenceTopClassEntry>? topClasses = default;
-		Elastic.Clients.Elasticsearch.FieldValue? value = default;
-		string? warning = default;
-		Dictionary<string, object> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, object> propData = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Aggregations.InferenceFeatureImportance>?> propFeatureImportance = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, object>?> propMeta = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Aggregations.InferenceTopClassEntry>?> propTopClasses = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.FieldValue?> propValue = default;
+		LocalJsonProperty<string?> propWarning = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propFeatureImportance.TryRead(ref reader, options, PropFeatureImportance))
 			{
-				var property = reader.GetString();
-				if (property == "feature_importance")
-				{
-					featureImportance = JsonSerializer.Deserialize<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Aggregations.InferenceFeatureImportance>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "meta")
-				{
-					meta = JsonSerializer.Deserialize<IReadOnlyDictionary<string, object>?>(ref reader, options);
-					continue;
-				}
+				continue;
+			}
 
-				if (property == "top_classes")
-				{
-					topClasses = JsonSerializer.Deserialize<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Aggregations.InferenceTopClassEntry>?>(ref reader, options);
-					continue;
-				}
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
 
-				if (property == "value")
-				{
-					value = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.FieldValue?>(ref reader, options);
-					continue;
-				}
+			if (propTopClasses.TryRead(ref reader, options, PropTopClasses))
+			{
+				continue;
+			}
 
-				if (property == "warning")
-				{
-					warning = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
+			if (propValue.TryRead(ref reader, options, PropValue))
+			{
+				continue;
+			}
 
-				additionalProperties ??= new Dictionary<string, object>();
-				var additionalValue = JsonSerializer.Deserialize<object>(ref reader, options);
-				additionalProperties.Add(property, additionalValue);
+			if (propWarning.TryRead(ref reader, options, PropWarning))
+			{
+				continue;
 			}
+
+			propData ??= new System.Collections.Generic.Dictionary<string, object>();
+			reader.ReadProperty(options, out string key, out object value);
+			propData[key] = value;
 		}
 
-		return new InferenceAggregate { Data = additionalProperties, FeatureImportance = featureImportance, Meta = meta, TopClasses = topClasses, Value = value, Warning = warning };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new InferenceAggregate
+		{
+			Data = propData
+,
+			FeatureImportance = propFeatureImportance.Value
+,
+			Meta = propMeta.Value
+,
+			TopClasses = propTopClasses.Value
+,
+			Value = propValue.Value
+,
+			Warning = propWarning.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, InferenceAggregate value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, InferenceAggregate value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'InferenceAggregate' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropFeatureImportance, value.FeatureImportance);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropTopClasses, value.TopClasses);
+		writer.WriteProperty(options, PropValue, value.Value);
+		writer.WriteProperty(options, PropWarning, value.Warning);
+		if (value.Data is not null)
+		{
+			foreach (var item in value.Data)
+			{
+				writer.WriteProperty(options, item.Key, item.Value);
+			}
+		}
+
+		writer.WriteEndObject();
 	}
 }
 
@@ -103,4 +129,6 @@ public sealed partial class InferenceAggregate : IAggregate
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Aggregations.InferenceTopClassEntry>? TopClasses { get; init; }
 	public Elastic.Clients.Elasticsearch.FieldValue? Value { get; init; }
 	public string? Warning { get; init; }
+
+	string IAggregate.Type => "inference";
 }
\ 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 431c4cac795..f40525beaff 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/InferenceConfig.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/InferenceConfig.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -39,12 +40,16 @@ internal InferenceConfig(string variantName, object variant)
 			throw new ArgumentNullException(nameof(variant));
 		if (string.IsNullOrWhiteSpace(variantName))
 			throw new ArgumentException("Variant name must not be empty or whitespace.");
-		VariantName = variantName;
+		VariantType = variantName;
 		Variant = variant;
 	}
 
-	internal object Variant { get; }
-	internal string VariantName { get; }
+	internal InferenceConfig()
+	{
+	}
+
+	public object Variant { get; internal set; }
+	public string VariantType { get; internal set; }
 
 	public static InferenceConfig Classification(Elastic.Clients.Elasticsearch.MachineLearning.ClassificationInferenceOptions classificationInferenceOptions) => new InferenceConfig("classification", classificationInferenceOptions);
 	public static InferenceConfig Regression(Elastic.Clients.Elasticsearch.MachineLearning.RegressionInferenceOptions regressionInferenceOptions) => new InferenceConfig("regression", regressionInferenceOptions);
@@ -62,67 +67,56 @@ public bool TryGet<T>([NotNullWhen(true)] out T? result) where T : class
 	}
 }
 
-internal sealed partial class InferenceConfigConverter : JsonConverter<InferenceConfig>
+internal sealed partial class InferenceConfigConverter : System.Text.Json.Serialization.JsonConverter<InferenceConfig>
 {
-	public override InferenceConfig Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-		{
-			throw new JsonException("Expected start token.");
-		}
+	private static readonly System.Text.Json.JsonEncodedText VariantClassification = System.Text.Json.JsonEncodedText.Encode("classification");
+	private static readonly System.Text.Json.JsonEncodedText VariantRegression = System.Text.Json.JsonEncodedText.Encode("regression");
 
-		object? variantValue = default;
-		string? variantNameValue = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+	public override InferenceConfig Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		var variantType = string.Empty;
+		object? variant = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
+			if (reader.ValueTextEquals(VariantClassification))
 			{
-				throw new JsonException("Expected a property name token.");
-			}
-
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token representing the name of an Elasticsearch field.");
-			}
-
-			var propertyName = reader.GetString();
-			reader.Read();
-			if (propertyName == "classification")
-			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.MachineLearning.ClassificationInferenceOptions?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantClassification.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.MachineLearning.ClassificationInferenceOptions?>(options);
 				continue;
 			}
 
-			if (propertyName == "regression")
+			if (reader.ValueTextEquals(VariantRegression))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.MachineLearning.RegressionInferenceOptions?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantRegression.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.MachineLearning.RegressionInferenceOptions?>(options);
 				continue;
 			}
 
-			throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'InferenceConfig' from the response.");
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		var result = new InferenceConfig(variantNameValue, variantValue);
-		return result;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new InferenceConfig { VariantType = variantType, Variant = variant };
 	}
 
-	public override void Write(Utf8JsonWriter writer, InferenceConfig value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, InferenceConfig value, System.Text.Json.JsonSerializerOptions options)
 	{
 		writer.WriteStartObject();
-		if (value.VariantName is not null && value.Variant is not null)
+		switch (value.VariantType)
 		{
-			writer.WritePropertyName(value.VariantName);
-			switch (value.VariantName)
-			{
-				case "classification":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.MachineLearning.ClassificationInferenceOptions>(writer, (Elastic.Clients.Elasticsearch.MachineLearning.ClassificationInferenceOptions)value.Variant, options);
-					break;
-				case "regression":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.MachineLearning.RegressionInferenceOptions>(writer, (Elastic.Clients.Elasticsearch.MachineLearning.RegressionInferenceOptions)value.Variant, options);
-					break;
-			}
+			case "":
+				break;
+			case "classification":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.MachineLearning.ClassificationInferenceOptions?)value.Variant);
+				break;
+			case "regression":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.MachineLearning.RegressionInferenceOptions?)value.Variant);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.VariantType}' is not supported for type '{nameof(InferenceConfig)}'.");
 		}
 
 		writer.WriteEndObject();
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/IpPrefixAggregate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/IpPrefixAggregate.g.cs
index ecd1258985b..a7e1a34d9df 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/IpPrefixAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/IpPrefixAggregate.g.cs
@@ -33,4 +33,6 @@ public sealed partial class IpPrefixAggregate : IAggregate
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Aggregations.IpPrefixBucket> Buckets { get; init; }
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
+
+	string IAggregate.Type => "ip_prefix";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/IpPrefixBucket.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/IpPrefixBucket.g.cs
index e03c5122173..dfad308328f 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/IpPrefixBucket.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/IpPrefixBucket.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,70 +28,90 @@
 
 namespace Elastic.Clients.Elasticsearch.Aggregations;
 
-internal sealed partial class IpPrefixBucketConverter : JsonConverter<IpPrefixBucket>
+internal sealed partial class IpPrefixBucketConverter : System.Text.Json.Serialization.JsonConverter<IpPrefixBucket>
 {
-	public override IpPrefixBucket Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropDocCount = System.Text.Json.JsonEncodedText.Encode("doc_count");
+	private static readonly System.Text.Json.JsonEncodedText PropIsIpv6 = System.Text.Json.JsonEncodedText.Encode("is_ipv6");
+	private static readonly System.Text.Json.JsonEncodedText PropKey = System.Text.Json.JsonEncodedText.Encode("key");
+	private static readonly System.Text.Json.JsonEncodedText PropNetmask = System.Text.Json.JsonEncodedText.Encode("netmask");
+	private static readonly System.Text.Json.JsonEncodedText PropPrefixLength = System.Text.Json.JsonEncodedText.Encode("prefix_length");
+
+	public override IpPrefixBucket Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		long docCount = default;
-		bool isIpv6 = default;
-		string key = default;
-		string? netmask = default;
-		int prefixLength = default;
-		Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate> propAggregations = default;
+		LocalJsonProperty<long> propDocCount = default;
+		LocalJsonProperty<bool> propIsIpv6 = default;
+		LocalJsonProperty<string> propKey = default;
+		LocalJsonProperty<string?> propNetmask = default;
+		LocalJsonProperty<int> propPrefixLength = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propDocCount.TryRead(ref reader, options, PropDocCount))
 			{
-				var property = reader.GetString();
-				if (property == "doc_count")
-				{
-					docCount = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "is_ipv6")
-				{
-					isIpv6 = JsonSerializer.Deserialize<bool>(ref reader, options);
-					continue;
-				}
-
-				if (property == "key")
-				{
-					key = JsonSerializer.Deserialize<string>(ref reader, options);
-					continue;
-				}
+				continue;
+			}
 
-				if (property == "netmask")
-				{
-					netmask = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
+			if (propIsIpv6.TryRead(ref reader, options, PropIsIpv6))
+			{
+				continue;
+			}
 
-				if (property == "prefix_length")
-				{
-					prefixLength = JsonSerializer.Deserialize<int>(ref reader, options);
-					continue;
-				}
+			if (propKey.TryRead(ref reader, options, PropKey))
+			{
+				continue;
+			}
 
-				if (property.Contains("#"))
-				{
-					additionalProperties ??= new Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate>();
-					AggregateDictionaryConverter.ReadItem(ref reader, options, additionalProperties, property);
-					continue;
-				}
+			if (propNetmask.TryRead(ref reader, options, PropNetmask))
+			{
+				continue;
+			}
 
-				throw new JsonException("Unknown property read from JSON.");
+			if (propPrefixLength.TryRead(ref reader, options, PropPrefixLength))
+			{
+				continue;
 			}
+
+			propAggregations ??= new System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate>();
+			Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionaryConverter.ReadItem(ref reader, options, out string key, out Elastic.Clients.Elasticsearch.Aggregations.IAggregate value);
+			propAggregations[key] = value;
 		}
 
-		return new IpPrefixBucket { Aggregations = new Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary(additionalProperties), DocCount = docCount, IsIpv6 = isIpv6, Key = key, Netmask = netmask, PrefixLength = prefixLength };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new IpPrefixBucket
+		{
+			Aggregations = new Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary(propAggregations)
+,
+			DocCount = propDocCount.Value
+,
+			IsIpv6 = propIsIpv6.Value
+,
+			Key = propKey.Value
+,
+			Netmask = propNetmask.Value
+,
+			PrefixLength = propPrefixLength.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, IpPrefixBucket value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IpPrefixBucket value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'IpPrefixBucket' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDocCount, value.DocCount);
+		writer.WriteProperty(options, PropIsIpv6, value.IsIpv6);
+		writer.WriteProperty(options, PropKey, value.Key);
+		writer.WriteProperty(options, PropNetmask, value.Netmask);
+		writer.WriteProperty(options, PropPrefixLength, value.PrefixLength);
+		if (value.Aggregations is not null)
+		{
+			foreach (var item in value.Aggregations)
+			{
+				Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionaryConverter.WriteItem(writer, options, item.Key, item.Value);
+			}
+		}
+
+		writer.WriteEndObject();
 	}
 }
 
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 b29a4b1c35b..eeaf5ca6df9 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/IpRangeAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/IpRangeAggregate.g.cs
@@ -33,4 +33,6 @@ public sealed partial class IpRangeAggregate : IAggregate
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Aggregations.IpRangeBucket> Buckets { get; init; }
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
+
+	string IAggregate.Type => "ip_range";
 }
\ No newline at end of file
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 ea2b231722d..466679c3ea9 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/IpRangeBucket.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/IpRangeBucket.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,63 +28,80 @@
 
 namespace Elastic.Clients.Elasticsearch.Aggregations;
 
-internal sealed partial class IpRangeBucketConverter : JsonConverter<IpRangeBucket>
+internal sealed partial class IpRangeBucketConverter : System.Text.Json.Serialization.JsonConverter<IpRangeBucket>
 {
-	public override IpRangeBucket Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropDocCount = System.Text.Json.JsonEncodedText.Encode("doc_count");
+	private static readonly System.Text.Json.JsonEncodedText PropFrom = System.Text.Json.JsonEncodedText.Encode("from");
+	private static readonly System.Text.Json.JsonEncodedText PropKey = System.Text.Json.JsonEncodedText.Encode("key");
+	private static readonly System.Text.Json.JsonEncodedText PropTo = System.Text.Json.JsonEncodedText.Encode("to");
+
+	public override IpRangeBucket Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		long docCount = default;
-		string? from = default;
-		string? key = default;
-		string? to = default;
-		Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate> propAggregations = default;
+		LocalJsonProperty<long> propDocCount = default;
+		LocalJsonProperty<string?> propFrom = default;
+		LocalJsonProperty<string?> propKey = default;
+		LocalJsonProperty<string?> propTo = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propDocCount.TryRead(ref reader, options, PropDocCount))
 			{
-				var property = reader.GetString();
-				if (property == "doc_count")
-				{
-					docCount = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "from")
-				{
-					from = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "key")
-				{
-					key = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
+				continue;
+			}
 
-				if (property == "to")
-				{
-					to = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
+			if (propFrom.TryRead(ref reader, options, PropFrom))
+			{
+				continue;
+			}
 
-				if (property.Contains("#"))
-				{
-					additionalProperties ??= new Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate>();
-					AggregateDictionaryConverter.ReadItem(ref reader, options, additionalProperties, property);
-					continue;
-				}
+			if (propKey.TryRead(ref reader, options, PropKey))
+			{
+				continue;
+			}
 
-				throw new JsonException("Unknown property read from JSON.");
+			if (propTo.TryRead(ref reader, options, PropTo))
+			{
+				continue;
 			}
+
+			propAggregations ??= new System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate>();
+			Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionaryConverter.ReadItem(ref reader, options, out string key, out Elastic.Clients.Elasticsearch.Aggregations.IAggregate value);
+			propAggregations[key] = value;
 		}
 
-		return new IpRangeBucket { Aggregations = new Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary(additionalProperties), DocCount = docCount, From = from, Key = key, To = to };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new IpRangeBucket
+		{
+			Aggregations = new Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary(propAggregations)
+,
+			DocCount = propDocCount.Value
+,
+			From = propFrom.Value
+,
+			Key = propKey.Value
+,
+			To = propTo.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, IpRangeBucket value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IpRangeBucket value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'IpRangeBucket' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDocCount, value.DocCount);
+		writer.WriteProperty(options, PropFrom, value.From);
+		writer.WriteProperty(options, PropKey, value.Key);
+		writer.WriteProperty(options, PropTo, value.To);
+		if (value.Aggregations is not null)
+		{
+			foreach (var item in value.Aggregations)
+			{
+				Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionaryConverter.WriteItem(writer, options, item.Key, item.Value);
+			}
+		}
+
+		writer.WriteEndObject();
 	}
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/LongRareTermsAggregate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/LongRareTermsAggregate.g.cs
index 13fa685df54..2e3ba8cc6c7 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/LongRareTermsAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/LongRareTermsAggregate.g.cs
@@ -38,4 +38,6 @@ public sealed partial class LongRareTermsAggregate : IAggregate
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Aggregations.LongRareTermsBucket> Buckets { get; init; }
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
+
+	string IAggregate.Type => "lrareterms";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/LongRareTermsBucket.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/LongRareTermsBucket.g.cs
index 11dc48330e5..6d31f712352 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/LongRareTermsBucket.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/LongRareTermsBucket.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,56 +28,70 @@
 
 namespace Elastic.Clients.Elasticsearch.Aggregations;
 
-internal sealed partial class LongRareTermsBucketConverter : JsonConverter<LongRareTermsBucket>
+internal sealed partial class LongRareTermsBucketConverter : System.Text.Json.Serialization.JsonConverter<LongRareTermsBucket>
 {
-	public override LongRareTermsBucket Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropDocCount = System.Text.Json.JsonEncodedText.Encode("doc_count");
+	private static readonly System.Text.Json.JsonEncodedText PropKey = System.Text.Json.JsonEncodedText.Encode("key");
+	private static readonly System.Text.Json.JsonEncodedText PropKeyAsString = System.Text.Json.JsonEncodedText.Encode("key_as_string");
+
+	public override LongRareTermsBucket Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		long docCount = default;
-		long key = default;
-		string? keyAsString = default;
-		Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate> propAggregations = default;
+		LocalJsonProperty<long> propDocCount = default;
+		LocalJsonProperty<long> propKey = default;
+		LocalJsonProperty<string?> propKeyAsString = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propDocCount.TryRead(ref reader, options, PropDocCount))
 			{
-				var property = reader.GetString();
-				if (property == "doc_count")
-				{
-					docCount = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "key")
-				{
-					key = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "key_as_string")
-				{
-					keyAsString = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
+				continue;
+			}
 
-				if (property.Contains("#"))
-				{
-					additionalProperties ??= new Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate>();
-					AggregateDictionaryConverter.ReadItem(ref reader, options, additionalProperties, property);
-					continue;
-				}
+			if (propKey.TryRead(ref reader, options, PropKey))
+			{
+				continue;
+			}
 
-				throw new JsonException("Unknown property read from JSON.");
+			if (propKeyAsString.TryRead(ref reader, options, PropKeyAsString))
+			{
+				continue;
 			}
+
+			propAggregations ??= new System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate>();
+			Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionaryConverter.ReadItem(ref reader, options, out string key, out Elastic.Clients.Elasticsearch.Aggregations.IAggregate value);
+			propAggregations[key] = value;
 		}
 
-		return new LongRareTermsBucket { Aggregations = new Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary(additionalProperties), DocCount = docCount, Key = key, KeyAsString = keyAsString };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new LongRareTermsBucket
+		{
+			Aggregations = new Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary(propAggregations)
+,
+			DocCount = propDocCount.Value
+,
+			Key = propKey.Value
+,
+			KeyAsString = propKeyAsString.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, LongRareTermsBucket value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, LongRareTermsBucket value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'LongRareTermsBucket' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDocCount, value.DocCount);
+		writer.WriteProperty(options, PropKey, value.Key);
+		writer.WriteProperty(options, PropKeyAsString, value.KeyAsString);
+		if (value.Aggregations is not null)
+		{
+			foreach (var item in value.Aggregations)
+			{
+				Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionaryConverter.WriteItem(writer, options, item.Key, item.Value);
+			}
+		}
+
+		writer.WriteEndObject();
 	}
 }
 
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 11c3ad82fae..68f568817bd 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/LongTermsAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/LongTermsAggregate.g.cs
@@ -42,4 +42,6 @@ public sealed partial class LongTermsAggregate : IAggregate
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
 	[JsonInclude, JsonPropertyName("sum_other_doc_count")]
 	public long? SumOtherDocCount { get; init; }
+
+	string IAggregate.Type => "lterms";
 }
\ 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 e6e6265dbfa..a5d05b4c2bf 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/LongTermsBucket.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/LongTermsBucket.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,63 +28,80 @@
 
 namespace Elastic.Clients.Elasticsearch.Aggregations;
 
-internal sealed partial class LongTermsBucketConverter : JsonConverter<LongTermsBucket>
+internal sealed partial class LongTermsBucketConverter : System.Text.Json.Serialization.JsonConverter<LongTermsBucket>
 {
-	public override LongTermsBucket Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropDocCount = System.Text.Json.JsonEncodedText.Encode("doc_count");
+	private static readonly System.Text.Json.JsonEncodedText PropDocCountErrorUpperBound = System.Text.Json.JsonEncodedText.Encode("doc_count_error_upper_bound");
+	private static readonly System.Text.Json.JsonEncodedText PropKey = System.Text.Json.JsonEncodedText.Encode("key");
+	private static readonly System.Text.Json.JsonEncodedText PropKeyAsString = System.Text.Json.JsonEncodedText.Encode("key_as_string");
+
+	public override LongTermsBucket Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		long docCount = default;
-		long? docCountErrorUpperBound = default;
-		long key = default;
-		string? keyAsString = default;
-		Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate> propAggregations = default;
+		LocalJsonProperty<long> propDocCount = default;
+		LocalJsonProperty<long?> propDocCountErrorUpperBound = default;
+		LocalJsonProperty<long> propKey = default;
+		LocalJsonProperty<string?> propKeyAsString = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propDocCount.TryRead(ref reader, options, PropDocCount))
 			{
-				var property = reader.GetString();
-				if (property == "doc_count")
-				{
-					docCount = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "doc_count_error_upper_bound")
-				{
-					docCountErrorUpperBound = JsonSerializer.Deserialize<long?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "key")
-				{
-					key = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
+				continue;
+			}
 
-				if (property == "key_as_string")
-				{
-					keyAsString = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
+			if (propDocCountErrorUpperBound.TryRead(ref reader, options, PropDocCountErrorUpperBound))
+			{
+				continue;
+			}
 
-				if (property.Contains("#"))
-				{
-					additionalProperties ??= new Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate>();
-					AggregateDictionaryConverter.ReadItem(ref reader, options, additionalProperties, property);
-					continue;
-				}
+			if (propKey.TryRead(ref reader, options, PropKey))
+			{
+				continue;
+			}
 
-				throw new JsonException("Unknown property read from JSON.");
+			if (propKeyAsString.TryRead(ref reader, options, PropKeyAsString))
+			{
+				continue;
 			}
+
+			propAggregations ??= new System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate>();
+			Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionaryConverter.ReadItem(ref reader, options, out string key, out Elastic.Clients.Elasticsearch.Aggregations.IAggregate value);
+			propAggregations[key] = value;
 		}
 
-		return new LongTermsBucket { Aggregations = new Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary(additionalProperties), DocCount = docCount, DocCountErrorUpperBound = docCountErrorUpperBound, Key = key, KeyAsString = keyAsString };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new LongTermsBucket
+		{
+			Aggregations = new Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary(propAggregations)
+,
+			DocCount = propDocCount.Value
+,
+			DocCountErrorUpperBound = propDocCountErrorUpperBound.Value
+,
+			Key = propKey.Value
+,
+			KeyAsString = propKeyAsString.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, LongTermsBucket value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, LongTermsBucket value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'LongTermsBucket' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDocCount, value.DocCount);
+		writer.WriteProperty(options, PropDocCountErrorUpperBound, value.DocCountErrorUpperBound);
+		writer.WriteProperty(options, PropKey, value.Key);
+		writer.WriteProperty(options, PropKeyAsString, value.KeyAsString);
+		if (value.Aggregations is not null)
+		{
+			foreach (var item in value.Aggregations)
+			{
+				Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionaryConverter.WriteItem(writer, options, item.Key, item.Value);
+			}
+		}
+
+		writer.WriteEndObject();
 	}
 }
 
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 6b941174faf..bf3ee2fe366 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MatrixStatsAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MatrixStatsAggregate.g.cs
@@ -35,4 +35,6 @@ public sealed partial class MatrixStatsAggregate : IAggregate
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Aggregations.MatrixStatsFields>? Fields { get; init; }
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
+
+	string IAggregate.Type => "matrix_stats";
 }
\ 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 db56e60d7af..483a104134b 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MatrixStatsAggregation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MatrixStatsAggregation.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,60 @@
 
 namespace Elastic.Clients.Elasticsearch.Aggregations;
 
+internal sealed partial class MatrixStatsAggregationConverter : System.Text.Json.Serialization.JsonConverter<MatrixStatsAggregation>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropMissing = System.Text.Json.JsonEncodedText.Encode("missing");
+	private static readonly System.Text.Json.JsonEncodedText PropMode = System.Text.Json.JsonEncodedText.Encode("mode");
+
+	public override MatrixStatsAggregation Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Fields?> propFields = default;
+		LocalJsonProperty<IDictionary<Elastic.Clients.Elasticsearch.Field, double>?> propMissing = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.SortMode?> propMode = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propFields.TryRead(ref reader, options, PropFields, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propMissing.TryRead(ref reader, options, PropMissing))
+			{
+				continue;
+			}
+
+			if (propMode.TryRead(ref reader, options, PropMode))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new MatrixStatsAggregation
+		{
+			Fields = propFields.Value
+,
+			Missing = propMissing.Value
+,
+			Mode = propMode.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, MatrixStatsAggregation value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropFields, value.Fields, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropMissing, value.Missing);
+		writer.WriteProperty(options, PropMode, value.Mode);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(MatrixStatsAggregationConverter))]
 public sealed partial class MatrixStatsAggregation
 {
 	/// <summary>
@@ -34,8 +89,6 @@ public sealed partial class MatrixStatsAggregation
 	/// An array of fields for computing the statistics.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("fields")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Fields? Fields { get; set; }
 
 	/// <summary>
@@ -44,7 +97,6 @@ public sealed partial class MatrixStatsAggregation
 	/// By default, documents without a value are ignored.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("missing")]
 	public IDictionary<Elastic.Clients.Elasticsearch.Field, double>? Missing { get; set; }
 
 	/// <summary>
@@ -52,7 +104,6 @@ public sealed partial class MatrixStatsAggregation
 	/// Array value the aggregation will use for array or multi-valued fields.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("mode")]
 	public Elastic.Clients.Elasticsearch.SortMode? Mode { get; set; }
 
 	public static implicit operator Elastic.Clients.Elasticsearch.Aggregations.Aggregation(MatrixStatsAggregation matrixStatsAggregation) => Elastic.Clients.Elasticsearch.Aggregations.Aggregation.MatrixStats(matrixStatsAggregation);
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 f1b01e2dbb5..281880059ab 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MatrixStatsFields.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MatrixStatsFields.g.cs
@@ -30,12 +30,10 @@ 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; }
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 cddda334221..bc132975c80 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MaxAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MaxAggregate.g.cs
@@ -42,4 +42,6 @@ public sealed partial class MaxAggregate : IAggregate
 	public double? Value { get; init; }
 	[JsonInclude, JsonPropertyName("value_as_string")]
 	public string? ValueAsString { get; init; }
+
+	string IAggregate.Type => "max";
 }
\ No newline at end of file
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 4d868eea1db..add5e70c90f 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MedianAbsoluteDeviationAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MedianAbsoluteDeviationAggregate.g.cs
@@ -42,4 +42,6 @@ public sealed partial class MedianAbsoluteDeviationAggregate : IAggregate
 	public double? Value { get; init; }
 	[JsonInclude, JsonPropertyName("value_as_string")]
 	public string? ValueAsString { get; init; }
+
+	string IAggregate.Type => "median_absolute_deviation";
 }
\ No newline at end of file
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 08ab4f8d939..977bcf74f06 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MinAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MinAggregate.g.cs
@@ -42,4 +42,6 @@ public sealed partial class MinAggregate : IAggregate
 	public double? Value { get; init; }
 	[JsonInclude, JsonPropertyName("value_as_string")]
 	public string? ValueAsString { get; init; }
+
+	string IAggregate.Type => "min";
 }
\ No newline at end of file
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 230547ba313..ca8ffdc6999 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MissingAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MissingAggregate.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,49 +28,60 @@
 
 namespace Elastic.Clients.Elasticsearch.Aggregations;
 
-internal sealed partial class MissingAggregateConverter : JsonConverter<MissingAggregate>
+internal sealed partial class MissingAggregateConverter : System.Text.Json.Serialization.JsonConverter<MissingAggregate>
 {
-	public override MissingAggregate Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropDocCount = System.Text.Json.JsonEncodedText.Encode("doc_count");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+
+	public override MissingAggregate Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		long docCount = default;
-		IReadOnlyDictionary<string, object>? meta = default;
-		Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate> propAggregations = default;
+		LocalJsonProperty<long> propDocCount = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, object>?> propMeta = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propDocCount.TryRead(ref reader, options, PropDocCount))
 			{
-				var property = reader.GetString();
-				if (property == "doc_count")
-				{
-					docCount = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "meta")
-				{
-					meta = JsonSerializer.Deserialize<IReadOnlyDictionary<string, object>?>(ref reader, options);
-					continue;
-				}
-
-				if (property.Contains("#"))
-				{
-					additionalProperties ??= new Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate>();
-					AggregateDictionaryConverter.ReadItem(ref reader, options, additionalProperties, property);
-					continue;
-				}
+				continue;
+			}
 
-				throw new JsonException("Unknown property read from JSON.");
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
 			}
+
+			propAggregations ??= new System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate>();
+			Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionaryConverter.ReadItem(ref reader, options, out string key, out Elastic.Clients.Elasticsearch.Aggregations.IAggregate value);
+			propAggregations[key] = value;
 		}
 
-		return new MissingAggregate { Aggregations = new Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary(additionalProperties), DocCount = docCount, Meta = meta };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new MissingAggregate
+		{
+			Aggregations = new Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary(propAggregations)
+,
+			DocCount = propDocCount.Value
+,
+			Meta = propMeta.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, MissingAggregate value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, MissingAggregate value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'MissingAggregate' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDocCount, value.DocCount);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		if (value.Aggregations is not null)
+		{
+			foreach (var item in value.Aggregations)
+			{
+				Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionaryConverter.WriteItem(writer, options, item.Key, item.Value);
+			}
+		}
+
+		writer.WriteEndObject();
 	}
 }
 
@@ -84,4 +96,6 @@ public sealed partial class MissingAggregate : IAggregate
 	public Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary Aggregations { get; init; }
 	public long DocCount { get; init; }
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
+
+	string IAggregate.Type => "missing";
 }
\ No newline at end of file
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 8b9a14cd9a2..db9b5ed3a40 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MultiTermsAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MultiTermsAggregate.g.cs
@@ -37,4 +37,6 @@ public sealed partial class MultiTermsAggregate : IAggregate
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
 	[JsonInclude, JsonPropertyName("sum_other_doc_count")]
 	public long? SumOtherDocCount { get; init; }
+
+	string IAggregate.Type => "multi_terms";
 }
\ 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 962a8a079e2..38d4212c547 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MultiTermsAggregation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MultiTermsAggregation.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,110 @@
 
 namespace Elastic.Clients.Elasticsearch.Aggregations;
 
+internal sealed partial class MultiTermsAggregationConverter : System.Text.Json.Serialization.JsonConverter<MultiTermsAggregation>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCollectMode = System.Text.Json.JsonEncodedText.Encode("collect_mode");
+	private static readonly System.Text.Json.JsonEncodedText PropMinDocCount = System.Text.Json.JsonEncodedText.Encode("min_doc_count");
+	private static readonly System.Text.Json.JsonEncodedText PropOrder = System.Text.Json.JsonEncodedText.Encode("order");
+	private static readonly System.Text.Json.JsonEncodedText PropShardMinDocCount = System.Text.Json.JsonEncodedText.Encode("shard_min_doc_count");
+	private static readonly System.Text.Json.JsonEncodedText PropShardSize = System.Text.Json.JsonEncodedText.Encode("shard_size");
+	private static readonly System.Text.Json.JsonEncodedText PropShowTermDocCountError = System.Text.Json.JsonEncodedText.Encode("show_term_doc_count_error");
+	private static readonly System.Text.Json.JsonEncodedText PropSize = System.Text.Json.JsonEncodedText.Encode("size");
+	private static readonly System.Text.Json.JsonEncodedText PropTerms = System.Text.Json.JsonEncodedText.Encode("terms");
+
+	public override MultiTermsAggregation Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Aggregations.TermsAggregationCollectMode?> propCollectMode = default;
+		LocalJsonProperty<long?> propMinDocCount = default;
+		LocalJsonProperty<ICollection<KeyValuePair<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.SortOrder>>?> propOrder = default;
+		LocalJsonProperty<long?> propShardMinDocCount = default;
+		LocalJsonProperty<int?> propShardSize = default;
+		LocalJsonProperty<bool?> propShowTermDocCountError = default;
+		LocalJsonProperty<int?> propSize = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Aggregations.MultiTermLookup>> propTerms = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCollectMode.TryRead(ref reader, options, PropCollectMode))
+			{
+				continue;
+			}
+
+			if (propMinDocCount.TryRead(ref reader, options, PropMinDocCount))
+			{
+				continue;
+			}
+
+			if (propOrder.TryRead(ref reader, options, PropOrder, typeof(SingleOrManyMarker<IReadOnlyCollection<KeyValuePair<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.SortOrder>>?, KeyValuePair<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.SortOrder>>)))
+			{
+				continue;
+			}
+
+			if (propShardMinDocCount.TryRead(ref reader, options, PropShardMinDocCount))
+			{
+				continue;
+			}
+
+			if (propShardSize.TryRead(ref reader, options, PropShardSize))
+			{
+				continue;
+			}
+
+			if (propShowTermDocCountError.TryRead(ref reader, options, PropShowTermDocCountError))
+			{
+				continue;
+			}
+
+			if (propSize.TryRead(ref reader, options, PropSize))
+			{
+				continue;
+			}
+
+			if (propTerms.TryRead(ref reader, options, PropTerms))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new MultiTermsAggregation
+		{
+			CollectMode = propCollectMode.Value
+,
+			MinDocCount = propMinDocCount.Value
+,
+			Order = propOrder.Value
+,
+			ShardMinDocCount = propShardMinDocCount.Value
+,
+			ShardSize = propShardSize.Value
+,
+			ShowTermDocCountError = propShowTermDocCountError.Value
+,
+			Size = propSize.Value
+,
+			Terms = propTerms.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, MultiTermsAggregation value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCollectMode, value.CollectMode);
+		writer.WriteProperty(options, PropMinDocCount, value.MinDocCount);
+		writer.WriteProperty(options, PropOrder, value.Order, typeof(SingleOrManyMarker<IReadOnlyCollection<KeyValuePair<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.SortOrder>>?, KeyValuePair<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.SortOrder>>));
+		writer.WriteProperty(options, PropShardMinDocCount, value.ShardMinDocCount);
+		writer.WriteProperty(options, PropShardSize, value.ShardSize);
+		writer.WriteProperty(options, PropShowTermDocCountError, value.ShowTermDocCountError);
+		writer.WriteProperty(options, PropSize, value.Size);
+		writer.WriteProperty(options, PropTerms, value.Terms);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(MultiTermsAggregationConverter))]
 public sealed partial class MultiTermsAggregation
 {
 	/// <summary>
@@ -34,7 +139,6 @@ public sealed partial class MultiTermsAggregation
 	/// Specifies the strategy for data collection.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("collect_mode")]
 	public Elastic.Clients.Elasticsearch.Aggregations.TermsAggregationCollectMode? CollectMode { get; set; }
 
 	/// <summary>
@@ -42,7 +146,6 @@ public sealed partial class MultiTermsAggregation
 	/// The minimum number of documents in a bucket for it to be returned.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("min_doc_count")]
 	public long? MinDocCount { get; set; }
 
 	/// <summary>
@@ -51,8 +154,6 @@ public sealed partial class MultiTermsAggregation
 	/// Defaults to sorting by descending document count.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("order")]
-	[SingleOrManyCollectionConverter(typeof(KeyValuePair<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.SortOrder>))]
 	public ICollection<KeyValuePair<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.SortOrder>>? Order { get; set; }
 
 	/// <summary>
@@ -60,7 +161,6 @@ public sealed partial class MultiTermsAggregation
 	/// The minimum number of documents in a bucket on each shard for it to be returned.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("shard_min_doc_count")]
 	public long? ShardMinDocCount { get; set; }
 
 	/// <summary>
@@ -69,7 +169,6 @@ public sealed partial class MultiTermsAggregation
 	/// By default, <c>shard_size</c> will be automatically estimated based on the number of shards and the <c>size</c> parameter.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("shard_size")]
 	public int? ShardSize { get; set; }
 
 	/// <summary>
@@ -77,7 +176,6 @@ public sealed partial class MultiTermsAggregation
 	/// Calculates the doc count error on per term basis.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("show_term_doc_count_error")]
 	public bool? ShowTermDocCountError { get; set; }
 
 	/// <summary>
@@ -85,7 +183,6 @@ public sealed partial class MultiTermsAggregation
 	/// The number of term buckets should be returned out of the overall terms list.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("size")]
 	public int? Size { get; set; }
 
 	/// <summary>
@@ -93,7 +190,6 @@ public sealed partial class MultiTermsAggregation
 	/// The field from which to generate sets of terms.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("terms")]
 	public ICollection<Elastic.Clients.Elasticsearch.Aggregations.MultiTermLookup> Terms { get; set; }
 
 	public static implicit operator Elastic.Clients.Elasticsearch.Aggregations.Aggregation(MultiTermsAggregation multiTermsAggregation) => Elastic.Clients.Elasticsearch.Aggregations.Aggregation.MultiTerms(multiTermsAggregation);
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 003b8283ea2..1e9cbb4ae07 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MultiTermsBucket.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MultiTermsBucket.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,63 +28,80 @@
 
 namespace Elastic.Clients.Elasticsearch.Aggregations;
 
-internal sealed partial class MultiTermsBucketConverter : JsonConverter<MultiTermsBucket>
+internal sealed partial class MultiTermsBucketConverter : System.Text.Json.Serialization.JsonConverter<MultiTermsBucket>
 {
-	public override MultiTermsBucket Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropDocCount = System.Text.Json.JsonEncodedText.Encode("doc_count");
+	private static readonly System.Text.Json.JsonEncodedText PropDocCountErrorUpperBound = System.Text.Json.JsonEncodedText.Encode("doc_count_error_upper_bound");
+	private static readonly System.Text.Json.JsonEncodedText PropKey = System.Text.Json.JsonEncodedText.Encode("key");
+	private static readonly System.Text.Json.JsonEncodedText PropKeyAsString = System.Text.Json.JsonEncodedText.Encode("key_as_string");
+
+	public override MultiTermsBucket Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		long docCount = default;
-		long? docCountErrorUpperBound = default;
-		IReadOnlyCollection<Elastic.Clients.Elasticsearch.FieldValue> key = default;
-		string? keyAsString = default;
-		Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate> propAggregations = default;
+		LocalJsonProperty<long> propDocCount = default;
+		LocalJsonProperty<long?> propDocCountErrorUpperBound = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.FieldValue>> propKey = default;
+		LocalJsonProperty<string?> propKeyAsString = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propDocCount.TryRead(ref reader, options, PropDocCount))
 			{
-				var property = reader.GetString();
-				if (property == "doc_count")
-				{
-					docCount = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "doc_count_error_upper_bound")
-				{
-					docCountErrorUpperBound = JsonSerializer.Deserialize<long?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "key")
-				{
-					key = JsonSerializer.Deserialize<IReadOnlyCollection<Elastic.Clients.Elasticsearch.FieldValue>>(ref reader, options);
-					continue;
-				}
+				continue;
+			}
 
-				if (property == "key_as_string")
-				{
-					keyAsString = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
+			if (propDocCountErrorUpperBound.TryRead(ref reader, options, PropDocCountErrorUpperBound))
+			{
+				continue;
+			}
 
-				if (property.Contains("#"))
-				{
-					additionalProperties ??= new Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate>();
-					AggregateDictionaryConverter.ReadItem(ref reader, options, additionalProperties, property);
-					continue;
-				}
+			if (propKey.TryRead(ref reader, options, PropKey))
+			{
+				continue;
+			}
 
-				throw new JsonException("Unknown property read from JSON.");
+			if (propKeyAsString.TryRead(ref reader, options, PropKeyAsString))
+			{
+				continue;
 			}
+
+			propAggregations ??= new System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate>();
+			Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionaryConverter.ReadItem(ref reader, options, out string key, out Elastic.Clients.Elasticsearch.Aggregations.IAggregate value);
+			propAggregations[key] = value;
 		}
 
-		return new MultiTermsBucket { Aggregations = new Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary(additionalProperties), DocCount = docCount, DocCountErrorUpperBound = docCountErrorUpperBound, Key = key, KeyAsString = keyAsString };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new MultiTermsBucket
+		{
+			Aggregations = new Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary(propAggregations)
+,
+			DocCount = propDocCount.Value
+,
+			DocCountErrorUpperBound = propDocCountErrorUpperBound.Value
+,
+			Key = propKey.Value
+,
+			KeyAsString = propKeyAsString.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, MultiTermsBucket value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, MultiTermsBucket value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'MultiTermsBucket' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDocCount, value.DocCount);
+		writer.WriteProperty(options, PropDocCountErrorUpperBound, value.DocCountErrorUpperBound);
+		writer.WriteProperty(options, PropKey, value.Key);
+		writer.WriteProperty(options, PropKeyAsString, value.KeyAsString);
+		if (value.Aggregations is not null)
+		{
+			foreach (var item in value.Aggregations)
+			{
+				Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionaryConverter.WriteItem(writer, options, item.Key, item.Value);
+			}
+		}
+
+		writer.WriteEndObject();
 	}
 }
 
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 e38814bec14..c200c9f76fd 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/NestedAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/NestedAggregate.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,49 +28,60 @@
 
 namespace Elastic.Clients.Elasticsearch.Aggregations;
 
-internal sealed partial class NestedAggregateConverter : JsonConverter<NestedAggregate>
+internal sealed partial class NestedAggregateConverter : System.Text.Json.Serialization.JsonConverter<NestedAggregate>
 {
-	public override NestedAggregate Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropDocCount = System.Text.Json.JsonEncodedText.Encode("doc_count");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+
+	public override NestedAggregate Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		long docCount = default;
-		IReadOnlyDictionary<string, object>? meta = default;
-		Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate> propAggregations = default;
+		LocalJsonProperty<long> propDocCount = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, object>?> propMeta = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propDocCount.TryRead(ref reader, options, PropDocCount))
 			{
-				var property = reader.GetString();
-				if (property == "doc_count")
-				{
-					docCount = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "meta")
-				{
-					meta = JsonSerializer.Deserialize<IReadOnlyDictionary<string, object>?>(ref reader, options);
-					continue;
-				}
-
-				if (property.Contains("#"))
-				{
-					additionalProperties ??= new Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate>();
-					AggregateDictionaryConverter.ReadItem(ref reader, options, additionalProperties, property);
-					continue;
-				}
+				continue;
+			}
 
-				throw new JsonException("Unknown property read from JSON.");
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
 			}
+
+			propAggregations ??= new System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate>();
+			Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionaryConverter.ReadItem(ref reader, options, out string key, out Elastic.Clients.Elasticsearch.Aggregations.IAggregate value);
+			propAggregations[key] = value;
 		}
 
-		return new NestedAggregate { Aggregations = new Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary(additionalProperties), DocCount = docCount, Meta = meta };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new NestedAggregate
+		{
+			Aggregations = new Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary(propAggregations)
+,
+			DocCount = propDocCount.Value
+,
+			Meta = propMeta.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, NestedAggregate value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, NestedAggregate value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'NestedAggregate' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDocCount, value.DocCount);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		if (value.Aggregations is not null)
+		{
+			foreach (var item in value.Aggregations)
+			{
+				Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionaryConverter.WriteItem(writer, options, item.Key, item.Value);
+			}
+		}
+
+		writer.WriteEndObject();
 	}
 }
 
@@ -84,4 +96,6 @@ public sealed partial class NestedAggregate : IAggregate
 	public Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary Aggregations { get; init; }
 	public long DocCount { get; init; }
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
+
+	string IAggregate.Type => "nested";
 }
\ No newline at end of file
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 33739b8289d..026cc573bf9 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ParentAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ParentAggregate.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,49 +28,60 @@
 
 namespace Elastic.Clients.Elasticsearch.Aggregations;
 
-internal sealed partial class ParentAggregateConverter : JsonConverter<ParentAggregate>
+internal sealed partial class ParentAggregateConverter : System.Text.Json.Serialization.JsonConverter<ParentAggregate>
 {
-	public override ParentAggregate Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropDocCount = System.Text.Json.JsonEncodedText.Encode("doc_count");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+
+	public override ParentAggregate Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		long docCount = default;
-		IReadOnlyDictionary<string, object>? meta = default;
-		Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate> propAggregations = default;
+		LocalJsonProperty<long> propDocCount = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, object>?> propMeta = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propDocCount.TryRead(ref reader, options, PropDocCount))
 			{
-				var property = reader.GetString();
-				if (property == "doc_count")
-				{
-					docCount = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "meta")
-				{
-					meta = JsonSerializer.Deserialize<IReadOnlyDictionary<string, object>?>(ref reader, options);
-					continue;
-				}
-
-				if (property.Contains("#"))
-				{
-					additionalProperties ??= new Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate>();
-					AggregateDictionaryConverter.ReadItem(ref reader, options, additionalProperties, property);
-					continue;
-				}
+				continue;
+			}
 
-				throw new JsonException("Unknown property read from JSON.");
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
 			}
+
+			propAggregations ??= new System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate>();
+			Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionaryConverter.ReadItem(ref reader, options, out string key, out Elastic.Clients.Elasticsearch.Aggregations.IAggregate value);
+			propAggregations[key] = value;
 		}
 
-		return new ParentAggregate { Aggregations = new Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary(additionalProperties), DocCount = docCount, Meta = meta };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ParentAggregate
+		{
+			Aggregations = new Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary(propAggregations)
+,
+			DocCount = propDocCount.Value
+,
+			Meta = propMeta.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, ParentAggregate value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ParentAggregate value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'ParentAggregate' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDocCount, value.DocCount);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		if (value.Aggregations is not null)
+		{
+			foreach (var item in value.Aggregations)
+			{
+				Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionaryConverter.WriteItem(writer, options, item.Key, item.Value);
+			}
+		}
+
+		writer.WriteEndObject();
 	}
 }
 
@@ -84,4 +96,6 @@ public sealed partial class ParentAggregate : IAggregate
 	public Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary Aggregations { get; init; }
 	public long DocCount { get; init; }
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
+
+	string IAggregate.Type => "parent";
 }
\ No newline at end of file
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 bed01ff53b2..a287e24e293 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/PercentilesBucketAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/PercentilesBucketAggregate.g.cs
@@ -33,4 +33,6 @@ public sealed partial class PercentilesBucketAggregate : IAggregate
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
 	[JsonInclude, JsonPropertyName("values")]
 	public Elastic.Clients.Elasticsearch.Aggregations.Percentiles Values { get; init; }
+
+	string IAggregate.Type => "percentiles_bucket";
 }
\ No newline at end of file
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 e9df9b37862..4de004441cd 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/RangeAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/RangeAggregate.g.cs
@@ -33,4 +33,6 @@ public sealed partial class RangeAggregate : IAggregate
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Aggregations.RangeBucket> Buckets { get; init; }
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
+
+	string IAggregate.Type => "range";
 }
\ No newline at end of file
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 b8079e6ad04..d286d36bc47 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/RangeBucket.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/RangeBucket.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,77 +28,100 @@
 
 namespace Elastic.Clients.Elasticsearch.Aggregations;
 
-internal sealed partial class RangeBucketConverter : JsonConverter<RangeBucket>
+internal sealed partial class RangeBucketConverter : System.Text.Json.Serialization.JsonConverter<RangeBucket>
 {
-	public override RangeBucket Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropDocCount = System.Text.Json.JsonEncodedText.Encode("doc_count");
+	private static readonly System.Text.Json.JsonEncodedText PropFrom = System.Text.Json.JsonEncodedText.Encode("from");
+	private static readonly System.Text.Json.JsonEncodedText PropFromAsString = System.Text.Json.JsonEncodedText.Encode("from_as_string");
+	private static readonly System.Text.Json.JsonEncodedText PropKey = System.Text.Json.JsonEncodedText.Encode("key");
+	private static readonly System.Text.Json.JsonEncodedText PropTo = System.Text.Json.JsonEncodedText.Encode("to");
+	private static readonly System.Text.Json.JsonEncodedText PropToAsString = System.Text.Json.JsonEncodedText.Encode("to_as_string");
+
+	public override RangeBucket Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		long docCount = default;
-		double? from = default;
-		string? fromAsString = default;
-		string? key = default;
-		double? to = default;
-		string? toAsString = default;
-		Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate> propAggregations = default;
+		LocalJsonProperty<long> propDocCount = default;
+		LocalJsonProperty<double?> propFrom = default;
+		LocalJsonProperty<string?> propFromAsString = default;
+		LocalJsonProperty<string?> propKey = default;
+		LocalJsonProperty<double?> propTo = default;
+		LocalJsonProperty<string?> propToAsString = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propDocCount.TryRead(ref reader, options, PropDocCount))
+			{
+				continue;
+			}
+
+			if (propFrom.TryRead(ref reader, options, PropFrom))
+			{
+				continue;
+			}
+
+			if (propFromAsString.TryRead(ref reader, options, PropFromAsString))
+			{
+				continue;
+			}
+
+			if (propKey.TryRead(ref reader, options, PropKey))
 			{
-				var property = reader.GetString();
-				if (property == "doc_count")
-				{
-					docCount = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "from")
-				{
-					from = JsonSerializer.Deserialize<double?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "from_as_string")
-				{
-					fromAsString = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "key")
-				{
-					key = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "to")
-				{
-					to = JsonSerializer.Deserialize<double?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "to_as_string")
-				{
-					toAsString = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property.Contains("#"))
-				{
-					additionalProperties ??= new Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate>();
-					AggregateDictionaryConverter.ReadItem(ref reader, options, additionalProperties, property);
-					continue;
-				}
-
-				throw new JsonException("Unknown property read from JSON.");
+				continue;
 			}
+
+			if (propTo.TryRead(ref reader, options, PropTo))
+			{
+				continue;
+			}
+
+			if (propToAsString.TryRead(ref reader, options, PropToAsString))
+			{
+				continue;
+			}
+
+			propAggregations ??= new System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate>();
+			Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionaryConverter.ReadItem(ref reader, options, out string key, out Elastic.Clients.Elasticsearch.Aggregations.IAggregate value);
+			propAggregations[key] = value;
 		}
 
-		return new RangeBucket { Aggregations = new Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary(additionalProperties), DocCount = docCount, From = from, FromAsString = fromAsString, Key = key, To = to, ToAsString = toAsString };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new RangeBucket
+		{
+			Aggregations = new Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary(propAggregations)
+,
+			DocCount = propDocCount.Value
+,
+			From = propFrom.Value
+,
+			FromAsString = propFromAsString.Value
+,
+			Key = propKey.Value
+,
+			To = propTo.Value
+,
+			ToAsString = propToAsString.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, RangeBucket value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, RangeBucket value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'RangeBucket' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDocCount, value.DocCount);
+		writer.WriteProperty(options, PropFrom, value.From);
+		writer.WriteProperty(options, PropFromAsString, value.FromAsString);
+		writer.WriteProperty(options, PropKey, value.Key);
+		writer.WriteProperty(options, PropTo, value.To);
+		writer.WriteProperty(options, PropToAsString, value.ToAsString);
+		if (value.Aggregations is not null)
+		{
+			foreach (var item in value.Aggregations)
+			{
+				Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionaryConverter.WriteItem(writer, options, item.Key, item.Value);
+			}
+		}
+
+		writer.WriteEndObject();
 	}
 }
 
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 4718e6f1823..a6459e2ae44 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/RateAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/RateAggregate.g.cs
@@ -35,4 +35,6 @@ public sealed partial class RateAggregate : IAggregate
 	public double Value { get; init; }
 	[JsonInclude, JsonPropertyName("value_as_string")]
 	public string? ValueAsString { get; init; }
+
+	string IAggregate.Type => "rate";
 }
\ No newline at end of file
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 ec6aff078dd..af97b7f607c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ReverseNestedAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ReverseNestedAggregate.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,49 +28,60 @@
 
 namespace Elastic.Clients.Elasticsearch.Aggregations;
 
-internal sealed partial class ReverseNestedAggregateConverter : JsonConverter<ReverseNestedAggregate>
+internal sealed partial class ReverseNestedAggregateConverter : System.Text.Json.Serialization.JsonConverter<ReverseNestedAggregate>
 {
-	public override ReverseNestedAggregate Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropDocCount = System.Text.Json.JsonEncodedText.Encode("doc_count");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+
+	public override ReverseNestedAggregate Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		long docCount = default;
-		IReadOnlyDictionary<string, object>? meta = default;
-		Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate> propAggregations = default;
+		LocalJsonProperty<long> propDocCount = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, object>?> propMeta = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propDocCount.TryRead(ref reader, options, PropDocCount))
 			{
-				var property = reader.GetString();
-				if (property == "doc_count")
-				{
-					docCount = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "meta")
-				{
-					meta = JsonSerializer.Deserialize<IReadOnlyDictionary<string, object>?>(ref reader, options);
-					continue;
-				}
-
-				if (property.Contains("#"))
-				{
-					additionalProperties ??= new Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate>();
-					AggregateDictionaryConverter.ReadItem(ref reader, options, additionalProperties, property);
-					continue;
-				}
+				continue;
+			}
 
-				throw new JsonException("Unknown property read from JSON.");
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
 			}
+
+			propAggregations ??= new System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate>();
+			Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionaryConverter.ReadItem(ref reader, options, out string key, out Elastic.Clients.Elasticsearch.Aggregations.IAggregate value);
+			propAggregations[key] = value;
 		}
 
-		return new ReverseNestedAggregate { Aggregations = new Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary(additionalProperties), DocCount = docCount, Meta = meta };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ReverseNestedAggregate
+		{
+			Aggregations = new Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary(propAggregations)
+,
+			DocCount = propDocCount.Value
+,
+			Meta = propMeta.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, ReverseNestedAggregate value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ReverseNestedAggregate value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'ReverseNestedAggregate' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDocCount, value.DocCount);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		if (value.Aggregations is not null)
+		{
+			foreach (var item in value.Aggregations)
+			{
+				Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionaryConverter.WriteItem(writer, options, item.Key, item.Value);
+			}
+		}
+
+		writer.WriteEndObject();
 	}
 }
 
@@ -84,4 +96,6 @@ public sealed partial class ReverseNestedAggregate : IAggregate
 	public Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary Aggregations { get; init; }
 	public long DocCount { get; init; }
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
+
+	string IAggregate.Type => "reverse_nested";
 }
\ No newline at end of file
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 422f7d9a8df..22e53e07cb1 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/SamplerAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/SamplerAggregate.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,49 +28,60 @@
 
 namespace Elastic.Clients.Elasticsearch.Aggregations;
 
-internal sealed partial class SamplerAggregateConverter : JsonConverter<SamplerAggregate>
+internal sealed partial class SamplerAggregateConverter : System.Text.Json.Serialization.JsonConverter<SamplerAggregate>
 {
-	public override SamplerAggregate Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropDocCount = System.Text.Json.JsonEncodedText.Encode("doc_count");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+
+	public override SamplerAggregate Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		long docCount = default;
-		IReadOnlyDictionary<string, object>? meta = default;
-		Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate> propAggregations = default;
+		LocalJsonProperty<long> propDocCount = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, object>?> propMeta = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propDocCount.TryRead(ref reader, options, PropDocCount))
 			{
-				var property = reader.GetString();
-				if (property == "doc_count")
-				{
-					docCount = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "meta")
-				{
-					meta = JsonSerializer.Deserialize<IReadOnlyDictionary<string, object>?>(ref reader, options);
-					continue;
-				}
-
-				if (property.Contains("#"))
-				{
-					additionalProperties ??= new Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate>();
-					AggregateDictionaryConverter.ReadItem(ref reader, options, additionalProperties, property);
-					continue;
-				}
+				continue;
+			}
 
-				throw new JsonException("Unknown property read from JSON.");
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
 			}
+
+			propAggregations ??= new System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate>();
+			Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionaryConverter.ReadItem(ref reader, options, out string key, out Elastic.Clients.Elasticsearch.Aggregations.IAggregate value);
+			propAggregations[key] = value;
 		}
 
-		return new SamplerAggregate { Aggregations = new Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary(additionalProperties), DocCount = docCount, Meta = meta };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SamplerAggregate
+		{
+			Aggregations = new Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary(propAggregations)
+,
+			DocCount = propDocCount.Value
+,
+			Meta = propMeta.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, SamplerAggregate value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SamplerAggregate value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'SamplerAggregate' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDocCount, value.DocCount);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		if (value.Aggregations is not null)
+		{
+			foreach (var item in value.Aggregations)
+			{
+				Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionaryConverter.WriteItem(writer, options, item.Key, item.Value);
+			}
+		}
+
+		writer.WriteEndObject();
 	}
 }
 
@@ -84,4 +96,6 @@ public sealed partial class SamplerAggregate : IAggregate
 	public Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary Aggregations { get; init; }
 	public long DocCount { get; init; }
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
+
+	string IAggregate.Type => "sampler";
 }
\ No newline at end of file
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 64ca2bf26ce..d5ec9eaf5a4 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ScriptedMetricAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ScriptedMetricAggregate.g.cs
@@ -33,4 +33,6 @@ public sealed partial class ScriptedMetricAggregate : IAggregate
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
 	[JsonInclude, JsonPropertyName("value")]
 	public object Value { get; init; }
+
+	string IAggregate.Type => "scripted_metric";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/SignificantLongTermsAggregate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/SignificantLongTermsAggregate.g.cs
index 04c561fc339..3ffae488fb0 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/SignificantLongTermsAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/SignificantLongTermsAggregate.g.cs
@@ -37,4 +37,6 @@ public sealed partial class SignificantLongTermsAggregate : IAggregate
 	public long? DocCount { get; init; }
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
+
+	string IAggregate.Type => "siglterms";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/SignificantLongTermsBucket.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/SignificantLongTermsBucket.g.cs
index bc249c8d098..5cdc488e964 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/SignificantLongTermsBucket.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/SignificantLongTermsBucket.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,70 +28,90 @@
 
 namespace Elastic.Clients.Elasticsearch.Aggregations;
 
-internal sealed partial class SignificantLongTermsBucketConverter : JsonConverter<SignificantLongTermsBucket>
+internal sealed partial class SignificantLongTermsBucketConverter : System.Text.Json.Serialization.JsonConverter<SignificantLongTermsBucket>
 {
-	public override SignificantLongTermsBucket Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropBgCount = System.Text.Json.JsonEncodedText.Encode("bg_count");
+	private static readonly System.Text.Json.JsonEncodedText PropDocCount = System.Text.Json.JsonEncodedText.Encode("doc_count");
+	private static readonly System.Text.Json.JsonEncodedText PropKey = System.Text.Json.JsonEncodedText.Encode("key");
+	private static readonly System.Text.Json.JsonEncodedText PropKeyAsString = System.Text.Json.JsonEncodedText.Encode("key_as_string");
+	private static readonly System.Text.Json.JsonEncodedText PropScore = System.Text.Json.JsonEncodedText.Encode("score");
+
+	public override SignificantLongTermsBucket Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		long bgCount = default;
-		long docCount = default;
-		long key = default;
-		string? keyAsString = default;
-		double score = default;
-		Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate> propAggregations = default;
+		LocalJsonProperty<long> propBgCount = default;
+		LocalJsonProperty<long> propDocCount = default;
+		LocalJsonProperty<long> propKey = default;
+		LocalJsonProperty<string?> propKeyAsString = default;
+		LocalJsonProperty<double> propScore = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propBgCount.TryRead(ref reader, options, PropBgCount))
 			{
-				var property = reader.GetString();
-				if (property == "bg_count")
-				{
-					bgCount = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "doc_count")
-				{
-					docCount = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "key")
-				{
-					key = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
+				continue;
+			}
 
-				if (property == "key_as_string")
-				{
-					keyAsString = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
+			if (propDocCount.TryRead(ref reader, options, PropDocCount))
+			{
+				continue;
+			}
 
-				if (property == "score")
-				{
-					score = JsonSerializer.Deserialize<double>(ref reader, options);
-					continue;
-				}
+			if (propKey.TryRead(ref reader, options, PropKey))
+			{
+				continue;
+			}
 
-				if (property.Contains("#"))
-				{
-					additionalProperties ??= new Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate>();
-					AggregateDictionaryConverter.ReadItem(ref reader, options, additionalProperties, property);
-					continue;
-				}
+			if (propKeyAsString.TryRead(ref reader, options, PropKeyAsString))
+			{
+				continue;
+			}
 
-				throw new JsonException("Unknown property read from JSON.");
+			if (propScore.TryRead(ref reader, options, PropScore))
+			{
+				continue;
 			}
+
+			propAggregations ??= new System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate>();
+			Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionaryConverter.ReadItem(ref reader, options, out string key, out Elastic.Clients.Elasticsearch.Aggregations.IAggregate value);
+			propAggregations[key] = value;
 		}
 
-		return new SignificantLongTermsBucket { Aggregations = new Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary(additionalProperties), BgCount = bgCount, DocCount = docCount, Key = key, KeyAsString = keyAsString, Score = score };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SignificantLongTermsBucket
+		{
+			Aggregations = new Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary(propAggregations)
+,
+			BgCount = propBgCount.Value
+,
+			DocCount = propDocCount.Value
+,
+			Key = propKey.Value
+,
+			KeyAsString = propKeyAsString.Value
+,
+			Score = propScore.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, SignificantLongTermsBucket value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SignificantLongTermsBucket value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'SignificantLongTermsBucket' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBgCount, value.BgCount);
+		writer.WriteProperty(options, PropDocCount, value.DocCount);
+		writer.WriteProperty(options, PropKey, value.Key);
+		writer.WriteProperty(options, PropKeyAsString, value.KeyAsString);
+		writer.WriteProperty(options, PropScore, value.Score);
+		if (value.Aggregations is not null)
+		{
+			foreach (var item in value.Aggregations)
+			{
+				Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionaryConverter.WriteItem(writer, options, item.Key, item.Value);
+			}
+		}
+
+		writer.WriteEndObject();
 	}
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/SignificantStringTermsAggregate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/SignificantStringTermsAggregate.g.cs
index e2e799a941e..661f9002353 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/SignificantStringTermsAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/SignificantStringTermsAggregate.g.cs
@@ -37,4 +37,6 @@ public sealed partial class SignificantStringTermsAggregate : IAggregate
 	public long? DocCount { get; init; }
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
+
+	string IAggregate.Type => "sigsterms";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/SignificantStringTermsBucket.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/SignificantStringTermsBucket.g.cs
index 557a647c326..87a4a7e5607 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/SignificantStringTermsBucket.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/SignificantStringTermsBucket.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,63 +28,80 @@
 
 namespace Elastic.Clients.Elasticsearch.Aggregations;
 
-internal sealed partial class SignificantStringTermsBucketConverter : JsonConverter<SignificantStringTermsBucket>
+internal sealed partial class SignificantStringTermsBucketConverter : System.Text.Json.Serialization.JsonConverter<SignificantStringTermsBucket>
 {
-	public override SignificantStringTermsBucket Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropBgCount = System.Text.Json.JsonEncodedText.Encode("bg_count");
+	private static readonly System.Text.Json.JsonEncodedText PropDocCount = System.Text.Json.JsonEncodedText.Encode("doc_count");
+	private static readonly System.Text.Json.JsonEncodedText PropKey = System.Text.Json.JsonEncodedText.Encode("key");
+	private static readonly System.Text.Json.JsonEncodedText PropScore = System.Text.Json.JsonEncodedText.Encode("score");
+
+	public override SignificantStringTermsBucket Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		long bgCount = default;
-		long docCount = default;
-		string key = default;
-		double score = default;
-		Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate> propAggregations = default;
+		LocalJsonProperty<long> propBgCount = default;
+		LocalJsonProperty<long> propDocCount = default;
+		LocalJsonProperty<string> propKey = default;
+		LocalJsonProperty<double> propScore = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propBgCount.TryRead(ref reader, options, PropBgCount))
 			{
-				var property = reader.GetString();
-				if (property == "bg_count")
-				{
-					bgCount = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "doc_count")
-				{
-					docCount = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "key")
-				{
-					key = JsonSerializer.Deserialize<string>(ref reader, options);
-					continue;
-				}
+				continue;
+			}
 
-				if (property == "score")
-				{
-					score = JsonSerializer.Deserialize<double>(ref reader, options);
-					continue;
-				}
+			if (propDocCount.TryRead(ref reader, options, PropDocCount))
+			{
+				continue;
+			}
 
-				if (property.Contains("#"))
-				{
-					additionalProperties ??= new Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate>();
-					AggregateDictionaryConverter.ReadItem(ref reader, options, additionalProperties, property);
-					continue;
-				}
+			if (propKey.TryRead(ref reader, options, PropKey))
+			{
+				continue;
+			}
 
-				throw new JsonException("Unknown property read from JSON.");
+			if (propScore.TryRead(ref reader, options, PropScore))
+			{
+				continue;
 			}
+
+			propAggregations ??= new System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate>();
+			Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionaryConverter.ReadItem(ref reader, options, out string key, out Elastic.Clients.Elasticsearch.Aggregations.IAggregate value);
+			propAggregations[key] = value;
 		}
 
-		return new SignificantStringTermsBucket { Aggregations = new Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary(additionalProperties), BgCount = bgCount, DocCount = docCount, Key = key, Score = score };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SignificantStringTermsBucket
+		{
+			Aggregations = new Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary(propAggregations)
+,
+			BgCount = propBgCount.Value
+,
+			DocCount = propDocCount.Value
+,
+			Key = propKey.Value
+,
+			Score = propScore.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, SignificantStringTermsBucket value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SignificantStringTermsBucket value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'SignificantStringTermsBucket' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBgCount, value.BgCount);
+		writer.WriteProperty(options, PropDocCount, value.DocCount);
+		writer.WriteProperty(options, PropKey, value.Key);
+		writer.WriteProperty(options, PropScore, value.Score);
+		if (value.Aggregations is not null)
+		{
+			foreach (var item in value.Aggregations)
+			{
+				Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionaryConverter.WriteItem(writer, options, item.Key, item.Value);
+			}
+		}
+
+		writer.WriteEndObject();
 	}
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/SignificantTextAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/SignificantTextAggregation.g.cs
index 09fa408e2cf..3aed88a402b 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/SignificantTextAggregation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/SignificantTextAggregation.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,200 @@
 
 namespace Elastic.Clients.Elasticsearch.Aggregations;
 
+internal sealed partial class SignificantTextAggregationConverter : System.Text.Json.Serialization.JsonConverter<SignificantTextAggregation>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropBackgroundFilter = System.Text.Json.JsonEncodedText.Encode("background_filter");
+	private static readonly System.Text.Json.JsonEncodedText PropChiSquare = System.Text.Json.JsonEncodedText.Encode("chi_square");
+	private static readonly System.Text.Json.JsonEncodedText PropExclude = System.Text.Json.JsonEncodedText.Encode("exclude");
+	private static readonly System.Text.Json.JsonEncodedText PropExecutionHint = System.Text.Json.JsonEncodedText.Encode("execution_hint");
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropFilterDuplicateText = System.Text.Json.JsonEncodedText.Encode("filter_duplicate_text");
+	private static readonly System.Text.Json.JsonEncodedText PropGnd = System.Text.Json.JsonEncodedText.Encode("gnd");
+	private static readonly System.Text.Json.JsonEncodedText PropInclude = System.Text.Json.JsonEncodedText.Encode("include");
+	private static readonly System.Text.Json.JsonEncodedText PropJlh = System.Text.Json.JsonEncodedText.Encode("jlh");
+	private static readonly System.Text.Json.JsonEncodedText PropMinDocCount = System.Text.Json.JsonEncodedText.Encode("min_doc_count");
+	private static readonly System.Text.Json.JsonEncodedText PropMutualInformation = System.Text.Json.JsonEncodedText.Encode("mutual_information");
+	private static readonly System.Text.Json.JsonEncodedText PropPercentage = System.Text.Json.JsonEncodedText.Encode("percentage");
+	private static readonly System.Text.Json.JsonEncodedText PropScriptHeuristic = System.Text.Json.JsonEncodedText.Encode("script_heuristic");
+	private static readonly System.Text.Json.JsonEncodedText PropShardMinDocCount = System.Text.Json.JsonEncodedText.Encode("shard_min_doc_count");
+	private static readonly System.Text.Json.JsonEncodedText PropShardSize = System.Text.Json.JsonEncodedText.Encode("shard_size");
+	private static readonly System.Text.Json.JsonEncodedText PropSize = System.Text.Json.JsonEncodedText.Encode("size");
+	private static readonly System.Text.Json.JsonEncodedText PropSourceFields = System.Text.Json.JsonEncodedText.Encode("source_fields");
+
+	public override SignificantTextAggregation Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.QueryDsl.Query?> propBackgroundFilter = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Aggregations.ChiSquareHeuristic?> propChiSquare = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Aggregations.TermsExclude?> propExclude = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Aggregations.TermsAggregationExecutionHint?> propExecutionHint = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Field?> propField = default;
+		LocalJsonProperty<bool?> propFilterDuplicateText = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Aggregations.GoogleNormalizedDistanceHeuristic?> propGnd = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Aggregations.TermsInclude?> propInclude = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.EmptyObject?> propJlh = default;
+		LocalJsonProperty<long?> propMinDocCount = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Aggregations.MutualInformationHeuristic?> propMutualInformation = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Aggregations.PercentageScoreHeuristic?> propPercentage = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Aggregations.ScriptedHeuristic?> propScriptHeuristic = default;
+		LocalJsonProperty<long?> propShardMinDocCount = default;
+		LocalJsonProperty<int?> propShardSize = default;
+		LocalJsonProperty<int?> propSize = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Fields?> propSourceFields = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBackgroundFilter.TryRead(ref reader, options, PropBackgroundFilter))
+			{
+				continue;
+			}
+
+			if (propChiSquare.TryRead(ref reader, options, PropChiSquare))
+			{
+				continue;
+			}
+
+			if (propExclude.TryRead(ref reader, options, PropExclude))
+			{
+				continue;
+			}
+
+			if (propExecutionHint.TryRead(ref reader, options, PropExecutionHint))
+			{
+				continue;
+			}
+
+			if (propField.TryRead(ref reader, options, PropField))
+			{
+				continue;
+			}
+
+			if (propFilterDuplicateText.TryRead(ref reader, options, PropFilterDuplicateText))
+			{
+				continue;
+			}
+
+			if (propGnd.TryRead(ref reader, options, PropGnd))
+			{
+				continue;
+			}
+
+			if (propInclude.TryRead(ref reader, options, PropInclude))
+			{
+				continue;
+			}
+
+			if (propJlh.TryRead(ref reader, options, PropJlh))
+			{
+				continue;
+			}
+
+			if (propMinDocCount.TryRead(ref reader, options, PropMinDocCount))
+			{
+				continue;
+			}
+
+			if (propMutualInformation.TryRead(ref reader, options, PropMutualInformation))
+			{
+				continue;
+			}
+
+			if (propPercentage.TryRead(ref reader, options, PropPercentage))
+			{
+				continue;
+			}
+
+			if (propScriptHeuristic.TryRead(ref reader, options, PropScriptHeuristic))
+			{
+				continue;
+			}
+
+			if (propShardMinDocCount.TryRead(ref reader, options, PropShardMinDocCount))
+			{
+				continue;
+			}
+
+			if (propShardSize.TryRead(ref reader, options, PropShardSize))
+			{
+				continue;
+			}
+
+			if (propSize.TryRead(ref reader, options, PropSize))
+			{
+				continue;
+			}
+
+			if (propSourceFields.TryRead(ref reader, options, PropSourceFields, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SignificantTextAggregation
+		{
+			BackgroundFilter = propBackgroundFilter.Value
+,
+			ChiSquare = propChiSquare.Value
+,
+			Exclude = propExclude.Value
+,
+			ExecutionHint = propExecutionHint.Value
+,
+			Field = propField.Value
+,
+			FilterDuplicateText = propFilterDuplicateText.Value
+,
+			Gnd = propGnd.Value
+,
+			Include = propInclude.Value
+,
+			Jlh = propJlh.Value
+,
+			MinDocCount = propMinDocCount.Value
+,
+			MutualInformation = propMutualInformation.Value
+,
+			Percentage = propPercentage.Value
+,
+			ScriptHeuristic = propScriptHeuristic.Value
+,
+			ShardMinDocCount = propShardMinDocCount.Value
+,
+			ShardSize = propShardSize.Value
+,
+			Size = propSize.Value
+,
+			SourceFields = propSourceFields.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SignificantTextAggregation value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBackgroundFilter, value.BackgroundFilter);
+		writer.WriteProperty(options, PropChiSquare, value.ChiSquare);
+		writer.WriteProperty(options, PropExclude, value.Exclude);
+		writer.WriteProperty(options, PropExecutionHint, value.ExecutionHint);
+		writer.WriteProperty(options, PropField, value.Field);
+		writer.WriteProperty(options, PropFilterDuplicateText, value.FilterDuplicateText);
+		writer.WriteProperty(options, PropGnd, value.Gnd);
+		writer.WriteProperty(options, PropInclude, value.Include);
+		writer.WriteProperty(options, PropJlh, value.Jlh);
+		writer.WriteProperty(options, PropMinDocCount, value.MinDocCount);
+		writer.WriteProperty(options, PropMutualInformation, value.MutualInformation);
+		writer.WriteProperty(options, PropPercentage, value.Percentage);
+		writer.WriteProperty(options, PropScriptHeuristic, value.ScriptHeuristic);
+		writer.WriteProperty(options, PropShardMinDocCount, value.ShardMinDocCount);
+		writer.WriteProperty(options, PropShardSize, value.ShardSize);
+		writer.WriteProperty(options, PropSize, value.Size);
+		writer.WriteProperty(options, PropSourceFields, value.SourceFields, typeof(SingleOrManyFieldsMarker));
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(SignificantTextAggregationConverter))]
 public sealed partial class SignificantTextAggregation
 {
 	/// <summary>
@@ -34,7 +229,6 @@ public sealed partial class SignificantTextAggregation
 	/// A background filter that can be used to focus in on significant terms within a narrower context, instead of the entire index.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("background_filter")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.Query? BackgroundFilter { get; set; }
 
 	/// <summary>
@@ -42,7 +236,6 @@ public sealed partial class SignificantTextAggregation
 	/// Use Chi square, as described in "Information Retrieval", Manning et al., Chapter 13.5.2, as the significance score.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("chi_square")]
 	public Elastic.Clients.Elasticsearch.Aggregations.ChiSquareHeuristic? ChiSquare { get; set; }
 
 	/// <summary>
@@ -50,7 +243,6 @@ public sealed partial class SignificantTextAggregation
 	/// Values to exclude.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("exclude")]
 	public Elastic.Clients.Elasticsearch.Aggregations.TermsExclude? Exclude { get; set; }
 
 	/// <summary>
@@ -58,7 +250,6 @@ public sealed partial class SignificantTextAggregation
 	/// Determines whether the aggregation will use field values directly or global ordinals.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("execution_hint")]
 	public Elastic.Clients.Elasticsearch.Aggregations.TermsAggregationExecutionHint? ExecutionHint { get; set; }
 
 	/// <summary>
@@ -66,7 +257,6 @@ public sealed partial class SignificantTextAggregation
 	/// The field from which to return significant text.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("field")]
 	public Elastic.Clients.Elasticsearch.Field? Field { get; set; }
 
 	/// <summary>
@@ -74,7 +264,6 @@ public sealed partial class SignificantTextAggregation
 	/// Whether to out duplicate text to deal with noisy data.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("filter_duplicate_text")]
 	public bool? FilterDuplicateText { get; set; }
 
 	/// <summary>
@@ -82,7 +271,6 @@ public sealed partial class SignificantTextAggregation
 	/// Use Google normalized distance as described in "The Google Similarity Distance", Cilibrasi and Vitanyi, 2007, as the significance score.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("gnd")]
 	public Elastic.Clients.Elasticsearch.Aggregations.GoogleNormalizedDistanceHeuristic? Gnd { get; set; }
 
 	/// <summary>
@@ -90,7 +278,6 @@ public sealed partial class SignificantTextAggregation
 	/// Values to include.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("include")]
 	public Elastic.Clients.Elasticsearch.Aggregations.TermsInclude? Include { get; set; }
 
 	/// <summary>
@@ -98,7 +285,6 @@ public sealed partial class SignificantTextAggregation
 	/// Use JLH score as the significance score.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("jlh")]
 	public Elastic.Clients.Elasticsearch.EmptyObject? Jlh { get; set; }
 
 	/// <summary>
@@ -106,7 +292,6 @@ public sealed partial class SignificantTextAggregation
 	/// Only return values that are found in more than <c>min_doc_count</c> hits.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("min_doc_count")]
 	public long? MinDocCount { get; set; }
 
 	/// <summary>
@@ -114,7 +299,6 @@ public sealed partial class SignificantTextAggregation
 	/// Use mutual information as described in "Information Retrieval", Manning et al., Chapter 13.5.1, as the significance score.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("mutual_information")]
 	public Elastic.Clients.Elasticsearch.Aggregations.MutualInformationHeuristic? MutualInformation { get; set; }
 
 	/// <summary>
@@ -122,7 +306,6 @@ public sealed partial class SignificantTextAggregation
 	/// A simple calculation of the number of documents in the foreground sample with a term divided by the number of documents in the background with the term.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("percentage")]
 	public Elastic.Clients.Elasticsearch.Aggregations.PercentageScoreHeuristic? Percentage { get; set; }
 
 	/// <summary>
@@ -130,7 +313,6 @@ public sealed partial class SignificantTextAggregation
 	/// Customized score, implemented via a script.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("script_heuristic")]
 	public Elastic.Clients.Elasticsearch.Aggregations.ScriptedHeuristic? ScriptHeuristic { get; set; }
 
 	/// <summary>
@@ -139,7 +321,6 @@ public sealed partial class SignificantTextAggregation
 	/// Values will only be considered if their local shard frequency within the set is higher than the <c>shard_min_doc_count</c>.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("shard_min_doc_count")]
 	public long? ShardMinDocCount { get; set; }
 
 	/// <summary>
@@ -148,7 +329,6 @@ public sealed partial class SignificantTextAggregation
 	/// By default, <c>shard_size</c> will be automatically estimated based on the number of shards and the <c>size</c> parameter.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("shard_size")]
 	public int? ShardSize { get; set; }
 
 	/// <summary>
@@ -156,7 +336,6 @@ public sealed partial class SignificantTextAggregation
 	/// The number of buckets returned out of the overall terms list.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("size")]
 	public int? Size { get; set; }
 
 	/// <summary>
@@ -164,8 +343,6 @@ public sealed partial class SignificantTextAggregation
 	/// Overrides the JSON <c>_source</c> fields from which text will be analyzed.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("source_fields")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Fields? SourceFields { get; set; }
 
 	public static implicit operator Elastic.Clients.Elasticsearch.Aggregations.Aggregation(SignificantTextAggregation significantTextAggregation) => Elastic.Clients.Elasticsearch.Aggregations.Aggregation.SignificantText(significantTextAggregation);
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 00e7be7375c..bb3f6596d98 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/SimpleValueAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/SimpleValueAggregate.g.cs
@@ -42,4 +42,6 @@ public sealed partial class SimpleValueAggregate : IAggregate
 	public double? Value { get; init; }
 	[JsonInclude, JsonPropertyName("value_as_string")]
 	public string? ValueAsString { get; init; }
+
+	string IAggregate.Type => "simple_value";
 }
\ 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 35562889db5..91517ba499c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/StatsAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/StatsAggregate.g.cs
@@ -55,4 +55,6 @@ public sealed partial class StatsAggregate : IAggregate
 	public double Sum { get; init; }
 	[JsonInclude, JsonPropertyName("sum_as_string")]
 	public string? SumAsString { get; init; }
+
+	string IAggregate.Type => "stats";
 }
\ No newline at end of file
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 ec9d642824d..09b53f1f69c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/StatsBucketAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/StatsBucketAggregate.g.cs
@@ -49,4 +49,6 @@ public sealed partial class StatsBucketAggregate : IAggregate
 	public double Sum { get; init; }
 	[JsonInclude, JsonPropertyName("sum_as_string")]
 	public string? SumAsString { get; init; }
+
+	string IAggregate.Type => "stats_bucket";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/StringRareTermsAggregate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/StringRareTermsAggregate.g.cs
index 405760fb953..6a18899063a 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/StringRareTermsAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/StringRareTermsAggregate.g.cs
@@ -38,4 +38,6 @@ public sealed partial class StringRareTermsAggregate : IAggregate
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Aggregations.StringRareTermsBucket> Buckets { get; init; }
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
+
+	string IAggregate.Type => "srareterms";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/StringRareTermsBucket.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/StringRareTermsBucket.g.cs
index f704ddde80d..3c6e8e9fda4 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/StringRareTermsBucket.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/StringRareTermsBucket.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,49 +28,60 @@
 
 namespace Elastic.Clients.Elasticsearch.Aggregations;
 
-internal sealed partial class StringRareTermsBucketConverter : JsonConverter<StringRareTermsBucket>
+internal sealed partial class StringRareTermsBucketConverter : System.Text.Json.Serialization.JsonConverter<StringRareTermsBucket>
 {
-	public override StringRareTermsBucket Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropDocCount = System.Text.Json.JsonEncodedText.Encode("doc_count");
+	private static readonly System.Text.Json.JsonEncodedText PropKey = System.Text.Json.JsonEncodedText.Encode("key");
+
+	public override StringRareTermsBucket Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		long docCount = default;
-		string key = default;
-		Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate> propAggregations = default;
+		LocalJsonProperty<long> propDocCount = default;
+		LocalJsonProperty<string> propKey = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propDocCount.TryRead(ref reader, options, PropDocCount))
 			{
-				var property = reader.GetString();
-				if (property == "doc_count")
-				{
-					docCount = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "key")
-				{
-					key = JsonSerializer.Deserialize<string>(ref reader, options);
-					continue;
-				}
-
-				if (property.Contains("#"))
-				{
-					additionalProperties ??= new Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate>();
-					AggregateDictionaryConverter.ReadItem(ref reader, options, additionalProperties, property);
-					continue;
-				}
+				continue;
+			}
 
-				throw new JsonException("Unknown property read from JSON.");
+			if (propKey.TryRead(ref reader, options, PropKey))
+			{
+				continue;
 			}
+
+			propAggregations ??= new System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate>();
+			Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionaryConverter.ReadItem(ref reader, options, out string key, out Elastic.Clients.Elasticsearch.Aggregations.IAggregate value);
+			propAggregations[key] = value;
 		}
 
-		return new StringRareTermsBucket { Aggregations = new Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary(additionalProperties), DocCount = docCount, Key = key };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new StringRareTermsBucket
+		{
+			Aggregations = new Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary(propAggregations)
+,
+			DocCount = propDocCount.Value
+,
+			Key = propKey.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, StringRareTermsBucket value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, StringRareTermsBucket value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'StringRareTermsBucket' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDocCount, value.DocCount);
+		writer.WriteProperty(options, PropKey, value.Key);
+		if (value.Aggregations is not null)
+		{
+			foreach (var item in value.Aggregations)
+			{
+				Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionaryConverter.WriteItem(writer, options, item.Key, item.Value);
+			}
+		}
+
+		writer.WriteEndObject();
 	}
 }
 
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 2bcd1cd10f5..e14b0af63ae 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/StringStatsAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/StringStatsAggregate.g.cs
@@ -49,4 +49,6 @@ public sealed partial class StringStatsAggregate : IAggregate
 	public int? MinLength { get; init; }
 	[JsonInclude, JsonPropertyName("min_length_as_string")]
 	public string? MinLengthAsString { get; init; }
+
+	string IAggregate.Type => "string_stats";
 }
\ No newline at end of file
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 91cc63038f0..c6fd70e6a53 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/StringTermsAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/StringTermsAggregate.g.cs
@@ -42,4 +42,6 @@ public sealed partial class StringTermsAggregate : IAggregate
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
 	[JsonInclude, JsonPropertyName("sum_other_doc_count")]
 	public long? SumOtherDocCount { get; init; }
+
+	string IAggregate.Type => "sterms";
 }
\ 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 72ce873ca08..e9f4dbe3dc6 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/StringTermsBucket.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/StringTermsBucket.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,56 +28,70 @@
 
 namespace Elastic.Clients.Elasticsearch.Aggregations;
 
-internal sealed partial class StringTermsBucketConverter : JsonConverter<StringTermsBucket>
+internal sealed partial class StringTermsBucketConverter : System.Text.Json.Serialization.JsonConverter<StringTermsBucket>
 {
-	public override StringTermsBucket Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropDocCount = System.Text.Json.JsonEncodedText.Encode("doc_count");
+	private static readonly System.Text.Json.JsonEncodedText PropDocCountErrorUpperBound = System.Text.Json.JsonEncodedText.Encode("doc_count_error_upper_bound");
+	private static readonly System.Text.Json.JsonEncodedText PropKey = System.Text.Json.JsonEncodedText.Encode("key");
+
+	public override StringTermsBucket Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		long docCount = default;
-		long? docCountErrorUpperBound = default;
-		Elastic.Clients.Elasticsearch.FieldValue key = default;
-		Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate> propAggregations = default;
+		LocalJsonProperty<long> propDocCount = default;
+		LocalJsonProperty<long?> propDocCountErrorUpperBound = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.FieldValue> propKey = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propDocCount.TryRead(ref reader, options, PropDocCount))
 			{
-				var property = reader.GetString();
-				if (property == "doc_count")
-				{
-					docCount = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "doc_count_error_upper_bound")
-				{
-					docCountErrorUpperBound = JsonSerializer.Deserialize<long?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "key")
-				{
-					key = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.FieldValue>(ref reader, options);
-					continue;
-				}
+				continue;
+			}
 
-				if (property.Contains("#"))
-				{
-					additionalProperties ??= new Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate>();
-					AggregateDictionaryConverter.ReadItem(ref reader, options, additionalProperties, property);
-					continue;
-				}
+			if (propDocCountErrorUpperBound.TryRead(ref reader, options, PropDocCountErrorUpperBound))
+			{
+				continue;
+			}
 
-				throw new JsonException("Unknown property read from JSON.");
+			if (propKey.TryRead(ref reader, options, PropKey))
+			{
+				continue;
 			}
+
+			propAggregations ??= new System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate>();
+			Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionaryConverter.ReadItem(ref reader, options, out string key, out Elastic.Clients.Elasticsearch.Aggregations.IAggregate value);
+			propAggregations[key] = value;
 		}
 
-		return new StringTermsBucket { Aggregations = new Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary(additionalProperties), DocCount = docCount, DocCountErrorUpperBound = docCountErrorUpperBound, Key = key };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new StringTermsBucket
+		{
+			Aggregations = new Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary(propAggregations)
+,
+			DocCount = propDocCount.Value
+,
+			DocCountErrorUpperBound = propDocCountErrorUpperBound.Value
+,
+			Key = propKey.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, StringTermsBucket value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, StringTermsBucket value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'StringTermsBucket' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDocCount, value.DocCount);
+		writer.WriteProperty(options, PropDocCountErrorUpperBound, value.DocCountErrorUpperBound);
+		writer.WriteProperty(options, PropKey, value.Key);
+		if (value.Aggregations is not null)
+		{
+			foreach (var item in value.Aggregations)
+			{
+				Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionaryConverter.WriteItem(writer, options, item.Key, item.Value);
+			}
+		}
+
+		writer.WriteEndObject();
 	}
 }
 
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 23cb1250502..e5eae8deea3 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/SumAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/SumAggregate.g.cs
@@ -47,4 +47,6 @@ public sealed partial class SumAggregate : IAggregate
 	public double? Value { get; init; }
 	[JsonInclude, JsonPropertyName("value_as_string")]
 	public string? ValueAsString { get; init; }
+
+	string IAggregate.Type => "sum";
 }
\ No newline at end of file
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 b38f73b6d5a..13948b12299 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TDigestPercentileRanksAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TDigestPercentileRanksAggregate.g.cs
@@ -33,4 +33,6 @@ public sealed partial class TDigestPercentileRanksAggregate : IAggregate
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
 	[JsonInclude, JsonPropertyName("values")]
 	public Elastic.Clients.Elasticsearch.Aggregations.Percentiles Values { get; init; }
+
+	string IAggregate.Type => "tdigest_percentile_ranks";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TDigestPercentilesAggregate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TDigestPercentilesAggregate.g.cs
index 4a7003596af..4dc5e72c56a 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TDigestPercentilesAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TDigestPercentilesAggregate.g.cs
@@ -33,4 +33,6 @@ public sealed partial class TDigestPercentilesAggregate : IAggregate
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
 	[JsonInclude, JsonPropertyName("values")]
 	public Elastic.Clients.Elasticsearch.Aggregations.Percentiles Values { get; init; }
+
+	string IAggregate.Type => "tdigest_percentiles";
 }
\ 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 a152f0c5218..0d047c25331 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TTestAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TTestAggregate.g.cs
@@ -35,4 +35,6 @@ public sealed partial class TTestAggregate : IAggregate
 	public double? Value { get; init; }
 	[JsonInclude, JsonPropertyName("value_as_string")]
 	public string? ValueAsString { get; init; }
+
+	string IAggregate.Type => "t_test";
 }
\ No newline at end of file
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 f49f740db06..9aab90d19ea 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TermsAggregation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TermsAggregation.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,200 @@
 
 namespace Elastic.Clients.Elasticsearch.Aggregations;
 
+internal sealed partial class TermsAggregationConverter : System.Text.Json.Serialization.JsonConverter<TermsAggregation>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCollectMode = System.Text.Json.JsonEncodedText.Encode("collect_mode");
+	private static readonly System.Text.Json.JsonEncodedText PropExclude = System.Text.Json.JsonEncodedText.Encode("exclude");
+	private static readonly System.Text.Json.JsonEncodedText PropExecutionHint = System.Text.Json.JsonEncodedText.Encode("execution_hint");
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropFormat = System.Text.Json.JsonEncodedText.Encode("format");
+	private static readonly System.Text.Json.JsonEncodedText PropInclude = System.Text.Json.JsonEncodedText.Encode("include");
+	private static readonly System.Text.Json.JsonEncodedText PropMinDocCount = System.Text.Json.JsonEncodedText.Encode("min_doc_count");
+	private static readonly System.Text.Json.JsonEncodedText PropMissing = System.Text.Json.JsonEncodedText.Encode("missing");
+	private static readonly System.Text.Json.JsonEncodedText PropMissingBucket = System.Text.Json.JsonEncodedText.Encode("missing_bucket");
+	private static readonly System.Text.Json.JsonEncodedText PropMissingOrder = System.Text.Json.JsonEncodedText.Encode("missing_order");
+	private static readonly System.Text.Json.JsonEncodedText PropOrder = System.Text.Json.JsonEncodedText.Encode("order");
+	private static readonly System.Text.Json.JsonEncodedText PropScript = System.Text.Json.JsonEncodedText.Encode("script");
+	private static readonly System.Text.Json.JsonEncodedText PropShardMinDocCount = System.Text.Json.JsonEncodedText.Encode("shard_min_doc_count");
+	private static readonly System.Text.Json.JsonEncodedText PropShardSize = System.Text.Json.JsonEncodedText.Encode("shard_size");
+	private static readonly System.Text.Json.JsonEncodedText PropShowTermDocCountError = System.Text.Json.JsonEncodedText.Encode("show_term_doc_count_error");
+	private static readonly System.Text.Json.JsonEncodedText PropSize = System.Text.Json.JsonEncodedText.Encode("size");
+	private static readonly System.Text.Json.JsonEncodedText PropValueType = System.Text.Json.JsonEncodedText.Encode("value_type");
+
+	public override TermsAggregation Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Aggregations.TermsAggregationCollectMode?> propCollectMode = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Aggregations.TermsExclude?> propExclude = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Aggregations.TermsAggregationExecutionHint?> propExecutionHint = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Field?> propField = default;
+		LocalJsonProperty<string?> propFormat = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Aggregations.TermsInclude?> propInclude = default;
+		LocalJsonProperty<int?> propMinDocCount = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.FieldValue?> propMissing = default;
+		LocalJsonProperty<bool?> propMissingBucket = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Aggregations.MissingOrder?> propMissingOrder = default;
+		LocalJsonProperty<ICollection<KeyValuePair<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.SortOrder>>?> propOrder = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Script?> propScript = default;
+		LocalJsonProperty<long?> propShardMinDocCount = default;
+		LocalJsonProperty<int?> propShardSize = default;
+		LocalJsonProperty<bool?> propShowTermDocCountError = default;
+		LocalJsonProperty<int?> propSize = default;
+		LocalJsonProperty<string?> propValueType = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCollectMode.TryRead(ref reader, options, PropCollectMode))
+			{
+				continue;
+			}
+
+			if (propExclude.TryRead(ref reader, options, PropExclude))
+			{
+				continue;
+			}
+
+			if (propExecutionHint.TryRead(ref reader, options, PropExecutionHint))
+			{
+				continue;
+			}
+
+			if (propField.TryRead(ref reader, options, PropField))
+			{
+				continue;
+			}
+
+			if (propFormat.TryRead(ref reader, options, PropFormat))
+			{
+				continue;
+			}
+
+			if (propInclude.TryRead(ref reader, options, PropInclude))
+			{
+				continue;
+			}
+
+			if (propMinDocCount.TryRead(ref reader, options, PropMinDocCount))
+			{
+				continue;
+			}
+
+			if (propMissing.TryRead(ref reader, options, PropMissing))
+			{
+				continue;
+			}
+
+			if (propMissingBucket.TryRead(ref reader, options, PropMissingBucket))
+			{
+				continue;
+			}
+
+			if (propMissingOrder.TryRead(ref reader, options, PropMissingOrder))
+			{
+				continue;
+			}
+
+			if (propOrder.TryRead(ref reader, options, PropOrder, typeof(SingleOrManyMarker<IReadOnlyCollection<KeyValuePair<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.SortOrder>>?, KeyValuePair<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.SortOrder>>)))
+			{
+				continue;
+			}
+
+			if (propScript.TryRead(ref reader, options, PropScript))
+			{
+				continue;
+			}
+
+			if (propShardMinDocCount.TryRead(ref reader, options, PropShardMinDocCount))
+			{
+				continue;
+			}
+
+			if (propShardSize.TryRead(ref reader, options, PropShardSize))
+			{
+				continue;
+			}
+
+			if (propShowTermDocCountError.TryRead(ref reader, options, PropShowTermDocCountError))
+			{
+				continue;
+			}
+
+			if (propSize.TryRead(ref reader, options, PropSize))
+			{
+				continue;
+			}
+
+			if (propValueType.TryRead(ref reader, options, PropValueType))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new TermsAggregation
+		{
+			CollectMode = propCollectMode.Value
+,
+			Exclude = propExclude.Value
+,
+			ExecutionHint = propExecutionHint.Value
+,
+			Field = propField.Value
+,
+			Format = propFormat.Value
+,
+			Include = propInclude.Value
+,
+			MinDocCount = propMinDocCount.Value
+,
+			Missing = propMissing.Value
+,
+			MissingBucket = propMissingBucket.Value
+,
+			MissingOrder = propMissingOrder.Value
+,
+			Order = propOrder.Value
+,
+			Script = propScript.Value
+,
+			ShardMinDocCount = propShardMinDocCount.Value
+,
+			ShardSize = propShardSize.Value
+,
+			ShowTermDocCountError = propShowTermDocCountError.Value
+,
+			Size = propSize.Value
+,
+			ValueType = propValueType.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, TermsAggregation value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCollectMode, value.CollectMode);
+		writer.WriteProperty(options, PropExclude, value.Exclude);
+		writer.WriteProperty(options, PropExecutionHint, value.ExecutionHint);
+		writer.WriteProperty(options, PropField, value.Field);
+		writer.WriteProperty(options, PropFormat, value.Format);
+		writer.WriteProperty(options, PropInclude, value.Include);
+		writer.WriteProperty(options, PropMinDocCount, value.MinDocCount);
+		writer.WriteProperty(options, PropMissing, value.Missing);
+		writer.WriteProperty(options, PropMissingBucket, value.MissingBucket);
+		writer.WriteProperty(options, PropMissingOrder, value.MissingOrder);
+		writer.WriteProperty(options, PropOrder, value.Order, typeof(SingleOrManyMarker<IReadOnlyCollection<KeyValuePair<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.SortOrder>>?, KeyValuePair<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.SortOrder>>));
+		writer.WriteProperty(options, PropScript, value.Script);
+		writer.WriteProperty(options, PropShardMinDocCount, value.ShardMinDocCount);
+		writer.WriteProperty(options, PropShardSize, value.ShardSize);
+		writer.WriteProperty(options, PropShowTermDocCountError, value.ShowTermDocCountError);
+		writer.WriteProperty(options, PropSize, value.Size);
+		writer.WriteProperty(options, PropValueType, value.ValueType);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(TermsAggregationConverter))]
 public sealed partial class TermsAggregation
 {
 	/// <summary>
@@ -34,7 +229,6 @@ public sealed partial class TermsAggregation
 	/// Determines how child aggregations should be calculated: breadth-first or depth-first.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("collect_mode")]
 	public Elastic.Clients.Elasticsearch.Aggregations.TermsAggregationCollectMode? CollectMode { get; set; }
 
 	/// <summary>
@@ -43,7 +237,6 @@ public sealed partial class TermsAggregation
 	/// Accepts regular expressions and partitions.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("exclude")]
 	public Elastic.Clients.Elasticsearch.Aggregations.TermsExclude? Exclude { get; set; }
 
 	/// <summary>
@@ -51,7 +244,6 @@ public sealed partial class TermsAggregation
 	/// Determines whether the aggregation will use field values directly or global ordinals.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("execution_hint")]
 	public Elastic.Clients.Elasticsearch.Aggregations.TermsAggregationExecutionHint? ExecutionHint { get; set; }
 
 	/// <summary>
@@ -59,9 +251,7 @@ public sealed partial class TermsAggregation
 	/// The field from which to return terms.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("field")]
 	public Elastic.Clients.Elasticsearch.Field? Field { get; set; }
-	[JsonInclude, JsonPropertyName("format")]
 	public string? Format { get; set; }
 
 	/// <summary>
@@ -70,7 +260,6 @@ public sealed partial class TermsAggregation
 	/// Accepts regular expressions and partitions.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("include")]
 	public Elastic.Clients.Elasticsearch.Aggregations.TermsInclude? Include { get; set; }
 
 	/// <summary>
@@ -78,7 +267,6 @@ public sealed partial class TermsAggregation
 	/// Only return values that are found in more than <c>min_doc_count</c> hits.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("min_doc_count")]
 	public int? MinDocCount { get; set; }
 
 	/// <summary>
@@ -87,11 +275,8 @@ public sealed partial class TermsAggregation
 	/// By default, documents without a value are ignored.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("missing")]
 	public Elastic.Clients.Elasticsearch.FieldValue? Missing { get; set; }
-	[JsonInclude, JsonPropertyName("missing_bucket")]
 	public bool? MissingBucket { get; set; }
-	[JsonInclude, JsonPropertyName("missing_order")]
 	public Elastic.Clients.Elasticsearch.Aggregations.MissingOrder? MissingOrder { get; set; }
 
 	/// <summary>
@@ -100,10 +285,7 @@ public sealed partial class TermsAggregation
 	/// Defaults to sorting by descending document count.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("order")]
-	[SingleOrManyCollectionConverter(typeof(KeyValuePair<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.SortOrder>))]
 	public ICollection<KeyValuePair<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.SortOrder>>? Order { get; set; }
-	[JsonInclude, JsonPropertyName("script")]
 	public Elastic.Clients.Elasticsearch.Script? Script { get; set; }
 
 	/// <summary>
@@ -112,7 +294,6 @@ public sealed partial class TermsAggregation
 	/// Terms will only be considered if their local shard frequency within the set is higher than the <c>shard_min_doc_count</c>.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("shard_min_doc_count")]
 	public long? ShardMinDocCount { get; set; }
 
 	/// <summary>
@@ -121,7 +302,6 @@ public sealed partial class TermsAggregation
 	/// By default, <c>shard_size</c> will be automatically estimated based on the number of shards and the <c>size</c> parameter.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("shard_size")]
 	public int? ShardSize { get; set; }
 
 	/// <summary>
@@ -129,7 +309,6 @@ public sealed partial class TermsAggregation
 	/// Set to <c>true</c> to return the <c>doc_count_error_upper_bound</c>, which is an upper bound to the error on the <c>doc_count</c> returned by each shard.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("show_term_doc_count_error")]
 	public bool? ShowTermDocCountError { get; set; }
 
 	/// <summary>
@@ -137,7 +316,6 @@ public sealed partial class TermsAggregation
 	/// The number of buckets returned out of the overall terms list.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("size")]
 	public int? Size { get; set; }
 
 	/// <summary>
@@ -145,7 +323,6 @@ public sealed partial class TermsAggregation
 	/// Coerced unmapped fields into the specified type.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("value_type")]
 	public string? ValueType { get; set; }
 
 	public static implicit operator Elastic.Clients.Elasticsearch.Aggregations.Aggregation(TermsAggregation termsAggregation) => Elastic.Clients.Elasticsearch.Aggregations.Aggregation.Terms(termsAggregation);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TimeSeriesAggregate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TimeSeriesAggregate.g.cs
index bd927b7576c..cffb8e524c4 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TimeSeriesAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TimeSeriesAggregate.g.cs
@@ -33,4 +33,6 @@ public sealed partial class TimeSeriesAggregate : IAggregate
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Aggregations.TimeSeriesBucket> Buckets { get; init; }
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
+
+	string IAggregate.Type => "time_series";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TimeSeriesBucket.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TimeSeriesBucket.g.cs
index 3b391a5494c..75f8a2fab82 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TimeSeriesBucket.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TimeSeriesBucket.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,49 +28,60 @@
 
 namespace Elastic.Clients.Elasticsearch.Aggregations;
 
-internal sealed partial class TimeSeriesBucketConverter : JsonConverter<TimeSeriesBucket>
+internal sealed partial class TimeSeriesBucketConverter : System.Text.Json.Serialization.JsonConverter<TimeSeriesBucket>
 {
-	public override TimeSeriesBucket Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropDocCount = System.Text.Json.JsonEncodedText.Encode("doc_count");
+	private static readonly System.Text.Json.JsonEncodedText PropKey = System.Text.Json.JsonEncodedText.Encode("key");
+
+	public override TimeSeriesBucket Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		long docCount = default;
-		IReadOnlyDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.FieldValue> key = default;
-		Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate> propAggregations = default;
+		LocalJsonProperty<long> propDocCount = default;
+		LocalJsonProperty<IReadOnlyDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.FieldValue>> propKey = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propDocCount.TryRead(ref reader, options, PropDocCount))
 			{
-				var property = reader.GetString();
-				if (property == "doc_count")
-				{
-					docCount = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "key")
-				{
-					key = JsonSerializer.Deserialize<IReadOnlyDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.FieldValue>>(ref reader, options);
-					continue;
-				}
-
-				if (property.Contains("#"))
-				{
-					additionalProperties ??= new Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate>();
-					AggregateDictionaryConverter.ReadItem(ref reader, options, additionalProperties, property);
-					continue;
-				}
+				continue;
+			}
 
-				throw new JsonException("Unknown property read from JSON.");
+			if (propKey.TryRead(ref reader, options, PropKey))
+			{
+				continue;
 			}
+
+			propAggregations ??= new System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate>();
+			Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionaryConverter.ReadItem(ref reader, options, out string key, out Elastic.Clients.Elasticsearch.Aggregations.IAggregate value);
+			propAggregations[key] = value;
 		}
 
-		return new TimeSeriesBucket { Aggregations = new Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary(additionalProperties), DocCount = docCount, Key = key };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new TimeSeriesBucket
+		{
+			Aggregations = new Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary(propAggregations)
+,
+			DocCount = propDocCount.Value
+,
+			Key = propKey.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, TimeSeriesBucket value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, TimeSeriesBucket value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'TimeSeriesBucket' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDocCount, value.DocCount);
+		writer.WriteProperty(options, PropKey, value.Key);
+		if (value.Aggregations is not null)
+		{
+			foreach (var item in value.Aggregations)
+			{
+				Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionaryConverter.WriteItem(writer, options, item.Key, item.Value);
+			}
+		}
+
+		writer.WriteEndObject();
 	}
 }
 
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 5a7011780ff..b2fc7bde46f 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TopHitsAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TopHitsAggregate.g.cs
@@ -33,4 +33,6 @@ public sealed partial class TopHitsAggregate : IAggregate
 	public Elastic.Clients.Elasticsearch.Core.Search.HitsMetadata<object> Hits { get; init; }
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
+
+	string IAggregate.Type => "top_hits";
 }
\ 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 60bdfb33f43..757caea740f 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TopHitsAggregation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TopHitsAggregation.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,190 @@
 
 namespace Elastic.Clients.Elasticsearch.Aggregations;
 
+internal sealed partial class TopHitsAggregationConverter : System.Text.Json.Serialization.JsonConverter<TopHitsAggregation>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropDocvalueFields = System.Text.Json.JsonEncodedText.Encode("docvalue_fields");
+	private static readonly System.Text.Json.JsonEncodedText PropExplain = System.Text.Json.JsonEncodedText.Encode("explain");
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropFrom = System.Text.Json.JsonEncodedText.Encode("from");
+	private static readonly System.Text.Json.JsonEncodedText PropHighlight = System.Text.Json.JsonEncodedText.Encode("highlight");
+	private static readonly System.Text.Json.JsonEncodedText PropMissing = System.Text.Json.JsonEncodedText.Encode("missing");
+	private static readonly System.Text.Json.JsonEncodedText PropScript = System.Text.Json.JsonEncodedText.Encode("script");
+	private static readonly System.Text.Json.JsonEncodedText PropScriptFields = System.Text.Json.JsonEncodedText.Encode("script_fields");
+	private static readonly System.Text.Json.JsonEncodedText PropSeqNoPrimaryTerm = System.Text.Json.JsonEncodedText.Encode("seq_no_primary_term");
+	private static readonly System.Text.Json.JsonEncodedText PropSize = System.Text.Json.JsonEncodedText.Encode("size");
+	private static readonly System.Text.Json.JsonEncodedText PropSort = System.Text.Json.JsonEncodedText.Encode("sort");
+	private static readonly System.Text.Json.JsonEncodedText PropSource = System.Text.Json.JsonEncodedText.Encode("_source");
+	private static readonly System.Text.Json.JsonEncodedText PropStoredFields = System.Text.Json.JsonEncodedText.Encode("stored_fields");
+	private static readonly System.Text.Json.JsonEncodedText PropTrackScores = System.Text.Json.JsonEncodedText.Encode("track_scores");
+	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("version");
+
+	public override TopHitsAggregation Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.QueryDsl.FieldAndFormat>?> propDocvalueFields = default;
+		LocalJsonProperty<bool?> propExplain = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Field?> propField = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.QueryDsl.FieldAndFormat>?> propFields = default;
+		LocalJsonProperty<int?> propFrom = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Core.Search.Highlight?> propHighlight = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.FieldValue?> propMissing = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Script?> propScript = default;
+		LocalJsonProperty<IDictionary<string, Elastic.Clients.Elasticsearch.ScriptField>?> propScriptFields = default;
+		LocalJsonProperty<bool?> propSeqNoPrimaryTerm = default;
+		LocalJsonProperty<int?> propSize = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.SortOptions>?> propSort = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Core.Search.SourceConfig?> propSource = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Fields?> propStoredFields = default;
+		LocalJsonProperty<bool?> propTrackScores = default;
+		LocalJsonProperty<bool?> propVersion = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propDocvalueFields.TryRead(ref reader, options, PropDocvalueFields))
+			{
+				continue;
+			}
+
+			if (propExplain.TryRead(ref reader, options, PropExplain))
+			{
+				continue;
+			}
+
+			if (propField.TryRead(ref reader, options, PropField))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propFrom.TryRead(ref reader, options, PropFrom))
+			{
+				continue;
+			}
+
+			if (propHighlight.TryRead(ref reader, options, PropHighlight))
+			{
+				continue;
+			}
+
+			if (propMissing.TryRead(ref reader, options, PropMissing))
+			{
+				continue;
+			}
+
+			if (propScript.TryRead(ref reader, options, PropScript))
+			{
+				continue;
+			}
+
+			if (propScriptFields.TryRead(ref reader, options, PropScriptFields))
+			{
+				continue;
+			}
+
+			if (propSeqNoPrimaryTerm.TryRead(ref reader, options, PropSeqNoPrimaryTerm))
+			{
+				continue;
+			}
+
+			if (propSize.TryRead(ref reader, options, PropSize))
+			{
+				continue;
+			}
+
+			if (propSort.TryRead(ref reader, options, PropSort, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.SortOptions>?, Elastic.Clients.Elasticsearch.SortOptions>)))
+			{
+				continue;
+			}
+
+			if (propSource.TryRead(ref reader, options, PropSource))
+			{
+				continue;
+			}
+
+			if (propStoredFields.TryRead(ref reader, options, PropStoredFields, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propTrackScores.TryRead(ref reader, options, PropTrackScores))
+			{
+				continue;
+			}
+
+			if (propVersion.TryRead(ref reader, options, PropVersion))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new TopHitsAggregation
+		{
+			DocvalueFields = propDocvalueFields.Value
+,
+			Explain = propExplain.Value
+,
+			Field = propField.Value
+,
+			Fields = propFields.Value
+,
+			From = propFrom.Value
+,
+			Highlight = propHighlight.Value
+,
+			Missing = propMissing.Value
+,
+			Script = propScript.Value
+,
+			ScriptFields = propScriptFields.Value
+,
+			SeqNoPrimaryTerm = propSeqNoPrimaryTerm.Value
+,
+			Size = propSize.Value
+,
+			Sort = propSort.Value
+,
+			Source = propSource.Value
+,
+			StoredFields = propStoredFields.Value
+,
+			TrackScores = propTrackScores.Value
+,
+			Version = propVersion.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, TopHitsAggregation value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDocvalueFields, value.DocvalueFields);
+		writer.WriteProperty(options, PropExplain, value.Explain);
+		writer.WriteProperty(options, PropField, value.Field);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropFrom, value.From);
+		writer.WriteProperty(options, PropHighlight, value.Highlight);
+		writer.WriteProperty(options, PropMissing, value.Missing);
+		writer.WriteProperty(options, PropScript, value.Script);
+		writer.WriteProperty(options, PropScriptFields, value.ScriptFields);
+		writer.WriteProperty(options, PropSeqNoPrimaryTerm, value.SeqNoPrimaryTerm);
+		writer.WriteProperty(options, PropSize, value.Size);
+		writer.WriteProperty(options, PropSort, value.Sort, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.SortOptions>?, Elastic.Clients.Elasticsearch.SortOptions>));
+		writer.WriteProperty(options, PropSource, value.Source);
+		writer.WriteProperty(options, PropStoredFields, value.StoredFields, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropTrackScores, value.TrackScores);
+		writer.WriteProperty(options, PropVersion, value.Version);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(TopHitsAggregationConverter))]
 public sealed partial class TopHitsAggregation
 {
 	/// <summary>
@@ -34,7 +219,6 @@ public sealed partial class TopHitsAggregation
 	/// Fields for which to return doc values.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("docvalue_fields")]
 	public ICollection<Elastic.Clients.Elasticsearch.QueryDsl.FieldAndFormat>? DocvalueFields { get; set; }
 
 	/// <summary>
@@ -42,7 +226,6 @@ public sealed partial class TopHitsAggregation
 	/// If <c>true</c>, returns detailed information about score computation as part of a hit.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("explain")]
 	public bool? Explain { get; set; }
 
 	/// <summary>
@@ -50,7 +233,6 @@ public sealed partial class TopHitsAggregation
 	/// The field on which to run the aggregation.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("field")]
 	public Elastic.Clients.Elasticsearch.Field? Field { get; set; }
 
 	/// <summary>
@@ -59,7 +241,6 @@ public sealed partial class TopHitsAggregation
 	/// 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>
@@ -67,7 +248,6 @@ public sealed partial class TopHitsAggregation
 	/// Starting document offset.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("from")]
 	public int? From { get; set; }
 
 	/// <summary>
@@ -75,7 +255,6 @@ public sealed partial class TopHitsAggregation
 	/// Specifies the highlighter to use for retrieving highlighted snippets from one or more fields in the search results.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("highlight")]
 	public Elastic.Clients.Elasticsearch.Core.Search.Highlight? Highlight { get; set; }
 
 	/// <summary>
@@ -84,9 +263,7 @@ public sealed partial class TopHitsAggregation
 	/// By default, documents without a value are ignored.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("missing")]
 	public Elastic.Clients.Elasticsearch.FieldValue? Missing { get; set; }
-	[JsonInclude, JsonPropertyName("script")]
 	public Elastic.Clients.Elasticsearch.Script? Script { get; set; }
 
 	/// <summary>
@@ -94,7 +271,6 @@ public sealed partial class TopHitsAggregation
 	/// Returns the result of one or more script evaluations for each hit.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("script_fields")]
 	public IDictionary<string, Elastic.Clients.Elasticsearch.ScriptField>? ScriptFields { get; set; }
 
 	/// <summary>
@@ -102,7 +278,6 @@ public sealed partial class TopHitsAggregation
 	/// If <c>true</c>, returns sequence number and primary term of the last modification of each hit.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("seq_no_primary_term")]
 	public bool? SeqNoPrimaryTerm { get; set; }
 
 	/// <summary>
@@ -110,7 +285,6 @@ public sealed partial class TopHitsAggregation
 	/// The maximum number of top matching hits to return per bucket.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("size")]
 	public int? Size { get; set; }
 
 	/// <summary>
@@ -119,8 +293,6 @@ public sealed partial class TopHitsAggregation
 	/// By default, the hits are sorted by the score of the main query.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("sort")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.SortOptions))]
 	public ICollection<Elastic.Clients.Elasticsearch.SortOptions>? Sort { get; set; }
 
 	/// <summary>
@@ -128,7 +300,6 @@ public sealed partial class TopHitsAggregation
 	/// Selects the fields of the source that are returned.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("_source")]
 	public Elastic.Clients.Elasticsearch.Core.Search.SourceConfig? Source { get; set; }
 
 	/// <summary>
@@ -136,8 +307,6 @@ public sealed partial class TopHitsAggregation
 	/// Returns values for the specified stored fields (fields that use the <c>store</c> mapping option).
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("stored_fields")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Fields? StoredFields { get; set; }
 
 	/// <summary>
@@ -145,7 +314,6 @@ public sealed partial class TopHitsAggregation
 	/// If <c>true</c>, calculates and returns document scores, even if the scores are not used for sorting.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("track_scores")]
 	public bool? TrackScores { get; set; }
 
 	/// <summary>
@@ -153,7 +321,6 @@ public sealed partial class TopHitsAggregation
 	/// If <c>true</c>, returns document version as part of a hit.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("version")]
 	public bool? Version { get; set; }
 
 	public static implicit operator Elastic.Clients.Elasticsearch.Aggregations.Aggregation(TopHitsAggregation topHitsAggregation) => Elastic.Clients.Elasticsearch.Aggregations.Aggregation.TopHits(topHitsAggregation);
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 3675a8b9148..82797613d28 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TopMetricsAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TopMetricsAggregate.g.cs
@@ -33,4 +33,6 @@ public sealed partial class TopMetricsAggregate : IAggregate
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
 	[JsonInclude, JsonPropertyName("top")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Aggregations.TopMetrics> Top { get; init; }
+
+	string IAggregate.Type => "top_metrics";
 }
\ 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 d063b3c1be9..663dcb13482 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TopMetricsAggregation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TopMetricsAggregation.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,90 @@
 
 namespace Elastic.Clients.Elasticsearch.Aggregations;
 
+internal sealed partial class TopMetricsAggregationConverter : System.Text.Json.Serialization.JsonConverter<TopMetricsAggregation>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropMetrics = System.Text.Json.JsonEncodedText.Encode("metrics");
+	private static readonly System.Text.Json.JsonEncodedText PropMissing = System.Text.Json.JsonEncodedText.Encode("missing");
+	private static readonly System.Text.Json.JsonEncodedText PropScript = System.Text.Json.JsonEncodedText.Encode("script");
+	private static readonly System.Text.Json.JsonEncodedText PropSize = System.Text.Json.JsonEncodedText.Encode("size");
+	private static readonly System.Text.Json.JsonEncodedText PropSort = System.Text.Json.JsonEncodedText.Encode("sort");
+
+	public override TopMetricsAggregation Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Field?> propField = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Aggregations.TopMetricsValue>?> propMetrics = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.FieldValue?> propMissing = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Script?> propScript = default;
+		LocalJsonProperty<int?> propSize = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.SortOptions>?> propSort = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propField.TryRead(ref reader, options, PropField))
+			{
+				continue;
+			}
+
+			if (propMetrics.TryRead(ref reader, options, PropMetrics, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Aggregations.TopMetricsValue>?, Elastic.Clients.Elasticsearch.Aggregations.TopMetricsValue>)))
+			{
+				continue;
+			}
+
+			if (propMissing.TryRead(ref reader, options, PropMissing))
+			{
+				continue;
+			}
+
+			if (propScript.TryRead(ref reader, options, PropScript))
+			{
+				continue;
+			}
+
+			if (propSize.TryRead(ref reader, options, PropSize))
+			{
+				continue;
+			}
+
+			if (propSort.TryRead(ref reader, options, PropSort, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.SortOptions>?, Elastic.Clients.Elasticsearch.SortOptions>)))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new TopMetricsAggregation
+		{
+			Field = propField.Value
+,
+			Metrics = propMetrics.Value
+,
+			Missing = propMissing.Value
+,
+			Script = propScript.Value
+,
+			Size = propSize.Value
+,
+			Sort = propSort.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, TopMetricsAggregation value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropField, value.Field);
+		writer.WriteProperty(options, PropMetrics, value.Metrics, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Aggregations.TopMetricsValue>?, Elastic.Clients.Elasticsearch.Aggregations.TopMetricsValue>));
+		writer.WriteProperty(options, PropMissing, value.Missing);
+		writer.WriteProperty(options, PropScript, value.Script);
+		writer.WriteProperty(options, PropSize, value.Size);
+		writer.WriteProperty(options, PropSort, value.Sort, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.SortOptions>?, Elastic.Clients.Elasticsearch.SortOptions>));
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(TopMetricsAggregationConverter))]
 public sealed partial class TopMetricsAggregation
 {
 	/// <summary>
@@ -34,7 +119,6 @@ public sealed partial class TopMetricsAggregation
 	/// The field on which to run the aggregation.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("field")]
 	public Elastic.Clients.Elasticsearch.Field? Field { get; set; }
 
 	/// <summary>
@@ -42,8 +126,6 @@ public sealed partial class TopMetricsAggregation
 	/// The fields of the top document to return.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("metrics")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.Aggregations.TopMetricsValue))]
 	public ICollection<Elastic.Clients.Elasticsearch.Aggregations.TopMetricsValue>? Metrics { get; set; }
 
 	/// <summary>
@@ -52,9 +134,7 @@ public sealed partial class TopMetricsAggregation
 	/// By default, documents without a value are ignored.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("missing")]
 	public Elastic.Clients.Elasticsearch.FieldValue? Missing { get; set; }
-	[JsonInclude, JsonPropertyName("script")]
 	public Elastic.Clients.Elasticsearch.Script? Script { get; set; }
 
 	/// <summary>
@@ -62,7 +142,6 @@ public sealed partial class TopMetricsAggregation
 	/// The number of top documents from which to return metrics.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("size")]
 	public int? Size { get; set; }
 
 	/// <summary>
@@ -70,8 +149,6 @@ public sealed partial class TopMetricsAggregation
 	/// The sort order of the documents.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("sort")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.SortOptions))]
 	public ICollection<Elastic.Clients.Elasticsearch.SortOptions>? Sort { get; set; }
 
 	public static implicit operator Elastic.Clients.Elasticsearch.Aggregations.Aggregation(TopMetricsAggregation topMetricsAggregation) => Elastic.Clients.Elasticsearch.Aggregations.Aggregation.TopMetrics(topMetricsAggregation);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/UnmappedRareTermsAggregate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/UnmappedRareTermsAggregate.g.cs
index 65f49279fe6..da3578e0e08 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/UnmappedRareTermsAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/UnmappedRareTermsAggregate.g.cs
@@ -38,4 +38,6 @@ public sealed partial class UnmappedRareTermsAggregate : IAggregate
 	public IReadOnlyCollection<object> Buckets { get; init; }
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
+
+	string IAggregate.Type => "umrareterms";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/UnmappedSamplerAggregate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/UnmappedSamplerAggregate.g.cs
index 49e77c3a953..e55af05ccf1 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/UnmappedSamplerAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/UnmappedSamplerAggregate.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,49 +28,60 @@
 
 namespace Elastic.Clients.Elasticsearch.Aggregations;
 
-internal sealed partial class UnmappedSamplerAggregateConverter : JsonConverter<UnmappedSamplerAggregate>
+internal sealed partial class UnmappedSamplerAggregateConverter : System.Text.Json.Serialization.JsonConverter<UnmappedSamplerAggregate>
 {
-	public override UnmappedSamplerAggregate Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropDocCount = System.Text.Json.JsonEncodedText.Encode("doc_count");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+
+	public override UnmappedSamplerAggregate Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		long docCount = default;
-		IReadOnlyDictionary<string, object>? meta = default;
-		Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate> propAggregations = default;
+		LocalJsonProperty<long> propDocCount = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, object>?> propMeta = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propDocCount.TryRead(ref reader, options, PropDocCount))
 			{
-				var property = reader.GetString();
-				if (property == "doc_count")
-				{
-					docCount = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "meta")
-				{
-					meta = JsonSerializer.Deserialize<IReadOnlyDictionary<string, object>?>(ref reader, options);
-					continue;
-				}
-
-				if (property.Contains("#"))
-				{
-					additionalProperties ??= new Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate>();
-					AggregateDictionaryConverter.ReadItem(ref reader, options, additionalProperties, property);
-					continue;
-				}
+				continue;
+			}
 
-				throw new JsonException("Unknown property read from JSON.");
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
 			}
+
+			propAggregations ??= new System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate>();
+			Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionaryConverter.ReadItem(ref reader, options, out string key, out Elastic.Clients.Elasticsearch.Aggregations.IAggregate value);
+			propAggregations[key] = value;
 		}
 
-		return new UnmappedSamplerAggregate { Aggregations = new Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary(additionalProperties), DocCount = docCount, Meta = meta };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new UnmappedSamplerAggregate
+		{
+			Aggregations = new Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary(propAggregations)
+,
+			DocCount = propDocCount.Value
+,
+			Meta = propMeta.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, UnmappedSamplerAggregate value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, UnmappedSamplerAggregate value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'UnmappedSamplerAggregate' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDocCount, value.DocCount);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		if (value.Aggregations is not null)
+		{
+			foreach (var item in value.Aggregations)
+			{
+				Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionaryConverter.WriteItem(writer, options, item.Key, item.Value);
+			}
+		}
+
+		writer.WriteEndObject();
 	}
 }
 
@@ -84,4 +96,6 @@ public sealed partial class UnmappedSamplerAggregate : IAggregate
 	public Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary Aggregations { get; init; }
 	public long DocCount { get; init; }
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
+
+	string IAggregate.Type => "unmapped_sampler";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/UnmappedSignificantTermsAggregate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/UnmappedSignificantTermsAggregate.g.cs
index 61265ed8a92..a5d5bc23fd8 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/UnmappedSignificantTermsAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/UnmappedSignificantTermsAggregate.g.cs
@@ -42,4 +42,6 @@ public sealed partial class UnmappedSignificantTermsAggregate : IAggregate
 	public long? DocCount { get; init; }
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
+
+	string IAggregate.Type => "umsigterms";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/UnmappedTermsAggregate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/UnmappedTermsAggregate.g.cs
index 58914563b27..2bbd309b511 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/UnmappedTermsAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/UnmappedTermsAggregate.g.cs
@@ -42,4 +42,6 @@ public sealed partial class UnmappedTermsAggregate : IAggregate
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
 	[JsonInclude, JsonPropertyName("sum_other_doc_count")]
 	public long? SumOtherDocCount { get; init; }
+
+	string IAggregate.Type => "umterms";
 }
\ No newline at end of file
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 697e951c703..5ee4872a5c1 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ValueCountAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ValueCountAggregate.g.cs
@@ -47,4 +47,6 @@ public sealed partial class ValueCountAggregate : IAggregate
 	public double? Value { get; init; }
 	[JsonInclude, JsonPropertyName("value_as_string")]
 	public string? ValueAsString { get; init; }
+
+	string IAggregate.Type => "value_count";
 }
\ No newline at end of file
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 5501a87a5b2..52845a6dd69 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/VariableWidthHistogramAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/VariableWidthHistogramAggregate.g.cs
@@ -33,4 +33,6 @@ public sealed partial class VariableWidthHistogramAggregate : IAggregate
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Aggregations.VariableWidthHistogramBucket> Buckets { get; init; }
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
+
+	string IAggregate.Type => "variable_width_histogram";
 }
\ No newline at end of file
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 4d1f82516da..f9c413b4616 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/VariableWidthHistogramBucket.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/VariableWidthHistogramBucket.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,84 +28,110 @@
 
 namespace Elastic.Clients.Elasticsearch.Aggregations;
 
-internal sealed partial class VariableWidthHistogramBucketConverter : JsonConverter<VariableWidthHistogramBucket>
+internal sealed partial class VariableWidthHistogramBucketConverter : System.Text.Json.Serialization.JsonConverter<VariableWidthHistogramBucket>
 {
-	public override VariableWidthHistogramBucket Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropDocCount = System.Text.Json.JsonEncodedText.Encode("doc_count");
+	private static readonly System.Text.Json.JsonEncodedText PropKey = System.Text.Json.JsonEncodedText.Encode("key");
+	private static readonly System.Text.Json.JsonEncodedText PropKeyAsString = System.Text.Json.JsonEncodedText.Encode("key_as_string");
+	private static readonly System.Text.Json.JsonEncodedText PropMax = System.Text.Json.JsonEncodedText.Encode("max");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxAsString = System.Text.Json.JsonEncodedText.Encode("max_as_string");
+	private static readonly System.Text.Json.JsonEncodedText PropMin = System.Text.Json.JsonEncodedText.Encode("min");
+	private static readonly System.Text.Json.JsonEncodedText PropMinAsString = System.Text.Json.JsonEncodedText.Encode("min_as_string");
+
+	public override VariableWidthHistogramBucket Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		long docCount = default;
-		double key = default;
-		string? keyAsString = default;
-		double max = default;
-		string? maxAsString = default;
-		double min = default;
-		string? minAsString = default;
-		Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate> propAggregations = default;
+		LocalJsonProperty<long> propDocCount = default;
+		LocalJsonProperty<double> propKey = default;
+		LocalJsonProperty<string?> propKeyAsString = default;
+		LocalJsonProperty<double> propMax = default;
+		LocalJsonProperty<string?> propMaxAsString = default;
+		LocalJsonProperty<double> propMin = default;
+		LocalJsonProperty<string?> propMinAsString = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propDocCount.TryRead(ref reader, options, PropDocCount))
+			{
+				continue;
+			}
+
+			if (propKey.TryRead(ref reader, options, PropKey))
+			{
+				continue;
+			}
+
+			if (propKeyAsString.TryRead(ref reader, options, PropKeyAsString))
+			{
+				continue;
+			}
+
+			if (propMax.TryRead(ref reader, options, PropMax))
+			{
+				continue;
+			}
+
+			if (propMaxAsString.TryRead(ref reader, options, PropMaxAsString))
 			{
-				var property = reader.GetString();
-				if (property == "doc_count")
-				{
-					docCount = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "key")
-				{
-					key = JsonSerializer.Deserialize<double>(ref reader, options);
-					continue;
-				}
-
-				if (property == "key_as_string")
-				{
-					keyAsString = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "max")
-				{
-					max = JsonSerializer.Deserialize<double>(ref reader, options);
-					continue;
-				}
-
-				if (property == "max_as_string")
-				{
-					maxAsString = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "min")
-				{
-					min = JsonSerializer.Deserialize<double>(ref reader, options);
-					continue;
-				}
-
-				if (property == "min_as_string")
-				{
-					minAsString = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property.Contains("#"))
-				{
-					additionalProperties ??= new Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate>();
-					AggregateDictionaryConverter.ReadItem(ref reader, options, additionalProperties, property);
-					continue;
-				}
-
-				throw new JsonException("Unknown property read from JSON.");
+				continue;
 			}
+
+			if (propMin.TryRead(ref reader, options, PropMin))
+			{
+				continue;
+			}
+
+			if (propMinAsString.TryRead(ref reader, options, PropMinAsString))
+			{
+				continue;
+			}
+
+			propAggregations ??= new System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Aggregations.IAggregate>();
+			Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionaryConverter.ReadItem(ref reader, options, out string key, out Elastic.Clients.Elasticsearch.Aggregations.IAggregate value);
+			propAggregations[key] = value;
 		}
 
-		return new VariableWidthHistogramBucket { Aggregations = new Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary(additionalProperties), DocCount = docCount, Key = key, KeyAsString = keyAsString, Max = max, MaxAsString = maxAsString, Min = min, MinAsString = minAsString };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new VariableWidthHistogramBucket
+		{
+			Aggregations = new Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary(propAggregations)
+,
+			DocCount = propDocCount.Value
+,
+			Key = propKey.Value
+,
+			KeyAsString = propKeyAsString.Value
+,
+			Max = propMax.Value
+,
+			MaxAsString = propMaxAsString.Value
+,
+			Min = propMin.Value
+,
+			MinAsString = propMinAsString.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, VariableWidthHistogramBucket value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, VariableWidthHistogramBucket value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'VariableWidthHistogramBucket' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDocCount, value.DocCount);
+		writer.WriteProperty(options, PropKey, value.Key);
+		writer.WriteProperty(options, PropKeyAsString, value.KeyAsString);
+		writer.WriteProperty(options, PropMax, value.Max);
+		writer.WriteProperty(options, PropMaxAsString, value.MaxAsString);
+		writer.WriteProperty(options, PropMin, value.Min);
+		writer.WriteProperty(options, PropMinAsString, value.MinAsString);
+		if (value.Aggregations is not null)
+		{
+			foreach (var item in value.Aggregations)
+			{
+				Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionaryConverter.WriteItem(writer, options, item.Key, item.Value);
+			}
+		}
+
+		writer.WriteEndObject();
 	}
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/WeightedAverageAggregate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/WeightedAverageAggregate.g.cs
index 673773b6806..e3cad85c268 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/WeightedAverageAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/WeightedAverageAggregate.g.cs
@@ -47,4 +47,6 @@ public sealed partial class WeightedAverageAggregate : IAggregate
 	public double? Value { get; init; }
 	[JsonInclude, JsonPropertyName("value_as_string")]
 	public string? ValueAsString { get; init; }
+
+	string IAggregate.Type => "weighted_avg";
 }
\ 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 aaec84a9912..757825c4e02 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/Analyzers.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/Analyzers.g.cs
@@ -19,6 +19,7 @@
 
 using Elastic.Clients.Elasticsearch.Core;
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport;
 using System;
@@ -218,289 +219,238 @@ public AnalyzersDescriptor() : base(new Analyzers())
 	public AnalyzersDescriptor Whitespace(string analyzerName, WhitespaceAnalyzer whitespaceAnalyzer) => AssignVariant(analyzerName, whitespaceAnalyzer);
 }
 
-internal sealed partial class AnalyzerInterfaceConverter : JsonConverter<IAnalyzer>
+internal sealed partial class AnalyzerInterfaceConverter : System.Text.Json.Serialization.JsonConverter<IAnalyzer>
 {
-	public override IAnalyzer Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropDiscriminator = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override IAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var copiedReader = reader;
-		string? type = null;
-		using var jsonDoc = JsonDocument.ParseValue(ref copiedReader);
-		if (jsonDoc is not null && jsonDoc.RootElement.TryGetProperty("type", out var readType) && readType.ValueKind == JsonValueKind.String)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		var readerSnapshot = reader;
+		string? discriminator = "custom";
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			type = readType.ToString();
+			if (reader.TryReadProperty(options, PropDiscriminator, ref discriminator))
+			{
+				break;
+			}
+
+			reader.Skip();
 		}
 
-		switch (type)
+		reader = readerSnapshot;
+		return discriminator switch
 		{
-			case "arabic":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.ArabicAnalyzer>(ref reader, options);
-			case "armenian":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.ArmenianAnalyzer>(ref reader, options);
-			case "basque":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.BasqueAnalyzer>(ref reader, options);
-			case "bengali":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.BengaliAnalyzer>(ref reader, options);
-			case "brazilian":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.BrazilianAnalyzer>(ref reader, options);
-			case "bulgarian":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.BulgarianAnalyzer>(ref reader, options);
-			case "catalan":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.CatalanAnalyzer>(ref reader, options);
-			case "chinese":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.ChineseAnalyzer>(ref reader, options);
-			case "cjk":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.CjkAnalyzer>(ref reader, options);
-			case "custom":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.CustomAnalyzer>(ref reader, options);
-			case "czech":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.CzechAnalyzer>(ref reader, options);
-			case "danish":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.DanishAnalyzer>(ref reader, options);
-			case "dutch":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.DutchAnalyzer>(ref reader, options);
-			case "english":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.EnglishAnalyzer>(ref reader, options);
-			case "estonian":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.EstonianAnalyzer>(ref reader, options);
-			case "fingerprint":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.FingerprintAnalyzer>(ref reader, options);
-			case "finnish":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.FinnishAnalyzer>(ref reader, options);
-			case "french":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.FrenchAnalyzer>(ref reader, options);
-			case "galician":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.GalicianAnalyzer>(ref reader, options);
-			case "german":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.GermanAnalyzer>(ref reader, options);
-			case "greek":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.GreekAnalyzer>(ref reader, options);
-			case "hindi":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.HindiAnalyzer>(ref reader, options);
-			case "hungarian":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.HungarianAnalyzer>(ref reader, options);
-			case "icu_analyzer":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.IcuAnalyzer>(ref reader, options);
-			case "indonesian":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.IndonesianAnalyzer>(ref reader, options);
-			case "irish":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.IrishAnalyzer>(ref reader, options);
-			case "italian":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.ItalianAnalyzer>(ref reader, options);
-			case "keyword":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.KeywordAnalyzer>(ref reader, options);
-			case "kuromoji":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.KuromojiAnalyzer>(ref reader, options);
-			case "language":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.LanguageAnalyzer>(ref reader, options);
-			case "latvian":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.LatvianAnalyzer>(ref reader, options);
-			case "lithuanian":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.LithuanianAnalyzer>(ref reader, options);
-			case "nori":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.NoriAnalyzer>(ref reader, options);
-			case "norwegian":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.NorwegianAnalyzer>(ref reader, options);
-			case "pattern":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.PatternAnalyzer>(ref reader, options);
-			case "persian":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.PersianAnalyzer>(ref reader, options);
-			case "portuguese":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.PortugueseAnalyzer>(ref reader, options);
-			case "romanian":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.RomanianAnalyzer>(ref reader, options);
-			case "russian":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.RussianAnalyzer>(ref reader, options);
-			case "serbian":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.SerbianAnalyzer>(ref reader, options);
-			case "simple":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.SimpleAnalyzer>(ref reader, options);
-			case "snowball":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.SnowballAnalyzer>(ref reader, options);
-			case "sorani":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.SoraniAnalyzer>(ref reader, options);
-			case "spanish":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.SpanishAnalyzer>(ref reader, options);
-			case "standard":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.StandardAnalyzer>(ref reader, options);
-			case "stop":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.StopAnalyzer>(ref reader, options);
-			case "swedish":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.SwedishAnalyzer>(ref reader, options);
-			case "thai":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.ThaiAnalyzer>(ref reader, options);
-			case "turkish":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.TurkishAnalyzer>(ref reader, options);
-			case "whitespace":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.WhitespaceAnalyzer>(ref reader, options);
-			default:
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.CustomAnalyzer>(ref reader, options);
-		}
+			"arabic" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.ArabicAnalyzer>(options),
+			"armenian" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.ArmenianAnalyzer>(options),
+			"basque" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.BasqueAnalyzer>(options),
+			"bengali" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.BengaliAnalyzer>(options),
+			"brazilian" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.BrazilianAnalyzer>(options),
+			"bulgarian" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.BulgarianAnalyzer>(options),
+			"catalan" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.CatalanAnalyzer>(options),
+			"chinese" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.ChineseAnalyzer>(options),
+			"cjk" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.CjkAnalyzer>(options),
+			"custom" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.CustomAnalyzer>(options),
+			"czech" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.CzechAnalyzer>(options),
+			"danish" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.DanishAnalyzer>(options),
+			"dutch" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.DutchAnalyzer>(options),
+			"english" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.EnglishAnalyzer>(options),
+			"estonian" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.EstonianAnalyzer>(options),
+			"fingerprint" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.FingerprintAnalyzer>(options),
+			"finnish" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.FinnishAnalyzer>(options),
+			"french" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.FrenchAnalyzer>(options),
+			"galician" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.GalicianAnalyzer>(options),
+			"german" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.GermanAnalyzer>(options),
+			"greek" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.GreekAnalyzer>(options),
+			"hindi" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.HindiAnalyzer>(options),
+			"hungarian" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.HungarianAnalyzer>(options),
+			"icu_analyzer" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.IcuAnalyzer>(options),
+			"indonesian" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.IndonesianAnalyzer>(options),
+			"irish" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.IrishAnalyzer>(options),
+			"italian" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.ItalianAnalyzer>(options),
+			"keyword" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.KeywordAnalyzer>(options),
+			"kuromoji" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.KuromojiAnalyzer>(options),
+			"language" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.LanguageAnalyzer>(options),
+			"latvian" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.LatvianAnalyzer>(options),
+			"lithuanian" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.LithuanianAnalyzer>(options),
+			"nori" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.NoriAnalyzer>(options),
+			"norwegian" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.NorwegianAnalyzer>(options),
+			"pattern" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.PatternAnalyzer>(options),
+			"persian" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.PersianAnalyzer>(options),
+			"portuguese" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.PortugueseAnalyzer>(options),
+			"romanian" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.RomanianAnalyzer>(options),
+			"russian" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.RussianAnalyzer>(options),
+			"serbian" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.SerbianAnalyzer>(options),
+			"simple" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.SimpleAnalyzer>(options),
+			"snowball" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.SnowballAnalyzer>(options),
+			"sorani" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.SoraniAnalyzer>(options),
+			"spanish" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.SpanishAnalyzer>(options),
+			"standard" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.StandardAnalyzer>(options),
+			"stop" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.StopAnalyzer>(options),
+			"swedish" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.SwedishAnalyzer>(options),
+			"thai" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.ThaiAnalyzer>(options),
+			"turkish" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.TurkishAnalyzer>(options),
+			"whitespace" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.WhitespaceAnalyzer>(options),
+			_ => throw new System.Text.Json.JsonException($"Variant '{discriminator}' is not supported for type '{nameof(IAnalyzer)}'.")
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, IAnalyzer value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IAnalyzer value, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (value is null)
-		{
-			writer.WriteNullValue();
-			return;
-		}
-
 		switch (value.Type)
 		{
 			case "arabic":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.ArabicAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.ArabicAnalyzer)value);
+				break;
 			case "armenian":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.ArmenianAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.ArmenianAnalyzer)value);
+				break;
 			case "basque":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.BasqueAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.BasqueAnalyzer)value);
+				break;
 			case "bengali":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.BengaliAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.BengaliAnalyzer)value);
+				break;
 			case "brazilian":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.BrazilianAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.BrazilianAnalyzer)value);
+				break;
 			case "bulgarian":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.BulgarianAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.BulgarianAnalyzer)value);
+				break;
 			case "catalan":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.CatalanAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.CatalanAnalyzer)value);
+				break;
 			case "chinese":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.ChineseAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.ChineseAnalyzer)value);
+				break;
 			case "cjk":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.CjkAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.CjkAnalyzer)value);
+				break;
 			case "custom":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.CustomAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.CustomAnalyzer)value);
+				break;
 			case "czech":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.CzechAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.CzechAnalyzer)value);
+				break;
 			case "danish":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.DanishAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.DanishAnalyzer)value);
+				break;
 			case "dutch":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.DutchAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.DutchAnalyzer)value);
+				break;
 			case "english":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.EnglishAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.EnglishAnalyzer)value);
+				break;
 			case "estonian":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.EstonianAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.EstonianAnalyzer)value);
+				break;
 			case "fingerprint":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.FingerprintAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.FingerprintAnalyzer)value);
+				break;
 			case "finnish":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.FinnishAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.FinnishAnalyzer)value);
+				break;
 			case "french":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.FrenchAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.FrenchAnalyzer)value);
+				break;
 			case "galician":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.GalicianAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.GalicianAnalyzer)value);
+				break;
 			case "german":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.GermanAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.GermanAnalyzer)value);
+				break;
 			case "greek":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.GreekAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.GreekAnalyzer)value);
+				break;
 			case "hindi":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.HindiAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.HindiAnalyzer)value);
+				break;
 			case "hungarian":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.HungarianAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.HungarianAnalyzer)value);
+				break;
 			case "icu_analyzer":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.IcuAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.IcuAnalyzer)value);
+				break;
 			case "indonesian":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.IndonesianAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.IndonesianAnalyzer)value);
+				break;
 			case "irish":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.IrishAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.IrishAnalyzer)value);
+				break;
 			case "italian":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.ItalianAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.ItalianAnalyzer)value);
+				break;
 			case "keyword":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.KeywordAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.KeywordAnalyzer)value);
+				break;
 			case "kuromoji":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.KuromojiAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.KuromojiAnalyzer)value);
+				break;
 			case "language":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.LanguageAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.LanguageAnalyzer)value);
+				break;
 			case "latvian":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.LatvianAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.LatvianAnalyzer)value);
+				break;
 			case "lithuanian":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.LithuanianAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.LithuanianAnalyzer)value);
+				break;
 			case "nori":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.NoriAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.NoriAnalyzer)value);
+				break;
 			case "norwegian":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.NorwegianAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.NorwegianAnalyzer)value);
+				break;
 			case "pattern":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.PatternAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.PatternAnalyzer)value);
+				break;
 			case "persian":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.PersianAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.PersianAnalyzer)value);
+				break;
 			case "portuguese":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.PortugueseAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.PortugueseAnalyzer)value);
+				break;
 			case "romanian":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.RomanianAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.RomanianAnalyzer)value);
+				break;
 			case "russian":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.RussianAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.RussianAnalyzer)value);
+				break;
 			case "serbian":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.SerbianAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.SerbianAnalyzer)value);
+				break;
 			case "simple":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.SimpleAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.SimpleAnalyzer)value);
+				break;
 			case "snowball":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.SnowballAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.SnowballAnalyzer)value);
+				break;
 			case "sorani":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.SoraniAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.SoraniAnalyzer)value);
+				break;
 			case "spanish":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.SpanishAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.SpanishAnalyzer)value);
+				break;
 			case "standard":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.StandardAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.StandardAnalyzer)value);
+				break;
 			case "stop":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.StopAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.StopAnalyzer)value);
+				break;
 			case "swedish":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.SwedishAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.SwedishAnalyzer)value);
+				break;
 			case "thai":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.ThaiAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.ThaiAnalyzer)value);
+				break;
 			case "turkish":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.TurkishAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.TurkishAnalyzer)value);
+				break;
 			case "whitespace":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.WhitespaceAnalyzer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.WhitespaceAnalyzer)value);
+				break;
 			default:
-				var type = value.GetType();
-				JsonSerializer.Serialize(writer, value, type, options);
-				return;
+				throw new System.Text.Json.JsonException($"Variant '{value.Type}' is not supported for type '{nameof(IAnalyzer)}'.");
 		}
 	}
 }
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/ArabicAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/ArabicAnalyzer.g.cs
index 64f5991c499..553b4feabbf 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/ArabicAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/ArabicAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,17 +28,74 @@
 
 namespace Elastic.Clients.Elasticsearch.Analysis;
 
+internal sealed partial class ArabicAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<ArabicAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStemExclusion = System.Text.Json.JsonEncodedText.Encode("stem_exclusion");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override ArabicAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propStemExclusion = default;
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStemExclusion.TryRead(ref reader, options, PropStemExclusion))
+			{
+				continue;
+			}
+
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ArabicAnalyzer
+		{
+			StemExclusion = propStemExclusion.Value
+,
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ArabicAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStemExclusion, value.StemExclusion);
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ArabicAnalyzerConverter))]
 public sealed partial class ArabicAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("stem_exclusion")]
 	public ICollection<string>? StemExclusion { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "arabic";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/ArmenianAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/ArmenianAnalyzer.g.cs
index 3641734436a..cad681d1dc5 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/ArmenianAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/ArmenianAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,17 +28,74 @@
 
 namespace Elastic.Clients.Elasticsearch.Analysis;
 
+internal sealed partial class ArmenianAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<ArmenianAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStemExclusion = System.Text.Json.JsonEncodedText.Encode("stem_exclusion");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override ArmenianAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propStemExclusion = default;
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStemExclusion.TryRead(ref reader, options, PropStemExclusion))
+			{
+				continue;
+			}
+
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ArmenianAnalyzer
+		{
+			StemExclusion = propStemExclusion.Value
+,
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ArmenianAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStemExclusion, value.StemExclusion);
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ArmenianAnalyzerConverter))]
 public sealed partial class ArmenianAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("stem_exclusion")]
 	public ICollection<string>? StemExclusion { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "armenian";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/BasqueAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/BasqueAnalyzer.g.cs
index 9bdabb5b6ef..7a8b83aaf2a 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/BasqueAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/BasqueAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,17 +28,74 @@
 
 namespace Elastic.Clients.Elasticsearch.Analysis;
 
+internal sealed partial class BasqueAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<BasqueAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStemExclusion = System.Text.Json.JsonEncodedText.Encode("stem_exclusion");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override BasqueAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propStemExclusion = default;
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStemExclusion.TryRead(ref reader, options, PropStemExclusion))
+			{
+				continue;
+			}
+
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new BasqueAnalyzer
+		{
+			StemExclusion = propStemExclusion.Value
+,
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, BasqueAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStemExclusion, value.StemExclusion);
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(BasqueAnalyzerConverter))]
 public sealed partial class BasqueAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("stem_exclusion")]
 	public ICollection<string>? StemExclusion { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "basque";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/BengaliAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/BengaliAnalyzer.g.cs
index a9393e534cc..27aa198616a 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/BengaliAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/BengaliAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,17 +28,74 @@
 
 namespace Elastic.Clients.Elasticsearch.Analysis;
 
+internal sealed partial class BengaliAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<BengaliAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStemExclusion = System.Text.Json.JsonEncodedText.Encode("stem_exclusion");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override BengaliAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propStemExclusion = default;
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStemExclusion.TryRead(ref reader, options, PropStemExclusion))
+			{
+				continue;
+			}
+
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new BengaliAnalyzer
+		{
+			StemExclusion = propStemExclusion.Value
+,
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, BengaliAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStemExclusion, value.StemExclusion);
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(BengaliAnalyzerConverter))]
 public sealed partial class BengaliAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("stem_exclusion")]
 	public ICollection<string>? StemExclusion { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "bengali";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/BrazilianAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/BrazilianAnalyzer.g.cs
index edb89e4c735..94bb43779a3 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/BrazilianAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/BrazilianAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,15 +28,63 @@
 
 namespace Elastic.Clients.Elasticsearch.Analysis;
 
+internal sealed partial class BrazilianAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<BrazilianAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override BrazilianAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new BrazilianAnalyzer
+		{
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, BrazilianAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(BrazilianAnalyzerConverter))]
 public sealed partial class BrazilianAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "brazilian";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/BulgarianAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/BulgarianAnalyzer.g.cs
index 7d08a972858..e8c47140491 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/BulgarianAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/BulgarianAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,17 +28,74 @@
 
 namespace Elastic.Clients.Elasticsearch.Analysis;
 
+internal sealed partial class BulgarianAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<BulgarianAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStemExclusion = System.Text.Json.JsonEncodedText.Encode("stem_exclusion");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override BulgarianAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propStemExclusion = default;
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStemExclusion.TryRead(ref reader, options, PropStemExclusion))
+			{
+				continue;
+			}
+
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new BulgarianAnalyzer
+		{
+			StemExclusion = propStemExclusion.Value
+,
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, BulgarianAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStemExclusion, value.StemExclusion);
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(BulgarianAnalyzerConverter))]
 public sealed partial class BulgarianAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("stem_exclusion")]
 	public ICollection<string>? StemExclusion { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "bulgarian";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/CatalanAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/CatalanAnalyzer.g.cs
index d6215912130..6b6028e338e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/CatalanAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/CatalanAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,17 +28,74 @@
 
 namespace Elastic.Clients.Elasticsearch.Analysis;
 
+internal sealed partial class CatalanAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<CatalanAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStemExclusion = System.Text.Json.JsonEncodedText.Encode("stem_exclusion");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override CatalanAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propStemExclusion = default;
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStemExclusion.TryRead(ref reader, options, PropStemExclusion))
+			{
+				continue;
+			}
+
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new CatalanAnalyzer
+		{
+			StemExclusion = propStemExclusion.Value
+,
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, CatalanAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStemExclusion, value.StemExclusion);
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(CatalanAnalyzerConverter))]
 public sealed partial class CatalanAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("stem_exclusion")]
 	public ICollection<string>? StemExclusion { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "catalan";
 }
 
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 893e7f01f76..2a72696b2b6 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/CharFilters.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/CharFilters.g.cs
@@ -19,6 +19,7 @@
 
 using Elastic.Clients.Elasticsearch.Core;
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport;
 using System;
@@ -83,65 +84,58 @@ public CharFiltersDescriptor() : base(new CharFilters())
 	public CharFiltersDescriptor PatternReplace(string charFilterName, PatternReplaceCharFilter patternReplaceCharFilter) => AssignVariant(charFilterName, patternReplaceCharFilter);
 }
 
-internal sealed partial class CharFilterInterfaceConverter : JsonConverter<ICharFilter>
+internal sealed partial class CharFilterInterfaceConverter : System.Text.Json.Serialization.JsonConverter<ICharFilter>
 {
-	public override ICharFilter Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropDiscriminator = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override ICharFilter Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var copiedReader = reader;
-		string? type = null;
-		using var jsonDoc = JsonDocument.ParseValue(ref copiedReader);
-		if (jsonDoc is not null && jsonDoc.RootElement.TryGetProperty("type", out var readType) && readType.ValueKind == JsonValueKind.String)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		var readerSnapshot = reader;
+		string? discriminator = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			type = readType.ToString();
+			if (reader.TryReadProperty(options, PropDiscriminator, ref discriminator))
+			{
+				break;
+			}
+
+			reader.Skip();
 		}
 
-		switch (type)
+		reader = readerSnapshot;
+		return discriminator switch
 		{
-			case "html_strip":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.HtmlStripCharFilter>(ref reader, options);
-			case "icu_normalizer":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.IcuNormalizationCharFilter>(ref reader, options);
-			case "kuromoji_iteration_mark":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.KuromojiIterationMarkCharFilter>(ref reader, options);
-			case "mapping":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.MappingCharFilter>(ref reader, options);
-			case "pattern_replace":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.PatternReplaceCharFilter>(ref reader, options);
-			default:
-				ThrowHelper.ThrowUnknownTaggedUnionVariantJsonException(type, typeof(ICharFilter));
-				return null;
-		}
+			"html_strip" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.HtmlStripCharFilter>(options),
+			"icu_normalizer" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.IcuNormalizationCharFilter>(options),
+			"kuromoji_iteration_mark" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.KuromojiIterationMarkCharFilter>(options),
+			"mapping" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.MappingCharFilter>(options),
+			"pattern_replace" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.PatternReplaceCharFilter>(options),
+			_ => throw new System.Text.Json.JsonException($"Variant '{discriminator}' is not supported for type '{nameof(ICharFilter)}'.")
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, ICharFilter value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ICharFilter value, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (value is null)
-		{
-			writer.WriteNullValue();
-			return;
-		}
-
 		switch (value.Type)
 		{
 			case "html_strip":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.HtmlStripCharFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.HtmlStripCharFilter)value);
+				break;
 			case "icu_normalizer":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.IcuNormalizationCharFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.IcuNormalizationCharFilter)value);
+				break;
 			case "kuromoji_iteration_mark":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.KuromojiIterationMarkCharFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.KuromojiIterationMarkCharFilter)value);
+				break;
 			case "mapping":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.MappingCharFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.MappingCharFilter)value);
+				break;
 			case "pattern_replace":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.PatternReplaceCharFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.PatternReplaceCharFilter)value);
+				break;
 			default:
-				var type = value.GetType();
-				JsonSerializer.Serialize(writer, value, type, options);
-				return;
+				throw new System.Text.Json.JsonException($"Variant '{value.Type}' is not supported for type '{nameof(ICharFilter)}'.");
 		}
 	}
 }
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/ChineseAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/ChineseAnalyzer.g.cs
index 8a70c33dd66..d763555f5fb 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/ChineseAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/ChineseAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,15 +28,63 @@
 
 namespace Elastic.Clients.Elasticsearch.Analysis;
 
+internal sealed partial class ChineseAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<ChineseAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override ChineseAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ChineseAnalyzer
+		{
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ChineseAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ChineseAnalyzerConverter))]
 public sealed partial class ChineseAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "chinese";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/CjkAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/CjkAnalyzer.g.cs
index 3fb380874ff..5a2a3dfe0ed 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/CjkAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/CjkAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,15 +28,63 @@
 
 namespace Elastic.Clients.Elasticsearch.Analysis;
 
+internal sealed partial class CjkAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<CjkAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override CjkAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new CjkAnalyzer
+		{
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, CjkAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(CjkAnalyzerConverter))]
 public sealed partial class CjkAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "cjk";
 }
 
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 ba1549ff6a7..d52eb006f2e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/CustomAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/CustomAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,22 +28,96 @@
 
 namespace Elastic.Clients.Elasticsearch.Analysis;
 
+internal sealed partial class CustomAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<CustomAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCharFilter = System.Text.Json.JsonEncodedText.Encode("char_filter");
+	private static readonly System.Text.Json.JsonEncodedText PropFilter = System.Text.Json.JsonEncodedText.Encode("filter");
+	private static readonly System.Text.Json.JsonEncodedText PropPositionIncrementGap = System.Text.Json.JsonEncodedText.Encode("position_increment_gap");
+	private static readonly System.Text.Json.JsonEncodedText PropPositionOffsetGap = System.Text.Json.JsonEncodedText.Encode("position_offset_gap");
+	private static readonly System.Text.Json.JsonEncodedText PropTokenizer = System.Text.Json.JsonEncodedText.Encode("tokenizer");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override CustomAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propCharFilter = default;
+		LocalJsonProperty<ICollection<string>?> propFilter = default;
+		LocalJsonProperty<int?> propPositionIncrementGap = default;
+		LocalJsonProperty<int?> propPositionOffsetGap = default;
+		LocalJsonProperty<string> propTokenizer = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCharFilter.TryRead(ref reader, options, PropCharFilter, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propFilter.TryRead(ref reader, options, PropFilter, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propPositionIncrementGap.TryRead(ref reader, options, PropPositionIncrementGap))
+			{
+				continue;
+			}
+
+			if (propPositionOffsetGap.TryRead(ref reader, options, PropPositionOffsetGap))
+			{
+				continue;
+			}
+
+			if (propTokenizer.TryRead(ref reader, options, PropTokenizer))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new CustomAnalyzer
+		{
+			CharFilter = propCharFilter.Value
+,
+			Filter = propFilter.Value
+,
+			PositionIncrementGap = propPositionIncrementGap.Value
+,
+			PositionOffsetGap = propPositionOffsetGap.Value
+,
+			Tokenizer = propTokenizer.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, CustomAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCharFilter, value.CharFilter, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropFilter, value.Filter, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropPositionIncrementGap, value.PositionIncrementGap);
+		writer.WriteProperty(options, PropPositionOffsetGap, value.PositionOffsetGap);
+		writer.WriteProperty(options, PropTokenizer, value.Tokenizer);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(CustomAnalyzerConverter))]
 public sealed partial class CustomAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("char_filter")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? CharFilter { get; set; }
-	[JsonInclude, JsonPropertyName("filter")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	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")]
 	public string Type => "custom";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/CzechAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/CzechAnalyzer.g.cs
index 85203810347..bd0b177a605 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/CzechAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/CzechAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,17 +28,74 @@
 
 namespace Elastic.Clients.Elasticsearch.Analysis;
 
+internal sealed partial class CzechAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<CzechAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStemExclusion = System.Text.Json.JsonEncodedText.Encode("stem_exclusion");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override CzechAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propStemExclusion = default;
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStemExclusion.TryRead(ref reader, options, PropStemExclusion))
+			{
+				continue;
+			}
+
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new CzechAnalyzer
+		{
+			StemExclusion = propStemExclusion.Value
+,
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, CzechAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStemExclusion, value.StemExclusion);
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(CzechAnalyzerConverter))]
 public sealed partial class CzechAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("stem_exclusion")]
 	public ICollection<string>? StemExclusion { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "czech";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/DanishAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/DanishAnalyzer.g.cs
index 96f1845395b..b8306bdc77f 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/DanishAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/DanishAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,15 +28,63 @@
 
 namespace Elastic.Clients.Elasticsearch.Analysis;
 
+internal sealed partial class DanishAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<DanishAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override DanishAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DanishAnalyzer
+		{
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DanishAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DanishAnalyzerConverter))]
 public sealed partial class DanishAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "danish";
 }
 
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 7fdbe496526..2633247c60c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/DutchAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/DutchAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,17 +28,74 @@
 
 namespace Elastic.Clients.Elasticsearch.Analysis;
 
+internal sealed partial class DutchAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<DutchAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStemExclusion = System.Text.Json.JsonEncodedText.Encode("stem_exclusion");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override DutchAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propStemExclusion = default;
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStemExclusion.TryRead(ref reader, options, PropStemExclusion))
+			{
+				continue;
+			}
+
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DutchAnalyzer
+		{
+			StemExclusion = propStemExclusion.Value
+,
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DutchAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStemExclusion, value.StemExclusion);
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DutchAnalyzerConverter))]
 public sealed partial class DutchAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("stem_exclusion")]
 	public ICollection<string>? StemExclusion { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "dutch";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/EnglishAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/EnglishAnalyzer.g.cs
index bf63091004e..3912315e8d1 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/EnglishAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/EnglishAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,17 +28,74 @@
 
 namespace Elastic.Clients.Elasticsearch.Analysis;
 
+internal sealed partial class EnglishAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<EnglishAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStemExclusion = System.Text.Json.JsonEncodedText.Encode("stem_exclusion");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override EnglishAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propStemExclusion = default;
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStemExclusion.TryRead(ref reader, options, PropStemExclusion))
+			{
+				continue;
+			}
+
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new EnglishAnalyzer
+		{
+			StemExclusion = propStemExclusion.Value
+,
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, EnglishAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStemExclusion, value.StemExclusion);
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(EnglishAnalyzerConverter))]
 public sealed partial class EnglishAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("stem_exclusion")]
 	public ICollection<string>? StemExclusion { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "english";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/EstonianAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/EstonianAnalyzer.g.cs
index a1e4374a3f5..a6c014fd492 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/EstonianAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/EstonianAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,15 +28,63 @@
 
 namespace Elastic.Clients.Elasticsearch.Analysis;
 
+internal sealed partial class EstonianAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<EstonianAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override EstonianAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new EstonianAnalyzer
+		{
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, EstonianAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(EstonianAnalyzerConverter))]
 public sealed partial class EstonianAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "estonian";
 }
 
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 f91086db2f4..3207a22ee7b 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/FingerprintAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/FingerprintAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,24 +28,108 @@
 
 namespace Elastic.Clients.Elasticsearch.Analysis;
 
+internal sealed partial class FingerprintAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<FingerprintAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropMaxOutputSize = System.Text.Json.JsonEncodedText.Encode("max_output_size");
+	private static readonly System.Text.Json.JsonEncodedText PropPreserveOriginal = System.Text.Json.JsonEncodedText.Encode("preserve_original");
+	private static readonly System.Text.Json.JsonEncodedText PropSeparator = System.Text.Json.JsonEncodedText.Encode("separator");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("version");
+
+	public override FingerprintAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<int> propMaxOutputSize = default;
+		LocalJsonProperty<bool> propPreserveOriginal = default;
+		LocalJsonProperty<string> propSeparator = default;
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		LocalJsonProperty<string?> propVersion = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propMaxOutputSize.TryRead(ref reader, options, PropMaxOutputSize))
+			{
+				continue;
+			}
+
+			if (propPreserveOriginal.TryRead(ref reader, options, PropPreserveOriginal))
+			{
+				continue;
+			}
+
+			if (propSeparator.TryRead(ref reader, options, PropSeparator))
+			{
+				continue;
+			}
+
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			if (propVersion.TryRead(ref reader, options, PropVersion))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new FingerprintAnalyzer
+		{
+			MaxOutputSize = propMaxOutputSize.Value
+,
+			PreserveOriginal = propPreserveOriginal.Value
+,
+			Separator = propSeparator.Value
+,
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+,
+			Version = propVersion.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, FingerprintAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropMaxOutputSize, value.MaxOutputSize);
+		writer.WriteProperty(options, PropPreserveOriginal, value.PreserveOriginal);
+		writer.WriteProperty(options, PropSeparator, value.Separator);
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteProperty(options, PropVersion, value.Version);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(FingerprintAnalyzerConverter))]
 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")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "fingerprint";
 
-	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/FinnishAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/FinnishAnalyzer.g.cs
index 26daf3595db..da4568f1e3c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/FinnishAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/FinnishAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,17 +28,74 @@
 
 namespace Elastic.Clients.Elasticsearch.Analysis;
 
+internal sealed partial class FinnishAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<FinnishAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStemExclusion = System.Text.Json.JsonEncodedText.Encode("stem_exclusion");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override FinnishAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propStemExclusion = default;
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStemExclusion.TryRead(ref reader, options, PropStemExclusion))
+			{
+				continue;
+			}
+
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new FinnishAnalyzer
+		{
+			StemExclusion = propStemExclusion.Value
+,
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, FinnishAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStemExclusion, value.StemExclusion);
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(FinnishAnalyzerConverter))]
 public sealed partial class FinnishAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("stem_exclusion")]
 	public ICollection<string>? StemExclusion { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "finnish";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/FrenchAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/FrenchAnalyzer.g.cs
index 71a3152f6f5..e0e5d066561 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/FrenchAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/FrenchAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,17 +28,74 @@
 
 namespace Elastic.Clients.Elasticsearch.Analysis;
 
+internal sealed partial class FrenchAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<FrenchAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStemExclusion = System.Text.Json.JsonEncodedText.Encode("stem_exclusion");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override FrenchAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propStemExclusion = default;
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStemExclusion.TryRead(ref reader, options, PropStemExclusion))
+			{
+				continue;
+			}
+
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new FrenchAnalyzer
+		{
+			StemExclusion = propStemExclusion.Value
+,
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, FrenchAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStemExclusion, value.StemExclusion);
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(FrenchAnalyzerConverter))]
 public sealed partial class FrenchAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("stem_exclusion")]
 	public ICollection<string>? StemExclusion { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "french";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/GalicianAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/GalicianAnalyzer.g.cs
index f1ddff66f9b..93ad68debfa 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/GalicianAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/GalicianAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,17 +28,74 @@
 
 namespace Elastic.Clients.Elasticsearch.Analysis;
 
+internal sealed partial class GalicianAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<GalicianAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStemExclusion = System.Text.Json.JsonEncodedText.Encode("stem_exclusion");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override GalicianAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propStemExclusion = default;
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStemExclusion.TryRead(ref reader, options, PropStemExclusion))
+			{
+				continue;
+			}
+
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GalicianAnalyzer
+		{
+			StemExclusion = propStemExclusion.Value
+,
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GalicianAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStemExclusion, value.StemExclusion);
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GalicianAnalyzerConverter))]
 public sealed partial class GalicianAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("stem_exclusion")]
 	public ICollection<string>? StemExclusion { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "galician";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/GermanAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/GermanAnalyzer.g.cs
index bd0b04a470f..699cd274a7e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/GermanAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/GermanAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,17 +28,74 @@
 
 namespace Elastic.Clients.Elasticsearch.Analysis;
 
+internal sealed partial class GermanAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<GermanAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStemExclusion = System.Text.Json.JsonEncodedText.Encode("stem_exclusion");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override GermanAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propStemExclusion = default;
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStemExclusion.TryRead(ref reader, options, PropStemExclusion))
+			{
+				continue;
+			}
+
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GermanAnalyzer
+		{
+			StemExclusion = propStemExclusion.Value
+,
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GermanAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStemExclusion, value.StemExclusion);
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GermanAnalyzerConverter))]
 public sealed partial class GermanAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("stem_exclusion")]
 	public ICollection<string>? StemExclusion { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "german";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/GreekAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/GreekAnalyzer.g.cs
index 89b4442eddd..ef95a7057de 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/GreekAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/GreekAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,15 +28,63 @@
 
 namespace Elastic.Clients.Elasticsearch.Analysis;
 
+internal sealed partial class GreekAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<GreekAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override GreekAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GreekAnalyzer
+		{
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GreekAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GreekAnalyzerConverter))]
 public sealed partial class GreekAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "greek";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/HindiAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/HindiAnalyzer.g.cs
index c3142b0a785..db25db9b388 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/HindiAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/HindiAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,17 +28,74 @@
 
 namespace Elastic.Clients.Elasticsearch.Analysis;
 
+internal sealed partial class HindiAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<HindiAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStemExclusion = System.Text.Json.JsonEncodedText.Encode("stem_exclusion");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override HindiAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propStemExclusion = default;
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStemExclusion.TryRead(ref reader, options, PropStemExclusion))
+			{
+				continue;
+			}
+
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new HindiAnalyzer
+		{
+			StemExclusion = propStemExclusion.Value
+,
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, HindiAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStemExclusion, value.StemExclusion);
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(HindiAnalyzerConverter))]
 public sealed partial class HindiAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("stem_exclusion")]
 	public ICollection<string>? StemExclusion { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "hindi";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/HungarianAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/HungarianAnalyzer.g.cs
index 1df50363051..173bad0d483 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/HungarianAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/HungarianAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,17 +28,74 @@
 
 namespace Elastic.Clients.Elasticsearch.Analysis;
 
+internal sealed partial class HungarianAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<HungarianAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStemExclusion = System.Text.Json.JsonEncodedText.Encode("stem_exclusion");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override HungarianAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propStemExclusion = default;
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStemExclusion.TryRead(ref reader, options, PropStemExclusion))
+			{
+				continue;
+			}
+
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new HungarianAnalyzer
+		{
+			StemExclusion = propStemExclusion.Value
+,
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, HungarianAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStemExclusion, value.StemExclusion);
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(HungarianAnalyzerConverter))]
 public sealed partial class HungarianAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("stem_exclusion")]
 	public ICollection<string>? StemExclusion { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "hungarian";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/IndonesianAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/IndonesianAnalyzer.g.cs
index a970bc92251..45b141f6231 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/IndonesianAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/IndonesianAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,17 +28,74 @@
 
 namespace Elastic.Clients.Elasticsearch.Analysis;
 
+internal sealed partial class IndonesianAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<IndonesianAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStemExclusion = System.Text.Json.JsonEncodedText.Encode("stem_exclusion");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override IndonesianAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propStemExclusion = default;
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStemExclusion.TryRead(ref reader, options, PropStemExclusion))
+			{
+				continue;
+			}
+
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new IndonesianAnalyzer
+		{
+			StemExclusion = propStemExclusion.Value
+,
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IndonesianAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStemExclusion, value.StemExclusion);
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(IndonesianAnalyzerConverter))]
 public sealed partial class IndonesianAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("stem_exclusion")]
 	public ICollection<string>? StemExclusion { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "indonesian";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/IrishAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/IrishAnalyzer.g.cs
index eb1d2959527..916ab7aa7f0 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/IrishAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/IrishAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,17 +28,74 @@
 
 namespace Elastic.Clients.Elasticsearch.Analysis;
 
+internal sealed partial class IrishAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<IrishAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStemExclusion = System.Text.Json.JsonEncodedText.Encode("stem_exclusion");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override IrishAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propStemExclusion = default;
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStemExclusion.TryRead(ref reader, options, PropStemExclusion))
+			{
+				continue;
+			}
+
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new IrishAnalyzer
+		{
+			StemExclusion = propStemExclusion.Value
+,
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IrishAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStemExclusion, value.StemExclusion);
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(IrishAnalyzerConverter))]
 public sealed partial class IrishAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("stem_exclusion")]
 	public ICollection<string>? StemExclusion { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "irish";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/ItalianAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/ItalianAnalyzer.g.cs
index f3c6ac186c8..2d8a8efc5b2 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/ItalianAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/ItalianAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,17 +28,74 @@
 
 namespace Elastic.Clients.Elasticsearch.Analysis;
 
+internal sealed partial class ItalianAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<ItalianAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStemExclusion = System.Text.Json.JsonEncodedText.Encode("stem_exclusion");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override ItalianAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propStemExclusion = default;
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStemExclusion.TryRead(ref reader, options, PropStemExclusion))
+			{
+				continue;
+			}
+
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ItalianAnalyzer
+		{
+			StemExclusion = propStemExclusion.Value
+,
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ItalianAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStemExclusion, value.StemExclusion);
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ItalianAnalyzerConverter))]
 public sealed partial class ItalianAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("stem_exclusion")]
 	public ICollection<string>? StemExclusion { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "italian";
 }
 
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 91a70863b7f..a7139981787 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/KeywordMarkerTokenFilter.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/KeywordMarkerTokenFilter.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,22 +28,97 @@
 
 namespace Elastic.Clients.Elasticsearch.Analysis;
 
+internal sealed partial class KeywordMarkerTokenFilterConverter : System.Text.Json.Serialization.JsonConverter<KeywordMarkerTokenFilter>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreCase = System.Text.Json.JsonEncodedText.Encode("ignore_case");
+	private static readonly System.Text.Json.JsonEncodedText PropKeywords = System.Text.Json.JsonEncodedText.Encode("keywords");
+	private static readonly System.Text.Json.JsonEncodedText PropKeywordsPath = System.Text.Json.JsonEncodedText.Encode("keywords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropKeywordsPattern = System.Text.Json.JsonEncodedText.Encode("keywords_pattern");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("version");
+
+	public override KeywordMarkerTokenFilter Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool?> propIgnoreCase = default;
+		LocalJsonProperty<ICollection<string>?> propKeywords = default;
+		LocalJsonProperty<string?> propKeywordsPath = default;
+		LocalJsonProperty<string?> propKeywordsPattern = default;
+		LocalJsonProperty<string?> propVersion = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propIgnoreCase.TryRead(ref reader, options, PropIgnoreCase))
+			{
+				continue;
+			}
+
+			if (propKeywords.TryRead(ref reader, options, PropKeywords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propKeywordsPath.TryRead(ref reader, options, PropKeywordsPath))
+			{
+				continue;
+			}
+
+			if (propKeywordsPattern.TryRead(ref reader, options, PropKeywordsPattern))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			if (propVersion.TryRead(ref reader, options, PropVersion))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new KeywordMarkerTokenFilter
+		{
+			IgnoreCase = propIgnoreCase.Value
+,
+			Keywords = propKeywords.Value
+,
+			KeywordsPath = propKeywordsPath.Value
+,
+			KeywordsPattern = propKeywordsPattern.Value
+,
+			Version = propVersion.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, KeywordMarkerTokenFilter value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropIgnoreCase, value.IgnoreCase);
+		writer.WriteProperty(options, PropKeywords, value.Keywords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropKeywordsPath, value.KeywordsPath);
+		writer.WriteProperty(options, PropKeywordsPattern, value.KeywordsPattern);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteProperty(options, PropVersion, value.Version);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(KeywordMarkerTokenFilterConverter))]
 public sealed partial class KeywordMarkerTokenFilter : ITokenFilter
 {
-	[JsonInclude, JsonPropertyName("ignore_case")]
 	public bool? IgnoreCase { get; set; }
-	[JsonInclude, JsonPropertyName("keywords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	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")]
 	public string Type => "keyword_marker";
 
-	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
 
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 00a6d5a7171..34144436584 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/LanguageAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/LanguageAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,22 +28,97 @@
 
 namespace Elastic.Clients.Elasticsearch.Analysis;
 
+internal sealed partial class LanguageAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<LanguageAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropLanguage = System.Text.Json.JsonEncodedText.Encode("language");
+	private static readonly System.Text.Json.JsonEncodedText PropStemExclusion = System.Text.Json.JsonEncodedText.Encode("stem_exclusion");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("version");
+
+	public override LanguageAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Analysis.Language> propLanguage = default;
+		LocalJsonProperty<ICollection<string>> propStemExclusion = default;
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		LocalJsonProperty<string?> propVersion = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propLanguage.TryRead(ref reader, options, PropLanguage))
+			{
+				continue;
+			}
+
+			if (propStemExclusion.TryRead(ref reader, options, PropStemExclusion))
+			{
+				continue;
+			}
+
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			if (propVersion.TryRead(ref reader, options, PropVersion))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new LanguageAnalyzer
+		{
+			Language = propLanguage.Value
+,
+			StemExclusion = propStemExclusion.Value
+,
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+,
+			Version = propVersion.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, LanguageAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropLanguage, value.Language);
+		writer.WriteProperty(options, PropStemExclusion, value.StemExclusion);
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteProperty(options, PropVersion, value.Version);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(LanguageAnalyzerConverter))]
 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")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "language";
 
-	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/LatvianAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/LatvianAnalyzer.g.cs
index 760fd6484b5..dc71282dd2c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/LatvianAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/LatvianAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,17 +28,74 @@
 
 namespace Elastic.Clients.Elasticsearch.Analysis;
 
+internal sealed partial class LatvianAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<LatvianAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStemExclusion = System.Text.Json.JsonEncodedText.Encode("stem_exclusion");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override LatvianAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propStemExclusion = default;
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStemExclusion.TryRead(ref reader, options, PropStemExclusion))
+			{
+				continue;
+			}
+
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new LatvianAnalyzer
+		{
+			StemExclusion = propStemExclusion.Value
+,
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, LatvianAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStemExclusion, value.StemExclusion);
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(LatvianAnalyzerConverter))]
 public sealed partial class LatvianAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("stem_exclusion")]
 	public ICollection<string>? StemExclusion { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "latvian";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/LithuanianAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/LithuanianAnalyzer.g.cs
index 4a5f774ff5d..4fa22968ab3 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/LithuanianAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/LithuanianAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,17 +28,74 @@
 
 namespace Elastic.Clients.Elasticsearch.Analysis;
 
+internal sealed partial class LithuanianAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<LithuanianAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStemExclusion = System.Text.Json.JsonEncodedText.Encode("stem_exclusion");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override LithuanianAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propStemExclusion = default;
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStemExclusion.TryRead(ref reader, options, PropStemExclusion))
+			{
+				continue;
+			}
+
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new LithuanianAnalyzer
+		{
+			StemExclusion = propStemExclusion.Value
+,
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, LithuanianAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStemExclusion, value.StemExclusion);
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(LithuanianAnalyzerConverter))]
 public sealed partial class LithuanianAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("stem_exclusion")]
 	public ICollection<string>? StemExclusion { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "lithuanian";
 }
 
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 e32a1cbe1ac..44db0b666fa 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/Normalizers.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/Normalizers.g.cs
@@ -19,6 +19,7 @@
 
 using Elastic.Clients.Elasticsearch.Core;
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport;
 using System;
@@ -74,49 +75,46 @@ public NormalizersDescriptor() : base(new Normalizers())
 	public NormalizersDescriptor Lowercase(string normalizerName, LowercaseNormalizer lowercaseNormalizer) => AssignVariant(normalizerName, lowercaseNormalizer);
 }
 
-internal sealed partial class NormalizerInterfaceConverter : JsonConverter<INormalizer>
+internal sealed partial class NormalizerInterfaceConverter : System.Text.Json.Serialization.JsonConverter<INormalizer>
 {
-	public override INormalizer Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropDiscriminator = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override INormalizer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var copiedReader = reader;
-		string? type = null;
-		using var jsonDoc = JsonDocument.ParseValue(ref copiedReader);
-		if (jsonDoc is not null && jsonDoc.RootElement.TryGetProperty("type", out var readType) && readType.ValueKind == JsonValueKind.String)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		var readerSnapshot = reader;
+		string? discriminator = "custom";
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			type = readType.ToString();
+			if (reader.TryReadProperty(options, PropDiscriminator, ref discriminator))
+			{
+				break;
+			}
+
+			reader.Skip();
 		}
 
-		switch (type)
+		reader = readerSnapshot;
+		return discriminator switch
 		{
-			case "custom":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.CustomNormalizer>(ref reader, options);
-			case "lowercase":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.LowercaseNormalizer>(ref reader, options);
-			default:
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.CustomNormalizer>(ref reader, options);
-		}
+			"custom" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.CustomNormalizer>(options),
+			"lowercase" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.LowercaseNormalizer>(options),
+			_ => throw new System.Text.Json.JsonException($"Variant '{discriminator}' is not supported for type '{nameof(INormalizer)}'.")
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, INormalizer value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, INormalizer value, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (value is null)
-		{
-			writer.WriteNullValue();
-			return;
-		}
-
 		switch (value.Type)
 		{
 			case "custom":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.CustomNormalizer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.CustomNormalizer)value);
+				break;
 			case "lowercase":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.LowercaseNormalizer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.LowercaseNormalizer)value);
+				break;
 			default:
-				var type = value.GetType();
-				JsonSerializer.Serialize(writer, value, type, options);
-				return;
+				throw new System.Text.Json.JsonException($"Variant '{value.Type}' is not supported for type '{nameof(INormalizer)}'.");
 		}
 	}
 }
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/NorwegianAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/NorwegianAnalyzer.g.cs
index 873ae454f84..ee3d725c5e1 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/NorwegianAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/NorwegianAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,17 +28,74 @@
 
 namespace Elastic.Clients.Elasticsearch.Analysis;
 
+internal sealed partial class NorwegianAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<NorwegianAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStemExclusion = System.Text.Json.JsonEncodedText.Encode("stem_exclusion");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override NorwegianAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propStemExclusion = default;
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStemExclusion.TryRead(ref reader, options, PropStemExclusion))
+			{
+				continue;
+			}
+
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new NorwegianAnalyzer
+		{
+			StemExclusion = propStemExclusion.Value
+,
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, NorwegianAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStemExclusion, value.StemExclusion);
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(NorwegianAnalyzerConverter))]
 public sealed partial class NorwegianAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("stem_exclusion")]
 	public ICollection<string>? StemExclusion { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "norwegian";
 }
 
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 90b4f9f3e43..25276d6d73c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/PatternAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/PatternAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,22 +28,97 @@
 
 namespace Elastic.Clients.Elasticsearch.Analysis;
 
+internal sealed partial class PatternAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<PatternAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropFlags = System.Text.Json.JsonEncodedText.Encode("flags");
+	private static readonly System.Text.Json.JsonEncodedText PropLowercase = System.Text.Json.JsonEncodedText.Encode("lowercase");
+	private static readonly System.Text.Json.JsonEncodedText PropPattern = System.Text.Json.JsonEncodedText.Encode("pattern");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("version");
+
+	public override PatternAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string?> propFlags = default;
+		LocalJsonProperty<bool?> propLowercase = default;
+		LocalJsonProperty<string> propPattern = default;
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propVersion = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propFlags.TryRead(ref reader, options, PropFlags))
+			{
+				continue;
+			}
+
+			if (propLowercase.TryRead(ref reader, options, PropLowercase))
+			{
+				continue;
+			}
+
+			if (propPattern.TryRead(ref reader, options, PropPattern))
+			{
+				continue;
+			}
+
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			if (propVersion.TryRead(ref reader, options, PropVersion))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PatternAnalyzer
+		{
+			Flags = propFlags.Value
+,
+			Lowercase = propLowercase.Value
+,
+			Pattern = propPattern.Value
+,
+			Stopwords = propStopwords.Value
+,
+			Version = propVersion.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PatternAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropFlags, value.Flags);
+		writer.WriteProperty(options, PropLowercase, value.Lowercase);
+		writer.WriteProperty(options, PropPattern, value.Pattern);
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteProperty(options, PropVersion, value.Version);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PatternAnalyzerConverter))]
 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")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "pattern";
 
-	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/PersianAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/PersianAnalyzer.g.cs
index f889fe2782e..0d141dd155e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/PersianAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/PersianAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,15 +28,63 @@
 
 namespace Elastic.Clients.Elasticsearch.Analysis;
 
+internal sealed partial class PersianAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<PersianAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override PersianAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PersianAnalyzer
+		{
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PersianAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PersianAnalyzerConverter))]
 public sealed partial class PersianAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "persian";
 }
 
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 edc88d5e128..6558dbe28a0 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/PhoneticTokenFilter.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/PhoneticTokenFilter.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,26 +28,119 @@
 
 namespace Elastic.Clients.Elasticsearch.Analysis;
 
+internal sealed partial class PhoneticTokenFilterConverter : System.Text.Json.Serialization.JsonConverter<PhoneticTokenFilter>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropEncoder = System.Text.Json.JsonEncodedText.Encode("encoder");
+	private static readonly System.Text.Json.JsonEncodedText PropLanguageset = System.Text.Json.JsonEncodedText.Encode("languageset");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxCodeLen = System.Text.Json.JsonEncodedText.Encode("max_code_len");
+	private static readonly System.Text.Json.JsonEncodedText PropNameType = System.Text.Json.JsonEncodedText.Encode("name_type");
+	private static readonly System.Text.Json.JsonEncodedText PropReplace = System.Text.Json.JsonEncodedText.Encode("replace");
+	private static readonly System.Text.Json.JsonEncodedText PropRuleType = System.Text.Json.JsonEncodedText.Encode("rule_type");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("version");
+
+	public override PhoneticTokenFilter Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Analysis.PhoneticEncoder> propEncoder = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Analysis.PhoneticLanguage>?> propLanguageset = default;
+		LocalJsonProperty<int?> propMaxCodeLen = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Analysis.PhoneticNameType?> propNameType = default;
+		LocalJsonProperty<bool?> propReplace = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Analysis.PhoneticRuleType?> propRuleType = default;
+		LocalJsonProperty<string?> propVersion = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propEncoder.TryRead(ref reader, options, PropEncoder))
+			{
+				continue;
+			}
+
+			if (propLanguageset.TryRead(ref reader, options, PropLanguageset, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Analysis.PhoneticLanguage>?, Elastic.Clients.Elasticsearch.Analysis.PhoneticLanguage>)))
+			{
+				continue;
+			}
+
+			if (propMaxCodeLen.TryRead(ref reader, options, PropMaxCodeLen))
+			{
+				continue;
+			}
+
+			if (propNameType.TryRead(ref reader, options, PropNameType))
+			{
+				continue;
+			}
+
+			if (propReplace.TryRead(ref reader, options, PropReplace))
+			{
+				continue;
+			}
+
+			if (propRuleType.TryRead(ref reader, options, PropRuleType))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			if (propVersion.TryRead(ref reader, options, PropVersion))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PhoneticTokenFilter
+		{
+			Encoder = propEncoder.Value
+,
+			Languageset = propLanguageset.Value
+,
+			MaxCodeLen = propMaxCodeLen.Value
+,
+			NameType = propNameType.Value
+,
+			Replace = propReplace.Value
+,
+			RuleType = propRuleType.Value
+,
+			Version = propVersion.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PhoneticTokenFilter value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropEncoder, value.Encoder);
+		writer.WriteProperty(options, PropLanguageset, value.Languageset, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Analysis.PhoneticLanguage>?, Elastic.Clients.Elasticsearch.Analysis.PhoneticLanguage>));
+		writer.WriteProperty(options, PropMaxCodeLen, value.MaxCodeLen);
+		writer.WriteProperty(options, PropNameType, value.NameType);
+		writer.WriteProperty(options, PropReplace, value.Replace);
+		writer.WriteProperty(options, PropRuleType, value.RuleType);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteProperty(options, PropVersion, value.Version);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PhoneticTokenFilterConverter))]
 public sealed partial class PhoneticTokenFilter : ITokenFilter
 {
-	[JsonInclude, JsonPropertyName("encoder")]
 	public Elastic.Clients.Elasticsearch.Analysis.PhoneticEncoder Encoder { get; set; }
-	[JsonInclude, JsonPropertyName("languageset")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.Analysis.PhoneticLanguage))]
 	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")]
 	public string Type => "phonetic";
 
-	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/PortugueseAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/PortugueseAnalyzer.g.cs
index 871b8aefa64..fac7875f23f 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/PortugueseAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/PortugueseAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,17 +28,74 @@
 
 namespace Elastic.Clients.Elasticsearch.Analysis;
 
+internal sealed partial class PortugueseAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<PortugueseAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStemExclusion = System.Text.Json.JsonEncodedText.Encode("stem_exclusion");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override PortugueseAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propStemExclusion = default;
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStemExclusion.TryRead(ref reader, options, PropStemExclusion))
+			{
+				continue;
+			}
+
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PortugueseAnalyzer
+		{
+			StemExclusion = propStemExclusion.Value
+,
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PortugueseAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStemExclusion, value.StemExclusion);
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PortugueseAnalyzerConverter))]
 public sealed partial class PortugueseAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("stem_exclusion")]
 	public ICollection<string>? StemExclusion { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "portuguese";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/RomanianAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/RomanianAnalyzer.g.cs
index b7b3a587660..d8504706505 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/RomanianAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/RomanianAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,17 +28,74 @@
 
 namespace Elastic.Clients.Elasticsearch.Analysis;
 
+internal sealed partial class RomanianAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<RomanianAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStemExclusion = System.Text.Json.JsonEncodedText.Encode("stem_exclusion");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override RomanianAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propStemExclusion = default;
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStemExclusion.TryRead(ref reader, options, PropStemExclusion))
+			{
+				continue;
+			}
+
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new RomanianAnalyzer
+		{
+			StemExclusion = propStemExclusion.Value
+,
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, RomanianAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStemExclusion, value.StemExclusion);
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(RomanianAnalyzerConverter))]
 public sealed partial class RomanianAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("stem_exclusion")]
 	public ICollection<string>? StemExclusion { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "romanian";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/RussianAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/RussianAnalyzer.g.cs
index b1c60d62fb8..510d84fe67a 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/RussianAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/RussianAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,17 +28,74 @@
 
 namespace Elastic.Clients.Elasticsearch.Analysis;
 
+internal sealed partial class RussianAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<RussianAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStemExclusion = System.Text.Json.JsonEncodedText.Encode("stem_exclusion");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override RussianAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propStemExclusion = default;
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStemExclusion.TryRead(ref reader, options, PropStemExclusion))
+			{
+				continue;
+			}
+
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new RussianAnalyzer
+		{
+			StemExclusion = propStemExclusion.Value
+,
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, RussianAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStemExclusion, value.StemExclusion);
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(RussianAnalyzerConverter))]
 public sealed partial class RussianAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("stem_exclusion")]
 	public ICollection<string>? StemExclusion { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "russian";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/SerbianAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/SerbianAnalyzer.g.cs
index 26cfb2729d5..6d2b28f65e0 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/SerbianAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/SerbianAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,17 +28,74 @@
 
 namespace Elastic.Clients.Elasticsearch.Analysis;
 
+internal sealed partial class SerbianAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<SerbianAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStemExclusion = System.Text.Json.JsonEncodedText.Encode("stem_exclusion");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override SerbianAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propStemExclusion = default;
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStemExclusion.TryRead(ref reader, options, PropStemExclusion))
+			{
+				continue;
+			}
+
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SerbianAnalyzer
+		{
+			StemExclusion = propStemExclusion.Value
+,
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SerbianAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStemExclusion, value.StemExclusion);
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(SerbianAnalyzerConverter))]
 public sealed partial class SerbianAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("stem_exclusion")]
 	public ICollection<string>? StemExclusion { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "serbian";
 }
 
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 f816558cc40..14eb1586f07 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/SnowballAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/SnowballAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,18 +28,75 @@
 
 namespace Elastic.Clients.Elasticsearch.Analysis;
 
+internal sealed partial class SnowballAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<SnowballAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropLanguage = System.Text.Json.JsonEncodedText.Encode("language");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("version");
+
+	public override SnowballAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Analysis.SnowballLanguage> propLanguage = default;
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propVersion = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propLanguage.TryRead(ref reader, options, PropLanguage))
+			{
+				continue;
+			}
+
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			if (propVersion.TryRead(ref reader, options, PropVersion))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SnowballAnalyzer
+		{
+			Language = propLanguage.Value
+,
+			Stopwords = propStopwords.Value
+,
+			Version = propVersion.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SnowballAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropLanguage, value.Language);
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteProperty(options, PropVersion, value.Version);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(SnowballAnalyzerConverter))]
 public sealed partial class SnowballAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("language")]
 	public Elastic.Clients.Elasticsearch.Analysis.SnowballLanguage Language { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "snowball";
 
-	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/SoraniAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/SoraniAnalyzer.g.cs
index af879465e82..81012a4713e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/SoraniAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/SoraniAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,17 +28,74 @@
 
 namespace Elastic.Clients.Elasticsearch.Analysis;
 
+internal sealed partial class SoraniAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<SoraniAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStemExclusion = System.Text.Json.JsonEncodedText.Encode("stem_exclusion");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override SoraniAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propStemExclusion = default;
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStemExclusion.TryRead(ref reader, options, PropStemExclusion))
+			{
+				continue;
+			}
+
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SoraniAnalyzer
+		{
+			StemExclusion = propStemExclusion.Value
+,
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SoraniAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStemExclusion, value.StemExclusion);
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(SoraniAnalyzerConverter))]
 public sealed partial class SoraniAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("stem_exclusion")]
 	public ICollection<string>? StemExclusion { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "sorani";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/SpanishAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/SpanishAnalyzer.g.cs
index bba23e77175..b4419fcd2d8 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/SpanishAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/SpanishAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,17 +28,74 @@
 
 namespace Elastic.Clients.Elasticsearch.Analysis;
 
+internal sealed partial class SpanishAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<SpanishAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStemExclusion = System.Text.Json.JsonEncodedText.Encode("stem_exclusion");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override SpanishAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propStemExclusion = default;
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStemExclusion.TryRead(ref reader, options, PropStemExclusion))
+			{
+				continue;
+			}
+
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SpanishAnalyzer
+		{
+			StemExclusion = propStemExclusion.Value
+,
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SpanishAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStemExclusion, value.StemExclusion);
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(SpanishAnalyzerConverter))]
 public sealed partial class SpanishAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("stem_exclusion")]
 	public ICollection<string>? StemExclusion { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "spanish";
 }
 
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 f89bcc5f1ec..02e26869823 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/StandardAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/StandardAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,15 +28,63 @@
 
 namespace Elastic.Clients.Elasticsearch.Analysis;
 
+internal sealed partial class StandardAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<StandardAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropMaxTokenLength = System.Text.Json.JsonEncodedText.Encode("max_token_length");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override StandardAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<int?> propMaxTokenLength = default;
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propMaxTokenLength.TryRead(ref reader, options, PropMaxTokenLength))
+			{
+				continue;
+			}
+
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new StandardAnalyzer
+		{
+			MaxTokenLength = propMaxTokenLength.Value
+,
+			Stopwords = propStopwords.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, StandardAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropMaxTokenLength, value.MaxTokenLength);
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(StandardAnalyzerConverter))]
 public sealed partial class StandardAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("max_token_length")]
 	public int? MaxTokenLength { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "standard";
 }
 
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 b92fc84576f..390c9df5c46 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/StemmerTokenFilter.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/StemmerTokenFilter.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,52 +28,54 @@
 
 namespace Elastic.Clients.Elasticsearch.Analysis;
 
-internal sealed partial class StemmerTokenFilterConverter : JsonConverter<StemmerTokenFilter>
+internal sealed partial class StemmerTokenFilterConverter : System.Text.Json.Serialization.JsonConverter<StemmerTokenFilter>
 {
-	public override StemmerTokenFilter Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropLanguage = System.Text.Json.JsonEncodedText.Encode("language");
+	private static readonly System.Text.Json.JsonEncodedText PropLanguage1 = System.Text.Json.JsonEncodedText.Encode("name");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("version");
+
+	public override StemmerTokenFilter Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		var variant = new StemmerTokenFilter();
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string?> propLanguage = default;
+		LocalJsonProperty<string?> propVersion = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propLanguage.TryRead(ref reader, options, PropLanguage) || propLanguage.TryRead(ref reader, options, PropLanguage1))
 			{
-				var property = reader.GetString();
-				if (property == "language" || property == "name")
-				{
-					variant.Language = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "version")
-				{
-					variant.Version = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
+				continue;
 			}
-		}
 
-		return variant;
-	}
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
 
-	public override void Write(Utf8JsonWriter writer, StemmerTokenFilter value, JsonSerializerOptions options)
-	{
-		writer.WriteStartObject();
-		if (!string.IsNullOrEmpty(value.Language))
-		{
-			writer.WritePropertyName("language");
-			writer.WriteStringValue(value.Language);
+			if (propVersion.TryRead(ref reader, options, PropVersion))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		writer.WritePropertyName("type");
-		writer.WriteStringValue("stemmer");
-		if (!string.IsNullOrEmpty(value.Version))
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new StemmerTokenFilter
 		{
-			writer.WritePropertyName("version");
-			writer.WriteStringValue(value.Version);
-		}
+			Language = propLanguage.Value
+,
+			Version = propVersion.Value
+		};
+	}
 
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, StemmerTokenFilter value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropLanguage, value.Language);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteProperty(options, PropVersion, value.Version);
 		writer.WriteEndObject();
 	}
 }
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 9467b26a75b..d9bf1c71660 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/StopAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/StopAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,18 +28,75 @@
 
 namespace Elastic.Clients.Elasticsearch.Analysis;
 
+internal sealed partial class StopAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<StopAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("version");
+
+	public override StopAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		LocalJsonProperty<string?> propVersion = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			if (propVersion.TryRead(ref reader, options, PropVersion))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new StopAnalyzer
+		{
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+,
+			Version = propVersion.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, StopAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteProperty(options, PropVersion, value.Version);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(StopAnalyzerConverter))]
 public sealed partial class StopAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "stop";
 
-	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
 
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 d1093f2ebef..efb054cd4e5 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/StopTokenFilter.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/StopTokenFilter.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,22 +28,97 @@
 
 namespace Elastic.Clients.Elasticsearch.Analysis;
 
+internal sealed partial class StopTokenFilterConverter : System.Text.Json.Serialization.JsonConverter<StopTokenFilter>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreCase = System.Text.Json.JsonEncodedText.Encode("ignore_case");
+	private static readonly System.Text.Json.JsonEncodedText PropRemoveTrailing = System.Text.Json.JsonEncodedText.Encode("remove_trailing");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("version");
+
+	public override StopTokenFilter Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool?> propIgnoreCase = default;
+		LocalJsonProperty<bool?> propRemoveTrailing = default;
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		LocalJsonProperty<string?> propVersion = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propIgnoreCase.TryRead(ref reader, options, PropIgnoreCase))
+			{
+				continue;
+			}
+
+			if (propRemoveTrailing.TryRead(ref reader, options, PropRemoveTrailing))
+			{
+				continue;
+			}
+
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			if (propVersion.TryRead(ref reader, options, PropVersion))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new StopTokenFilter
+		{
+			IgnoreCase = propIgnoreCase.Value
+,
+			RemoveTrailing = propRemoveTrailing.Value
+,
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+,
+			Version = propVersion.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, StopTokenFilter value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropIgnoreCase, value.IgnoreCase);
+		writer.WriteProperty(options, PropRemoveTrailing, value.RemoveTrailing);
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteProperty(options, PropVersion, value.Version);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(StopTokenFilterConverter))]
 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")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "stop";
 
-	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/SwedishAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/SwedishAnalyzer.g.cs
index 1158c84638a..0562f59e011 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/SwedishAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/SwedishAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,17 +28,74 @@
 
 namespace Elastic.Clients.Elasticsearch.Analysis;
 
+internal sealed partial class SwedishAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<SwedishAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStemExclusion = System.Text.Json.JsonEncodedText.Encode("stem_exclusion");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override SwedishAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propStemExclusion = default;
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStemExclusion.TryRead(ref reader, options, PropStemExclusion))
+			{
+				continue;
+			}
+
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SwedishAnalyzer
+		{
+			StemExclusion = propStemExclusion.Value
+,
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SwedishAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStemExclusion, value.StemExclusion);
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(SwedishAnalyzerConverter))]
 public sealed partial class SwedishAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("stem_exclusion")]
 	public ICollection<string>? StemExclusion { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "swedish";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/ThaiAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/ThaiAnalyzer.g.cs
index 6ce5aceb322..5be9998b16f 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/ThaiAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/ThaiAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,15 +28,63 @@
 
 namespace Elastic.Clients.Elasticsearch.Analysis;
 
+internal sealed partial class ThaiAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<ThaiAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override ThaiAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ThaiAnalyzer
+		{
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ThaiAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ThaiAnalyzerConverter))]
 public sealed partial class ThaiAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "thai";
 }
 
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 2fa0d6a043c..271f33f3756 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/TokenFilters.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/TokenFilters.g.cs
@@ -19,6 +19,7 @@
 
 using Elastic.Clients.Elasticsearch.Core;
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport;
 using System;
@@ -209,275 +210,226 @@ public TokenFiltersDescriptor() : base(new TokenFilters())
 	public TokenFiltersDescriptor WordDelimiter(string tokenFilterName, WordDelimiterTokenFilter wordDelimiterTokenFilter) => AssignVariant(tokenFilterName, wordDelimiterTokenFilter);
 }
 
-internal sealed partial class TokenFilterInterfaceConverter : JsonConverter<ITokenFilter>
+internal sealed partial class TokenFilterInterfaceConverter : System.Text.Json.Serialization.JsonConverter<ITokenFilter>
 {
-	public override ITokenFilter Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropDiscriminator = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override ITokenFilter Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var copiedReader = reader;
-		string? type = null;
-		using var jsonDoc = JsonDocument.ParseValue(ref copiedReader);
-		if (jsonDoc is not null && jsonDoc.RootElement.TryGetProperty("type", out var readType) && readType.ValueKind == JsonValueKind.String)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		var readerSnapshot = reader;
+		string? discriminator = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			type = readType.ToString();
+			if (reader.TryReadProperty(options, PropDiscriminator, ref discriminator))
+			{
+				break;
+			}
+
+			reader.Skip();
 		}
 
-		switch (type)
+		reader = readerSnapshot;
+		return discriminator switch
 		{
-			case "asciifolding":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.AsciiFoldingTokenFilter>(ref reader, options);
-			case "common_grams":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.CommonGramsTokenFilter>(ref reader, options);
-			case "condition":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.ConditionTokenFilter>(ref reader, options);
-			case "delimited_payload":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.DelimitedPayloadTokenFilter>(ref reader, options);
-			case "dictionary_decompounder":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.DictionaryDecompounderTokenFilter>(ref reader, options);
-			case "edge_ngram":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.EdgeNGramTokenFilter>(ref reader, options);
-			case "elision":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.ElisionTokenFilter>(ref reader, options);
-			case "fingerprint":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.FingerprintTokenFilter>(ref reader, options);
-			case "hunspell":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.HunspellTokenFilter>(ref reader, options);
-			case "hyphenation_decompounder":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.HyphenationDecompounderTokenFilter>(ref reader, options);
-			case "icu_collation":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.IcuCollationTokenFilter>(ref reader, options);
-			case "icu_folding":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.IcuFoldingTokenFilter>(ref reader, options);
-			case "icu_normalizer":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.IcuNormalizationTokenFilter>(ref reader, options);
-			case "icu_transform":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.IcuTransformTokenFilter>(ref reader, options);
-			case "keep_types":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.KeepTypesTokenFilter>(ref reader, options);
-			case "keep":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.KeepWordsTokenFilter>(ref reader, options);
-			case "keyword_marker":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.KeywordMarkerTokenFilter>(ref reader, options);
-			case "kstem":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.KStemTokenFilter>(ref reader, options);
-			case "kuromoji_part_of_speech":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.KuromojiPartOfSpeechTokenFilter>(ref reader, options);
-			case "kuromoji_readingform":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.KuromojiReadingFormTokenFilter>(ref reader, options);
-			case "kuromoji_stemmer":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.KuromojiStemmerTokenFilter>(ref reader, options);
-			case "length":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.LengthTokenFilter>(ref reader, options);
-			case "limit":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.LimitTokenCountTokenFilter>(ref reader, options);
-			case "lowercase":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.LowercaseTokenFilter>(ref reader, options);
-			case "multiplexer":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.MultiplexerTokenFilter>(ref reader, options);
-			case "ngram":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.NGramTokenFilter>(ref reader, options);
-			case "nori_part_of_speech":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.NoriPartOfSpeechTokenFilter>(ref reader, options);
-			case "pattern_capture":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.PatternCaptureTokenFilter>(ref reader, options);
-			case "pattern_replace":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.PatternReplaceTokenFilter>(ref reader, options);
-			case "phonetic":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.PhoneticTokenFilter>(ref reader, options);
-			case "porter_stem":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.PorterStemTokenFilter>(ref reader, options);
-			case "predicate_token_filter":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.PredicateTokenFilter>(ref reader, options);
-			case "remove_duplicates":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.RemoveDuplicatesTokenFilter>(ref reader, options);
-			case "reverse":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.ReverseTokenFilter>(ref reader, options);
-			case "shingle":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.ShingleTokenFilter>(ref reader, options);
-			case "snowball":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.SnowballTokenFilter>(ref reader, options);
-			case "stemmer_override":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.StemmerOverrideTokenFilter>(ref reader, options);
-			case "stemmer":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.StemmerTokenFilter>(ref reader, options);
-			case "stop":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.StopTokenFilter>(ref reader, options);
-			case "synonym_graph":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.SynonymGraphTokenFilter>(ref reader, options);
-			case "synonym":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.SynonymTokenFilter>(ref reader, options);
-			case "trim":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.TrimTokenFilter>(ref reader, options);
-			case "truncate":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.TruncateTokenFilter>(ref reader, options);
-			case "unique":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.UniqueTokenFilter>(ref reader, options);
-			case "uppercase":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.UppercaseTokenFilter>(ref reader, options);
-			case "word_delimiter_graph":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.WordDelimiterGraphTokenFilter>(ref reader, options);
-			case "word_delimiter":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.WordDelimiterTokenFilter>(ref reader, options);
-			default:
-				ThrowHelper.ThrowUnknownTaggedUnionVariantJsonException(type, typeof(ITokenFilter));
-				return null;
-		}
+			"asciifolding" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.AsciiFoldingTokenFilter>(options),
+			"common_grams" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.CommonGramsTokenFilter>(options),
+			"condition" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.ConditionTokenFilter>(options),
+			"delimited_payload" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.DelimitedPayloadTokenFilter>(options),
+			"dictionary_decompounder" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.DictionaryDecompounderTokenFilter>(options),
+			"edge_ngram" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.EdgeNGramTokenFilter>(options),
+			"elision" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.ElisionTokenFilter>(options),
+			"fingerprint" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.FingerprintTokenFilter>(options),
+			"hunspell" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.HunspellTokenFilter>(options),
+			"hyphenation_decompounder" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.HyphenationDecompounderTokenFilter>(options),
+			"icu_collation" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.IcuCollationTokenFilter>(options),
+			"icu_folding" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.IcuFoldingTokenFilter>(options),
+			"icu_normalizer" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.IcuNormalizationTokenFilter>(options),
+			"icu_transform" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.IcuTransformTokenFilter>(options),
+			"keep_types" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.KeepTypesTokenFilter>(options),
+			"keep" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.KeepWordsTokenFilter>(options),
+			"keyword_marker" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.KeywordMarkerTokenFilter>(options),
+			"kstem" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.KStemTokenFilter>(options),
+			"kuromoji_part_of_speech" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.KuromojiPartOfSpeechTokenFilter>(options),
+			"kuromoji_readingform" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.KuromojiReadingFormTokenFilter>(options),
+			"kuromoji_stemmer" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.KuromojiStemmerTokenFilter>(options),
+			"length" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.LengthTokenFilter>(options),
+			"limit" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.LimitTokenCountTokenFilter>(options),
+			"lowercase" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.LowercaseTokenFilter>(options),
+			"multiplexer" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.MultiplexerTokenFilter>(options),
+			"ngram" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.NGramTokenFilter>(options),
+			"nori_part_of_speech" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.NoriPartOfSpeechTokenFilter>(options),
+			"pattern_capture" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.PatternCaptureTokenFilter>(options),
+			"pattern_replace" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.PatternReplaceTokenFilter>(options),
+			"phonetic" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.PhoneticTokenFilter>(options),
+			"porter_stem" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.PorterStemTokenFilter>(options),
+			"predicate_token_filter" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.PredicateTokenFilter>(options),
+			"remove_duplicates" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.RemoveDuplicatesTokenFilter>(options),
+			"reverse" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.ReverseTokenFilter>(options),
+			"shingle" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.ShingleTokenFilter>(options),
+			"snowball" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.SnowballTokenFilter>(options),
+			"stemmer_override" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.StemmerOverrideTokenFilter>(options),
+			"stemmer" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.StemmerTokenFilter>(options),
+			"stop" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.StopTokenFilter>(options),
+			"synonym_graph" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.SynonymGraphTokenFilter>(options),
+			"synonym" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.SynonymTokenFilter>(options),
+			"trim" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.TrimTokenFilter>(options),
+			"truncate" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.TruncateTokenFilter>(options),
+			"unique" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.UniqueTokenFilter>(options),
+			"uppercase" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.UppercaseTokenFilter>(options),
+			"word_delimiter_graph" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.WordDelimiterGraphTokenFilter>(options),
+			"word_delimiter" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.WordDelimiterTokenFilter>(options),
+			_ => throw new System.Text.Json.JsonException($"Variant '{discriminator}' is not supported for type '{nameof(ITokenFilter)}'.")
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, ITokenFilter value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ITokenFilter value, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (value is null)
-		{
-			writer.WriteNullValue();
-			return;
-		}
-
 		switch (value.Type)
 		{
 			case "asciifolding":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.AsciiFoldingTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.AsciiFoldingTokenFilter)value);
+				break;
 			case "common_grams":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.CommonGramsTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.CommonGramsTokenFilter)value);
+				break;
 			case "condition":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.ConditionTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.ConditionTokenFilter)value);
+				break;
 			case "delimited_payload":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.DelimitedPayloadTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.DelimitedPayloadTokenFilter)value);
+				break;
 			case "dictionary_decompounder":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.DictionaryDecompounderTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.DictionaryDecompounderTokenFilter)value);
+				break;
 			case "edge_ngram":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.EdgeNGramTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.EdgeNGramTokenFilter)value);
+				break;
 			case "elision":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.ElisionTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.ElisionTokenFilter)value);
+				break;
 			case "fingerprint":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.FingerprintTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.FingerprintTokenFilter)value);
+				break;
 			case "hunspell":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.HunspellTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.HunspellTokenFilter)value);
+				break;
 			case "hyphenation_decompounder":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.HyphenationDecompounderTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.HyphenationDecompounderTokenFilter)value);
+				break;
 			case "icu_collation":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.IcuCollationTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.IcuCollationTokenFilter)value);
+				break;
 			case "icu_folding":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.IcuFoldingTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.IcuFoldingTokenFilter)value);
+				break;
 			case "icu_normalizer":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.IcuNormalizationTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.IcuNormalizationTokenFilter)value);
+				break;
 			case "icu_transform":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.IcuTransformTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.IcuTransformTokenFilter)value);
+				break;
 			case "keep_types":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.KeepTypesTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.KeepTypesTokenFilter)value);
+				break;
 			case "keep":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.KeepWordsTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.KeepWordsTokenFilter)value);
+				break;
 			case "keyword_marker":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.KeywordMarkerTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.KeywordMarkerTokenFilter)value);
+				break;
 			case "kstem":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.KStemTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.KStemTokenFilter)value);
+				break;
 			case "kuromoji_part_of_speech":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.KuromojiPartOfSpeechTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.KuromojiPartOfSpeechTokenFilter)value);
+				break;
 			case "kuromoji_readingform":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.KuromojiReadingFormTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.KuromojiReadingFormTokenFilter)value);
+				break;
 			case "kuromoji_stemmer":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.KuromojiStemmerTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.KuromojiStemmerTokenFilter)value);
+				break;
 			case "length":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.LengthTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.LengthTokenFilter)value);
+				break;
 			case "limit":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.LimitTokenCountTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.LimitTokenCountTokenFilter)value);
+				break;
 			case "lowercase":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.LowercaseTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.LowercaseTokenFilter)value);
+				break;
 			case "multiplexer":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.MultiplexerTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.MultiplexerTokenFilter)value);
+				break;
 			case "ngram":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.NGramTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.NGramTokenFilter)value);
+				break;
 			case "nori_part_of_speech":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.NoriPartOfSpeechTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.NoriPartOfSpeechTokenFilter)value);
+				break;
 			case "pattern_capture":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.PatternCaptureTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.PatternCaptureTokenFilter)value);
+				break;
 			case "pattern_replace":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.PatternReplaceTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.PatternReplaceTokenFilter)value);
+				break;
 			case "phonetic":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.PhoneticTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.PhoneticTokenFilter)value);
+				break;
 			case "porter_stem":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.PorterStemTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.PorterStemTokenFilter)value);
+				break;
 			case "predicate_token_filter":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.PredicateTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.PredicateTokenFilter)value);
+				break;
 			case "remove_duplicates":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.RemoveDuplicatesTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.RemoveDuplicatesTokenFilter)value);
+				break;
 			case "reverse":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.ReverseTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.ReverseTokenFilter)value);
+				break;
 			case "shingle":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.ShingleTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.ShingleTokenFilter)value);
+				break;
 			case "snowball":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.SnowballTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.SnowballTokenFilter)value);
+				break;
 			case "stemmer_override":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.StemmerOverrideTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.StemmerOverrideTokenFilter)value);
+				break;
 			case "stemmer":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.StemmerTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.StemmerTokenFilter)value);
+				break;
 			case "stop":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.StopTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.StopTokenFilter)value);
+				break;
 			case "synonym_graph":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.SynonymGraphTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.SynonymGraphTokenFilter)value);
+				break;
 			case "synonym":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.SynonymTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.SynonymTokenFilter)value);
+				break;
 			case "trim":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.TrimTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.TrimTokenFilter)value);
+				break;
 			case "truncate":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.TruncateTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.TruncateTokenFilter)value);
+				break;
 			case "unique":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.UniqueTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.UniqueTokenFilter)value);
+				break;
 			case "uppercase":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.UppercaseTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.UppercaseTokenFilter)value);
+				break;
 			case "word_delimiter_graph":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.WordDelimiterGraphTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.WordDelimiterGraphTokenFilter)value);
+				break;
 			case "word_delimiter":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.WordDelimiterTokenFilter), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.WordDelimiterTokenFilter)value);
+				break;
 			default:
-				var type = value.GetType();
-				JsonSerializer.Serialize(writer, value, type, options);
-				return;
+				throw new System.Text.Json.JsonException($"Variant '{value.Type}' is not supported for type '{nameof(ITokenFilter)}'.");
 		}
 	}
 }
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 54f24ae2bab..07227cc2d70 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/Tokenizers.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/Tokenizers.g.cs
@@ -19,6 +19,7 @@
 
 using Elastic.Clients.Elasticsearch.Core;
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport;
 using System;
@@ -122,130 +123,110 @@ public TokenizersDescriptor() : base(new Tokenizers())
 	public TokenizersDescriptor Whitespace(string tokenizerName, WhitespaceTokenizer whitespaceTokenizer) => AssignVariant(tokenizerName, whitespaceTokenizer);
 }
 
-internal sealed partial class TokenizerInterfaceConverter : JsonConverter<ITokenizer>
+internal sealed partial class TokenizerInterfaceConverter : System.Text.Json.Serialization.JsonConverter<ITokenizer>
 {
-	public override ITokenizer Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropDiscriminator = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override ITokenizer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var copiedReader = reader;
-		string? type = null;
-		using var jsonDoc = JsonDocument.ParseValue(ref copiedReader);
-		if (jsonDoc is not null && jsonDoc.RootElement.TryGetProperty("type", out var readType) && readType.ValueKind == JsonValueKind.String)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		var readerSnapshot = reader;
+		string? discriminator = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			type = readType.ToString();
+			if (reader.TryReadProperty(options, PropDiscriminator, ref discriminator))
+			{
+				break;
+			}
+
+			reader.Skip();
 		}
 
-		switch (type)
+		reader = readerSnapshot;
+		return discriminator switch
 		{
-			case "char_group":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.CharGroupTokenizer>(ref reader, options);
-			case "classic":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.ClassicTokenizer>(ref reader, options);
-			case "edge_ngram":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.EdgeNGramTokenizer>(ref reader, options);
-			case "icu_tokenizer":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.IcuTokenizer>(ref reader, options);
-			case "keyword":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.KeywordTokenizer>(ref reader, options);
-			case "kuromoji_tokenizer":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.KuromojiTokenizer>(ref reader, options);
-			case "letter":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.LetterTokenizer>(ref reader, options);
-			case "lowercase":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.LowercaseTokenizer>(ref reader, options);
-			case "ngram":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.NGramTokenizer>(ref reader, options);
-			case "nori_tokenizer":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.NoriTokenizer>(ref reader, options);
-			case "path_hierarchy":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.PathHierarchyTokenizer>(ref reader, options);
-			case "pattern":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.PatternTokenizer>(ref reader, options);
-			case "simple_pattern_split":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.SimplePatternSplitTokenizer>(ref reader, options);
-			case "simple_pattern":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.SimplePatternTokenizer>(ref reader, options);
-			case "standard":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.StandardTokenizer>(ref reader, options);
-			case "thai":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.ThaiTokenizer>(ref reader, options);
-			case "uax_url_email":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.UaxEmailUrlTokenizer>(ref reader, options);
-			case "whitespace":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Analysis.WhitespaceTokenizer>(ref reader, options);
-			default:
-				ThrowHelper.ThrowUnknownTaggedUnionVariantJsonException(type, typeof(ITokenizer));
-				return null;
-		}
+			"char_group" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.CharGroupTokenizer>(options),
+			"classic" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.ClassicTokenizer>(options),
+			"edge_ngram" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.EdgeNGramTokenizer>(options),
+			"icu_tokenizer" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.IcuTokenizer>(options),
+			"keyword" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.KeywordTokenizer>(options),
+			"kuromoji_tokenizer" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.KuromojiTokenizer>(options),
+			"letter" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.LetterTokenizer>(options),
+			"lowercase" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.LowercaseTokenizer>(options),
+			"ngram" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.NGramTokenizer>(options),
+			"nori_tokenizer" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.NoriTokenizer>(options),
+			"path_hierarchy" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.PathHierarchyTokenizer>(options),
+			"pattern" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.PatternTokenizer>(options),
+			"simple_pattern_split" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.SimplePatternSplitTokenizer>(options),
+			"simple_pattern" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.SimplePatternTokenizer>(options),
+			"standard" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.StandardTokenizer>(options),
+			"thai" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.ThaiTokenizer>(options),
+			"uax_url_email" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.UaxEmailUrlTokenizer>(options),
+			"whitespace" => reader.ReadValue<Elastic.Clients.Elasticsearch.Analysis.WhitespaceTokenizer>(options),
+			_ => throw new System.Text.Json.JsonException($"Variant '{discriminator}' is not supported for type '{nameof(ITokenizer)}'.")
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, ITokenizer value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ITokenizer value, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (value is null)
-		{
-			writer.WriteNullValue();
-			return;
-		}
-
 		switch (value.Type)
 		{
 			case "char_group":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.CharGroupTokenizer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.CharGroupTokenizer)value);
+				break;
 			case "classic":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.ClassicTokenizer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.ClassicTokenizer)value);
+				break;
 			case "edge_ngram":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.EdgeNGramTokenizer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.EdgeNGramTokenizer)value);
+				break;
 			case "icu_tokenizer":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.IcuTokenizer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.IcuTokenizer)value);
+				break;
 			case "keyword":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.KeywordTokenizer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.KeywordTokenizer)value);
+				break;
 			case "kuromoji_tokenizer":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.KuromojiTokenizer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.KuromojiTokenizer)value);
+				break;
 			case "letter":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.LetterTokenizer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.LetterTokenizer)value);
+				break;
 			case "lowercase":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.LowercaseTokenizer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.LowercaseTokenizer)value);
+				break;
 			case "ngram":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.NGramTokenizer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.NGramTokenizer)value);
+				break;
 			case "nori_tokenizer":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.NoriTokenizer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.NoriTokenizer)value);
+				break;
 			case "path_hierarchy":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.PathHierarchyTokenizer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.PathHierarchyTokenizer)value);
+				break;
 			case "pattern":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.PatternTokenizer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.PatternTokenizer)value);
+				break;
 			case "simple_pattern_split":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.SimplePatternSplitTokenizer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.SimplePatternSplitTokenizer)value);
+				break;
 			case "simple_pattern":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.SimplePatternTokenizer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.SimplePatternTokenizer)value);
+				break;
 			case "standard":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.StandardTokenizer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.StandardTokenizer)value);
+				break;
 			case "thai":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.ThaiTokenizer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.ThaiTokenizer)value);
+				break;
 			case "uax_url_email":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.UaxEmailUrlTokenizer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.UaxEmailUrlTokenizer)value);
+				break;
 			case "whitespace":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Analysis.WhitespaceTokenizer), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Analysis.WhitespaceTokenizer)value);
+				break;
 			default:
-				var type = value.GetType();
-				JsonSerializer.Serialize(writer, value, type, options);
-				return;
+				throw new System.Text.Json.JsonException($"Variant '{value.Type}' is not supported for type '{nameof(ITokenizer)}'.");
 		}
 	}
 }
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/TurkishAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/TurkishAnalyzer.g.cs
index 29aad7e4200..e60dc18d4a0 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/TurkishAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/TurkishAnalyzer.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,17 +28,74 @@
 
 namespace Elastic.Clients.Elasticsearch.Analysis;
 
+internal sealed partial class TurkishAnalyzerConverter : System.Text.Json.Serialization.JsonConverter<TurkishAnalyzer>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropStemExclusion = System.Text.Json.JsonEncodedText.Encode("stem_exclusion");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwords = System.Text.Json.JsonEncodedText.Encode("stopwords");
+	private static readonly System.Text.Json.JsonEncodedText PropStopwordsPath = System.Text.Json.JsonEncodedText.Encode("stopwords_path");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override TurkishAnalyzer Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propStemExclusion = default;
+		LocalJsonProperty<ICollection<string>?> propStopwords = default;
+		LocalJsonProperty<string?> propStopwordsPath = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propStemExclusion.TryRead(ref reader, options, PropStemExclusion))
+			{
+				continue;
+			}
+
+			if (propStopwords.TryRead(ref reader, options, PropStopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propStopwordsPath.TryRead(ref reader, options, PropStopwordsPath))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new TurkishAnalyzer
+		{
+			StemExclusion = propStemExclusion.Value
+,
+			Stopwords = propStopwords.Value
+,
+			StopwordsPath = propStopwordsPath.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, TurkishAnalyzer value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropStemExclusion, value.StemExclusion);
+		writer.WriteProperty(options, PropStopwords, value.Stopwords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropStopwordsPath, value.StopwordsPath);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(TurkishAnalyzerConverter))]
 public sealed partial class TurkishAnalyzer : IAnalyzer
 {
-	[JsonInclude, JsonPropertyName("stem_exclusion")]
 	public ICollection<string>? StemExclusion { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Stopwords { get; set; }
-	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "turkish";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/CompletionStats.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/CompletionStats.g.cs
index 00c49f9380c..c2fe4eb7f3c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/CompletionStats.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/CompletionStats.g.cs
@@ -30,7 +30,6 @@ 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; }
 
 	/// <summary>
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 7305368830a..960a1b5ba6f 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
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,150 @@
 
 namespace Elastic.Clients.Elasticsearch.Core.FieldCaps;
 
+internal sealed partial class FieldCapabilityConverter : System.Text.Json.Serialization.JsonConverter<FieldCapability>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAggregatable = System.Text.Json.JsonEncodedText.Encode("aggregatable");
+	private static readonly System.Text.Json.JsonEncodedText PropIndices = System.Text.Json.JsonEncodedText.Encode("indices");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropMetadataField = System.Text.Json.JsonEncodedText.Encode("metadata_field");
+	private static readonly System.Text.Json.JsonEncodedText PropMetricConflictsIndices = System.Text.Json.JsonEncodedText.Encode("metric_conflicts_indices");
+	private static readonly System.Text.Json.JsonEncodedText PropNonAggregatableIndices = System.Text.Json.JsonEncodedText.Encode("non_aggregatable_indices");
+	private static readonly System.Text.Json.JsonEncodedText PropNonDimensionIndices = System.Text.Json.JsonEncodedText.Encode("non_dimension_indices");
+	private static readonly System.Text.Json.JsonEncodedText PropNonSearchableIndices = System.Text.Json.JsonEncodedText.Encode("non_searchable_indices");
+	private static readonly System.Text.Json.JsonEncodedText PropSearchable = System.Text.Json.JsonEncodedText.Encode("searchable");
+	private static readonly System.Text.Json.JsonEncodedText PropTimeSeriesDimension = System.Text.Json.JsonEncodedText.Encode("time_series_dimension");
+	private static readonly System.Text.Json.JsonEncodedText PropTimeSeriesMetric = System.Text.Json.JsonEncodedText.Encode("time_series_metric");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override FieldCapability Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAggregatable = default;
+		LocalJsonProperty<IReadOnlyCollection<string>?> propIndices = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, object>?> propMeta = default;
+		LocalJsonProperty<bool?> propMetadataField = default;
+		LocalJsonProperty<IReadOnlyCollection<string>?> propMetricConflictsIndices = default;
+		LocalJsonProperty<IReadOnlyCollection<string>?> propNonAggregatableIndices = default;
+		LocalJsonProperty<IReadOnlyCollection<string>?> propNonDimensionIndices = default;
+		LocalJsonProperty<IReadOnlyCollection<string>?> propNonSearchableIndices = default;
+		LocalJsonProperty<bool> propSearchable = default;
+		LocalJsonProperty<bool?> propTimeSeriesDimension = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.TimeSeriesMetricType?> propTimeSeriesMetric = default;
+		LocalJsonProperty<string> propType = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAggregatable.TryRead(ref reader, options, PropAggregatable))
+			{
+				continue;
+			}
+
+			if (propIndices.TryRead(ref reader, options, PropIndices, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propMetadataField.TryRead(ref reader, options, PropMetadataField))
+			{
+				continue;
+			}
+
+			if (propMetricConflictsIndices.TryRead(ref reader, options, PropMetricConflictsIndices))
+			{
+				continue;
+			}
+
+			if (propNonAggregatableIndices.TryRead(ref reader, options, PropNonAggregatableIndices, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propNonDimensionIndices.TryRead(ref reader, options, PropNonDimensionIndices))
+			{
+				continue;
+			}
+
+			if (propNonSearchableIndices.TryRead(ref reader, options, PropNonSearchableIndices, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propSearchable.TryRead(ref reader, options, PropSearchable))
+			{
+				continue;
+			}
+
+			if (propTimeSeriesDimension.TryRead(ref reader, options, PropTimeSeriesDimension))
+			{
+				continue;
+			}
+
+			if (propTimeSeriesMetric.TryRead(ref reader, options, PropTimeSeriesMetric))
+			{
+				continue;
+			}
+
+			if (propType.TryRead(ref reader, options, PropType))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new FieldCapability
+		{
+			Aggregatable = propAggregatable.Value
+,
+			Indices = propIndices.Value
+,
+			Meta = propMeta.Value
+,
+			MetadataField = propMetadataField.Value
+,
+			MetricConflictsIndices = propMetricConflictsIndices.Value
+,
+			NonAggregatableIndices = propNonAggregatableIndices.Value
+,
+			NonDimensionIndices = propNonDimensionIndices.Value
+,
+			NonSearchableIndices = propNonSearchableIndices.Value
+,
+			Searchable = propSearchable.Value
+,
+			TimeSeriesDimension = propTimeSeriesDimension.Value
+,
+			TimeSeriesMetric = propTimeSeriesMetric.Value
+,
+			Type = propType.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, FieldCapability value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAggregatable, value.Aggregatable);
+		writer.WriteProperty(options, PropIndices, value.Indices, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropMetadataField, value.MetadataField);
+		writer.WriteProperty(options, PropMetricConflictsIndices, value.MetricConflictsIndices);
+		writer.WriteProperty(options, PropNonAggregatableIndices, value.NonAggregatableIndices, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropNonDimensionIndices, value.NonDimensionIndices);
+		writer.WriteProperty(options, PropNonSearchableIndices, value.NonSearchableIndices, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropSearchable, value.Searchable);
+		writer.WriteProperty(options, PropTimeSeriesDimension, value.TimeSeriesDimension);
+		writer.WriteProperty(options, PropTimeSeriesMetric, value.TimeSeriesMetric);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(FieldCapabilityConverter))]
 public sealed partial class FieldCapability
 {
 	/// <summary>
@@ -34,7 +179,6 @@ public sealed partial class FieldCapability
 	/// Whether this field can be aggregated on all indices.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("aggregatable")]
 	public bool Aggregatable { get; init; }
 
 	/// <summary>
@@ -42,8 +186,6 @@ public sealed partial class FieldCapability
 	/// 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")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public IReadOnlyCollection<string>? Indices { get; init; }
 
 	/// <summary>
@@ -51,7 +193,6 @@ public sealed partial class FieldCapability
 	/// 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>
@@ -59,7 +200,6 @@ public sealed partial class FieldCapability
 	/// Whether this field is registered as a metadata field.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("metadata_field")]
 	public bool? MetadataField { get; init; }
 
 	/// <summary>
@@ -68,7 +208,6 @@ public sealed partial class FieldCapability
 	/// don’t have the same <c>time_series_metric</c> value for this field.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("metric_conflicts_indices")]
 	public IReadOnlyCollection<string>? MetricConflictsIndices { get; init; }
 
 	/// <summary>
@@ -76,8 +215,6 @@ public sealed partial class FieldCapability
 	/// 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")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public IReadOnlyCollection<string>? NonAggregatableIndices { get; init; }
 
 	/// <summary>
@@ -86,7 +223,6 @@ public sealed partial class FieldCapability
 	/// field marked as a dimension and other indices, the ones in this list, do not.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("non_dimension_indices")]
 	public IReadOnlyCollection<string>? NonDimensionIndices { get; init; }
 
 	/// <summary>
@@ -94,8 +230,6 @@ public sealed partial class FieldCapability
 	/// 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")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public IReadOnlyCollection<string>? NonSearchableIndices { get; init; }
 
 	/// <summary>
@@ -103,7 +237,6 @@ public sealed partial class FieldCapability
 	/// Whether this field is indexed for search on all indices.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("searchable")]
 	public bool Searchable { get; init; }
 
 	/// <summary>
@@ -111,7 +244,6 @@ public sealed partial class FieldCapability
 	/// Whether this field is used as a time series dimension.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("time_series_dimension")]
 	public bool? TimeSeriesDimension { get; init; }
 
 	/// <summary>
@@ -120,8 +252,6 @@ public sealed partial class FieldCapability
 	/// 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 07624ca28ed..43127450137 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
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,27 +28,157 @@
 
 namespace Elastic.Clients.Elasticsearch.Core.Get;
 
+internal sealed partial class GetResultConverter<TDocument> : System.Text.Json.Serialization.JsonConverter<GetResult<TDocument>>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropFound = System.Text.Json.JsonEncodedText.Encode("found");
+	private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("_id");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnored = System.Text.Json.JsonEncodedText.Encode("_ignored");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("_index");
+	private static readonly System.Text.Json.JsonEncodedText PropPrimaryTerm = System.Text.Json.JsonEncodedText.Encode("_primary_term");
+	private static readonly System.Text.Json.JsonEncodedText PropRouting = System.Text.Json.JsonEncodedText.Encode("_routing");
+	private static readonly System.Text.Json.JsonEncodedText PropSeqNo = System.Text.Json.JsonEncodedText.Encode("_seq_no");
+	private static readonly System.Text.Json.JsonEncodedText PropSource = System.Text.Json.JsonEncodedText.Encode("_source");
+	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("_version");
+
+	public override GetResult<TDocument> Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.FieldValues?> propFields = default;
+		LocalJsonProperty<bool> propFound = default;
+		LocalJsonProperty<string> propId = default;
+		LocalJsonProperty<IReadOnlyCollection<string>?> propIgnored = default;
+		LocalJsonProperty<string> propIndex = default;
+		LocalJsonProperty<long?> propPrimaryTerm = default;
+		LocalJsonProperty<string?> propRouting = default;
+		LocalJsonProperty<long?> propSeqNo = default;
+		LocalJsonProperty<TDocument?> propSource = default;
+		LocalJsonProperty<long?> propVersion = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propFound.TryRead(ref reader, options, PropFound))
+			{
+				continue;
+			}
+
+			if (propId.TryRead(ref reader, options, PropId))
+			{
+				continue;
+			}
+
+			if (propIgnored.TryRead(ref reader, options, PropIgnored))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propPrimaryTerm.TryRead(ref reader, options, PropPrimaryTerm))
+			{
+				continue;
+			}
+
+			if (propRouting.TryRead(ref reader, options, PropRouting))
+			{
+				continue;
+			}
+
+			if (propSeqNo.TryRead(ref reader, options, PropSeqNo))
+			{
+				continue;
+			}
+
+			if (propSource.TryRead(ref reader, options, PropSource, typeof(SourceMarker<TDocument?>)))
+			{
+				continue;
+			}
+
+			if (propVersion.TryRead(ref reader, options, PropVersion))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GetResult<TDocument>
+		{
+			Fields = propFields.Value
+,
+			Found = propFound.Value
+,
+			Id = propId.Value
+,
+			Ignored = propIgnored.Value
+,
+			Index = propIndex.Value
+,
+			PrimaryTerm = propPrimaryTerm.Value
+,
+			Routing = propRouting.Value
+,
+			SeqNo = propSeqNo.Value
+,
+			Source = propSource.Value
+,
+			Version = propVersion.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GetResult<TDocument> value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropFound, value.Found);
+		writer.WriteProperty(options, PropId, value.Id);
+		writer.WriteProperty(options, PropIgnored, value.Ignored);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropPrimaryTerm, value.PrimaryTerm);
+		writer.WriteProperty(options, PropRouting, value.Routing);
+		writer.WriteProperty(options, PropSeqNo, value.SeqNo);
+		writer.WriteProperty(options, PropSource, value.Source, typeof(SourceMarker<TDocument?>));
+		writer.WriteProperty(options, PropVersion, value.Version);
+		writer.WriteEndObject();
+	}
+}
+
+internal sealed partial class GetResultConverterFactory : System.Text.Json.Serialization.JsonConverterFactory
+{
+	public override bool CanConvert(System.Type typeToConvert)
+	{
+		return typeToConvert.IsGenericType && typeToConvert.GetGenericTypeDefinition() == typeof(GetResult<>);
+	}
+
+	public override System.Text.Json.Serialization.JsonConverter CreateConverter(System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		var args = typeToConvert.GetGenericArguments();
+#pragma warning disable IL3050
+		var converter = (System.Text.Json.Serialization.JsonConverter)System.Activator.CreateInstance(typeof(GetResultConverter<>).MakeGenericType(args[0]), System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public, binder: null, args: null, culture: null)!;
+#pragma warning restore IL3050
+		return converter;
+	}
+}
+
+[JsonConverter(typeof(GetResultConverterFactory))]
 public sealed partial class GetResult<TDocument>
 {
-	[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("_ignored")]
 	public IReadOnlyCollection<string>? Ignored { 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/Types/Core/HealthReport/DiagnosisAffectedResources.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/HealthReport/DiagnosisAffectedResources.g.cs
index 389fd578f42..6a1a95e9102 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/HealthReport/DiagnosisAffectedResources.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/HealthReport/DiagnosisAffectedResources.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,17 +28,85 @@
 
 namespace Elastic.Clients.Elasticsearch.Core.HealthReport;
 
+internal sealed partial class DiagnosisAffectedResourcesConverter : System.Text.Json.Serialization.JsonConverter<DiagnosisAffectedResources>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropFeatureStates = System.Text.Json.JsonEncodedText.Encode("feature_states");
+	private static readonly System.Text.Json.JsonEncodedText PropIndices = System.Text.Json.JsonEncodedText.Encode("indices");
+	private static readonly System.Text.Json.JsonEncodedText PropNodes = System.Text.Json.JsonEncodedText.Encode("nodes");
+	private static readonly System.Text.Json.JsonEncodedText PropSlmPolicies = System.Text.Json.JsonEncodedText.Encode("slm_policies");
+	private static readonly System.Text.Json.JsonEncodedText PropSnapshotRepositories = System.Text.Json.JsonEncodedText.Encode("snapshot_repositories");
+
+	public override DiagnosisAffectedResources Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<string>?> propFeatureStates = default;
+		LocalJsonProperty<IReadOnlyCollection<string>?> propIndices = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Core.HealthReport.IndicatorNode>?> propNodes = default;
+		LocalJsonProperty<IReadOnlyCollection<string>?> propSlmPolicies = default;
+		LocalJsonProperty<IReadOnlyCollection<string>?> propSnapshotRepositories = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propFeatureStates.TryRead(ref reader, options, PropFeatureStates))
+			{
+				continue;
+			}
+
+			if (propIndices.TryRead(ref reader, options, PropIndices, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propNodes.TryRead(ref reader, options, PropNodes))
+			{
+				continue;
+			}
+
+			if (propSlmPolicies.TryRead(ref reader, options, PropSlmPolicies))
+			{
+				continue;
+			}
+
+			if (propSnapshotRepositories.TryRead(ref reader, options, PropSnapshotRepositories))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DiagnosisAffectedResources
+		{
+			FeatureStates = propFeatureStates.Value
+,
+			Indices = propIndices.Value
+,
+			Nodes = propNodes.Value
+,
+			SlmPolicies = propSlmPolicies.Value
+,
+			SnapshotRepositories = propSnapshotRepositories.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DiagnosisAffectedResources value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropFeatureStates, value.FeatureStates);
+		writer.WriteProperty(options, PropIndices, value.Indices, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropNodes, value.Nodes);
+		writer.WriteProperty(options, PropSlmPolicies, value.SlmPolicies);
+		writer.WriteProperty(options, PropSnapshotRepositories, value.SnapshotRepositories);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DiagnosisAffectedResourcesConverter))]
 public sealed partial class DiagnosisAffectedResources
 {
-	[JsonInclude, JsonPropertyName("feature_states")]
 	public IReadOnlyCollection<string>? FeatureStates { get; init; }
-	[JsonInclude, JsonPropertyName("indices")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public IReadOnlyCollection<string>? Indices { get; init; }
-	[JsonInclude, JsonPropertyName("nodes")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Core.HealthReport.IndicatorNode>? Nodes { get; init; }
-	[JsonInclude, JsonPropertyName("slm_policies")]
 	public IReadOnlyCollection<string>? SlmPolicies { get; init; }
-	[JsonInclude, JsonPropertyName("snapshot_repositories")]
 	public IReadOnlyCollection<string>? SnapshotRepositories { 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 eb20a84fc6e..78659c1433d 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
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,100 @@
 
 namespace Elastic.Clients.Elasticsearch.Core.MGet;
 
+internal sealed partial class MultiGetOperationConverter : System.Text.Json.Serialization.JsonConverter<MultiGetOperation>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("_id");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("_index");
+	private static readonly System.Text.Json.JsonEncodedText PropRouting = System.Text.Json.JsonEncodedText.Encode("routing");
+	private static readonly System.Text.Json.JsonEncodedText PropSource = System.Text.Json.JsonEncodedText.Encode("_source");
+	private static readonly System.Text.Json.JsonEncodedText PropStoredFields = System.Text.Json.JsonEncodedText.Encode("stored_fields");
+	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("version");
+	private static readonly System.Text.Json.JsonEncodedText PropVersionType = System.Text.Json.JsonEncodedText.Encode("version_type");
+
+	public override MultiGetOperation Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Id> propId = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.IndexName?> propIndex = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Routing?> propRouting = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Core.Search.SourceConfig?> propSource = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Fields?> propStoredFields = default;
+		LocalJsonProperty<long?> propVersion = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.VersionType?> propVersionType = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propId.TryRead(ref reader, options, PropId))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propRouting.TryRead(ref reader, options, PropRouting))
+			{
+				continue;
+			}
+
+			if (propSource.TryRead(ref reader, options, PropSource))
+			{
+				continue;
+			}
+
+			if (propStoredFields.TryRead(ref reader, options, PropStoredFields, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propVersion.TryRead(ref reader, options, PropVersion))
+			{
+				continue;
+			}
+
+			if (propVersionType.TryRead(ref reader, options, PropVersionType))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new MultiGetOperation
+		{
+			Id = propId.Value
+,
+			Index = propIndex.Value
+,
+			Routing = propRouting.Value
+,
+			Source = propSource.Value
+,
+			StoredFields = propStoredFields.Value
+,
+			Version = propVersion.Value
+,
+			VersionType = propVersionType.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, MultiGetOperation value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropId, value.Id);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropRouting, value.Routing);
+		writer.WriteProperty(options, PropSource, value.Source);
+		writer.WriteProperty(options, PropStoredFields, value.StoredFields, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropVersion, value.Version);
+		writer.WriteProperty(options, PropVersionType, value.VersionType);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(MultiGetOperationConverter))]
 public sealed partial class MultiGetOperation
 {
 	/// <summary>
@@ -34,7 +129,6 @@ public sealed partial class MultiGetOperation
 	/// The unique document ID.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("_id")]
 	public Elastic.Clients.Elasticsearch.Id Id { get; set; }
 
 	/// <summary>
@@ -42,7 +136,6 @@ public sealed partial class MultiGetOperation
 	/// The index that contains the document.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("_index")]
 	public Elastic.Clients.Elasticsearch.IndexName? Index { get; set; }
 
 	/// <summary>
@@ -50,7 +143,6 @@ public sealed partial class MultiGetOperation
 	/// 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>
@@ -58,7 +150,6 @@ public sealed partial class MultiGetOperation
 	/// If <c>false</c>, excludes all _source fields.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("_source")]
 	public Elastic.Clients.Elasticsearch.Core.Search.SourceConfig? Source { get; set; }
 
 	/// <summary>
@@ -66,12 +157,8 @@ public sealed partial class MultiGetOperation
 	/// The stored fields you want to retrieve.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("stored_fields")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	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; }
 }
 
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 1cac0049899..cba6e236941 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
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,399 +28,336 @@
 
 namespace Elastic.Clients.Elasticsearch.Core.MSearch;
 
-internal sealed partial class MultisearchBodyConverter : JsonConverter<MultisearchBody>
+internal sealed partial class MultisearchBodyConverter : System.Text.Json.Serialization.JsonConverter<MultisearchBody>
 {
-	public override MultisearchBody Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		var variant = new MultisearchBody();
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
-		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations1 = System.Text.Json.JsonEncodedText.Encode("aggs");
+	private static readonly System.Text.Json.JsonEncodedText PropCollapse = System.Text.Json.JsonEncodedText.Encode("collapse");
+	private static readonly System.Text.Json.JsonEncodedText PropDocvalueFields = System.Text.Json.JsonEncodedText.Encode("docvalue_fields");
+	private static readonly System.Text.Json.JsonEncodedText PropExplain = System.Text.Json.JsonEncodedText.Encode("explain");
+	private static readonly System.Text.Json.JsonEncodedText PropExt = System.Text.Json.JsonEncodedText.Encode("ext");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropFrom = System.Text.Json.JsonEncodedText.Encode("from");
+	private static readonly System.Text.Json.JsonEncodedText PropHighlight = System.Text.Json.JsonEncodedText.Encode("highlight");
+	private static readonly System.Text.Json.JsonEncodedText PropIndicesBoost = System.Text.Json.JsonEncodedText.Encode("indices_boost");
+	private static readonly System.Text.Json.JsonEncodedText PropKnn = System.Text.Json.JsonEncodedText.Encode("knn");
+	private static readonly System.Text.Json.JsonEncodedText PropMinScore = System.Text.Json.JsonEncodedText.Encode("min_score");
+	private static readonly System.Text.Json.JsonEncodedText PropPit = System.Text.Json.JsonEncodedText.Encode("pit");
+	private static readonly System.Text.Json.JsonEncodedText PropPostFilter = System.Text.Json.JsonEncodedText.Encode("post_filter");
+	private static readonly System.Text.Json.JsonEncodedText PropProfile = System.Text.Json.JsonEncodedText.Encode("profile");
+	private static readonly System.Text.Json.JsonEncodedText PropQuery = System.Text.Json.JsonEncodedText.Encode("query");
+	private static readonly System.Text.Json.JsonEncodedText PropRescore = System.Text.Json.JsonEncodedText.Encode("rescore");
+	private static readonly System.Text.Json.JsonEncodedText PropRuntimeMappings = System.Text.Json.JsonEncodedText.Encode("runtime_mappings");
+	private static readonly System.Text.Json.JsonEncodedText PropScriptFields = System.Text.Json.JsonEncodedText.Encode("script_fields");
+	private static readonly System.Text.Json.JsonEncodedText PropSearchAfter = System.Text.Json.JsonEncodedText.Encode("search_after");
+	private static readonly System.Text.Json.JsonEncodedText PropSeqNoPrimaryTerm = System.Text.Json.JsonEncodedText.Encode("seq_no_primary_term");
+	private static readonly System.Text.Json.JsonEncodedText PropSize = System.Text.Json.JsonEncodedText.Encode("size");
+	private static readonly System.Text.Json.JsonEncodedText PropSort = System.Text.Json.JsonEncodedText.Encode("sort");
+	private static readonly System.Text.Json.JsonEncodedText PropSource = System.Text.Json.JsonEncodedText.Encode("_source");
+	private static readonly System.Text.Json.JsonEncodedText PropStats = System.Text.Json.JsonEncodedText.Encode("stats");
+	private static readonly System.Text.Json.JsonEncodedText PropStoredFields = System.Text.Json.JsonEncodedText.Encode("stored_fields");
+	private static readonly System.Text.Json.JsonEncodedText PropSuggest = System.Text.Json.JsonEncodedText.Encode("suggest");
+	private static readonly System.Text.Json.JsonEncodedText PropTerminateAfter = System.Text.Json.JsonEncodedText.Encode("terminate_after");
+	private static readonly System.Text.Json.JsonEncodedText PropTimeout = System.Text.Json.JsonEncodedText.Encode("timeout");
+	private static readonly System.Text.Json.JsonEncodedText PropTrackScores = System.Text.Json.JsonEncodedText.Encode("track_scores");
+	private static readonly System.Text.Json.JsonEncodedText PropTrackTotalHits = System.Text.Json.JsonEncodedText.Encode("track_total_hits");
+	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("version");
+
+	public override MultisearchBody Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IDictionary<string, Elastic.Clients.Elasticsearch.Aggregations.Aggregation>?> propAggregations = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Core.Search.FieldCollapse?> propCollapse = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.QueryDsl.FieldAndFormat>?> propDocvalueFields = default;
+		LocalJsonProperty<bool?> propExplain = default;
+		LocalJsonProperty<IDictionary<string, object>?> propExt = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.QueryDsl.FieldAndFormat>?> propFields = default;
+		LocalJsonProperty<int?> propFrom = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Core.Search.Highlight?> propHighlight = default;
+		LocalJsonProperty<ICollection<IDictionary<Elastic.Clients.Elasticsearch.IndexName, double>>?> propIndicesBoost = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.KnnSearch>?> propKnn = default;
+		LocalJsonProperty<double?> propMinScore = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Core.Search.PointInTimeReference?> propPit = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.QueryDsl.Query?> propPostFilter = default;
+		LocalJsonProperty<bool?> propProfile = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.QueryDsl.Query?> propQuery = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Core.Search.Rescore>?> propRescore = default;
+		LocalJsonProperty<IDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>?> propRuntimeMappings = default;
+		LocalJsonProperty<IDictionary<string, Elastic.Clients.Elasticsearch.ScriptField>?> propScriptFields = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.FieldValue>?> propSearchAfter = default;
+		LocalJsonProperty<bool?> propSeqNoPrimaryTerm = default;
+		LocalJsonProperty<int?> propSize = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.SortOptions>?> propSort = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Core.Search.SourceConfig?> propSource = default;
+		LocalJsonProperty<ICollection<string>?> propStats = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Fields?> propStoredFields = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Core.Search.Suggester?> propSuggest = default;
+		LocalJsonProperty<long?> propTerminateAfter = default;
+		LocalJsonProperty<string?> propTimeout = default;
+		LocalJsonProperty<bool?> propTrackScores = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Core.Search.TrackHits?> propTrackTotalHits = default;
+		LocalJsonProperty<bool?> propVersion = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAggregations.TryRead(ref reader, options, PropAggregations) || propAggregations.TryRead(ref reader, options, PropAggregations1))
 			{
-				var property = reader.GetString();
-				if (property == "aggregations" || property == "aggs")
-				{
-					variant.Aggregations = JsonSerializer.Deserialize<IDictionary<string, Elastic.Clients.Elasticsearch.Aggregations.Aggregation>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "collapse")
-				{
-					variant.Collapse = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Core.Search.FieldCollapse?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "docvalue_fields")
-				{
-					variant.DocvalueFields = JsonSerializer.Deserialize<ICollection<Elastic.Clients.Elasticsearch.QueryDsl.FieldAndFormat>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "explain")
-				{
-					variant.Explain = JsonSerializer.Deserialize<bool?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "ext")
-				{
-					variant.Ext = JsonSerializer.Deserialize<IDictionary<string, object>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "fields")
-				{
-					variant.Fields = JsonSerializer.Deserialize<ICollection<Elastic.Clients.Elasticsearch.QueryDsl.FieldAndFormat>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "from")
-				{
-					variant.From = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "highlight")
-				{
-					variant.Highlight = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Core.Search.Highlight?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "indices_boost")
-				{
-					variant.IndicesBoost = JsonSerializer.Deserialize<ICollection<IDictionary<Elastic.Clients.Elasticsearch.IndexName, double>>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "knn")
-				{
-					variant.Knn = SingleOrManySerializationHelper.Deserialize<Elastic.Clients.Elasticsearch.KnnSearch>(ref reader, options);
-					continue;
-				}
-
-				if (property == "min_score")
-				{
-					variant.MinScore = JsonSerializer.Deserialize<double?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "pit")
-				{
-					variant.Pit = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Core.Search.PointInTimeReference?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "post_filter")
-				{
-					variant.PostFilter = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.Query?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "profile")
-				{
-					variant.Profile = JsonSerializer.Deserialize<bool?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "query")
-				{
-					variant.Query = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.Query?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "rescore")
-				{
-					variant.Rescore = SingleOrManySerializationHelper.Deserialize<Elastic.Clients.Elasticsearch.Core.Search.Rescore>(ref reader, options);
-					continue;
-				}
-
-				if (property == "runtime_mappings")
-				{
-					variant.RuntimeMappings = JsonSerializer.Deserialize<IDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "script_fields")
-				{
-					variant.ScriptFields = JsonSerializer.Deserialize<IDictionary<string, Elastic.Clients.Elasticsearch.ScriptField>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "search_after")
-				{
-					variant.SearchAfter = JsonSerializer.Deserialize<ICollection<Elastic.Clients.Elasticsearch.FieldValue>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "seq_no_primary_term")
-				{
-					variant.SeqNoPrimaryTerm = JsonSerializer.Deserialize<bool?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "size")
-				{
-					variant.Size = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "sort")
-				{
-					variant.Sort = SingleOrManySerializationHelper.Deserialize<Elastic.Clients.Elasticsearch.SortOptions>(ref reader, options);
-					continue;
-				}
-
-				if (property == "_source")
-				{
-					variant.Source = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Core.Search.SourceConfig?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "stats")
-				{
-					variant.Stats = JsonSerializer.Deserialize<ICollection<string>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "stored_fields")
-				{
-					reader.Read();
-					variant.StoredFields = new FieldsConverter().Read(ref reader, typeToConvert, options);
-					continue;
-				}
-
-				if (property == "suggest")
-				{
-					variant.Suggest = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Core.Search.Suggester?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "terminate_after")
-				{
-					variant.TerminateAfter = JsonSerializer.Deserialize<long?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "timeout")
-				{
-					variant.Timeout = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "track_scores")
-				{
-					variant.TrackScores = JsonSerializer.Deserialize<bool?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "track_total_hits")
-				{
-					variant.TrackTotalHits = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Core.Search.TrackHits?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "version")
-				{
-					variant.Version = JsonSerializer.Deserialize<bool?>(ref reader, options);
-					continue;
-				}
+				continue;
 			}
-		}
-
-		return variant;
-	}
-
-	public override void Write(Utf8JsonWriter writer, MultisearchBody value, JsonSerializerOptions options)
-	{
-		writer.WriteStartObject();
-		if (value.Aggregations is not null)
-		{
-			writer.WritePropertyName("aggregations");
-			JsonSerializer.Serialize(writer, value.Aggregations, options);
-		}
 
-		if (value.Collapse is not null)
-		{
-			writer.WritePropertyName("collapse");
-			JsonSerializer.Serialize(writer, value.Collapse, options);
-		}
+			if (propCollapse.TryRead(ref reader, options, PropCollapse))
+			{
+				continue;
+			}
 
-		if (value.DocvalueFields is not null)
-		{
-			writer.WritePropertyName("docvalue_fields");
-			JsonSerializer.Serialize(writer, value.DocvalueFields, options);
-		}
+			if (propDocvalueFields.TryRead(ref reader, options, PropDocvalueFields))
+			{
+				continue;
+			}
 
-		if (value.Explain.HasValue)
-		{
-			writer.WritePropertyName("explain");
-			writer.WriteBooleanValue(value.Explain.Value);
-		}
+			if (propExplain.TryRead(ref reader, options, PropExplain))
+			{
+				continue;
+			}
 
-		if (value.Ext is not null)
-		{
-			writer.WritePropertyName("ext");
-			JsonSerializer.Serialize(writer, value.Ext, options);
-		}
+			if (propExt.TryRead(ref reader, options, PropExt))
+			{
+				continue;
+			}
 
-		if (value.Fields is not null)
-		{
-			writer.WritePropertyName("fields");
-			JsonSerializer.Serialize(writer, value.Fields, options);
-		}
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
 
-		if (value.From.HasValue)
-		{
-			writer.WritePropertyName("from");
-			writer.WriteNumberValue(value.From.Value);
-		}
+			if (propFrom.TryRead(ref reader, options, PropFrom))
+			{
+				continue;
+			}
 
-		if (value.Highlight is not null)
-		{
-			writer.WritePropertyName("highlight");
-			JsonSerializer.Serialize(writer, value.Highlight, options);
-		}
+			if (propHighlight.TryRead(ref reader, options, PropHighlight))
+			{
+				continue;
+			}
 
-		if (value.IndicesBoost is not null)
-		{
-			writer.WritePropertyName("indices_boost");
-			JsonSerializer.Serialize(writer, value.IndicesBoost, options);
-		}
+			if (propIndicesBoost.TryRead(ref reader, options, PropIndicesBoost))
+			{
+				continue;
+			}
 
-		if (value.Knn is not null)
-		{
-			writer.WritePropertyName("knn");
-			JsonSerializer.Serialize(writer, value.Knn, options);
-		}
+			if (propKnn.TryRead(ref reader, options, PropKnn, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.KnnSearch>?, Elastic.Clients.Elasticsearch.KnnSearch>)))
+			{
+				continue;
+			}
 
-		if (value.MinScore.HasValue)
-		{
-			writer.WritePropertyName("min_score");
-			writer.WriteNumberValue(value.MinScore.Value);
-		}
+			if (propMinScore.TryRead(ref reader, options, PropMinScore))
+			{
+				continue;
+			}
 
-		if (value.Pit is not null)
-		{
-			writer.WritePropertyName("pit");
-			JsonSerializer.Serialize(writer, value.Pit, options);
-		}
+			if (propPit.TryRead(ref reader, options, PropPit))
+			{
+				continue;
+			}
 
-		if (value.PostFilter is not null)
-		{
-			writer.WritePropertyName("post_filter");
-			JsonSerializer.Serialize(writer, value.PostFilter, options);
-		}
+			if (propPostFilter.TryRead(ref reader, options, PropPostFilter))
+			{
+				continue;
+			}
 
-		if (value.Profile.HasValue)
-		{
-			writer.WritePropertyName("profile");
-			writer.WriteBooleanValue(value.Profile.Value);
-		}
+			if (propProfile.TryRead(ref reader, options, PropProfile))
+			{
+				continue;
+			}
 
-		if (value.Query is not null)
-		{
-			writer.WritePropertyName("query");
-			JsonSerializer.Serialize(writer, value.Query, options);
-		}
+			if (propQuery.TryRead(ref reader, options, PropQuery))
+			{
+				continue;
+			}
 
-		if (value.Rescore is not null)
-		{
-			writer.WritePropertyName("rescore");
-			JsonSerializer.Serialize(writer, value.Rescore, options);
-		}
+			if (propRescore.TryRead(ref reader, options, PropRescore, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Core.Search.Rescore>?, Elastic.Clients.Elasticsearch.Core.Search.Rescore>)))
+			{
+				continue;
+			}
 
-		if (value.RuntimeMappings is not null)
-		{
-			writer.WritePropertyName("runtime_mappings");
-			JsonSerializer.Serialize(writer, value.RuntimeMappings, options);
-		}
+			if (propRuntimeMappings.TryRead(ref reader, options, PropRuntimeMappings))
+			{
+				continue;
+			}
 
-		if (value.ScriptFields is not null)
-		{
-			writer.WritePropertyName("script_fields");
-			JsonSerializer.Serialize(writer, value.ScriptFields, options);
-		}
+			if (propScriptFields.TryRead(ref reader, options, PropScriptFields))
+			{
+				continue;
+			}
 
-		if (value.SearchAfter is not null)
-		{
-			writer.WritePropertyName("search_after");
-			JsonSerializer.Serialize(writer, value.SearchAfter, options);
-		}
+			if (propSearchAfter.TryRead(ref reader, options, PropSearchAfter))
+			{
+				continue;
+			}
 
-		if (value.SeqNoPrimaryTerm.HasValue)
-		{
-			writer.WritePropertyName("seq_no_primary_term");
-			writer.WriteBooleanValue(value.SeqNoPrimaryTerm.Value);
-		}
+			if (propSeqNoPrimaryTerm.TryRead(ref reader, options, PropSeqNoPrimaryTerm))
+			{
+				continue;
+			}
 
-		if (value.Size.HasValue)
-		{
-			writer.WritePropertyName("size");
-			writer.WriteNumberValue(value.Size.Value);
-		}
+			if (propSize.TryRead(ref reader, options, PropSize))
+			{
+				continue;
+			}
 
-		if (value.Sort is not null)
-		{
-			writer.WritePropertyName("sort");
-			JsonSerializer.Serialize(writer, value.Sort, options);
-		}
+			if (propSort.TryRead(ref reader, options, PropSort, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.SortOptions>?, Elastic.Clients.Elasticsearch.SortOptions>)))
+			{
+				continue;
+			}
 
-		if (value.Source is not null)
-		{
-			writer.WritePropertyName("_source");
-			JsonSerializer.Serialize(writer, value.Source, options);
-		}
+			if (propSource.TryRead(ref reader, options, PropSource))
+			{
+				continue;
+			}
 
-		if (value.Stats is not null)
-		{
-			writer.WritePropertyName("stats");
-			JsonSerializer.Serialize(writer, value.Stats, options);
-		}
+			if (propStats.TryRead(ref reader, options, PropStats))
+			{
+				continue;
+			}
 
-		if (value.StoredFields is not null)
-		{
-			writer.WritePropertyName("stored_fields");
-			new FieldsConverter().Write(writer, value.StoredFields, options);
-		}
+			if (propStoredFields.TryRead(ref reader, options, PropStoredFields, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
 
-		if (value.Suggest is not null)
-		{
-			writer.WritePropertyName("suggest");
-			JsonSerializer.Serialize(writer, value.Suggest, options);
-		}
+			if (propSuggest.TryRead(ref reader, options, PropSuggest))
+			{
+				continue;
+			}
 
-		if (value.TerminateAfter.HasValue)
-		{
-			writer.WritePropertyName("terminate_after");
-			writer.WriteNumberValue(value.TerminateAfter.Value);
-		}
+			if (propTerminateAfter.TryRead(ref reader, options, PropTerminateAfter))
+			{
+				continue;
+			}
 
-		if (!string.IsNullOrEmpty(value.Timeout))
-		{
-			writer.WritePropertyName("timeout");
-			writer.WriteStringValue(value.Timeout);
-		}
+			if (propTimeout.TryRead(ref reader, options, PropTimeout))
+			{
+				continue;
+			}
 
-		if (value.TrackScores.HasValue)
-		{
-			writer.WritePropertyName("track_scores");
-			writer.WriteBooleanValue(value.TrackScores.Value);
-		}
+			if (propTrackScores.TryRead(ref reader, options, PropTrackScores))
+			{
+				continue;
+			}
 
-		if (value.TrackTotalHits is not null)
-		{
-			writer.WritePropertyName("track_total_hits");
-			JsonSerializer.Serialize(writer, value.TrackTotalHits, options);
-		}
+			if (propTrackTotalHits.TryRead(ref reader, options, PropTrackTotalHits))
+			{
+				continue;
+			}
 
-		if (value.Version.HasValue)
-		{
-			writer.WritePropertyName("version");
-			writer.WriteBooleanValue(value.Version.Value);
-		}
+			if (propVersion.TryRead(ref reader, options, PropVersion))
+			{
+				continue;
+			}
 
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new MultisearchBody
+		{
+			Aggregations = propAggregations.Value
+,
+			Collapse = propCollapse.Value
+,
+			DocvalueFields = propDocvalueFields.Value
+,
+			Explain = propExplain.Value
+,
+			Ext = propExt.Value
+,
+			Fields = propFields.Value
+,
+			From = propFrom.Value
+,
+			Highlight = propHighlight.Value
+,
+			IndicesBoost = propIndicesBoost.Value
+,
+			Knn = propKnn.Value
+,
+			MinScore = propMinScore.Value
+,
+			Pit = propPit.Value
+,
+			PostFilter = propPostFilter.Value
+,
+			Profile = propProfile.Value
+,
+			Query = propQuery.Value
+,
+			Rescore = propRescore.Value
+,
+			RuntimeMappings = propRuntimeMappings.Value
+,
+			ScriptFields = propScriptFields.Value
+,
+			SearchAfter = propSearchAfter.Value
+,
+			SeqNoPrimaryTerm = propSeqNoPrimaryTerm.Value
+,
+			Size = propSize.Value
+,
+			Sort = propSort.Value
+,
+			Source = propSource.Value
+,
+			Stats = propStats.Value
+,
+			StoredFields = propStoredFields.Value
+,
+			Suggest = propSuggest.Value
+,
+			TerminateAfter = propTerminateAfter.Value
+,
+			Timeout = propTimeout.Value
+,
+			TrackScores = propTrackScores.Value
+,
+			TrackTotalHits = propTrackTotalHits.Value
+,
+			Version = propVersion.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, MultisearchBody value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAggregations, value.Aggregations);
+		writer.WriteProperty(options, PropCollapse, value.Collapse);
+		writer.WriteProperty(options, PropDocvalueFields, value.DocvalueFields);
+		writer.WriteProperty(options, PropExplain, value.Explain);
+		writer.WriteProperty(options, PropExt, value.Ext);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropFrom, value.From);
+		writer.WriteProperty(options, PropHighlight, value.Highlight);
+		writer.WriteProperty(options, PropIndicesBoost, value.IndicesBoost);
+		writer.WriteProperty(options, PropKnn, value.Knn, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.KnnSearch>?, Elastic.Clients.Elasticsearch.KnnSearch>));
+		writer.WriteProperty(options, PropMinScore, value.MinScore);
+		writer.WriteProperty(options, PropPit, value.Pit);
+		writer.WriteProperty(options, PropPostFilter, value.PostFilter);
+		writer.WriteProperty(options, PropProfile, value.Profile);
+		writer.WriteProperty(options, PropQuery, value.Query);
+		writer.WriteProperty(options, PropRescore, value.Rescore, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Core.Search.Rescore>?, Elastic.Clients.Elasticsearch.Core.Search.Rescore>));
+		writer.WriteProperty(options, PropRuntimeMappings, value.RuntimeMappings);
+		writer.WriteProperty(options, PropScriptFields, value.ScriptFields);
+		writer.WriteProperty(options, PropSearchAfter, value.SearchAfter);
+		writer.WriteProperty(options, PropSeqNoPrimaryTerm, value.SeqNoPrimaryTerm);
+		writer.WriteProperty(options, PropSize, value.Size);
+		writer.WriteProperty(options, PropSort, value.Sort, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.SortOptions>?, Elastic.Clients.Elasticsearch.SortOptions>));
+		writer.WriteProperty(options, PropSource, value.Source);
+		writer.WriteProperty(options, PropStats, value.Stats);
+		writer.WriteProperty(options, PropStoredFields, value.StoredFields, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropSuggest, value.Suggest);
+		writer.WriteProperty(options, PropTerminateAfter, value.TerminateAfter);
+		writer.WriteProperty(options, PropTimeout, value.Timeout);
+		writer.WriteProperty(options, PropTrackScores, value.TrackScores);
+		writer.WriteProperty(options, PropTrackTotalHits, value.TrackTotalHits);
+		writer.WriteProperty(options, PropVersion, value.Version);
 		writer.WriteEndObject();
 	}
 }
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 c9ff671b68d..8d823727639 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
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,35 +28,157 @@
 
 namespace Elastic.Clients.Elasticsearch.Core.MSearch;
 
+internal sealed partial class MultisearchHeaderConverter : System.Text.Json.Serialization.JsonConverter<MultisearchHeader>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAllowNoIndices = System.Text.Json.JsonEncodedText.Encode("allow_no_indices");
+	private static readonly System.Text.Json.JsonEncodedText PropAllowPartialSearchResults = System.Text.Json.JsonEncodedText.Encode("allow_partial_search_results");
+	private static readonly System.Text.Json.JsonEncodedText PropCcsMinimizeRoundtrips = System.Text.Json.JsonEncodedText.Encode("ccs_minimize_roundtrips");
+	private static readonly System.Text.Json.JsonEncodedText PropExpandWildcards = System.Text.Json.JsonEncodedText.Encode("expand_wildcards");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreThrottled = System.Text.Json.JsonEncodedText.Encode("ignore_throttled");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreUnavailable = System.Text.Json.JsonEncodedText.Encode("ignore_unavailable");
+	private static readonly System.Text.Json.JsonEncodedText PropIndices = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropPreference = System.Text.Json.JsonEncodedText.Encode("preference");
+	private static readonly System.Text.Json.JsonEncodedText PropRequestCache = System.Text.Json.JsonEncodedText.Encode("request_cache");
+	private static readonly System.Text.Json.JsonEncodedText PropRouting = System.Text.Json.JsonEncodedText.Encode("routing");
+	private static readonly System.Text.Json.JsonEncodedText PropSearchType = System.Text.Json.JsonEncodedText.Encode("search_type");
+
+	public override MultisearchHeader Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool?> propAllowNoIndices = default;
+		LocalJsonProperty<bool?> propAllowPartialSearchResults = default;
+		LocalJsonProperty<bool?> propCcsMinimizeRoundtrips = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>?> propExpandWildcards = default;
+		LocalJsonProperty<bool?> propIgnoreThrottled = default;
+		LocalJsonProperty<bool?> propIgnoreUnavailable = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Indices?> propIndices = default;
+		LocalJsonProperty<string?> propPreference = default;
+		LocalJsonProperty<bool?> propRequestCache = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Routing?> propRouting = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.SearchType?> propSearchType = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAllowNoIndices.TryRead(ref reader, options, PropAllowNoIndices))
+			{
+				continue;
+			}
+
+			if (propAllowPartialSearchResults.TryRead(ref reader, options, PropAllowPartialSearchResults))
+			{
+				continue;
+			}
+
+			if (propCcsMinimizeRoundtrips.TryRead(ref reader, options, PropCcsMinimizeRoundtrips))
+			{
+				continue;
+			}
+
+			if (propExpandWildcards.TryRead(ref reader, options, PropExpandWildcards, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.ExpandWildcard>?, Elastic.Clients.Elasticsearch.ExpandWildcard>)))
+			{
+				continue;
+			}
+
+			if (propIgnoreThrottled.TryRead(ref reader, options, PropIgnoreThrottled))
+			{
+				continue;
+			}
+
+			if (propIgnoreUnavailable.TryRead(ref reader, options, PropIgnoreUnavailable))
+			{
+				continue;
+			}
+
+			if (propIndices.TryRead(ref reader, options, PropIndices))
+			{
+				continue;
+			}
+
+			if (propPreference.TryRead(ref reader, options, PropPreference))
+			{
+				continue;
+			}
+
+			if (propRequestCache.TryRead(ref reader, options, PropRequestCache))
+			{
+				continue;
+			}
+
+			if (propRouting.TryRead(ref reader, options, PropRouting))
+			{
+				continue;
+			}
+
+			if (propSearchType.TryRead(ref reader, options, PropSearchType))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new MultisearchHeader
+		{
+			AllowNoIndices = propAllowNoIndices.Value
+,
+			AllowPartialSearchResults = propAllowPartialSearchResults.Value
+,
+			CcsMinimizeRoundtrips = propCcsMinimizeRoundtrips.Value
+,
+			ExpandWildcards = propExpandWildcards.Value
+,
+			IgnoreThrottled = propIgnoreThrottled.Value
+,
+			IgnoreUnavailable = propIgnoreUnavailable.Value
+,
+			Indices = propIndices.Value
+,
+			Preference = propPreference.Value
+,
+			RequestCache = propRequestCache.Value
+,
+			Routing = propRouting.Value
+,
+			SearchType = propSearchType.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, MultisearchHeader value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAllowNoIndices, value.AllowNoIndices);
+		writer.WriteProperty(options, PropAllowPartialSearchResults, value.AllowPartialSearchResults);
+		writer.WriteProperty(options, PropCcsMinimizeRoundtrips, value.CcsMinimizeRoundtrips);
+		writer.WriteProperty(options, PropExpandWildcards, value.ExpandWildcards, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.ExpandWildcard>?, Elastic.Clients.Elasticsearch.ExpandWildcard>));
+		writer.WriteProperty(options, PropIgnoreThrottled, value.IgnoreThrottled);
+		writer.WriteProperty(options, PropIgnoreUnavailable, value.IgnoreUnavailable);
+		writer.WriteProperty(options, PropIndices, value.Indices);
+		writer.WriteProperty(options, PropPreference, value.Preference);
+		writer.WriteProperty(options, PropRequestCache, value.RequestCache);
+		writer.WriteProperty(options, PropRouting, value.Routing);
+		writer.WriteProperty(options, PropSearchType, value.SearchType);
+		writer.WriteEndObject();
+	}
+}
+
 /// <summary>
 /// <para>
 /// Contains parameters used to limit or change the subsequent search body request.
 /// </para>
 /// </summary>
+[JsonConverter(typeof(MultisearchHeaderConverter))]
 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")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.ExpandWildcard))]
 	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? Indices { 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; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Mtermvectors/MultiTermVectorsOperation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Mtermvectors/MultiTermVectorsOperation.g.cs
index a21f16a7f7d..97c035adb51 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Mtermvectors/MultiTermVectorsOperation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Mtermvectors/MultiTermVectorsOperation.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,160 @@
 
 namespace Elastic.Clients.Elasticsearch.Core.Mtermvectors;
 
+internal sealed partial class MultiTermVectorsOperationConverter : System.Text.Json.Serialization.JsonConverter<MultiTermVectorsOperation>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropDoc = System.Text.Json.JsonEncodedText.Encode("doc");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropFieldStatistics = System.Text.Json.JsonEncodedText.Encode("field_statistics");
+	private static readonly System.Text.Json.JsonEncodedText PropFilter = System.Text.Json.JsonEncodedText.Encode("filter");
+	private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("_id");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("_index");
+	private static readonly System.Text.Json.JsonEncodedText PropOffsets = System.Text.Json.JsonEncodedText.Encode("offsets");
+	private static readonly System.Text.Json.JsonEncodedText PropPayloads = System.Text.Json.JsonEncodedText.Encode("payloads");
+	private static readonly System.Text.Json.JsonEncodedText PropPositions = System.Text.Json.JsonEncodedText.Encode("positions");
+	private static readonly System.Text.Json.JsonEncodedText PropRouting = System.Text.Json.JsonEncodedText.Encode("routing");
+	private static readonly System.Text.Json.JsonEncodedText PropTermStatistics = System.Text.Json.JsonEncodedText.Encode("term_statistics");
+	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("version");
+	private static readonly System.Text.Json.JsonEncodedText PropVersionType = System.Text.Json.JsonEncodedText.Encode("version_type");
+
+	public override MultiTermVectorsOperation Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<object?> propDoc = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Fields?> propFields = default;
+		LocalJsonProperty<bool?> propFieldStatistics = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Core.TermVectors.Filter?> propFilter = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Id?> propId = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.IndexName?> propIndex = default;
+		LocalJsonProperty<bool?> propOffsets = default;
+		LocalJsonProperty<bool?> propPayloads = default;
+		LocalJsonProperty<bool?> propPositions = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Routing?> propRouting = default;
+		LocalJsonProperty<bool?> propTermStatistics = default;
+		LocalJsonProperty<long?> propVersion = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.VersionType?> propVersionType = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propDoc.TryRead(ref reader, options, PropDoc))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propFieldStatistics.TryRead(ref reader, options, PropFieldStatistics))
+			{
+				continue;
+			}
+
+			if (propFilter.TryRead(ref reader, options, PropFilter))
+			{
+				continue;
+			}
+
+			if (propId.TryRead(ref reader, options, PropId))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propOffsets.TryRead(ref reader, options, PropOffsets))
+			{
+				continue;
+			}
+
+			if (propPayloads.TryRead(ref reader, options, PropPayloads))
+			{
+				continue;
+			}
+
+			if (propPositions.TryRead(ref reader, options, PropPositions))
+			{
+				continue;
+			}
+
+			if (propRouting.TryRead(ref reader, options, PropRouting))
+			{
+				continue;
+			}
+
+			if (propTermStatistics.TryRead(ref reader, options, PropTermStatistics))
+			{
+				continue;
+			}
+
+			if (propVersion.TryRead(ref reader, options, PropVersion))
+			{
+				continue;
+			}
+
+			if (propVersionType.TryRead(ref reader, options, PropVersionType))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new MultiTermVectorsOperation
+		{
+			Doc = propDoc.Value
+,
+			Fields = propFields.Value
+,
+			FieldStatistics = propFieldStatistics.Value
+,
+			Filter = propFilter.Value
+,
+			Id = propId.Value
+,
+			Index = propIndex.Value
+,
+			Offsets = propOffsets.Value
+,
+			Payloads = propPayloads.Value
+,
+			Positions = propPositions.Value
+,
+			Routing = propRouting.Value
+,
+			TermStatistics = propTermStatistics.Value
+,
+			Version = propVersion.Value
+,
+			VersionType = propVersionType.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, MultiTermVectorsOperation value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDoc, value.Doc);
+		writer.WriteProperty(options, PropFields, value.Fields, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropFieldStatistics, value.FieldStatistics);
+		writer.WriteProperty(options, PropFilter, value.Filter);
+		writer.WriteProperty(options, PropId, value.Id);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropOffsets, value.Offsets);
+		writer.WriteProperty(options, PropPayloads, value.Payloads);
+		writer.WriteProperty(options, PropPositions, value.Positions);
+		writer.WriteProperty(options, PropRouting, value.Routing);
+		writer.WriteProperty(options, PropTermStatistics, value.TermStatistics);
+		writer.WriteProperty(options, PropVersion, value.Version);
+		writer.WriteProperty(options, PropVersionType, value.VersionType);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(MultiTermVectorsOperationConverter))]
 public sealed partial class MultiTermVectorsOperation
 {
 	/// <summary>
@@ -34,7 +189,6 @@ public sealed partial class MultiTermVectorsOperation
 	/// An artificial document (a document not present in the index) for which you want to retrieve term vectors.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("doc")]
 	public object? Doc { get; set; }
 
 	/// <summary>
@@ -43,8 +197,6 @@ public sealed partial class MultiTermVectorsOperation
 	/// Used as the default list unless a specific field list is provided in the <c>completion_fields</c> or <c>fielddata_fields</c> parameters.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("fields")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Fields? Fields { get; set; }
 
 	/// <summary>
@@ -52,7 +204,6 @@ public sealed partial class MultiTermVectorsOperation
 	/// If <c>true</c>, the response includes the document count, sum of document frequencies, and sum of total term frequencies.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("field_statistics")]
 	public bool? FieldStatistics { get; set; }
 
 	/// <summary>
@@ -60,7 +211,6 @@ public sealed partial class MultiTermVectorsOperation
 	/// Filter terms based on their tf-idf scores.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("filter")]
 	public Elastic.Clients.Elasticsearch.Core.TermVectors.Filter? Filter { get; set; }
 
 	/// <summary>
@@ -68,7 +218,6 @@ public sealed partial class MultiTermVectorsOperation
 	/// The ID of the document.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("_id")]
 	public Elastic.Clients.Elasticsearch.Id? Id { get; set; }
 
 	/// <summary>
@@ -76,7 +225,6 @@ public sealed partial class MultiTermVectorsOperation
 	/// The index of the document.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("_index")]
 	public Elastic.Clients.Elasticsearch.IndexName? Index { get; set; }
 
 	/// <summary>
@@ -84,7 +232,6 @@ public sealed partial class MultiTermVectorsOperation
 	/// If <c>true</c>, the response includes term offsets.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("offsets")]
 	public bool? Offsets { get; set; }
 
 	/// <summary>
@@ -92,7 +239,6 @@ public sealed partial class MultiTermVectorsOperation
 	/// If <c>true</c>, the response includes term payloads.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("payloads")]
 	public bool? Payloads { get; set; }
 
 	/// <summary>
@@ -100,7 +246,6 @@ public sealed partial class MultiTermVectorsOperation
 	/// If <c>true</c>, the response includes term positions.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("positions")]
 	public bool? Positions { get; set; }
 
 	/// <summary>
@@ -108,7 +253,6 @@ public sealed partial class MultiTermVectorsOperation
 	/// Custom value used to route operations to a specific shard.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("routing")]
 	public Elastic.Clients.Elasticsearch.Routing? Routing { get; set; }
 
 	/// <summary>
@@ -116,7 +260,6 @@ public sealed partial class MultiTermVectorsOperation
 	/// If true, the response includes term frequency and document frequency.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("term_statistics")]
 	public bool? TermStatistics { get; set; }
 
 	/// <summary>
@@ -124,7 +267,6 @@ public sealed partial class MultiTermVectorsOperation
 	/// If <c>true</c>, returns the document version as part of a hit.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("version")]
 	public long? Version { get; set; }
 
 	/// <summary>
@@ -132,7 +274,6 @@ public sealed partial class MultiTermVectorsOperation
 	/// Specific version type.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("version_type")]
 	public Elastic.Clients.Elasticsearch.VersionType? VersionType { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Mtermvectors/MultiTermVectorsResult.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Mtermvectors/MultiTermVectorsResult.g.cs
index e8ec6d5f061..3fb09185679 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Mtermvectors/MultiTermVectorsResult.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Mtermvectors/MultiTermVectorsResult.g.cs
@@ -38,7 +38,6 @@ public sealed partial class MultiTermVectorsResult
 	[JsonInclude, JsonPropertyName("_index")]
 	public string Index { get; init; }
 	[JsonInclude, JsonPropertyName("term_vectors")]
-	[ReadOnlyFieldDictionaryConverter(typeof(Elastic.Clients.Elasticsearch.Core.TermVectors.TermVector))]
 	public IReadOnlyDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Core.TermVectors.TermVector>? TermVectors { get; init; }
 	[JsonInclude, JsonPropertyName("took")]
 	public long? Took { get; init; }
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 687bd0ffd08..c462bf9daad 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
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,11 +28,63 @@
 
 namespace Elastic.Clients.Elasticsearch.Core.RankEval;
 
+internal sealed partial class RankEvalQueryConverter : System.Text.Json.Serialization.JsonConverter<RankEvalQuery>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropQuery = System.Text.Json.JsonEncodedText.Encode("query");
+	private static readonly System.Text.Json.JsonEncodedText PropSize = System.Text.Json.JsonEncodedText.Encode("size");
+
+	public override RankEvalQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		var readerSnapshot = reader;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.QueryDsl.Query> propQuery = default;
+		LocalJsonProperty<int?> propSize = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propQuery.TryRead(ref reader, options, PropQuery))
+			{
+				continue;
+			}
+
+			if (propSize.TryRead(ref reader, options, PropSize))
+			{
+				continue;
+			}
+
+			try
+			{
+				reader = readerSnapshot;
+				var result = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.Query>(options);
+				return new RankEvalQuery { Query = result };
+			}
+			catch (System.Text.Json.JsonException)
+			{
+				throw;
+			}
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new RankEvalQuery
+		{
+			Query = propQuery.Value
+,
+			Size = propSize.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, RankEvalQuery value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropQuery, value.Query);
+		writer.WriteProperty(options, PropSize, value.Size);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(RankEvalQueryConverter))]
 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; }
 }
 
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 0c75aa06abf..87d09566faf 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
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,110 @@
 
 namespace Elastic.Clients.Elasticsearch.Core.Reindex;
 
+internal sealed partial class SourceConverter : System.Text.Json.Serialization.JsonConverter<Source>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropIndices = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropQuery = System.Text.Json.JsonEncodedText.Encode("query");
+	private static readonly System.Text.Json.JsonEncodedText PropRemote = System.Text.Json.JsonEncodedText.Encode("remote");
+	private static readonly System.Text.Json.JsonEncodedText PropRuntimeMappings = System.Text.Json.JsonEncodedText.Encode("runtime_mappings");
+	private static readonly System.Text.Json.JsonEncodedText PropSize = System.Text.Json.JsonEncodedText.Encode("size");
+	private static readonly System.Text.Json.JsonEncodedText PropSlice = System.Text.Json.JsonEncodedText.Encode("slice");
+	private static readonly System.Text.Json.JsonEncodedText PropSort = System.Text.Json.JsonEncodedText.Encode("sort");
+	private static readonly System.Text.Json.JsonEncodedText PropSourceFields = System.Text.Json.JsonEncodedText.Encode("_source");
+
+	public override Source Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Indices> propIndices = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.QueryDsl.Query?> propQuery = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Core.Reindex.RemoteSource?> propRemote = default;
+		LocalJsonProperty<IDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>?> propRuntimeMappings = default;
+		LocalJsonProperty<int?> propSize = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.SlicedScroll?> propSlice = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.SortOptions>?> propSort = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Fields?> propSourceFields = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propIndices.TryRead(ref reader, options, PropIndices))
+			{
+				continue;
+			}
+
+			if (propQuery.TryRead(ref reader, options, PropQuery))
+			{
+				continue;
+			}
+
+			if (propRemote.TryRead(ref reader, options, PropRemote))
+			{
+				continue;
+			}
+
+			if (propRuntimeMappings.TryRead(ref reader, options, PropRuntimeMappings))
+			{
+				continue;
+			}
+
+			if (propSize.TryRead(ref reader, options, PropSize))
+			{
+				continue;
+			}
+
+			if (propSlice.TryRead(ref reader, options, PropSlice))
+			{
+				continue;
+			}
+
+			if (propSort.TryRead(ref reader, options, PropSort, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.SortOptions>?, Elastic.Clients.Elasticsearch.SortOptions>)))
+			{
+				continue;
+			}
+
+			if (propSourceFields.TryRead(ref reader, options, PropSourceFields, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new Source
+		{
+			Indices = propIndices.Value
+,
+			Query = propQuery.Value
+,
+			Remote = propRemote.Value
+,
+			RuntimeMappings = propRuntimeMappings.Value
+,
+			Size = propSize.Value
+,
+			Slice = propSlice.Value
+,
+			Sort = propSort.Value
+,
+			SourceFields = propSourceFields.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, Source value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropIndices, value.Indices);
+		writer.WriteProperty(options, PropQuery, value.Query);
+		writer.WriteProperty(options, PropRemote, value.Remote);
+		writer.WriteProperty(options, PropRuntimeMappings, value.RuntimeMappings);
+		writer.WriteProperty(options, PropSize, value.Size);
+		writer.WriteProperty(options, PropSlice, value.Slice);
+		writer.WriteProperty(options, PropSort, value.Sort, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.SortOptions>?, Elastic.Clients.Elasticsearch.SortOptions>));
+		writer.WriteProperty(options, PropSourceFields, value.SourceFields, typeof(SingleOrManyFieldsMarker));
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(SourceConverter))]
 public sealed partial class Source
 {
 	/// <summary>
@@ -35,7 +140,6 @@ public sealed partial class Source
 	/// Accepts a comma-separated list to reindex from multiple sources.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("index")]
 	public Elastic.Clients.Elasticsearch.Indices Indices { get; set; }
 
 	/// <summary>
@@ -43,7 +147,6 @@ public sealed partial class Source
 	/// Specifies the documents to reindex using the Query DSL.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("query")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.Query? Query { get; set; }
 
 	/// <summary>
@@ -51,9 +154,7 @@ public sealed partial class Source
 	/// A remote instance of Elasticsearch that you want to index from.
 	/// </para>
 	/// </summary>
-	[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; }
 
 	/// <summary>
@@ -62,7 +163,6 @@ public sealed partial class Source
 	/// Use when indexing from remote to ensure that the batches fit within the on-heap buffer, which defaults to a maximum size of 100 MB.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("size")]
 	public int? Size { get; set; }
 
 	/// <summary>
@@ -70,10 +170,7 @@ public sealed partial class Source
 	/// Slice the reindex request manually using the provided slice ID and total number of slices.
 	/// </para>
 	/// </summary>
-	[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>
@@ -82,8 +179,6 @@ public sealed partial class Source
 	/// Set to a list to reindex select fields.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("_source")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Fields? SourceFields { get; set; }
 }
 
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 7e8b2f44500..2b1cf10392b 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
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,90 @@
 
 namespace Elastic.Clients.Elasticsearch.Core.Search;
 
+internal sealed partial class CompletionContextConverter : System.Text.Json.Serialization.JsonConverter<CompletionContext>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropContext = System.Text.Json.JsonEncodedText.Encode("context");
+	private static readonly System.Text.Json.JsonEncodedText PropNeighbours = System.Text.Json.JsonEncodedText.Encode("neighbours");
+	private static readonly System.Text.Json.JsonEncodedText PropPrecision = System.Text.Json.JsonEncodedText.Encode("precision");
+	private static readonly System.Text.Json.JsonEncodedText PropPrefix = System.Text.Json.JsonEncodedText.Encode("prefix");
+
+	public override CompletionContext Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		var readerSnapshot = reader;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<double?> propBoost = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Core.Search.Context> propContext = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.GeohashPrecision>?> propNeighbours = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.GeohashPrecision?> propPrecision = default;
+		LocalJsonProperty<bool?> propPrefix = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
+
+			if (propContext.TryRead(ref reader, options, PropContext))
+			{
+				continue;
+			}
+
+			if (propNeighbours.TryRead(ref reader, options, PropNeighbours))
+			{
+				continue;
+			}
+
+			if (propPrecision.TryRead(ref reader, options, PropPrecision))
+			{
+				continue;
+			}
+
+			if (propPrefix.TryRead(ref reader, options, PropPrefix))
+			{
+				continue;
+			}
+
+			try
+			{
+				reader = readerSnapshot;
+				var result = reader.ReadValue<Elastic.Clients.Elasticsearch.Core.Search.Context>(options);
+				return new CompletionContext { Context = result };
+			}
+			catch (System.Text.Json.JsonException)
+			{
+				throw;
+			}
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new CompletionContext
+		{
+			Boost = propBoost.Value
+,
+			Context = propContext.Value
+,
+			Neighbours = propNeighbours.Value
+,
+			Precision = propPrecision.Value
+,
+			Prefix = propPrefix.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, CompletionContext value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropContext, value.Context);
+		writer.WriteProperty(options, PropNeighbours, value.Neighbours);
+		writer.WriteProperty(options, PropPrecision, value.Precision);
+		writer.WriteProperty(options, PropPrefix, value.Prefix);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(CompletionContextConverter))]
 public sealed partial class CompletionContext
 {
 	/// <summary>
@@ -35,7 +120,6 @@ public sealed partial class CompletionContext
 	/// The score is computed by multiplying the boost with the suggestion weight.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("boost")]
 	public double? Boost { get; set; }
 
 	/// <summary>
@@ -43,7 +127,6 @@ public sealed partial class CompletionContext
 	/// The value of the category to filter/boost on.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("context")]
 	public Elastic.Clients.Elasticsearch.Core.Search.Context Context { get; set; }
 
 	/// <summary>
@@ -53,7 +136,6 @@ public sealed partial class CompletionContext
 	/// Defaults to generating neighbors for index time precision level.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("neighbours")]
 	public ICollection<Elastic.Clients.Elasticsearch.GeohashPrecision>? Neighbours { get; set; }
 
 	/// <summary>
@@ -63,7 +145,6 @@ public sealed partial class CompletionContext
 	/// Defaults to index time precision level.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("precision")]
 	public Elastic.Clients.Elasticsearch.GeohashPrecision? Precision { get; set; }
 
 	/// <summary>
@@ -71,7 +152,6 @@ public sealed partial class CompletionContext
 	/// Whether the category value should be treated as a prefix or not.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("prefix")]
 	public bool? Prefix { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/CompletionSuggest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/CompletionSuggest.g.cs
index c294fa934bc..d75ca72135c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/CompletionSuggest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/CompletionSuggest.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,15 +28,93 @@
 
 namespace Elastic.Clients.Elasticsearch.Core.Search;
 
+internal sealed partial class CompletionSuggestConverter<TDocument> : System.Text.Json.Serialization.JsonConverter<CompletionSuggest<TDocument>>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropLength = System.Text.Json.JsonEncodedText.Encode("length");
+	private static readonly System.Text.Json.JsonEncodedText PropOffset = System.Text.Json.JsonEncodedText.Encode("offset");
+	private static readonly System.Text.Json.JsonEncodedText PropOptions = System.Text.Json.JsonEncodedText.Encode("options");
+	private static readonly System.Text.Json.JsonEncodedText PropText = System.Text.Json.JsonEncodedText.Encode("text");
+
+	public override CompletionSuggest<TDocument> Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<int> propLength = default;
+		LocalJsonProperty<int> propOffset = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Core.Search.CompletionSuggestOption<TDocument>>> propOptions = default;
+		LocalJsonProperty<string> propText = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propLength.TryRead(ref reader, options, PropLength))
+			{
+				continue;
+			}
+
+			if (propOffset.TryRead(ref reader, options, PropOffset))
+			{
+				continue;
+			}
+
+			if (propOptions.TryRead(ref reader, options, PropOptions, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Core.Search.CompletionSuggestOption<TDocument>>, Elastic.Clients.Elasticsearch.Core.Search.CompletionSuggestOption<TDocument>>)))
+			{
+				continue;
+			}
+
+			if (propText.TryRead(ref reader, options, PropText))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new CompletionSuggest<TDocument>
+		{
+			Length = propLength.Value
+,
+			Offset = propOffset.Value
+,
+			Options = propOptions.Value
+,
+			Text = propText.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, CompletionSuggest<TDocument> value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropLength, value.Length);
+		writer.WriteProperty(options, PropOffset, value.Offset);
+		writer.WriteProperty(options, PropOptions, value.Options, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Core.Search.CompletionSuggestOption<TDocument>>, Elastic.Clients.Elasticsearch.Core.Search.CompletionSuggestOption<TDocument>>));
+		writer.WriteProperty(options, PropText, value.Text);
+		writer.WriteEndObject();
+	}
+}
+
+internal sealed partial class CompletionSuggestConverterFactory : System.Text.Json.Serialization.JsonConverterFactory
+{
+	public override bool CanConvert(System.Type typeToConvert)
+	{
+		return typeToConvert.IsGenericType && typeToConvert.GetGenericTypeDefinition() == typeof(CompletionSuggest<>);
+	}
+
+	public override System.Text.Json.Serialization.JsonConverter CreateConverter(System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		var args = typeToConvert.GetGenericArguments();
+#pragma warning disable IL3050
+		var converter = (System.Text.Json.Serialization.JsonConverter)System.Activator.CreateInstance(typeof(CompletionSuggestConverter<>).MakeGenericType(args[0]), System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public, binder: null, args: null, culture: null)!;
+#pragma warning restore IL3050
+		return converter;
+	}
+}
+
+[JsonConverter(typeof(CompletionSuggestConverterFactory))]
 public sealed partial class CompletionSuggest<TDocument> : ISuggest
 {
-	[JsonInclude, JsonPropertyName("length")]
 	public int Length { get; init; }
-	[JsonInclude, JsonPropertyName("offset")]
 	public int Offset { get; init; }
-	[JsonInclude, JsonPropertyName("options")]
-	[GenericConverter(typeof(SingleOrManyCollectionConverter<>), unwrap: true)]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Core.Search.CompletionSuggestOption<TDocument>> Options { get; init; }
-	[JsonInclude, JsonPropertyName("text")]
 	public string Text { get; init; }
+
+	string ISuggest.Type => "completion";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/CompletionSuggestOption.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/CompletionSuggestOption.g.cs
index 3e0c73771fb..ca2bc6df054 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/CompletionSuggestOption.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/CompletionSuggestOption.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,27 +28,157 @@
 
 namespace Elastic.Clients.Elasticsearch.Core.Search;
 
+internal sealed partial class CompletionSuggestOptionConverter<TDocument> : System.Text.Json.Serialization.JsonConverter<CompletionSuggestOption<TDocument>>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCollateMatch = System.Text.Json.JsonEncodedText.Encode("collate_match");
+	private static readonly System.Text.Json.JsonEncodedText PropContexts = System.Text.Json.JsonEncodedText.Encode("contexts");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("_id");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("_index");
+	private static readonly System.Text.Json.JsonEncodedText PropRouting = System.Text.Json.JsonEncodedText.Encode("_routing");
+	private static readonly System.Text.Json.JsonEncodedText PropScore = System.Text.Json.JsonEncodedText.Encode("score");
+	private static readonly System.Text.Json.JsonEncodedText PropScore0 = System.Text.Json.JsonEncodedText.Encode("_score");
+	private static readonly System.Text.Json.JsonEncodedText PropSource = System.Text.Json.JsonEncodedText.Encode("_source");
+	private static readonly System.Text.Json.JsonEncodedText PropText = System.Text.Json.JsonEncodedText.Encode("text");
+
+	public override CompletionSuggestOption<TDocument> Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool?> propCollateMatch = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, IReadOnlyCollection<Elastic.Clients.Elasticsearch.Core.Search.Context>>?> propContexts = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, object>?> propFields = default;
+		LocalJsonProperty<string?> propId = default;
+		LocalJsonProperty<string?> propIndex = default;
+		LocalJsonProperty<string?> propRouting = default;
+		LocalJsonProperty<double?> propScore = default;
+		LocalJsonProperty<double?> propScore0 = default;
+		LocalJsonProperty<TDocument?> propSource = default;
+		LocalJsonProperty<string> propText = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCollateMatch.TryRead(ref reader, options, PropCollateMatch))
+			{
+				continue;
+			}
+
+			if (propContexts.TryRead(ref reader, options, PropContexts))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propId.TryRead(ref reader, options, PropId))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propRouting.TryRead(ref reader, options, PropRouting))
+			{
+				continue;
+			}
+
+			if (propScore.TryRead(ref reader, options, PropScore))
+			{
+				continue;
+			}
+
+			if (propScore0.TryRead(ref reader, options, PropScore0))
+			{
+				continue;
+			}
+
+			if (propSource.TryRead(ref reader, options, PropSource, typeof(SourceMarker<TDocument?>)))
+			{
+				continue;
+			}
+
+			if (propText.TryRead(ref reader, options, PropText))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new CompletionSuggestOption<TDocument>
+		{
+			CollateMatch = propCollateMatch.Value
+,
+			Contexts = propContexts.Value
+,
+			Fields = propFields.Value
+,
+			Id = propId.Value
+,
+			Index = propIndex.Value
+,
+			Routing = propRouting.Value
+,
+			Score = propScore.Value
+,
+			Score0 = propScore0.Value
+,
+			Source = propSource.Value
+,
+			Text = propText.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, CompletionSuggestOption<TDocument> value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCollateMatch, value.CollateMatch);
+		writer.WriteProperty(options, PropContexts, value.Contexts);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropId, value.Id);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropRouting, value.Routing);
+		writer.WriteProperty(options, PropScore, value.Score);
+		writer.WriteProperty(options, PropScore0, value.Score0);
+		writer.WriteProperty(options, PropSource, value.Source, typeof(SourceMarker<TDocument?>));
+		writer.WriteProperty(options, PropText, value.Text);
+		writer.WriteEndObject();
+	}
+}
+
+internal sealed partial class CompletionSuggestOptionConverterFactory : System.Text.Json.Serialization.JsonConverterFactory
+{
+	public override bool CanConvert(System.Type typeToConvert)
+	{
+		return typeToConvert.IsGenericType && typeToConvert.GetGenericTypeDefinition() == typeof(CompletionSuggestOption<>);
+	}
+
+	public override System.Text.Json.Serialization.JsonConverter CreateConverter(System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		var args = typeToConvert.GetGenericArguments();
+#pragma warning disable IL3050
+		var converter = (System.Text.Json.Serialization.JsonConverter)System.Activator.CreateInstance(typeof(CompletionSuggestOptionConverter<>).MakeGenericType(args[0]), System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public, binder: null, args: null, culture: null)!;
+#pragma warning restore IL3050
+		return converter;
+	}
+}
+
+[JsonConverter(typeof(CompletionSuggestOptionConverterFactory))]
 public sealed partial class CompletionSuggestOption<TDocument>
 {
-	[JsonInclude, JsonPropertyName("collate_match")]
 	public bool? CollateMatch { get; init; }
-	[JsonInclude, JsonPropertyName("contexts")]
 	public IReadOnlyDictionary<string, IReadOnlyCollection<Elastic.Clients.Elasticsearch.Core.Search.Context>>? Contexts { get; init; }
-	[JsonInclude, JsonPropertyName("fields")]
 	public IReadOnlyDictionary<string, object>? Fields { get; init; }
-	[JsonInclude, JsonPropertyName("_id")]
 	public string? Id { get; init; }
-	[JsonInclude, JsonPropertyName("_index")]
 	public string? Index { get; init; }
-	[JsonInclude, JsonPropertyName("_routing")]
 	public string? Routing { get; init; }
-	[JsonInclude, JsonPropertyName("score")]
 	public double? Score { get; init; }
-	[JsonInclude, JsonPropertyName("_score")]
 	public double? Score0 { get; init; }
-	[JsonInclude, JsonPropertyName("_source")]
-	[SourceConverter]
 	public TDocument? Source { get; init; }
-	[JsonInclude, JsonPropertyName("text")]
 	public string Text { 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 06fbcd812b5..54221070558 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
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,9 +28,72 @@
 
 namespace Elastic.Clients.Elasticsearch.Core.Search;
 
+internal sealed partial class FieldCollapseConverter : System.Text.Json.Serialization.JsonConverter<FieldCollapse>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCollapse = System.Text.Json.JsonEncodedText.Encode("collapse");
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropInnerHits = System.Text.Json.JsonEncodedText.Encode("inner_hits");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxConcurrentGroupSearches = System.Text.Json.JsonEncodedText.Encode("max_concurrent_group_searches");
+
+	public override FieldCollapse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Core.Search.FieldCollapse?> propCollapse = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Field> propField = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Core.Search.InnerHits>?> propInnerHits = default;
+		LocalJsonProperty<int?> propMaxConcurrentGroupSearches = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCollapse.TryRead(ref reader, options, PropCollapse))
+			{
+				continue;
+			}
+
+			if (propField.TryRead(ref reader, options, PropField))
+			{
+				continue;
+			}
+
+			if (propInnerHits.TryRead(ref reader, options, PropInnerHits, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Core.Search.InnerHits>?, Elastic.Clients.Elasticsearch.Core.Search.InnerHits>)))
+			{
+				continue;
+			}
+
+			if (propMaxConcurrentGroupSearches.TryRead(ref reader, options, PropMaxConcurrentGroupSearches))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new FieldCollapse
+		{
+			Collapse = propCollapse.Value
+,
+			Field = propField.Value
+,
+			InnerHits = propInnerHits.Value
+,
+			MaxConcurrentGroupSearches = propMaxConcurrentGroupSearches.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, FieldCollapse value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCollapse, value.Collapse);
+		writer.WriteProperty(options, PropField, value.Field);
+		writer.WriteProperty(options, PropInnerHits, value.InnerHits, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Core.Search.InnerHits>?, Elastic.Clients.Elasticsearch.Core.Search.InnerHits>));
+		writer.WriteProperty(options, PropMaxConcurrentGroupSearches, value.MaxConcurrentGroupSearches);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(FieldCollapseConverter))]
 public sealed partial class FieldCollapse
 {
-	[JsonInclude, JsonPropertyName("collapse")]
 	public Elastic.Clients.Elasticsearch.Core.Search.FieldCollapse? Collapse { get; set; }
 
 	/// <summary>
@@ -37,7 +101,6 @@ public sealed partial class FieldCollapse
 	/// The field to collapse the result set on
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("field")]
 	public Elastic.Clients.Elasticsearch.Field Field { get; set; }
 
 	/// <summary>
@@ -45,8 +108,6 @@ public sealed partial class FieldCollapse
 	/// The number of inner hits and their sort order
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("inner_hits")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.Core.Search.InnerHits))]
 	public ICollection<Elastic.Clients.Elasticsearch.Core.Search.InnerHits>? InnerHits { get; set; }
 
 	/// <summary>
@@ -54,7 +115,6 @@ public sealed partial class FieldCollapse
 	/// The number of concurrent requests allowed to retrieve the inner_hits per group
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("max_concurrent_group_searches")]
 	public int? MaxConcurrentGroupSearches { get; set; }
 }
 
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 eb342fd32f5..d55991b8dee 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
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -39,12 +40,16 @@ internal FieldSuggester(string variantName, object variant)
 			throw new ArgumentNullException(nameof(variant));
 		if (string.IsNullOrWhiteSpace(variantName))
 			throw new ArgumentException("Variant name must not be empty or whitespace.");
-		VariantName = variantName;
+		VariantType = variantName;
 		Variant = variant;
 	}
 
-	internal object Variant { get; }
-	internal string VariantName { get; }
+	internal FieldSuggester()
+	{
+	}
+
+	public object Variant { get; internal set; }
+	public string VariantType { get; internal set; }
 
 	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);
@@ -88,121 +93,103 @@ public bool TryGet<T>([NotNullWhen(true)] out T? result) where T : class
 	}
 }
 
-internal sealed partial class FieldSuggesterConverter : JsonConverter<FieldSuggester>
+internal sealed partial class FieldSuggesterConverter : System.Text.Json.Serialization.JsonConverter<FieldSuggester>
 {
-	public override FieldSuggester Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropPrefix = System.Text.Json.JsonEncodedText.Encode("prefix");
+	private static readonly System.Text.Json.JsonEncodedText PropRegex = System.Text.Json.JsonEncodedText.Encode("regex");
+	private static readonly System.Text.Json.JsonEncodedText PropText = System.Text.Json.JsonEncodedText.Encode("text");
+	private static readonly System.Text.Json.JsonEncodedText VariantCompletion = System.Text.Json.JsonEncodedText.Encode("completion");
+	private static readonly System.Text.Json.JsonEncodedText VariantPhrase = System.Text.Json.JsonEncodedText.Encode("phrase");
+	private static readonly System.Text.Json.JsonEncodedText VariantTerm = System.Text.Json.JsonEncodedText.Encode("term");
+
+	public override FieldSuggester Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string?> propPrefix = default;
+		LocalJsonProperty<string?> propRegex = default;
+		LocalJsonProperty<string?> propText = default;
+		var variantType = string.Empty;
+		object? variant = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			throw new JsonException("Expected start token.");
-		}
-
-		object? variantValue = default;
-		string? variantNameValue = default;
-		string? prefixValue = default;
-		string? regexValue = default;
-		string? textValue = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
-		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token.");
-			}
-
-			if (reader.TokenType != JsonTokenType.PropertyName)
+			if (propPrefix.TryRead(ref reader, options, PropPrefix))
 			{
-				throw new JsonException("Expected a property name token representing the name of an Elasticsearch field.");
-			}
-
-			var propertyName = reader.GetString();
-			reader.Read();
-			if (propertyName == "prefix")
-			{
-				prefixValue = JsonSerializer.Deserialize<string?>(ref reader, options);
 				continue;
 			}
 
-			if (propertyName == "regex")
+			if (propRegex.TryRead(ref reader, options, PropRegex))
 			{
-				regexValue = JsonSerializer.Deserialize<string?>(ref reader, options);
 				continue;
 			}
 
-			if (propertyName == "text")
+			if (propText.TryRead(ref reader, options, PropText))
 			{
-				textValue = JsonSerializer.Deserialize<string?>(ref reader, options);
 				continue;
 			}
 
-			if (propertyName == "completion")
+			if (reader.ValueTextEquals(VariantCompletion))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Core.Search.CompletionSuggester?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantCompletion.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Core.Search.CompletionSuggester?>(options);
 				continue;
 			}
 
-			if (propertyName == "phrase")
+			if (reader.ValueTextEquals(VariantPhrase))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Core.Search.PhraseSuggester?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantPhrase.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Core.Search.PhraseSuggester?>(options);
 				continue;
 			}
 
-			if (propertyName == "term")
+			if (reader.ValueTextEquals(VariantTerm))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Core.Search.TermSuggester?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantTerm.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Core.Search.TermSuggester?>(options);
 				continue;
 			}
 
-			throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'FieldSuggester' from the response.");
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		var result = new FieldSuggester(variantNameValue, variantValue);
-		result.Prefix = prefixValue;
-		result.Regex = regexValue;
-		result.Text = textValue;
-		return result;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new FieldSuggester
+		{
+			VariantType = variantType,
+			Variant = variant,
+			Prefix = propPrefix.Value
+	,
+			Regex = propRegex.Value
+	,
+			Text = propText.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, FieldSuggester value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, FieldSuggester value, System.Text.Json.JsonSerializerOptions options)
 	{
 		writer.WriteStartObject();
-		if (!string.IsNullOrEmpty(value.Prefix))
+		switch (value.VariantType)
 		{
-			writer.WritePropertyName("prefix");
-			writer.WriteStringValue(value.Prefix);
-		}
-
-		if (!string.IsNullOrEmpty(value.Regex))
-		{
-			writer.WritePropertyName("regex");
-			writer.WriteStringValue(value.Regex);
-		}
-
-		if (!string.IsNullOrEmpty(value.Text))
-		{
-			writer.WritePropertyName("text");
-			writer.WriteStringValue(value.Text);
-		}
-
-		if (value.VariantName is not null && value.Variant is not null)
-		{
-			writer.WritePropertyName(value.VariantName);
-			switch (value.VariantName)
-			{
-				case "completion":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Core.Search.CompletionSuggester>(writer, (Elastic.Clients.Elasticsearch.Core.Search.CompletionSuggester)value.Variant, options);
-					break;
-				case "phrase":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Core.Search.PhraseSuggester>(writer, (Elastic.Clients.Elasticsearch.Core.Search.PhraseSuggester)value.Variant, options);
-					break;
-				case "term":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Core.Search.TermSuggester>(writer, (Elastic.Clients.Elasticsearch.Core.Search.TermSuggester)value.Variant, options);
-					break;
-			}
+			case "":
+				break;
+			case "completion":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Core.Search.CompletionSuggester?)value.Variant);
+				break;
+			case "phrase":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Core.Search.PhraseSuggester?)value.Variant);
+				break;
+			case "term":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Core.Search.TermSuggester?)value.Variant);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.VariantType}' is not supported for type '{nameof(FieldSuggester)}'.");
 		}
 
+		writer.WriteProperty(options, PropPrefix, value.Prefix);
+		writer.WriteProperty(options, PropRegex, value.Regex);
+		writer.WriteProperty(options, PropText, value.Text);
 		writer.WriteEndObject();
 	}
 }
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 ef12eaa8957..5c74f83dca1 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
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,250 @@
 
 namespace Elastic.Clients.Elasticsearch.Core.Search;
 
+internal sealed partial class HighlightFieldConverter : System.Text.Json.Serialization.JsonConverter<HighlightField>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropBoundaryChars = System.Text.Json.JsonEncodedText.Encode("boundary_chars");
+	private static readonly System.Text.Json.JsonEncodedText PropBoundaryMaxScan = System.Text.Json.JsonEncodedText.Encode("boundary_max_scan");
+	private static readonly System.Text.Json.JsonEncodedText PropBoundaryScanner = System.Text.Json.JsonEncodedText.Encode("boundary_scanner");
+	private static readonly System.Text.Json.JsonEncodedText PropBoundaryScannerLocale = System.Text.Json.JsonEncodedText.Encode("boundary_scanner_locale");
+	private static readonly System.Text.Json.JsonEncodedText PropFragmenter = System.Text.Json.JsonEncodedText.Encode("fragmenter");
+	private static readonly System.Text.Json.JsonEncodedText PropFragmentOffset = System.Text.Json.JsonEncodedText.Encode("fragment_offset");
+	private static readonly System.Text.Json.JsonEncodedText PropFragmentSize = System.Text.Json.JsonEncodedText.Encode("fragment_size");
+	private static readonly System.Text.Json.JsonEncodedText PropHighlightFilter = System.Text.Json.JsonEncodedText.Encode("highlight_filter");
+	private static readonly System.Text.Json.JsonEncodedText PropHighlightQuery = System.Text.Json.JsonEncodedText.Encode("highlight_query");
+	private static readonly System.Text.Json.JsonEncodedText PropMatchedFields = System.Text.Json.JsonEncodedText.Encode("matched_fields");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxAnalyzedOffset = System.Text.Json.JsonEncodedText.Encode("max_analyzed_offset");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxFragmentLength = System.Text.Json.JsonEncodedText.Encode("max_fragment_length");
+	private static readonly System.Text.Json.JsonEncodedText PropNoMatchSize = System.Text.Json.JsonEncodedText.Encode("no_match_size");
+	private static readonly System.Text.Json.JsonEncodedText PropNumberOfFragments = System.Text.Json.JsonEncodedText.Encode("number_of_fragments");
+	private static readonly System.Text.Json.JsonEncodedText PropOptions = System.Text.Json.JsonEncodedText.Encode("options");
+	private static readonly System.Text.Json.JsonEncodedText PropOrder = System.Text.Json.JsonEncodedText.Encode("order");
+	private static readonly System.Text.Json.JsonEncodedText PropPhraseLimit = System.Text.Json.JsonEncodedText.Encode("phrase_limit");
+	private static readonly System.Text.Json.JsonEncodedText PropPostTags = System.Text.Json.JsonEncodedText.Encode("post_tags");
+	private static readonly System.Text.Json.JsonEncodedText PropPreTags = System.Text.Json.JsonEncodedText.Encode("pre_tags");
+	private static readonly System.Text.Json.JsonEncodedText PropRequireFieldMatch = System.Text.Json.JsonEncodedText.Encode("require_field_match");
+	private static readonly System.Text.Json.JsonEncodedText PropTagsSchema = System.Text.Json.JsonEncodedText.Encode("tags_schema");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override HighlightField Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string?> propBoundaryChars = default;
+		LocalJsonProperty<int?> propBoundaryMaxScan = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Core.Search.BoundaryScanner?> propBoundaryScanner = default;
+		LocalJsonProperty<string?> propBoundaryScannerLocale = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Core.Search.HighlighterFragmenter?> propFragmenter = default;
+		LocalJsonProperty<int?> propFragmentOffset = default;
+		LocalJsonProperty<int?> propFragmentSize = default;
+		LocalJsonProperty<bool?> propHighlightFilter = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.QueryDsl.Query?> propHighlightQuery = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Fields?> propMatchedFields = default;
+		LocalJsonProperty<int?> propMaxAnalyzedOffset = default;
+		LocalJsonProperty<int?> propMaxFragmentLength = default;
+		LocalJsonProperty<int?> propNoMatchSize = default;
+		LocalJsonProperty<int?> propNumberOfFragments = default;
+		LocalJsonProperty<IDictionary<string, object>?> propOptions = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Core.Search.HighlighterOrder?> propOrder = default;
+		LocalJsonProperty<int?> propPhraseLimit = default;
+		LocalJsonProperty<ICollection<string>?> propPostTags = default;
+		LocalJsonProperty<ICollection<string>?> propPreTags = default;
+		LocalJsonProperty<bool?> propRequireFieldMatch = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Core.Search.HighlighterTagsSchema?> propTagsSchema = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Core.Search.HighlighterType?> propType = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBoundaryChars.TryRead(ref reader, options, PropBoundaryChars))
+			{
+				continue;
+			}
+
+			if (propBoundaryMaxScan.TryRead(ref reader, options, PropBoundaryMaxScan))
+			{
+				continue;
+			}
+
+			if (propBoundaryScanner.TryRead(ref reader, options, PropBoundaryScanner))
+			{
+				continue;
+			}
+
+			if (propBoundaryScannerLocale.TryRead(ref reader, options, PropBoundaryScannerLocale))
+			{
+				continue;
+			}
+
+			if (propFragmenter.TryRead(ref reader, options, PropFragmenter))
+			{
+				continue;
+			}
+
+			if (propFragmentOffset.TryRead(ref reader, options, PropFragmentOffset))
+			{
+				continue;
+			}
+
+			if (propFragmentSize.TryRead(ref reader, options, PropFragmentSize))
+			{
+				continue;
+			}
+
+			if (propHighlightFilter.TryRead(ref reader, options, PropHighlightFilter))
+			{
+				continue;
+			}
+
+			if (propHighlightQuery.TryRead(ref reader, options, PropHighlightQuery))
+			{
+				continue;
+			}
+
+			if (propMatchedFields.TryRead(ref reader, options, PropMatchedFields, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propMaxAnalyzedOffset.TryRead(ref reader, options, PropMaxAnalyzedOffset))
+			{
+				continue;
+			}
+
+			if (propMaxFragmentLength.TryRead(ref reader, options, PropMaxFragmentLength))
+			{
+				continue;
+			}
+
+			if (propNoMatchSize.TryRead(ref reader, options, PropNoMatchSize))
+			{
+				continue;
+			}
+
+			if (propNumberOfFragments.TryRead(ref reader, options, PropNumberOfFragments))
+			{
+				continue;
+			}
+
+			if (propOptions.TryRead(ref reader, options, PropOptions))
+			{
+				continue;
+			}
+
+			if (propOrder.TryRead(ref reader, options, PropOrder))
+			{
+				continue;
+			}
+
+			if (propPhraseLimit.TryRead(ref reader, options, PropPhraseLimit))
+			{
+				continue;
+			}
+
+			if (propPostTags.TryRead(ref reader, options, PropPostTags))
+			{
+				continue;
+			}
+
+			if (propPreTags.TryRead(ref reader, options, PropPreTags))
+			{
+				continue;
+			}
+
+			if (propRequireFieldMatch.TryRead(ref reader, options, PropRequireFieldMatch))
+			{
+				continue;
+			}
+
+			if (propTagsSchema.TryRead(ref reader, options, PropTagsSchema))
+			{
+				continue;
+			}
+
+			if (propType.TryRead(ref reader, options, PropType))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new HighlightField
+		{
+			BoundaryChars = propBoundaryChars.Value
+,
+			BoundaryMaxScan = propBoundaryMaxScan.Value
+,
+			BoundaryScanner = propBoundaryScanner.Value
+,
+			BoundaryScannerLocale = propBoundaryScannerLocale.Value
+,
+			Fragmenter = propFragmenter.Value
+,
+			FragmentOffset = propFragmentOffset.Value
+,
+			FragmentSize = propFragmentSize.Value
+,
+			HighlightFilter = propHighlightFilter.Value
+,
+			HighlightQuery = propHighlightQuery.Value
+,
+			MatchedFields = propMatchedFields.Value
+,
+			MaxAnalyzedOffset = propMaxAnalyzedOffset.Value
+,
+			MaxFragmentLength = propMaxFragmentLength.Value
+,
+			NoMatchSize = propNoMatchSize.Value
+,
+			NumberOfFragments = propNumberOfFragments.Value
+,
+			Options = propOptions.Value
+,
+			Order = propOrder.Value
+,
+			PhraseLimit = propPhraseLimit.Value
+,
+			PostTags = propPostTags.Value
+,
+			PreTags = propPreTags.Value
+,
+			RequireFieldMatch = propRequireFieldMatch.Value
+,
+			TagsSchema = propTagsSchema.Value
+,
+			Type = propType.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, HighlightField value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoundaryChars, value.BoundaryChars);
+		writer.WriteProperty(options, PropBoundaryMaxScan, value.BoundaryMaxScan);
+		writer.WriteProperty(options, PropBoundaryScanner, value.BoundaryScanner);
+		writer.WriteProperty(options, PropBoundaryScannerLocale, value.BoundaryScannerLocale);
+		writer.WriteProperty(options, PropFragmenter, value.Fragmenter);
+		writer.WriteProperty(options, PropFragmentOffset, value.FragmentOffset);
+		writer.WriteProperty(options, PropFragmentSize, value.FragmentSize);
+		writer.WriteProperty(options, PropHighlightFilter, value.HighlightFilter);
+		writer.WriteProperty(options, PropHighlightQuery, value.HighlightQuery);
+		writer.WriteProperty(options, PropMatchedFields, value.MatchedFields, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropMaxAnalyzedOffset, value.MaxAnalyzedOffset);
+		writer.WriteProperty(options, PropMaxFragmentLength, value.MaxFragmentLength);
+		writer.WriteProperty(options, PropNoMatchSize, value.NoMatchSize);
+		writer.WriteProperty(options, PropNumberOfFragments, value.NumberOfFragments);
+		writer.WriteProperty(options, PropOptions, value.Options);
+		writer.WriteProperty(options, PropOrder, value.Order);
+		writer.WriteProperty(options, PropPhraseLimit, value.PhraseLimit);
+		writer.WriteProperty(options, PropPostTags, value.PostTags);
+		writer.WriteProperty(options, PropPreTags, value.PreTags);
+		writer.WriteProperty(options, PropRequireFieldMatch, value.RequireFieldMatch);
+		writer.WriteProperty(options, PropTagsSchema, value.TagsSchema);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(HighlightFieldConverter))]
 public sealed partial class HighlightField
 {
 	/// <summary>
@@ -34,7 +279,6 @@ public sealed partial class HighlightField
 	/// A string that contains each boundary character.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("boundary_chars")]
 	public string? BoundaryChars { get; set; }
 
 	/// <summary>
@@ -42,7 +286,6 @@ public sealed partial class HighlightField
 	/// How far to scan for boundary characters.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("boundary_max_scan")]
 	public int? BoundaryMaxScan { get; set; }
 
 	/// <summary>
@@ -52,7 +295,6 @@ public sealed partial class HighlightField
 	/// Defaults to <c>sentence</c> for the <c>unified</c> highlighter. Defaults to <c>chars</c> for the <c>fvh</c> highlighter.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("boundary_scanner")]
 	public Elastic.Clients.Elasticsearch.Core.Search.BoundaryScanner? BoundaryScanner { get; set; }
 
 	/// <summary>
@@ -61,7 +303,6 @@ public sealed partial class HighlightField
 	/// This parameter takes a form of a language tag, for example: <c>"en-US"</c>, <c>"fr-FR"</c>, <c>"ja-JP"</c>.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("boundary_scanner_locale")]
 	public string? BoundaryScannerLocale { get; set; }
 
 	/// <summary>
@@ -70,9 +311,7 @@ public sealed partial class HighlightField
 	/// Only valid for the <c>plain</c> highlighter.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("fragmenter")]
 	public Elastic.Clients.Elasticsearch.Core.Search.HighlighterFragmenter? Fragmenter { get; set; }
-	[JsonInclude, JsonPropertyName("fragment_offset")]
 	public int? FragmentOffset { get; set; }
 
 	/// <summary>
@@ -80,9 +319,7 @@ public sealed partial class HighlightField
 	/// The size of the highlighted fragment in characters.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("fragment_size")]
 	public int? FragmentSize { get; set; }
-	[JsonInclude, JsonPropertyName("highlight_filter")]
 	public bool? HighlightFilter { get; set; }
 
 	/// <summary>
@@ -91,10 +328,7 @@ public sealed partial class HighlightField
 	/// This is especially useful if you use a rescore query because those are not taken into account by highlighting by default.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("highlight_query")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.Query? HighlightQuery { get; set; }
-	[JsonInclude, JsonPropertyName("matched_fields")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Fields? MatchedFields { get; set; }
 
 	/// <summary>
@@ -104,9 +338,7 @@ public sealed partial class HighlightField
 	/// The <c>max_analyzed_offset</c> query setting does not override the <c>index.highlight.max_analyzed_offset</c> setting, which prevails when it’s set to lower value than the query setting.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("max_analyzed_offset")]
 	public int? MaxAnalyzedOffset { get; set; }
-	[JsonInclude, JsonPropertyName("max_fragment_length")]
 	public int? MaxFragmentLength { get; set; }
 
 	/// <summary>
@@ -114,7 +346,6 @@ public sealed partial class HighlightField
 	/// The amount of text you want to return from the beginning of the field if there are no matching fragments to highlight.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("no_match_size")]
 	public int? NoMatchSize { get; set; }
 
 	/// <summary>
@@ -126,9 +357,7 @@ public sealed partial class HighlightField
 	/// If <c>number_of_fragments</c> is <c>0</c>, <c>fragment_size</c> is ignored.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("number_of_fragments")]
 	public int? NumberOfFragments { get; set; }
-	[JsonInclude, JsonPropertyName("options")]
 	public IDictionary<string, object>? Options { get; set; }
 
 	/// <summary>
@@ -139,7 +368,6 @@ public sealed partial class HighlightField
 	/// Each highlighter applies its own logic to compute relevancy scores.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("order")]
 	public Elastic.Clients.Elasticsearch.Core.Search.HighlighterOrder? Order { get; set; }
 
 	/// <summary>
@@ -150,7 +378,6 @@ public sealed partial class HighlightField
 	/// Only supported by the <c>fvh</c> highlighter.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("phrase_limit")]
 	public int? PhraseLimit { get; set; }
 
 	/// <summary>
@@ -159,7 +386,6 @@ public sealed partial class HighlightField
 	/// By default, highlighted text is wrapped in <c>&lt;em></c> and <c>&lt;/em></c> tags.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("post_tags")]
 	public ICollection<string>? PostTags { get; set; }
 
 	/// <summary>
@@ -168,7 +394,6 @@ public sealed partial class HighlightField
 	/// By default, highlighted text is wrapped in <c>&lt;em></c> and <c>&lt;/em></c> tags.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("pre_tags")]
 	public ICollection<string>? PreTags { get; set; }
 
 	/// <summary>
@@ -177,7 +402,6 @@ public sealed partial class HighlightField
 	/// Set to <c>false</c> to highlight all fields.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("require_field_match")]
 	public bool? RequireFieldMatch { get; set; }
 
 	/// <summary>
@@ -185,9 +409,7 @@ public sealed partial class HighlightField
 	/// Set to <c>styled</c> to use the built-in tag schema.
 	/// </para>
 	/// </summary>
-	[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; }
 }
 
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 bddd3f292b6..bf2b2282205 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
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,47 +28,267 @@
 
 namespace Elastic.Clients.Elasticsearch.Core.Search;
 
+internal sealed partial class HitConverter<TDocument> : System.Text.Json.Serialization.JsonConverter<Hit<TDocument>>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropExplanation = System.Text.Json.JsonEncodedText.Encode("_explanation");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropHighlight = System.Text.Json.JsonEncodedText.Encode("highlight");
+	private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("_id");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnored = System.Text.Json.JsonEncodedText.Encode("_ignored");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoredFieldValues = System.Text.Json.JsonEncodedText.Encode("ignored_field_values");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("_index");
+	private static readonly System.Text.Json.JsonEncodedText PropInnerHits = System.Text.Json.JsonEncodedText.Encode("inner_hits");
+	private static readonly System.Text.Json.JsonEncodedText PropMatchedQueries = System.Text.Json.JsonEncodedText.Encode("matched_queries");
+	private static readonly System.Text.Json.JsonEncodedText PropNested = System.Text.Json.JsonEncodedText.Encode("_nested");
+	private static readonly System.Text.Json.JsonEncodedText PropNode = System.Text.Json.JsonEncodedText.Encode("_node");
+	private static readonly System.Text.Json.JsonEncodedText PropPrimaryTerm = System.Text.Json.JsonEncodedText.Encode("_primary_term");
+	private static readonly System.Text.Json.JsonEncodedText PropRank = System.Text.Json.JsonEncodedText.Encode("_rank");
+	private static readonly System.Text.Json.JsonEncodedText PropRouting = System.Text.Json.JsonEncodedText.Encode("_routing");
+	private static readonly System.Text.Json.JsonEncodedText PropScore = System.Text.Json.JsonEncodedText.Encode("_score");
+	private static readonly System.Text.Json.JsonEncodedText PropSeqNo = System.Text.Json.JsonEncodedText.Encode("_seq_no");
+	private static readonly System.Text.Json.JsonEncodedText PropShard = System.Text.Json.JsonEncodedText.Encode("_shard");
+	private static readonly System.Text.Json.JsonEncodedText PropSort = System.Text.Json.JsonEncodedText.Encode("sort");
+	private static readonly System.Text.Json.JsonEncodedText PropSource = System.Text.Json.JsonEncodedText.Encode("_source");
+	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("_version");
+
+	public override Hit<TDocument> Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Core.Explain.Explanation?> propExplanation = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, object>?> propFields = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, IReadOnlyCollection<string>>?> propHighlight = default;
+		LocalJsonProperty<string?> propId = default;
+		LocalJsonProperty<IReadOnlyCollection<string>?> propIgnored = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, IReadOnlyCollection<Elastic.Clients.Elasticsearch.FieldValue>>?> propIgnoredFieldValues = default;
+		LocalJsonProperty<string> propIndex = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Core.Search.InnerHitsResult>?> propInnerHits = default;
+		LocalJsonProperty<IReadOnlyCollection<string>?> propMatchedQueries = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Core.Search.NestedIdentity?> propNested = default;
+		LocalJsonProperty<string?> propNode = default;
+		LocalJsonProperty<long?> propPrimaryTerm = default;
+		LocalJsonProperty<int?> propRank = default;
+		LocalJsonProperty<string?> propRouting = default;
+		LocalJsonProperty<double?> propScore = default;
+		LocalJsonProperty<long?> propSeqNo = default;
+		LocalJsonProperty<string?> propShard = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.FieldValue>?> propSort = default;
+		LocalJsonProperty<TDocument?> propSource = default;
+		LocalJsonProperty<long?> propVersion = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propExplanation.TryRead(ref reader, options, PropExplanation))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propHighlight.TryRead(ref reader, options, PropHighlight))
+			{
+				continue;
+			}
+
+			if (propId.TryRead(ref reader, options, PropId))
+			{
+				continue;
+			}
+
+			if (propIgnored.TryRead(ref reader, options, PropIgnored))
+			{
+				continue;
+			}
+
+			if (propIgnoredFieldValues.TryRead(ref reader, options, PropIgnoredFieldValues))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propInnerHits.TryRead(ref reader, options, PropInnerHits))
+			{
+				continue;
+			}
+
+			if (propMatchedQueries.TryRead(ref reader, options, PropMatchedQueries))
+			{
+				continue;
+			}
+
+			if (propNested.TryRead(ref reader, options, PropNested))
+			{
+				continue;
+			}
+
+			if (propNode.TryRead(ref reader, options, PropNode))
+			{
+				continue;
+			}
+
+			if (propPrimaryTerm.TryRead(ref reader, options, PropPrimaryTerm))
+			{
+				continue;
+			}
+
+			if (propRank.TryRead(ref reader, options, PropRank))
+			{
+				continue;
+			}
+
+			if (propRouting.TryRead(ref reader, options, PropRouting))
+			{
+				continue;
+			}
+
+			if (propScore.TryRead(ref reader, options, PropScore))
+			{
+				continue;
+			}
+
+			if (propSeqNo.TryRead(ref reader, options, PropSeqNo))
+			{
+				continue;
+			}
+
+			if (propShard.TryRead(ref reader, options, PropShard))
+			{
+				continue;
+			}
+
+			if (propSort.TryRead(ref reader, options, PropSort))
+			{
+				continue;
+			}
+
+			if (propSource.TryRead(ref reader, options, PropSource, typeof(SourceMarker<TDocument?>)))
+			{
+				continue;
+			}
+
+			if (propVersion.TryRead(ref reader, options, PropVersion))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new Hit<TDocument>
+		{
+			Explanation = propExplanation.Value
+,
+			Fields = propFields.Value
+,
+			Highlight = propHighlight.Value
+,
+			Id = propId.Value
+,
+			Ignored = propIgnored.Value
+,
+			IgnoredFieldValues = propIgnoredFieldValues.Value
+,
+			Index = propIndex.Value
+,
+			InnerHits = propInnerHits.Value
+,
+			MatchedQueries = propMatchedQueries.Value
+,
+			Nested = propNested.Value
+,
+			Node = propNode.Value
+,
+			PrimaryTerm = propPrimaryTerm.Value
+,
+			Rank = propRank.Value
+,
+			Routing = propRouting.Value
+,
+			Score = propScore.Value
+,
+			SeqNo = propSeqNo.Value
+,
+			Shard = propShard.Value
+,
+			Sort = propSort.Value
+,
+			Source = propSource.Value
+,
+			Version = propVersion.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, Hit<TDocument> value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropExplanation, value.Explanation);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropHighlight, value.Highlight);
+		writer.WriteProperty(options, PropId, value.Id);
+		writer.WriteProperty(options, PropIgnored, value.Ignored);
+		writer.WriteProperty(options, PropIgnoredFieldValues, value.IgnoredFieldValues);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropInnerHits, value.InnerHits);
+		writer.WriteProperty(options, PropMatchedQueries, value.MatchedQueries);
+		writer.WriteProperty(options, PropNested, value.Nested);
+		writer.WriteProperty(options, PropNode, value.Node);
+		writer.WriteProperty(options, PropPrimaryTerm, value.PrimaryTerm);
+		writer.WriteProperty(options, PropRank, value.Rank);
+		writer.WriteProperty(options, PropRouting, value.Routing);
+		writer.WriteProperty(options, PropScore, value.Score);
+		writer.WriteProperty(options, PropSeqNo, value.SeqNo);
+		writer.WriteProperty(options, PropShard, value.Shard);
+		writer.WriteProperty(options, PropSort, value.Sort);
+		writer.WriteProperty(options, PropSource, value.Source, typeof(SourceMarker<TDocument?>));
+		writer.WriteProperty(options, PropVersion, value.Version);
+		writer.WriteEndObject();
+	}
+}
+
+internal sealed partial class HitConverterFactory : System.Text.Json.Serialization.JsonConverterFactory
+{
+	public override bool CanConvert(System.Type typeToConvert)
+	{
+		return typeToConvert.IsGenericType && typeToConvert.GetGenericTypeDefinition() == typeof(Hit<>);
+	}
+
+	public override System.Text.Json.Serialization.JsonConverter CreateConverter(System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		var args = typeToConvert.GetGenericArguments();
+#pragma warning disable IL3050
+		var converter = (System.Text.Json.Serialization.JsonConverter)System.Activator.CreateInstance(typeof(HitConverter<>).MakeGenericType(args[0]), System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public, binder: null, args: null, culture: null)!;
+#pragma warning restore IL3050
+		return converter;
+	}
+}
+
+[JsonConverter(typeof(HitConverterFactory))]
 public sealed partial class Hit<TDocument>
 {
-	[JsonInclude, JsonPropertyName("_explanation")]
 	public Elastic.Clients.Elasticsearch.Core.Explain.Explanation? Explanation { 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("_id")]
 	public string? Id { get; init; }
-	[JsonInclude, JsonPropertyName("_ignored")]
 	public IReadOnlyCollection<string>? Ignored { get; init; }
-	[JsonInclude, JsonPropertyName("ignored_field_values")]
 	public IReadOnlyDictionary<string, IReadOnlyCollection<Elastic.Clients.Elasticsearch.FieldValue>>? IgnoredFieldValues { get; init; }
-	[JsonInclude, JsonPropertyName("_index")]
 	public string Index { 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("_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("_rank")]
 	public int? Rank { 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("sort")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.FieldValue>? Sort { 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/Types/Core/Search/InnerHits.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/InnerHits.g.cs
index f896031d7d9..04312dd5b18 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
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,16 +28,195 @@
 
 namespace Elastic.Clients.Elasticsearch.Core.Search;
 
+internal sealed partial class InnerHitsConverter : System.Text.Json.Serialization.JsonConverter<InnerHits>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCollapse = System.Text.Json.JsonEncodedText.Encode("collapse");
+	private static readonly System.Text.Json.JsonEncodedText PropDocvalueFields = System.Text.Json.JsonEncodedText.Encode("docvalue_fields");
+	private static readonly System.Text.Json.JsonEncodedText PropExplain = System.Text.Json.JsonEncodedText.Encode("explain");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropFrom = System.Text.Json.JsonEncodedText.Encode("from");
+	private static readonly System.Text.Json.JsonEncodedText PropHighlight = System.Text.Json.JsonEncodedText.Encode("highlight");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreUnmapped = System.Text.Json.JsonEncodedText.Encode("ignore_unmapped");
+	private static readonly System.Text.Json.JsonEncodedText PropName = System.Text.Json.JsonEncodedText.Encode("name");
+	private static readonly System.Text.Json.JsonEncodedText PropScriptFields = System.Text.Json.JsonEncodedText.Encode("script_fields");
+	private static readonly System.Text.Json.JsonEncodedText PropSeqNoPrimaryTerm = System.Text.Json.JsonEncodedText.Encode("seq_no_primary_term");
+	private static readonly System.Text.Json.JsonEncodedText PropSize = System.Text.Json.JsonEncodedText.Encode("size");
+	private static readonly System.Text.Json.JsonEncodedText PropSort = System.Text.Json.JsonEncodedText.Encode("sort");
+	private static readonly System.Text.Json.JsonEncodedText PropSource = System.Text.Json.JsonEncodedText.Encode("_source");
+	private static readonly System.Text.Json.JsonEncodedText PropStoredFields = System.Text.Json.JsonEncodedText.Encode("stored_fields");
+	private static readonly System.Text.Json.JsonEncodedText PropTrackScores = System.Text.Json.JsonEncodedText.Encode("track_scores");
+	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("version");
+
+	public override InnerHits Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Core.Search.FieldCollapse?> propCollapse = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.QueryDsl.FieldAndFormat>?> propDocvalueFields = default;
+		LocalJsonProperty<bool?> propExplain = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Fields?> propFields = default;
+		LocalJsonProperty<int?> propFrom = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Core.Search.Highlight?> propHighlight = default;
+		LocalJsonProperty<bool?> propIgnoreUnmapped = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Name?> propName = default;
+		LocalJsonProperty<IDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.ScriptField>?> propScriptFields = default;
+		LocalJsonProperty<bool?> propSeqNoPrimaryTerm = default;
+		LocalJsonProperty<int?> propSize = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.SortOptions>?> propSort = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Core.Search.SourceConfig?> propSource = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Fields?> propStoredFields = default;
+		LocalJsonProperty<bool?> propTrackScores = default;
+		LocalJsonProperty<bool?> propVersion = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCollapse.TryRead(ref reader, options, PropCollapse))
+			{
+				continue;
+			}
+
+			if (propDocvalueFields.TryRead(ref reader, options, PropDocvalueFields))
+			{
+				continue;
+			}
+
+			if (propExplain.TryRead(ref reader, options, PropExplain))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propFrom.TryRead(ref reader, options, PropFrom))
+			{
+				continue;
+			}
+
+			if (propHighlight.TryRead(ref reader, options, PropHighlight))
+			{
+				continue;
+			}
+
+			if (propIgnoreUnmapped.TryRead(ref reader, options, PropIgnoreUnmapped))
+			{
+				continue;
+			}
+
+			if (propName.TryRead(ref reader, options, PropName))
+			{
+				continue;
+			}
+
+			if (propScriptFields.TryRead(ref reader, options, PropScriptFields))
+			{
+				continue;
+			}
+
+			if (propSeqNoPrimaryTerm.TryRead(ref reader, options, PropSeqNoPrimaryTerm))
+			{
+				continue;
+			}
+
+			if (propSize.TryRead(ref reader, options, PropSize))
+			{
+				continue;
+			}
+
+			if (propSort.TryRead(ref reader, options, PropSort, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.SortOptions>?, Elastic.Clients.Elasticsearch.SortOptions>)))
+			{
+				continue;
+			}
+
+			if (propSource.TryRead(ref reader, options, PropSource))
+			{
+				continue;
+			}
+
+			if (propStoredFields.TryRead(ref reader, options, PropStoredFields, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propTrackScores.TryRead(ref reader, options, PropTrackScores))
+			{
+				continue;
+			}
+
+			if (propVersion.TryRead(ref reader, options, PropVersion))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new InnerHits
+		{
+			Collapse = propCollapse.Value
+,
+			DocvalueFields = propDocvalueFields.Value
+,
+			Explain = propExplain.Value
+,
+			Fields = propFields.Value
+,
+			From = propFrom.Value
+,
+			Highlight = propHighlight.Value
+,
+			IgnoreUnmapped = propIgnoreUnmapped.Value
+,
+			Name = propName.Value
+,
+			ScriptFields = propScriptFields.Value
+,
+			SeqNoPrimaryTerm = propSeqNoPrimaryTerm.Value
+,
+			Size = propSize.Value
+,
+			Sort = propSort.Value
+,
+			Source = propSource.Value
+,
+			StoredFields = propStoredFields.Value
+,
+			TrackScores = propTrackScores.Value
+,
+			Version = propVersion.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, InnerHits value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCollapse, value.Collapse);
+		writer.WriteProperty(options, PropDocvalueFields, value.DocvalueFields);
+		writer.WriteProperty(options, PropExplain, value.Explain);
+		writer.WriteProperty(options, PropFields, value.Fields, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropFrom, value.From);
+		writer.WriteProperty(options, PropHighlight, value.Highlight);
+		writer.WriteProperty(options, PropIgnoreUnmapped, value.IgnoreUnmapped);
+		writer.WriteProperty(options, PropName, value.Name);
+		writer.WriteProperty(options, PropScriptFields, value.ScriptFields);
+		writer.WriteProperty(options, PropSeqNoPrimaryTerm, value.SeqNoPrimaryTerm);
+		writer.WriteProperty(options, PropSize, value.Size);
+		writer.WriteProperty(options, PropSort, value.Sort, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.SortOptions>?, Elastic.Clients.Elasticsearch.SortOptions>));
+		writer.WriteProperty(options, PropSource, value.Source);
+		writer.WriteProperty(options, PropStoredFields, value.StoredFields, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropTrackScores, value.TrackScores);
+		writer.WriteProperty(options, PropVersion, value.Version);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(InnerHitsConverter))]
 public sealed partial class InnerHits
 {
-	[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")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Fields? Fields { get; set; }
 
 	/// <summary>
@@ -44,11 +224,8 @@ public sealed partial class InnerHits
 	/// Inner hit starting document offset.
 	/// </para>
 	/// </summary>
-	[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; }
 
 	/// <summary>
@@ -57,11 +234,8 @@ public sealed partial class InnerHits
 	/// Useful when a search request contains multiple inner hits.
 	/// </para>
 	/// </summary>
-	[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; }
 
 	/// <summary>
@@ -69,7 +243,6 @@ public sealed partial class InnerHits
 	/// The maximum number of hits to return per <c>inner_hits</c>.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("size")]
 	public int? Size { get; set; }
 
 	/// <summary>
@@ -78,17 +251,10 @@ public sealed partial class InnerHits
 	/// By default, inner hits are sorted by score.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("sort")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.SortOptions))]
 	public ICollection<Elastic.Clients.Elasticsearch.SortOptions>? Sort { get; set; }
-	[JsonInclude, JsonPropertyName("_source")]
 	public Elastic.Clients.Elasticsearch.Core.Search.SourceConfig? Source { get; set; }
-	[JsonInclude, JsonPropertyName("stored_fields")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Fields? StoredFields { get; set; }
-	[JsonInclude, JsonPropertyName("track_scores")]
 	public bool? TrackScores { get; set; }
-	[JsonInclude, JsonPropertyName("version")]
 	public bool? Version { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/PhraseSuggest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/PhraseSuggest.g.cs
index d00e32970ee..c5c9baa887a 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/PhraseSuggest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/PhraseSuggest.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,15 +28,76 @@
 
 namespace Elastic.Clients.Elasticsearch.Core.Search;
 
+internal sealed partial class PhraseSuggestConverter : System.Text.Json.Serialization.JsonConverter<PhraseSuggest>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropLength = System.Text.Json.JsonEncodedText.Encode("length");
+	private static readonly System.Text.Json.JsonEncodedText PropOffset = System.Text.Json.JsonEncodedText.Encode("offset");
+	private static readonly System.Text.Json.JsonEncodedText PropOptions = System.Text.Json.JsonEncodedText.Encode("options");
+	private static readonly System.Text.Json.JsonEncodedText PropText = System.Text.Json.JsonEncodedText.Encode("text");
+
+	public override PhraseSuggest Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<int> propLength = default;
+		LocalJsonProperty<int> propOffset = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Core.Search.PhraseSuggestOption>> propOptions = default;
+		LocalJsonProperty<string> propText = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propLength.TryRead(ref reader, options, PropLength))
+			{
+				continue;
+			}
+
+			if (propOffset.TryRead(ref reader, options, PropOffset))
+			{
+				continue;
+			}
+
+			if (propOptions.TryRead(ref reader, options, PropOptions, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Core.Search.PhraseSuggestOption>, Elastic.Clients.Elasticsearch.Core.Search.PhraseSuggestOption>)))
+			{
+				continue;
+			}
+
+			if (propText.TryRead(ref reader, options, PropText))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PhraseSuggest
+		{
+			Length = propLength.Value
+,
+			Offset = propOffset.Value
+,
+			Options = propOptions.Value
+,
+			Text = propText.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PhraseSuggest value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropLength, value.Length);
+		writer.WriteProperty(options, PropOffset, value.Offset);
+		writer.WriteProperty(options, PropOptions, value.Options, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Core.Search.PhraseSuggestOption>, Elastic.Clients.Elasticsearch.Core.Search.PhraseSuggestOption>));
+		writer.WriteProperty(options, PropText, value.Text);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PhraseSuggestConverter))]
 public sealed partial class PhraseSuggest : ISuggest
 {
-	[JsonInclude, JsonPropertyName("length")]
 	public int Length { get; init; }
-	[JsonInclude, JsonPropertyName("offset")]
 	public int Offset { get; init; }
-	[JsonInclude, JsonPropertyName("options")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.Core.Search.PhraseSuggestOption))]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Core.Search.PhraseSuggestOption> Options { get; init; }
-	[JsonInclude, JsonPropertyName("text")]
 	public string Text { get; init; }
+
+	string ISuggest.Type => "phrase";
 }
\ 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 4690dd4d38a..140afb70c37 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
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -39,12 +40,16 @@ internal Rescore(string variantName, object variant)
 			throw new ArgumentNullException(nameof(variant));
 		if (string.IsNullOrWhiteSpace(variantName))
 			throw new ArgumentException("Variant name must not be empty or whitespace.");
-		VariantName = variantName;
+		VariantType = variantName;
 		Variant = variant;
 	}
 
-	internal object Variant { get; }
-	internal string VariantName { get; }
+	internal Rescore()
+	{
+	}
+
+	public object Variant { get; internal set; }
+	public string VariantType { get; internal set; }
 
 	public static Rescore LearningToRank(Elastic.Clients.Elasticsearch.Core.Search.LearningToRank learningToRank) => new Rescore("learning_to_rank", learningToRank);
 	public static Rescore Query(Elastic.Clients.Elasticsearch.Core.Search.RescoreQuery rescoreQuery) => new Rescore("query", rescoreQuery);
@@ -65,83 +70,71 @@ public bool TryGet<T>([NotNullWhen(true)] out T? result) where T : class
 	}
 }
 
-internal sealed partial class RescoreConverter : JsonConverter<Rescore>
+internal sealed partial class RescoreConverter : System.Text.Json.Serialization.JsonConverter<Rescore>
 {
-	public override Rescore Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-		{
-			throw new JsonException("Expected start token.");
-		}
+	private static readonly System.Text.Json.JsonEncodedText PropWindowSize = System.Text.Json.JsonEncodedText.Encode("window_size");
+	private static readonly System.Text.Json.JsonEncodedText VariantLearningToRank = System.Text.Json.JsonEncodedText.Encode("learning_to_rank");
+	private static readonly System.Text.Json.JsonEncodedText VariantQuery = System.Text.Json.JsonEncodedText.Encode("query");
 
-		object? variantValue = default;
-		string? variantNameValue = default;
-		int? windowSizeValue = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+	public override Rescore Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<int?> propWindowSize = default;
+		var variantType = string.Empty;
+		object? variant = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token.");
-			}
-
-			if (reader.TokenType != JsonTokenType.PropertyName)
+			if (propWindowSize.TryRead(ref reader, options, PropWindowSize))
 			{
-				throw new JsonException("Expected a property name token representing the name of an Elasticsearch field.");
-			}
-
-			var propertyName = reader.GetString();
-			reader.Read();
-			if (propertyName == "window_size")
-			{
-				windowSizeValue = JsonSerializer.Deserialize<int?>(ref reader, options);
 				continue;
 			}
 
-			if (propertyName == "learning_to_rank")
+			if (reader.ValueTextEquals(VariantLearningToRank))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Core.Search.LearningToRank?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantLearningToRank.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Core.Search.LearningToRank?>(options);
 				continue;
 			}
 
-			if (propertyName == "query")
+			if (reader.ValueTextEquals(VariantQuery))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Core.Search.RescoreQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantQuery.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Core.Search.RescoreQuery?>(options);
 				continue;
 			}
 
-			throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'Rescore' from the response.");
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		var result = new Rescore(variantNameValue, variantValue);
-		result.WindowSize = windowSizeValue;
-		return result;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new Rescore
+		{
+			VariantType = variantType,
+			Variant = variant,
+			WindowSize = propWindowSize.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, Rescore value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, Rescore value, System.Text.Json.JsonSerializerOptions options)
 	{
 		writer.WriteStartObject();
-		if (value.WindowSize.HasValue)
-		{
-			writer.WritePropertyName("window_size");
-			writer.WriteNumberValue(value.WindowSize.Value);
-		}
-
-		if (value.VariantName is not null && value.Variant is not null)
+		switch (value.VariantType)
 		{
-			writer.WritePropertyName(value.VariantName);
-			switch (value.VariantName)
-			{
-				case "learning_to_rank":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Core.Search.LearningToRank>(writer, (Elastic.Clients.Elasticsearch.Core.Search.LearningToRank)value.Variant, options);
-					break;
-				case "query":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Core.Search.RescoreQuery>(writer, (Elastic.Clients.Elasticsearch.Core.Search.RescoreQuery)value.Variant, options);
-					break;
-			}
+			case "":
+				break;
+			case "learning_to_rank":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Core.Search.LearningToRank?)value.Variant);
+				break;
+			case "query":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Core.Search.RescoreQuery?)value.Variant);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.VariantType}' is not supported for type '{nameof(Rescore)}'.");
 		}
 
+		writer.WriteProperty(options, PropWindowSize, value.WindowSize);
 		writer.WriteEndObject();
 	}
 }
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 9d3e6ebe178..e5d07927a63 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
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -39,12 +40,16 @@ internal SmoothingModel(string variantName, object variant)
 			throw new ArgumentNullException(nameof(variant));
 		if (string.IsNullOrWhiteSpace(variantName))
 			throw new ArgumentException("Variant name must not be empty or whitespace.");
-		VariantName = variantName;
+		VariantType = variantName;
 		Variant = variant;
 	}
 
-	internal object Variant { get; }
-	internal string VariantName { get; }
+	internal SmoothingModel()
+	{
+	}
+
+	public object Variant { get; internal set; }
+	public string VariantType { get; internal set; }
 
 	public static SmoothingModel Laplace(Elastic.Clients.Elasticsearch.Core.Search.LaplaceSmoothingModel laplaceSmoothingModel) => new SmoothingModel("laplace", laplaceSmoothingModel);
 	public static SmoothingModel LinearInterpolation(Elastic.Clients.Elasticsearch.Core.Search.LinearInterpolationSmoothingModel linearInterpolationSmoothingModel) => new SmoothingModel("linear_interpolation", linearInterpolationSmoothingModel);
@@ -63,77 +68,68 @@ public bool TryGet<T>([NotNullWhen(true)] out T? result) where T : class
 	}
 }
 
-internal sealed partial class SmoothingModelConverter : JsonConverter<SmoothingModel>
+internal sealed partial class SmoothingModelConverter : System.Text.Json.Serialization.JsonConverter<SmoothingModel>
 {
-	public override SmoothingModel Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-		{
-			throw new JsonException("Expected start token.");
-		}
+	private static readonly System.Text.Json.JsonEncodedText VariantLaplace = System.Text.Json.JsonEncodedText.Encode("laplace");
+	private static readonly System.Text.Json.JsonEncodedText VariantLinearInterpolation = System.Text.Json.JsonEncodedText.Encode("linear_interpolation");
+	private static readonly System.Text.Json.JsonEncodedText VariantStupidBackoff = System.Text.Json.JsonEncodedText.Encode("stupid_backoff");
 
-		object? variantValue = default;
-		string? variantNameValue = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+	public override SmoothingModel Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		var variantType = string.Empty;
+		object? variant = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
+			if (reader.ValueTextEquals(VariantLaplace))
 			{
-				throw new JsonException("Expected a property name token.");
-			}
-
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token representing the name of an Elasticsearch field.");
-			}
-
-			var propertyName = reader.GetString();
-			reader.Read();
-			if (propertyName == "laplace")
-			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Core.Search.LaplaceSmoothingModel?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantLaplace.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Core.Search.LaplaceSmoothingModel?>(options);
 				continue;
 			}
 
-			if (propertyName == "linear_interpolation")
+			if (reader.ValueTextEquals(VariantLinearInterpolation))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Core.Search.LinearInterpolationSmoothingModel?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantLinearInterpolation.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Core.Search.LinearInterpolationSmoothingModel?>(options);
 				continue;
 			}
 
-			if (propertyName == "stupid_backoff")
+			if (reader.ValueTextEquals(VariantStupidBackoff))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Core.Search.StupidBackoffSmoothingModel?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantStupidBackoff.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Core.Search.StupidBackoffSmoothingModel?>(options);
 				continue;
 			}
 
-			throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'SmoothingModel' from the response.");
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		var result = new SmoothingModel(variantNameValue, variantValue);
-		return result;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SmoothingModel { VariantType = variantType, Variant = variant };
 	}
 
-	public override void Write(Utf8JsonWriter writer, SmoothingModel value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SmoothingModel value, System.Text.Json.JsonSerializerOptions options)
 	{
 		writer.WriteStartObject();
-		if (value.VariantName is not null && value.Variant is not null)
+		switch (value.VariantType)
 		{
-			writer.WritePropertyName(value.VariantName);
-			switch (value.VariantName)
-			{
-				case "laplace":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Core.Search.LaplaceSmoothingModel>(writer, (Elastic.Clients.Elasticsearch.Core.Search.LaplaceSmoothingModel)value.Variant, options);
-					break;
-				case "linear_interpolation":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Core.Search.LinearInterpolationSmoothingModel>(writer, (Elastic.Clients.Elasticsearch.Core.Search.LinearInterpolationSmoothingModel)value.Variant, options);
-					break;
-				case "stupid_backoff":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Core.Search.StupidBackoffSmoothingModel>(writer, (Elastic.Clients.Elasticsearch.Core.Search.StupidBackoffSmoothingModel)value.Variant, options);
-					break;
-			}
+			case "":
+				break;
+			case "laplace":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Core.Search.LaplaceSmoothingModel?)value.Variant);
+				break;
+			case "linear_interpolation":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Core.Search.LinearInterpolationSmoothingModel?)value.Variant);
+				break;
+			case "stupid_backoff":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Core.Search.StupidBackoffSmoothingModel?)value.Variant);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.VariantType}' is not supported for type '{nameof(SmoothingModel)}'.");
 		}
 
 		writer.WriteEndObject();
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 ecf27ebf675..ff3aebb1ede 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
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,52 +28,57 @@
 
 namespace Elastic.Clients.Elasticsearch.Core.Search;
 
-internal sealed partial class SourceFilterConverter : JsonConverter<SourceFilter>
+internal sealed partial class SourceFilterConverter : System.Text.Json.Serialization.JsonConverter<SourceFilter>
 {
-	public override SourceFilter Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropExcludes = System.Text.Json.JsonEncodedText.Encode("excludes");
+	private static readonly System.Text.Json.JsonEncodedText PropExcludes1 = System.Text.Json.JsonEncodedText.Encode("exclude");
+	private static readonly System.Text.Json.JsonEncodedText PropIncludes = System.Text.Json.JsonEncodedText.Encode("includes");
+	private static readonly System.Text.Json.JsonEncodedText PropIncludes1 = System.Text.Json.JsonEncodedText.Encode("include");
+
+	public override SourceFilter Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		var variant = new SourceFilter();
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		var readerSnapshot = reader;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Fields?> propExcludes = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Fields?> propIncludes = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propExcludes.TryRead(ref reader, options, PropExcludes, typeof(SingleOrManyFieldsMarker)) || propExcludes.TryRead(ref reader, options, PropExcludes1, typeof(SingleOrManyFieldsMarker)))
 			{
-				var property = reader.GetString();
-				if (property == "excludes" || property == "exclude")
-				{
-					reader.Read();
-					variant.Excludes = new FieldsConverter().Read(ref reader, typeToConvert, options);
-					continue;
-				}
-
-				if (property == "includes" || property == "include")
-				{
-					reader.Read();
-					variant.Includes = new FieldsConverter().Read(ref reader, typeToConvert, options);
-					continue;
-				}
+				continue;
 			}
-		}
 
-		return variant;
-	}
+			if (propIncludes.TryRead(ref reader, options, PropIncludes, typeof(SingleOrManyFieldsMarker)) || propIncludes.TryRead(ref reader, options, PropIncludes1, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
 
-	public override void Write(Utf8JsonWriter writer, SourceFilter value, JsonSerializerOptions options)
-	{
-		writer.WriteStartObject();
-		if (value.Excludes is not null)
-		{
-			writer.WritePropertyName("excludes");
-			new FieldsConverter().Write(writer, value.Excludes, options);
+			try
+			{
+				reader = readerSnapshot;
+				var result = reader.ReadValue<Elastic.Clients.Elasticsearch.Fields?>(options);
+				return new SourceFilter { Includes = result };
+			}
+			catch (System.Text.Json.JsonException)
+			{
+				throw;
+			}
 		}
 
-		if (value.Includes is not null)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SourceFilter
 		{
-			writer.WritePropertyName("includes");
-			new FieldsConverter().Write(writer, value.Includes, options);
-		}
+			Excludes = propExcludes.Value
+,
+			Includes = propIncludes.Value
+		};
+	}
 
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SourceFilter value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropExcludes, value.Excludes, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropIncludes, value.Includes, typeof(SingleOrManyFieldsMarker));
 		writer.WriteEndObject();
 	}
 }
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/SuggestDictionary.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/SuggestDictionary.g.cs
index 3cde4af0f69..1e6885d8c13 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/SuggestDictionary.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/SuggestDictionary.g.cs
@@ -19,6 +19,7 @@
 
 using Elastic.Clients.Elasticsearch.Core;
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport;
 using System;
@@ -33,9 +34,10 @@ namespace Elastic.Clients.Elasticsearch.Core.Search;
 
 public partial interface ISuggest
 {
+	public string? Type { get; }
 }
 
-[GenericConverter(typeof(SuggestDictionaryConverter<>), unwrap: true)]
+[JsonConverter(typeof(SuggestDictionaryConverterFactory))]
 public partial class SuggestDictionary<TDocument> : IsAReadOnlyDictionary<string, IReadOnlyCollection<ISuggest>>
 {
 	public SuggestDictionary(IReadOnlyDictionary<string, IReadOnlyCollection<ISuggest>> backingDictionary) : base(backingDictionary)
@@ -48,61 +50,87 @@ public SuggestDictionary(IReadOnlyDictionary<string, IReadOnlyCollection<ISugges
 	private IReadOnlyCollection<T>? TryGet<T>(string key) where T : class, ISuggest => BackingDictionary.TryGetValue(key, out var value) ? value.Cast<T>().ToArray() : null;
 }
 
-internal sealed partial class SuggestDictionaryConverter<TDocument> : JsonConverter<SuggestDictionary<TDocument>>
+internal sealed partial class SuggestDictionaryConverter<TDocument> : System.Text.Json.Serialization.JsonConverter<SuggestDictionary<TDocument>>
 {
-	public override SuggestDictionary<TDocument> Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	public override SuggestDictionary<TDocument> Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var dictionary = new Dictionary<string, IReadOnlyCollection<ISuggest>>();
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException($"Expected {JsonTokenType.StartObject} but read {reader.TokenType}.");
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		var dictionary = new System.Collections.Generic.Dictionary<string, IReadOnlyCollection<ISuggest>>();
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
-				throw new JsonException($"Expected {JsonTokenType.PropertyName} but read {reader.TokenType}.");
-			var name = reader.GetString();
-			reader.Read();
-			ReadItem(ref reader, options, dictionary, name);
+			ReadItem(ref reader, options, out string name, out IReadOnlyCollection<ISuggest> value);
+			dictionary[name] = value;
 		}
 
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
 		return new SuggestDictionary<TDocument>(dictionary);
 	}
 
-	public override void Write(Utf8JsonWriter writer, SuggestDictionary<TDocument> value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SuggestDictionary<TDocument> value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'SuggestDictionary' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		foreach (var pair in value)
+		{
+			WriteItem(writer, options, pair.Key, pair.Value);
+		}
+
+		writer.WriteEndObject();
 	}
 
-	public static void ReadItem(ref Utf8JsonReader reader, JsonSerializerOptions options, Dictionary<string, IReadOnlyCollection<ISuggest>> dictionary, string name)
+	internal static void ReadItem(ref System.Text.Json.Utf8JsonReader reader, System.Text.Json.JsonSerializerOptions options, out string name, out IReadOnlyCollection<ISuggest> value)
 	{
-		var nameParts = name.Split('#');
-		if (nameParts.Length != 2)
-			throw new JsonException($"Unable to parse typed-key '{name}'.");
-		var type = nameParts[0];
-		switch (type)
+		reader.ReadPropertyName(options, out string key);
+		reader.Read();
+		var parts = key.Split('#');
+		if (parts.Length != 2)
 		{
-			case "completion":
-				{
-					var item = JsonSerializer.Deserialize<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Core.Search.CompletionSuggest<TDocument>>>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
-
-			case "phrase":
-				{
-					var item = JsonSerializer.Deserialize<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Core.Search.PhraseSuggest>>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
+			throw new System.Text.Json.JsonException($"Unable to parse typed-key '{key}' for variant '{nameof(IReadOnlyCollection<ISuggest>)}'.");
+		}
 
-			case "term":
-				{
-					var item = JsonSerializer.Deserialize<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Core.Search.TermSuggest>>(ref reader, options);
-					dictionary.Add(nameParts[1], item);
-					break;
-				}
+		var discriminator = parts[0];
+		name = parts[1];
+		value = discriminator switch
+		{
+			"completion" => reader.ReadValue<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Core.Search.CompletionSuggest<TDocument>>>(options),
+			"phrase" => reader.ReadValue<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Core.Search.PhraseSuggest>>(options),
+			"term" => reader.ReadValue<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Core.Search.TermSuggest>>(options),
+			_ => throw new System.Text.Json.JsonException($"Variant '{discriminator}' is not supported for type '{nameof(IReadOnlyCollection<ISuggest>)}'.")
+		};
+	}
 
+	internal static void WriteItem(System.Text.Json.Utf8JsonWriter writer, System.Text.Json.JsonSerializerOptions options, string name, IReadOnlyCollection<ISuggest> value)
+	{
+		var key = value.First().Type + '#' + name;
+		switch (value)
+		{
+			case IReadOnlyCollection<Elastic.Clients.Elasticsearch.Core.Search.CompletionSuggest<TDocument>> v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case IReadOnlyCollection<Elastic.Clients.Elasticsearch.Core.Search.PhraseSuggest> v:
+				writer.WriteProperty(options, key, v);
+				break;
+			case IReadOnlyCollection<Elastic.Clients.Elasticsearch.Core.Search.TermSuggest> v:
+				writer.WriteProperty(options, key, v);
+				break;
 			default:
-				throw new NotSupportedException($"The tagged variant '{type}' is currently not supported.");
+				throw new System.Text.Json.JsonException($"Variant '{0}' is not supported for type '{nameof(IReadOnlyCollection<ISuggest>)}'.");
 		}
 	}
+}
+
+internal sealed partial class SuggestDictionaryConverterFactory : System.Text.Json.Serialization.JsonConverterFactory
+{
+	public override bool CanConvert(System.Type typeToConvert)
+	{
+		return typeToConvert.IsGenericType && typeToConvert.GetGenericTypeDefinition() == typeof(SuggestDictionary<>);
+	}
+
+	public override System.Text.Json.Serialization.JsonConverter CreateConverter(System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		var args = typeToConvert.GetGenericArguments();
+#pragma warning disable IL3050
+		var converter = (System.Text.Json.Serialization.JsonConverter)System.Activator.CreateInstance(typeof(SuggestDictionaryConverter<>).MakeGenericType(args[0]), System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public, binder: null, args: null, culture: null)!;
+#pragma warning restore IL3050
+		return converter;
+	}
 }
\ No newline at end of file
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 4c45bb505e6..485b485b696 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
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,53 +28,49 @@
 
 namespace Elastic.Clients.Elasticsearch.Core.Search;
 
-internal sealed partial class SuggesterConverter : JsonConverter<Suggester>
+internal sealed partial class SuggesterConverter : System.Text.Json.Serialization.JsonConverter<Suggester>
 {
-	public override Suggester Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropSuggesters = System.Text.Json.JsonEncodedText.Encode("suggesters");
+	private static readonly System.Text.Json.JsonEncodedText PropText = System.Text.Json.JsonEncodedText.Encode("text");
+
+	public override Suggester Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		var variant = new Suggester();
-		Dictionary<string, Elastic.Clients.Elasticsearch.Core.Search.FieldSuggester> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Core.Search.FieldSuggester> propSuggesters = default;
+		LocalJsonProperty<string?> propText = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propText.TryRead(ref reader, options, PropText))
 			{
-				var property = reader.GetString();
-				if (property == "text")
-				{
-					variant.Text = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				additionalProperties ??= new Dictionary<string, Elastic.Clients.Elasticsearch.Core.Search.FieldSuggester>();
-				var additionalValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Core.Search.FieldSuggester>(ref reader, options);
-				additionalProperties.Add(property, additionalValue);
+				continue;
 			}
+
+			propSuggesters ??= new System.Collections.Generic.Dictionary<string, Elastic.Clients.Elasticsearch.Core.Search.FieldSuggester>();
+			reader.ReadProperty(options, out string key, out Elastic.Clients.Elasticsearch.Core.Search.FieldSuggester value);
+			propSuggesters[key] = value;
 		}
 
-		variant.Suggesters = additionalProperties;
-		return variant;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new Suggester
+		{
+			Suggesters = propSuggesters
+,
+			Text = propText.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, Suggester value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, Suggester value, System.Text.Json.JsonSerializerOptions options)
 	{
 		writer.WriteStartObject();
+		writer.WriteProperty(options, PropText, value.Text);
 		if (value.Suggesters is not null)
 		{
-			foreach (var additionalProperty in value.Suggesters)
+			foreach (var item in value.Suggesters)
 			{
-				writer.WritePropertyName(additionalProperty.Key);
-				JsonSerializer.Serialize(writer, additionalProperty.Value, options);
+				writer.WriteProperty(options, item.Key, item.Value);
 			}
 		}
 
-		if (!string.IsNullOrEmpty(value.Text))
-		{
-			writer.WritePropertyName("text");
-			writer.WriteStringValue(value.Text);
-		}
-
 		writer.WriteEndObject();
 	}
 }
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/TermSuggest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/TermSuggest.g.cs
index c7a1b48092c..4e77b252a84 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/TermSuggest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/TermSuggest.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,15 +28,76 @@
 
 namespace Elastic.Clients.Elasticsearch.Core.Search;
 
+internal sealed partial class TermSuggestConverter : System.Text.Json.Serialization.JsonConverter<TermSuggest>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropLength = System.Text.Json.JsonEncodedText.Encode("length");
+	private static readonly System.Text.Json.JsonEncodedText PropOffset = System.Text.Json.JsonEncodedText.Encode("offset");
+	private static readonly System.Text.Json.JsonEncodedText PropOptions = System.Text.Json.JsonEncodedText.Encode("options");
+	private static readonly System.Text.Json.JsonEncodedText PropText = System.Text.Json.JsonEncodedText.Encode("text");
+
+	public override TermSuggest Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<int> propLength = default;
+		LocalJsonProperty<int> propOffset = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Core.Search.TermSuggestOption>> propOptions = default;
+		LocalJsonProperty<string> propText = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propLength.TryRead(ref reader, options, PropLength))
+			{
+				continue;
+			}
+
+			if (propOffset.TryRead(ref reader, options, PropOffset))
+			{
+				continue;
+			}
+
+			if (propOptions.TryRead(ref reader, options, PropOptions, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Core.Search.TermSuggestOption>, Elastic.Clients.Elasticsearch.Core.Search.TermSuggestOption>)))
+			{
+				continue;
+			}
+
+			if (propText.TryRead(ref reader, options, PropText))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new TermSuggest
+		{
+			Length = propLength.Value
+,
+			Offset = propOffset.Value
+,
+			Options = propOptions.Value
+,
+			Text = propText.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, TermSuggest value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropLength, value.Length);
+		writer.WriteProperty(options, PropOffset, value.Offset);
+		writer.WriteProperty(options, PropOptions, value.Options, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Core.Search.TermSuggestOption>, Elastic.Clients.Elasticsearch.Core.Search.TermSuggestOption>));
+		writer.WriteProperty(options, PropText, value.Text);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(TermSuggestConverter))]
 public sealed partial class TermSuggest : ISuggest
 {
-	[JsonInclude, JsonPropertyName("length")]
 	public int Length { get; init; }
-	[JsonInclude, JsonPropertyName("offset")]
 	public int Offset { get; init; }
-	[JsonInclude, JsonPropertyName("options")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.Core.Search.TermSuggestOption))]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Core.Search.TermSuggestOption> Options { get; init; }
-	[JsonInclude, JsonPropertyName("text")]
 	public string Text { get; init; }
+
+	string ISuggest.Type => "term";
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/DanglingIndices/DanglingIndex.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/DanglingIndices/DanglingIndex.g.cs
index 5dc8b54516f..11d0de13179 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/DanglingIndices/DanglingIndex.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/DanglingIndices/DanglingIndex.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,15 +28,74 @@
 
 namespace Elastic.Clients.Elasticsearch.DanglingIndices;
 
+internal sealed partial class DanglingIndexConverter : System.Text.Json.Serialization.JsonConverter<DanglingIndex>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCreationDateMillis = System.Text.Json.JsonEncodedText.Encode("creation_date_millis");
+	private static readonly System.Text.Json.JsonEncodedText PropIndexName = System.Text.Json.JsonEncodedText.Encode("index_name");
+	private static readonly System.Text.Json.JsonEncodedText PropIndexUuid = System.Text.Json.JsonEncodedText.Encode("index_uuid");
+	private static readonly System.Text.Json.JsonEncodedText PropNodeIds = System.Text.Json.JsonEncodedText.Encode("node_ids");
+
+	public override DanglingIndex Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<long> propCreationDateMillis = default;
+		LocalJsonProperty<string> propIndexName = default;
+		LocalJsonProperty<string> propIndexUuid = default;
+		LocalJsonProperty<IReadOnlyCollection<string>> propNodeIds = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCreationDateMillis.TryRead(ref reader, options, PropCreationDateMillis))
+			{
+				continue;
+			}
+
+			if (propIndexName.TryRead(ref reader, options, PropIndexName))
+			{
+				continue;
+			}
+
+			if (propIndexUuid.TryRead(ref reader, options, PropIndexUuid))
+			{
+				continue;
+			}
+
+			if (propNodeIds.TryRead(ref reader, options, PropNodeIds, typeof(SingleOrManyMarker<IReadOnlyCollection<string>, string>)))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DanglingIndex
+		{
+			CreationDateMillis = propCreationDateMillis.Value
+,
+			IndexName = propIndexName.Value
+,
+			IndexUuid = propIndexUuid.Value
+,
+			NodeIds = propNodeIds.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DanglingIndex value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCreationDateMillis, value.CreationDateMillis);
+		writer.WriteProperty(options, PropIndexName, value.IndexName);
+		writer.WriteProperty(options, PropIndexUuid, value.IndexUuid);
+		writer.WriteProperty(options, PropNodeIds, value.NodeIds, typeof(SingleOrManyMarker<IReadOnlyCollection<string>, string>));
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DanglingIndexConverter))]
 public sealed partial class DanglingIndex
 {
-	[JsonInclude, JsonPropertyName("creation_date_millis")]
 	public long CreationDateMillis { get; init; }
-	[JsonInclude, JsonPropertyName("index_name")]
 	public string IndexName { get; init; }
-	[JsonInclude, JsonPropertyName("index_uuid")]
 	public string IndexUuid { get; init; }
-	[JsonInclude, JsonPropertyName("node_ids")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public IReadOnlyCollection<string> NodeIds { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enrich/EnrichPolicy.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enrich/EnrichPolicy.g.cs
index fc7a0cf8953..a8d7d73cdf1 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enrich/EnrichPolicy.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enrich/EnrichPolicy.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,20 +28,97 @@
 
 namespace Elastic.Clients.Elasticsearch.Enrich;
 
+internal sealed partial class EnrichPolicyConverter : System.Text.Json.Serialization.JsonConverter<EnrichPolicy>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropElasticsearchVersion = System.Text.Json.JsonEncodedText.Encode("elasticsearch_version");
+	private static readonly System.Text.Json.JsonEncodedText PropEnrichFields = System.Text.Json.JsonEncodedText.Encode("enrich_fields");
+	private static readonly System.Text.Json.JsonEncodedText PropIndices = System.Text.Json.JsonEncodedText.Encode("indices");
+	private static readonly System.Text.Json.JsonEncodedText PropMatchField = System.Text.Json.JsonEncodedText.Encode("match_field");
+	private static readonly System.Text.Json.JsonEncodedText PropName = System.Text.Json.JsonEncodedText.Encode("name");
+	private static readonly System.Text.Json.JsonEncodedText PropQuery = System.Text.Json.JsonEncodedText.Encode("query");
+
+	public override EnrichPolicy Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string?> propElasticsearchVersion = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Fields> propEnrichFields = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Indices> propIndices = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Field> propMatchField = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Name?> propName = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.QueryDsl.Query?> propQuery = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propElasticsearchVersion.TryRead(ref reader, options, PropElasticsearchVersion))
+			{
+				continue;
+			}
+
+			if (propEnrichFields.TryRead(ref reader, options, PropEnrichFields, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propIndices.TryRead(ref reader, options, PropIndices))
+			{
+				continue;
+			}
+
+			if (propMatchField.TryRead(ref reader, options, PropMatchField))
+			{
+				continue;
+			}
+
+			if (propName.TryRead(ref reader, options, PropName))
+			{
+				continue;
+			}
+
+			if (propQuery.TryRead(ref reader, options, PropQuery))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new EnrichPolicy
+		{
+			ElasticsearchVersion = propElasticsearchVersion.Value
+,
+			EnrichFields = propEnrichFields.Value
+,
+			Indices = propIndices.Value
+,
+			MatchField = propMatchField.Value
+,
+			Name = propName.Value
+,
+			Query = propQuery.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, EnrichPolicy value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropElasticsearchVersion, value.ElasticsearchVersion);
+		writer.WriteProperty(options, PropEnrichFields, value.EnrichFields, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropIndices, value.Indices);
+		writer.WriteProperty(options, PropMatchField, value.MatchField);
+		writer.WriteProperty(options, PropName, value.Name);
+		writer.WriteProperty(options, PropQuery, value.Query);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(EnrichPolicyConverter))]
 public sealed partial class EnrichPolicy
 {
-	[JsonInclude, JsonPropertyName("elasticsearch_version")]
 	public string? ElasticsearchVersion { get; set; }
-	[JsonInclude, JsonPropertyName("enrich_fields")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Fields EnrichFields { get; set; }
-	[JsonInclude, JsonPropertyName("indices")]
 	public Elastic.Clients.Elasticsearch.Indices Indices { get; set; }
-	[JsonInclude, JsonPropertyName("match_field")]
 	public Elastic.Clients.Elasticsearch.Field MatchField { get; set; }
-	[JsonInclude, JsonPropertyName("name")]
 	public Elastic.Clients.Elasticsearch.Name? Name { get; set; }
-	[JsonInclude, JsonPropertyName("query")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.Query? Query { get; set; }
 }
 
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 bb501a37b36..9e72f50aafb 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
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Core;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport;
 using System;
@@ -49,74 +50,102 @@ public enum CalendarInterval
 	Day
 }
 
-internal sealed class CalendarIntervalConverter : JsonConverter<CalendarInterval>
+internal sealed partial class CalendarIntervalConverter : System.Text.Json.Serialization.JsonConverter<CalendarInterval>
 {
-	public override CalendarInterval Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberYear = System.Text.Json.JsonEncodedText.Encode("year");
+	private static readonly System.Text.Json.JsonEncodedText MemberYear1 = System.Text.Json.JsonEncodedText.Encode("1y");
+	private static readonly System.Text.Json.JsonEncodedText MemberWeek = System.Text.Json.JsonEncodedText.Encode("week");
+	private static readonly System.Text.Json.JsonEncodedText MemberWeek1 = System.Text.Json.JsonEncodedText.Encode("1w");
+	private static readonly System.Text.Json.JsonEncodedText MemberSecond = System.Text.Json.JsonEncodedText.Encode("second");
+	private static readonly System.Text.Json.JsonEncodedText MemberSecond1 = System.Text.Json.JsonEncodedText.Encode("1s");
+	private static readonly System.Text.Json.JsonEncodedText MemberQuarter = System.Text.Json.JsonEncodedText.Encode("quarter");
+	private static readonly System.Text.Json.JsonEncodedText MemberQuarter1 = System.Text.Json.JsonEncodedText.Encode("1q");
+	private static readonly System.Text.Json.JsonEncodedText MemberMonth = System.Text.Json.JsonEncodedText.Encode("month");
+	private static readonly System.Text.Json.JsonEncodedText MemberMonth1 = System.Text.Json.JsonEncodedText.Encode("1M");
+	private static readonly System.Text.Json.JsonEncodedText MemberMinute = System.Text.Json.JsonEncodedText.Encode("minute");
+	private static readonly System.Text.Json.JsonEncodedText MemberMinute1 = System.Text.Json.JsonEncodedText.Encode("1m");
+	private static readonly System.Text.Json.JsonEncodedText MemberHour = System.Text.Json.JsonEncodedText.Encode("hour");
+	private static readonly System.Text.Json.JsonEncodedText MemberHour1 = System.Text.Json.JsonEncodedText.Encode("1h");
+	private static readonly System.Text.Json.JsonEncodedText MemberDay = System.Text.Json.JsonEncodedText.Encode("day");
+	private static readonly System.Text.Json.JsonEncodedText MemberDay1 = System.Text.Json.JsonEncodedText.Encode("1d");
+
+	public override CalendarInterval Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "year":
-			case "1y":
-				return CalendarInterval.Year;
-			case "week":
-			case "1w":
-				return CalendarInterval.Week;
-			case "second":
-			case "1s":
-				return CalendarInterval.Second;
-			case "quarter":
-			case "1q":
-				return CalendarInterval.Quarter;
-			case "month":
-			case "1M":
-				return CalendarInterval.Month;
-			case "minute":
-			case "1m":
-				return CalendarInterval.Minute;
-			case "hour":
-			case "1h":
-				return CalendarInterval.Hour;
-			case "day":
-			case "1d":
-				return CalendarInterval.Day;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberYear) || reader.ValueTextEquals(MemberYear1))
+		{
+			return CalendarInterval.Year;
+		}
+
+		if (reader.ValueTextEquals(MemberWeek) || reader.ValueTextEquals(MemberWeek1))
+		{
+			return CalendarInterval.Week;
+		}
+
+		if (reader.ValueTextEquals(MemberSecond) || reader.ValueTextEquals(MemberSecond1))
+		{
+			return CalendarInterval.Second;
+		}
+
+		if (reader.ValueTextEquals(MemberQuarter) || reader.ValueTextEquals(MemberQuarter1))
+		{
+			return CalendarInterval.Quarter;
+		}
+
+		if (reader.ValueTextEquals(MemberMonth) || reader.ValueTextEquals(MemberMonth1))
+		{
+			return CalendarInterval.Month;
+		}
+
+		if (reader.ValueTextEquals(MemberMinute) || reader.ValueTextEquals(MemberMinute1))
+		{
+			return CalendarInterval.Minute;
+		}
+
+		if (reader.ValueTextEquals(MemberHour) || reader.ValueTextEquals(MemberHour1))
+		{
+			return CalendarInterval.Hour;
+		}
+
+		if (reader.ValueTextEquals(MemberDay) || reader.ValueTextEquals(MemberDay1))
+		{
+			return CalendarInterval.Day;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(CalendarInterval)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, CalendarInterval value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, CalendarInterval value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case CalendarInterval.Year:
-				writer.WriteStringValue("year");
-				return;
+				writer.WriteStringValue(MemberYear);
+				break;
 			case CalendarInterval.Week:
-				writer.WriteStringValue("week");
-				return;
+				writer.WriteStringValue(MemberWeek);
+				break;
 			case CalendarInterval.Second:
-				writer.WriteStringValue("second");
-				return;
+				writer.WriteStringValue(MemberSecond);
+				break;
 			case CalendarInterval.Quarter:
-				writer.WriteStringValue("quarter");
-				return;
+				writer.WriteStringValue(MemberQuarter);
+				break;
 			case CalendarInterval.Month:
-				writer.WriteStringValue("month");
-				return;
+				writer.WriteStringValue(MemberMonth);
+				break;
 			case CalendarInterval.Minute:
-				writer.WriteStringValue("minute");
-				return;
+				writer.WriteStringValue(MemberMinute);
+				break;
 			case CalendarInterval.Hour:
-				writer.WriteStringValue("hour");
-				return;
+				writer.WriteStringValue(MemberHour);
+				break;
 			case CalendarInterval.Day:
-				writer.WriteStringValue("day");
-				return;
+				writer.WriteStringValue(MemberDay);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(CalendarInterval)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -160,51 +189,67 @@ public enum CardinalityExecutionMode
 	Direct
 }
 
-internal sealed class CardinalityExecutionModeConverter : JsonConverter<CardinalityExecutionMode>
+internal sealed partial class CardinalityExecutionModeConverter : System.Text.Json.Serialization.JsonConverter<CardinalityExecutionMode>
 {
-	public override CardinalityExecutionMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberSegmentOrdinals = System.Text.Json.JsonEncodedText.Encode("segment_ordinals");
+	private static readonly System.Text.Json.JsonEncodedText MemberSaveTimeHeuristic = System.Text.Json.JsonEncodedText.Encode("save_time_heuristic");
+	private static readonly System.Text.Json.JsonEncodedText MemberSaveMemoryHeuristic = System.Text.Json.JsonEncodedText.Encode("save_memory_heuristic");
+	private static readonly System.Text.Json.JsonEncodedText MemberGlobalOrdinals = System.Text.Json.JsonEncodedText.Encode("global_ordinals");
+	private static readonly System.Text.Json.JsonEncodedText MemberDirect = System.Text.Json.JsonEncodedText.Encode("direct");
+
+	public override CardinalityExecutionMode Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "segment_ordinals":
-				return CardinalityExecutionMode.SegmentOrdinals;
-			case "save_time_heuristic":
-				return CardinalityExecutionMode.SaveTimeHeuristic;
-			case "save_memory_heuristic":
-				return CardinalityExecutionMode.SaveMemoryHeuristic;
-			case "global_ordinals":
-				return CardinalityExecutionMode.GlobalOrdinals;
-			case "direct":
-				return CardinalityExecutionMode.Direct;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberSegmentOrdinals))
+		{
+			return CardinalityExecutionMode.SegmentOrdinals;
+		}
+
+		if (reader.ValueTextEquals(MemberSaveTimeHeuristic))
+		{
+			return CardinalityExecutionMode.SaveTimeHeuristic;
+		}
+
+		if (reader.ValueTextEquals(MemberSaveMemoryHeuristic))
+		{
+			return CardinalityExecutionMode.SaveMemoryHeuristic;
+		}
+
+		if (reader.ValueTextEquals(MemberGlobalOrdinals))
+		{
+			return CardinalityExecutionMode.GlobalOrdinals;
+		}
+
+		if (reader.ValueTextEquals(MemberDirect))
+		{
+			return CardinalityExecutionMode.Direct;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(CardinalityExecutionMode)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, CardinalityExecutionMode value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, CardinalityExecutionMode value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case CardinalityExecutionMode.SegmentOrdinals:
-				writer.WriteStringValue("segment_ordinals");
-				return;
+				writer.WriteStringValue(MemberSegmentOrdinals);
+				break;
 			case CardinalityExecutionMode.SaveTimeHeuristic:
-				writer.WriteStringValue("save_time_heuristic");
-				return;
+				writer.WriteStringValue(MemberSaveTimeHeuristic);
+				break;
 			case CardinalityExecutionMode.SaveMemoryHeuristic:
-				writer.WriteStringValue("save_memory_heuristic");
-				return;
+				writer.WriteStringValue(MemberSaveMemoryHeuristic);
+				break;
 			case CardinalityExecutionMode.GlobalOrdinals:
-				writer.WriteStringValue("global_ordinals");
-				return;
+				writer.WriteStringValue(MemberGlobalOrdinals);
+				break;
 			case CardinalityExecutionMode.Direct:
-				writer.WriteStringValue("direct");
-				return;
+				writer.WriteStringValue(MemberDirect);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(CardinalityExecutionMode)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -236,41 +281,49 @@ public enum GapPolicy
 	InsertZeros
 }
 
-internal sealed class GapPolicyConverter : JsonConverter<GapPolicy>
+internal sealed partial class GapPolicyConverter : System.Text.Json.Serialization.JsonConverter<GapPolicy>
 {
-	public override GapPolicy Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberSkip = System.Text.Json.JsonEncodedText.Encode("skip");
+	private static readonly System.Text.Json.JsonEncodedText MemberKeepValues = System.Text.Json.JsonEncodedText.Encode("keep_values");
+	private static readonly System.Text.Json.JsonEncodedText MemberInsertZeros = System.Text.Json.JsonEncodedText.Encode("insert_zeros");
+
+	public override GapPolicy Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberSkip))
+		{
+			return GapPolicy.Skip;
+		}
+
+		if (reader.ValueTextEquals(MemberKeepValues))
 		{
-			case "skip":
-				return GapPolicy.Skip;
-			case "keep_values":
-				return GapPolicy.KeepValues;
-			case "insert_zeros":
-				return GapPolicy.InsertZeros;
+			return GapPolicy.KeepValues;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberInsertZeros))
+		{
+			return GapPolicy.InsertZeros;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(GapPolicy)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, GapPolicy value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GapPolicy value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case GapPolicy.Skip:
-				writer.WriteStringValue("skip");
-				return;
+				writer.WriteStringValue(MemberSkip);
+				break;
 			case GapPolicy.KeepValues:
-				writer.WriteStringValue("keep_values");
-				return;
+				writer.WriteStringValue(MemberKeepValues);
+				break;
 			case GapPolicy.InsertZeros:
-				writer.WriteStringValue("insert_zeros");
-				return;
+				writer.WriteStringValue(MemberInsertZeros);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(GapPolicy)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -291,56 +344,76 @@ public enum MinimumInterval
 	Day
 }
 
-internal sealed class MinimumIntervalConverter : JsonConverter<MinimumInterval>
+internal sealed partial class MinimumIntervalConverter : System.Text.Json.Serialization.JsonConverter<MinimumInterval>
 {
-	public override MinimumInterval Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberYear = System.Text.Json.JsonEncodedText.Encode("year");
+	private static readonly System.Text.Json.JsonEncodedText MemberSecond = System.Text.Json.JsonEncodedText.Encode("second");
+	private static readonly System.Text.Json.JsonEncodedText MemberMonth = System.Text.Json.JsonEncodedText.Encode("month");
+	private static readonly System.Text.Json.JsonEncodedText MemberMinute = System.Text.Json.JsonEncodedText.Encode("minute");
+	private static readonly System.Text.Json.JsonEncodedText MemberHour = System.Text.Json.JsonEncodedText.Encode("hour");
+	private static readonly System.Text.Json.JsonEncodedText MemberDay = System.Text.Json.JsonEncodedText.Encode("day");
+
+	public override MinimumInterval Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "year":
-				return MinimumInterval.Year;
-			case "second":
-				return MinimumInterval.Second;
-			case "month":
-				return MinimumInterval.Month;
-			case "minute":
-				return MinimumInterval.Minute;
-			case "hour":
-				return MinimumInterval.Hour;
-			case "day":
-				return MinimumInterval.Day;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberYear))
+		{
+			return MinimumInterval.Year;
+		}
+
+		if (reader.ValueTextEquals(MemberSecond))
+		{
+			return MinimumInterval.Second;
+		}
+
+		if (reader.ValueTextEquals(MemberMonth))
+		{
+			return MinimumInterval.Month;
+		}
+
+		if (reader.ValueTextEquals(MemberMinute))
+		{
+			return MinimumInterval.Minute;
+		}
+
+		if (reader.ValueTextEquals(MemberHour))
+		{
+			return MinimumInterval.Hour;
+		}
+
+		if (reader.ValueTextEquals(MemberDay))
+		{
+			return MinimumInterval.Day;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(MinimumInterval)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, MinimumInterval value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, MinimumInterval value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case MinimumInterval.Year:
-				writer.WriteStringValue("year");
-				return;
+				writer.WriteStringValue(MemberYear);
+				break;
 			case MinimumInterval.Second:
-				writer.WriteStringValue("second");
-				return;
+				writer.WriteStringValue(MemberSecond);
+				break;
 			case MinimumInterval.Month:
-				writer.WriteStringValue("month");
-				return;
+				writer.WriteStringValue(MemberMonth);
+				break;
 			case MinimumInterval.Minute:
-				writer.WriteStringValue("minute");
-				return;
+				writer.WriteStringValue(MemberMinute);
+				break;
 			case MinimumInterval.Hour:
-				writer.WriteStringValue("hour");
-				return;
+				writer.WriteStringValue(MemberHour);
+				break;
 			case MinimumInterval.Day:
-				writer.WriteStringValue("day");
-				return;
+				writer.WriteStringValue(MemberDay);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(MinimumInterval)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -355,41 +428,49 @@ public enum MissingOrder
 	Default
 }
 
-internal sealed class MissingOrderConverter : JsonConverter<MissingOrder>
+internal sealed partial class MissingOrderConverter : System.Text.Json.Serialization.JsonConverter<MissingOrder>
 {
-	public override MissingOrder Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberLast = System.Text.Json.JsonEncodedText.Encode("last");
+	private static readonly System.Text.Json.JsonEncodedText MemberFirst = System.Text.Json.JsonEncodedText.Encode("first");
+	private static readonly System.Text.Json.JsonEncodedText MemberDefault = System.Text.Json.JsonEncodedText.Encode("default");
+
+	public override MissingOrder Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberLast))
 		{
-			case "last":
-				return MissingOrder.Last;
-			case "first":
-				return MissingOrder.First;
-			case "default":
-				return MissingOrder.Default;
+			return MissingOrder.Last;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberFirst))
+		{
+			return MissingOrder.First;
+		}
+
+		if (reader.ValueTextEquals(MemberDefault))
+		{
+			return MissingOrder.Default;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(MissingOrder)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, MissingOrder value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, MissingOrder value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case MissingOrder.Last:
-				writer.WriteStringValue("last");
-				return;
+				writer.WriteStringValue(MemberLast);
+				break;
 			case MissingOrder.First:
-				writer.WriteStringValue("first");
-				return;
+				writer.WriteStringValue(MemberFirst);
+				break;
 			case MissingOrder.Default:
-				writer.WriteStringValue("default");
-				return;
+				writer.WriteStringValue(MemberDefault);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(MissingOrder)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -440,56 +521,76 @@ public enum NormalizeMethod
 	Mean
 }
 
-internal sealed class NormalizeMethodConverter : JsonConverter<NormalizeMethod>
+internal sealed partial class NormalizeMethodConverter : System.Text.Json.Serialization.JsonConverter<NormalizeMethod>
 {
-	public override NormalizeMethod Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberZScore = System.Text.Json.JsonEncodedText.Encode("z-score");
+	private static readonly System.Text.Json.JsonEncodedText MemberSoftmax = System.Text.Json.JsonEncodedText.Encode("softmax");
+	private static readonly System.Text.Json.JsonEncodedText MemberRescale0100 = System.Text.Json.JsonEncodedText.Encode("rescale_0_100");
+	private static readonly System.Text.Json.JsonEncodedText MemberRescale01 = System.Text.Json.JsonEncodedText.Encode("rescale_0_1");
+	private static readonly System.Text.Json.JsonEncodedText MemberPercentOfSum = System.Text.Json.JsonEncodedText.Encode("percent_of_sum");
+	private static readonly System.Text.Json.JsonEncodedText MemberMean = System.Text.Json.JsonEncodedText.Encode("mean");
+
+	public override NormalizeMethod Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "z-score":
-				return NormalizeMethod.ZScore;
-			case "softmax":
-				return NormalizeMethod.Softmax;
-			case "rescale_0_100":
-				return NormalizeMethod.Rescale0100;
-			case "rescale_0_1":
-				return NormalizeMethod.Rescale01;
-			case "percent_of_sum":
-				return NormalizeMethod.PercentOfSum;
-			case "mean":
-				return NormalizeMethod.Mean;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberZScore))
+		{
+			return NormalizeMethod.ZScore;
+		}
+
+		if (reader.ValueTextEquals(MemberSoftmax))
+		{
+			return NormalizeMethod.Softmax;
+		}
+
+		if (reader.ValueTextEquals(MemberRescale0100))
+		{
+			return NormalizeMethod.Rescale0100;
+		}
+
+		if (reader.ValueTextEquals(MemberRescale01))
+		{
+			return NormalizeMethod.Rescale01;
+		}
+
+		if (reader.ValueTextEquals(MemberPercentOfSum))
+		{
+			return NormalizeMethod.PercentOfSum;
+		}
+
+		if (reader.ValueTextEquals(MemberMean))
+		{
+			return NormalizeMethod.Mean;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(NormalizeMethod)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, NormalizeMethod value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, NormalizeMethod value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case NormalizeMethod.ZScore:
-				writer.WriteStringValue("z-score");
-				return;
+				writer.WriteStringValue(MemberZScore);
+				break;
 			case NormalizeMethod.Softmax:
-				writer.WriteStringValue("softmax");
-				return;
+				writer.WriteStringValue(MemberSoftmax);
+				break;
 			case NormalizeMethod.Rescale0100:
-				writer.WriteStringValue("rescale_0_100");
-				return;
+				writer.WriteStringValue(MemberRescale0100);
+				break;
 			case NormalizeMethod.Rescale01:
-				writer.WriteStringValue("rescale_0_1");
-				return;
+				writer.WriteStringValue(MemberRescale01);
+				break;
 			case NormalizeMethod.PercentOfSum:
-				writer.WriteStringValue("percent_of_sum");
-				return;
+				writer.WriteStringValue(MemberPercentOfSum);
+				break;
 			case NormalizeMethod.Mean:
-				writer.WriteStringValue("mean");
-				return;
+				writer.WriteStringValue(MemberMean);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(NormalizeMethod)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -512,36 +613,40 @@ public enum RateMode
 	Sum
 }
 
-internal sealed class RateModeConverter : JsonConverter<RateMode>
+internal sealed partial class RateModeConverter : System.Text.Json.Serialization.JsonConverter<RateMode>
 {
-	public override RateMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberValueCount = System.Text.Json.JsonEncodedText.Encode("value_count");
+	private static readonly System.Text.Json.JsonEncodedText MemberSum = System.Text.Json.JsonEncodedText.Encode("sum");
+
+	public override RateMode Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberValueCount))
 		{
-			case "value_count":
-				return RateMode.ValueCount;
-			case "sum":
-				return RateMode.Sum;
+			return RateMode.ValueCount;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberSum))
+		{
+			return RateMode.Sum;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(RateMode)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, RateMode value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, RateMode value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case RateMode.ValueCount:
-				writer.WriteStringValue("value_count");
-				return;
+				writer.WriteStringValue(MemberValueCount);
+				break;
 			case RateMode.Sum:
-				writer.WriteStringValue("sum");
-				return;
+				writer.WriteStringValue(MemberSum);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(RateMode)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -571,41 +676,49 @@ public enum SamplerAggregationExecutionHint
 	BytesHash
 }
 
-internal sealed class SamplerAggregationExecutionHintConverter : JsonConverter<SamplerAggregationExecutionHint>
+internal sealed partial class SamplerAggregationExecutionHintConverter : System.Text.Json.Serialization.JsonConverter<SamplerAggregationExecutionHint>
 {
-	public override SamplerAggregationExecutionHint Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberMap = System.Text.Json.JsonEncodedText.Encode("map");
+	private static readonly System.Text.Json.JsonEncodedText MemberGlobalOrdinals = System.Text.Json.JsonEncodedText.Encode("global_ordinals");
+	private static readonly System.Text.Json.JsonEncodedText MemberBytesHash = System.Text.Json.JsonEncodedText.Encode("bytes_hash");
+
+	public override SamplerAggregationExecutionHint Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberMap))
 		{
-			case "map":
-				return SamplerAggregationExecutionHint.Map;
-			case "global_ordinals":
-				return SamplerAggregationExecutionHint.GlobalOrdinals;
-			case "bytes_hash":
-				return SamplerAggregationExecutionHint.BytesHash;
+			return SamplerAggregationExecutionHint.Map;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberGlobalOrdinals))
+		{
+			return SamplerAggregationExecutionHint.GlobalOrdinals;
+		}
+
+		if (reader.ValueTextEquals(MemberBytesHash))
+		{
+			return SamplerAggregationExecutionHint.BytesHash;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(SamplerAggregationExecutionHint)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, SamplerAggregationExecutionHint value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SamplerAggregationExecutionHint value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case SamplerAggregationExecutionHint.Map:
-				writer.WriteStringValue("map");
-				return;
+				writer.WriteStringValue(MemberMap);
+				break;
 			case SamplerAggregationExecutionHint.GlobalOrdinals:
-				writer.WriteStringValue("global_ordinals");
-				return;
+				writer.WriteStringValue(MemberGlobalOrdinals);
+				break;
 			case SamplerAggregationExecutionHint.BytesHash:
-				writer.WriteStringValue("bytes_hash");
-				return;
+				writer.WriteStringValue(MemberBytesHash);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(SamplerAggregationExecutionHint)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -628,36 +741,40 @@ public enum TermsAggregationCollectMode
 	BreadthFirst
 }
 
-internal sealed class TermsAggregationCollectModeConverter : JsonConverter<TermsAggregationCollectMode>
+internal sealed partial class TermsAggregationCollectModeConverter : System.Text.Json.Serialization.JsonConverter<TermsAggregationCollectMode>
 {
-	public override TermsAggregationCollectMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberDepthFirst = System.Text.Json.JsonEncodedText.Encode("depth_first");
+	private static readonly System.Text.Json.JsonEncodedText MemberBreadthFirst = System.Text.Json.JsonEncodedText.Encode("breadth_first");
+
+	public override TermsAggregationCollectMode Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberDepthFirst))
+		{
+			return TermsAggregationCollectMode.DepthFirst;
+		}
+
+		if (reader.ValueTextEquals(MemberBreadthFirst))
 		{
-			case "depth_first":
-				return TermsAggregationCollectMode.DepthFirst;
-			case "breadth_first":
-				return TermsAggregationCollectMode.BreadthFirst;
+			return TermsAggregationCollectMode.BreadthFirst;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(TermsAggregationCollectMode)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, TermsAggregationCollectMode value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, TermsAggregationCollectMode value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case TermsAggregationCollectMode.DepthFirst:
-				writer.WriteStringValue("depth_first");
-				return;
+				writer.WriteStringValue(MemberDepthFirst);
+				break;
 			case TermsAggregationCollectMode.BreadthFirst:
-				writer.WriteStringValue("breadth_first");
-				return;
+				writer.WriteStringValue(MemberBreadthFirst);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(TermsAggregationCollectMode)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -674,46 +791,58 @@ public enum TermsAggregationExecutionHint
 	GlobalOrdinals
 }
 
-internal sealed class TermsAggregationExecutionHintConverter : JsonConverter<TermsAggregationExecutionHint>
+internal sealed partial class TermsAggregationExecutionHintConverter : System.Text.Json.Serialization.JsonConverter<TermsAggregationExecutionHint>
 {
-	public override TermsAggregationExecutionHint Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberMap = System.Text.Json.JsonEncodedText.Encode("map");
+	private static readonly System.Text.Json.JsonEncodedText MemberGlobalOrdinalsLowCardinality = System.Text.Json.JsonEncodedText.Encode("global_ordinals_low_cardinality");
+	private static readonly System.Text.Json.JsonEncodedText MemberGlobalOrdinalsHash = System.Text.Json.JsonEncodedText.Encode("global_ordinals_hash");
+	private static readonly System.Text.Json.JsonEncodedText MemberGlobalOrdinals = System.Text.Json.JsonEncodedText.Encode("global_ordinals");
+
+	public override TermsAggregationExecutionHint Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberMap))
+		{
+			return TermsAggregationExecutionHint.Map;
+		}
+
+		if (reader.ValueTextEquals(MemberGlobalOrdinalsLowCardinality))
+		{
+			return TermsAggregationExecutionHint.GlobalOrdinalsLowCardinality;
+		}
+
+		if (reader.ValueTextEquals(MemberGlobalOrdinalsHash))
+		{
+			return TermsAggregationExecutionHint.GlobalOrdinalsHash;
+		}
+
+		if (reader.ValueTextEquals(MemberGlobalOrdinals))
 		{
-			case "map":
-				return TermsAggregationExecutionHint.Map;
-			case "global_ordinals_low_cardinality":
-				return TermsAggregationExecutionHint.GlobalOrdinalsLowCardinality;
-			case "global_ordinals_hash":
-				return TermsAggregationExecutionHint.GlobalOrdinalsHash;
-			case "global_ordinals":
-				return TermsAggregationExecutionHint.GlobalOrdinals;
+			return TermsAggregationExecutionHint.GlobalOrdinals;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(TermsAggregationExecutionHint)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, TermsAggregationExecutionHint value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, TermsAggregationExecutionHint value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case TermsAggregationExecutionHint.Map:
-				writer.WriteStringValue("map");
-				return;
+				writer.WriteStringValue(MemberMap);
+				break;
 			case TermsAggregationExecutionHint.GlobalOrdinalsLowCardinality:
-				writer.WriteStringValue("global_ordinals_low_cardinality");
-				return;
+				writer.WriteStringValue(MemberGlobalOrdinalsLowCardinality);
+				break;
 			case TermsAggregationExecutionHint.GlobalOrdinalsHash:
-				writer.WriteStringValue("global_ordinals_hash");
-				return;
+				writer.WriteStringValue(MemberGlobalOrdinalsHash);
+				break;
 			case TermsAggregationExecutionHint.GlobalOrdinals:
-				writer.WriteStringValue("global_ordinals");
-				return;
+				writer.WriteStringValue(MemberGlobalOrdinals);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(TermsAggregationExecutionHint)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -743,41 +872,49 @@ public enum TTestType
 	Heteroscedastic
 }
 
-internal sealed class TTestTypeConverter : JsonConverter<TTestType>
+internal sealed partial class TTestTypeConverter : System.Text.Json.Serialization.JsonConverter<TTestType>
 {
-	public override TTestType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberPaired = System.Text.Json.JsonEncodedText.Encode("paired");
+	private static readonly System.Text.Json.JsonEncodedText MemberHomoscedastic = System.Text.Json.JsonEncodedText.Encode("homoscedastic");
+	private static readonly System.Text.Json.JsonEncodedText MemberHeteroscedastic = System.Text.Json.JsonEncodedText.Encode("heteroscedastic");
+
+	public override TTestType Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberPaired))
+		{
+			return TTestType.Paired;
+		}
+
+		if (reader.ValueTextEquals(MemberHomoscedastic))
 		{
-			case "paired":
-				return TTestType.Paired;
-			case "homoscedastic":
-				return TTestType.Homoscedastic;
-			case "heteroscedastic":
-				return TTestType.Heteroscedastic;
+			return TTestType.Homoscedastic;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberHeteroscedastic))
+		{
+			return TTestType.Heteroscedastic;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(TTestType)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, TTestType value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, TTestType value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case TTestType.Paired:
-				writer.WriteStringValue("paired");
-				return;
+				writer.WriteStringValue(MemberPaired);
+				break;
 			case TTestType.Homoscedastic:
-				writer.WriteStringValue("homoscedastic");
-				return;
+				writer.WriteStringValue(MemberHomoscedastic);
+				break;
 			case TTestType.Heteroscedastic:
-				writer.WriteStringValue("heteroscedastic");
-				return;
+				writer.WriteStringValue(MemberHeteroscedastic);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(TTestType)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -806,75 +943,111 @@ public enum ValueType
 	Boolean
 }
 
-internal sealed class ValueTypeConverter : JsonConverter<ValueType>
+internal sealed partial class ValueTypeConverter : System.Text.Json.Serialization.JsonConverter<ValueType>
 {
-	public override ValueType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberString = System.Text.Json.JsonEncodedText.Encode("string");
+	private static readonly System.Text.Json.JsonEncodedText MemberNumeric = System.Text.Json.JsonEncodedText.Encode("numeric");
+	private static readonly System.Text.Json.JsonEncodedText MemberNumber = System.Text.Json.JsonEncodedText.Encode("number");
+	private static readonly System.Text.Json.JsonEncodedText MemberLong = System.Text.Json.JsonEncodedText.Encode("long");
+	private static readonly System.Text.Json.JsonEncodedText MemberIp = System.Text.Json.JsonEncodedText.Encode("ip");
+	private static readonly System.Text.Json.JsonEncodedText MemberGeoPoint = System.Text.Json.JsonEncodedText.Encode("geo_point");
+	private static readonly System.Text.Json.JsonEncodedText MemberDouble = System.Text.Json.JsonEncodedText.Encode("double");
+	private static readonly System.Text.Json.JsonEncodedText MemberDateNanos = System.Text.Json.JsonEncodedText.Encode("date_nanos");
+	private static readonly System.Text.Json.JsonEncodedText MemberDate = System.Text.Json.JsonEncodedText.Encode("date");
+	private static readonly System.Text.Json.JsonEncodedText MemberBoolean = System.Text.Json.JsonEncodedText.Encode("boolean");
+
+	public override ValueType Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "string":
-				return ValueType.String;
-			case "numeric":
-				return ValueType.Numeric;
-			case "number":
-				return ValueType.Number;
-			case "long":
-				return ValueType.Long;
-			case "ip":
-				return ValueType.Ip;
-			case "geo_point":
-				return ValueType.GeoPoint;
-			case "double":
-				return ValueType.Double;
-			case "date_nanos":
-				return ValueType.DateNanos;
-			case "date":
-				return ValueType.Date;
-			case "boolean":
-				return ValueType.Boolean;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberString))
+		{
+			return ValueType.String;
+		}
+
+		if (reader.ValueTextEquals(MemberNumeric))
+		{
+			return ValueType.Numeric;
+		}
+
+		if (reader.ValueTextEquals(MemberNumber))
+		{
+			return ValueType.Number;
+		}
+
+		if (reader.ValueTextEquals(MemberLong))
+		{
+			return ValueType.Long;
+		}
+
+		if (reader.ValueTextEquals(MemberIp))
+		{
+			return ValueType.Ip;
+		}
+
+		if (reader.ValueTextEquals(MemberGeoPoint))
+		{
+			return ValueType.GeoPoint;
+		}
+
+		if (reader.ValueTextEquals(MemberDouble))
+		{
+			return ValueType.Double;
+		}
+
+		if (reader.ValueTextEquals(MemberDateNanos))
+		{
+			return ValueType.DateNanos;
+		}
+
+		if (reader.ValueTextEquals(MemberDate))
+		{
+			return ValueType.Date;
+		}
+
+		if (reader.ValueTextEquals(MemberBoolean))
+		{
+			return ValueType.Boolean;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(ValueType)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, ValueType value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ValueType value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case ValueType.String:
-				writer.WriteStringValue("string");
-				return;
+				writer.WriteStringValue(MemberString);
+				break;
 			case ValueType.Numeric:
-				writer.WriteStringValue("numeric");
-				return;
+				writer.WriteStringValue(MemberNumeric);
+				break;
 			case ValueType.Number:
-				writer.WriteStringValue("number");
-				return;
+				writer.WriteStringValue(MemberNumber);
+				break;
 			case ValueType.Long:
-				writer.WriteStringValue("long");
-				return;
+				writer.WriteStringValue(MemberLong);
+				break;
 			case ValueType.Ip:
-				writer.WriteStringValue("ip");
-				return;
+				writer.WriteStringValue(MemberIp);
+				break;
 			case ValueType.GeoPoint:
-				writer.WriteStringValue("geo_point");
-				return;
+				writer.WriteStringValue(MemberGeoPoint);
+				break;
 			case ValueType.Double:
-				writer.WriteStringValue("double");
-				return;
+				writer.WriteStringValue(MemberDouble);
+				break;
 			case ValueType.DateNanos:
-				writer.WriteStringValue("date_nanos");
-				return;
+				writer.WriteStringValue(MemberDateNanos);
+				break;
 			case ValueType.Date:
-				writer.WriteStringValue("date");
-				return;
+				writer.WriteStringValue(MemberDate);
+				break;
 			case ValueType.Boolean:
-				writer.WriteStringValue("boolean");
-				return;
+				writer.WriteStringValue(MemberBoolean);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(ValueType)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
\ No newline at end of file
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 dae02bf828f..a7300563b6b 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
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Core;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport;
 using System;
@@ -39,41 +40,49 @@ public enum DelimitedPayloadEncoding
 	Float
 }
 
-internal sealed class DelimitedPayloadEncodingConverter : JsonConverter<DelimitedPayloadEncoding>
+internal sealed partial class DelimitedPayloadEncodingConverter : System.Text.Json.Serialization.JsonConverter<DelimitedPayloadEncoding>
 {
-	public override DelimitedPayloadEncoding Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberInteger = System.Text.Json.JsonEncodedText.Encode("int");
+	private static readonly System.Text.Json.JsonEncodedText MemberIdentity = System.Text.Json.JsonEncodedText.Encode("identity");
+	private static readonly System.Text.Json.JsonEncodedText MemberFloat = System.Text.Json.JsonEncodedText.Encode("float");
+
+	public override DelimitedPayloadEncoding Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberInteger))
+		{
+			return DelimitedPayloadEncoding.Integer;
+		}
+
+		if (reader.ValueTextEquals(MemberIdentity))
+		{
+			return DelimitedPayloadEncoding.Identity;
+		}
+
+		if (reader.ValueTextEquals(MemberFloat))
 		{
-			case "int":
-				return DelimitedPayloadEncoding.Integer;
-			case "identity":
-				return DelimitedPayloadEncoding.Identity;
-			case "float":
-				return DelimitedPayloadEncoding.Float;
+			return DelimitedPayloadEncoding.Float;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(DelimitedPayloadEncoding)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, DelimitedPayloadEncoding value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DelimitedPayloadEncoding value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case DelimitedPayloadEncoding.Integer:
-				writer.WriteStringValue("int");
-				return;
+				writer.WriteStringValue(MemberInteger);
+				break;
 			case DelimitedPayloadEncoding.Identity:
-				writer.WriteStringValue("identity");
-				return;
+				writer.WriteStringValue(MemberIdentity);
+				break;
 			case DelimitedPayloadEncoding.Float:
-				writer.WriteStringValue("float");
-				return;
+				writer.WriteStringValue(MemberFloat);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(DelimitedPayloadEncoding)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -86,36 +95,40 @@ public enum EdgeNGramSide
 	Back
 }
 
-internal sealed class EdgeNGramSideConverter : JsonConverter<EdgeNGramSide>
+internal sealed partial class EdgeNGramSideConverter : System.Text.Json.Serialization.JsonConverter<EdgeNGramSide>
 {
-	public override EdgeNGramSide Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberFront = System.Text.Json.JsonEncodedText.Encode("front");
+	private static readonly System.Text.Json.JsonEncodedText MemberBack = System.Text.Json.JsonEncodedText.Encode("back");
+
+	public override EdgeNGramSide Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberFront))
+		{
+			return EdgeNGramSide.Front;
+		}
+
+		if (reader.ValueTextEquals(MemberBack))
 		{
-			case "front":
-				return EdgeNGramSide.Front;
-			case "back":
-				return EdgeNGramSide.Back;
+			return EdgeNGramSide.Back;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(EdgeNGramSide)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, EdgeNGramSide value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, EdgeNGramSide value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case EdgeNGramSide.Front:
-				writer.WriteStringValue("front");
-				return;
+				writer.WriteStringValue(MemberFront);
+				break;
 			case EdgeNGramSide.Back:
-				writer.WriteStringValue("back");
-				return;
+				writer.WriteStringValue(MemberBack);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(EdgeNGramSide)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -128,36 +141,40 @@ public enum IcuCollationAlternate
 	NonIgnorable
 }
 
-internal sealed class IcuCollationAlternateConverter : JsonConverter<IcuCollationAlternate>
+internal sealed partial class IcuCollationAlternateConverter : System.Text.Json.Serialization.JsonConverter<IcuCollationAlternate>
 {
-	public override IcuCollationAlternate Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberShifted = System.Text.Json.JsonEncodedText.Encode("shifted");
+	private static readonly System.Text.Json.JsonEncodedText MemberNonIgnorable = System.Text.Json.JsonEncodedText.Encode("non-ignorable");
+
+	public override IcuCollationAlternate Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberShifted))
+		{
+			return IcuCollationAlternate.Shifted;
+		}
+
+		if (reader.ValueTextEquals(MemberNonIgnorable))
 		{
-			case "shifted":
-				return IcuCollationAlternate.Shifted;
-			case "non-ignorable":
-				return IcuCollationAlternate.NonIgnorable;
+			return IcuCollationAlternate.NonIgnorable;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(IcuCollationAlternate)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, IcuCollationAlternate value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IcuCollationAlternate value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case IcuCollationAlternate.Shifted:
-				writer.WriteStringValue("shifted");
-				return;
+				writer.WriteStringValue(MemberShifted);
+				break;
 			case IcuCollationAlternate.NonIgnorable:
-				writer.WriteStringValue("non-ignorable");
-				return;
+				writer.WriteStringValue(MemberNonIgnorable);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(IcuCollationAlternate)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -170,36 +187,40 @@ public enum IcuCollationCaseFirst
 	Lower
 }
 
-internal sealed class IcuCollationCaseFirstConverter : JsonConverter<IcuCollationCaseFirst>
+internal sealed partial class IcuCollationCaseFirstConverter : System.Text.Json.Serialization.JsonConverter<IcuCollationCaseFirst>
 {
-	public override IcuCollationCaseFirst Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberUpper = System.Text.Json.JsonEncodedText.Encode("upper");
+	private static readonly System.Text.Json.JsonEncodedText MemberLower = System.Text.Json.JsonEncodedText.Encode("lower");
+
+	public override IcuCollationCaseFirst Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberUpper))
 		{
-			case "upper":
-				return IcuCollationCaseFirst.Upper;
-			case "lower":
-				return IcuCollationCaseFirst.Lower;
+			return IcuCollationCaseFirst.Upper;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberLower))
+		{
+			return IcuCollationCaseFirst.Lower;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(IcuCollationCaseFirst)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, IcuCollationCaseFirst value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IcuCollationCaseFirst value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case IcuCollationCaseFirst.Upper:
-				writer.WriteStringValue("upper");
-				return;
+				writer.WriteStringValue(MemberUpper);
+				break;
 			case IcuCollationCaseFirst.Lower:
-				writer.WriteStringValue("lower");
-				return;
+				writer.WriteStringValue(MemberLower);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(IcuCollationCaseFirst)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -212,36 +233,40 @@ public enum IcuCollationDecomposition
 	Identical
 }
 
-internal sealed class IcuCollationDecompositionConverter : JsonConverter<IcuCollationDecomposition>
+internal sealed partial class IcuCollationDecompositionConverter : System.Text.Json.Serialization.JsonConverter<IcuCollationDecomposition>
 {
-	public override IcuCollationDecomposition Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberNo = System.Text.Json.JsonEncodedText.Encode("no");
+	private static readonly System.Text.Json.JsonEncodedText MemberIdentical = System.Text.Json.JsonEncodedText.Encode("identical");
+
+	public override IcuCollationDecomposition Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberNo))
+		{
+			return IcuCollationDecomposition.No;
+		}
+
+		if (reader.ValueTextEquals(MemberIdentical))
 		{
-			case "no":
-				return IcuCollationDecomposition.No;
-			case "identical":
-				return IcuCollationDecomposition.Identical;
+			return IcuCollationDecomposition.Identical;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(IcuCollationDecomposition)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, IcuCollationDecomposition value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IcuCollationDecomposition value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case IcuCollationDecomposition.No:
-				writer.WriteStringValue("no");
-				return;
+				writer.WriteStringValue(MemberNo);
+				break;
 			case IcuCollationDecomposition.Identical:
-				writer.WriteStringValue("identical");
-				return;
+				writer.WriteStringValue(MemberIdentical);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(IcuCollationDecomposition)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -260,51 +285,67 @@ public enum IcuCollationStrength
 	Identical
 }
 
-internal sealed class IcuCollationStrengthConverter : JsonConverter<IcuCollationStrength>
+internal sealed partial class IcuCollationStrengthConverter : System.Text.Json.Serialization.JsonConverter<IcuCollationStrength>
 {
-	public override IcuCollationStrength Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberTertiary = System.Text.Json.JsonEncodedText.Encode("tertiary");
+	private static readonly System.Text.Json.JsonEncodedText MemberSecondary = System.Text.Json.JsonEncodedText.Encode("secondary");
+	private static readonly System.Text.Json.JsonEncodedText MemberQuaternary = System.Text.Json.JsonEncodedText.Encode("quaternary");
+	private static readonly System.Text.Json.JsonEncodedText MemberPrimary = System.Text.Json.JsonEncodedText.Encode("primary");
+	private static readonly System.Text.Json.JsonEncodedText MemberIdentical = System.Text.Json.JsonEncodedText.Encode("identical");
+
+	public override IcuCollationStrength Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "tertiary":
-				return IcuCollationStrength.Tertiary;
-			case "secondary":
-				return IcuCollationStrength.Secondary;
-			case "quaternary":
-				return IcuCollationStrength.Quaternary;
-			case "primary":
-				return IcuCollationStrength.Primary;
-			case "identical":
-				return IcuCollationStrength.Identical;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberTertiary))
+		{
+			return IcuCollationStrength.Tertiary;
+		}
+
+		if (reader.ValueTextEquals(MemberSecondary))
+		{
+			return IcuCollationStrength.Secondary;
+		}
+
+		if (reader.ValueTextEquals(MemberQuaternary))
+		{
+			return IcuCollationStrength.Quaternary;
+		}
+
+		if (reader.ValueTextEquals(MemberPrimary))
+		{
+			return IcuCollationStrength.Primary;
+		}
+
+		if (reader.ValueTextEquals(MemberIdentical))
+		{
+			return IcuCollationStrength.Identical;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(IcuCollationStrength)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, IcuCollationStrength value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IcuCollationStrength value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case IcuCollationStrength.Tertiary:
-				writer.WriteStringValue("tertiary");
-				return;
+				writer.WriteStringValue(MemberTertiary);
+				break;
 			case IcuCollationStrength.Secondary:
-				writer.WriteStringValue("secondary");
-				return;
+				writer.WriteStringValue(MemberSecondary);
+				break;
 			case IcuCollationStrength.Quaternary:
-				writer.WriteStringValue("quaternary");
-				return;
+				writer.WriteStringValue(MemberQuaternary);
+				break;
 			case IcuCollationStrength.Primary:
-				writer.WriteStringValue("primary");
-				return;
+				writer.WriteStringValue(MemberPrimary);
+				break;
 			case IcuCollationStrength.Identical:
-				writer.WriteStringValue("identical");
-				return;
+				writer.WriteStringValue(MemberIdentical);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(IcuCollationStrength)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -317,36 +358,40 @@ public enum IcuNormalizationMode
 	Compose
 }
 
-internal sealed class IcuNormalizationModeConverter : JsonConverter<IcuNormalizationMode>
+internal sealed partial class IcuNormalizationModeConverter : System.Text.Json.Serialization.JsonConverter<IcuNormalizationMode>
 {
-	public override IcuNormalizationMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberDecompose = System.Text.Json.JsonEncodedText.Encode("decompose");
+	private static readonly System.Text.Json.JsonEncodedText MemberCompose = System.Text.Json.JsonEncodedText.Encode("compose");
+
+	public override IcuNormalizationMode Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberDecompose))
 		{
-			case "decompose":
-				return IcuNormalizationMode.Decompose;
-			case "compose":
-				return IcuNormalizationMode.Compose;
+			return IcuNormalizationMode.Decompose;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberCompose))
+		{
+			return IcuNormalizationMode.Compose;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(IcuNormalizationMode)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, IcuNormalizationMode value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IcuNormalizationMode value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case IcuNormalizationMode.Decompose:
-				writer.WriteStringValue("decompose");
-				return;
+				writer.WriteStringValue(MemberDecompose);
+				break;
 			case IcuNormalizationMode.Compose:
-				writer.WriteStringValue("compose");
-				return;
+				writer.WriteStringValue(MemberCompose);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(IcuNormalizationMode)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -361,41 +406,49 @@ public enum IcuNormalizationType
 	Nfc
 }
 
-internal sealed class IcuNormalizationTypeConverter : JsonConverter<IcuNormalizationType>
+internal sealed partial class IcuNormalizationTypeConverter : System.Text.Json.Serialization.JsonConverter<IcuNormalizationType>
 {
-	public override IcuNormalizationType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberNfkcCf = System.Text.Json.JsonEncodedText.Encode("nfkc_cf");
+	private static readonly System.Text.Json.JsonEncodedText MemberNfkc = System.Text.Json.JsonEncodedText.Encode("nfkc");
+	private static readonly System.Text.Json.JsonEncodedText MemberNfc = System.Text.Json.JsonEncodedText.Encode("nfc");
+
+	public override IcuNormalizationType Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberNfkcCf))
+		{
+			return IcuNormalizationType.NfkcCf;
+		}
+
+		if (reader.ValueTextEquals(MemberNfkc))
+		{
+			return IcuNormalizationType.Nfkc;
+		}
+
+		if (reader.ValueTextEquals(MemberNfc))
 		{
-			case "nfkc_cf":
-				return IcuNormalizationType.NfkcCf;
-			case "nfkc":
-				return IcuNormalizationType.Nfkc;
-			case "nfc":
-				return IcuNormalizationType.Nfc;
+			return IcuNormalizationType.Nfc;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(IcuNormalizationType)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, IcuNormalizationType value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IcuNormalizationType value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case IcuNormalizationType.NfkcCf:
-				writer.WriteStringValue("nfkc_cf");
-				return;
+				writer.WriteStringValue(MemberNfkcCf);
+				break;
 			case IcuNormalizationType.Nfkc:
-				writer.WriteStringValue("nfkc");
-				return;
+				writer.WriteStringValue(MemberNfkc);
+				break;
 			case IcuNormalizationType.Nfc:
-				writer.WriteStringValue("nfc");
-				return;
+				writer.WriteStringValue(MemberNfc);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(IcuNormalizationType)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -408,36 +461,40 @@ public enum IcuTransformDirection
 	Forward
 }
 
-internal sealed class IcuTransformDirectionConverter : JsonConverter<IcuTransformDirection>
+internal sealed partial class IcuTransformDirectionConverter : System.Text.Json.Serialization.JsonConverter<IcuTransformDirection>
 {
-	public override IcuTransformDirection Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberReverse = System.Text.Json.JsonEncodedText.Encode("reverse");
+	private static readonly System.Text.Json.JsonEncodedText MemberForward = System.Text.Json.JsonEncodedText.Encode("forward");
+
+	public override IcuTransformDirection Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberReverse))
+		{
+			return IcuTransformDirection.Reverse;
+		}
+
+		if (reader.ValueTextEquals(MemberForward))
 		{
-			case "reverse":
-				return IcuTransformDirection.Reverse;
-			case "forward":
-				return IcuTransformDirection.Forward;
+			return IcuTransformDirection.Forward;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(IcuTransformDirection)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, IcuTransformDirection value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IcuTransformDirection value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case IcuTransformDirection.Reverse:
-				writer.WriteStringValue("reverse");
-				return;
+				writer.WriteStringValue(MemberReverse);
+				break;
 			case IcuTransformDirection.Forward:
-				writer.WriteStringValue("forward");
-				return;
+				writer.WriteStringValue(MemberForward);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(IcuTransformDirection)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -450,36 +507,40 @@ public enum KeepTypesMode
 	Exclude
 }
 
-internal sealed class KeepTypesModeConverter : JsonConverter<KeepTypesMode>
+internal sealed partial class KeepTypesModeConverter : System.Text.Json.Serialization.JsonConverter<KeepTypesMode>
 {
-	public override KeepTypesMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberInclude = System.Text.Json.JsonEncodedText.Encode("include");
+	private static readonly System.Text.Json.JsonEncodedText MemberExclude = System.Text.Json.JsonEncodedText.Encode("exclude");
+
+	public override KeepTypesMode Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberInclude))
 		{
-			case "include":
-				return KeepTypesMode.Include;
-			case "exclude":
-				return KeepTypesMode.Exclude;
+			return KeepTypesMode.Include;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberExclude))
+		{
+			return KeepTypesMode.Exclude;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(KeepTypesMode)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, KeepTypesMode value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, KeepTypesMode value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case KeepTypesMode.Include:
-				writer.WriteStringValue("include");
-				return;
+				writer.WriteStringValue(MemberInclude);
+				break;
 			case KeepTypesMode.Exclude:
-				writer.WriteStringValue("exclude");
-				return;
+				writer.WriteStringValue(MemberExclude);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(KeepTypesMode)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -494,41 +555,49 @@ public enum KuromojiTokenizationMode
 	Extended
 }
 
-internal sealed class KuromojiTokenizationModeConverter : JsonConverter<KuromojiTokenizationMode>
+internal sealed partial class KuromojiTokenizationModeConverter : System.Text.Json.Serialization.JsonConverter<KuromojiTokenizationMode>
 {
-	public override KuromojiTokenizationMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberSearch = System.Text.Json.JsonEncodedText.Encode("search");
+	private static readonly System.Text.Json.JsonEncodedText MemberNormal = System.Text.Json.JsonEncodedText.Encode("normal");
+	private static readonly System.Text.Json.JsonEncodedText MemberExtended = System.Text.Json.JsonEncodedText.Encode("extended");
+
+	public override KuromojiTokenizationMode Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberSearch))
 		{
-			case "search":
-				return KuromojiTokenizationMode.Search;
-			case "normal":
-				return KuromojiTokenizationMode.Normal;
-			case "extended":
-				return KuromojiTokenizationMode.Extended;
+			return KuromojiTokenizationMode.Search;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberNormal))
+		{
+			return KuromojiTokenizationMode.Normal;
+		}
+
+		if (reader.ValueTextEquals(MemberExtended))
+		{
+			return KuromojiTokenizationMode.Extended;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(KuromojiTokenizationMode)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, KuromojiTokenizationMode value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, KuromojiTokenizationMode value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case KuromojiTokenizationMode.Search:
-				writer.WriteStringValue("search");
-				return;
+				writer.WriteStringValue(MemberSearch);
+				break;
 			case KuromojiTokenizationMode.Normal:
-				writer.WriteStringValue("normal");
-				return;
+				writer.WriteStringValue(MemberNormal);
+				break;
 			case KuromojiTokenizationMode.Extended:
-				writer.WriteStringValue("extended");
-				return;
+				writer.WriteStringValue(MemberExtended);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(KuromojiTokenizationMode)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -605,196 +674,328 @@ public enum Language
 	Arabic
 }
 
-internal sealed class LanguageConverter : JsonConverter<Language>
+internal sealed partial class LanguageConverter : System.Text.Json.Serialization.JsonConverter<Language>
 {
-	public override Language Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberTurkish = System.Text.Json.JsonEncodedText.Encode("Turkish");
+	private static readonly System.Text.Json.JsonEncodedText MemberThai = System.Text.Json.JsonEncodedText.Encode("Thai");
+	private static readonly System.Text.Json.JsonEncodedText MemberSwedish = System.Text.Json.JsonEncodedText.Encode("Swedish");
+	private static readonly System.Text.Json.JsonEncodedText MemberSpanish = System.Text.Json.JsonEncodedText.Encode("Spanish");
+	private static readonly System.Text.Json.JsonEncodedText MemberSorani = System.Text.Json.JsonEncodedText.Encode("Sorani");
+	private static readonly System.Text.Json.JsonEncodedText MemberRussian = System.Text.Json.JsonEncodedText.Encode("Russian");
+	private static readonly System.Text.Json.JsonEncodedText MemberRomanian = System.Text.Json.JsonEncodedText.Encode("Romanian");
+	private static readonly System.Text.Json.JsonEncodedText MemberPortuguese = System.Text.Json.JsonEncodedText.Encode("Portuguese");
+	private static readonly System.Text.Json.JsonEncodedText MemberPersian = System.Text.Json.JsonEncodedText.Encode("Persian");
+	private static readonly System.Text.Json.JsonEncodedText MemberNorwegian = System.Text.Json.JsonEncodedText.Encode("Norwegian");
+	private static readonly System.Text.Json.JsonEncodedText MemberLatvian = System.Text.Json.JsonEncodedText.Encode("Latvian");
+	private static readonly System.Text.Json.JsonEncodedText MemberItalian = System.Text.Json.JsonEncodedText.Encode("Italian");
+	private static readonly System.Text.Json.JsonEncodedText MemberIrish = System.Text.Json.JsonEncodedText.Encode("Irish");
+	private static readonly System.Text.Json.JsonEncodedText MemberIndonesian = System.Text.Json.JsonEncodedText.Encode("Indonesian");
+	private static readonly System.Text.Json.JsonEncodedText MemberHungarian = System.Text.Json.JsonEncodedText.Encode("Hungarian");
+	private static readonly System.Text.Json.JsonEncodedText MemberHindi = System.Text.Json.JsonEncodedText.Encode("Hindi");
+	private static readonly System.Text.Json.JsonEncodedText MemberGreek = System.Text.Json.JsonEncodedText.Encode("Greek");
+	private static readonly System.Text.Json.JsonEncodedText MemberGerman = System.Text.Json.JsonEncodedText.Encode("German");
+	private static readonly System.Text.Json.JsonEncodedText MemberGalician = System.Text.Json.JsonEncodedText.Encode("Galician");
+	private static readonly System.Text.Json.JsonEncodedText MemberFrench = System.Text.Json.JsonEncodedText.Encode("French");
+	private static readonly System.Text.Json.JsonEncodedText MemberFinnish = System.Text.Json.JsonEncodedText.Encode("Finnish");
+	private static readonly System.Text.Json.JsonEncodedText MemberEstonian = System.Text.Json.JsonEncodedText.Encode("Estonian");
+	private static readonly System.Text.Json.JsonEncodedText MemberEnglish = System.Text.Json.JsonEncodedText.Encode("English");
+	private static readonly System.Text.Json.JsonEncodedText MemberDutch = System.Text.Json.JsonEncodedText.Encode("Dutch");
+	private static readonly System.Text.Json.JsonEncodedText MemberDanish = System.Text.Json.JsonEncodedText.Encode("Danish");
+	private static readonly System.Text.Json.JsonEncodedText MemberCzech = System.Text.Json.JsonEncodedText.Encode("Czech");
+	private static readonly System.Text.Json.JsonEncodedText MemberCjk = System.Text.Json.JsonEncodedText.Encode("Cjk");
+	private static readonly System.Text.Json.JsonEncodedText MemberChinese = System.Text.Json.JsonEncodedText.Encode("Chinese");
+	private static readonly System.Text.Json.JsonEncodedText MemberCatalan = System.Text.Json.JsonEncodedText.Encode("Catalan");
+	private static readonly System.Text.Json.JsonEncodedText MemberBulgarian = System.Text.Json.JsonEncodedText.Encode("Bulgarian");
+	private static readonly System.Text.Json.JsonEncodedText MemberBrazilian = System.Text.Json.JsonEncodedText.Encode("Brazilian");
+	private static readonly System.Text.Json.JsonEncodedText MemberBasque = System.Text.Json.JsonEncodedText.Encode("Basque");
+	private static readonly System.Text.Json.JsonEncodedText MemberArmenian = System.Text.Json.JsonEncodedText.Encode("Armenian");
+	private static readonly System.Text.Json.JsonEncodedText MemberArabic = System.Text.Json.JsonEncodedText.Encode("Arabic");
+
+	public override Language Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "Turkish":
-				return Language.Turkish;
-			case "Thai":
-				return Language.Thai;
-			case "Swedish":
-				return Language.Swedish;
-			case "Spanish":
-				return Language.Spanish;
-			case "Sorani":
-				return Language.Sorani;
-			case "Russian":
-				return Language.Russian;
-			case "Romanian":
-				return Language.Romanian;
-			case "Portuguese":
-				return Language.Portuguese;
-			case "Persian":
-				return Language.Persian;
-			case "Norwegian":
-				return Language.Norwegian;
-			case "Latvian":
-				return Language.Latvian;
-			case "Italian":
-				return Language.Italian;
-			case "Irish":
-				return Language.Irish;
-			case "Indonesian":
-				return Language.Indonesian;
-			case "Hungarian":
-				return Language.Hungarian;
-			case "Hindi":
-				return Language.Hindi;
-			case "Greek":
-				return Language.Greek;
-			case "German":
-				return Language.German;
-			case "Galician":
-				return Language.Galician;
-			case "French":
-				return Language.French;
-			case "Finnish":
-				return Language.Finnish;
-			case "Estonian":
-				return Language.Estonian;
-			case "English":
-				return Language.English;
-			case "Dutch":
-				return Language.Dutch;
-			case "Danish":
-				return Language.Danish;
-			case "Czech":
-				return Language.Czech;
-			case "Cjk":
-				return Language.Cjk;
-			case "Chinese":
-				return Language.Chinese;
-			case "Catalan":
-				return Language.Catalan;
-			case "Bulgarian":
-				return Language.Bulgarian;
-			case "Brazilian":
-				return Language.Brazilian;
-			case "Basque":
-				return Language.Basque;
-			case "Armenian":
-				return Language.Armenian;
-			case "Arabic":
-				return Language.Arabic;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberTurkish))
+		{
+			return Language.Turkish;
+		}
+
+		if (reader.ValueTextEquals(MemberThai))
+		{
+			return Language.Thai;
+		}
+
+		if (reader.ValueTextEquals(MemberSwedish))
+		{
+			return Language.Swedish;
+		}
+
+		if (reader.ValueTextEquals(MemberSpanish))
+		{
+			return Language.Spanish;
+		}
+
+		if (reader.ValueTextEquals(MemberSorani))
+		{
+			return Language.Sorani;
+		}
+
+		if (reader.ValueTextEquals(MemberRussian))
+		{
+			return Language.Russian;
+		}
+
+		if (reader.ValueTextEquals(MemberRomanian))
+		{
+			return Language.Romanian;
+		}
+
+		if (reader.ValueTextEquals(MemberPortuguese))
+		{
+			return Language.Portuguese;
+		}
+
+		if (reader.ValueTextEquals(MemberPersian))
+		{
+			return Language.Persian;
+		}
+
+		if (reader.ValueTextEquals(MemberNorwegian))
+		{
+			return Language.Norwegian;
+		}
+
+		if (reader.ValueTextEquals(MemberLatvian))
+		{
+			return Language.Latvian;
+		}
+
+		if (reader.ValueTextEquals(MemberItalian))
+		{
+			return Language.Italian;
+		}
+
+		if (reader.ValueTextEquals(MemberIrish))
+		{
+			return Language.Irish;
+		}
+
+		if (reader.ValueTextEquals(MemberIndonesian))
+		{
+			return Language.Indonesian;
+		}
+
+		if (reader.ValueTextEquals(MemberHungarian))
+		{
+			return Language.Hungarian;
+		}
+
+		if (reader.ValueTextEquals(MemberHindi))
+		{
+			return Language.Hindi;
+		}
+
+		if (reader.ValueTextEquals(MemberGreek))
+		{
+			return Language.Greek;
+		}
+
+		if (reader.ValueTextEquals(MemberGerman))
+		{
+			return Language.German;
+		}
+
+		if (reader.ValueTextEquals(MemberGalician))
+		{
+			return Language.Galician;
+		}
+
+		if (reader.ValueTextEquals(MemberFrench))
+		{
+			return Language.French;
+		}
+
+		if (reader.ValueTextEquals(MemberFinnish))
+		{
+			return Language.Finnish;
+		}
+
+		if (reader.ValueTextEquals(MemberEstonian))
+		{
+			return Language.Estonian;
+		}
+
+		if (reader.ValueTextEquals(MemberEnglish))
+		{
+			return Language.English;
+		}
+
+		if (reader.ValueTextEquals(MemberDutch))
+		{
+			return Language.Dutch;
+		}
+
+		if (reader.ValueTextEquals(MemberDanish))
+		{
+			return Language.Danish;
+		}
+
+		if (reader.ValueTextEquals(MemberCzech))
+		{
+			return Language.Czech;
+		}
+
+		if (reader.ValueTextEquals(MemberCjk))
+		{
+			return Language.Cjk;
+		}
+
+		if (reader.ValueTextEquals(MemberChinese))
+		{
+			return Language.Chinese;
+		}
+
+		if (reader.ValueTextEquals(MemberCatalan))
+		{
+			return Language.Catalan;
+		}
+
+		if (reader.ValueTextEquals(MemberBulgarian))
+		{
+			return Language.Bulgarian;
+		}
+
+		if (reader.ValueTextEquals(MemberBrazilian))
+		{
+			return Language.Brazilian;
+		}
+
+		if (reader.ValueTextEquals(MemberBasque))
+		{
+			return Language.Basque;
+		}
+
+		if (reader.ValueTextEquals(MemberArmenian))
+		{
+			return Language.Armenian;
+		}
+
+		if (reader.ValueTextEquals(MemberArabic))
+		{
+			return Language.Arabic;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(Language)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, Language value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, Language value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case Language.Turkish:
-				writer.WriteStringValue("Turkish");
-				return;
+				writer.WriteStringValue(MemberTurkish);
+				break;
 			case Language.Thai:
-				writer.WriteStringValue("Thai");
-				return;
+				writer.WriteStringValue(MemberThai);
+				break;
 			case Language.Swedish:
-				writer.WriteStringValue("Swedish");
-				return;
+				writer.WriteStringValue(MemberSwedish);
+				break;
 			case Language.Spanish:
-				writer.WriteStringValue("Spanish");
-				return;
+				writer.WriteStringValue(MemberSpanish);
+				break;
 			case Language.Sorani:
-				writer.WriteStringValue("Sorani");
-				return;
+				writer.WriteStringValue(MemberSorani);
+				break;
 			case Language.Russian:
-				writer.WriteStringValue("Russian");
-				return;
+				writer.WriteStringValue(MemberRussian);
+				break;
 			case Language.Romanian:
-				writer.WriteStringValue("Romanian");
-				return;
+				writer.WriteStringValue(MemberRomanian);
+				break;
 			case Language.Portuguese:
-				writer.WriteStringValue("Portuguese");
-				return;
+				writer.WriteStringValue(MemberPortuguese);
+				break;
 			case Language.Persian:
-				writer.WriteStringValue("Persian");
-				return;
+				writer.WriteStringValue(MemberPersian);
+				break;
 			case Language.Norwegian:
-				writer.WriteStringValue("Norwegian");
-				return;
+				writer.WriteStringValue(MemberNorwegian);
+				break;
 			case Language.Latvian:
-				writer.WriteStringValue("Latvian");
-				return;
+				writer.WriteStringValue(MemberLatvian);
+				break;
 			case Language.Italian:
-				writer.WriteStringValue("Italian");
-				return;
+				writer.WriteStringValue(MemberItalian);
+				break;
 			case Language.Irish:
-				writer.WriteStringValue("Irish");
-				return;
+				writer.WriteStringValue(MemberIrish);
+				break;
 			case Language.Indonesian:
-				writer.WriteStringValue("Indonesian");
-				return;
+				writer.WriteStringValue(MemberIndonesian);
+				break;
 			case Language.Hungarian:
-				writer.WriteStringValue("Hungarian");
-				return;
+				writer.WriteStringValue(MemberHungarian);
+				break;
 			case Language.Hindi:
-				writer.WriteStringValue("Hindi");
-				return;
+				writer.WriteStringValue(MemberHindi);
+				break;
 			case Language.Greek:
-				writer.WriteStringValue("Greek");
-				return;
+				writer.WriteStringValue(MemberGreek);
+				break;
 			case Language.German:
-				writer.WriteStringValue("German");
-				return;
+				writer.WriteStringValue(MemberGerman);
+				break;
 			case Language.Galician:
-				writer.WriteStringValue("Galician");
-				return;
+				writer.WriteStringValue(MemberGalician);
+				break;
 			case Language.French:
-				writer.WriteStringValue("French");
-				return;
+				writer.WriteStringValue(MemberFrench);
+				break;
 			case Language.Finnish:
-				writer.WriteStringValue("Finnish");
-				return;
+				writer.WriteStringValue(MemberFinnish);
+				break;
 			case Language.Estonian:
-				writer.WriteStringValue("Estonian");
-				return;
+				writer.WriteStringValue(MemberEstonian);
+				break;
 			case Language.English:
-				writer.WriteStringValue("English");
-				return;
+				writer.WriteStringValue(MemberEnglish);
+				break;
 			case Language.Dutch:
-				writer.WriteStringValue("Dutch");
-				return;
+				writer.WriteStringValue(MemberDutch);
+				break;
 			case Language.Danish:
-				writer.WriteStringValue("Danish");
-				return;
+				writer.WriteStringValue(MemberDanish);
+				break;
 			case Language.Czech:
-				writer.WriteStringValue("Czech");
-				return;
+				writer.WriteStringValue(MemberCzech);
+				break;
 			case Language.Cjk:
-				writer.WriteStringValue("Cjk");
-				return;
+				writer.WriteStringValue(MemberCjk);
+				break;
 			case Language.Chinese:
-				writer.WriteStringValue("Chinese");
-				return;
+				writer.WriteStringValue(MemberChinese);
+				break;
 			case Language.Catalan:
-				writer.WriteStringValue("Catalan");
-				return;
+				writer.WriteStringValue(MemberCatalan);
+				break;
 			case Language.Bulgarian:
-				writer.WriteStringValue("Bulgarian");
-				return;
+				writer.WriteStringValue(MemberBulgarian);
+				break;
 			case Language.Brazilian:
-				writer.WriteStringValue("Brazilian");
-				return;
+				writer.WriteStringValue(MemberBrazilian);
+				break;
 			case Language.Basque:
-				writer.WriteStringValue("Basque");
-				return;
+				writer.WriteStringValue(MemberBasque);
+				break;
 			case Language.Armenian:
-				writer.WriteStringValue("Armenian");
-				return;
+				writer.WriteStringValue(MemberArmenian);
+				break;
 			case Language.Arabic:
-				writer.WriteStringValue("Arabic");
-				return;
+				writer.WriteStringValue(MemberArabic);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(Language)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -809,41 +1010,49 @@ public enum NoriDecompoundMode
 	Discard
 }
 
-internal sealed class NoriDecompoundModeConverter : JsonConverter<NoriDecompoundMode>
+internal sealed partial class NoriDecompoundModeConverter : System.Text.Json.Serialization.JsonConverter<NoriDecompoundMode>
 {
-	public override NoriDecompoundMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberNone = System.Text.Json.JsonEncodedText.Encode("none");
+	private static readonly System.Text.Json.JsonEncodedText MemberMixed = System.Text.Json.JsonEncodedText.Encode("mixed");
+	private static readonly System.Text.Json.JsonEncodedText MemberDiscard = System.Text.Json.JsonEncodedText.Encode("discard");
+
+	public override NoriDecompoundMode Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberNone))
+		{
+			return NoriDecompoundMode.None;
+		}
+
+		if (reader.ValueTextEquals(MemberMixed))
 		{
-			case "none":
-				return NoriDecompoundMode.None;
-			case "mixed":
-				return NoriDecompoundMode.Mixed;
-			case "discard":
-				return NoriDecompoundMode.Discard;
+			return NoriDecompoundMode.Mixed;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberDiscard))
+		{
+			return NoriDecompoundMode.Discard;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(NoriDecompoundMode)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, NoriDecompoundMode value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, NoriDecompoundMode value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case NoriDecompoundMode.None:
-				writer.WriteStringValue("none");
-				return;
+				writer.WriteStringValue(MemberNone);
+				break;
 			case NoriDecompoundMode.Mixed:
-				writer.WriteStringValue("mixed");
-				return;
+				writer.WriteStringValue(MemberMixed);
+				break;
 			case NoriDecompoundMode.Discard:
-				writer.WriteStringValue("discard");
-				return;
+				writer.WriteStringValue(MemberDiscard);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(NoriDecompoundMode)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -876,86 +1085,130 @@ public enum PhoneticEncoder
 	BeiderMorse
 }
 
-internal sealed class PhoneticEncoderConverter : JsonConverter<PhoneticEncoder>
+internal sealed partial class PhoneticEncoderConverter : System.Text.Json.Serialization.JsonConverter<PhoneticEncoder>
 {
-	public override PhoneticEncoder Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberSoundex = System.Text.Json.JsonEncodedText.Encode("soundex");
+	private static readonly System.Text.Json.JsonEncodedText MemberRefinedSoundex = System.Text.Json.JsonEncodedText.Encode("refined_soundex");
+	private static readonly System.Text.Json.JsonEncodedText MemberNysiis = System.Text.Json.JsonEncodedText.Encode("nysiis");
+	private static readonly System.Text.Json.JsonEncodedText MemberMetaphone = System.Text.Json.JsonEncodedText.Encode("metaphone");
+	private static readonly System.Text.Json.JsonEncodedText MemberKoelnerphonetik = System.Text.Json.JsonEncodedText.Encode("koelnerphonetik");
+	private static readonly System.Text.Json.JsonEncodedText MemberHaasephonetik = System.Text.Json.JsonEncodedText.Encode("haasephonetik");
+	private static readonly System.Text.Json.JsonEncodedText MemberDoubleMetaphone = System.Text.Json.JsonEncodedText.Encode("double_metaphone");
+	private static readonly System.Text.Json.JsonEncodedText MemberDaitchMokotoff = System.Text.Json.JsonEncodedText.Encode("daitch_mokotoff");
+	private static readonly System.Text.Json.JsonEncodedText MemberCologne = System.Text.Json.JsonEncodedText.Encode("cologne");
+	private static readonly System.Text.Json.JsonEncodedText MemberCaverphone2 = System.Text.Json.JsonEncodedText.Encode("caverphone2");
+	private static readonly System.Text.Json.JsonEncodedText MemberCaverphone1 = System.Text.Json.JsonEncodedText.Encode("caverphone1");
+	private static readonly System.Text.Json.JsonEncodedText MemberBeiderMorse = System.Text.Json.JsonEncodedText.Encode("beider_morse");
+
+	public override PhoneticEncoder Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "soundex":
-				return PhoneticEncoder.Soundex;
-			case "refined_soundex":
-				return PhoneticEncoder.RefinedSoundex;
-			case "nysiis":
-				return PhoneticEncoder.Nysiis;
-			case "metaphone":
-				return PhoneticEncoder.Metaphone;
-			case "koelnerphonetik":
-				return PhoneticEncoder.Koelnerphonetik;
-			case "haasephonetik":
-				return PhoneticEncoder.Haasephonetik;
-			case "double_metaphone":
-				return PhoneticEncoder.DoubleMetaphone;
-			case "daitch_mokotoff":
-				return PhoneticEncoder.DaitchMokotoff;
-			case "cologne":
-				return PhoneticEncoder.Cologne;
-			case "caverphone2":
-				return PhoneticEncoder.Caverphone2;
-			case "caverphone1":
-				return PhoneticEncoder.Caverphone1;
-			case "beider_morse":
-				return PhoneticEncoder.BeiderMorse;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberSoundex))
+		{
+			return PhoneticEncoder.Soundex;
+		}
+
+		if (reader.ValueTextEquals(MemberRefinedSoundex))
+		{
+			return PhoneticEncoder.RefinedSoundex;
+		}
+
+		if (reader.ValueTextEquals(MemberNysiis))
+		{
+			return PhoneticEncoder.Nysiis;
+		}
+
+		if (reader.ValueTextEquals(MemberMetaphone))
+		{
+			return PhoneticEncoder.Metaphone;
+		}
+
+		if (reader.ValueTextEquals(MemberKoelnerphonetik))
+		{
+			return PhoneticEncoder.Koelnerphonetik;
+		}
+
+		if (reader.ValueTextEquals(MemberHaasephonetik))
+		{
+			return PhoneticEncoder.Haasephonetik;
+		}
+
+		if (reader.ValueTextEquals(MemberDoubleMetaphone))
+		{
+			return PhoneticEncoder.DoubleMetaphone;
+		}
+
+		if (reader.ValueTextEquals(MemberDaitchMokotoff))
+		{
+			return PhoneticEncoder.DaitchMokotoff;
+		}
+
+		if (reader.ValueTextEquals(MemberCologne))
+		{
+			return PhoneticEncoder.Cologne;
+		}
+
+		if (reader.ValueTextEquals(MemberCaverphone2))
+		{
+			return PhoneticEncoder.Caverphone2;
+		}
+
+		if (reader.ValueTextEquals(MemberCaverphone1))
+		{
+			return PhoneticEncoder.Caverphone1;
+		}
+
+		if (reader.ValueTextEquals(MemberBeiderMorse))
+		{
+			return PhoneticEncoder.BeiderMorse;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(PhoneticEncoder)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, PhoneticEncoder value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PhoneticEncoder value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case PhoneticEncoder.Soundex:
-				writer.WriteStringValue("soundex");
-				return;
+				writer.WriteStringValue(MemberSoundex);
+				break;
 			case PhoneticEncoder.RefinedSoundex:
-				writer.WriteStringValue("refined_soundex");
-				return;
+				writer.WriteStringValue(MemberRefinedSoundex);
+				break;
 			case PhoneticEncoder.Nysiis:
-				writer.WriteStringValue("nysiis");
-				return;
+				writer.WriteStringValue(MemberNysiis);
+				break;
 			case PhoneticEncoder.Metaphone:
-				writer.WriteStringValue("metaphone");
-				return;
+				writer.WriteStringValue(MemberMetaphone);
+				break;
 			case PhoneticEncoder.Koelnerphonetik:
-				writer.WriteStringValue("koelnerphonetik");
-				return;
+				writer.WriteStringValue(MemberKoelnerphonetik);
+				break;
 			case PhoneticEncoder.Haasephonetik:
-				writer.WriteStringValue("haasephonetik");
-				return;
+				writer.WriteStringValue(MemberHaasephonetik);
+				break;
 			case PhoneticEncoder.DoubleMetaphone:
-				writer.WriteStringValue("double_metaphone");
-				return;
+				writer.WriteStringValue(MemberDoubleMetaphone);
+				break;
 			case PhoneticEncoder.DaitchMokotoff:
-				writer.WriteStringValue("daitch_mokotoff");
-				return;
+				writer.WriteStringValue(MemberDaitchMokotoff);
+				break;
 			case PhoneticEncoder.Cologne:
-				writer.WriteStringValue("cologne");
-				return;
+				writer.WriteStringValue(MemberCologne);
+				break;
 			case PhoneticEncoder.Caverphone2:
-				writer.WriteStringValue("caverphone2");
-				return;
+				writer.WriteStringValue(MemberCaverphone2);
+				break;
 			case PhoneticEncoder.Caverphone1:
-				writer.WriteStringValue("caverphone1");
-				return;
+				writer.WriteStringValue(MemberCaverphone1);
+				break;
 			case PhoneticEncoder.BeiderMorse:
-				writer.WriteStringValue("beider_morse");
-				return;
+				writer.WriteStringValue(MemberBeiderMorse);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(PhoneticEncoder)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -988,86 +1241,130 @@ public enum PhoneticLanguage
 	Any
 }
 
-internal sealed class PhoneticLanguageConverter : JsonConverter<PhoneticLanguage>
+internal sealed partial class PhoneticLanguageConverter : System.Text.Json.Serialization.JsonConverter<PhoneticLanguage>
 {
-	public override PhoneticLanguage Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberSpanish = System.Text.Json.JsonEncodedText.Encode("spanish");
+	private static readonly System.Text.Json.JsonEncodedText MemberRussian = System.Text.Json.JsonEncodedText.Encode("russian");
+	private static readonly System.Text.Json.JsonEncodedText MemberRomanian = System.Text.Json.JsonEncodedText.Encode("romanian");
+	private static readonly System.Text.Json.JsonEncodedText MemberPolish = System.Text.Json.JsonEncodedText.Encode("polish");
+	private static readonly System.Text.Json.JsonEncodedText MemberHungarian = System.Text.Json.JsonEncodedText.Encode("hungarian");
+	private static readonly System.Text.Json.JsonEncodedText MemberHebrew = System.Text.Json.JsonEncodedText.Encode("hebrew");
+	private static readonly System.Text.Json.JsonEncodedText MemberGerman = System.Text.Json.JsonEncodedText.Encode("german");
+	private static readonly System.Text.Json.JsonEncodedText MemberFrench = System.Text.Json.JsonEncodedText.Encode("french");
+	private static readonly System.Text.Json.JsonEncodedText MemberEnglish = System.Text.Json.JsonEncodedText.Encode("english");
+	private static readonly System.Text.Json.JsonEncodedText MemberCyrillic = System.Text.Json.JsonEncodedText.Encode("cyrillic");
+	private static readonly System.Text.Json.JsonEncodedText MemberCommon = System.Text.Json.JsonEncodedText.Encode("common");
+	private static readonly System.Text.Json.JsonEncodedText MemberAny = System.Text.Json.JsonEncodedText.Encode("any");
+
+	public override PhoneticLanguage Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "spanish":
-				return PhoneticLanguage.Spanish;
-			case "russian":
-				return PhoneticLanguage.Russian;
-			case "romanian":
-				return PhoneticLanguage.Romanian;
-			case "polish":
-				return PhoneticLanguage.Polish;
-			case "hungarian":
-				return PhoneticLanguage.Hungarian;
-			case "hebrew":
-				return PhoneticLanguage.Hebrew;
-			case "german":
-				return PhoneticLanguage.German;
-			case "french":
-				return PhoneticLanguage.French;
-			case "english":
-				return PhoneticLanguage.English;
-			case "cyrillic":
-				return PhoneticLanguage.Cyrillic;
-			case "common":
-				return PhoneticLanguage.Common;
-			case "any":
-				return PhoneticLanguage.Any;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberSpanish))
+		{
+			return PhoneticLanguage.Spanish;
+		}
+
+		if (reader.ValueTextEquals(MemberRussian))
+		{
+			return PhoneticLanguage.Russian;
+		}
+
+		if (reader.ValueTextEquals(MemberRomanian))
+		{
+			return PhoneticLanguage.Romanian;
+		}
+
+		if (reader.ValueTextEquals(MemberPolish))
+		{
+			return PhoneticLanguage.Polish;
+		}
+
+		if (reader.ValueTextEquals(MemberHungarian))
+		{
+			return PhoneticLanguage.Hungarian;
+		}
+
+		if (reader.ValueTextEquals(MemberHebrew))
+		{
+			return PhoneticLanguage.Hebrew;
+		}
+
+		if (reader.ValueTextEquals(MemberGerman))
+		{
+			return PhoneticLanguage.German;
+		}
+
+		if (reader.ValueTextEquals(MemberFrench))
+		{
+			return PhoneticLanguage.French;
+		}
+
+		if (reader.ValueTextEquals(MemberEnglish))
+		{
+			return PhoneticLanguage.English;
+		}
+
+		if (reader.ValueTextEquals(MemberCyrillic))
+		{
+			return PhoneticLanguage.Cyrillic;
+		}
+
+		if (reader.ValueTextEquals(MemberCommon))
+		{
+			return PhoneticLanguage.Common;
+		}
+
+		if (reader.ValueTextEquals(MemberAny))
+		{
+			return PhoneticLanguage.Any;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(PhoneticLanguage)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, PhoneticLanguage value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PhoneticLanguage value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case PhoneticLanguage.Spanish:
-				writer.WriteStringValue("spanish");
-				return;
+				writer.WriteStringValue(MemberSpanish);
+				break;
 			case PhoneticLanguage.Russian:
-				writer.WriteStringValue("russian");
-				return;
+				writer.WriteStringValue(MemberRussian);
+				break;
 			case PhoneticLanguage.Romanian:
-				writer.WriteStringValue("romanian");
-				return;
+				writer.WriteStringValue(MemberRomanian);
+				break;
 			case PhoneticLanguage.Polish:
-				writer.WriteStringValue("polish");
-				return;
+				writer.WriteStringValue(MemberPolish);
+				break;
 			case PhoneticLanguage.Hungarian:
-				writer.WriteStringValue("hungarian");
-				return;
+				writer.WriteStringValue(MemberHungarian);
+				break;
 			case PhoneticLanguage.Hebrew:
-				writer.WriteStringValue("hebrew");
-				return;
+				writer.WriteStringValue(MemberHebrew);
+				break;
 			case PhoneticLanguage.German:
-				writer.WriteStringValue("german");
-				return;
+				writer.WriteStringValue(MemberGerman);
+				break;
 			case PhoneticLanguage.French:
-				writer.WriteStringValue("french");
-				return;
+				writer.WriteStringValue(MemberFrench);
+				break;
 			case PhoneticLanguage.English:
-				writer.WriteStringValue("english");
-				return;
+				writer.WriteStringValue(MemberEnglish);
+				break;
 			case PhoneticLanguage.Cyrillic:
-				writer.WriteStringValue("cyrillic");
-				return;
+				writer.WriteStringValue(MemberCyrillic);
+				break;
 			case PhoneticLanguage.Common:
-				writer.WriteStringValue("common");
-				return;
+				writer.WriteStringValue(MemberCommon);
+				break;
 			case PhoneticLanguage.Any:
-				writer.WriteStringValue("any");
-				return;
+				writer.WriteStringValue(MemberAny);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(PhoneticLanguage)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -1082,41 +1379,49 @@ public enum PhoneticNameType
 	Ashkenazi
 }
 
-internal sealed class PhoneticNameTypeConverter : JsonConverter<PhoneticNameType>
+internal sealed partial class PhoneticNameTypeConverter : System.Text.Json.Serialization.JsonConverter<PhoneticNameType>
 {
-	public override PhoneticNameType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberSephardic = System.Text.Json.JsonEncodedText.Encode("sephardic");
+	private static readonly System.Text.Json.JsonEncodedText MemberGeneric = System.Text.Json.JsonEncodedText.Encode("generic");
+	private static readonly System.Text.Json.JsonEncodedText MemberAshkenazi = System.Text.Json.JsonEncodedText.Encode("ashkenazi");
+
+	public override PhoneticNameType Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberSephardic))
+		{
+			return PhoneticNameType.Sephardic;
+		}
+
+		if (reader.ValueTextEquals(MemberGeneric))
+		{
+			return PhoneticNameType.Generic;
+		}
+
+		if (reader.ValueTextEquals(MemberAshkenazi))
 		{
-			case "sephardic":
-				return PhoneticNameType.Sephardic;
-			case "generic":
-				return PhoneticNameType.Generic;
-			case "ashkenazi":
-				return PhoneticNameType.Ashkenazi;
+			return PhoneticNameType.Ashkenazi;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(PhoneticNameType)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, PhoneticNameType value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PhoneticNameType value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case PhoneticNameType.Sephardic:
-				writer.WriteStringValue("sephardic");
-				return;
+				writer.WriteStringValue(MemberSephardic);
+				break;
 			case PhoneticNameType.Generic:
-				writer.WriteStringValue("generic");
-				return;
+				writer.WriteStringValue(MemberGeneric);
+				break;
 			case PhoneticNameType.Ashkenazi:
-				writer.WriteStringValue("ashkenazi");
-				return;
+				writer.WriteStringValue(MemberAshkenazi);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(PhoneticNameType)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -1129,36 +1434,40 @@ public enum PhoneticRuleType
 	Approx
 }
 
-internal sealed class PhoneticRuleTypeConverter : JsonConverter<PhoneticRuleType>
+internal sealed partial class PhoneticRuleTypeConverter : System.Text.Json.Serialization.JsonConverter<PhoneticRuleType>
 {
-	public override PhoneticRuleType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberExact = System.Text.Json.JsonEncodedText.Encode("exact");
+	private static readonly System.Text.Json.JsonEncodedText MemberApprox = System.Text.Json.JsonEncodedText.Encode("approx");
+
+	public override PhoneticRuleType Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberExact))
 		{
-			case "exact":
-				return PhoneticRuleType.Exact;
-			case "approx":
-				return PhoneticRuleType.Approx;
+			return PhoneticRuleType.Exact;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberApprox))
+		{
+			return PhoneticRuleType.Approx;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(PhoneticRuleType)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, PhoneticRuleType value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PhoneticRuleType value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case PhoneticRuleType.Exact:
-				writer.WriteStringValue("exact");
-				return;
+				writer.WriteStringValue(MemberExact);
+				break;
 			case PhoneticRuleType.Approx:
-				writer.WriteStringValue("approx");
-				return;
+				writer.WriteStringValue(MemberApprox);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(PhoneticRuleType)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -1211,136 +1520,220 @@ public enum SnowballLanguage
 	Armenian
 }
 
-internal sealed class SnowballLanguageConverter : JsonConverter<SnowballLanguage>
+internal sealed partial class SnowballLanguageConverter : System.Text.Json.Serialization.JsonConverter<SnowballLanguage>
 {
-	public override SnowballLanguage Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberTurkish = System.Text.Json.JsonEncodedText.Encode("Turkish");
+	private static readonly System.Text.Json.JsonEncodedText MemberSwedish = System.Text.Json.JsonEncodedText.Encode("Swedish");
+	private static readonly System.Text.Json.JsonEncodedText MemberSpanish = System.Text.Json.JsonEncodedText.Encode("Spanish");
+	private static readonly System.Text.Json.JsonEncodedText MemberRussian = System.Text.Json.JsonEncodedText.Encode("Russian");
+	private static readonly System.Text.Json.JsonEncodedText MemberRomanian = System.Text.Json.JsonEncodedText.Encode("Romanian");
+	private static readonly System.Text.Json.JsonEncodedText MemberPortuguese = System.Text.Json.JsonEncodedText.Encode("Portuguese");
+	private static readonly System.Text.Json.JsonEncodedText MemberPorter = System.Text.Json.JsonEncodedText.Encode("Porter");
+	private static readonly System.Text.Json.JsonEncodedText MemberNorwegian = System.Text.Json.JsonEncodedText.Encode("Norwegian");
+	private static readonly System.Text.Json.JsonEncodedText MemberLovins = System.Text.Json.JsonEncodedText.Encode("Lovins");
+	private static readonly System.Text.Json.JsonEncodedText MemberKp = System.Text.Json.JsonEncodedText.Encode("Kp");
+	private static readonly System.Text.Json.JsonEncodedText MemberItalian = System.Text.Json.JsonEncodedText.Encode("Italian");
+	private static readonly System.Text.Json.JsonEncodedText MemberHungarian = System.Text.Json.JsonEncodedText.Encode("Hungarian");
+	private static readonly System.Text.Json.JsonEncodedText MemberGerman2 = System.Text.Json.JsonEncodedText.Encode("German2");
+	private static readonly System.Text.Json.JsonEncodedText MemberGerman = System.Text.Json.JsonEncodedText.Encode("German");
+	private static readonly System.Text.Json.JsonEncodedText MemberFrench = System.Text.Json.JsonEncodedText.Encode("French");
+	private static readonly System.Text.Json.JsonEncodedText MemberFinnish = System.Text.Json.JsonEncodedText.Encode("Finnish");
+	private static readonly System.Text.Json.JsonEncodedText MemberEnglish = System.Text.Json.JsonEncodedText.Encode("English");
+	private static readonly System.Text.Json.JsonEncodedText MemberDutch = System.Text.Json.JsonEncodedText.Encode("Dutch");
+	private static readonly System.Text.Json.JsonEncodedText MemberDanish = System.Text.Json.JsonEncodedText.Encode("Danish");
+	private static readonly System.Text.Json.JsonEncodedText MemberCatalan = System.Text.Json.JsonEncodedText.Encode("Catalan");
+	private static readonly System.Text.Json.JsonEncodedText MemberBasque = System.Text.Json.JsonEncodedText.Encode("Basque");
+	private static readonly System.Text.Json.JsonEncodedText MemberArmenian = System.Text.Json.JsonEncodedText.Encode("Armenian");
+
+	public override SnowballLanguage Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "Turkish":
-				return SnowballLanguage.Turkish;
-			case "Swedish":
-				return SnowballLanguage.Swedish;
-			case "Spanish":
-				return SnowballLanguage.Spanish;
-			case "Russian":
-				return SnowballLanguage.Russian;
-			case "Romanian":
-				return SnowballLanguage.Romanian;
-			case "Portuguese":
-				return SnowballLanguage.Portuguese;
-			case "Porter":
-				return SnowballLanguage.Porter;
-			case "Norwegian":
-				return SnowballLanguage.Norwegian;
-			case "Lovins":
-				return SnowballLanguage.Lovins;
-			case "Kp":
-				return SnowballLanguage.Kp;
-			case "Italian":
-				return SnowballLanguage.Italian;
-			case "Hungarian":
-				return SnowballLanguage.Hungarian;
-			case "German2":
-				return SnowballLanguage.German2;
-			case "German":
-				return SnowballLanguage.German;
-			case "French":
-				return SnowballLanguage.French;
-			case "Finnish":
-				return SnowballLanguage.Finnish;
-			case "English":
-				return SnowballLanguage.English;
-			case "Dutch":
-				return SnowballLanguage.Dutch;
-			case "Danish":
-				return SnowballLanguage.Danish;
-			case "Catalan":
-				return SnowballLanguage.Catalan;
-			case "Basque":
-				return SnowballLanguage.Basque;
-			case "Armenian":
-				return SnowballLanguage.Armenian;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberTurkish))
+		{
+			return SnowballLanguage.Turkish;
+		}
+
+		if (reader.ValueTextEquals(MemberSwedish))
+		{
+			return SnowballLanguage.Swedish;
+		}
+
+		if (reader.ValueTextEquals(MemberSpanish))
+		{
+			return SnowballLanguage.Spanish;
+		}
+
+		if (reader.ValueTextEquals(MemberRussian))
+		{
+			return SnowballLanguage.Russian;
+		}
+
+		if (reader.ValueTextEquals(MemberRomanian))
+		{
+			return SnowballLanguage.Romanian;
+		}
+
+		if (reader.ValueTextEquals(MemberPortuguese))
+		{
+			return SnowballLanguage.Portuguese;
+		}
+
+		if (reader.ValueTextEquals(MemberPorter))
+		{
+			return SnowballLanguage.Porter;
+		}
+
+		if (reader.ValueTextEquals(MemberNorwegian))
+		{
+			return SnowballLanguage.Norwegian;
+		}
+
+		if (reader.ValueTextEquals(MemberLovins))
+		{
+			return SnowballLanguage.Lovins;
+		}
+
+		if (reader.ValueTextEquals(MemberKp))
+		{
+			return SnowballLanguage.Kp;
+		}
+
+		if (reader.ValueTextEquals(MemberItalian))
+		{
+			return SnowballLanguage.Italian;
+		}
+
+		if (reader.ValueTextEquals(MemberHungarian))
+		{
+			return SnowballLanguage.Hungarian;
+		}
+
+		if (reader.ValueTextEquals(MemberGerman2))
+		{
+			return SnowballLanguage.German2;
+		}
+
+		if (reader.ValueTextEquals(MemberGerman))
+		{
+			return SnowballLanguage.German;
+		}
+
+		if (reader.ValueTextEquals(MemberFrench))
+		{
+			return SnowballLanguage.French;
+		}
+
+		if (reader.ValueTextEquals(MemberFinnish))
+		{
+			return SnowballLanguage.Finnish;
+		}
+
+		if (reader.ValueTextEquals(MemberEnglish))
+		{
+			return SnowballLanguage.English;
+		}
+
+		if (reader.ValueTextEquals(MemberDutch))
+		{
+			return SnowballLanguage.Dutch;
+		}
+
+		if (reader.ValueTextEquals(MemberDanish))
+		{
+			return SnowballLanguage.Danish;
+		}
+
+		if (reader.ValueTextEquals(MemberCatalan))
+		{
+			return SnowballLanguage.Catalan;
+		}
+
+		if (reader.ValueTextEquals(MemberBasque))
+		{
+			return SnowballLanguage.Basque;
+		}
+
+		if (reader.ValueTextEquals(MemberArmenian))
+		{
+			return SnowballLanguage.Armenian;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(SnowballLanguage)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, SnowballLanguage value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SnowballLanguage value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case SnowballLanguage.Turkish:
-				writer.WriteStringValue("Turkish");
-				return;
+				writer.WriteStringValue(MemberTurkish);
+				break;
 			case SnowballLanguage.Swedish:
-				writer.WriteStringValue("Swedish");
-				return;
+				writer.WriteStringValue(MemberSwedish);
+				break;
 			case SnowballLanguage.Spanish:
-				writer.WriteStringValue("Spanish");
-				return;
+				writer.WriteStringValue(MemberSpanish);
+				break;
 			case SnowballLanguage.Russian:
-				writer.WriteStringValue("Russian");
-				return;
+				writer.WriteStringValue(MemberRussian);
+				break;
 			case SnowballLanguage.Romanian:
-				writer.WriteStringValue("Romanian");
-				return;
+				writer.WriteStringValue(MemberRomanian);
+				break;
 			case SnowballLanguage.Portuguese:
-				writer.WriteStringValue("Portuguese");
-				return;
+				writer.WriteStringValue(MemberPortuguese);
+				break;
 			case SnowballLanguage.Porter:
-				writer.WriteStringValue("Porter");
-				return;
+				writer.WriteStringValue(MemberPorter);
+				break;
 			case SnowballLanguage.Norwegian:
-				writer.WriteStringValue("Norwegian");
-				return;
+				writer.WriteStringValue(MemberNorwegian);
+				break;
 			case SnowballLanguage.Lovins:
-				writer.WriteStringValue("Lovins");
-				return;
+				writer.WriteStringValue(MemberLovins);
+				break;
 			case SnowballLanguage.Kp:
-				writer.WriteStringValue("Kp");
-				return;
+				writer.WriteStringValue(MemberKp);
+				break;
 			case SnowballLanguage.Italian:
-				writer.WriteStringValue("Italian");
-				return;
+				writer.WriteStringValue(MemberItalian);
+				break;
 			case SnowballLanguage.Hungarian:
-				writer.WriteStringValue("Hungarian");
-				return;
+				writer.WriteStringValue(MemberHungarian);
+				break;
 			case SnowballLanguage.German2:
-				writer.WriteStringValue("German2");
-				return;
+				writer.WriteStringValue(MemberGerman2);
+				break;
 			case SnowballLanguage.German:
-				writer.WriteStringValue("German");
-				return;
+				writer.WriteStringValue(MemberGerman);
+				break;
 			case SnowballLanguage.French:
-				writer.WriteStringValue("French");
-				return;
+				writer.WriteStringValue(MemberFrench);
+				break;
 			case SnowballLanguage.Finnish:
-				writer.WriteStringValue("Finnish");
-				return;
+				writer.WriteStringValue(MemberFinnish);
+				break;
 			case SnowballLanguage.English:
-				writer.WriteStringValue("English");
-				return;
+				writer.WriteStringValue(MemberEnglish);
+				break;
 			case SnowballLanguage.Dutch:
-				writer.WriteStringValue("Dutch");
-				return;
+				writer.WriteStringValue(MemberDutch);
+				break;
 			case SnowballLanguage.Danish:
-				writer.WriteStringValue("Danish");
-				return;
+				writer.WriteStringValue(MemberDanish);
+				break;
 			case SnowballLanguage.Catalan:
-				writer.WriteStringValue("Catalan");
-				return;
+				writer.WriteStringValue(MemberCatalan);
+				break;
 			case SnowballLanguage.Basque:
-				writer.WriteStringValue("Basque");
-				return;
+				writer.WriteStringValue(MemberBasque);
+				break;
 			case SnowballLanguage.Armenian:
-				writer.WriteStringValue("Armenian");
-				return;
+				writer.WriteStringValue(MemberArmenian);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(SnowballLanguage)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -1353,36 +1746,40 @@ public enum SynonymFormat
 	Solr
 }
 
-internal sealed class SynonymFormatConverter : JsonConverter<SynonymFormat>
+internal sealed partial class SynonymFormatConverter : System.Text.Json.Serialization.JsonConverter<SynonymFormat>
 {
-	public override SynonymFormat Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberWordnet = System.Text.Json.JsonEncodedText.Encode("wordnet");
+	private static readonly System.Text.Json.JsonEncodedText MemberSolr = System.Text.Json.JsonEncodedText.Encode("solr");
+
+	public override SynonymFormat Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberWordnet))
 		{
-			case "wordnet":
-				return SynonymFormat.Wordnet;
-			case "solr":
-				return SynonymFormat.Solr;
+			return SynonymFormat.Wordnet;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberSolr))
+		{
+			return SynonymFormat.Solr;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(SynonymFormat)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, SynonymFormat value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SynonymFormat value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case SynonymFormat.Wordnet:
-				writer.WriteStringValue("wordnet");
-				return;
+				writer.WriteStringValue(MemberWordnet);
+				break;
 			case SynonymFormat.Solr:
-				writer.WriteStringValue("solr");
-				return;
+				writer.WriteStringValue(MemberSolr);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(SynonymFormat)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -1403,55 +1800,75 @@ public enum TokenChar
 	Custom
 }
 
-internal sealed class TokenCharConverter : JsonConverter<TokenChar>
+internal sealed partial class TokenCharConverter : System.Text.Json.Serialization.JsonConverter<TokenChar>
 {
-	public override TokenChar Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberWhitespace = System.Text.Json.JsonEncodedText.Encode("whitespace");
+	private static readonly System.Text.Json.JsonEncodedText MemberSymbol = System.Text.Json.JsonEncodedText.Encode("symbol");
+	private static readonly System.Text.Json.JsonEncodedText MemberPunctuation = System.Text.Json.JsonEncodedText.Encode("punctuation");
+	private static readonly System.Text.Json.JsonEncodedText MemberLetter = System.Text.Json.JsonEncodedText.Encode("letter");
+	private static readonly System.Text.Json.JsonEncodedText MemberDigit = System.Text.Json.JsonEncodedText.Encode("digit");
+	private static readonly System.Text.Json.JsonEncodedText MemberCustom = System.Text.Json.JsonEncodedText.Encode("custom");
+
+	public override TokenChar Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "whitespace":
-				return TokenChar.Whitespace;
-			case "symbol":
-				return TokenChar.Symbol;
-			case "punctuation":
-				return TokenChar.Punctuation;
-			case "letter":
-				return TokenChar.Letter;
-			case "digit":
-				return TokenChar.Digit;
-			case "custom":
-				return TokenChar.Custom;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberWhitespace))
+		{
+			return TokenChar.Whitespace;
+		}
+
+		if (reader.ValueTextEquals(MemberSymbol))
+		{
+			return TokenChar.Symbol;
+		}
+
+		if (reader.ValueTextEquals(MemberPunctuation))
+		{
+			return TokenChar.Punctuation;
+		}
+
+		if (reader.ValueTextEquals(MemberLetter))
+		{
+			return TokenChar.Letter;
+		}
+
+		if (reader.ValueTextEquals(MemberDigit))
+		{
+			return TokenChar.Digit;
+		}
+
+		if (reader.ValueTextEquals(MemberCustom))
+		{
+			return TokenChar.Custom;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(TokenChar)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, TokenChar value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, TokenChar value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case TokenChar.Whitespace:
-				writer.WriteStringValue("whitespace");
-				return;
+				writer.WriteStringValue(MemberWhitespace);
+				break;
 			case TokenChar.Symbol:
-				writer.WriteStringValue("symbol");
-				return;
+				writer.WriteStringValue(MemberSymbol);
+				break;
 			case TokenChar.Punctuation:
-				writer.WriteStringValue("punctuation");
-				return;
+				writer.WriteStringValue(MemberPunctuation);
+				break;
 			case TokenChar.Letter:
-				writer.WriteStringValue("letter");
-				return;
+				writer.WriteStringValue(MemberLetter);
+				break;
 			case TokenChar.Digit:
-				writer.WriteStringValue("digit");
-				return;
+				writer.WriteStringValue(MemberDigit);
+				break;
 			case TokenChar.Custom:
-				writer.WriteStringValue("custom");
-				return;
+				writer.WriteStringValue(MemberCustom);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(TokenChar)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
\ No newline at end of file
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 f8a92c8f479..dcf5b54ff45 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
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Core;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport;
 using System;
@@ -41,46 +42,58 @@ public enum AllocationExplainDecision
 	Always
 }
 
-internal sealed class AllocationExplainDecisionConverter : JsonConverter<AllocationExplainDecision>
+internal sealed partial class AllocationExplainDecisionConverter : System.Text.Json.Serialization.JsonConverter<AllocationExplainDecision>
 {
-	public override AllocationExplainDecision Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberYes = System.Text.Json.JsonEncodedText.Encode("YES");
+	private static readonly System.Text.Json.JsonEncodedText MemberThrottle = System.Text.Json.JsonEncodedText.Encode("THROTTLE");
+	private static readonly System.Text.Json.JsonEncodedText MemberNo = System.Text.Json.JsonEncodedText.Encode("NO");
+	private static readonly System.Text.Json.JsonEncodedText MemberAlways = System.Text.Json.JsonEncodedText.Encode("ALWAYS");
+
+	public override AllocationExplainDecision Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberYes))
+		{
+			return AllocationExplainDecision.Yes;
+		}
+
+		if (reader.ValueTextEquals(MemberThrottle))
+		{
+			return AllocationExplainDecision.Throttle;
+		}
+
+		if (reader.ValueTextEquals(MemberNo))
+		{
+			return AllocationExplainDecision.No;
+		}
+
+		if (reader.ValueTextEquals(MemberAlways))
 		{
-			case "YES":
-				return AllocationExplainDecision.Yes;
-			case "THROTTLE":
-				return AllocationExplainDecision.Throttle;
-			case "NO":
-				return AllocationExplainDecision.No;
-			case "ALWAYS":
-				return AllocationExplainDecision.Always;
+			return AllocationExplainDecision.Always;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(AllocationExplainDecision)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, AllocationExplainDecision value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, AllocationExplainDecision value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case AllocationExplainDecision.Yes:
-				writer.WriteStringValue("YES");
-				return;
+				writer.WriteStringValue(MemberYes);
+				break;
 			case AllocationExplainDecision.Throttle:
-				writer.WriteStringValue("THROTTLE");
-				return;
+				writer.WriteStringValue(MemberThrottle);
+				break;
 			case AllocationExplainDecision.No:
-				writer.WriteStringValue("NO");
-				return;
+				writer.WriteStringValue(MemberNo);
+				break;
 			case AllocationExplainDecision.Always:
-				writer.WriteStringValue("ALWAYS");
-				return;
+				writer.WriteStringValue(MemberAlways);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(AllocationExplainDecision)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -105,66 +118,94 @@ public enum Decision
 	AllocationDelayed
 }
 
-internal sealed class DecisionConverter : JsonConverter<Decision>
+internal sealed partial class DecisionConverter : System.Text.Json.Serialization.JsonConverter<Decision>
 {
-	public override Decision Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberYes = System.Text.Json.JsonEncodedText.Encode("yes");
+	private static readonly System.Text.Json.JsonEncodedText MemberWorseBalance = System.Text.Json.JsonEncodedText.Encode("worse_balance");
+	private static readonly System.Text.Json.JsonEncodedText MemberThrottled = System.Text.Json.JsonEncodedText.Encode("throttled");
+	private static readonly System.Text.Json.JsonEncodedText MemberNoValidShardCopy = System.Text.Json.JsonEncodedText.Encode("no_valid_shard_copy");
+	private static readonly System.Text.Json.JsonEncodedText MemberNoAttempt = System.Text.Json.JsonEncodedText.Encode("no_attempt");
+	private static readonly System.Text.Json.JsonEncodedText MemberNo = System.Text.Json.JsonEncodedText.Encode("no");
+	private static readonly System.Text.Json.JsonEncodedText MemberAwaitingInfo = System.Text.Json.JsonEncodedText.Encode("awaiting_info");
+	private static readonly System.Text.Json.JsonEncodedText MemberAllocationDelayed = System.Text.Json.JsonEncodedText.Encode("allocation_delayed");
+
+	public override Decision Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberYes))
+		{
+			return Decision.Yes;
+		}
+
+		if (reader.ValueTextEquals(MemberWorseBalance))
 		{
-			case "yes":
-				return Decision.Yes;
-			case "worse_balance":
-				return Decision.WorseBalance;
-			case "throttled":
-				return Decision.Throttled;
-			case "no_valid_shard_copy":
-				return Decision.NoValidShardCopy;
-			case "no_attempt":
-				return Decision.NoAttempt;
-			case "no":
-				return Decision.No;
-			case "awaiting_info":
-				return Decision.AwaitingInfo;
-			case "allocation_delayed":
-				return Decision.AllocationDelayed;
+			return Decision.WorseBalance;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberThrottled))
+		{
+			return Decision.Throttled;
+		}
+
+		if (reader.ValueTextEquals(MemberNoValidShardCopy))
+		{
+			return Decision.NoValidShardCopy;
+		}
+
+		if (reader.ValueTextEquals(MemberNoAttempt))
+		{
+			return Decision.NoAttempt;
+		}
+
+		if (reader.ValueTextEquals(MemberNo))
+		{
+			return Decision.No;
+		}
+
+		if (reader.ValueTextEquals(MemberAwaitingInfo))
+		{
+			return Decision.AwaitingInfo;
+		}
+
+		if (reader.ValueTextEquals(MemberAllocationDelayed))
+		{
+			return Decision.AllocationDelayed;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(Decision)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, Decision value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, Decision value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case Decision.Yes:
-				writer.WriteStringValue("yes");
-				return;
+				writer.WriteStringValue(MemberYes);
+				break;
 			case Decision.WorseBalance:
-				writer.WriteStringValue("worse_balance");
-				return;
+				writer.WriteStringValue(MemberWorseBalance);
+				break;
 			case Decision.Throttled:
-				writer.WriteStringValue("throttled");
-				return;
+				writer.WriteStringValue(MemberThrottled);
+				break;
 			case Decision.NoValidShardCopy:
-				writer.WriteStringValue("no_valid_shard_copy");
-				return;
+				writer.WriteStringValue(MemberNoValidShardCopy);
+				break;
 			case Decision.NoAttempt:
-				writer.WriteStringValue("no_attempt");
-				return;
+				writer.WriteStringValue(MemberNoAttempt);
+				break;
 			case Decision.No:
-				writer.WriteStringValue("no");
-				return;
+				writer.WriteStringValue(MemberNo);
+				break;
 			case Decision.AwaitingInfo:
-				writer.WriteStringValue("awaiting_info");
-				return;
+				writer.WriteStringValue(MemberAwaitingInfo);
+				break;
 			case Decision.AllocationDelayed:
-				writer.WriteStringValue("allocation_delayed");
-				return;
+				writer.WriteStringValue(MemberAllocationDelayed);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(Decision)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -203,100 +244,156 @@ public enum UnassignedInformationReason
 	AllocationFailed
 }
 
-internal sealed class UnassignedInformationReasonConverter : JsonConverter<UnassignedInformationReason>
+internal sealed partial class UnassignedInformationReasonConverter : System.Text.Json.Serialization.JsonConverter<UnassignedInformationReason>
 {
-	public override UnassignedInformationReason Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberRerouteCancelled = System.Text.Json.JsonEncodedText.Encode("REROUTE_CANCELLED");
+	private static readonly System.Text.Json.JsonEncodedText MemberReplicaAdded = System.Text.Json.JsonEncodedText.Encode("REPLICA_ADDED");
+	private static readonly System.Text.Json.JsonEncodedText MemberReinitialized = System.Text.Json.JsonEncodedText.Encode("REINITIALIZED");
+	private static readonly System.Text.Json.JsonEncodedText MemberReallocatedReplica = System.Text.Json.JsonEncodedText.Encode("REALLOCATED_REPLICA");
+	private static readonly System.Text.Json.JsonEncodedText MemberPrimaryFailed = System.Text.Json.JsonEncodedText.Encode("PRIMARY_FAILED");
+	private static readonly System.Text.Json.JsonEncodedText MemberNodeLeft = System.Text.Json.JsonEncodedText.Encode("NODE_LEFT");
+	private static readonly System.Text.Json.JsonEncodedText MemberNewIndexRestored = System.Text.Json.JsonEncodedText.Encode("NEW_INDEX_RESTORED");
+	private static readonly System.Text.Json.JsonEncodedText MemberManualAllocation = System.Text.Json.JsonEncodedText.Encode("MANUAL_ALLOCATION");
+	private static readonly System.Text.Json.JsonEncodedText MemberIndexReopened = System.Text.Json.JsonEncodedText.Encode("INDEX_REOPENED");
+	private static readonly System.Text.Json.JsonEncodedText MemberIndexCreated = System.Text.Json.JsonEncodedText.Encode("INDEX_CREATED");
+	private static readonly System.Text.Json.JsonEncodedText MemberForcedEmptyPrimary = System.Text.Json.JsonEncodedText.Encode("FORCED_EMPTY_PRIMARY");
+	private static readonly System.Text.Json.JsonEncodedText MemberExistingIndexRestored = System.Text.Json.JsonEncodedText.Encode("EXISTING_INDEX_RESTORED");
+	private static readonly System.Text.Json.JsonEncodedText MemberDanglingIndexImported = System.Text.Json.JsonEncodedText.Encode("DANGLING_INDEX_IMPORTED");
+	private static readonly System.Text.Json.JsonEncodedText MemberClusterRecovered = System.Text.Json.JsonEncodedText.Encode("CLUSTER_RECOVERED");
+	private static readonly System.Text.Json.JsonEncodedText MemberAllocationFailed = System.Text.Json.JsonEncodedText.Encode("ALLOCATION_FAILED");
+
+	public override UnassignedInformationReason Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberRerouteCancelled))
+		{
+			return UnassignedInformationReason.RerouteCancelled;
+		}
+
+		if (reader.ValueTextEquals(MemberReplicaAdded))
+		{
+			return UnassignedInformationReason.ReplicaAdded;
+		}
+
+		if (reader.ValueTextEquals(MemberReinitialized))
+		{
+			return UnassignedInformationReason.Reinitialized;
+		}
+
+		if (reader.ValueTextEquals(MemberReallocatedReplica))
+		{
+			return UnassignedInformationReason.ReallocatedReplica;
+		}
+
+		if (reader.ValueTextEquals(MemberPrimaryFailed))
+		{
+			return UnassignedInformationReason.PrimaryFailed;
+		}
+
+		if (reader.ValueTextEquals(MemberNodeLeft))
+		{
+			return UnassignedInformationReason.NodeLeft;
+		}
+
+		if (reader.ValueTextEquals(MemberNewIndexRestored))
+		{
+			return UnassignedInformationReason.NewIndexRestored;
+		}
+
+		if (reader.ValueTextEquals(MemberManualAllocation))
+		{
+			return UnassignedInformationReason.ManualAllocation;
+		}
+
+		if (reader.ValueTextEquals(MemberIndexReopened))
 		{
-			case "REROUTE_CANCELLED":
-				return UnassignedInformationReason.RerouteCancelled;
-			case "REPLICA_ADDED":
-				return UnassignedInformationReason.ReplicaAdded;
-			case "REINITIALIZED":
-				return UnassignedInformationReason.Reinitialized;
-			case "REALLOCATED_REPLICA":
-				return UnassignedInformationReason.ReallocatedReplica;
-			case "PRIMARY_FAILED":
-				return UnassignedInformationReason.PrimaryFailed;
-			case "NODE_LEFT":
-				return UnassignedInformationReason.NodeLeft;
-			case "NEW_INDEX_RESTORED":
-				return UnassignedInformationReason.NewIndexRestored;
-			case "MANUAL_ALLOCATION":
-				return UnassignedInformationReason.ManualAllocation;
-			case "INDEX_REOPENED":
-				return UnassignedInformationReason.IndexReopened;
-			case "INDEX_CREATED":
-				return UnassignedInformationReason.IndexCreated;
-			case "FORCED_EMPTY_PRIMARY":
-				return UnassignedInformationReason.ForcedEmptyPrimary;
-			case "EXISTING_INDEX_RESTORED":
-				return UnassignedInformationReason.ExistingIndexRestored;
-			case "DANGLING_INDEX_IMPORTED":
-				return UnassignedInformationReason.DanglingIndexImported;
-			case "CLUSTER_RECOVERED":
-				return UnassignedInformationReason.ClusterRecovered;
-			case "ALLOCATION_FAILED":
-				return UnassignedInformationReason.AllocationFailed;
+			return UnassignedInformationReason.IndexReopened;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberIndexCreated))
+		{
+			return UnassignedInformationReason.IndexCreated;
+		}
+
+		if (reader.ValueTextEquals(MemberForcedEmptyPrimary))
+		{
+			return UnassignedInformationReason.ForcedEmptyPrimary;
+		}
+
+		if (reader.ValueTextEquals(MemberExistingIndexRestored))
+		{
+			return UnassignedInformationReason.ExistingIndexRestored;
+		}
+
+		if (reader.ValueTextEquals(MemberDanglingIndexImported))
+		{
+			return UnassignedInformationReason.DanglingIndexImported;
+		}
+
+		if (reader.ValueTextEquals(MemberClusterRecovered))
+		{
+			return UnassignedInformationReason.ClusterRecovered;
+		}
+
+		if (reader.ValueTextEquals(MemberAllocationFailed))
+		{
+			return UnassignedInformationReason.AllocationFailed;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(UnassignedInformationReason)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, UnassignedInformationReason value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, UnassignedInformationReason value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case UnassignedInformationReason.RerouteCancelled:
-				writer.WriteStringValue("REROUTE_CANCELLED");
-				return;
+				writer.WriteStringValue(MemberRerouteCancelled);
+				break;
 			case UnassignedInformationReason.ReplicaAdded:
-				writer.WriteStringValue("REPLICA_ADDED");
-				return;
+				writer.WriteStringValue(MemberReplicaAdded);
+				break;
 			case UnassignedInformationReason.Reinitialized:
-				writer.WriteStringValue("REINITIALIZED");
-				return;
+				writer.WriteStringValue(MemberReinitialized);
+				break;
 			case UnassignedInformationReason.ReallocatedReplica:
-				writer.WriteStringValue("REALLOCATED_REPLICA");
-				return;
+				writer.WriteStringValue(MemberReallocatedReplica);
+				break;
 			case UnassignedInformationReason.PrimaryFailed:
-				writer.WriteStringValue("PRIMARY_FAILED");
-				return;
+				writer.WriteStringValue(MemberPrimaryFailed);
+				break;
 			case UnassignedInformationReason.NodeLeft:
-				writer.WriteStringValue("NODE_LEFT");
-				return;
+				writer.WriteStringValue(MemberNodeLeft);
+				break;
 			case UnassignedInformationReason.NewIndexRestored:
-				writer.WriteStringValue("NEW_INDEX_RESTORED");
-				return;
+				writer.WriteStringValue(MemberNewIndexRestored);
+				break;
 			case UnassignedInformationReason.ManualAllocation:
-				writer.WriteStringValue("MANUAL_ALLOCATION");
-				return;
+				writer.WriteStringValue(MemberManualAllocation);
+				break;
 			case UnassignedInformationReason.IndexReopened:
-				writer.WriteStringValue("INDEX_REOPENED");
-				return;
+				writer.WriteStringValue(MemberIndexReopened);
+				break;
 			case UnassignedInformationReason.IndexCreated:
-				writer.WriteStringValue("INDEX_CREATED");
-				return;
+				writer.WriteStringValue(MemberIndexCreated);
+				break;
 			case UnassignedInformationReason.ForcedEmptyPrimary:
-				writer.WriteStringValue("FORCED_EMPTY_PRIMARY");
-				return;
+				writer.WriteStringValue(MemberForcedEmptyPrimary);
+				break;
 			case UnassignedInformationReason.ExistingIndexRestored:
-				writer.WriteStringValue("EXISTING_INDEX_RESTORED");
-				return;
+				writer.WriteStringValue(MemberExistingIndexRestored);
+				break;
 			case UnassignedInformationReason.DanglingIndexImported:
-				writer.WriteStringValue("DANGLING_INDEX_IMPORTED");
-				return;
+				writer.WriteStringValue(MemberDanglingIndexImported);
+				break;
 			case UnassignedInformationReason.ClusterRecovered:
-				writer.WriteStringValue("CLUSTER_RECOVERED");
-				return;
+				writer.WriteStringValue(MemberClusterRecovered);
+				break;
 			case UnassignedInformationReason.AllocationFailed:
-				writer.WriteStringValue("ALLOCATION_FAILED");
-				return;
+				writer.WriteStringValue(MemberAllocationFailed);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(UnassignedInformationReason)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Core.HealthReport.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Core.HealthReport.g.cs
index c3bc56ecfd4..37c01737831 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Core.HealthReport.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Core.HealthReport.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Core;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport;
 using System;
@@ -41,46 +42,58 @@ public enum ImpactArea
 	Backup
 }
 
-internal sealed class ImpactAreaConverter : JsonConverter<ImpactArea>
+internal sealed partial class ImpactAreaConverter : System.Text.Json.Serialization.JsonConverter<ImpactArea>
 {
-	public override ImpactArea Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberSearch = System.Text.Json.JsonEncodedText.Encode("search");
+	private static readonly System.Text.Json.JsonEncodedText MemberIngest = System.Text.Json.JsonEncodedText.Encode("ingest");
+	private static readonly System.Text.Json.JsonEncodedText MemberDeploymentManagement = System.Text.Json.JsonEncodedText.Encode("deployment_management");
+	private static readonly System.Text.Json.JsonEncodedText MemberBackup = System.Text.Json.JsonEncodedText.Encode("backup");
+
+	public override ImpactArea Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberSearch))
+		{
+			return ImpactArea.Search;
+		}
+
+		if (reader.ValueTextEquals(MemberIngest))
 		{
-			case "search":
-				return ImpactArea.Search;
-			case "ingest":
-				return ImpactArea.Ingest;
-			case "deployment_management":
-				return ImpactArea.DeploymentManagement;
-			case "backup":
-				return ImpactArea.Backup;
+			return ImpactArea.Ingest;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberDeploymentManagement))
+		{
+			return ImpactArea.DeploymentManagement;
+		}
+
+		if (reader.ValueTextEquals(MemberBackup))
+		{
+			return ImpactArea.Backup;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(ImpactArea)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, ImpactArea value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ImpactArea value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case ImpactArea.Search:
-				writer.WriteStringValue("search");
-				return;
+				writer.WriteStringValue(MemberSearch);
+				break;
 			case ImpactArea.Ingest:
-				writer.WriteStringValue("ingest");
-				return;
+				writer.WriteStringValue(MemberIngest);
+				break;
 			case ImpactArea.DeploymentManagement:
-				writer.WriteStringValue("deployment_management");
-				return;
+				writer.WriteStringValue(MemberDeploymentManagement);
+				break;
 			case ImpactArea.Backup:
-				writer.WriteStringValue("backup");
-				return;
+				writer.WriteStringValue(MemberBackup);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(ImpactArea)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -97,45 +110,57 @@ public enum IndicatorHealthStatus
 	Green
 }
 
-internal sealed class IndicatorHealthStatusConverter : JsonConverter<IndicatorHealthStatus>
+internal sealed partial class IndicatorHealthStatusConverter : System.Text.Json.Serialization.JsonConverter<IndicatorHealthStatus>
 {
-	public override IndicatorHealthStatus Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberYellow = System.Text.Json.JsonEncodedText.Encode("yellow");
+	private static readonly System.Text.Json.JsonEncodedText MemberUnknown = System.Text.Json.JsonEncodedText.Encode("unknown");
+	private static readonly System.Text.Json.JsonEncodedText MemberRed = System.Text.Json.JsonEncodedText.Encode("red");
+	private static readonly System.Text.Json.JsonEncodedText MemberGreen = System.Text.Json.JsonEncodedText.Encode("green");
+
+	public override IndicatorHealthStatus Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberYellow))
+		{
+			return IndicatorHealthStatus.Yellow;
+		}
+
+		if (reader.ValueTextEquals(MemberUnknown))
 		{
-			case "yellow":
-				return IndicatorHealthStatus.Yellow;
-			case "unknown":
-				return IndicatorHealthStatus.Unknown;
-			case "red":
-				return IndicatorHealthStatus.Red;
-			case "green":
-				return IndicatorHealthStatus.Green;
+			return IndicatorHealthStatus.Unknown;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberRed))
+		{
+			return IndicatorHealthStatus.Red;
+		}
+
+		if (reader.ValueTextEquals(MemberGreen))
+		{
+			return IndicatorHealthStatus.Green;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(IndicatorHealthStatus)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, IndicatorHealthStatus value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IndicatorHealthStatus value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case IndicatorHealthStatus.Yellow:
-				writer.WriteStringValue("yellow");
-				return;
+				writer.WriteStringValue(MemberYellow);
+				break;
 			case IndicatorHealthStatus.Unknown:
-				writer.WriteStringValue("unknown");
-				return;
+				writer.WriteStringValue(MemberUnknown);
+				break;
 			case IndicatorHealthStatus.Red:
-				writer.WriteStringValue("red");
-				return;
+				writer.WriteStringValue(MemberRed);
+				break;
 			case IndicatorHealthStatus.Green:
-				writer.WriteStringValue("green");
-				return;
+				writer.WriteStringValue(MemberGreen);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(IndicatorHealthStatus)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
\ No newline at end of file
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 d585ddc3ee1..bb08cbe2a76 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
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Core;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport;
 using System;
@@ -60,41 +61,49 @@ public enum BoundaryScanner
 	Chars
 }
 
-internal sealed class BoundaryScannerConverter : JsonConverter<BoundaryScanner>
+internal sealed partial class BoundaryScannerConverter : System.Text.Json.Serialization.JsonConverter<BoundaryScanner>
 {
-	public override BoundaryScanner Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberWord = System.Text.Json.JsonEncodedText.Encode("word");
+	private static readonly System.Text.Json.JsonEncodedText MemberSentence = System.Text.Json.JsonEncodedText.Encode("sentence");
+	private static readonly System.Text.Json.JsonEncodedText MemberChars = System.Text.Json.JsonEncodedText.Encode("chars");
+
+	public override BoundaryScanner Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberWord))
 		{
-			case "word":
-				return BoundaryScanner.Word;
-			case "sentence":
-				return BoundaryScanner.Sentence;
-			case "chars":
-				return BoundaryScanner.Chars;
+			return BoundaryScanner.Word;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberSentence))
+		{
+			return BoundaryScanner.Sentence;
+		}
+
+		if (reader.ValueTextEquals(MemberChars))
+		{
+			return BoundaryScanner.Chars;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(BoundaryScanner)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, BoundaryScanner value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, BoundaryScanner value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case BoundaryScanner.Word:
-				writer.WriteStringValue("word");
-				return;
+				writer.WriteStringValue(MemberWord);
+				break;
 			case BoundaryScanner.Sentence:
-				writer.WriteStringValue("sentence");
-				return;
+				writer.WriteStringValue(MemberSentence);
+				break;
 			case BoundaryScanner.Chars:
-				writer.WriteStringValue("chars");
-				return;
+				writer.WriteStringValue(MemberChars);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(BoundaryScanner)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -107,36 +116,40 @@ public enum HighlighterEncoder
 	Default
 }
 
-internal sealed class HighlighterEncoderConverter : JsonConverter<HighlighterEncoder>
+internal sealed partial class HighlighterEncoderConverter : System.Text.Json.Serialization.JsonConverter<HighlighterEncoder>
 {
-	public override HighlighterEncoder Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberHtml = System.Text.Json.JsonEncodedText.Encode("html");
+	private static readonly System.Text.Json.JsonEncodedText MemberDefault = System.Text.Json.JsonEncodedText.Encode("default");
+
+	public override HighlighterEncoder Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberHtml))
 		{
-			case "html":
-				return HighlighterEncoder.Html;
-			case "default":
-				return HighlighterEncoder.Default;
+			return HighlighterEncoder.Html;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberDefault))
+		{
+			return HighlighterEncoder.Default;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(HighlighterEncoder)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, HighlighterEncoder value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, HighlighterEncoder value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case HighlighterEncoder.Html:
-				writer.WriteStringValue("html");
-				return;
+				writer.WriteStringValue(MemberHtml);
+				break;
 			case HighlighterEncoder.Default:
-				writer.WriteStringValue("default");
-				return;
+				writer.WriteStringValue(MemberDefault);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(HighlighterEncoder)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -149,36 +162,40 @@ public enum HighlighterFragmenter
 	Simple
 }
 
-internal sealed class HighlighterFragmenterConverter : JsonConverter<HighlighterFragmenter>
+internal sealed partial class HighlighterFragmenterConverter : System.Text.Json.Serialization.JsonConverter<HighlighterFragmenter>
 {
-	public override HighlighterFragmenter Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberSpan = System.Text.Json.JsonEncodedText.Encode("span");
+	private static readonly System.Text.Json.JsonEncodedText MemberSimple = System.Text.Json.JsonEncodedText.Encode("simple");
+
+	public override HighlighterFragmenter Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberSpan))
+		{
+			return HighlighterFragmenter.Span;
+		}
+
+		if (reader.ValueTextEquals(MemberSimple))
 		{
-			case "span":
-				return HighlighterFragmenter.Span;
-			case "simple":
-				return HighlighterFragmenter.Simple;
+			return HighlighterFragmenter.Simple;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(HighlighterFragmenter)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, HighlighterFragmenter value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, HighlighterFragmenter value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case HighlighterFragmenter.Span:
-				writer.WriteStringValue("span");
-				return;
+				writer.WriteStringValue(MemberSpan);
+				break;
 			case HighlighterFragmenter.Simple:
-				writer.WriteStringValue("simple");
-				return;
+				writer.WriteStringValue(MemberSimple);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(HighlighterFragmenter)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -189,31 +206,31 @@ public enum HighlighterOrder
 	Score
 }
 
-internal sealed class HighlighterOrderConverter : JsonConverter<HighlighterOrder>
+internal sealed partial class HighlighterOrderConverter : System.Text.Json.Serialization.JsonConverter<HighlighterOrder>
 {
-	public override HighlighterOrder Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberScore = System.Text.Json.JsonEncodedText.Encode("score");
+
+	public override HighlighterOrder Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberScore))
 		{
-			case "score":
-				return HighlighterOrder.Score;
+			return HighlighterOrder.Score;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(HighlighterOrder)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, HighlighterOrder value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, HighlighterOrder value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case HighlighterOrder.Score:
-				writer.WriteStringValue("score");
-				return;
+				writer.WriteStringValue(MemberScore);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(HighlighterOrder)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -224,31 +241,31 @@ public enum HighlighterTagsSchema
 	Styled
 }
 
-internal sealed class HighlighterTagsSchemaConverter : JsonConverter<HighlighterTagsSchema>
+internal sealed partial class HighlighterTagsSchemaConverter : System.Text.Json.Serialization.JsonConverter<HighlighterTagsSchema>
 {
-	public override HighlighterTagsSchema Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberStyled = System.Text.Json.JsonEncodedText.Encode("styled");
+
+	public override HighlighterTagsSchema Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberStyled))
 		{
-			case "styled":
-				return HighlighterTagsSchema.Styled;
+			return HighlighterTagsSchema.Styled;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(HighlighterTagsSchema)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, HighlighterTagsSchema value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, HighlighterTagsSchema value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case HighlighterTagsSchema.Styled:
-				writer.WriteStringValue("styled");
-				return;
+				writer.WriteStringValue(MemberStyled);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(HighlighterTagsSchema)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -256,9 +273,11 @@ public override void Write(Utf8JsonWriter writer, HighlighterTagsSchema value, J
 public readonly partial struct HighlighterType : IEnumStruct<HighlighterType>
 {
 	public HighlighterType(string value) => Value = value;
-
+#if NET7_0_OR_GREATER
+	static HighlighterType IEnumStruct<HighlighterType>.Create(string value) => value;
+#else
 	HighlighterType IEnumStruct<HighlighterType>.Create(string value) => value;
-
+#endif
 	public readonly string Value { get; }
 
 	/// <summary>
@@ -336,51 +355,67 @@ public enum ScoreMode
 	Avg
 }
 
-internal sealed class ScoreModeConverter : JsonConverter<ScoreMode>
+internal sealed partial class ScoreModeConverter : System.Text.Json.Serialization.JsonConverter<ScoreMode>
 {
-	public override ScoreMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberTotal = System.Text.Json.JsonEncodedText.Encode("total");
+	private static readonly System.Text.Json.JsonEncodedText MemberMultiply = System.Text.Json.JsonEncodedText.Encode("multiply");
+	private static readonly System.Text.Json.JsonEncodedText MemberMin = System.Text.Json.JsonEncodedText.Encode("min");
+	private static readonly System.Text.Json.JsonEncodedText MemberMax = System.Text.Json.JsonEncodedText.Encode("max");
+	private static readonly System.Text.Json.JsonEncodedText MemberAvg = System.Text.Json.JsonEncodedText.Encode("avg");
+
+	public override ScoreMode Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "total":
-				return ScoreMode.Total;
-			case "multiply":
-				return ScoreMode.Multiply;
-			case "min":
-				return ScoreMode.Min;
-			case "max":
-				return ScoreMode.Max;
-			case "avg":
-				return ScoreMode.Avg;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberTotal))
+		{
+			return ScoreMode.Total;
+		}
+
+		if (reader.ValueTextEquals(MemberMultiply))
+		{
+			return ScoreMode.Multiply;
+		}
+
+		if (reader.ValueTextEquals(MemberMin))
+		{
+			return ScoreMode.Min;
+		}
+
+		if (reader.ValueTextEquals(MemberMax))
+		{
+			return ScoreMode.Max;
+		}
+
+		if (reader.ValueTextEquals(MemberAvg))
+		{
+			return ScoreMode.Avg;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(ScoreMode)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, ScoreMode value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ScoreMode value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case ScoreMode.Total:
-				writer.WriteStringValue("total");
-				return;
+				writer.WriteStringValue(MemberTotal);
+				break;
 			case ScoreMode.Multiply:
-				writer.WriteStringValue("multiply");
-				return;
+				writer.WriteStringValue(MemberMultiply);
+				break;
 			case ScoreMode.Min:
-				writer.WriteStringValue("min");
-				return;
+				writer.WriteStringValue(MemberMin);
+				break;
 			case ScoreMode.Max:
-				writer.WriteStringValue("max");
-				return;
+				writer.WriteStringValue(MemberMax);
+				break;
 			case ScoreMode.Avg:
-				writer.WriteStringValue("avg");
-				return;
+				writer.WriteStringValue(MemberAvg);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(ScoreMode)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -424,51 +459,67 @@ public enum StringDistance
 	DamerauLevenshtein
 }
 
-internal sealed class StringDistanceConverter : JsonConverter<StringDistance>
+internal sealed partial class StringDistanceConverter : System.Text.Json.Serialization.JsonConverter<StringDistance>
 {
-	public override StringDistance Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberNgram = System.Text.Json.JsonEncodedText.Encode("ngram");
+	private static readonly System.Text.Json.JsonEncodedText MemberLevenshtein = System.Text.Json.JsonEncodedText.Encode("levenshtein");
+	private static readonly System.Text.Json.JsonEncodedText MemberJaroWinkler = System.Text.Json.JsonEncodedText.Encode("jaro_winkler");
+	private static readonly System.Text.Json.JsonEncodedText MemberInternal = System.Text.Json.JsonEncodedText.Encode("internal");
+	private static readonly System.Text.Json.JsonEncodedText MemberDamerauLevenshtein = System.Text.Json.JsonEncodedText.Encode("damerau_levenshtein");
+
+	public override StringDistance Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "ngram":
-				return StringDistance.Ngram;
-			case "levenshtein":
-				return StringDistance.Levenshtein;
-			case "jaro_winkler":
-				return StringDistance.JaroWinkler;
-			case "internal":
-				return StringDistance.Internal;
-			case "damerau_levenshtein":
-				return StringDistance.DamerauLevenshtein;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberNgram))
+		{
+			return StringDistance.Ngram;
+		}
+
+		if (reader.ValueTextEquals(MemberLevenshtein))
+		{
+			return StringDistance.Levenshtein;
+		}
+
+		if (reader.ValueTextEquals(MemberJaroWinkler))
+		{
+			return StringDistance.JaroWinkler;
+		}
+
+		if (reader.ValueTextEquals(MemberInternal))
+		{
+			return StringDistance.Internal;
+		}
+
+		if (reader.ValueTextEquals(MemberDamerauLevenshtein))
+		{
+			return StringDistance.DamerauLevenshtein;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(StringDistance)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, StringDistance value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, StringDistance value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case StringDistance.Ngram:
-				writer.WriteStringValue("ngram");
-				return;
+				writer.WriteStringValue(MemberNgram);
+				break;
 			case StringDistance.Levenshtein:
-				writer.WriteStringValue("levenshtein");
-				return;
+				writer.WriteStringValue(MemberLevenshtein);
+				break;
 			case StringDistance.JaroWinkler:
-				writer.WriteStringValue("jaro_winkler");
-				return;
+				writer.WriteStringValue(MemberJaroWinkler);
+				break;
 			case StringDistance.Internal:
-				writer.WriteStringValue("internal");
-				return;
+				writer.WriteStringValue(MemberInternal);
+				break;
 			case StringDistance.DamerauLevenshtein:
-				writer.WriteStringValue("damerau_levenshtein");
-				return;
+				writer.WriteStringValue(MemberDamerauLevenshtein);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(StringDistance)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -491,36 +542,40 @@ public enum SuggestSort
 	Frequency
 }
 
-internal sealed class SuggestSortConverter : JsonConverter<SuggestSort>
+internal sealed partial class SuggestSortConverter : System.Text.Json.Serialization.JsonConverter<SuggestSort>
 {
-	public override SuggestSort Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberScore = System.Text.Json.JsonEncodedText.Encode("score");
+	private static readonly System.Text.Json.JsonEncodedText MemberFrequency = System.Text.Json.JsonEncodedText.Encode("frequency");
+
+	public override SuggestSort Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberScore))
 		{
-			case "score":
-				return SuggestSort.Score;
-			case "frequency":
-				return SuggestSort.Frequency;
+			return SuggestSort.Score;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberFrequency))
+		{
+			return SuggestSort.Frequency;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(SuggestSort)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, SuggestSort value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SuggestSort value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case SuggestSort.Score:
-				writer.WriteStringValue("score");
-				return;
+				writer.WriteStringValue(MemberScore);
+				break;
 			case SuggestSort.Frequency:
-				writer.WriteStringValue("frequency");
-				return;
+				writer.WriteStringValue(MemberFrequency);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(SuggestSort)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -543,35 +598,39 @@ public enum TotalHitsRelation
 	Eq
 }
 
-internal sealed class TotalHitsRelationConverter : JsonConverter<TotalHitsRelation>
+internal sealed partial class TotalHitsRelationConverter : System.Text.Json.Serialization.JsonConverter<TotalHitsRelation>
 {
-	public override TotalHitsRelation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberGte = System.Text.Json.JsonEncodedText.Encode("gte");
+	private static readonly System.Text.Json.JsonEncodedText MemberEq = System.Text.Json.JsonEncodedText.Encode("eq");
+
+	public override TotalHitsRelation Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberGte))
 		{
-			case "gte":
-				return TotalHitsRelation.Gte;
-			case "eq":
-				return TotalHitsRelation.Eq;
+			return TotalHitsRelation.Gte;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberEq))
+		{
+			return TotalHitsRelation.Eq;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(TotalHitsRelation)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, TotalHitsRelation value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, TotalHitsRelation value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case TotalHitsRelation.Gte:
-				writer.WriteStringValue("gte");
-				return;
+				writer.WriteStringValue(MemberGte);
+				break;
 			case TotalHitsRelation.Eq:
-				writer.WriteStringValue("eq");
-				return;
+				writer.WriteStringValue(MemberEq);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(TotalHitsRelation)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Core.SearchMvt.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Core.SearchMvt.g.cs
index ba5a373ae24..f37a4b05c64 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Core.SearchMvt.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Core.SearchMvt.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Core;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport;
 using System;
@@ -37,36 +38,40 @@ public enum GridAggregationType
 	Geohex
 }
 
-internal sealed class GridAggregationTypeConverter : JsonConverter<GridAggregationType>
+internal sealed partial class GridAggregationTypeConverter : System.Text.Json.Serialization.JsonConverter<GridAggregationType>
 {
-	public override GridAggregationType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberGeotile = System.Text.Json.JsonEncodedText.Encode("geotile");
+	private static readonly System.Text.Json.JsonEncodedText MemberGeohex = System.Text.Json.JsonEncodedText.Encode("geohex");
+
+	public override GridAggregationType Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberGeotile))
+		{
+			return GridAggregationType.Geotile;
+		}
+
+		if (reader.ValueTextEquals(MemberGeohex))
 		{
-			case "geotile":
-				return GridAggregationType.Geotile;
-			case "geohex":
-				return GridAggregationType.Geohex;
+			return GridAggregationType.Geohex;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(GridAggregationType)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, GridAggregationType value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GridAggregationType value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case GridAggregationType.Geotile:
-				writer.WriteStringValue("geotile");
-				return;
+				writer.WriteStringValue(MemberGeotile);
+				break;
 			case GridAggregationType.Geohex:
-				writer.WriteStringValue("geohex");
-				return;
+				writer.WriteStringValue(MemberGeohex);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(GridAggregationType)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -81,40 +86,48 @@ public enum GridType
 	Centroid
 }
 
-internal sealed class GridTypeConverter : JsonConverter<GridType>
+internal sealed partial class GridTypeConverter : System.Text.Json.Serialization.JsonConverter<GridType>
 {
-	public override GridType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberPoint = System.Text.Json.JsonEncodedText.Encode("point");
+	private static readonly System.Text.Json.JsonEncodedText MemberGrid = System.Text.Json.JsonEncodedText.Encode("grid");
+	private static readonly System.Text.Json.JsonEncodedText MemberCentroid = System.Text.Json.JsonEncodedText.Encode("centroid");
+
+	public override GridType Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberPoint))
 		{
-			case "point":
-				return GridType.Point;
-			case "grid":
-				return GridType.Grid;
-			case "centroid":
-				return GridType.Centroid;
+			return GridType.Point;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberGrid))
+		{
+			return GridType.Grid;
+		}
+
+		if (reader.ValueTextEquals(MemberCentroid))
+		{
+			return GridType.Centroid;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(GridType)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, GridType value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GridType value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case GridType.Point:
-				writer.WriteStringValue("point");
-				return;
+				writer.WriteStringValue(MemberPoint);
+				break;
 			case GridType.Grid:
-				writer.WriteStringValue("grid");
-				return;
+				writer.WriteStringValue(MemberGrid);
+				break;
 			case GridType.Centroid:
-				writer.WriteStringValue("centroid");
-				return;
+				writer.WriteStringValue(MemberCentroid);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(GridType)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.CrossClusterReplication.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.CrossClusterReplication.g.cs
index b7c7782a161..5875b77b05d 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.CrossClusterReplication.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.CrossClusterReplication.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Core;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport;
 using System;
@@ -37,35 +38,39 @@ public enum FollowerIndexStatus
 	Active
 }
 
-internal sealed class FollowerIndexStatusConverter : JsonConverter<FollowerIndexStatus>
+internal sealed partial class FollowerIndexStatusConverter : System.Text.Json.Serialization.JsonConverter<FollowerIndexStatus>
 {
-	public override FollowerIndexStatus Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberPaused = System.Text.Json.JsonEncodedText.Encode("paused");
+	private static readonly System.Text.Json.JsonEncodedText MemberActive = System.Text.Json.JsonEncodedText.Encode("active");
+
+	public override FollowerIndexStatus Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberPaused))
 		{
-			case "paused":
-				return FollowerIndexStatus.Paused;
-			case "active":
-				return FollowerIndexStatus.Active;
+			return FollowerIndexStatus.Paused;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberActive))
+		{
+			return FollowerIndexStatus.Active;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(FollowerIndexStatus)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, FollowerIndexStatus value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, FollowerIndexStatus value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case FollowerIndexStatus.Paused:
-				writer.WriteStringValue("paused");
-				return;
+				writer.WriteStringValue(MemberPaused);
+				break;
 			case FollowerIndexStatus.Active:
-				writer.WriteStringValue("active");
-				return;
+				writer.WriteStringValue(MemberActive);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(FollowerIndexStatus)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Enrich.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Enrich.g.cs
index e515e745ac1..58698855e43 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Enrich.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Enrich.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Core;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport;
 using System;
@@ -41,46 +42,58 @@ public enum EnrichPolicyPhase
 	Complete
 }
 
-internal sealed class EnrichPolicyPhaseConverter : JsonConverter<EnrichPolicyPhase>
+internal sealed partial class EnrichPolicyPhaseConverter : System.Text.Json.Serialization.JsonConverter<EnrichPolicyPhase>
 {
-	public override EnrichPolicyPhase Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberScheduled = System.Text.Json.JsonEncodedText.Encode("SCHEDULED");
+	private static readonly System.Text.Json.JsonEncodedText MemberRunning = System.Text.Json.JsonEncodedText.Encode("RUNNING");
+	private static readonly System.Text.Json.JsonEncodedText MemberFailed = System.Text.Json.JsonEncodedText.Encode("FAILED");
+	private static readonly System.Text.Json.JsonEncodedText MemberComplete = System.Text.Json.JsonEncodedText.Encode("COMPLETE");
+
+	public override EnrichPolicyPhase Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberScheduled))
+		{
+			return EnrichPolicyPhase.Scheduled;
+		}
+
+		if (reader.ValueTextEquals(MemberRunning))
+		{
+			return EnrichPolicyPhase.Running;
+		}
+
+		if (reader.ValueTextEquals(MemberFailed))
+		{
+			return EnrichPolicyPhase.Failed;
+		}
+
+		if (reader.ValueTextEquals(MemberComplete))
 		{
-			case "SCHEDULED":
-				return EnrichPolicyPhase.Scheduled;
-			case "RUNNING":
-				return EnrichPolicyPhase.Running;
-			case "FAILED":
-				return EnrichPolicyPhase.Failed;
-			case "COMPLETE":
-				return EnrichPolicyPhase.Complete;
+			return EnrichPolicyPhase.Complete;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(EnrichPolicyPhase)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, EnrichPolicyPhase value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, EnrichPolicyPhase value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case EnrichPolicyPhase.Scheduled:
-				writer.WriteStringValue("SCHEDULED");
-				return;
+				writer.WriteStringValue(MemberScheduled);
+				break;
 			case EnrichPolicyPhase.Running:
-				writer.WriteStringValue("RUNNING");
-				return;
+				writer.WriteStringValue(MemberRunning);
+				break;
 			case EnrichPolicyPhase.Failed:
-				writer.WriteStringValue("FAILED");
-				return;
+				writer.WriteStringValue(MemberFailed);
+				break;
 			case EnrichPolicyPhase.Complete:
-				writer.WriteStringValue("COMPLETE");
-				return;
+				writer.WriteStringValue(MemberComplete);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(EnrichPolicyPhase)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -95,40 +108,48 @@ public enum PolicyType
 	GeoMatch
 }
 
-internal sealed class PolicyTypeConverter : JsonConverter<PolicyType>
+internal sealed partial class PolicyTypeConverter : System.Text.Json.Serialization.JsonConverter<PolicyType>
 {
-	public override PolicyType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberRange = System.Text.Json.JsonEncodedText.Encode("range");
+	private static readonly System.Text.Json.JsonEncodedText MemberMatch = System.Text.Json.JsonEncodedText.Encode("match");
+	private static readonly System.Text.Json.JsonEncodedText MemberGeoMatch = System.Text.Json.JsonEncodedText.Encode("geo_match");
+
+	public override PolicyType Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberRange))
+		{
+			return PolicyType.Range;
+		}
+
+		if (reader.ValueTextEquals(MemberMatch))
 		{
-			case "range":
-				return PolicyType.Range;
-			case "match":
-				return PolicyType.Match;
-			case "geo_match":
-				return PolicyType.GeoMatch;
+			return PolicyType.Match;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberGeoMatch))
+		{
+			return PolicyType.GeoMatch;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(PolicyType)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, PolicyType value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PolicyType value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case PolicyType.Range:
-				writer.WriteStringValue("range");
-				return;
+				writer.WriteStringValue(MemberRange);
+				break;
 			case PolicyType.Match:
-				writer.WriteStringValue("match");
-				return;
+				writer.WriteStringValue(MemberMatch);
+				break;
 			case PolicyType.GeoMatch:
-				writer.WriteStringValue("geo_match");
-				return;
+				writer.WriteStringValue(MemberGeoMatch);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(PolicyType)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
\ No newline at end of file
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 d4d3772640b..91533c5ec84 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
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Core;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport;
 using System;
@@ -47,35 +48,39 @@ public enum ResultPosition
 	Head
 }
 
-internal sealed class ResultPositionConverter : JsonConverter<ResultPosition>
+internal sealed partial class ResultPositionConverter : System.Text.Json.Serialization.JsonConverter<ResultPosition>
 {
-	public override ResultPosition Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberTail = System.Text.Json.JsonEncodedText.Encode("tail");
+	private static readonly System.Text.Json.JsonEncodedText MemberHead = System.Text.Json.JsonEncodedText.Encode("head");
+
+	public override ResultPosition Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberTail))
 		{
-			case "tail":
-				return ResultPosition.Tail;
-			case "head":
-				return ResultPosition.Head;
+			return ResultPosition.Tail;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberHead))
+		{
+			return ResultPosition.Head;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(ResultPosition)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, ResultPosition value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ResultPosition value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case ResultPosition.Tail:
-				writer.WriteStringValue("tail");
-				return;
+				writer.WriteStringValue(MemberTail);
+				break;
 			case ResultPosition.Head:
-				writer.WriteStringValue("head");
-				return;
+				writer.WriteStringValue(MemberHead);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(ResultPosition)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Esql.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Esql.g.cs
index 88f73b46228..339dc670158 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Esql.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Esql.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Core;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport;
 using System;
@@ -49,65 +50,93 @@ public enum EsqlFormat
 	Arrow
 }
 
-internal sealed class EsqlFormatConverter : JsonConverter<EsqlFormat>
+internal sealed partial class EsqlFormatConverter : System.Text.Json.Serialization.JsonConverter<EsqlFormat>
 {
-	public override EsqlFormat Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberYaml = System.Text.Json.JsonEncodedText.Encode("yaml");
+	private static readonly System.Text.Json.JsonEncodedText MemberTxt = System.Text.Json.JsonEncodedText.Encode("txt");
+	private static readonly System.Text.Json.JsonEncodedText MemberTsv = System.Text.Json.JsonEncodedText.Encode("tsv");
+	private static readonly System.Text.Json.JsonEncodedText MemberSmile = System.Text.Json.JsonEncodedText.Encode("smile");
+	private static readonly System.Text.Json.JsonEncodedText MemberJson = System.Text.Json.JsonEncodedText.Encode("json");
+	private static readonly System.Text.Json.JsonEncodedText MemberCsv = System.Text.Json.JsonEncodedText.Encode("csv");
+	private static readonly System.Text.Json.JsonEncodedText MemberCbor = System.Text.Json.JsonEncodedText.Encode("cbor");
+	private static readonly System.Text.Json.JsonEncodedText MemberArrow = System.Text.Json.JsonEncodedText.Encode("arrow");
+
+	public override EsqlFormat Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberYaml))
+		{
+			return EsqlFormat.Yaml;
+		}
+
+		if (reader.ValueTextEquals(MemberTxt))
+		{
+			return EsqlFormat.Txt;
+		}
+
+		if (reader.ValueTextEquals(MemberTsv))
+		{
+			return EsqlFormat.Tsv;
+		}
+
+		if (reader.ValueTextEquals(MemberSmile))
 		{
-			case "yaml":
-				return EsqlFormat.Yaml;
-			case "txt":
-				return EsqlFormat.Txt;
-			case "tsv":
-				return EsqlFormat.Tsv;
-			case "smile":
-				return EsqlFormat.Smile;
-			case "json":
-				return EsqlFormat.Json;
-			case "csv":
-				return EsqlFormat.Csv;
-			case "cbor":
-				return EsqlFormat.Cbor;
-			case "arrow":
-				return EsqlFormat.Arrow;
+			return EsqlFormat.Smile;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberJson))
+		{
+			return EsqlFormat.Json;
+		}
+
+		if (reader.ValueTextEquals(MemberCsv))
+		{
+			return EsqlFormat.Csv;
+		}
+
+		if (reader.ValueTextEquals(MemberCbor))
+		{
+			return EsqlFormat.Cbor;
+		}
+
+		if (reader.ValueTextEquals(MemberArrow))
+		{
+			return EsqlFormat.Arrow;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(EsqlFormat)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, EsqlFormat value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, EsqlFormat value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case EsqlFormat.Yaml:
-				writer.WriteStringValue("yaml");
-				return;
+				writer.WriteStringValue(MemberYaml);
+				break;
 			case EsqlFormat.Txt:
-				writer.WriteStringValue("txt");
-				return;
+				writer.WriteStringValue(MemberTxt);
+				break;
 			case EsqlFormat.Tsv:
-				writer.WriteStringValue("tsv");
-				return;
+				writer.WriteStringValue(MemberTsv);
+				break;
 			case EsqlFormat.Smile:
-				writer.WriteStringValue("smile");
-				return;
+				writer.WriteStringValue(MemberSmile);
+				break;
 			case EsqlFormat.Json:
-				writer.WriteStringValue("json");
-				return;
+				writer.WriteStringValue(MemberJson);
+				break;
 			case EsqlFormat.Csv:
-				writer.WriteStringValue("csv");
-				return;
+				writer.WriteStringValue(MemberCsv);
+				break;
 			case EsqlFormat.Cbor:
-				writer.WriteStringValue("cbor");
-				return;
+				writer.WriteStringValue(MemberCbor);
+				break;
 			case EsqlFormat.Arrow:
-				writer.WriteStringValue("arrow");
-				return;
+				writer.WriteStringValue(MemberArrow);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(EsqlFormat)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
\ No newline at end of file
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 a5fbdb62bbf..a38cfb831f6 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
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Core;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport;
 using System;
@@ -39,41 +40,49 @@ public enum Feature
 	Aliases
 }
 
-internal sealed class FeatureConverter : JsonConverter<Feature>
+internal sealed partial class FeatureConverter : System.Text.Json.Serialization.JsonConverter<Feature>
 {
-	public override Feature Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberSettings = System.Text.Json.JsonEncodedText.Encode("settings");
+	private static readonly System.Text.Json.JsonEncodedText MemberMappings = System.Text.Json.JsonEncodedText.Encode("mappings");
+	private static readonly System.Text.Json.JsonEncodedText MemberAliases = System.Text.Json.JsonEncodedText.Encode("aliases");
+
+	public override Feature Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberSettings))
+		{
+			return Feature.Settings;
+		}
+
+		if (reader.ValueTextEquals(MemberMappings))
+		{
+			return Feature.Mappings;
+		}
+
+		if (reader.ValueTextEquals(MemberAliases))
 		{
-			case "settings":
-				return Feature.Settings;
-			case "mappings":
-				return Feature.Mappings;
-			case "aliases":
-				return Feature.Aliases;
+			return Feature.Aliases;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(Feature)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, Feature value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, Feature value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case Feature.Settings:
-				writer.WriteStringValue("settings");
-				return;
+				writer.WriteStringValue(MemberSettings);
+				break;
 			case Feature.Mappings:
-				writer.WriteStringValue("mappings");
-				return;
+				writer.WriteStringValue(MemberMappings);
+				break;
 			case Feature.Aliases:
-				writer.WriteStringValue("aliases");
-				return;
+				writer.WriteStringValue(MemberAliases);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(Feature)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -88,41 +97,49 @@ public enum IndexCheckOnStartup
 	Checksum
 }
 
-internal sealed class IndexCheckOnStartupConverter : JsonConverter<IndexCheckOnStartup>
+internal sealed partial class IndexCheckOnStartupConverter : System.Text.Json.Serialization.JsonConverter<IndexCheckOnStartup>
 {
-	public override IndexCheckOnStartup Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberTrue = System.Text.Json.JsonEncodedText.Encode("true");
+	private static readonly System.Text.Json.JsonEncodedText MemberFalse = System.Text.Json.JsonEncodedText.Encode("false");
+	private static readonly System.Text.Json.JsonEncodedText MemberChecksum = System.Text.Json.JsonEncodedText.Encode("checksum");
+
+	public override IndexCheckOnStartup Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberTrue))
 		{
-			case "true":
-				return IndexCheckOnStartup.True;
-			case "false":
-				return IndexCheckOnStartup.False;
-			case "checksum":
-				return IndexCheckOnStartup.Checksum;
+			return IndexCheckOnStartup.True;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberFalse))
+		{
+			return IndexCheckOnStartup.False;
+		}
+
+		if (reader.ValueTextEquals(MemberChecksum))
+		{
+			return IndexCheckOnStartup.Checksum;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(IndexCheckOnStartup)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, IndexCheckOnStartup value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IndexCheckOnStartup value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case IndexCheckOnStartup.True:
-				writer.WriteStringValue("true");
-				return;
+				writer.WriteStringValue(MemberTrue);
+				break;
 			case IndexCheckOnStartup.False:
-				writer.WriteStringValue("false");
-				return;
+				writer.WriteStringValue(MemberFalse);
+				break;
 			case IndexCheckOnStartup.Checksum:
-				writer.WriteStringValue("checksum");
-				return;
+				writer.WriteStringValue(MemberChecksum);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(IndexCheckOnStartup)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -135,36 +152,40 @@ public enum IndexMetadataState
 	Close
 }
 
-internal sealed class IndexMetadataStateConverter : JsonConverter<IndexMetadataState>
+internal sealed partial class IndexMetadataStateConverter : System.Text.Json.Serialization.JsonConverter<IndexMetadataState>
 {
-	public override IndexMetadataState Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberOpen = System.Text.Json.JsonEncodedText.Encode("open");
+	private static readonly System.Text.Json.JsonEncodedText MemberClose = System.Text.Json.JsonEncodedText.Encode("close");
+
+	public override IndexMetadataState Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberOpen))
 		{
-			case "open":
-				return IndexMetadataState.Open;
-			case "close":
-				return IndexMetadataState.Close;
+			return IndexMetadataState.Open;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberClose))
+		{
+			return IndexMetadataState.Close;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(IndexMetadataState)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, IndexMetadataState value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IndexMetadataState value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case IndexMetadataState.Open:
-				writer.WriteStringValue("open");
-				return;
+				writer.WriteStringValue(MemberOpen);
+				break;
 			case IndexMetadataState.Close:
-				writer.WriteStringValue("close");
-				return;
+				writer.WriteStringValue(MemberClose);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(IndexMetadataState)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -181,46 +202,58 @@ public enum IndexRoutingAllocationOptions
 	All
 }
 
-internal sealed class IndexRoutingAllocationOptionsConverter : JsonConverter<IndexRoutingAllocationOptions>
+internal sealed partial class IndexRoutingAllocationOptionsConverter : System.Text.Json.Serialization.JsonConverter<IndexRoutingAllocationOptions>
 {
-	public override IndexRoutingAllocationOptions Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberPrimaries = System.Text.Json.JsonEncodedText.Encode("primaries");
+	private static readonly System.Text.Json.JsonEncodedText MemberNone = System.Text.Json.JsonEncodedText.Encode("none");
+	private static readonly System.Text.Json.JsonEncodedText MemberNewPrimaries = System.Text.Json.JsonEncodedText.Encode("new_primaries");
+	private static readonly System.Text.Json.JsonEncodedText MemberAll = System.Text.Json.JsonEncodedText.Encode("all");
+
+	public override IndexRoutingAllocationOptions Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberPrimaries))
+		{
+			return IndexRoutingAllocationOptions.Primaries;
+		}
+
+		if (reader.ValueTextEquals(MemberNone))
+		{
+			return IndexRoutingAllocationOptions.None;
+		}
+
+		if (reader.ValueTextEquals(MemberNewPrimaries))
+		{
+			return IndexRoutingAllocationOptions.NewPrimaries;
+		}
+
+		if (reader.ValueTextEquals(MemberAll))
 		{
-			case "primaries":
-				return IndexRoutingAllocationOptions.Primaries;
-			case "none":
-				return IndexRoutingAllocationOptions.None;
-			case "new_primaries":
-				return IndexRoutingAllocationOptions.NewPrimaries;
-			case "all":
-				return IndexRoutingAllocationOptions.All;
+			return IndexRoutingAllocationOptions.All;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(IndexRoutingAllocationOptions)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, IndexRoutingAllocationOptions value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IndexRoutingAllocationOptions value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case IndexRoutingAllocationOptions.Primaries:
-				writer.WriteStringValue("primaries");
-				return;
+				writer.WriteStringValue(MemberPrimaries);
+				break;
 			case IndexRoutingAllocationOptions.None:
-				writer.WriteStringValue("none");
-				return;
+				writer.WriteStringValue(MemberNone);
+				break;
 			case IndexRoutingAllocationOptions.NewPrimaries:
-				writer.WriteStringValue("new_primaries");
-				return;
+				writer.WriteStringValue(MemberNewPrimaries);
+				break;
 			case IndexRoutingAllocationOptions.All:
-				writer.WriteStringValue("all");
-				return;
+				writer.WriteStringValue(MemberAll);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(IndexRoutingAllocationOptions)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -237,46 +270,58 @@ public enum IndexRoutingRebalanceOptions
 	All
 }
 
-internal sealed class IndexRoutingRebalanceOptionsConverter : JsonConverter<IndexRoutingRebalanceOptions>
+internal sealed partial class IndexRoutingRebalanceOptionsConverter : System.Text.Json.Serialization.JsonConverter<IndexRoutingRebalanceOptions>
 {
-	public override IndexRoutingRebalanceOptions Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberReplicas = System.Text.Json.JsonEncodedText.Encode("replicas");
+	private static readonly System.Text.Json.JsonEncodedText MemberPrimaries = System.Text.Json.JsonEncodedText.Encode("primaries");
+	private static readonly System.Text.Json.JsonEncodedText MemberNone = System.Text.Json.JsonEncodedText.Encode("none");
+	private static readonly System.Text.Json.JsonEncodedText MemberAll = System.Text.Json.JsonEncodedText.Encode("all");
+
+	public override IndexRoutingRebalanceOptions Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberReplicas))
+		{
+			return IndexRoutingRebalanceOptions.Replicas;
+		}
+
+		if (reader.ValueTextEquals(MemberPrimaries))
 		{
-			case "replicas":
-				return IndexRoutingRebalanceOptions.Replicas;
-			case "primaries":
-				return IndexRoutingRebalanceOptions.Primaries;
-			case "none":
-				return IndexRoutingRebalanceOptions.None;
-			case "all":
-				return IndexRoutingRebalanceOptions.All;
+			return IndexRoutingRebalanceOptions.Primaries;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberNone))
+		{
+			return IndexRoutingRebalanceOptions.None;
+		}
+
+		if (reader.ValueTextEquals(MemberAll))
+		{
+			return IndexRoutingRebalanceOptions.All;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(IndexRoutingRebalanceOptions)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, IndexRoutingRebalanceOptions value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IndexRoutingRebalanceOptions value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case IndexRoutingRebalanceOptions.Replicas:
-				writer.WriteStringValue("replicas");
-				return;
+				writer.WriteStringValue(MemberReplicas);
+				break;
 			case IndexRoutingRebalanceOptions.Primaries:
-				writer.WriteStringValue("primaries");
-				return;
+				writer.WriteStringValue(MemberPrimaries);
+				break;
 			case IndexRoutingRebalanceOptions.None:
-				writer.WriteStringValue("none");
-				return;
+				writer.WriteStringValue(MemberNone);
+				break;
 			case IndexRoutingRebalanceOptions.All:
-				writer.WriteStringValue("all");
-				return;
+				writer.WriteStringValue(MemberAll);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(IndexRoutingRebalanceOptions)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -291,41 +336,49 @@ public enum ManagedBy
 	Datastream
 }
 
-internal sealed class ManagedByConverter : JsonConverter<ManagedBy>
+internal sealed partial class ManagedByConverter : System.Text.Json.Serialization.JsonConverter<ManagedBy>
 {
-	public override ManagedBy Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberUnmanaged = System.Text.Json.JsonEncodedText.Encode("Unmanaged");
+	private static readonly System.Text.Json.JsonEncodedText MemberIlm = System.Text.Json.JsonEncodedText.Encode("Index Lifecycle Management");
+	private static readonly System.Text.Json.JsonEncodedText MemberDatastream = System.Text.Json.JsonEncodedText.Encode("Data stream lifecycle");
+
+	public override ManagedBy Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberUnmanaged))
 		{
-			case "Unmanaged":
-				return ManagedBy.Unmanaged;
-			case "Index Lifecycle Management":
-				return ManagedBy.Ilm;
-			case "Data stream lifecycle":
-				return ManagedBy.Datastream;
+			return ManagedBy.Unmanaged;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberIlm))
+		{
+			return ManagedBy.Ilm;
+		}
+
+		if (reader.ValueTextEquals(MemberDatastream))
+		{
+			return ManagedBy.Datastream;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(ManagedBy)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, ManagedBy value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ManagedBy value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case ManagedBy.Unmanaged:
-				writer.WriteStringValue("Unmanaged");
-				return;
+				writer.WriteStringValue(MemberUnmanaged);
+				break;
 			case ManagedBy.Ilm:
-				writer.WriteStringValue("Index Lifecycle Management");
-				return;
+				writer.WriteStringValue(MemberIlm);
+				break;
 			case ManagedBy.Datastream:
-				writer.WriteStringValue("Data stream lifecycle");
-				return;
+				writer.WriteStringValue(MemberDatastream);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(ManagedBy)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -338,36 +391,40 @@ public enum NumericFielddataFormat
 	Array
 }
 
-internal sealed class NumericFielddataFormatConverter : JsonConverter<NumericFielddataFormat>
+internal sealed partial class NumericFielddataFormatConverter : System.Text.Json.Serialization.JsonConverter<NumericFielddataFormat>
 {
-	public override NumericFielddataFormat Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberDisabled = System.Text.Json.JsonEncodedText.Encode("disabled");
+	private static readonly System.Text.Json.JsonEncodedText MemberArray = System.Text.Json.JsonEncodedText.Encode("array");
+
+	public override NumericFielddataFormat Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberDisabled))
+		{
+			return NumericFielddataFormat.Disabled;
+		}
+
+		if (reader.ValueTextEquals(MemberArray))
 		{
-			case "disabled":
-				return NumericFielddataFormat.Disabled;
-			case "array":
-				return NumericFielddataFormat.Array;
+			return NumericFielddataFormat.Array;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(NumericFielddataFormat)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, NumericFielddataFormat value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, NumericFielddataFormat value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case NumericFielddataFormat.Disabled:
-				writer.WriteStringValue("disabled");
-				return;
+				writer.WriteStringValue(MemberDisabled);
+				break;
 			case NumericFielddataFormat.Array:
-				writer.WriteStringValue("array");
-				return;
+				writer.WriteStringValue(MemberArray);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(NumericFielddataFormat)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -380,36 +437,40 @@ public enum SegmentSortMissing
 	First
 }
 
-internal sealed class SegmentSortMissingConverter : JsonConverter<SegmentSortMissing>
+internal sealed partial class SegmentSortMissingConverter : System.Text.Json.Serialization.JsonConverter<SegmentSortMissing>
 {
-	public override SegmentSortMissing Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberLast = System.Text.Json.JsonEncodedText.Encode("_last");
+	private static readonly System.Text.Json.JsonEncodedText MemberFirst = System.Text.Json.JsonEncodedText.Encode("_first");
+
+	public override SegmentSortMissing Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberLast))
 		{
-			case "_last":
-				return SegmentSortMissing.Last;
-			case "_first":
-				return SegmentSortMissing.First;
+			return SegmentSortMissing.Last;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberFirst))
+		{
+			return SegmentSortMissing.First;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(SegmentSortMissing)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, SegmentSortMissing value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SegmentSortMissing value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case SegmentSortMissing.Last:
-				writer.WriteStringValue("_last");
-				return;
+				writer.WriteStringValue(MemberLast);
+				break;
 			case SegmentSortMissing.First:
-				writer.WriteStringValue("_first");
-				return;
+				writer.WriteStringValue(MemberFirst);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(SegmentSortMissing)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -422,38 +483,42 @@ public enum SegmentSortMode
 	Max
 }
 
-internal sealed class SegmentSortModeConverter : JsonConverter<SegmentSortMode>
+internal sealed partial class SegmentSortModeConverter : System.Text.Json.Serialization.JsonConverter<SegmentSortMode>
 {
-	public override SegmentSortMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberMin = System.Text.Json.JsonEncodedText.Encode("min");
+	private static readonly System.Text.Json.JsonEncodedText MemberMin1 = System.Text.Json.JsonEncodedText.Encode("MIN");
+	private static readonly System.Text.Json.JsonEncodedText MemberMax = System.Text.Json.JsonEncodedText.Encode("max");
+	private static readonly System.Text.Json.JsonEncodedText MemberMax1 = System.Text.Json.JsonEncodedText.Encode("MAX");
+
+	public override SegmentSortMode Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberMin) || reader.ValueTextEquals(MemberMin1))
+		{
+			return SegmentSortMode.Min;
+		}
+
+		if (reader.ValueTextEquals(MemberMax) || reader.ValueTextEquals(MemberMax1))
 		{
-			case "min":
-			case "MIN":
-				return SegmentSortMode.Min;
-			case "max":
-			case "MAX":
-				return SegmentSortMode.Max;
+			return SegmentSortMode.Max;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(SegmentSortMode)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, SegmentSortMode value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SegmentSortMode value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case SegmentSortMode.Min:
-				writer.WriteStringValue("min");
-				return;
+				writer.WriteStringValue(MemberMin);
+				break;
 			case SegmentSortMode.Max:
-				writer.WriteStringValue("max");
-				return;
+				writer.WriteStringValue(MemberMax);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(SegmentSortMode)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -466,38 +531,42 @@ public enum SegmentSortOrder
 	Asc
 }
 
-internal sealed class SegmentSortOrderConverter : JsonConverter<SegmentSortOrder>
+internal sealed partial class SegmentSortOrderConverter : System.Text.Json.Serialization.JsonConverter<SegmentSortOrder>
 {
-	public override SegmentSortOrder Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberDesc = System.Text.Json.JsonEncodedText.Encode("desc");
+	private static readonly System.Text.Json.JsonEncodedText MemberDesc1 = System.Text.Json.JsonEncodedText.Encode("DESC");
+	private static readonly System.Text.Json.JsonEncodedText MemberAsc = System.Text.Json.JsonEncodedText.Encode("asc");
+	private static readonly System.Text.Json.JsonEncodedText MemberAsc1 = System.Text.Json.JsonEncodedText.Encode("ASC");
+
+	public override SegmentSortOrder Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberDesc) || reader.ValueTextEquals(MemberDesc1))
 		{
-			case "desc":
-			case "DESC":
-				return SegmentSortOrder.Desc;
-			case "asc":
-			case "ASC":
-				return SegmentSortOrder.Asc;
+			return SegmentSortOrder.Desc;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberAsc) || reader.ValueTextEquals(MemberAsc1))
+		{
+			return SegmentSortOrder.Asc;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(SegmentSortOrder)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, SegmentSortOrder value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SegmentSortOrder value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case SegmentSortOrder.Desc:
-				writer.WriteStringValue("desc");
-				return;
+				writer.WriteStringValue(MemberDesc);
+				break;
 			case SegmentSortOrder.Asc:
-				writer.WriteStringValue("asc");
-				return;
+				writer.WriteStringValue(MemberAsc);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(SegmentSortOrder)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -514,46 +583,58 @@ public enum ShardRoutingState
 	Initializing
 }
 
-internal sealed class ShardRoutingStateConverter : JsonConverter<ShardRoutingState>
+internal sealed partial class ShardRoutingStateConverter : System.Text.Json.Serialization.JsonConverter<ShardRoutingState>
 {
-	public override ShardRoutingState Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberUnassigned = System.Text.Json.JsonEncodedText.Encode("UNASSIGNED");
+	private static readonly System.Text.Json.JsonEncodedText MemberStarted = System.Text.Json.JsonEncodedText.Encode("STARTED");
+	private static readonly System.Text.Json.JsonEncodedText MemberRelocating = System.Text.Json.JsonEncodedText.Encode("RELOCATING");
+	private static readonly System.Text.Json.JsonEncodedText MemberInitializing = System.Text.Json.JsonEncodedText.Encode("INITIALIZING");
+
+	public override ShardRoutingState Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberUnassigned))
+		{
+			return ShardRoutingState.Unassigned;
+		}
+
+		if (reader.ValueTextEquals(MemberStarted))
+		{
+			return ShardRoutingState.Started;
+		}
+
+		if (reader.ValueTextEquals(MemberRelocating))
+		{
+			return ShardRoutingState.Relocating;
+		}
+
+		if (reader.ValueTextEquals(MemberInitializing))
 		{
-			case "UNASSIGNED":
-				return ShardRoutingState.Unassigned;
-			case "STARTED":
-				return ShardRoutingState.Started;
-			case "RELOCATING":
-				return ShardRoutingState.Relocating;
-			case "INITIALIZING":
-				return ShardRoutingState.Initializing;
+			return ShardRoutingState.Initializing;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(ShardRoutingState)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, ShardRoutingState value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ShardRoutingState value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case ShardRoutingState.Unassigned:
-				writer.WriteStringValue("UNASSIGNED");
-				return;
+				writer.WriteStringValue(MemberUnassigned);
+				break;
 			case ShardRoutingState.Started:
-				writer.WriteStringValue("STARTED");
-				return;
+				writer.WriteStringValue(MemberStarted);
+				break;
 			case ShardRoutingState.Relocating:
-				writer.WriteStringValue("RELOCATING");
-				return;
+				writer.WriteStringValue(MemberRelocating);
+				break;
 			case ShardRoutingState.Initializing:
-				writer.WriteStringValue("INITIALIZING");
-				return;
+				writer.WriteStringValue(MemberInitializing);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(ShardRoutingState)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -568,41 +649,49 @@ public enum ShardStoreAllocation
 	Primary
 }
 
-internal sealed class ShardStoreAllocationConverter : JsonConverter<ShardStoreAllocation>
+internal sealed partial class ShardStoreAllocationConverter : System.Text.Json.Serialization.JsonConverter<ShardStoreAllocation>
 {
-	public override ShardStoreAllocation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberUnused = System.Text.Json.JsonEncodedText.Encode("unused");
+	private static readonly System.Text.Json.JsonEncodedText MemberReplica = System.Text.Json.JsonEncodedText.Encode("replica");
+	private static readonly System.Text.Json.JsonEncodedText MemberPrimary = System.Text.Json.JsonEncodedText.Encode("primary");
+
+	public override ShardStoreAllocation Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberUnused))
+		{
+			return ShardStoreAllocation.Unused;
+		}
+
+		if (reader.ValueTextEquals(MemberReplica))
+		{
+			return ShardStoreAllocation.Replica;
+		}
+
+		if (reader.ValueTextEquals(MemberPrimary))
 		{
-			case "unused":
-				return ShardStoreAllocation.Unused;
-			case "replica":
-				return ShardStoreAllocation.Replica;
-			case "primary":
-				return ShardStoreAllocation.Primary;
+			return ShardStoreAllocation.Primary;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(ShardStoreAllocation)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, ShardStoreAllocation value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ShardStoreAllocation value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case ShardStoreAllocation.Unused:
-				writer.WriteStringValue("unused");
-				return;
+				writer.WriteStringValue(MemberUnused);
+				break;
 			case ShardStoreAllocation.Replica:
-				writer.WriteStringValue("replica");
-				return;
+				writer.WriteStringValue(MemberReplica);
+				break;
 			case ShardStoreAllocation.Primary:
-				writer.WriteStringValue("primary");
-				return;
+				writer.WriteStringValue(MemberPrimary);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(ShardStoreAllocation)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -639,46 +728,58 @@ public enum ShardStoreStatus
 	All
 }
 
-internal sealed class ShardStoreStatusConverter : JsonConverter<ShardStoreStatus>
+internal sealed partial class ShardStoreStatusConverter : System.Text.Json.Serialization.JsonConverter<ShardStoreStatus>
 {
-	public override ShardStoreStatus Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberYellow = System.Text.Json.JsonEncodedText.Encode("yellow");
+	private static readonly System.Text.Json.JsonEncodedText MemberRed = System.Text.Json.JsonEncodedText.Encode("red");
+	private static readonly System.Text.Json.JsonEncodedText MemberGreen = System.Text.Json.JsonEncodedText.Encode("green");
+	private static readonly System.Text.Json.JsonEncodedText MemberAll = System.Text.Json.JsonEncodedText.Encode("all");
+
+	public override ShardStoreStatus Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberYellow))
 		{
-			case "yellow":
-				return ShardStoreStatus.Yellow;
-			case "red":
-				return ShardStoreStatus.Red;
-			case "green":
-				return ShardStoreStatus.Green;
-			case "all":
-				return ShardStoreStatus.All;
+			return ShardStoreStatus.Yellow;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberRed))
+		{
+			return ShardStoreStatus.Red;
+		}
+
+		if (reader.ValueTextEquals(MemberGreen))
+		{
+			return ShardStoreStatus.Green;
+		}
+
+		if (reader.ValueTextEquals(MemberAll))
+		{
+			return ShardStoreStatus.All;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(ShardStoreStatus)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, ShardStoreStatus value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ShardStoreStatus value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case ShardStoreStatus.Yellow:
-				writer.WriteStringValue("yellow");
-				return;
+				writer.WriteStringValue(MemberYellow);
+				break;
 			case ShardStoreStatus.Red:
-				writer.WriteStringValue("red");
-				return;
+				writer.WriteStringValue(MemberRed);
+				break;
 			case ShardStoreStatus.Green:
-				writer.WriteStringValue("green");
-				return;
+				writer.WriteStringValue(MemberGreen);
+				break;
 			case ShardStoreStatus.All:
-				writer.WriteStringValue("all");
-				return;
+				writer.WriteStringValue(MemberAll);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(ShardStoreStatus)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -686,9 +787,11 @@ public override void Write(Utf8JsonWriter writer, ShardStoreStatus value, JsonSe
 public readonly partial struct StorageType : IEnumStruct<StorageType>
 {
 	public StorageType(string value) => Value = value;
-
+#if NET7_0_OR_GREATER
+	static StorageType IEnumStruct<StorageType>.Create(string value) => value;
+#else
 	StorageType IEnumStruct<StorageType>.Create(string value) => value;
-
+#endif
 	public readonly string Value { get; }
 
 	/// <summary>
@@ -761,37 +864,41 @@ public enum TranslogDurability
 	Async
 }
 
-internal sealed class TranslogDurabilityConverter : JsonConverter<TranslogDurability>
+internal sealed partial class TranslogDurabilityConverter : System.Text.Json.Serialization.JsonConverter<TranslogDurability>
 {
-	public override TranslogDurability Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberRequest = System.Text.Json.JsonEncodedText.Encode("request");
+	private static readonly System.Text.Json.JsonEncodedText MemberRequest1 = System.Text.Json.JsonEncodedText.Encode("REQUEST");
+	private static readonly System.Text.Json.JsonEncodedText MemberAsync = System.Text.Json.JsonEncodedText.Encode("async");
+	private static readonly System.Text.Json.JsonEncodedText MemberAsync1 = System.Text.Json.JsonEncodedText.Encode("ASYNC");
+
+	public override TranslogDurability Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberRequest) || reader.ValueTextEquals(MemberRequest1))
+		{
+			return TranslogDurability.Request;
+		}
+
+		if (reader.ValueTextEquals(MemberAsync) || reader.ValueTextEquals(MemberAsync1))
 		{
-			case "request":
-			case "REQUEST":
-				return TranslogDurability.Request;
-			case "async":
-			case "ASYNC":
-				return TranslogDurability.Async;
+			return TranslogDurability.Async;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(TranslogDurability)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, TranslogDurability value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, TranslogDurability value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case TranslogDurability.Request:
-				writer.WriteStringValue("request");
-				return;
+				writer.WriteStringValue(MemberRequest);
+				break;
 			case TranslogDurability.Async:
-				writer.WriteStringValue("async");
-				return;
+				writer.WriteStringValue(MemberAsync);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(TranslogDurability)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Inference.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Inference.g.cs
index ab0a177455b..d3e0b31282e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Inference.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Inference.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Core;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport;
 using System;
@@ -41,45 +42,57 @@ public enum TaskType
 	Completion
 }
 
-internal sealed class TaskTypeConverter : JsonConverter<TaskType>
+internal sealed partial class TaskTypeConverter : System.Text.Json.Serialization.JsonConverter<TaskType>
 {
-	public override TaskType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberTextEmbedding = System.Text.Json.JsonEncodedText.Encode("text_embedding");
+	private static readonly System.Text.Json.JsonEncodedText MemberSparseEmbedding = System.Text.Json.JsonEncodedText.Encode("sparse_embedding");
+	private static readonly System.Text.Json.JsonEncodedText MemberRerank = System.Text.Json.JsonEncodedText.Encode("rerank");
+	private static readonly System.Text.Json.JsonEncodedText MemberCompletion = System.Text.Json.JsonEncodedText.Encode("completion");
+
+	public override TaskType Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberTextEmbedding))
+		{
+			return TaskType.TextEmbedding;
+		}
+
+		if (reader.ValueTextEquals(MemberSparseEmbedding))
 		{
-			case "text_embedding":
-				return TaskType.TextEmbedding;
-			case "sparse_embedding":
-				return TaskType.SparseEmbedding;
-			case "rerank":
-				return TaskType.Rerank;
-			case "completion":
-				return TaskType.Completion;
+			return TaskType.SparseEmbedding;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberRerank))
+		{
+			return TaskType.Rerank;
+		}
+
+		if (reader.ValueTextEquals(MemberCompletion))
+		{
+			return TaskType.Completion;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(TaskType)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, TaskType value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, TaskType value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case TaskType.TextEmbedding:
-				writer.WriteStringValue("text_embedding");
-				return;
+				writer.WriteStringValue(MemberTextEmbedding);
+				break;
 			case TaskType.SparseEmbedding:
-				writer.WriteStringValue("sparse_embedding");
-				return;
+				writer.WriteStringValue(MemberSparseEmbedding);
+				break;
 			case TaskType.Rerank:
-				writer.WriteStringValue("rerank");
-				return;
+				writer.WriteStringValue(MemberRerank);
+				break;
 			case TaskType.Completion:
-				writer.WriteStringValue("completion");
-				return;
+				writer.WriteStringValue(MemberCompletion);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(TaskType)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
\ No newline at end of file
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 6e2a0890436..490f7326a63 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
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Core;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport;
 using System;
@@ -49,66 +50,94 @@ public enum ConvertType
 	Auto
 }
 
-internal sealed class ConvertTypeConverter : JsonConverter<ConvertType>
+internal sealed partial class ConvertTypeConverter : System.Text.Json.Serialization.JsonConverter<ConvertType>
 {
-	public override ConvertType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberString = System.Text.Json.JsonEncodedText.Encode("string");
+	private static readonly System.Text.Json.JsonEncodedText MemberLong = System.Text.Json.JsonEncodedText.Encode("long");
+	private static readonly System.Text.Json.JsonEncodedText MemberIp = System.Text.Json.JsonEncodedText.Encode("ip");
+	private static readonly System.Text.Json.JsonEncodedText MemberInteger = System.Text.Json.JsonEncodedText.Encode("integer");
+	private static readonly System.Text.Json.JsonEncodedText MemberFloat = System.Text.Json.JsonEncodedText.Encode("float");
+	private static readonly System.Text.Json.JsonEncodedText MemberDouble = System.Text.Json.JsonEncodedText.Encode("double");
+	private static readonly System.Text.Json.JsonEncodedText MemberBoolean = System.Text.Json.JsonEncodedText.Encode("boolean");
+	private static readonly System.Text.Json.JsonEncodedText MemberAuto = System.Text.Json.JsonEncodedText.Encode("auto");
+
+	public override ConvertType Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "string":
-				return ConvertType.String;
-			case "long":
-				return ConvertType.Long;
-			case "ip":
-				return ConvertType.Ip;
-			case "integer":
-				return ConvertType.Integer;
-			case "float":
-				return ConvertType.Float;
-			case "double":
-				return ConvertType.Double;
-			case "boolean":
-				return ConvertType.Boolean;
-			case "auto":
-				return ConvertType.Auto;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberString))
+		{
+			return ConvertType.String;
+		}
+
+		if (reader.ValueTextEquals(MemberLong))
+		{
+			return ConvertType.Long;
+		}
+
+		if (reader.ValueTextEquals(MemberIp))
+		{
+			return ConvertType.Ip;
+		}
+
+		if (reader.ValueTextEquals(MemberInteger))
+		{
+			return ConvertType.Integer;
+		}
+
+		if (reader.ValueTextEquals(MemberFloat))
+		{
+			return ConvertType.Float;
+		}
+
+		if (reader.ValueTextEquals(MemberDouble))
+		{
+			return ConvertType.Double;
+		}
+
+		if (reader.ValueTextEquals(MemberBoolean))
+		{
+			return ConvertType.Boolean;
+		}
+
+		if (reader.ValueTextEquals(MemberAuto))
+		{
+			return ConvertType.Auto;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(ConvertType)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, ConvertType value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ConvertType value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case ConvertType.String:
-				writer.WriteStringValue("string");
-				return;
+				writer.WriteStringValue(MemberString);
+				break;
 			case ConvertType.Long:
-				writer.WriteStringValue("long");
-				return;
+				writer.WriteStringValue(MemberLong);
+				break;
 			case ConvertType.Ip:
-				writer.WriteStringValue("ip");
-				return;
+				writer.WriteStringValue(MemberIp);
+				break;
 			case ConvertType.Integer:
-				writer.WriteStringValue("integer");
-				return;
+				writer.WriteStringValue(MemberInteger);
+				break;
 			case ConvertType.Float:
-				writer.WriteStringValue("float");
-				return;
+				writer.WriteStringValue(MemberFloat);
+				break;
 			case ConvertType.Double:
-				writer.WriteStringValue("double");
-				return;
+				writer.WriteStringValue(MemberDouble);
+				break;
 			case ConvertType.Boolean:
-				writer.WriteStringValue("boolean");
-				return;
+				writer.WriteStringValue(MemberBoolean);
+				break;
 			case ConvertType.Auto:
-				writer.WriteStringValue("auto");
-				return;
+				writer.WriteStringValue(MemberAuto);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(ConvertType)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -127,51 +156,67 @@ public enum FingerprintDigest
 	Md5
 }
 
-internal sealed class FingerprintDigestConverter : JsonConverter<FingerprintDigest>
+internal sealed partial class FingerprintDigestConverter : System.Text.Json.Serialization.JsonConverter<FingerprintDigest>
 {
-	public override FingerprintDigest Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberSha512 = System.Text.Json.JsonEncodedText.Encode("SHA-512");
+	private static readonly System.Text.Json.JsonEncodedText MemberSha256 = System.Text.Json.JsonEncodedText.Encode("SHA-256");
+	private static readonly System.Text.Json.JsonEncodedText MemberSha1 = System.Text.Json.JsonEncodedText.Encode("SHA-1");
+	private static readonly System.Text.Json.JsonEncodedText MemberMurmurhash3 = System.Text.Json.JsonEncodedText.Encode("MurmurHash3");
+	private static readonly System.Text.Json.JsonEncodedText MemberMd5 = System.Text.Json.JsonEncodedText.Encode("MD5");
+
+	public override FingerprintDigest Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "SHA-512":
-				return FingerprintDigest.Sha512;
-			case "SHA-256":
-				return FingerprintDigest.Sha256;
-			case "SHA-1":
-				return FingerprintDigest.Sha1;
-			case "MurmurHash3":
-				return FingerprintDigest.Murmurhash3;
-			case "MD5":
-				return FingerprintDigest.Md5;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberSha512))
+		{
+			return FingerprintDigest.Sha512;
+		}
+
+		if (reader.ValueTextEquals(MemberSha256))
+		{
+			return FingerprintDigest.Sha256;
+		}
+
+		if (reader.ValueTextEquals(MemberSha1))
+		{
+			return FingerprintDigest.Sha1;
+		}
+
+		if (reader.ValueTextEquals(MemberMurmurhash3))
+		{
+			return FingerprintDigest.Murmurhash3;
+		}
+
+		if (reader.ValueTextEquals(MemberMd5))
+		{
+			return FingerprintDigest.Md5;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(FingerprintDigest)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, FingerprintDigest value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, FingerprintDigest value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case FingerprintDigest.Sha512:
-				writer.WriteStringValue("SHA-512");
-				return;
+				writer.WriteStringValue(MemberSha512);
+				break;
 			case FingerprintDigest.Sha256:
-				writer.WriteStringValue("SHA-256");
-				return;
+				writer.WriteStringValue(MemberSha256);
+				break;
 			case FingerprintDigest.Sha1:
-				writer.WriteStringValue("SHA-1");
-				return;
+				writer.WriteStringValue(MemberSha1);
+				break;
 			case FingerprintDigest.Murmurhash3:
-				writer.WriteStringValue("MurmurHash3");
-				return;
+				writer.WriteStringValue(MemberMurmurhash3);
+				break;
 			case FingerprintDigest.Md5:
-				writer.WriteStringValue("MD5");
-				return;
+				writer.WriteStringValue(MemberMd5);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(FingerprintDigest)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -184,36 +229,40 @@ public enum GeoGridTargetFormat
 	Geojson
 }
 
-internal sealed class GeoGridTargetFormatConverter : JsonConverter<GeoGridTargetFormat>
+internal sealed partial class GeoGridTargetFormatConverter : System.Text.Json.Serialization.JsonConverter<GeoGridTargetFormat>
 {
-	public override GeoGridTargetFormat Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberWkt = System.Text.Json.JsonEncodedText.Encode("wkt");
+	private static readonly System.Text.Json.JsonEncodedText MemberGeojson = System.Text.Json.JsonEncodedText.Encode("geojson");
+
+	public override GeoGridTargetFormat Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberWkt))
+		{
+			return GeoGridTargetFormat.Wkt;
+		}
+
+		if (reader.ValueTextEquals(MemberGeojson))
 		{
-			case "wkt":
-				return GeoGridTargetFormat.Wkt;
-			case "geojson":
-				return GeoGridTargetFormat.Geojson;
+			return GeoGridTargetFormat.Geojson;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(GeoGridTargetFormat)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, GeoGridTargetFormat value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GeoGridTargetFormat value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case GeoGridTargetFormat.Wkt:
-				writer.WriteStringValue("wkt");
-				return;
+				writer.WriteStringValue(MemberWkt);
+				break;
 			case GeoGridTargetFormat.Geojson:
-				writer.WriteStringValue("geojson");
-				return;
+				writer.WriteStringValue(MemberGeojson);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(GeoGridTargetFormat)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -228,41 +277,49 @@ public enum GeoGridTileType
 	Geohash
 }
 
-internal sealed class GeoGridTileTypeConverter : JsonConverter<GeoGridTileType>
+internal sealed partial class GeoGridTileTypeConverter : System.Text.Json.Serialization.JsonConverter<GeoGridTileType>
 {
-	public override GeoGridTileType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberGeotile = System.Text.Json.JsonEncodedText.Encode("geotile");
+	private static readonly System.Text.Json.JsonEncodedText MemberGeohex = System.Text.Json.JsonEncodedText.Encode("geohex");
+	private static readonly System.Text.Json.JsonEncodedText MemberGeohash = System.Text.Json.JsonEncodedText.Encode("geohash");
+
+	public override GeoGridTileType Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberGeotile))
 		{
-			case "geotile":
-				return GeoGridTileType.Geotile;
-			case "geohex":
-				return GeoGridTileType.Geohex;
-			case "geohash":
-				return GeoGridTileType.Geohash;
+			return GeoGridTileType.Geotile;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberGeohex))
+		{
+			return GeoGridTileType.Geohex;
+		}
+
+		if (reader.ValueTextEquals(MemberGeohash))
+		{
+			return GeoGridTileType.Geohash;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(GeoGridTileType)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, GeoGridTileType value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GeoGridTileType value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case GeoGridTileType.Geotile:
-				writer.WriteStringValue("geotile");
-				return;
+				writer.WriteStringValue(MemberGeotile);
+				break;
 			case GeoGridTileType.Geohex:
-				writer.WriteStringValue("geohex");
-				return;
+				writer.WriteStringValue(MemberGeohex);
+				break;
 			case GeoGridTileType.Geohash:
-				writer.WriteStringValue("geohash");
-				return;
+				writer.WriteStringValue(MemberGeohash);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(GeoGridTileType)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -285,36 +342,40 @@ public enum JsonProcessorConflictStrategy
 	Merge
 }
 
-internal sealed class JsonProcessorConflictStrategyConverter : JsonConverter<JsonProcessorConflictStrategy>
+internal sealed partial class JsonProcessorConflictStrategyConverter : System.Text.Json.Serialization.JsonConverter<JsonProcessorConflictStrategy>
 {
-	public override JsonProcessorConflictStrategy Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberReplace = System.Text.Json.JsonEncodedText.Encode("replace");
+	private static readonly System.Text.Json.JsonEncodedText MemberMerge = System.Text.Json.JsonEncodedText.Encode("merge");
+
+	public override JsonProcessorConflictStrategy Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberReplace))
+		{
+			return JsonProcessorConflictStrategy.Replace;
+		}
+
+		if (reader.ValueTextEquals(MemberMerge))
 		{
-			case "replace":
-				return JsonProcessorConflictStrategy.Replace;
-			case "merge":
-				return JsonProcessorConflictStrategy.Merge;
+			return JsonProcessorConflictStrategy.Merge;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(JsonProcessorConflictStrategy)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, JsonProcessorConflictStrategy value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, JsonProcessorConflictStrategy value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case JsonProcessorConflictStrategy.Replace:
-				writer.WriteStringValue("replace");
-				return;
+				writer.WriteStringValue(MemberReplace);
+				break;
 			case JsonProcessorConflictStrategy.Merge:
-				writer.WriteStringValue("merge");
-				return;
+				writer.WriteStringValue(MemberMerge);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(JsonProcessorConflictStrategy)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -327,36 +388,40 @@ public enum ShapeType
 	GeoShape
 }
 
-internal sealed class ShapeTypeConverter : JsonConverter<ShapeType>
+internal sealed partial class ShapeTypeConverter : System.Text.Json.Serialization.JsonConverter<ShapeType>
 {
-	public override ShapeType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberShape = System.Text.Json.JsonEncodedText.Encode("shape");
+	private static readonly System.Text.Json.JsonEncodedText MemberGeoShape = System.Text.Json.JsonEncodedText.Encode("geo_shape");
+
+	public override ShapeType Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberShape))
 		{
-			case "shape":
-				return ShapeType.Shape;
-			case "geo_shape":
-				return ShapeType.GeoShape;
+			return ShapeType.Shape;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberGeoShape))
+		{
+			return ShapeType.GeoShape;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(ShapeType)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, ShapeType value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ShapeType value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case ShapeType.Shape:
-				writer.WriteStringValue("shape");
-				return;
+				writer.WriteStringValue(MemberShape);
+				break;
 			case ShapeType.GeoShape:
-				writer.WriteStringValue("geo_shape");
-				return;
+				writer.WriteStringValue(MemberGeoShape);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(ShapeType)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -375,50 +440,66 @@ public enum UserAgentProperty
 	Device
 }
 
-internal sealed class UserAgentPropertyConverter : JsonConverter<UserAgentProperty>
+internal sealed partial class UserAgentPropertyConverter : System.Text.Json.Serialization.JsonConverter<UserAgentProperty>
 {
-	public override UserAgentProperty Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberVersion = System.Text.Json.JsonEncodedText.Encode("version");
+	private static readonly System.Text.Json.JsonEncodedText MemberOs = System.Text.Json.JsonEncodedText.Encode("os");
+	private static readonly System.Text.Json.JsonEncodedText MemberOriginal = System.Text.Json.JsonEncodedText.Encode("original");
+	private static readonly System.Text.Json.JsonEncodedText MemberName = System.Text.Json.JsonEncodedText.Encode("name");
+	private static readonly System.Text.Json.JsonEncodedText MemberDevice = System.Text.Json.JsonEncodedText.Encode("device");
+
+	public override UserAgentProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "version":
-				return UserAgentProperty.Version;
-			case "os":
-				return UserAgentProperty.Os;
-			case "original":
-				return UserAgentProperty.Original;
-			case "name":
-				return UserAgentProperty.Name;
-			case "device":
-				return UserAgentProperty.Device;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberVersion))
+		{
+			return UserAgentProperty.Version;
+		}
+
+		if (reader.ValueTextEquals(MemberOs))
+		{
+			return UserAgentProperty.Os;
+		}
+
+		if (reader.ValueTextEquals(MemberOriginal))
+		{
+			return UserAgentProperty.Original;
+		}
+
+		if (reader.ValueTextEquals(MemberName))
+		{
+			return UserAgentProperty.Name;
+		}
+
+		if (reader.ValueTextEquals(MemberDevice))
+		{
+			return UserAgentProperty.Device;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(UserAgentProperty)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, UserAgentProperty value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, UserAgentProperty value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case UserAgentProperty.Version:
-				writer.WriteStringValue("version");
-				return;
+				writer.WriteStringValue(MemberVersion);
+				break;
 			case UserAgentProperty.Os:
-				writer.WriteStringValue("os");
-				return;
+				writer.WriteStringValue(MemberOs);
+				break;
 			case UserAgentProperty.Original:
-				writer.WriteStringValue("original");
-				return;
+				writer.WriteStringValue(MemberOriginal);
+				break;
 			case UserAgentProperty.Name:
-				writer.WriteStringValue("name");
-				return;
+				writer.WriteStringValue(MemberName);
+				break;
 			case UserAgentProperty.Device:
-				writer.WriteStringValue("device");
-				return;
+				writer.WriteStringValue(MemberDevice);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(UserAgentProperty)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.LicenseManagement.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.LicenseManagement.g.cs
index 00f97d8b1e7..93de3fa945b 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.LicenseManagement.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.LicenseManagement.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Core;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport;
 using System;
@@ -41,46 +42,58 @@ public enum LicenseStatus
 	Active
 }
 
-internal sealed class LicenseStatusConverter : JsonConverter<LicenseStatus>
+internal sealed partial class LicenseStatusConverter : System.Text.Json.Serialization.JsonConverter<LicenseStatus>
 {
-	public override LicenseStatus Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberValid = System.Text.Json.JsonEncodedText.Encode("valid");
+	private static readonly System.Text.Json.JsonEncodedText MemberInvalid = System.Text.Json.JsonEncodedText.Encode("invalid");
+	private static readonly System.Text.Json.JsonEncodedText MemberExpired = System.Text.Json.JsonEncodedText.Encode("expired");
+	private static readonly System.Text.Json.JsonEncodedText MemberActive = System.Text.Json.JsonEncodedText.Encode("active");
+
+	public override LicenseStatus Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberValid))
+		{
+			return LicenseStatus.Valid;
+		}
+
+		if (reader.ValueTextEquals(MemberInvalid))
+		{
+			return LicenseStatus.Invalid;
+		}
+
+		if (reader.ValueTextEquals(MemberExpired))
+		{
+			return LicenseStatus.Expired;
+		}
+
+		if (reader.ValueTextEquals(MemberActive))
 		{
-			case "valid":
-				return LicenseStatus.Valid;
-			case "invalid":
-				return LicenseStatus.Invalid;
-			case "expired":
-				return LicenseStatus.Expired;
-			case "active":
-				return LicenseStatus.Active;
+			return LicenseStatus.Active;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(LicenseStatus)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, LicenseStatus value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, LicenseStatus value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case LicenseStatus.Valid:
-				writer.WriteStringValue("valid");
-				return;
+				writer.WriteStringValue(MemberValid);
+				break;
 			case LicenseStatus.Invalid:
-				writer.WriteStringValue("invalid");
-				return;
+				writer.WriteStringValue(MemberInvalid);
+				break;
 			case LicenseStatus.Expired:
-				writer.WriteStringValue("expired");
-				return;
+				writer.WriteStringValue(MemberExpired);
+				break;
 			case LicenseStatus.Active:
-				writer.WriteStringValue("active");
-				return;
+				writer.WriteStringValue(MemberActive);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(LicenseStatus)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -107,70 +120,102 @@ public enum LicenseType
 	Basic
 }
 
-internal sealed class LicenseTypeConverter : JsonConverter<LicenseType>
+internal sealed partial class LicenseTypeConverter : System.Text.Json.Serialization.JsonConverter<LicenseType>
 {
-	public override LicenseType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberTrial = System.Text.Json.JsonEncodedText.Encode("trial");
+	private static readonly System.Text.Json.JsonEncodedText MemberStandard = System.Text.Json.JsonEncodedText.Encode("standard");
+	private static readonly System.Text.Json.JsonEncodedText MemberSilver = System.Text.Json.JsonEncodedText.Encode("silver");
+	private static readonly System.Text.Json.JsonEncodedText MemberPlatinum = System.Text.Json.JsonEncodedText.Encode("platinum");
+	private static readonly System.Text.Json.JsonEncodedText MemberMissing = System.Text.Json.JsonEncodedText.Encode("missing");
+	private static readonly System.Text.Json.JsonEncodedText MemberGold = System.Text.Json.JsonEncodedText.Encode("gold");
+	private static readonly System.Text.Json.JsonEncodedText MemberEnterprise = System.Text.Json.JsonEncodedText.Encode("enterprise");
+	private static readonly System.Text.Json.JsonEncodedText MemberDev = System.Text.Json.JsonEncodedText.Encode("dev");
+	private static readonly System.Text.Json.JsonEncodedText MemberBasic = System.Text.Json.JsonEncodedText.Encode("basic");
+
+	public override LicenseType Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberTrial))
+		{
+			return LicenseType.Trial;
+		}
+
+		if (reader.ValueTextEquals(MemberStandard))
 		{
-			case "trial":
-				return LicenseType.Trial;
-			case "standard":
-				return LicenseType.Standard;
-			case "silver":
-				return LicenseType.Silver;
-			case "platinum":
-				return LicenseType.Platinum;
-			case "missing":
-				return LicenseType.Missing;
-			case "gold":
-				return LicenseType.Gold;
-			case "enterprise":
-				return LicenseType.Enterprise;
-			case "dev":
-				return LicenseType.Dev;
-			case "basic":
-				return LicenseType.Basic;
+			return LicenseType.Standard;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberSilver))
+		{
+			return LicenseType.Silver;
+		}
+
+		if (reader.ValueTextEquals(MemberPlatinum))
+		{
+			return LicenseType.Platinum;
+		}
+
+		if (reader.ValueTextEquals(MemberMissing))
+		{
+			return LicenseType.Missing;
+		}
+
+		if (reader.ValueTextEquals(MemberGold))
+		{
+			return LicenseType.Gold;
+		}
+
+		if (reader.ValueTextEquals(MemberEnterprise))
+		{
+			return LicenseType.Enterprise;
+		}
+
+		if (reader.ValueTextEquals(MemberDev))
+		{
+			return LicenseType.Dev;
+		}
+
+		if (reader.ValueTextEquals(MemberBasic))
+		{
+			return LicenseType.Basic;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(LicenseType)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, LicenseType value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, LicenseType value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case LicenseType.Trial:
-				writer.WriteStringValue("trial");
-				return;
+				writer.WriteStringValue(MemberTrial);
+				break;
 			case LicenseType.Standard:
-				writer.WriteStringValue("standard");
-				return;
+				writer.WriteStringValue(MemberStandard);
+				break;
 			case LicenseType.Silver:
-				writer.WriteStringValue("silver");
-				return;
+				writer.WriteStringValue(MemberSilver);
+				break;
 			case LicenseType.Platinum:
-				writer.WriteStringValue("platinum");
-				return;
+				writer.WriteStringValue(MemberPlatinum);
+				break;
 			case LicenseType.Missing:
-				writer.WriteStringValue("missing");
-				return;
+				writer.WriteStringValue(MemberMissing);
+				break;
 			case LicenseType.Gold:
-				writer.WriteStringValue("gold");
-				return;
+				writer.WriteStringValue(MemberGold);
+				break;
 			case LicenseType.Enterprise:
-				writer.WriteStringValue("enterprise");
-				return;
+				writer.WriteStringValue(MemberEnterprise);
+				break;
 			case LicenseType.Dev:
-				writer.WriteStringValue("dev");
-				return;
+				writer.WriteStringValue(MemberDev);
+				break;
 			case LicenseType.Basic:
-				writer.WriteStringValue("basic");
-				return;
+				writer.WriteStringValue(MemberBasic);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(LicenseType)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.MachineLearning.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.MachineLearning.g.cs
index a9f89e68101..0f88b461ee2 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.MachineLearning.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.MachineLearning.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Core;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport;
 using System;
@@ -41,46 +42,58 @@ public enum AppliesTo
 	Actual
 }
 
-internal sealed class AppliesToConverter : JsonConverter<AppliesTo>
+internal sealed partial class AppliesToConverter : System.Text.Json.Serialization.JsonConverter<AppliesTo>
 {
-	public override AppliesTo Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberTypical = System.Text.Json.JsonEncodedText.Encode("typical");
+	private static readonly System.Text.Json.JsonEncodedText MemberTime = System.Text.Json.JsonEncodedText.Encode("time");
+	private static readonly System.Text.Json.JsonEncodedText MemberDiffFromTypical = System.Text.Json.JsonEncodedText.Encode("diff_from_typical");
+	private static readonly System.Text.Json.JsonEncodedText MemberActual = System.Text.Json.JsonEncodedText.Encode("actual");
+
+	public override AppliesTo Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberTypical))
+		{
+			return AppliesTo.Typical;
+		}
+
+		if (reader.ValueTextEquals(MemberTime))
+		{
+			return AppliesTo.Time;
+		}
+
+		if (reader.ValueTextEquals(MemberDiffFromTypical))
 		{
-			case "typical":
-				return AppliesTo.Typical;
-			case "time":
-				return AppliesTo.Time;
-			case "diff_from_typical":
-				return AppliesTo.DiffFromTypical;
-			case "actual":
-				return AppliesTo.Actual;
+			return AppliesTo.DiffFromTypical;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberActual))
+		{
+			return AppliesTo.Actual;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(AppliesTo)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, AppliesTo value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, AppliesTo value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case AppliesTo.Typical:
-				writer.WriteStringValue("typical");
-				return;
+				writer.WriteStringValue(MemberTypical);
+				break;
 			case AppliesTo.Time:
-				writer.WriteStringValue("time");
-				return;
+				writer.WriteStringValue(MemberTime);
+				break;
 			case AppliesTo.DiffFromTypical:
-				writer.WriteStringValue("diff_from_typical");
-				return;
+				writer.WriteStringValue(MemberDiffFromTypical);
+				break;
 			case AppliesTo.Actual:
-				writer.WriteStringValue("actual");
-				return;
+				writer.WriteStringValue(MemberActual);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(AppliesTo)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -93,36 +106,40 @@ public enum CategorizationStatus
 	Ok
 }
 
-internal sealed class CategorizationStatusConverter : JsonConverter<CategorizationStatus>
+internal sealed partial class CategorizationStatusConverter : System.Text.Json.Serialization.JsonConverter<CategorizationStatus>
 {
-	public override CategorizationStatus Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberWarn = System.Text.Json.JsonEncodedText.Encode("warn");
+	private static readonly System.Text.Json.JsonEncodedText MemberOk = System.Text.Json.JsonEncodedText.Encode("ok");
+
+	public override CategorizationStatus Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberWarn))
+		{
+			return CategorizationStatus.Warn;
+		}
+
+		if (reader.ValueTextEquals(MemberOk))
 		{
-			case "warn":
-				return CategorizationStatus.Warn;
-			case "ok":
-				return CategorizationStatus.Ok;
+			return CategorizationStatus.Ok;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(CategorizationStatus)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, CategorizationStatus value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, CategorizationStatus value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case CategorizationStatus.Warn:
-				writer.WriteStringValue("warn");
-				return;
+				writer.WriteStringValue(MemberWarn);
+				break;
 			case CategorizationStatus.Ok:
-				writer.WriteStringValue("ok");
-				return;
+				writer.WriteStringValue(MemberOk);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(CategorizationStatus)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -137,41 +154,49 @@ public enum ChunkingMode
 	Auto
 }
 
-internal sealed class ChunkingModeConverter : JsonConverter<ChunkingMode>
+internal sealed partial class ChunkingModeConverter : System.Text.Json.Serialization.JsonConverter<ChunkingMode>
 {
-	public override ChunkingMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberOff = System.Text.Json.JsonEncodedText.Encode("off");
+	private static readonly System.Text.Json.JsonEncodedText MemberManual = System.Text.Json.JsonEncodedText.Encode("manual");
+	private static readonly System.Text.Json.JsonEncodedText MemberAuto = System.Text.Json.JsonEncodedText.Encode("auto");
+
+	public override ChunkingMode Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberOff))
+		{
+			return ChunkingMode.Off;
+		}
+
+		if (reader.ValueTextEquals(MemberManual))
 		{
-			case "off":
-				return ChunkingMode.Off;
-			case "manual":
-				return ChunkingMode.Manual;
-			case "auto":
-				return ChunkingMode.Auto;
+			return ChunkingMode.Manual;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberAuto))
+		{
+			return ChunkingMode.Auto;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(ChunkingMode)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, ChunkingMode value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ChunkingMode value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case ChunkingMode.Off:
-				writer.WriteStringValue("off");
-				return;
+				writer.WriteStringValue(MemberOff);
+				break;
 			case ChunkingMode.Manual:
-				writer.WriteStringValue("manual");
-				return;
+				writer.WriteStringValue(MemberManual);
+				break;
 			case ChunkingMode.Auto:
-				writer.WriteStringValue("auto");
-				return;
+				writer.WriteStringValue(MemberAuto);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(ChunkingMode)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -188,46 +213,58 @@ public enum ConditionOperator
 	Gt
 }
 
-internal sealed class ConditionOperatorConverter : JsonConverter<ConditionOperator>
+internal sealed partial class ConditionOperatorConverter : System.Text.Json.Serialization.JsonConverter<ConditionOperator>
 {
-	public override ConditionOperator Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberLte = System.Text.Json.JsonEncodedText.Encode("lte");
+	private static readonly System.Text.Json.JsonEncodedText MemberLt = System.Text.Json.JsonEncodedText.Encode("lt");
+	private static readonly System.Text.Json.JsonEncodedText MemberGte = System.Text.Json.JsonEncodedText.Encode("gte");
+	private static readonly System.Text.Json.JsonEncodedText MemberGt = System.Text.Json.JsonEncodedText.Encode("gt");
+
+	public override ConditionOperator Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberLte))
 		{
-			case "lte":
-				return ConditionOperator.Lte;
-			case "lt":
-				return ConditionOperator.Lt;
-			case "gte":
-				return ConditionOperator.Gte;
-			case "gt":
-				return ConditionOperator.Gt;
+			return ConditionOperator.Lte;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberLt))
+		{
+			return ConditionOperator.Lt;
+		}
+
+		if (reader.ValueTextEquals(MemberGte))
+		{
+			return ConditionOperator.Gte;
+		}
+
+		if (reader.ValueTextEquals(MemberGt))
+		{
+			return ConditionOperator.Gt;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(ConditionOperator)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, ConditionOperator value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ConditionOperator value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case ConditionOperator.Lte:
-				writer.WriteStringValue("lte");
-				return;
+				writer.WriteStringValue(MemberLte);
+				break;
 			case ConditionOperator.Lt:
-				writer.WriteStringValue("lt");
-				return;
+				writer.WriteStringValue(MemberLt);
+				break;
 			case ConditionOperator.Gte:
-				writer.WriteStringValue("gte");
-				return;
+				writer.WriteStringValue(MemberGte);
+				break;
 			case ConditionOperator.Gt:
-				writer.WriteStringValue("gt");
-				return;
+				writer.WriteStringValue(MemberGt);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(ConditionOperator)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -244,46 +281,58 @@ public enum DatafeedState
 	Started
 }
 
-internal sealed class DatafeedStateConverter : JsonConverter<DatafeedState>
+internal sealed partial class DatafeedStateConverter : System.Text.Json.Serialization.JsonConverter<DatafeedState>
 {
-	public override DatafeedState Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberStopping = System.Text.Json.JsonEncodedText.Encode("stopping");
+	private static readonly System.Text.Json.JsonEncodedText MemberStopped = System.Text.Json.JsonEncodedText.Encode("stopped");
+	private static readonly System.Text.Json.JsonEncodedText MemberStarting = System.Text.Json.JsonEncodedText.Encode("starting");
+	private static readonly System.Text.Json.JsonEncodedText MemberStarted = System.Text.Json.JsonEncodedText.Encode("started");
+
+	public override DatafeedState Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberStopping))
+		{
+			return DatafeedState.Stopping;
+		}
+
+		if (reader.ValueTextEquals(MemberStopped))
 		{
-			case "stopping":
-				return DatafeedState.Stopping;
-			case "stopped":
-				return DatafeedState.Stopped;
-			case "starting":
-				return DatafeedState.Starting;
-			case "started":
-				return DatafeedState.Started;
+			return DatafeedState.Stopped;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberStarting))
+		{
+			return DatafeedState.Starting;
+		}
+
+		if (reader.ValueTextEquals(MemberStarted))
+		{
+			return DatafeedState.Started;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(DatafeedState)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, DatafeedState value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DatafeedState value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case DatafeedState.Stopping:
-				writer.WriteStringValue("stopping");
-				return;
+				writer.WriteStringValue(MemberStopping);
+				break;
 			case DatafeedState.Stopped:
-				writer.WriteStringValue("stopped");
-				return;
+				writer.WriteStringValue(MemberStopped);
+				break;
 			case DatafeedState.Starting:
-				writer.WriteStringValue("starting");
-				return;
+				writer.WriteStringValue(MemberStarting);
+				break;
 			case DatafeedState.Started:
-				writer.WriteStringValue("started");
-				return;
+				writer.WriteStringValue(MemberStarted);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(DatafeedState)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -302,51 +351,67 @@ public enum DataframeState
 	Failed
 }
 
-internal sealed class DataframeStateConverter : JsonConverter<DataframeState>
+internal sealed partial class DataframeStateConverter : System.Text.Json.Serialization.JsonConverter<DataframeState>
 {
-	public override DataframeState Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberStopping = System.Text.Json.JsonEncodedText.Encode("stopping");
+	private static readonly System.Text.Json.JsonEncodedText MemberStopped = System.Text.Json.JsonEncodedText.Encode("stopped");
+	private static readonly System.Text.Json.JsonEncodedText MemberStarting = System.Text.Json.JsonEncodedText.Encode("starting");
+	private static readonly System.Text.Json.JsonEncodedText MemberStarted = System.Text.Json.JsonEncodedText.Encode("started");
+	private static readonly System.Text.Json.JsonEncodedText MemberFailed = System.Text.Json.JsonEncodedText.Encode("failed");
+
+	public override DataframeState Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "stopping":
-				return DataframeState.Stopping;
-			case "stopped":
-				return DataframeState.Stopped;
-			case "starting":
-				return DataframeState.Starting;
-			case "started":
-				return DataframeState.Started;
-			case "failed":
-				return DataframeState.Failed;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberStopping))
+		{
+			return DataframeState.Stopping;
+		}
+
+		if (reader.ValueTextEquals(MemberStopped))
+		{
+			return DataframeState.Stopped;
+		}
+
+		if (reader.ValueTextEquals(MemberStarting))
+		{
+			return DataframeState.Starting;
+		}
+
+		if (reader.ValueTextEquals(MemberStarted))
+		{
+			return DataframeState.Started;
+		}
+
+		if (reader.ValueTextEquals(MemberFailed))
+		{
+			return DataframeState.Failed;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(DataframeState)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, DataframeState value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DataframeState value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case DataframeState.Stopping:
-				writer.WriteStringValue("stopping");
-				return;
+				writer.WriteStringValue(MemberStopping);
+				break;
 			case DataframeState.Stopped:
-				writer.WriteStringValue("stopped");
-				return;
+				writer.WriteStringValue(MemberStopped);
+				break;
 			case DataframeState.Starting:
-				writer.WriteStringValue("starting");
-				return;
+				writer.WriteStringValue(MemberStarting);
+				break;
 			case DataframeState.Started:
-				writer.WriteStringValue("started");
-				return;
+				writer.WriteStringValue(MemberStarted);
+				break;
 			case DataframeState.Failed:
-				writer.WriteStringValue("failed");
-				return;
+				writer.WriteStringValue(MemberFailed);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(DataframeState)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -376,41 +441,49 @@ public enum DeploymentAllocationState
 	FullyAllocated
 }
 
-internal sealed class DeploymentAllocationStateConverter : JsonConverter<DeploymentAllocationState>
+internal sealed partial class DeploymentAllocationStateConverter : System.Text.Json.Serialization.JsonConverter<DeploymentAllocationState>
 {
-	public override DeploymentAllocationState Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberStarting = System.Text.Json.JsonEncodedText.Encode("starting");
+	private static readonly System.Text.Json.JsonEncodedText MemberStarted = System.Text.Json.JsonEncodedText.Encode("started");
+	private static readonly System.Text.Json.JsonEncodedText MemberFullyAllocated = System.Text.Json.JsonEncodedText.Encode("fully_allocated");
+
+	public override DeploymentAllocationState Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberStarting))
 		{
-			case "starting":
-				return DeploymentAllocationState.Starting;
-			case "started":
-				return DeploymentAllocationState.Started;
-			case "fully_allocated":
-				return DeploymentAllocationState.FullyAllocated;
+			return DeploymentAllocationState.Starting;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberStarted))
+		{
+			return DeploymentAllocationState.Started;
+		}
+
+		if (reader.ValueTextEquals(MemberFullyAllocated))
+		{
+			return DeploymentAllocationState.FullyAllocated;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(DeploymentAllocationState)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, DeploymentAllocationState value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeploymentAllocationState value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case DeploymentAllocationState.Starting:
-				writer.WriteStringValue("starting");
-				return;
+				writer.WriteStringValue(MemberStarting);
+				break;
 			case DeploymentAllocationState.Started:
-				writer.WriteStringValue("started");
-				return;
+				writer.WriteStringValue(MemberStarted);
+				break;
 			case DeploymentAllocationState.FullyAllocated:
-				writer.WriteStringValue("fully_allocated");
-				return;
+				writer.WriteStringValue(MemberFullyAllocated);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(DeploymentAllocationState)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -447,46 +520,58 @@ public enum DeploymentAssignmentState
 	Failed
 }
 
-internal sealed class DeploymentAssignmentStateConverter : JsonConverter<DeploymentAssignmentState>
+internal sealed partial class DeploymentAssignmentStateConverter : System.Text.Json.Serialization.JsonConverter<DeploymentAssignmentState>
 {
-	public override DeploymentAssignmentState Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberStopping = System.Text.Json.JsonEncodedText.Encode("stopping");
+	private static readonly System.Text.Json.JsonEncodedText MemberStarting = System.Text.Json.JsonEncodedText.Encode("starting");
+	private static readonly System.Text.Json.JsonEncodedText MemberStarted = System.Text.Json.JsonEncodedText.Encode("started");
+	private static readonly System.Text.Json.JsonEncodedText MemberFailed = System.Text.Json.JsonEncodedText.Encode("failed");
+
+	public override DeploymentAssignmentState Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberStopping))
+		{
+			return DeploymentAssignmentState.Stopping;
+		}
+
+		if (reader.ValueTextEquals(MemberStarting))
+		{
+			return DeploymentAssignmentState.Starting;
+		}
+
+		if (reader.ValueTextEquals(MemberStarted))
 		{
-			case "stopping":
-				return DeploymentAssignmentState.Stopping;
-			case "starting":
-				return DeploymentAssignmentState.Starting;
-			case "started":
-				return DeploymentAssignmentState.Started;
-			case "failed":
-				return DeploymentAssignmentState.Failed;
+			return DeploymentAssignmentState.Started;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberFailed))
+		{
+			return DeploymentAssignmentState.Failed;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(DeploymentAssignmentState)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, DeploymentAssignmentState value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DeploymentAssignmentState value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case DeploymentAssignmentState.Stopping:
-				writer.WriteStringValue("stopping");
-				return;
+				writer.WriteStringValue(MemberStopping);
+				break;
 			case DeploymentAssignmentState.Starting:
-				writer.WriteStringValue("starting");
-				return;
+				writer.WriteStringValue(MemberStarting);
+				break;
 			case DeploymentAssignmentState.Started:
-				writer.WriteStringValue("started");
-				return;
+				writer.WriteStringValue(MemberStarted);
+				break;
 			case DeploymentAssignmentState.Failed:
-				writer.WriteStringValue("failed");
-				return;
+				writer.WriteStringValue(MemberFailed);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(DeploymentAssignmentState)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -503,46 +588,58 @@ public enum ExcludeFrequent
 	All
 }
 
-internal sealed class ExcludeFrequentConverter : JsonConverter<ExcludeFrequent>
+internal sealed partial class ExcludeFrequentConverter : System.Text.Json.Serialization.JsonConverter<ExcludeFrequent>
 {
-	public override ExcludeFrequent Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberOver = System.Text.Json.JsonEncodedText.Encode("over");
+	private static readonly System.Text.Json.JsonEncodedText MemberNone = System.Text.Json.JsonEncodedText.Encode("none");
+	private static readonly System.Text.Json.JsonEncodedText MemberBy = System.Text.Json.JsonEncodedText.Encode("by");
+	private static readonly System.Text.Json.JsonEncodedText MemberAll = System.Text.Json.JsonEncodedText.Encode("all");
+
+	public override ExcludeFrequent Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberOver))
+		{
+			return ExcludeFrequent.Over;
+		}
+
+		if (reader.ValueTextEquals(MemberNone))
+		{
+			return ExcludeFrequent.None;
+		}
+
+		if (reader.ValueTextEquals(MemberBy))
 		{
-			case "over":
-				return ExcludeFrequent.Over;
-			case "none":
-				return ExcludeFrequent.None;
-			case "by":
-				return ExcludeFrequent.By;
-			case "all":
-				return ExcludeFrequent.All;
+			return ExcludeFrequent.By;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberAll))
+		{
+			return ExcludeFrequent.All;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(ExcludeFrequent)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, ExcludeFrequent value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ExcludeFrequent value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case ExcludeFrequent.Over:
-				writer.WriteStringValue("over");
-				return;
+				writer.WriteStringValue(MemberOver);
+				break;
 			case ExcludeFrequent.None:
-				writer.WriteStringValue("none");
-				return;
+				writer.WriteStringValue(MemberNone);
+				break;
 			case ExcludeFrequent.By:
-				writer.WriteStringValue("by");
-				return;
+				writer.WriteStringValue(MemberBy);
+				break;
 			case ExcludeFrequent.All:
-				writer.WriteStringValue("all");
-				return;
+				writer.WriteStringValue(MemberAll);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(ExcludeFrequent)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -555,36 +652,40 @@ public enum FilterType
 	Exclude
 }
 
-internal sealed class FilterTypeConverter : JsonConverter<FilterType>
+internal sealed partial class FilterTypeConverter : System.Text.Json.Serialization.JsonConverter<FilterType>
 {
-	public override FilterType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberInclude = System.Text.Json.JsonEncodedText.Encode("include");
+	private static readonly System.Text.Json.JsonEncodedText MemberExclude = System.Text.Json.JsonEncodedText.Encode("exclude");
+
+	public override FilterType Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberInclude))
+		{
+			return FilterType.Include;
+		}
+
+		if (reader.ValueTextEquals(MemberExclude))
 		{
-			case "include":
-				return FilterType.Include;
-			case "exclude":
-				return FilterType.Exclude;
+			return FilterType.Exclude;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(FilterType)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, FilterType value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, FilterType value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case FilterType.Include:
-				writer.WriteStringValue("include");
-				return;
+				writer.WriteStringValue(MemberInclude);
+				break;
 			case FilterType.Exclude:
-				writer.WriteStringValue("exclude");
-				return;
+				writer.WriteStringValue(MemberExclude);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(FilterType)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -633,51 +734,67 @@ public enum Include
 	Definition
 }
 
-internal sealed class IncludeConverter : JsonConverter<Include>
+internal sealed partial class IncludeConverter : System.Text.Json.Serialization.JsonConverter<Include>
 {
-	public override Include Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberTotalFeatureImportance = System.Text.Json.JsonEncodedText.Encode("total_feature_importance");
+	private static readonly System.Text.Json.JsonEncodedText MemberHyperparameters = System.Text.Json.JsonEncodedText.Encode("hyperparameters");
+	private static readonly System.Text.Json.JsonEncodedText MemberFeatureImportanceBaseline = System.Text.Json.JsonEncodedText.Encode("feature_importance_baseline");
+	private static readonly System.Text.Json.JsonEncodedText MemberDefinitionStatus = System.Text.Json.JsonEncodedText.Encode("definition_status");
+	private static readonly System.Text.Json.JsonEncodedText MemberDefinition = System.Text.Json.JsonEncodedText.Encode("definition");
+
+	public override Include Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "total_feature_importance":
-				return Include.TotalFeatureImportance;
-			case "hyperparameters":
-				return Include.Hyperparameters;
-			case "feature_importance_baseline":
-				return Include.FeatureImportanceBaseline;
-			case "definition_status":
-				return Include.DefinitionStatus;
-			case "definition":
-				return Include.Definition;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberTotalFeatureImportance))
+		{
+			return Include.TotalFeatureImportance;
+		}
+
+		if (reader.ValueTextEquals(MemberHyperparameters))
+		{
+			return Include.Hyperparameters;
+		}
+
+		if (reader.ValueTextEquals(MemberFeatureImportanceBaseline))
+		{
+			return Include.FeatureImportanceBaseline;
+		}
+
+		if (reader.ValueTextEquals(MemberDefinitionStatus))
+		{
+			return Include.DefinitionStatus;
+		}
+
+		if (reader.ValueTextEquals(MemberDefinition))
+		{
+			return Include.Definition;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(Include)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, Include value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, Include value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case Include.TotalFeatureImportance:
-				writer.WriteStringValue("total_feature_importance");
-				return;
+				writer.WriteStringValue(MemberTotalFeatureImportance);
+				break;
 			case Include.Hyperparameters:
-				writer.WriteStringValue("hyperparameters");
-				return;
+				writer.WriteStringValue(MemberHyperparameters);
+				break;
 			case Include.FeatureImportanceBaseline:
-				writer.WriteStringValue("feature_importance_baseline");
-				return;
+				writer.WriteStringValue(MemberFeatureImportanceBaseline);
+				break;
 			case Include.DefinitionStatus:
-				writer.WriteStringValue("definition_status");
-				return;
+				writer.WriteStringValue(MemberDefinitionStatus);
+				break;
 			case Include.Definition:
-				writer.WriteStringValue("definition");
-				return;
+				writer.WriteStringValue(MemberDefinition);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(Include)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -692,41 +809,49 @@ public enum JobBlockedReason
 	Delete
 }
 
-internal sealed class JobBlockedReasonConverter : JsonConverter<JobBlockedReason>
+internal sealed partial class JobBlockedReasonConverter : System.Text.Json.Serialization.JsonConverter<JobBlockedReason>
 {
-	public override JobBlockedReason Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberRevert = System.Text.Json.JsonEncodedText.Encode("revert");
+	private static readonly System.Text.Json.JsonEncodedText MemberReset = System.Text.Json.JsonEncodedText.Encode("reset");
+	private static readonly System.Text.Json.JsonEncodedText MemberDelete = System.Text.Json.JsonEncodedText.Encode("delete");
+
+	public override JobBlockedReason Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberRevert))
 		{
-			case "revert":
-				return JobBlockedReason.Revert;
-			case "reset":
-				return JobBlockedReason.Reset;
-			case "delete":
-				return JobBlockedReason.Delete;
+			return JobBlockedReason.Revert;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberReset))
+		{
+			return JobBlockedReason.Reset;
+		}
+
+		if (reader.ValueTextEquals(MemberDelete))
+		{
+			return JobBlockedReason.Delete;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(JobBlockedReason)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, JobBlockedReason value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, JobBlockedReason value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case JobBlockedReason.Revert:
-				writer.WriteStringValue("revert");
-				return;
+				writer.WriteStringValue(MemberRevert);
+				break;
 			case JobBlockedReason.Reset:
-				writer.WriteStringValue("reset");
-				return;
+				writer.WriteStringValue(MemberReset);
+				break;
 			case JobBlockedReason.Delete:
-				writer.WriteStringValue("delete");
-				return;
+				writer.WriteStringValue(MemberDelete);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(JobBlockedReason)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -773,51 +898,67 @@ public enum JobState
 	Closed
 }
 
-internal sealed class JobStateConverter : JsonConverter<JobState>
+internal sealed partial class JobStateConverter : System.Text.Json.Serialization.JsonConverter<JobState>
 {
-	public override JobState Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberOpening = System.Text.Json.JsonEncodedText.Encode("opening");
+	private static readonly System.Text.Json.JsonEncodedText MemberOpened = System.Text.Json.JsonEncodedText.Encode("opened");
+	private static readonly System.Text.Json.JsonEncodedText MemberFailed = System.Text.Json.JsonEncodedText.Encode("failed");
+	private static readonly System.Text.Json.JsonEncodedText MemberClosing = System.Text.Json.JsonEncodedText.Encode("closing");
+	private static readonly System.Text.Json.JsonEncodedText MemberClosed = System.Text.Json.JsonEncodedText.Encode("closed");
+
+	public override JobState Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "opening":
-				return JobState.Opening;
-			case "opened":
-				return JobState.Opened;
-			case "failed":
-				return JobState.Failed;
-			case "closing":
-				return JobState.Closing;
-			case "closed":
-				return JobState.Closed;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberOpening))
+		{
+			return JobState.Opening;
+		}
+
+		if (reader.ValueTextEquals(MemberOpened))
+		{
+			return JobState.Opened;
+		}
+
+		if (reader.ValueTextEquals(MemberFailed))
+		{
+			return JobState.Failed;
+		}
+
+		if (reader.ValueTextEquals(MemberClosing))
+		{
+			return JobState.Closing;
+		}
+
+		if (reader.ValueTextEquals(MemberClosed))
+		{
+			return JobState.Closed;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(JobState)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, JobState value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, JobState value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case JobState.Opening:
-				writer.WriteStringValue("opening");
-				return;
+				writer.WriteStringValue(MemberOpening);
+				break;
 			case JobState.Opened:
-				writer.WriteStringValue("opened");
-				return;
+				writer.WriteStringValue(MemberOpened);
+				break;
 			case JobState.Failed:
-				writer.WriteStringValue("failed");
-				return;
+				writer.WriteStringValue(MemberFailed);
+				break;
 			case JobState.Closing:
-				writer.WriteStringValue("closing");
-				return;
+				writer.WriteStringValue(MemberClosing);
+				break;
 			case JobState.Closed:
-				writer.WriteStringValue("closed");
-				return;
+				writer.WriteStringValue(MemberClosed);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(JobState)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -832,41 +973,49 @@ public enum MemoryStatus
 	HardLimit
 }
 
-internal sealed class MemoryStatusConverter : JsonConverter<MemoryStatus>
+internal sealed partial class MemoryStatusConverter : System.Text.Json.Serialization.JsonConverter<MemoryStatus>
 {
-	public override MemoryStatus Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberSoftLimit = System.Text.Json.JsonEncodedText.Encode("soft_limit");
+	private static readonly System.Text.Json.JsonEncodedText MemberOk = System.Text.Json.JsonEncodedText.Encode("ok");
+	private static readonly System.Text.Json.JsonEncodedText MemberHardLimit = System.Text.Json.JsonEncodedText.Encode("hard_limit");
+
+	public override MemoryStatus Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberSoftLimit))
+		{
+			return MemoryStatus.SoftLimit;
+		}
+
+		if (reader.ValueTextEquals(MemberOk))
+		{
+			return MemoryStatus.Ok;
+		}
+
+		if (reader.ValueTextEquals(MemberHardLimit))
 		{
-			case "soft_limit":
-				return MemoryStatus.SoftLimit;
-			case "ok":
-				return MemoryStatus.Ok;
-			case "hard_limit":
-				return MemoryStatus.HardLimit;
+			return MemoryStatus.HardLimit;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(MemoryStatus)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, MemoryStatus value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, MemoryStatus value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case MemoryStatus.SoftLimit:
-				writer.WriteStringValue("soft_limit");
-				return;
+				writer.WriteStringValue(MemberSoftLimit);
+				break;
 			case MemoryStatus.Ok:
-				writer.WriteStringValue("ok");
-				return;
+				writer.WriteStringValue(MemberOk);
+				break;
 			case MemoryStatus.HardLimit:
-				writer.WriteStringValue("hard_limit");
-				return;
+				writer.WriteStringValue(MemberHardLimit);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(MemoryStatus)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -910,51 +1059,67 @@ public enum RoutingState
 	Failed
 }
 
-internal sealed class RoutingStateConverter : JsonConverter<RoutingState>
+internal sealed partial class RoutingStateConverter : System.Text.Json.Serialization.JsonConverter<RoutingState>
 {
-	public override RoutingState Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberStopping = System.Text.Json.JsonEncodedText.Encode("stopping");
+	private static readonly System.Text.Json.JsonEncodedText MemberStopped = System.Text.Json.JsonEncodedText.Encode("stopped");
+	private static readonly System.Text.Json.JsonEncodedText MemberStarting = System.Text.Json.JsonEncodedText.Encode("starting");
+	private static readonly System.Text.Json.JsonEncodedText MemberStarted = System.Text.Json.JsonEncodedText.Encode("started");
+	private static readonly System.Text.Json.JsonEncodedText MemberFailed = System.Text.Json.JsonEncodedText.Encode("failed");
+
+	public override RoutingState Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "stopping":
-				return RoutingState.Stopping;
-			case "stopped":
-				return RoutingState.Stopped;
-			case "starting":
-				return RoutingState.Starting;
-			case "started":
-				return RoutingState.Started;
-			case "failed":
-				return RoutingState.Failed;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberStopping))
+		{
+			return RoutingState.Stopping;
+		}
+
+		if (reader.ValueTextEquals(MemberStopped))
+		{
+			return RoutingState.Stopped;
+		}
+
+		if (reader.ValueTextEquals(MemberStarting))
+		{
+			return RoutingState.Starting;
+		}
+
+		if (reader.ValueTextEquals(MemberStarted))
+		{
+			return RoutingState.Started;
+		}
+
+		if (reader.ValueTextEquals(MemberFailed))
+		{
+			return RoutingState.Failed;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(RoutingState)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, RoutingState value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, RoutingState value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case RoutingState.Stopping:
-				writer.WriteStringValue("stopping");
-				return;
+				writer.WriteStringValue(MemberStopping);
+				break;
 			case RoutingState.Stopped:
-				writer.WriteStringValue("stopped");
-				return;
+				writer.WriteStringValue(MemberStopped);
+				break;
 			case RoutingState.Starting:
-				writer.WriteStringValue("starting");
-				return;
+				writer.WriteStringValue(MemberStarting);
+				break;
 			case RoutingState.Started:
-				writer.WriteStringValue("started");
-				return;
+				writer.WriteStringValue(MemberStarted);
+				break;
 			case RoutingState.Failed:
-				writer.WriteStringValue("failed");
-				return;
+				writer.WriteStringValue(MemberFailed);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(RoutingState)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -977,36 +1142,40 @@ public enum RuleAction
 	SkipModelUpdate
 }
 
-internal sealed class RuleActionConverter : JsonConverter<RuleAction>
+internal sealed partial class RuleActionConverter : System.Text.Json.Serialization.JsonConverter<RuleAction>
 {
-	public override RuleAction Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberSkipResult = System.Text.Json.JsonEncodedText.Encode("skip_result");
+	private static readonly System.Text.Json.JsonEncodedText MemberSkipModelUpdate = System.Text.Json.JsonEncodedText.Encode("skip_model_update");
+
+	public override RuleAction Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberSkipResult))
+		{
+			return RuleAction.SkipResult;
+		}
+
+		if (reader.ValueTextEquals(MemberSkipModelUpdate))
 		{
-			case "skip_result":
-				return RuleAction.SkipResult;
-			case "skip_model_update":
-				return RuleAction.SkipModelUpdate;
+			return RuleAction.SkipModelUpdate;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(RuleAction)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, RuleAction value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, RuleAction value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case RuleAction.SkipResult:
-				writer.WriteStringValue("skip_result");
-				return;
+				writer.WriteStringValue(MemberSkipResult);
+				break;
 			case RuleAction.SkipModelUpdate:
-				writer.WriteStringValue("skip_model_update");
-				return;
+				writer.WriteStringValue(MemberSkipModelUpdate);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(RuleAction)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -1023,46 +1192,58 @@ public enum SnapshotUpgradeState
 	Failed
 }
 
-internal sealed class SnapshotUpgradeStateConverter : JsonConverter<SnapshotUpgradeState>
+internal sealed partial class SnapshotUpgradeStateConverter : System.Text.Json.Serialization.JsonConverter<SnapshotUpgradeState>
 {
-	public override SnapshotUpgradeState Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberStopped = System.Text.Json.JsonEncodedText.Encode("stopped");
+	private static readonly System.Text.Json.JsonEncodedText MemberSavingNewState = System.Text.Json.JsonEncodedText.Encode("saving_new_state");
+	private static readonly System.Text.Json.JsonEncodedText MemberLoadingOldState = System.Text.Json.JsonEncodedText.Encode("loading_old_state");
+	private static readonly System.Text.Json.JsonEncodedText MemberFailed = System.Text.Json.JsonEncodedText.Encode("failed");
+
+	public override SnapshotUpgradeState Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberStopped))
+		{
+			return SnapshotUpgradeState.Stopped;
+		}
+
+		if (reader.ValueTextEquals(MemberSavingNewState))
+		{
+			return SnapshotUpgradeState.SavingNewState;
+		}
+
+		if (reader.ValueTextEquals(MemberLoadingOldState))
 		{
-			case "stopped":
-				return SnapshotUpgradeState.Stopped;
-			case "saving_new_state":
-				return SnapshotUpgradeState.SavingNewState;
-			case "loading_old_state":
-				return SnapshotUpgradeState.LoadingOldState;
-			case "failed":
-				return SnapshotUpgradeState.Failed;
+			return SnapshotUpgradeState.LoadingOldState;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberFailed))
+		{
+			return SnapshotUpgradeState.Failed;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(SnapshotUpgradeState)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, SnapshotUpgradeState value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SnapshotUpgradeState value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case SnapshotUpgradeState.Stopped:
-				writer.WriteStringValue("stopped");
-				return;
+				writer.WriteStringValue(MemberStopped);
+				break;
 			case SnapshotUpgradeState.SavingNewState:
-				writer.WriteStringValue("saving_new_state");
-				return;
+				writer.WriteStringValue(MemberSavingNewState);
+				break;
 			case SnapshotUpgradeState.LoadingOldState:
-				writer.WriteStringValue("loading_old_state");
-				return;
+				writer.WriteStringValue(MemberLoadingOldState);
+				break;
 			case SnapshotUpgradeState.Failed:
-				writer.WriteStringValue("failed");
-				return;
+				writer.WriteStringValue(MemberFailed);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(SnapshotUpgradeState)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -1077,41 +1258,49 @@ public enum TokenizationTruncate
 	First
 }
 
-internal sealed class TokenizationTruncateConverter : JsonConverter<TokenizationTruncate>
+internal sealed partial class TokenizationTruncateConverter : System.Text.Json.Serialization.JsonConverter<TokenizationTruncate>
 {
-	public override TokenizationTruncate Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberSecond = System.Text.Json.JsonEncodedText.Encode("second");
+	private static readonly System.Text.Json.JsonEncodedText MemberNone = System.Text.Json.JsonEncodedText.Encode("none");
+	private static readonly System.Text.Json.JsonEncodedText MemberFirst = System.Text.Json.JsonEncodedText.Encode("first");
+
+	public override TokenizationTruncate Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberSecond))
 		{
-			case "second":
-				return TokenizationTruncate.Second;
-			case "none":
-				return TokenizationTruncate.None;
-			case "first":
-				return TokenizationTruncate.First;
+			return TokenizationTruncate.Second;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberNone))
+		{
+			return TokenizationTruncate.None;
+		}
+
+		if (reader.ValueTextEquals(MemberFirst))
+		{
+			return TokenizationTruncate.First;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(TokenizationTruncate)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, TokenizationTruncate value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, TokenizationTruncate value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case TokenizationTruncate.Second:
-				writer.WriteStringValue("second");
-				return;
+				writer.WriteStringValue(MemberSecond);
+				break;
 			case TokenizationTruncate.None:
-				writer.WriteStringValue("none");
-				return;
+				writer.WriteStringValue(MemberNone);
+				break;
 			case TokenizationTruncate.First:
-				writer.WriteStringValue("first");
-				return;
+				writer.WriteStringValue(MemberFirst);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(TokenizationTruncate)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -1142,41 +1331,49 @@ public enum TrainedModelType
 	LangIdent
 }
 
-internal sealed class TrainedModelTypeConverter : JsonConverter<TrainedModelType>
+internal sealed partial class TrainedModelTypeConverter : System.Text.Json.Serialization.JsonConverter<TrainedModelType>
 {
-	public override TrainedModelType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberTreeEnsemble = System.Text.Json.JsonEncodedText.Encode("tree_ensemble");
+	private static readonly System.Text.Json.JsonEncodedText MemberPytorch = System.Text.Json.JsonEncodedText.Encode("pytorch");
+	private static readonly System.Text.Json.JsonEncodedText MemberLangIdent = System.Text.Json.JsonEncodedText.Encode("lang_ident");
+
+	public override TrainedModelType Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberTreeEnsemble))
 		{
-			case "tree_ensemble":
-				return TrainedModelType.TreeEnsemble;
-			case "pytorch":
-				return TrainedModelType.Pytorch;
-			case "lang_ident":
-				return TrainedModelType.LangIdent;
+			return TrainedModelType.TreeEnsemble;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberPytorch))
+		{
+			return TrainedModelType.Pytorch;
+		}
+
+		if (reader.ValueTextEquals(MemberLangIdent))
+		{
+			return TrainedModelType.LangIdent;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(TrainedModelType)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, TrainedModelType value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, TrainedModelType value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case TrainedModelType.TreeEnsemble:
-				writer.WriteStringValue("tree_ensemble");
-				return;
+				writer.WriteStringValue(MemberTreeEnsemble);
+				break;
 			case TrainedModelType.Pytorch:
-				writer.WriteStringValue("pytorch");
-				return;
+				writer.WriteStringValue(MemberPytorch);
+				break;
 			case TrainedModelType.LangIdent:
-				writer.WriteStringValue("lang_ident");
-				return;
+				writer.WriteStringValue(MemberLangIdent);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(TrainedModelType)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -1189,35 +1386,39 @@ public enum TrainingPriority
 	Low
 }
 
-internal sealed class TrainingPriorityConverter : JsonConverter<TrainingPriority>
+internal sealed partial class TrainingPriorityConverter : System.Text.Json.Serialization.JsonConverter<TrainingPriority>
 {
-	public override TrainingPriority Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberNormal = System.Text.Json.JsonEncodedText.Encode("normal");
+	private static readonly System.Text.Json.JsonEncodedText MemberLow = System.Text.Json.JsonEncodedText.Encode("low");
+
+	public override TrainingPriority Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberNormal))
+		{
+			return TrainingPriority.Normal;
+		}
+
+		if (reader.ValueTextEquals(MemberLow))
 		{
-			case "normal":
-				return TrainingPriority.Normal;
-			case "low":
-				return TrainingPriority.Low;
+			return TrainingPriority.Low;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(TrainingPriority)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, TrainingPriority value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, TrainingPriority value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case TrainingPriority.Normal:
-				writer.WriteStringValue("normal");
-				return;
+				writer.WriteStringValue(MemberNormal);
+				break;
 			case TrainingPriority.Low:
-				writer.WriteStringValue("low");
-				return;
+				writer.WriteStringValue(MemberLow);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(TrainingPriority)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
\ No newline at end of file
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 af9e0d808bf..89471155831 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
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Core;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport;
 using System;
@@ -58,41 +59,49 @@ public enum DenseVectorElementType
 	Bit
 }
 
-internal sealed class DenseVectorElementTypeConverter : JsonConverter<DenseVectorElementType>
+internal sealed partial class DenseVectorElementTypeConverter : System.Text.Json.Serialization.JsonConverter<DenseVectorElementType>
 {
-	public override DenseVectorElementType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberFloat = System.Text.Json.JsonEncodedText.Encode("float");
+	private static readonly System.Text.Json.JsonEncodedText MemberByte = System.Text.Json.JsonEncodedText.Encode("byte");
+	private static readonly System.Text.Json.JsonEncodedText MemberBit = System.Text.Json.JsonEncodedText.Encode("bit");
+
+	public override DenseVectorElementType Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberFloat))
+		{
+			return DenseVectorElementType.Float;
+		}
+
+		if (reader.ValueTextEquals(MemberByte))
+		{
+			return DenseVectorElementType.Byte;
+		}
+
+		if (reader.ValueTextEquals(MemberBit))
 		{
-			case "float":
-				return DenseVectorElementType.Float;
-			case "byte":
-				return DenseVectorElementType.Byte;
-			case "bit":
-				return DenseVectorElementType.Bit;
+			return DenseVectorElementType.Bit;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(DenseVectorElementType)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, DenseVectorElementType value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DenseVectorElementType value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case DenseVectorElementType.Float:
-				writer.WriteStringValue("float");
-				return;
+				writer.WriteStringValue(MemberFloat);
+				break;
 			case DenseVectorElementType.Byte:
-				writer.WriteStringValue("byte");
-				return;
+				writer.WriteStringValue(MemberByte);
+				break;
 			case DenseVectorElementType.Bit:
-				writer.WriteStringValue("bit");
-				return;
+				writer.WriteStringValue(MemberBit);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(DenseVectorElementType)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -153,56 +162,76 @@ public enum DenseVectorIndexOptionsType
 	Flat
 }
 
-internal sealed class DenseVectorIndexOptionsTypeConverter : JsonConverter<DenseVectorIndexOptionsType>
+internal sealed partial class DenseVectorIndexOptionsTypeConverter : System.Text.Json.Serialization.JsonConverter<DenseVectorIndexOptionsType>
 {
-	public override DenseVectorIndexOptionsType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberInt8Hnsw = System.Text.Json.JsonEncodedText.Encode("int8_hnsw");
+	private static readonly System.Text.Json.JsonEncodedText MemberInt8Flat = System.Text.Json.JsonEncodedText.Encode("int8_flat");
+	private static readonly System.Text.Json.JsonEncodedText MemberInt4Hnsw = System.Text.Json.JsonEncodedText.Encode("int4_hnsw");
+	private static readonly System.Text.Json.JsonEncodedText MemberInt4Flat = System.Text.Json.JsonEncodedText.Encode("int4_flat");
+	private static readonly System.Text.Json.JsonEncodedText MemberHnsw = System.Text.Json.JsonEncodedText.Encode("hnsw");
+	private static readonly System.Text.Json.JsonEncodedText MemberFlat = System.Text.Json.JsonEncodedText.Encode("flat");
+
+	public override DenseVectorIndexOptionsType Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "int8_hnsw":
-				return DenseVectorIndexOptionsType.Int8Hnsw;
-			case "int8_flat":
-				return DenseVectorIndexOptionsType.Int8Flat;
-			case "int4_hnsw":
-				return DenseVectorIndexOptionsType.Int4Hnsw;
-			case "int4_flat":
-				return DenseVectorIndexOptionsType.Int4Flat;
-			case "hnsw":
-				return DenseVectorIndexOptionsType.Hnsw;
-			case "flat":
-				return DenseVectorIndexOptionsType.Flat;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberInt8Hnsw))
+		{
+			return DenseVectorIndexOptionsType.Int8Hnsw;
+		}
+
+		if (reader.ValueTextEquals(MemberInt8Flat))
+		{
+			return DenseVectorIndexOptionsType.Int8Flat;
+		}
+
+		if (reader.ValueTextEquals(MemberInt4Hnsw))
+		{
+			return DenseVectorIndexOptionsType.Int4Hnsw;
+		}
+
+		if (reader.ValueTextEquals(MemberInt4Flat))
+		{
+			return DenseVectorIndexOptionsType.Int4Flat;
+		}
+
+		if (reader.ValueTextEquals(MemberHnsw))
+		{
+			return DenseVectorIndexOptionsType.Hnsw;
+		}
+
+		if (reader.ValueTextEquals(MemberFlat))
+		{
+			return DenseVectorIndexOptionsType.Flat;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(DenseVectorIndexOptionsType)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, DenseVectorIndexOptionsType value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DenseVectorIndexOptionsType value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case DenseVectorIndexOptionsType.Int8Hnsw:
-				writer.WriteStringValue("int8_hnsw");
-				return;
+				writer.WriteStringValue(MemberInt8Hnsw);
+				break;
 			case DenseVectorIndexOptionsType.Int8Flat:
-				writer.WriteStringValue("int8_flat");
-				return;
+				writer.WriteStringValue(MemberInt8Flat);
+				break;
 			case DenseVectorIndexOptionsType.Int4Hnsw:
-				writer.WriteStringValue("int4_hnsw");
-				return;
+				writer.WriteStringValue(MemberInt4Hnsw);
+				break;
 			case DenseVectorIndexOptionsType.Int4Flat:
-				writer.WriteStringValue("int4_flat");
-				return;
+				writer.WriteStringValue(MemberInt4Flat);
+				break;
 			case DenseVectorIndexOptionsType.Hnsw:
-				writer.WriteStringValue("hnsw");
-				return;
+				writer.WriteStringValue(MemberHnsw);
+				break;
 			case DenseVectorIndexOptionsType.Flat:
-				writer.WriteStringValue("flat");
-				return;
+				writer.WriteStringValue(MemberFlat);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(DenseVectorIndexOptionsType)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -277,46 +306,58 @@ public enum DenseVectorSimilarity
 	Cosine
 }
 
-internal sealed class DenseVectorSimilarityConverter : JsonConverter<DenseVectorSimilarity>
+internal sealed partial class DenseVectorSimilarityConverter : System.Text.Json.Serialization.JsonConverter<DenseVectorSimilarity>
 {
-	public override DenseVectorSimilarity Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberMaxInnerProduct = System.Text.Json.JsonEncodedText.Encode("max_inner_product");
+	private static readonly System.Text.Json.JsonEncodedText MemberL2Norm = System.Text.Json.JsonEncodedText.Encode("l2_norm");
+	private static readonly System.Text.Json.JsonEncodedText MemberDotProduct = System.Text.Json.JsonEncodedText.Encode("dot_product");
+	private static readonly System.Text.Json.JsonEncodedText MemberCosine = System.Text.Json.JsonEncodedText.Encode("cosine");
+
+	public override DenseVectorSimilarity Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberMaxInnerProduct))
 		{
-			case "max_inner_product":
-				return DenseVectorSimilarity.MaxInnerProduct;
-			case "l2_norm":
-				return DenseVectorSimilarity.L2Norm;
-			case "dot_product":
-				return DenseVectorSimilarity.DotProduct;
-			case "cosine":
-				return DenseVectorSimilarity.Cosine;
+			return DenseVectorSimilarity.MaxInnerProduct;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberL2Norm))
+		{
+			return DenseVectorSimilarity.L2Norm;
+		}
+
+		if (reader.ValueTextEquals(MemberDotProduct))
+		{
+			return DenseVectorSimilarity.DotProduct;
+		}
+
+		if (reader.ValueTextEquals(MemberCosine))
+		{
+			return DenseVectorSimilarity.Cosine;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(DenseVectorSimilarity)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, DenseVectorSimilarity value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DenseVectorSimilarity value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case DenseVectorSimilarity.MaxInnerProduct:
-				writer.WriteStringValue("max_inner_product");
-				return;
+				writer.WriteStringValue(MemberMaxInnerProduct);
+				break;
 			case DenseVectorSimilarity.L2Norm:
-				writer.WriteStringValue("l2_norm");
-				return;
+				writer.WriteStringValue(MemberL2Norm);
+				break;
 			case DenseVectorSimilarity.DotProduct:
-				writer.WriteStringValue("dot_product");
-				return;
+				writer.WriteStringValue(MemberDotProduct);
+				break;
 			case DenseVectorSimilarity.Cosine:
-				writer.WriteStringValue("cosine");
-				return;
+				writer.WriteStringValue(MemberCosine);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(DenseVectorSimilarity)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -333,46 +374,58 @@ public enum DynamicMapping
 	False
 }
 
-internal sealed class DynamicMappingConverter : JsonConverter<DynamicMapping>
+internal sealed partial class DynamicMappingConverter : System.Text.Json.Serialization.JsonConverter<DynamicMapping>
 {
-	public override DynamicMapping Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberTrue = System.Text.Json.JsonEncodedText.Encode("true");
+	private static readonly System.Text.Json.JsonEncodedText MemberStrict = System.Text.Json.JsonEncodedText.Encode("strict");
+	private static readonly System.Text.Json.JsonEncodedText MemberRuntime = System.Text.Json.JsonEncodedText.Encode("runtime");
+	private static readonly System.Text.Json.JsonEncodedText MemberFalse = System.Text.Json.JsonEncodedText.Encode("false");
+
+	public override DynamicMapping Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberTrue))
+		{
+			return DynamicMapping.True;
+		}
+
+		if (reader.ValueTextEquals(MemberStrict))
+		{
+			return DynamicMapping.Strict;
+		}
+
+		if (reader.ValueTextEquals(MemberRuntime))
+		{
+			return DynamicMapping.Runtime;
+		}
+
+		if (reader.ValueTextEquals(MemberFalse))
 		{
-			case "true":
-				return DynamicMapping.True;
-			case "strict":
-				return DynamicMapping.Strict;
-			case "runtime":
-				return DynamicMapping.Runtime;
-			case "false":
-				return DynamicMapping.False;
+			return DynamicMapping.False;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(DynamicMapping)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, DynamicMapping value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DynamicMapping value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case DynamicMapping.True:
-				writer.WriteStringValue("true");
-				return;
+				writer.WriteStringValue(MemberTrue);
+				break;
 			case DynamicMapping.Strict:
-				writer.WriteStringValue("strict");
-				return;
+				writer.WriteStringValue(MemberStrict);
+				break;
 			case DynamicMapping.Runtime:
-				writer.WriteStringValue("runtime");
-				return;
+				writer.WriteStringValue(MemberRuntime);
+				break;
 			case DynamicMapping.False:
-				writer.WriteStringValue("false");
-				return;
+				writer.WriteStringValue(MemberFalse);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(DynamicMapping)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -475,261 +528,445 @@ public enum FieldType
 	AggregateMetricDouble
 }
 
-internal sealed class FieldTypeConverter : JsonConverter<FieldType>
+internal sealed partial class FieldTypeConverter : System.Text.Json.Serialization.JsonConverter<FieldType>
 {
-	public override FieldType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberVersion = System.Text.Json.JsonEncodedText.Encode("version");
+	private static readonly System.Text.Json.JsonEncodedText MemberTokenCount = System.Text.Json.JsonEncodedText.Encode("token_count");
+	private static readonly System.Text.Json.JsonEncodedText MemberText = System.Text.Json.JsonEncodedText.Encode("text");
+	private static readonly System.Text.Json.JsonEncodedText MemberSparseVector = System.Text.Json.JsonEncodedText.Encode("sparse_vector");
+	private static readonly System.Text.Json.JsonEncodedText MemberShort = System.Text.Json.JsonEncodedText.Encode("short");
+	private static readonly System.Text.Json.JsonEncodedText MemberShape = System.Text.Json.JsonEncodedText.Encode("shape");
+	private static readonly System.Text.Json.JsonEncodedText MemberSemanticText = System.Text.Json.JsonEncodedText.Encode("semantic_text");
+	private static readonly System.Text.Json.JsonEncodedText MemberSearchAsYouType = System.Text.Json.JsonEncodedText.Encode("search_as_you_type");
+	private static readonly System.Text.Json.JsonEncodedText MemberScaledFloat = System.Text.Json.JsonEncodedText.Encode("scaled_float");
+	private static readonly System.Text.Json.JsonEncodedText MemberRankFeatures = System.Text.Json.JsonEncodedText.Encode("rank_features");
+	private static readonly System.Text.Json.JsonEncodedText MemberRankFeature = System.Text.Json.JsonEncodedText.Encode("rank_feature");
+	private static readonly System.Text.Json.JsonEncodedText MemberPercolator = System.Text.Json.JsonEncodedText.Encode("percolator");
+	private static readonly System.Text.Json.JsonEncodedText MemberPassthrough = System.Text.Json.JsonEncodedText.Encode("passthrough");
+	private static readonly System.Text.Json.JsonEncodedText MemberObject = System.Text.Json.JsonEncodedText.Encode("object");
+	private static readonly System.Text.Json.JsonEncodedText MemberNone = System.Text.Json.JsonEncodedText.Encode("none");
+	private static readonly System.Text.Json.JsonEncodedText MemberNested = System.Text.Json.JsonEncodedText.Encode("nested");
+	private static readonly System.Text.Json.JsonEncodedText MemberMurmur3 = System.Text.Json.JsonEncodedText.Encode("murmur3");
+	private static readonly System.Text.Json.JsonEncodedText MemberMatchOnlyText = System.Text.Json.JsonEncodedText.Encode("match_only_text");
+	private static readonly System.Text.Json.JsonEncodedText MemberLongRange = System.Text.Json.JsonEncodedText.Encode("long_range");
+	private static readonly System.Text.Json.JsonEncodedText MemberLong = System.Text.Json.JsonEncodedText.Encode("long");
+	private static readonly System.Text.Json.JsonEncodedText MemberKeyword = System.Text.Json.JsonEncodedText.Encode("keyword");
+	private static readonly System.Text.Json.JsonEncodedText MemberJoin = System.Text.Json.JsonEncodedText.Encode("join");
+	private static readonly System.Text.Json.JsonEncodedText MemberIpRange = System.Text.Json.JsonEncodedText.Encode("ip_range");
+	private static readonly System.Text.Json.JsonEncodedText MemberIp = System.Text.Json.JsonEncodedText.Encode("ip");
+	private static readonly System.Text.Json.JsonEncodedText MemberIntegerRange = System.Text.Json.JsonEncodedText.Encode("integer_range");
+	private static readonly System.Text.Json.JsonEncodedText MemberInteger = System.Text.Json.JsonEncodedText.Encode("integer");
+	private static readonly System.Text.Json.JsonEncodedText MemberIcuCollationKeyword = System.Text.Json.JsonEncodedText.Encode("icu_collation_keyword");
+	private static readonly System.Text.Json.JsonEncodedText MemberHistogram = System.Text.Json.JsonEncodedText.Encode("histogram");
+	private static readonly System.Text.Json.JsonEncodedText MemberHalfFloat = System.Text.Json.JsonEncodedText.Encode("half_float");
+	private static readonly System.Text.Json.JsonEncodedText MemberGeoShape = System.Text.Json.JsonEncodedText.Encode("geo_shape");
+	private static readonly System.Text.Json.JsonEncodedText MemberGeoPoint = System.Text.Json.JsonEncodedText.Encode("geo_point");
+	private static readonly System.Text.Json.JsonEncodedText MemberFloatRange = System.Text.Json.JsonEncodedText.Encode("float_range");
+	private static readonly System.Text.Json.JsonEncodedText MemberFloat = System.Text.Json.JsonEncodedText.Encode("float");
+	private static readonly System.Text.Json.JsonEncodedText MemberFlattened = System.Text.Json.JsonEncodedText.Encode("flattened");
+	private static readonly System.Text.Json.JsonEncodedText MemberDoubleRange = System.Text.Json.JsonEncodedText.Encode("double_range");
+	private static readonly System.Text.Json.JsonEncodedText MemberDouble = System.Text.Json.JsonEncodedText.Encode("double");
+	private static readonly System.Text.Json.JsonEncodedText MemberDenseVector = System.Text.Json.JsonEncodedText.Encode("dense_vector");
+	private static readonly System.Text.Json.JsonEncodedText MemberDateRange = System.Text.Json.JsonEncodedText.Encode("date_range");
+	private static readonly System.Text.Json.JsonEncodedText MemberDateNanos = System.Text.Json.JsonEncodedText.Encode("date_nanos");
+	private static readonly System.Text.Json.JsonEncodedText MemberDate = System.Text.Json.JsonEncodedText.Encode("date");
+	private static readonly System.Text.Json.JsonEncodedText MemberConstantKeyword = System.Text.Json.JsonEncodedText.Encode("constant_keyword");
+	private static readonly System.Text.Json.JsonEncodedText MemberCompletion = System.Text.Json.JsonEncodedText.Encode("completion");
+	private static readonly System.Text.Json.JsonEncodedText MemberByte = System.Text.Json.JsonEncodedText.Encode("byte");
+	private static readonly System.Text.Json.JsonEncodedText MemberBoolean = System.Text.Json.JsonEncodedText.Encode("boolean");
+	private static readonly System.Text.Json.JsonEncodedText MemberBinary = System.Text.Json.JsonEncodedText.Encode("binary");
+	private static readonly System.Text.Json.JsonEncodedText MemberAlias = System.Text.Json.JsonEncodedText.Encode("alias");
+	private static readonly System.Text.Json.JsonEncodedText MemberAggregateMetricDouble = System.Text.Json.JsonEncodedText.Encode("aggregate_metric_double");
+
+	public override FieldType Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "version":
-				return FieldType.Version;
-			case "token_count":
-				return FieldType.TokenCount;
-			case "text":
-				return FieldType.Text;
-			case "sparse_vector":
-				return FieldType.SparseVector;
-			case "short":
-				return FieldType.Short;
-			case "shape":
-				return FieldType.Shape;
-			case "semantic_text":
-				return FieldType.SemanticText;
-			case "search_as_you_type":
-				return FieldType.SearchAsYouType;
-			case "scaled_float":
-				return FieldType.ScaledFloat;
-			case "rank_features":
-				return FieldType.RankFeatures;
-			case "rank_feature":
-				return FieldType.RankFeature;
-			case "percolator":
-				return FieldType.Percolator;
-			case "passthrough":
-				return FieldType.Passthrough;
-			case "object":
-				return FieldType.Object;
-			case "none":
-				return FieldType.None;
-			case "nested":
-				return FieldType.Nested;
-			case "murmur3":
-				return FieldType.Murmur3;
-			case "match_only_text":
-				return FieldType.MatchOnlyText;
-			case "long_range":
-				return FieldType.LongRange;
-			case "long":
-				return FieldType.Long;
-			case "keyword":
-				return FieldType.Keyword;
-			case "join":
-				return FieldType.Join;
-			case "ip_range":
-				return FieldType.IpRange;
-			case "ip":
-				return FieldType.Ip;
-			case "integer_range":
-				return FieldType.IntegerRange;
-			case "integer":
-				return FieldType.Integer;
-			case "icu_collation_keyword":
-				return FieldType.IcuCollationKeyword;
-			case "histogram":
-				return FieldType.Histogram;
-			case "half_float":
-				return FieldType.HalfFloat;
-			case "geo_shape":
-				return FieldType.GeoShape;
-			case "geo_point":
-				return FieldType.GeoPoint;
-			case "float_range":
-				return FieldType.FloatRange;
-			case "float":
-				return FieldType.Float;
-			case "flattened":
-				return FieldType.Flattened;
-			case "double_range":
-				return FieldType.DoubleRange;
-			case "double":
-				return FieldType.Double;
-			case "dense_vector":
-				return FieldType.DenseVector;
-			case "date_range":
-				return FieldType.DateRange;
-			case "date_nanos":
-				return FieldType.DateNanos;
-			case "date":
-				return FieldType.Date;
-			case "constant_keyword":
-				return FieldType.ConstantKeyword;
-			case "completion":
-				return FieldType.Completion;
-			case "byte":
-				return FieldType.Byte;
-			case "boolean":
-				return FieldType.Boolean;
-			case "binary":
-				return FieldType.Binary;
-			case "alias":
-				return FieldType.Alias;
-			case "aggregate_metric_double":
-				return FieldType.AggregateMetricDouble;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberVersion))
+		{
+			return FieldType.Version;
+		}
+
+		if (reader.ValueTextEquals(MemberTokenCount))
+		{
+			return FieldType.TokenCount;
+		}
+
+		if (reader.ValueTextEquals(MemberText))
+		{
+			return FieldType.Text;
+		}
+
+		if (reader.ValueTextEquals(MemberSparseVector))
+		{
+			return FieldType.SparseVector;
+		}
+
+		if (reader.ValueTextEquals(MemberShort))
+		{
+			return FieldType.Short;
+		}
+
+		if (reader.ValueTextEquals(MemberShape))
+		{
+			return FieldType.Shape;
+		}
+
+		if (reader.ValueTextEquals(MemberSemanticText))
+		{
+			return FieldType.SemanticText;
+		}
+
+		if (reader.ValueTextEquals(MemberSearchAsYouType))
+		{
+			return FieldType.SearchAsYouType;
+		}
+
+		if (reader.ValueTextEquals(MemberScaledFloat))
+		{
+			return FieldType.ScaledFloat;
+		}
+
+		if (reader.ValueTextEquals(MemberRankFeatures))
+		{
+			return FieldType.RankFeatures;
+		}
+
+		if (reader.ValueTextEquals(MemberRankFeature))
+		{
+			return FieldType.RankFeature;
+		}
+
+		if (reader.ValueTextEquals(MemberPercolator))
+		{
+			return FieldType.Percolator;
+		}
+
+		if (reader.ValueTextEquals(MemberPassthrough))
+		{
+			return FieldType.Passthrough;
+		}
+
+		if (reader.ValueTextEquals(MemberObject))
+		{
+			return FieldType.Object;
+		}
+
+		if (reader.ValueTextEquals(MemberNone))
+		{
+			return FieldType.None;
+		}
+
+		if (reader.ValueTextEquals(MemberNested))
+		{
+			return FieldType.Nested;
+		}
+
+		if (reader.ValueTextEquals(MemberMurmur3))
+		{
+			return FieldType.Murmur3;
+		}
+
+		if (reader.ValueTextEquals(MemberMatchOnlyText))
+		{
+			return FieldType.MatchOnlyText;
+		}
+
+		if (reader.ValueTextEquals(MemberLongRange))
+		{
+			return FieldType.LongRange;
+		}
+
+		if (reader.ValueTextEquals(MemberLong))
+		{
+			return FieldType.Long;
+		}
+
+		if (reader.ValueTextEquals(MemberKeyword))
+		{
+			return FieldType.Keyword;
+		}
+
+		if (reader.ValueTextEquals(MemberJoin))
+		{
+			return FieldType.Join;
+		}
+
+		if (reader.ValueTextEquals(MemberIpRange))
+		{
+			return FieldType.IpRange;
+		}
+
+		if (reader.ValueTextEquals(MemberIp))
+		{
+			return FieldType.Ip;
+		}
+
+		if (reader.ValueTextEquals(MemberIntegerRange))
+		{
+			return FieldType.IntegerRange;
+		}
+
+		if (reader.ValueTextEquals(MemberInteger))
+		{
+			return FieldType.Integer;
+		}
+
+		if (reader.ValueTextEquals(MemberIcuCollationKeyword))
+		{
+			return FieldType.IcuCollationKeyword;
+		}
+
+		if (reader.ValueTextEquals(MemberHistogram))
+		{
+			return FieldType.Histogram;
+		}
+
+		if (reader.ValueTextEquals(MemberHalfFloat))
+		{
+			return FieldType.HalfFloat;
+		}
+
+		if (reader.ValueTextEquals(MemberGeoShape))
+		{
+			return FieldType.GeoShape;
+		}
+
+		if (reader.ValueTextEquals(MemberGeoPoint))
+		{
+			return FieldType.GeoPoint;
+		}
+
+		if (reader.ValueTextEquals(MemberFloatRange))
+		{
+			return FieldType.FloatRange;
+		}
+
+		if (reader.ValueTextEquals(MemberFloat))
+		{
+			return FieldType.Float;
+		}
+
+		if (reader.ValueTextEquals(MemberFlattened))
+		{
+			return FieldType.Flattened;
+		}
+
+		if (reader.ValueTextEquals(MemberDoubleRange))
+		{
+			return FieldType.DoubleRange;
+		}
+
+		if (reader.ValueTextEquals(MemberDouble))
+		{
+			return FieldType.Double;
+		}
+
+		if (reader.ValueTextEquals(MemberDenseVector))
+		{
+			return FieldType.DenseVector;
+		}
+
+		if (reader.ValueTextEquals(MemberDateRange))
+		{
+			return FieldType.DateRange;
+		}
+
+		if (reader.ValueTextEquals(MemberDateNanos))
+		{
+			return FieldType.DateNanos;
+		}
+
+		if (reader.ValueTextEquals(MemberDate))
+		{
+			return FieldType.Date;
+		}
+
+		if (reader.ValueTextEquals(MemberConstantKeyword))
+		{
+			return FieldType.ConstantKeyword;
+		}
+
+		if (reader.ValueTextEquals(MemberCompletion))
+		{
+			return FieldType.Completion;
+		}
+
+		if (reader.ValueTextEquals(MemberByte))
+		{
+			return FieldType.Byte;
+		}
+
+		if (reader.ValueTextEquals(MemberBoolean))
+		{
+			return FieldType.Boolean;
+		}
+
+		if (reader.ValueTextEquals(MemberBinary))
+		{
+			return FieldType.Binary;
+		}
+
+		if (reader.ValueTextEquals(MemberAlias))
+		{
+			return FieldType.Alias;
+		}
+
+		if (reader.ValueTextEquals(MemberAggregateMetricDouble))
+		{
+			return FieldType.AggregateMetricDouble;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(FieldType)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, FieldType value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, FieldType value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case FieldType.Version:
-				writer.WriteStringValue("version");
-				return;
+				writer.WriteStringValue(MemberVersion);
+				break;
 			case FieldType.TokenCount:
-				writer.WriteStringValue("token_count");
-				return;
+				writer.WriteStringValue(MemberTokenCount);
+				break;
 			case FieldType.Text:
-				writer.WriteStringValue("text");
-				return;
+				writer.WriteStringValue(MemberText);
+				break;
 			case FieldType.SparseVector:
-				writer.WriteStringValue("sparse_vector");
-				return;
+				writer.WriteStringValue(MemberSparseVector);
+				break;
 			case FieldType.Short:
-				writer.WriteStringValue("short");
-				return;
+				writer.WriteStringValue(MemberShort);
+				break;
 			case FieldType.Shape:
-				writer.WriteStringValue("shape");
-				return;
+				writer.WriteStringValue(MemberShape);
+				break;
 			case FieldType.SemanticText:
-				writer.WriteStringValue("semantic_text");
-				return;
+				writer.WriteStringValue(MemberSemanticText);
+				break;
 			case FieldType.SearchAsYouType:
-				writer.WriteStringValue("search_as_you_type");
-				return;
+				writer.WriteStringValue(MemberSearchAsYouType);
+				break;
 			case FieldType.ScaledFloat:
-				writer.WriteStringValue("scaled_float");
-				return;
+				writer.WriteStringValue(MemberScaledFloat);
+				break;
 			case FieldType.RankFeatures:
-				writer.WriteStringValue("rank_features");
-				return;
+				writer.WriteStringValue(MemberRankFeatures);
+				break;
 			case FieldType.RankFeature:
-				writer.WriteStringValue("rank_feature");
-				return;
+				writer.WriteStringValue(MemberRankFeature);
+				break;
 			case FieldType.Percolator:
-				writer.WriteStringValue("percolator");
-				return;
+				writer.WriteStringValue(MemberPercolator);
+				break;
 			case FieldType.Passthrough:
-				writer.WriteStringValue("passthrough");
-				return;
+				writer.WriteStringValue(MemberPassthrough);
+				break;
 			case FieldType.Object:
-				writer.WriteStringValue("object");
-				return;
+				writer.WriteStringValue(MemberObject);
+				break;
 			case FieldType.None:
-				writer.WriteStringValue("none");
-				return;
+				writer.WriteStringValue(MemberNone);
+				break;
 			case FieldType.Nested:
-				writer.WriteStringValue("nested");
-				return;
+				writer.WriteStringValue(MemberNested);
+				break;
 			case FieldType.Murmur3:
-				writer.WriteStringValue("murmur3");
-				return;
+				writer.WriteStringValue(MemberMurmur3);
+				break;
 			case FieldType.MatchOnlyText:
-				writer.WriteStringValue("match_only_text");
-				return;
+				writer.WriteStringValue(MemberMatchOnlyText);
+				break;
 			case FieldType.LongRange:
-				writer.WriteStringValue("long_range");
-				return;
+				writer.WriteStringValue(MemberLongRange);
+				break;
 			case FieldType.Long:
-				writer.WriteStringValue("long");
-				return;
+				writer.WriteStringValue(MemberLong);
+				break;
 			case FieldType.Keyword:
-				writer.WriteStringValue("keyword");
-				return;
+				writer.WriteStringValue(MemberKeyword);
+				break;
 			case FieldType.Join:
-				writer.WriteStringValue("join");
-				return;
+				writer.WriteStringValue(MemberJoin);
+				break;
 			case FieldType.IpRange:
-				writer.WriteStringValue("ip_range");
-				return;
+				writer.WriteStringValue(MemberIpRange);
+				break;
 			case FieldType.Ip:
-				writer.WriteStringValue("ip");
-				return;
+				writer.WriteStringValue(MemberIp);
+				break;
 			case FieldType.IntegerRange:
-				writer.WriteStringValue("integer_range");
-				return;
+				writer.WriteStringValue(MemberIntegerRange);
+				break;
 			case FieldType.Integer:
-				writer.WriteStringValue("integer");
-				return;
+				writer.WriteStringValue(MemberInteger);
+				break;
 			case FieldType.IcuCollationKeyword:
-				writer.WriteStringValue("icu_collation_keyword");
-				return;
+				writer.WriteStringValue(MemberIcuCollationKeyword);
+				break;
 			case FieldType.Histogram:
-				writer.WriteStringValue("histogram");
-				return;
+				writer.WriteStringValue(MemberHistogram);
+				break;
 			case FieldType.HalfFloat:
-				writer.WriteStringValue("half_float");
-				return;
+				writer.WriteStringValue(MemberHalfFloat);
+				break;
 			case FieldType.GeoShape:
-				writer.WriteStringValue("geo_shape");
-				return;
+				writer.WriteStringValue(MemberGeoShape);
+				break;
 			case FieldType.GeoPoint:
-				writer.WriteStringValue("geo_point");
-				return;
+				writer.WriteStringValue(MemberGeoPoint);
+				break;
 			case FieldType.FloatRange:
-				writer.WriteStringValue("float_range");
-				return;
+				writer.WriteStringValue(MemberFloatRange);
+				break;
 			case FieldType.Float:
-				writer.WriteStringValue("float");
-				return;
+				writer.WriteStringValue(MemberFloat);
+				break;
 			case FieldType.Flattened:
-				writer.WriteStringValue("flattened");
-				return;
+				writer.WriteStringValue(MemberFlattened);
+				break;
 			case FieldType.DoubleRange:
-				writer.WriteStringValue("double_range");
-				return;
+				writer.WriteStringValue(MemberDoubleRange);
+				break;
 			case FieldType.Double:
-				writer.WriteStringValue("double");
-				return;
+				writer.WriteStringValue(MemberDouble);
+				break;
 			case FieldType.DenseVector:
-				writer.WriteStringValue("dense_vector");
-				return;
+				writer.WriteStringValue(MemberDenseVector);
+				break;
 			case FieldType.DateRange:
-				writer.WriteStringValue("date_range");
-				return;
+				writer.WriteStringValue(MemberDateRange);
+				break;
 			case FieldType.DateNanos:
-				writer.WriteStringValue("date_nanos");
-				return;
+				writer.WriteStringValue(MemberDateNanos);
+				break;
 			case FieldType.Date:
-				writer.WriteStringValue("date");
-				return;
+				writer.WriteStringValue(MemberDate);
+				break;
 			case FieldType.ConstantKeyword:
-				writer.WriteStringValue("constant_keyword");
-				return;
+				writer.WriteStringValue(MemberConstantKeyword);
+				break;
 			case FieldType.Completion:
-				writer.WriteStringValue("completion");
-				return;
+				writer.WriteStringValue(MemberCompletion);
+				break;
 			case FieldType.Byte:
-				writer.WriteStringValue("byte");
-				return;
+				writer.WriteStringValue(MemberByte);
+				break;
 			case FieldType.Boolean:
-				writer.WriteStringValue("boolean");
-				return;
+				writer.WriteStringValue(MemberBoolean);
+				break;
 			case FieldType.Binary:
-				writer.WriteStringValue("binary");
-				return;
+				writer.WriteStringValue(MemberBinary);
+				break;
 			case FieldType.Alias:
-				writer.WriteStringValue("alias");
-				return;
+				writer.WriteStringValue(MemberAlias);
+				break;
 			case FieldType.AggregateMetricDouble:
-				writer.WriteStringValue("aggregate_metric_double");
-				return;
+				writer.WriteStringValue(MemberAggregateMetricDouble);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(FieldType)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -742,42 +979,46 @@ public enum GeoOrientation
 	Left
 }
 
-internal sealed class GeoOrientationConverter : JsonConverter<GeoOrientation>
+internal sealed partial class GeoOrientationConverter : System.Text.Json.Serialization.JsonConverter<GeoOrientation>
 {
-	public override GeoOrientation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberRight = System.Text.Json.JsonEncodedText.Encode("right");
+	private static readonly System.Text.Json.JsonEncodedText MemberRight1 = System.Text.Json.JsonEncodedText.Encode("RIGHT");
+	private static readonly System.Text.Json.JsonEncodedText MemberRight2 = System.Text.Json.JsonEncodedText.Encode("counterclockwise");
+	private static readonly System.Text.Json.JsonEncodedText MemberRight3 = System.Text.Json.JsonEncodedText.Encode("ccw");
+	private static readonly System.Text.Json.JsonEncodedText MemberLeft = System.Text.Json.JsonEncodedText.Encode("left");
+	private static readonly System.Text.Json.JsonEncodedText MemberLeft1 = System.Text.Json.JsonEncodedText.Encode("LEFT");
+	private static readonly System.Text.Json.JsonEncodedText MemberLeft2 = System.Text.Json.JsonEncodedText.Encode("clockwise");
+	private static readonly System.Text.Json.JsonEncodedText MemberLeft3 = System.Text.Json.JsonEncodedText.Encode("cw");
+
+	public override GeoOrientation Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "right":
-			case "RIGHT":
-			case "counterclockwise":
-			case "ccw":
-				return GeoOrientation.Right;
-			case "left":
-			case "LEFT":
-			case "clockwise":
-			case "cw":
-				return GeoOrientation.Left;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberRight) || reader.ValueTextEquals(MemberRight1) || reader.ValueTextEquals(MemberRight2) || reader.ValueTextEquals(MemberRight3))
+		{
+			return GeoOrientation.Right;
+		}
+
+		if (reader.ValueTextEquals(MemberLeft) || reader.ValueTextEquals(MemberLeft1) || reader.ValueTextEquals(MemberLeft2) || reader.ValueTextEquals(MemberLeft3))
+		{
+			return GeoOrientation.Left;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(GeoOrientation)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, GeoOrientation value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GeoOrientation value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case GeoOrientation.Right:
-				writer.WriteStringValue("right");
-				return;
+				writer.WriteStringValue(MemberRight);
+				break;
 			case GeoOrientation.Left:
-				writer.WriteStringValue("left");
-				return;
+				writer.WriteStringValue(MemberLeft);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(GeoOrientation)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -790,36 +1031,40 @@ public enum GeoStrategy
 	Recursive
 }
 
-internal sealed class GeoStrategyConverter : JsonConverter<GeoStrategy>
+internal sealed partial class GeoStrategyConverter : System.Text.Json.Serialization.JsonConverter<GeoStrategy>
 {
-	public override GeoStrategy Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberTerm = System.Text.Json.JsonEncodedText.Encode("term");
+	private static readonly System.Text.Json.JsonEncodedText MemberRecursive = System.Text.Json.JsonEncodedText.Encode("recursive");
+
+	public override GeoStrategy Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberTerm))
 		{
-			case "term":
-				return GeoStrategy.Term;
-			case "recursive":
-				return GeoStrategy.Recursive;
+			return GeoStrategy.Term;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberRecursive))
+		{
+			return GeoStrategy.Recursive;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(GeoStrategy)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, GeoStrategy value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GeoStrategy value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case GeoStrategy.Term:
-				writer.WriteStringValue("term");
-				return;
+				writer.WriteStringValue(MemberTerm);
+				break;
 			case GeoStrategy.Recursive:
-				writer.WriteStringValue("recursive");
-				return;
+				writer.WriteStringValue(MemberRecursive);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(GeoStrategy)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -836,46 +1081,58 @@ public enum IndexOptions
 	Docs
 }
 
-internal sealed class IndexOptionsConverter : JsonConverter<IndexOptions>
+internal sealed partial class IndexOptionsConverter : System.Text.Json.Serialization.JsonConverter<IndexOptions>
 {
-	public override IndexOptions Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberPositions = System.Text.Json.JsonEncodedText.Encode("positions");
+	private static readonly System.Text.Json.JsonEncodedText MemberOffsets = System.Text.Json.JsonEncodedText.Encode("offsets");
+	private static readonly System.Text.Json.JsonEncodedText MemberFreqs = System.Text.Json.JsonEncodedText.Encode("freqs");
+	private static readonly System.Text.Json.JsonEncodedText MemberDocs = System.Text.Json.JsonEncodedText.Encode("docs");
+
+	public override IndexOptions Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberPositions))
+		{
+			return IndexOptions.Positions;
+		}
+
+		if (reader.ValueTextEquals(MemberOffsets))
 		{
-			case "positions":
-				return IndexOptions.Positions;
-			case "offsets":
-				return IndexOptions.Offsets;
-			case "freqs":
-				return IndexOptions.Freqs;
-			case "docs":
-				return IndexOptions.Docs;
+			return IndexOptions.Offsets;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberFreqs))
+		{
+			return IndexOptions.Freqs;
+		}
+
+		if (reader.ValueTextEquals(MemberDocs))
+		{
+			return IndexOptions.Docs;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(IndexOptions)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, IndexOptions value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IndexOptions value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case IndexOptions.Positions:
-				writer.WriteStringValue("positions");
-				return;
+				writer.WriteStringValue(MemberPositions);
+				break;
 			case IndexOptions.Offsets:
-				writer.WriteStringValue("offsets");
-				return;
+				writer.WriteStringValue(MemberOffsets);
+				break;
 			case IndexOptions.Freqs:
-				writer.WriteStringValue("freqs");
-				return;
+				writer.WriteStringValue(MemberFreqs);
+				break;
 			case IndexOptions.Docs:
-				writer.WriteStringValue("docs");
-				return;
+				writer.WriteStringValue(MemberDocs);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(IndexOptions)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -888,36 +1145,40 @@ public enum MatchType
 	Regex
 }
 
-internal sealed class MatchTypeConverter : JsonConverter<MatchType>
+internal sealed partial class MatchTypeConverter : System.Text.Json.Serialization.JsonConverter<MatchType>
 {
-	public override MatchType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberSimple = System.Text.Json.JsonEncodedText.Encode("simple");
+	private static readonly System.Text.Json.JsonEncodedText MemberRegex = System.Text.Json.JsonEncodedText.Encode("regex");
+
+	public override MatchType Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberSimple))
+		{
+			return MatchType.Simple;
+		}
+
+		if (reader.ValueTextEquals(MemberRegex))
 		{
-			case "simple":
-				return MatchType.Simple;
-			case "regex":
-				return MatchType.Regex;
+			return MatchType.Regex;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(MatchType)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, MatchType value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, MatchType value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case MatchType.Simple:
-				writer.WriteStringValue("simple");
-				return;
+				writer.WriteStringValue(MemberSimple);
+				break;
 			case MatchType.Regex:
-				writer.WriteStringValue("regex");
-				return;
+				writer.WriteStringValue(MemberRegex);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(MatchType)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -930,36 +1191,40 @@ public enum OnScriptError
 	Continue
 }
 
-internal sealed class OnScriptErrorConverter : JsonConverter<OnScriptError>
+internal sealed partial class OnScriptErrorConverter : System.Text.Json.Serialization.JsonConverter<OnScriptError>
 {
-	public override OnScriptError Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberFail = System.Text.Json.JsonEncodedText.Encode("fail");
+	private static readonly System.Text.Json.JsonEncodedText MemberContinue = System.Text.Json.JsonEncodedText.Encode("continue");
+
+	public override OnScriptError Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberFail))
 		{
-			case "fail":
-				return OnScriptError.Fail;
-			case "continue":
-				return OnScriptError.Continue;
+			return OnScriptError.Fail;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberContinue))
+		{
+			return OnScriptError.Continue;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(OnScriptError)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, OnScriptError value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, OnScriptError value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case OnScriptError.Fail:
-				writer.WriteStringValue("fail");
-				return;
+				writer.WriteStringValue(MemberFail);
+				break;
 			case OnScriptError.Continue:
-				writer.WriteStringValue("continue");
-				return;
+				writer.WriteStringValue(MemberContinue);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(OnScriptError)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -986,71 +1251,103 @@ public enum RuntimeFieldType
 	Boolean
 }
 
-internal sealed class RuntimeFieldTypeConverter : JsonConverter<RuntimeFieldType>
+internal sealed partial class RuntimeFieldTypeConverter : System.Text.Json.Serialization.JsonConverter<RuntimeFieldType>
 {
-	public override RuntimeFieldType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberLookup = System.Text.Json.JsonEncodedText.Encode("lookup");
+	private static readonly System.Text.Json.JsonEncodedText MemberLong = System.Text.Json.JsonEncodedText.Encode("long");
+	private static readonly System.Text.Json.JsonEncodedText MemberKeyword = System.Text.Json.JsonEncodedText.Encode("keyword");
+	private static readonly System.Text.Json.JsonEncodedText MemberIp = System.Text.Json.JsonEncodedText.Encode("ip");
+	private static readonly System.Text.Json.JsonEncodedText MemberGeoPoint = System.Text.Json.JsonEncodedText.Encode("geo_point");
+	private static readonly System.Text.Json.JsonEncodedText MemberDouble = System.Text.Json.JsonEncodedText.Encode("double");
+	private static readonly System.Text.Json.JsonEncodedText MemberDate = System.Text.Json.JsonEncodedText.Encode("date");
+	private static readonly System.Text.Json.JsonEncodedText MemberComposite = System.Text.Json.JsonEncodedText.Encode("composite");
+	private static readonly System.Text.Json.JsonEncodedText MemberBoolean = System.Text.Json.JsonEncodedText.Encode("boolean");
+
+	public override RuntimeFieldType Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "lookup":
-				return RuntimeFieldType.Lookup;
-			case "long":
-				return RuntimeFieldType.Long;
-			case "keyword":
-				return RuntimeFieldType.Keyword;
-			case "ip":
-				return RuntimeFieldType.Ip;
-			case "geo_point":
-				return RuntimeFieldType.GeoPoint;
-			case "double":
-				return RuntimeFieldType.Double;
-			case "date":
-				return RuntimeFieldType.Date;
-			case "composite":
-				return RuntimeFieldType.Composite;
-			case "boolean":
-				return RuntimeFieldType.Boolean;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberLookup))
+		{
+			return RuntimeFieldType.Lookup;
+		}
+
+		if (reader.ValueTextEquals(MemberLong))
+		{
+			return RuntimeFieldType.Long;
+		}
+
+		if (reader.ValueTextEquals(MemberKeyword))
+		{
+			return RuntimeFieldType.Keyword;
+		}
+
+		if (reader.ValueTextEquals(MemberIp))
+		{
+			return RuntimeFieldType.Ip;
+		}
+
+		if (reader.ValueTextEquals(MemberGeoPoint))
+		{
+			return RuntimeFieldType.GeoPoint;
+		}
+
+		if (reader.ValueTextEquals(MemberDouble))
+		{
+			return RuntimeFieldType.Double;
+		}
+
+		if (reader.ValueTextEquals(MemberDate))
+		{
+			return RuntimeFieldType.Date;
+		}
+
+		if (reader.ValueTextEquals(MemberComposite))
+		{
+			return RuntimeFieldType.Composite;
+		}
+
+		if (reader.ValueTextEquals(MemberBoolean))
+		{
+			return RuntimeFieldType.Boolean;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(RuntimeFieldType)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, RuntimeFieldType value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, RuntimeFieldType value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case RuntimeFieldType.Lookup:
-				writer.WriteStringValue("lookup");
-				return;
+				writer.WriteStringValue(MemberLookup);
+				break;
 			case RuntimeFieldType.Long:
-				writer.WriteStringValue("long");
-				return;
+				writer.WriteStringValue(MemberLong);
+				break;
 			case RuntimeFieldType.Keyword:
-				writer.WriteStringValue("keyword");
-				return;
+				writer.WriteStringValue(MemberKeyword);
+				break;
 			case RuntimeFieldType.Ip:
-				writer.WriteStringValue("ip");
-				return;
+				writer.WriteStringValue(MemberIp);
+				break;
 			case RuntimeFieldType.GeoPoint:
-				writer.WriteStringValue("geo_point");
-				return;
+				writer.WriteStringValue(MemberGeoPoint);
+				break;
 			case RuntimeFieldType.Double:
-				writer.WriteStringValue("double");
-				return;
+				writer.WriteStringValue(MemberDouble);
+				break;
 			case RuntimeFieldType.Date:
-				writer.WriteStringValue("date");
-				return;
+				writer.WriteStringValue(MemberDate);
+				break;
 			case RuntimeFieldType.Composite:
-				writer.WriteStringValue("composite");
-				return;
+				writer.WriteStringValue(MemberComposite);
+				break;
 			case RuntimeFieldType.Boolean:
-				writer.WriteStringValue("boolean");
-				return;
+				writer.WriteStringValue(MemberBoolean);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(RuntimeFieldType)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -1071,41 +1368,49 @@ public enum SourceFieldMode
 	Disabled
 }
 
-internal sealed class SourceFieldModeConverter : JsonConverter<SourceFieldMode>
+internal sealed partial class SourceFieldModeConverter : System.Text.Json.Serialization.JsonConverter<SourceFieldMode>
 {
-	public override SourceFieldMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberSynthetic = System.Text.Json.JsonEncodedText.Encode("synthetic");
+	private static readonly System.Text.Json.JsonEncodedText MemberStored = System.Text.Json.JsonEncodedText.Encode("stored");
+	private static readonly System.Text.Json.JsonEncodedText MemberDisabled = System.Text.Json.JsonEncodedText.Encode("disabled");
+
+	public override SourceFieldMode Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberSynthetic))
 		{
-			case "synthetic":
-				return SourceFieldMode.Synthetic;
-			case "stored":
-				return SourceFieldMode.Stored;
-			case "disabled":
-				return SourceFieldMode.Disabled;
+			return SourceFieldMode.Synthetic;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberStored))
+		{
+			return SourceFieldMode.Stored;
+		}
+
+		if (reader.ValueTextEquals(MemberDisabled))
+		{
+			return SourceFieldMode.Disabled;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(SourceFieldMode)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, SourceFieldMode value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SourceFieldMode value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case SourceFieldMode.Synthetic:
-				writer.WriteStringValue("synthetic");
-				return;
+				writer.WriteStringValue(MemberSynthetic);
+				break;
 			case SourceFieldMode.Stored:
-				writer.WriteStringValue("stored");
-				return;
+				writer.WriteStringValue(MemberStored);
+				break;
 			case SourceFieldMode.Disabled:
-				writer.WriteStringValue("disabled");
-				return;
+				writer.WriteStringValue(MemberDisabled);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(SourceFieldMode)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -1128,61 +1433,85 @@ public enum TermVectorOption
 	No
 }
 
-internal sealed class TermVectorOptionConverter : JsonConverter<TermVectorOption>
+internal sealed partial class TermVectorOptionConverter : System.Text.Json.Serialization.JsonConverter<TermVectorOption>
 {
-	public override TermVectorOption Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberYes = System.Text.Json.JsonEncodedText.Encode("yes");
+	private static readonly System.Text.Json.JsonEncodedText MemberWithPositionsPayloads = System.Text.Json.JsonEncodedText.Encode("with_positions_payloads");
+	private static readonly System.Text.Json.JsonEncodedText MemberWithPositionsOffsetsPayloads = System.Text.Json.JsonEncodedText.Encode("with_positions_offsets_payloads");
+	private static readonly System.Text.Json.JsonEncodedText MemberWithPositionsOffsets = System.Text.Json.JsonEncodedText.Encode("with_positions_offsets");
+	private static readonly System.Text.Json.JsonEncodedText MemberWithPositions = System.Text.Json.JsonEncodedText.Encode("with_positions");
+	private static readonly System.Text.Json.JsonEncodedText MemberWithOffsets = System.Text.Json.JsonEncodedText.Encode("with_offsets");
+	private static readonly System.Text.Json.JsonEncodedText MemberNo = System.Text.Json.JsonEncodedText.Encode("no");
+
+	public override TermVectorOption Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "yes":
-				return TermVectorOption.Yes;
-			case "with_positions_payloads":
-				return TermVectorOption.WithPositionsPayloads;
-			case "with_positions_offsets_payloads":
-				return TermVectorOption.WithPositionsOffsetsPayloads;
-			case "with_positions_offsets":
-				return TermVectorOption.WithPositionsOffsets;
-			case "with_positions":
-				return TermVectorOption.WithPositions;
-			case "with_offsets":
-				return TermVectorOption.WithOffsets;
-			case "no":
-				return TermVectorOption.No;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberYes))
+		{
+			return TermVectorOption.Yes;
+		}
+
+		if (reader.ValueTextEquals(MemberWithPositionsPayloads))
+		{
+			return TermVectorOption.WithPositionsPayloads;
+		}
+
+		if (reader.ValueTextEquals(MemberWithPositionsOffsetsPayloads))
+		{
+			return TermVectorOption.WithPositionsOffsetsPayloads;
+		}
+
+		if (reader.ValueTextEquals(MemberWithPositionsOffsets))
+		{
+			return TermVectorOption.WithPositionsOffsets;
+		}
+
+		if (reader.ValueTextEquals(MemberWithPositions))
+		{
+			return TermVectorOption.WithPositions;
+		}
+
+		if (reader.ValueTextEquals(MemberWithOffsets))
+		{
+			return TermVectorOption.WithOffsets;
+		}
+
+		if (reader.ValueTextEquals(MemberNo))
+		{
+			return TermVectorOption.No;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(TermVectorOption)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, TermVectorOption value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, TermVectorOption value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case TermVectorOption.Yes:
-				writer.WriteStringValue("yes");
-				return;
+				writer.WriteStringValue(MemberYes);
+				break;
 			case TermVectorOption.WithPositionsPayloads:
-				writer.WriteStringValue("with_positions_payloads");
-				return;
+				writer.WriteStringValue(MemberWithPositionsPayloads);
+				break;
 			case TermVectorOption.WithPositionsOffsetsPayloads:
-				writer.WriteStringValue("with_positions_offsets_payloads");
-				return;
+				writer.WriteStringValue(MemberWithPositionsOffsetsPayloads);
+				break;
 			case TermVectorOption.WithPositionsOffsets:
-				writer.WriteStringValue("with_positions_offsets");
-				return;
+				writer.WriteStringValue(MemberWithPositionsOffsets);
+				break;
 			case TermVectorOption.WithPositions:
-				writer.WriteStringValue("with_positions");
-				return;
+				writer.WriteStringValue(MemberWithPositions);
+				break;
 			case TermVectorOption.WithOffsets:
-				writer.WriteStringValue("with_offsets");
-				return;
+				writer.WriteStringValue(MemberWithOffsets);
+				break;
 			case TermVectorOption.No:
-				writer.WriteStringValue("no");
-				return;
+				writer.WriteStringValue(MemberNo);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(TermVectorOption)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -1201,50 +1530,66 @@ public enum TimeSeriesMetricType
 	Counter
 }
 
-internal sealed class TimeSeriesMetricTypeConverter : JsonConverter<TimeSeriesMetricType>
+internal sealed partial class TimeSeriesMetricTypeConverter : System.Text.Json.Serialization.JsonConverter<TimeSeriesMetricType>
 {
-	public override TimeSeriesMetricType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberSummary = System.Text.Json.JsonEncodedText.Encode("summary");
+	private static readonly System.Text.Json.JsonEncodedText MemberPosition = System.Text.Json.JsonEncodedText.Encode("position");
+	private static readonly System.Text.Json.JsonEncodedText MemberHistogram = System.Text.Json.JsonEncodedText.Encode("histogram");
+	private static readonly System.Text.Json.JsonEncodedText MemberGauge = System.Text.Json.JsonEncodedText.Encode("gauge");
+	private static readonly System.Text.Json.JsonEncodedText MemberCounter = System.Text.Json.JsonEncodedText.Encode("counter");
+
+	public override TimeSeriesMetricType Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "summary":
-				return TimeSeriesMetricType.Summary;
-			case "position":
-				return TimeSeriesMetricType.Position;
-			case "histogram":
-				return TimeSeriesMetricType.Histogram;
-			case "gauge":
-				return TimeSeriesMetricType.Gauge;
-			case "counter":
-				return TimeSeriesMetricType.Counter;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberSummary))
+		{
+			return TimeSeriesMetricType.Summary;
+		}
+
+		if (reader.ValueTextEquals(MemberPosition))
+		{
+			return TimeSeriesMetricType.Position;
+		}
+
+		if (reader.ValueTextEquals(MemberHistogram))
+		{
+			return TimeSeriesMetricType.Histogram;
+		}
+
+		if (reader.ValueTextEquals(MemberGauge))
+		{
+			return TimeSeriesMetricType.Gauge;
+		}
+
+		if (reader.ValueTextEquals(MemberCounter))
+		{
+			return TimeSeriesMetricType.Counter;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(TimeSeriesMetricType)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, TimeSeriesMetricType value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, TimeSeriesMetricType value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case TimeSeriesMetricType.Summary:
-				writer.WriteStringValue("summary");
-				return;
+				writer.WriteStringValue(MemberSummary);
+				break;
 			case TimeSeriesMetricType.Position:
-				writer.WriteStringValue("position");
-				return;
+				writer.WriteStringValue(MemberPosition);
+				break;
 			case TimeSeriesMetricType.Histogram:
-				writer.WriteStringValue("histogram");
-				return;
+				writer.WriteStringValue(MemberHistogram);
+				break;
 			case TimeSeriesMetricType.Gauge:
-				writer.WriteStringValue("gauge");
-				return;
+				writer.WriteStringValue(MemberGauge);
+				break;
 			case TimeSeriesMetricType.Counter:
-				writer.WriteStringValue("counter");
-				return;
+				writer.WriteStringValue(MemberCounter);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(TimeSeriesMetricType)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
\ No newline at end of file
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 f2c5c6202bc..56b68d59204 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
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Core;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport;
 using System;
@@ -43,51 +44,67 @@ public enum ClusterInfoTarget
 	All
 }
 
-internal sealed class ClusterInfoTargetConverter : JsonConverter<ClusterInfoTarget>
+internal sealed partial class ClusterInfoTargetConverter : System.Text.Json.Serialization.JsonConverter<ClusterInfoTarget>
 {
-	public override ClusterInfoTarget Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberThreadPool = System.Text.Json.JsonEncodedText.Encode("thread_pool");
+	private static readonly System.Text.Json.JsonEncodedText MemberScript = System.Text.Json.JsonEncodedText.Encode("script");
+	private static readonly System.Text.Json.JsonEncodedText MemberIngest = System.Text.Json.JsonEncodedText.Encode("ingest");
+	private static readonly System.Text.Json.JsonEncodedText MemberHttp = System.Text.Json.JsonEncodedText.Encode("http");
+	private static readonly System.Text.Json.JsonEncodedText MemberAll = System.Text.Json.JsonEncodedText.Encode("_all");
+
+	public override ClusterInfoTarget Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "thread_pool":
-				return ClusterInfoTarget.ThreadPool;
-			case "script":
-				return ClusterInfoTarget.Script;
-			case "ingest":
-				return ClusterInfoTarget.Ingest;
-			case "http":
-				return ClusterInfoTarget.Http;
-			case "_all":
-				return ClusterInfoTarget.All;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberThreadPool))
+		{
+			return ClusterInfoTarget.ThreadPool;
+		}
+
+		if (reader.ValueTextEquals(MemberScript))
+		{
+			return ClusterInfoTarget.Script;
+		}
+
+		if (reader.ValueTextEquals(MemberIngest))
+		{
+			return ClusterInfoTarget.Ingest;
+		}
+
+		if (reader.ValueTextEquals(MemberHttp))
+		{
+			return ClusterInfoTarget.Http;
+		}
+
+		if (reader.ValueTextEquals(MemberAll))
+		{
+			return ClusterInfoTarget.All;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(ClusterInfoTarget)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, ClusterInfoTarget value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ClusterInfoTarget value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case ClusterInfoTarget.ThreadPool:
-				writer.WriteStringValue("thread_pool");
-				return;
+				writer.WriteStringValue(MemberThreadPool);
+				break;
 			case ClusterInfoTarget.Script:
-				writer.WriteStringValue("script");
-				return;
+				writer.WriteStringValue(MemberScript);
+				break;
 			case ClusterInfoTarget.Ingest:
-				writer.WriteStringValue("ingest");
-				return;
+				writer.WriteStringValue(MemberIngest);
+				break;
 			case ClusterInfoTarget.Http:
-				writer.WriteStringValue("http");
-				return;
+				writer.WriteStringValue(MemberHttp);
+				break;
 			case ClusterInfoTarget.All:
-				writer.WriteStringValue("_all");
-				return;
+				writer.WriteStringValue(MemberAll);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(ClusterInfoTarget)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -106,51 +123,67 @@ public enum ClusterSearchStatus
 	Failed
 }
 
-internal sealed class ClusterSearchStatusConverter : JsonConverter<ClusterSearchStatus>
+internal sealed partial class ClusterSearchStatusConverter : System.Text.Json.Serialization.JsonConverter<ClusterSearchStatus>
 {
-	public override ClusterSearchStatus Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberSuccessful = System.Text.Json.JsonEncodedText.Encode("successful");
+	private static readonly System.Text.Json.JsonEncodedText MemberSkipped = System.Text.Json.JsonEncodedText.Encode("skipped");
+	private static readonly System.Text.Json.JsonEncodedText MemberRunning = System.Text.Json.JsonEncodedText.Encode("running");
+	private static readonly System.Text.Json.JsonEncodedText MemberPartial = System.Text.Json.JsonEncodedText.Encode("partial");
+	private static readonly System.Text.Json.JsonEncodedText MemberFailed = System.Text.Json.JsonEncodedText.Encode("failed");
+
+	public override ClusterSearchStatus Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "successful":
-				return ClusterSearchStatus.Successful;
-			case "skipped":
-				return ClusterSearchStatus.Skipped;
-			case "running":
-				return ClusterSearchStatus.Running;
-			case "partial":
-				return ClusterSearchStatus.Partial;
-			case "failed":
-				return ClusterSearchStatus.Failed;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberSuccessful))
+		{
+			return ClusterSearchStatus.Successful;
+		}
+
+		if (reader.ValueTextEquals(MemberSkipped))
+		{
+			return ClusterSearchStatus.Skipped;
+		}
+
+		if (reader.ValueTextEquals(MemberRunning))
+		{
+			return ClusterSearchStatus.Running;
+		}
+
+		if (reader.ValueTextEquals(MemberPartial))
+		{
+			return ClusterSearchStatus.Partial;
+		}
+
+		if (reader.ValueTextEquals(MemberFailed))
+		{
+			return ClusterSearchStatus.Failed;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(ClusterSearchStatus)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, ClusterSearchStatus value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ClusterSearchStatus value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case ClusterSearchStatus.Successful:
-				writer.WriteStringValue("successful");
-				return;
+				writer.WriteStringValue(MemberSuccessful);
+				break;
 			case ClusterSearchStatus.Skipped:
-				writer.WriteStringValue("skipped");
-				return;
+				writer.WriteStringValue(MemberSkipped);
+				break;
 			case ClusterSearchStatus.Running:
-				writer.WriteStringValue("running");
-				return;
+				writer.WriteStringValue(MemberRunning);
+				break;
 			case ClusterSearchStatus.Partial:
-				writer.WriteStringValue("partial");
-				return;
+				writer.WriteStringValue(MemberPartial);
+				break;
 			case ClusterSearchStatus.Failed:
-				writer.WriteStringValue("failed");
-				return;
+				writer.WriteStringValue(MemberFailed);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(ClusterSearchStatus)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -173,36 +206,40 @@ public enum Conflicts
 	Abort
 }
 
-internal sealed class ConflictsConverter : JsonConverter<Conflicts>
+internal sealed partial class ConflictsConverter : System.Text.Json.Serialization.JsonConverter<Conflicts>
 {
-	public override Conflicts Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberProceed = System.Text.Json.JsonEncodedText.Encode("proceed");
+	private static readonly System.Text.Json.JsonEncodedText MemberAbort = System.Text.Json.JsonEncodedText.Encode("abort");
+
+	public override Conflicts Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberProceed))
+		{
+			return Conflicts.Proceed;
+		}
+
+		if (reader.ValueTextEquals(MemberAbort))
 		{
-			case "proceed":
-				return Conflicts.Proceed;
-			case "abort":
-				return Conflicts.Abort;
+			return Conflicts.Abort;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(Conflicts)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, Conflicts value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, Conflicts value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case Conflicts.Proceed:
-				writer.WriteStringValue("proceed");
-				return;
+				writer.WriteStringValue(MemberProceed);
+				break;
 			case Conflicts.Abort:
-				writer.WriteStringValue("abort");
-				return;
+				writer.WriteStringValue(MemberAbort);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(Conflicts)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -217,41 +254,49 @@ public enum DFIIndependenceMeasure
 	Chisquared
 }
 
-internal sealed class DFIIndependenceMeasureConverter : JsonConverter<DFIIndependenceMeasure>
+internal sealed partial class DFIIndependenceMeasureConverter : System.Text.Json.Serialization.JsonConverter<DFIIndependenceMeasure>
 {
-	public override DFIIndependenceMeasure Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberStandardized = System.Text.Json.JsonEncodedText.Encode("standardized");
+	private static readonly System.Text.Json.JsonEncodedText MemberSaturated = System.Text.Json.JsonEncodedText.Encode("saturated");
+	private static readonly System.Text.Json.JsonEncodedText MemberChisquared = System.Text.Json.JsonEncodedText.Encode("chisquared");
+
+	public override DFIIndependenceMeasure Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberStandardized))
+		{
+			return DFIIndependenceMeasure.Standardized;
+		}
+
+		if (reader.ValueTextEquals(MemberSaturated))
+		{
+			return DFIIndependenceMeasure.Saturated;
+		}
+
+		if (reader.ValueTextEquals(MemberChisquared))
 		{
-			case "standardized":
-				return DFIIndependenceMeasure.Standardized;
-			case "saturated":
-				return DFIIndependenceMeasure.Saturated;
-			case "chisquared":
-				return DFIIndependenceMeasure.Chisquared;
+			return DFIIndependenceMeasure.Chisquared;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(DFIIndependenceMeasure)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, DFIIndependenceMeasure value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DFIIndependenceMeasure value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case DFIIndependenceMeasure.Standardized:
-				writer.WriteStringValue("standardized");
-				return;
+				writer.WriteStringValue(MemberStandardized);
+				break;
 			case DFIIndependenceMeasure.Saturated:
-				writer.WriteStringValue("saturated");
-				return;
+				writer.WriteStringValue(MemberSaturated);
+				break;
 			case DFIIndependenceMeasure.Chisquared:
-				writer.WriteStringValue("chisquared");
-				return;
+				writer.WriteStringValue(MemberChisquared);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(DFIIndependenceMeasure)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -266,41 +311,49 @@ public enum DFRAfterEffect
 	b
 }
 
-internal sealed class DFRAfterEffectConverter : JsonConverter<DFRAfterEffect>
+internal sealed partial class DFRAfterEffectConverter : System.Text.Json.Serialization.JsonConverter<DFRAfterEffect>
 {
-	public override DFRAfterEffect Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberNo = System.Text.Json.JsonEncodedText.Encode("no");
+	private static readonly System.Text.Json.JsonEncodedText Memberl = System.Text.Json.JsonEncodedText.Encode("l");
+	private static readonly System.Text.Json.JsonEncodedText Memberb = System.Text.Json.JsonEncodedText.Encode("b");
+
+	public override DFRAfterEffect Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberNo))
 		{
-			case "no":
-				return DFRAfterEffect.No;
-			case "l":
-				return DFRAfterEffect.l;
-			case "b":
-				return DFRAfterEffect.b;
+			return DFRAfterEffect.No;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(Memberl))
+		{
+			return DFRAfterEffect.l;
+		}
+
+		if (reader.ValueTextEquals(Memberb))
+		{
+			return DFRAfterEffect.b;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(DFRAfterEffect)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, DFRAfterEffect value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DFRAfterEffect value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case DFRAfterEffect.No:
-				writer.WriteStringValue("no");
-				return;
+				writer.WriteStringValue(MemberNo);
+				break;
 			case DFRAfterEffect.l:
-				writer.WriteStringValue("l");
-				return;
+				writer.WriteStringValue(Memberl);
+				break;
 			case DFRAfterEffect.b:
-				writer.WriteStringValue("b");
-				return;
+				writer.WriteStringValue(Memberb);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(DFRAfterEffect)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -323,61 +376,85 @@ public enum DFRBasicModel
 	Be
 }
 
-internal sealed class DFRBasicModelConverter : JsonConverter<DFRBasicModel>
+internal sealed partial class DFRBasicModelConverter : System.Text.Json.Serialization.JsonConverter<DFRBasicModel>
 {
-	public override DFRBasicModel Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText Memberp = System.Text.Json.JsonEncodedText.Encode("p");
+	private static readonly System.Text.Json.JsonEncodedText MemberIne = System.Text.Json.JsonEncodedText.Encode("ine");
+	private static readonly System.Text.Json.JsonEncodedText MemberIn = System.Text.Json.JsonEncodedText.Encode("in");
+	private static readonly System.Text.Json.JsonEncodedText MemberIf = System.Text.Json.JsonEncodedText.Encode("if");
+	private static readonly System.Text.Json.JsonEncodedText Memberg = System.Text.Json.JsonEncodedText.Encode("g");
+	private static readonly System.Text.Json.JsonEncodedText Memberd = System.Text.Json.JsonEncodedText.Encode("d");
+	private static readonly System.Text.Json.JsonEncodedText MemberBe = System.Text.Json.JsonEncodedText.Encode("be");
+
+	public override DFRBasicModel Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "p":
-				return DFRBasicModel.p;
-			case "ine":
-				return DFRBasicModel.Ine;
-			case "in":
-				return DFRBasicModel.In;
-			case "if":
-				return DFRBasicModel.If;
-			case "g":
-				return DFRBasicModel.g;
-			case "d":
-				return DFRBasicModel.d;
-			case "be":
-				return DFRBasicModel.Be;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(Memberp))
+		{
+			return DFRBasicModel.p;
+		}
+
+		if (reader.ValueTextEquals(MemberIne))
+		{
+			return DFRBasicModel.Ine;
+		}
+
+		if (reader.ValueTextEquals(MemberIn))
+		{
+			return DFRBasicModel.In;
+		}
+
+		if (reader.ValueTextEquals(MemberIf))
+		{
+			return DFRBasicModel.If;
+		}
+
+		if (reader.ValueTextEquals(Memberg))
+		{
+			return DFRBasicModel.g;
+		}
+
+		if (reader.ValueTextEquals(Memberd))
+		{
+			return DFRBasicModel.d;
+		}
+
+		if (reader.ValueTextEquals(MemberBe))
+		{
+			return DFRBasicModel.Be;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(DFRBasicModel)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, DFRBasicModel value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DFRBasicModel value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case DFRBasicModel.p:
-				writer.WriteStringValue("p");
-				return;
+				writer.WriteStringValue(Memberp);
+				break;
 			case DFRBasicModel.Ine:
-				writer.WriteStringValue("ine");
-				return;
+				writer.WriteStringValue(MemberIne);
+				break;
 			case DFRBasicModel.In:
-				writer.WriteStringValue("in");
-				return;
+				writer.WriteStringValue(MemberIn);
+				break;
 			case DFRBasicModel.If:
-				writer.WriteStringValue("if");
-				return;
+				writer.WriteStringValue(MemberIf);
+				break;
 			case DFRBasicModel.g:
-				writer.WriteStringValue("g");
-				return;
+				writer.WriteStringValue(Memberg);
+				break;
 			case DFRBasicModel.d:
-				writer.WriteStringValue("d");
-				return;
+				writer.WriteStringValue(Memberd);
+				break;
 			case DFRBasicModel.Be:
-				writer.WriteStringValue("be");
-				return;
+				writer.WriteStringValue(MemberBe);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(DFRBasicModel)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -404,71 +481,103 @@ public enum DistanceUnit
 	Centimeters
 }
 
-internal sealed class DistanceUnitConverter : JsonConverter<DistanceUnit>
+internal sealed partial class DistanceUnitConverter : System.Text.Json.Serialization.JsonConverter<DistanceUnit>
 {
-	public override DistanceUnit Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberYards = System.Text.Json.JsonEncodedText.Encode("yd");
+	private static readonly System.Text.Json.JsonEncodedText MemberNauticMiles = System.Text.Json.JsonEncodedText.Encode("nmi");
+	private static readonly System.Text.Json.JsonEncodedText MemberMillimeters = System.Text.Json.JsonEncodedText.Encode("mm");
+	private static readonly System.Text.Json.JsonEncodedText MemberMiles = System.Text.Json.JsonEncodedText.Encode("mi");
+	private static readonly System.Text.Json.JsonEncodedText MemberMeters = System.Text.Json.JsonEncodedText.Encode("m");
+	private static readonly System.Text.Json.JsonEncodedText MemberKilometers = System.Text.Json.JsonEncodedText.Encode("km");
+	private static readonly System.Text.Json.JsonEncodedText MemberInches = System.Text.Json.JsonEncodedText.Encode("in");
+	private static readonly System.Text.Json.JsonEncodedText MemberFeet = System.Text.Json.JsonEncodedText.Encode("ft");
+	private static readonly System.Text.Json.JsonEncodedText MemberCentimeters = System.Text.Json.JsonEncodedText.Encode("cm");
+
+	public override DistanceUnit Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "yd":
-				return DistanceUnit.Yards;
-			case "nmi":
-				return DistanceUnit.NauticMiles;
-			case "mm":
-				return DistanceUnit.Millimeters;
-			case "mi":
-				return DistanceUnit.Miles;
-			case "m":
-				return DistanceUnit.Meters;
-			case "km":
-				return DistanceUnit.Kilometers;
-			case "in":
-				return DistanceUnit.Inches;
-			case "ft":
-				return DistanceUnit.Feet;
-			case "cm":
-				return DistanceUnit.Centimeters;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberYards))
+		{
+			return DistanceUnit.Yards;
+		}
+
+		if (reader.ValueTextEquals(MemberNauticMiles))
+		{
+			return DistanceUnit.NauticMiles;
+		}
+
+		if (reader.ValueTextEquals(MemberMillimeters))
+		{
+			return DistanceUnit.Millimeters;
+		}
+
+		if (reader.ValueTextEquals(MemberMiles))
+		{
+			return DistanceUnit.Miles;
+		}
+
+		if (reader.ValueTextEquals(MemberMeters))
+		{
+			return DistanceUnit.Meters;
+		}
+
+		if (reader.ValueTextEquals(MemberKilometers))
+		{
+			return DistanceUnit.Kilometers;
+		}
+
+		if (reader.ValueTextEquals(MemberInches))
+		{
+			return DistanceUnit.Inches;
+		}
+
+		if (reader.ValueTextEquals(MemberFeet))
+		{
+			return DistanceUnit.Feet;
+		}
+
+		if (reader.ValueTextEquals(MemberCentimeters))
+		{
+			return DistanceUnit.Centimeters;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(DistanceUnit)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, DistanceUnit value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DistanceUnit value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case DistanceUnit.Yards:
-				writer.WriteStringValue("yd");
-				return;
+				writer.WriteStringValue(MemberYards);
+				break;
 			case DistanceUnit.NauticMiles:
-				writer.WriteStringValue("nmi");
-				return;
+				writer.WriteStringValue(MemberNauticMiles);
+				break;
 			case DistanceUnit.Millimeters:
-				writer.WriteStringValue("mm");
-				return;
+				writer.WriteStringValue(MemberMillimeters);
+				break;
 			case DistanceUnit.Miles:
-				writer.WriteStringValue("mi");
-				return;
+				writer.WriteStringValue(MemberMiles);
+				break;
 			case DistanceUnit.Meters:
-				writer.WriteStringValue("m");
-				return;
+				writer.WriteStringValue(MemberMeters);
+				break;
 			case DistanceUnit.Kilometers:
-				writer.WriteStringValue("km");
-				return;
+				writer.WriteStringValue(MemberKilometers);
+				break;
 			case DistanceUnit.Inches:
-				writer.WriteStringValue("in");
-				return;
+				writer.WriteStringValue(MemberInches);
+				break;
 			case DistanceUnit.Feet:
-				writer.WriteStringValue("ft");
-				return;
+				writer.WriteStringValue(MemberFeet);
+				break;
 			case DistanceUnit.Centimeters:
-				writer.WriteStringValue("cm");
-				return;
+				writer.WriteStringValue(MemberCentimeters);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(DistanceUnit)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -512,51 +621,67 @@ public enum ExpandWildcard
 	All
 }
 
-internal sealed class ExpandWildcardConverter : JsonConverter<ExpandWildcard>
+internal sealed partial class ExpandWildcardConverter : System.Text.Json.Serialization.JsonConverter<ExpandWildcard>
 {
-	public override ExpandWildcard Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberOpen = System.Text.Json.JsonEncodedText.Encode("open");
+	private static readonly System.Text.Json.JsonEncodedText MemberNone = System.Text.Json.JsonEncodedText.Encode("none");
+	private static readonly System.Text.Json.JsonEncodedText MemberHidden = System.Text.Json.JsonEncodedText.Encode("hidden");
+	private static readonly System.Text.Json.JsonEncodedText MemberClosed = System.Text.Json.JsonEncodedText.Encode("closed");
+	private static readonly System.Text.Json.JsonEncodedText MemberAll = System.Text.Json.JsonEncodedText.Encode("all");
+
+	public override ExpandWildcard Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "open":
-				return ExpandWildcard.Open;
-			case "none":
-				return ExpandWildcard.None;
-			case "hidden":
-				return ExpandWildcard.Hidden;
-			case "closed":
-				return ExpandWildcard.Closed;
-			case "all":
-				return ExpandWildcard.All;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberOpen))
+		{
+			return ExpandWildcard.Open;
+		}
+
+		if (reader.ValueTextEquals(MemberNone))
+		{
+			return ExpandWildcard.None;
+		}
+
+		if (reader.ValueTextEquals(MemberHidden))
+		{
+			return ExpandWildcard.Hidden;
+		}
+
+		if (reader.ValueTextEquals(MemberClosed))
+		{
+			return ExpandWildcard.Closed;
+		}
+
+		if (reader.ValueTextEquals(MemberAll))
+		{
+			return ExpandWildcard.All;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(ExpandWildcard)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, ExpandWildcard value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ExpandWildcard value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case ExpandWildcard.Open:
-				writer.WriteStringValue("open");
-				return;
+				writer.WriteStringValue(MemberOpen);
+				break;
 			case ExpandWildcard.None:
-				writer.WriteStringValue("none");
-				return;
+				writer.WriteStringValue(MemberNone);
+				break;
 			case ExpandWildcard.Hidden:
-				writer.WriteStringValue("hidden");
-				return;
+				writer.WriteStringValue(MemberHidden);
+				break;
 			case ExpandWildcard.Closed:
-				writer.WriteStringValue("closed");
-				return;
+				writer.WriteStringValue(MemberClosed);
+				break;
 			case ExpandWildcard.All:
-				writer.WriteStringValue("all");
-				return;
+				writer.WriteStringValue(MemberAll);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(ExpandWildcard)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -573,46 +698,58 @@ public enum FieldSortNumericType
 	Date
 }
 
-internal sealed class FieldSortNumericTypeConverter : JsonConverter<FieldSortNumericType>
+internal sealed partial class FieldSortNumericTypeConverter : System.Text.Json.Serialization.JsonConverter<FieldSortNumericType>
 {
-	public override FieldSortNumericType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberLong = System.Text.Json.JsonEncodedText.Encode("long");
+	private static readonly System.Text.Json.JsonEncodedText MemberDouble = System.Text.Json.JsonEncodedText.Encode("double");
+	private static readonly System.Text.Json.JsonEncodedText MemberDateNanos = System.Text.Json.JsonEncodedText.Encode("date_nanos");
+	private static readonly System.Text.Json.JsonEncodedText MemberDate = System.Text.Json.JsonEncodedText.Encode("date");
+
+	public override FieldSortNumericType Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberLong))
+		{
+			return FieldSortNumericType.Long;
+		}
+
+		if (reader.ValueTextEquals(MemberDouble))
+		{
+			return FieldSortNumericType.Double;
+		}
+
+		if (reader.ValueTextEquals(MemberDateNanos))
 		{
-			case "long":
-				return FieldSortNumericType.Long;
-			case "double":
-				return FieldSortNumericType.Double;
-			case "date_nanos":
-				return FieldSortNumericType.DateNanos;
-			case "date":
-				return FieldSortNumericType.Date;
+			return FieldSortNumericType.DateNanos;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberDate))
+		{
+			return FieldSortNumericType.Date;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(FieldSortNumericType)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, FieldSortNumericType value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, FieldSortNumericType value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case FieldSortNumericType.Long:
-				writer.WriteStringValue("long");
-				return;
+				writer.WriteStringValue(MemberLong);
+				break;
 			case FieldSortNumericType.Double:
-				writer.WriteStringValue("double");
-				return;
+				writer.WriteStringValue(MemberDouble);
+				break;
 			case FieldSortNumericType.DateNanos:
-				writer.WriteStringValue("date_nanos");
-				return;
+				writer.WriteStringValue(MemberDateNanos);
+				break;
 			case FieldSortNumericType.Date:
-				writer.WriteStringValue("date");
-				return;
+				writer.WriteStringValue(MemberDate);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(FieldSortNumericType)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -635,36 +772,40 @@ public enum GeoDistanceType
 	Arc
 }
 
-internal sealed class GeoDistanceTypeConverter : JsonConverter<GeoDistanceType>
+internal sealed partial class GeoDistanceTypeConverter : System.Text.Json.Serialization.JsonConverter<GeoDistanceType>
 {
-	public override GeoDistanceType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberPlane = System.Text.Json.JsonEncodedText.Encode("plane");
+	private static readonly System.Text.Json.JsonEncodedText MemberArc = System.Text.Json.JsonEncodedText.Encode("arc");
+
+	public override GeoDistanceType Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberPlane))
+		{
+			return GeoDistanceType.Plane;
+		}
+
+		if (reader.ValueTextEquals(MemberArc))
 		{
-			case "plane":
-				return GeoDistanceType.Plane;
-			case "arc":
-				return GeoDistanceType.Arc;
+			return GeoDistanceType.Arc;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(GeoDistanceType)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, GeoDistanceType value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GeoDistanceType value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case GeoDistanceType.Plane:
-				writer.WriteStringValue("plane");
-				return;
+				writer.WriteStringValue(MemberPlane);
+				break;
 			case GeoDistanceType.Arc:
-				writer.WriteStringValue("arc");
-				return;
+				writer.WriteStringValue(MemberArc);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(GeoDistanceType)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -702,46 +843,58 @@ public enum GeoShapeRelation
 	Contains
 }
 
-internal sealed class GeoShapeRelationConverter : JsonConverter<GeoShapeRelation>
+internal sealed partial class GeoShapeRelationConverter : System.Text.Json.Serialization.JsonConverter<GeoShapeRelation>
 {
-	public override GeoShapeRelation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberWithin = System.Text.Json.JsonEncodedText.Encode("within");
+	private static readonly System.Text.Json.JsonEncodedText MemberIntersects = System.Text.Json.JsonEncodedText.Encode("intersects");
+	private static readonly System.Text.Json.JsonEncodedText MemberDisjoint = System.Text.Json.JsonEncodedText.Encode("disjoint");
+	private static readonly System.Text.Json.JsonEncodedText MemberContains = System.Text.Json.JsonEncodedText.Encode("contains");
+
+	public override GeoShapeRelation Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberWithin))
+		{
+			return GeoShapeRelation.Within;
+		}
+
+		if (reader.ValueTextEquals(MemberIntersects))
 		{
-			case "within":
-				return GeoShapeRelation.Within;
-			case "intersects":
-				return GeoShapeRelation.Intersects;
-			case "disjoint":
-				return GeoShapeRelation.Disjoint;
-			case "contains":
-				return GeoShapeRelation.Contains;
+			return GeoShapeRelation.Intersects;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberDisjoint))
+		{
+			return GeoShapeRelation.Disjoint;
+		}
+
+		if (reader.ValueTextEquals(MemberContains))
+		{
+			return GeoShapeRelation.Contains;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(GeoShapeRelation)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, GeoShapeRelation value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GeoShapeRelation value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case GeoShapeRelation.Within:
-				writer.WriteStringValue("within");
-				return;
+				writer.WriteStringValue(MemberWithin);
+				break;
 			case GeoShapeRelation.Intersects:
-				writer.WriteStringValue("intersects");
-				return;
+				writer.WriteStringValue(MemberIntersects);
+				break;
 			case GeoShapeRelation.Disjoint:
-				writer.WriteStringValue("disjoint");
-				return;
+				writer.WriteStringValue(MemberDisjoint);
+				break;
 			case GeoShapeRelation.Contains:
-				writer.WriteStringValue("contains");
-				return;
+				writer.WriteStringValue(MemberContains);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(GeoShapeRelation)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -771,44 +924,52 @@ public enum HealthStatus
 	Green
 }
 
-internal sealed class HealthStatusConverter : JsonConverter<HealthStatus>
+internal sealed partial class HealthStatusConverter : System.Text.Json.Serialization.JsonConverter<HealthStatus>
 {
-	public override HealthStatus Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberYellow = System.Text.Json.JsonEncodedText.Encode("yellow");
+	private static readonly System.Text.Json.JsonEncodedText MemberYellow1 = System.Text.Json.JsonEncodedText.Encode("YELLOW");
+	private static readonly System.Text.Json.JsonEncodedText MemberRed = System.Text.Json.JsonEncodedText.Encode("red");
+	private static readonly System.Text.Json.JsonEncodedText MemberRed1 = System.Text.Json.JsonEncodedText.Encode("RED");
+	private static readonly System.Text.Json.JsonEncodedText MemberGreen = System.Text.Json.JsonEncodedText.Encode("green");
+	private static readonly System.Text.Json.JsonEncodedText MemberGreen1 = System.Text.Json.JsonEncodedText.Encode("GREEN");
+
+	public override HealthStatus Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "yellow":
-			case "YELLOW":
-				return HealthStatus.Yellow;
-			case "red":
-			case "RED":
-				return HealthStatus.Red;
-			case "green":
-			case "GREEN":
-				return HealthStatus.Green;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberYellow) || reader.ValueTextEquals(MemberYellow1))
+		{
+			return HealthStatus.Yellow;
+		}
+
+		if (reader.ValueTextEquals(MemberRed) || reader.ValueTextEquals(MemberRed1))
+		{
+			return HealthStatus.Red;
+		}
+
+		if (reader.ValueTextEquals(MemberGreen) || reader.ValueTextEquals(MemberGreen1))
+		{
+			return HealthStatus.Green;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(HealthStatus)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, HealthStatus value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, HealthStatus value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case HealthStatus.Yellow:
-				writer.WriteStringValue("yellow");
-				return;
+				writer.WriteStringValue(MemberYellow);
+				break;
 			case HealthStatus.Red:
-				writer.WriteStringValue("red");
-				return;
+				writer.WriteStringValue(MemberRed);
+				break;
 			case HealthStatus.Green:
-				writer.WriteStringValue("green");
-				return;
+				writer.WriteStringValue(MemberGreen);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(HealthStatus)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -821,36 +982,40 @@ public enum IBDistribution
 	Ll
 }
 
-internal sealed class IBDistributionConverter : JsonConverter<IBDistribution>
+internal sealed partial class IBDistributionConverter : System.Text.Json.Serialization.JsonConverter<IBDistribution>
 {
-	public override IBDistribution Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberSpl = System.Text.Json.JsonEncodedText.Encode("spl");
+	private static readonly System.Text.Json.JsonEncodedText MemberLl = System.Text.Json.JsonEncodedText.Encode("ll");
+
+	public override IBDistribution Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberSpl))
 		{
-			case "spl":
-				return IBDistribution.Spl;
-			case "ll":
-				return IBDistribution.Ll;
+			return IBDistribution.Spl;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberLl))
+		{
+			return IBDistribution.Ll;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(IBDistribution)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, IBDistribution value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IBDistribution value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case IBDistribution.Spl:
-				writer.WriteStringValue("spl");
-				return;
+				writer.WriteStringValue(MemberSpl);
+				break;
 			case IBDistribution.Ll:
-				writer.WriteStringValue("ll");
-				return;
+				writer.WriteStringValue(MemberLl);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(IBDistribution)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -863,36 +1028,40 @@ public enum IBLambda
 	Df
 }
 
-internal sealed class IBLambdaConverter : JsonConverter<IBLambda>
+internal sealed partial class IBLambdaConverter : System.Text.Json.Serialization.JsonConverter<IBLambda>
 {
-	public override IBLambda Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberTtf = System.Text.Json.JsonEncodedText.Encode("ttf");
+	private static readonly System.Text.Json.JsonEncodedText MemberDf = System.Text.Json.JsonEncodedText.Encode("df");
+
+	public override IBLambda Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberTtf))
 		{
-			case "ttf":
-				return IBLambda.Ttf;
-			case "df":
-				return IBLambda.Df;
+			return IBLambda.Ttf;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberDf))
+		{
+			return IBLambda.Df;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(IBLambda)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, IBLambda value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IBLambda value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case IBLambda.Ttf:
-				writer.WriteStringValue("ttf");
-				return;
+				writer.WriteStringValue(MemberTtf);
+				break;
 			case IBLambda.Df:
-				writer.WriteStringValue("df");
-				return;
+				writer.WriteStringValue(MemberDf);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(IBLambda)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -907,41 +1076,49 @@ public enum Level
 	Cluster
 }
 
-internal sealed class LevelConverter : JsonConverter<Level>
+internal sealed partial class LevelConverter : System.Text.Json.Serialization.JsonConverter<Level>
 {
-	public override Level Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberShards = System.Text.Json.JsonEncodedText.Encode("shards");
+	private static readonly System.Text.Json.JsonEncodedText MemberIndices = System.Text.Json.JsonEncodedText.Encode("indices");
+	private static readonly System.Text.Json.JsonEncodedText MemberCluster = System.Text.Json.JsonEncodedText.Encode("cluster");
+
+	public override Level Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberShards))
+		{
+			return Level.Shards;
+		}
+
+		if (reader.ValueTextEquals(MemberIndices))
+		{
+			return Level.Indices;
+		}
+
+		if (reader.ValueTextEquals(MemberCluster))
 		{
-			case "shards":
-				return Level.Shards;
-			case "indices":
-				return Level.Indices;
-			case "cluster":
-				return Level.Cluster;
+			return Level.Cluster;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(Level)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, Level value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, Level value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case Level.Shards:
-				writer.WriteStringValue("shards");
-				return;
+				writer.WriteStringValue(MemberShards);
+				break;
 			case Level.Indices:
-				writer.WriteStringValue("indices");
-				return;
+				writer.WriteStringValue(MemberIndices);
+				break;
 			case Level.Cluster:
-				writer.WriteStringValue("cluster");
-				return;
+				writer.WriteStringValue(MemberCluster);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(Level)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -956,41 +1133,49 @@ public enum LifecycleOperationMode
 	Running
 }
 
-internal sealed class LifecycleOperationModeConverter : JsonConverter<LifecycleOperationMode>
+internal sealed partial class LifecycleOperationModeConverter : System.Text.Json.Serialization.JsonConverter<LifecycleOperationMode>
 {
-	public override LifecycleOperationMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberStopping = System.Text.Json.JsonEncodedText.Encode("STOPPING");
+	private static readonly System.Text.Json.JsonEncodedText MemberStopped = System.Text.Json.JsonEncodedText.Encode("STOPPED");
+	private static readonly System.Text.Json.JsonEncodedText MemberRunning = System.Text.Json.JsonEncodedText.Encode("RUNNING");
+
+	public override LifecycleOperationMode Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberStopping))
 		{
-			case "STOPPING":
-				return LifecycleOperationMode.Stopping;
-			case "STOPPED":
-				return LifecycleOperationMode.Stopped;
-			case "RUNNING":
-				return LifecycleOperationMode.Running;
+			return LifecycleOperationMode.Stopping;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberStopped))
+		{
+			return LifecycleOperationMode.Stopped;
+		}
+
+		if (reader.ValueTextEquals(MemberRunning))
+		{
+			return LifecycleOperationMode.Running;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(LifecycleOperationMode)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, LifecycleOperationMode value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, LifecycleOperationMode value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case LifecycleOperationMode.Stopping:
-				writer.WriteStringValue("STOPPING");
-				return;
+				writer.WriteStringValue(MemberStopping);
+				break;
 			case LifecycleOperationMode.Stopped:
-				writer.WriteStringValue("STOPPED");
-				return;
+				writer.WriteStringValue(MemberStopped);
+				break;
 			case LifecycleOperationMode.Running:
-				writer.WriteStringValue("RUNNING");
-				return;
+				writer.WriteStringValue(MemberRunning);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(LifecycleOperationMode)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -1027,96 +1212,148 @@ public enum NodeRole
 	Client
 }
 
-internal sealed class NodeRoleConverter : JsonConverter<NodeRole>
+internal sealed partial class NodeRoleConverter : System.Text.Json.Serialization.JsonConverter<NodeRole>
 {
-	public override NodeRole Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberVotingOnly = System.Text.Json.JsonEncodedText.Encode("voting_only");
+	private static readonly System.Text.Json.JsonEncodedText MemberTransform = System.Text.Json.JsonEncodedText.Encode("transform");
+	private static readonly System.Text.Json.JsonEncodedText MemberRemoteClusterClient = System.Text.Json.JsonEncodedText.Encode("remote_cluster_client");
+	private static readonly System.Text.Json.JsonEncodedText MemberMl = System.Text.Json.JsonEncodedText.Encode("ml");
+	private static readonly System.Text.Json.JsonEncodedText MemberMaster = System.Text.Json.JsonEncodedText.Encode("master");
+	private static readonly System.Text.Json.JsonEncodedText MemberIngest = System.Text.Json.JsonEncodedText.Encode("ingest");
+	private static readonly System.Text.Json.JsonEncodedText MemberDataWarm = System.Text.Json.JsonEncodedText.Encode("data_warm");
+	private static readonly System.Text.Json.JsonEncodedText MemberDataHot = System.Text.Json.JsonEncodedText.Encode("data_hot");
+	private static readonly System.Text.Json.JsonEncodedText MemberDataFrozen = System.Text.Json.JsonEncodedText.Encode("data_frozen");
+	private static readonly System.Text.Json.JsonEncodedText MemberDataContent = System.Text.Json.JsonEncodedText.Encode("data_content");
+	private static readonly System.Text.Json.JsonEncodedText MemberDataCold = System.Text.Json.JsonEncodedText.Encode("data_cold");
+	private static readonly System.Text.Json.JsonEncodedText MemberData = System.Text.Json.JsonEncodedText.Encode("data");
+	private static readonly System.Text.Json.JsonEncodedText MemberCoordinatingOnly = System.Text.Json.JsonEncodedText.Encode("coordinating_only");
+	private static readonly System.Text.Json.JsonEncodedText MemberClient = System.Text.Json.JsonEncodedText.Encode("client");
+
+	public override NodeRole Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "voting_only":
-				return NodeRole.VotingOnly;
-			case "transform":
-				return NodeRole.Transform;
-			case "remote_cluster_client":
-				return NodeRole.RemoteClusterClient;
-			case "ml":
-				return NodeRole.Ml;
-			case "master":
-				return NodeRole.Master;
-			case "ingest":
-				return NodeRole.Ingest;
-			case "data_warm":
-				return NodeRole.DataWarm;
-			case "data_hot":
-				return NodeRole.DataHot;
-			case "data_frozen":
-				return NodeRole.DataFrozen;
-			case "data_content":
-				return NodeRole.DataContent;
-			case "data_cold":
-				return NodeRole.DataCold;
-			case "data":
-				return NodeRole.Data;
-			case "coordinating_only":
-				return NodeRole.CoordinatingOnly;
-			case "client":
-				return NodeRole.Client;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberVotingOnly))
+		{
+			return NodeRole.VotingOnly;
+		}
+
+		if (reader.ValueTextEquals(MemberTransform))
+		{
+			return NodeRole.Transform;
+		}
+
+		if (reader.ValueTextEquals(MemberRemoteClusterClient))
+		{
+			return NodeRole.RemoteClusterClient;
+		}
+
+		if (reader.ValueTextEquals(MemberMl))
+		{
+			return NodeRole.Ml;
+		}
+
+		if (reader.ValueTextEquals(MemberMaster))
+		{
+			return NodeRole.Master;
+		}
+
+		if (reader.ValueTextEquals(MemberIngest))
+		{
+			return NodeRole.Ingest;
+		}
+
+		if (reader.ValueTextEquals(MemberDataWarm))
+		{
+			return NodeRole.DataWarm;
+		}
+
+		if (reader.ValueTextEquals(MemberDataHot))
+		{
+			return NodeRole.DataHot;
+		}
+
+		if (reader.ValueTextEquals(MemberDataFrozen))
+		{
+			return NodeRole.DataFrozen;
+		}
+
+		if (reader.ValueTextEquals(MemberDataContent))
+		{
+			return NodeRole.DataContent;
+		}
+
+		if (reader.ValueTextEquals(MemberDataCold))
+		{
+			return NodeRole.DataCold;
+		}
+
+		if (reader.ValueTextEquals(MemberData))
+		{
+			return NodeRole.Data;
+		}
+
+		if (reader.ValueTextEquals(MemberCoordinatingOnly))
+		{
+			return NodeRole.CoordinatingOnly;
+		}
+
+		if (reader.ValueTextEquals(MemberClient))
+		{
+			return NodeRole.Client;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(NodeRole)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, NodeRole value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, NodeRole value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case NodeRole.VotingOnly:
-				writer.WriteStringValue("voting_only");
-				return;
+				writer.WriteStringValue(MemberVotingOnly);
+				break;
 			case NodeRole.Transform:
-				writer.WriteStringValue("transform");
-				return;
+				writer.WriteStringValue(MemberTransform);
+				break;
 			case NodeRole.RemoteClusterClient:
-				writer.WriteStringValue("remote_cluster_client");
-				return;
+				writer.WriteStringValue(MemberRemoteClusterClient);
+				break;
 			case NodeRole.Ml:
-				writer.WriteStringValue("ml");
-				return;
+				writer.WriteStringValue(MemberMl);
+				break;
 			case NodeRole.Master:
-				writer.WriteStringValue("master");
-				return;
+				writer.WriteStringValue(MemberMaster);
+				break;
 			case NodeRole.Ingest:
-				writer.WriteStringValue("ingest");
-				return;
+				writer.WriteStringValue(MemberIngest);
+				break;
 			case NodeRole.DataWarm:
-				writer.WriteStringValue("data_warm");
-				return;
+				writer.WriteStringValue(MemberDataWarm);
+				break;
 			case NodeRole.DataHot:
-				writer.WriteStringValue("data_hot");
-				return;
+				writer.WriteStringValue(MemberDataHot);
+				break;
 			case NodeRole.DataFrozen:
-				writer.WriteStringValue("data_frozen");
-				return;
+				writer.WriteStringValue(MemberDataFrozen);
+				break;
 			case NodeRole.DataContent:
-				writer.WriteStringValue("data_content");
-				return;
+				writer.WriteStringValue(MemberDataContent);
+				break;
 			case NodeRole.DataCold:
-				writer.WriteStringValue("data_cold");
-				return;
+				writer.WriteStringValue(MemberDataCold);
+				break;
 			case NodeRole.Data:
-				writer.WriteStringValue("data");
-				return;
+				writer.WriteStringValue(MemberData);
+				break;
 			case NodeRole.CoordinatingOnly:
-				writer.WriteStringValue("coordinating_only");
-				return;
+				writer.WriteStringValue(MemberCoordinatingOnly);
+				break;
 			case NodeRole.Client:
-				writer.WriteStringValue("client");
-				return;
+				writer.WriteStringValue(MemberClient);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(NodeRole)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -1135,51 +1372,67 @@ public enum Normalization
 	H1
 }
 
-internal sealed class NormalizationConverter : JsonConverter<Normalization>
+internal sealed partial class NormalizationConverter : System.Text.Json.Serialization.JsonConverter<Normalization>
 {
-	public override Normalization Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText Memberz = System.Text.Json.JsonEncodedText.Encode("z");
+	private static readonly System.Text.Json.JsonEncodedText MemberNo = System.Text.Json.JsonEncodedText.Encode("no");
+	private static readonly System.Text.Json.JsonEncodedText MemberH3 = System.Text.Json.JsonEncodedText.Encode("h3");
+	private static readonly System.Text.Json.JsonEncodedText MemberH2 = System.Text.Json.JsonEncodedText.Encode("h2");
+	private static readonly System.Text.Json.JsonEncodedText MemberH1 = System.Text.Json.JsonEncodedText.Encode("h1");
+
+	public override Normalization Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "z":
-				return Normalization.z;
-			case "no":
-				return Normalization.No;
-			case "h3":
-				return Normalization.H3;
-			case "h2":
-				return Normalization.H2;
-			case "h1":
-				return Normalization.H1;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(Memberz))
+		{
+			return Normalization.z;
+		}
+
+		if (reader.ValueTextEquals(MemberNo))
+		{
+			return Normalization.No;
+		}
+
+		if (reader.ValueTextEquals(MemberH3))
+		{
+			return Normalization.H3;
+		}
+
+		if (reader.ValueTextEquals(MemberH2))
+		{
+			return Normalization.H2;
+		}
+
+		if (reader.ValueTextEquals(MemberH1))
+		{
+			return Normalization.H1;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(Normalization)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, Normalization value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, Normalization value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case Normalization.z:
-				writer.WriteStringValue("z");
-				return;
+				writer.WriteStringValue(Memberz);
+				break;
 			case Normalization.No:
-				writer.WriteStringValue("no");
-				return;
+				writer.WriteStringValue(MemberNo);
+				break;
 			case Normalization.H3:
-				writer.WriteStringValue("h3");
-				return;
+				writer.WriteStringValue(MemberH3);
+				break;
 			case Normalization.H2:
-				writer.WriteStringValue("h2");
-				return;
+				writer.WriteStringValue(MemberH2);
+				break;
 			case Normalization.H1:
-				writer.WriteStringValue("h1");
-				return;
+				writer.WriteStringValue(MemberH1);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(Normalization)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -1198,51 +1451,67 @@ public enum Result
 	Created
 }
 
-internal sealed class ResultConverter : JsonConverter<Result>
+internal sealed partial class ResultConverter : System.Text.Json.Serialization.JsonConverter<Result>
 {
-	public override Result Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberUpdated = System.Text.Json.JsonEncodedText.Encode("updated");
+	private static readonly System.Text.Json.JsonEncodedText MemberNotFound = System.Text.Json.JsonEncodedText.Encode("not_found");
+	private static readonly System.Text.Json.JsonEncodedText MemberNoOp = System.Text.Json.JsonEncodedText.Encode("noop");
+	private static readonly System.Text.Json.JsonEncodedText MemberDeleted = System.Text.Json.JsonEncodedText.Encode("deleted");
+	private static readonly System.Text.Json.JsonEncodedText MemberCreated = System.Text.Json.JsonEncodedText.Encode("created");
+
+	public override Result Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "updated":
-				return Result.Updated;
-			case "not_found":
-				return Result.NotFound;
-			case "noop":
-				return Result.NoOp;
-			case "deleted":
-				return Result.Deleted;
-			case "created":
-				return Result.Created;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberUpdated))
+		{
+			return Result.Updated;
+		}
+
+		if (reader.ValueTextEquals(MemberNotFound))
+		{
+			return Result.NotFound;
+		}
+
+		if (reader.ValueTextEquals(MemberNoOp))
+		{
+			return Result.NoOp;
+		}
+
+		if (reader.ValueTextEquals(MemberDeleted))
+		{
+			return Result.Deleted;
+		}
+
+		if (reader.ValueTextEquals(MemberCreated))
+		{
+			return Result.Created;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(Result)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, Result value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, Result value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case Result.Updated:
-				writer.WriteStringValue("updated");
-				return;
+				writer.WriteStringValue(MemberUpdated);
+				break;
 			case Result.NotFound:
-				writer.WriteStringValue("not_found");
-				return;
+				writer.WriteStringValue(MemberNotFound);
+				break;
 			case Result.NoOp:
-				writer.WriteStringValue("noop");
-				return;
+				writer.WriteStringValue(MemberNoOp);
+				break;
 			case Result.Deleted:
-				writer.WriteStringValue("deleted");
-				return;
+				writer.WriteStringValue(MemberDeleted);
+				break;
 			case Result.Created:
-				writer.WriteStringValue("created");
-				return;
+				writer.WriteStringValue(MemberCreated);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(Result)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -1250,9 +1519,11 @@ public override void Write(Utf8JsonWriter writer, Result value, JsonSerializerOp
 public readonly partial struct ScriptLanguage : IEnumStruct<ScriptLanguage>
 {
 	public ScriptLanguage(string value) => Value = value;
-
+#if NET7_0_OR_GREATER
+	static ScriptLanguage IEnumStruct<ScriptLanguage>.Create(string value) => value;
+#else
 	ScriptLanguage IEnumStruct<ScriptLanguage>.Create(string value) => value;
-
+#endif
 	public readonly string Value { get; }
 
 	/// <summary>
@@ -1307,41 +1578,49 @@ public enum ScriptSortType
 	Number
 }
 
-internal sealed class ScriptSortTypeConverter : JsonConverter<ScriptSortType>
+internal sealed partial class ScriptSortTypeConverter : System.Text.Json.Serialization.JsonConverter<ScriptSortType>
 {
-	public override ScriptSortType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberVersion = System.Text.Json.JsonEncodedText.Encode("version");
+	private static readonly System.Text.Json.JsonEncodedText MemberString = System.Text.Json.JsonEncodedText.Encode("string");
+	private static readonly System.Text.Json.JsonEncodedText MemberNumber = System.Text.Json.JsonEncodedText.Encode("number");
+
+	public override ScriptSortType Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberVersion))
+		{
+			return ScriptSortType.Version;
+		}
+
+		if (reader.ValueTextEquals(MemberString))
+		{
+			return ScriptSortType.String;
+		}
+
+		if (reader.ValueTextEquals(MemberNumber))
 		{
-			case "version":
-				return ScriptSortType.Version;
-			case "string":
-				return ScriptSortType.String;
-			case "number":
-				return ScriptSortType.Number;
+			return ScriptSortType.Number;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(ScriptSortType)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, ScriptSortType value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ScriptSortType value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case ScriptSortType.Version:
-				writer.WriteStringValue("version");
-				return;
+				writer.WriteStringValue(MemberVersion);
+				break;
 			case ScriptSortType.String:
-				writer.WriteStringValue("string");
-				return;
+				writer.WriteStringValue(MemberString);
+				break;
 			case ScriptSortType.Number:
-				writer.WriteStringValue("number");
-				return;
+				writer.WriteStringValue(MemberNumber);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(ScriptSortType)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -1364,36 +1643,40 @@ public enum SearchType
 	DfsQueryThenFetch
 }
 
-internal sealed class SearchTypeConverter : JsonConverter<SearchType>
+internal sealed partial class SearchTypeConverter : System.Text.Json.Serialization.JsonConverter<SearchType>
 {
-	public override SearchType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberQueryThenFetch = System.Text.Json.JsonEncodedText.Encode("query_then_fetch");
+	private static readonly System.Text.Json.JsonEncodedText MemberDfsQueryThenFetch = System.Text.Json.JsonEncodedText.Encode("dfs_query_then_fetch");
+
+	public override SearchType Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberQueryThenFetch))
 		{
-			case "query_then_fetch":
-				return SearchType.QueryThenFetch;
-			case "dfs_query_then_fetch":
-				return SearchType.DfsQueryThenFetch;
+			return SearchType.QueryThenFetch;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberDfsQueryThenFetch))
+		{
+			return SearchType.DfsQueryThenFetch;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(SearchType)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, SearchType value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SearchType value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case SearchType.QueryThenFetch:
-				writer.WriteStringValue("query_then_fetch");
-				return;
+				writer.WriteStringValue(MemberQueryThenFetch);
+				break;
 			case SearchType.DfsQueryThenFetch:
-				writer.WriteStringValue("dfs_query_then_fetch");
-				return;
+				writer.WriteStringValue(MemberDfsQueryThenFetch);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(SearchType)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -1409,31 +1692,31 @@ public enum SlicesCalculation
 	Auto
 }
 
-internal sealed class SlicesCalculationConverter : JsonConverter<SlicesCalculation>
+internal sealed partial class SlicesCalculationConverter : System.Text.Json.Serialization.JsonConverter<SlicesCalculation>
 {
-	public override SlicesCalculation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberAuto = System.Text.Json.JsonEncodedText.Encode("auto");
+
+	public override SlicesCalculation Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberAuto))
 		{
-			case "auto":
-				return SlicesCalculation.Auto;
+			return SlicesCalculation.Auto;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(SlicesCalculation)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, SlicesCalculation value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SlicesCalculation value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case SlicesCalculation.Auto:
-				writer.WriteStringValue("auto");
-				return;
+				writer.WriteStringValue(MemberAuto);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(SlicesCalculation)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -1452,51 +1735,67 @@ public enum SortMode
 	Avg
 }
 
-internal sealed class SortModeConverter : JsonConverter<SortMode>
+internal sealed partial class SortModeConverter : System.Text.Json.Serialization.JsonConverter<SortMode>
 {
-	public override SortMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberSum = System.Text.Json.JsonEncodedText.Encode("sum");
+	private static readonly System.Text.Json.JsonEncodedText MemberMin = System.Text.Json.JsonEncodedText.Encode("min");
+	private static readonly System.Text.Json.JsonEncodedText MemberMedian = System.Text.Json.JsonEncodedText.Encode("median");
+	private static readonly System.Text.Json.JsonEncodedText MemberMax = System.Text.Json.JsonEncodedText.Encode("max");
+	private static readonly System.Text.Json.JsonEncodedText MemberAvg = System.Text.Json.JsonEncodedText.Encode("avg");
+
+	public override SortMode Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "sum":
-				return SortMode.Sum;
-			case "min":
-				return SortMode.Min;
-			case "median":
-				return SortMode.Median;
-			case "max":
-				return SortMode.Max;
-			case "avg":
-				return SortMode.Avg;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberSum))
+		{
+			return SortMode.Sum;
+		}
+
+		if (reader.ValueTextEquals(MemberMin))
+		{
+			return SortMode.Min;
+		}
+
+		if (reader.ValueTextEquals(MemberMedian))
+		{
+			return SortMode.Median;
+		}
+
+		if (reader.ValueTextEquals(MemberMax))
+		{
+			return SortMode.Max;
+		}
+
+		if (reader.ValueTextEquals(MemberAvg))
+		{
+			return SortMode.Avg;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(SortMode)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, SortMode value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SortMode value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case SortMode.Sum:
-				writer.WriteStringValue("sum");
-				return;
+				writer.WriteStringValue(MemberSum);
+				break;
 			case SortMode.Min:
-				writer.WriteStringValue("min");
-				return;
+				writer.WriteStringValue(MemberMin);
+				break;
 			case SortMode.Median:
-				writer.WriteStringValue("median");
-				return;
+				writer.WriteStringValue(MemberMedian);
+				break;
 			case SortMode.Max:
-				writer.WriteStringValue("max");
-				return;
+				writer.WriteStringValue(MemberMax);
+				break;
 			case SortMode.Avg:
-				writer.WriteStringValue("avg");
-				return;
+				writer.WriteStringValue(MemberAvg);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(SortMode)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -1519,36 +1818,40 @@ public enum SortOrder
 	Asc
 }
 
-internal sealed class SortOrderConverter : JsonConverter<SortOrder>
+internal sealed partial class SortOrderConverter : System.Text.Json.Serialization.JsonConverter<SortOrder>
 {
-	public override SortOrder Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberDesc = System.Text.Json.JsonEncodedText.Encode("desc");
+	private static readonly System.Text.Json.JsonEncodedText MemberAsc = System.Text.Json.JsonEncodedText.Encode("asc");
+
+	public override SortOrder Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberDesc))
+		{
+			return SortOrder.Desc;
+		}
+
+		if (reader.ValueTextEquals(MemberAsc))
 		{
-			case "desc":
-				return SortOrder.Desc;
-			case "asc":
-				return SortOrder.Asc;
+			return SortOrder.Asc;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(SortOrder)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, SortOrder value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SortOrder value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case SortOrder.Desc:
-				writer.WriteStringValue("desc");
-				return;
+				writer.WriteStringValue(MemberDesc);
+				break;
 			case SortOrder.Asc:
-				writer.WriteStringValue("asc");
-				return;
+				writer.WriteStringValue(MemberAsc);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(SortOrder)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -1578,41 +1881,49 @@ public enum SuggestMode
 	Always
 }
 
-internal sealed class SuggestModeConverter : JsonConverter<SuggestMode>
+internal sealed partial class SuggestModeConverter : System.Text.Json.Serialization.JsonConverter<SuggestMode>
 {
-	public override SuggestMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberPopular = System.Text.Json.JsonEncodedText.Encode("popular");
+	private static readonly System.Text.Json.JsonEncodedText MemberMissing = System.Text.Json.JsonEncodedText.Encode("missing");
+	private static readonly System.Text.Json.JsonEncodedText MemberAlways = System.Text.Json.JsonEncodedText.Encode("always");
+
+	public override SuggestMode Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberPopular))
+		{
+			return SuggestMode.Popular;
+		}
+
+		if (reader.ValueTextEquals(MemberMissing))
+		{
+			return SuggestMode.Missing;
+		}
+
+		if (reader.ValueTextEquals(MemberAlways))
 		{
-			case "popular":
-				return SuggestMode.Popular;
-			case "missing":
-				return SuggestMode.Missing;
-			case "always":
-				return SuggestMode.Always;
+			return SuggestMode.Always;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(SuggestMode)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, SuggestMode value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SuggestMode value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case SuggestMode.Popular:
-				writer.WriteStringValue("popular");
-				return;
+				writer.WriteStringValue(MemberPopular);
+				break;
 			case SuggestMode.Missing:
-				writer.WriteStringValue("missing");
-				return;
+				writer.WriteStringValue(MemberMissing);
+				break;
 			case SuggestMode.Always:
-				writer.WriteStringValue("always");
-				return;
+				writer.WriteStringValue(MemberAlways);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(SuggestMode)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -1631,51 +1942,67 @@ public enum ThreadType
 	Block
 }
 
-internal sealed class ThreadTypeConverter : JsonConverter<ThreadType>
+internal sealed partial class ThreadTypeConverter : System.Text.Json.Serialization.JsonConverter<ThreadType>
 {
-	public override ThreadType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberWait = System.Text.Json.JsonEncodedText.Encode("wait");
+	private static readonly System.Text.Json.JsonEncodedText MemberMem = System.Text.Json.JsonEncodedText.Encode("mem");
+	private static readonly System.Text.Json.JsonEncodedText MemberGpu = System.Text.Json.JsonEncodedText.Encode("gpu");
+	private static readonly System.Text.Json.JsonEncodedText MemberCpu = System.Text.Json.JsonEncodedText.Encode("cpu");
+	private static readonly System.Text.Json.JsonEncodedText MemberBlock = System.Text.Json.JsonEncodedText.Encode("block");
+
+	public override ThreadType Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "wait":
-				return ThreadType.Wait;
-			case "mem":
-				return ThreadType.Mem;
-			case "gpu":
-				return ThreadType.Gpu;
-			case "cpu":
-				return ThreadType.Cpu;
-			case "block":
-				return ThreadType.Block;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberWait))
+		{
+			return ThreadType.Wait;
+		}
+
+		if (reader.ValueTextEquals(MemberMem))
+		{
+			return ThreadType.Mem;
+		}
+
+		if (reader.ValueTextEquals(MemberGpu))
+		{
+			return ThreadType.Gpu;
+		}
+
+		if (reader.ValueTextEquals(MemberCpu))
+		{
+			return ThreadType.Cpu;
+		}
+
+		if (reader.ValueTextEquals(MemberBlock))
+		{
+			return ThreadType.Block;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(ThreadType)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, ThreadType value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ThreadType value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case ThreadType.Wait:
-				writer.WriteStringValue("wait");
-				return;
+				writer.WriteStringValue(MemberWait);
+				break;
 			case ThreadType.Mem:
-				writer.WriteStringValue("mem");
-				return;
+				writer.WriteStringValue(MemberMem);
+				break;
 			case ThreadType.Gpu:
-				writer.WriteStringValue("gpu");
-				return;
+				writer.WriteStringValue(MemberGpu);
+				break;
 			case ThreadType.Cpu:
-				writer.WriteStringValue("cpu");
-				return;
+				writer.WriteStringValue(MemberCpu);
+				break;
 			case ThreadType.Block:
-				writer.WriteStringValue("block");
-				return;
+				writer.WriteStringValue(MemberBlock);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(ThreadType)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -1698,61 +2025,85 @@ public enum TimeUnit
 	Days
 }
 
-internal sealed class TimeUnitConverter : JsonConverter<TimeUnit>
+internal sealed partial class TimeUnitConverter : System.Text.Json.Serialization.JsonConverter<TimeUnit>
 {
-	public override TimeUnit Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberSeconds = System.Text.Json.JsonEncodedText.Encode("s");
+	private static readonly System.Text.Json.JsonEncodedText MemberNanoseconds = System.Text.Json.JsonEncodedText.Encode("nanos");
+	private static readonly System.Text.Json.JsonEncodedText MemberMinutes = System.Text.Json.JsonEncodedText.Encode("m");
+	private static readonly System.Text.Json.JsonEncodedText MemberMilliseconds = System.Text.Json.JsonEncodedText.Encode("ms");
+	private static readonly System.Text.Json.JsonEncodedText MemberMicroseconds = System.Text.Json.JsonEncodedText.Encode("micros");
+	private static readonly System.Text.Json.JsonEncodedText MemberHours = System.Text.Json.JsonEncodedText.Encode("h");
+	private static readonly System.Text.Json.JsonEncodedText MemberDays = System.Text.Json.JsonEncodedText.Encode("d");
+
+	public override TimeUnit Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "s":
-				return TimeUnit.Seconds;
-			case "nanos":
-				return TimeUnit.Nanoseconds;
-			case "m":
-				return TimeUnit.Minutes;
-			case "ms":
-				return TimeUnit.Milliseconds;
-			case "micros":
-				return TimeUnit.Microseconds;
-			case "h":
-				return TimeUnit.Hours;
-			case "d":
-				return TimeUnit.Days;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberSeconds))
+		{
+			return TimeUnit.Seconds;
+		}
+
+		if (reader.ValueTextEquals(MemberNanoseconds))
+		{
+			return TimeUnit.Nanoseconds;
+		}
+
+		if (reader.ValueTextEquals(MemberMinutes))
+		{
+			return TimeUnit.Minutes;
+		}
+
+		if (reader.ValueTextEquals(MemberMilliseconds))
+		{
+			return TimeUnit.Milliseconds;
+		}
+
+		if (reader.ValueTextEquals(MemberMicroseconds))
+		{
+			return TimeUnit.Microseconds;
+		}
+
+		if (reader.ValueTextEquals(MemberHours))
+		{
+			return TimeUnit.Hours;
+		}
+
+		if (reader.ValueTextEquals(MemberDays))
+		{
+			return TimeUnit.Days;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(TimeUnit)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, TimeUnit value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, TimeUnit value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case TimeUnit.Seconds:
-				writer.WriteStringValue("s");
-				return;
+				writer.WriteStringValue(MemberSeconds);
+				break;
 			case TimeUnit.Nanoseconds:
-				writer.WriteStringValue("nanos");
-				return;
+				writer.WriteStringValue(MemberNanoseconds);
+				break;
 			case TimeUnit.Minutes:
-				writer.WriteStringValue("m");
-				return;
+				writer.WriteStringValue(MemberMinutes);
+				break;
 			case TimeUnit.Milliseconds:
-				writer.WriteStringValue("ms");
-				return;
+				writer.WriteStringValue(MemberMilliseconds);
+				break;
 			case TimeUnit.Microseconds:
-				writer.WriteStringValue("micros");
-				return;
+				writer.WriteStringValue(MemberMicroseconds);
+				break;
 			case TimeUnit.Hours:
-				writer.WriteStringValue("h");
-				return;
+				writer.WriteStringValue(MemberHours);
+				break;
 			case TimeUnit.Days:
-				writer.WriteStringValue("d");
-				return;
+				writer.WriteStringValue(MemberDays);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(TimeUnit)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -1786,46 +2137,58 @@ public enum VersionType
 	External
 }
 
-internal sealed class VersionTypeConverter : JsonConverter<VersionType>
+internal sealed partial class VersionTypeConverter : System.Text.Json.Serialization.JsonConverter<VersionType>
 {
-	public override VersionType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberInternal = System.Text.Json.JsonEncodedText.Encode("internal");
+	private static readonly System.Text.Json.JsonEncodedText MemberForce = System.Text.Json.JsonEncodedText.Encode("force");
+	private static readonly System.Text.Json.JsonEncodedText MemberExternalGte = System.Text.Json.JsonEncodedText.Encode("external_gte");
+	private static readonly System.Text.Json.JsonEncodedText MemberExternal = System.Text.Json.JsonEncodedText.Encode("external");
+
+	public override VersionType Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberInternal))
+		{
+			return VersionType.Internal;
+		}
+
+		if (reader.ValueTextEquals(MemberForce))
+		{
+			return VersionType.Force;
+		}
+
+		if (reader.ValueTextEquals(MemberExternalGte))
 		{
-			case "internal":
-				return VersionType.Internal;
-			case "force":
-				return VersionType.Force;
-			case "external_gte":
-				return VersionType.ExternalGte;
-			case "external":
-				return VersionType.External;
+			return VersionType.ExternalGte;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberExternal))
+		{
+			return VersionType.External;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(VersionType)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, VersionType value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, VersionType value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case VersionType.Internal:
-				writer.WriteStringValue("internal");
-				return;
+				writer.WriteStringValue(MemberInternal);
+				break;
 			case VersionType.Force:
-				writer.WriteStringValue("force");
-				return;
+				writer.WriteStringValue(MemberForce);
+				break;
 			case VersionType.ExternalGte:
-				writer.WriteStringValue("external_gte");
-				return;
+				writer.WriteStringValue(MemberExternalGte);
+				break;
 			case VersionType.External:
-				writer.WriteStringValue("external");
-				return;
+				writer.WriteStringValue(MemberExternal);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(VersionType)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -1846,55 +2209,75 @@ public enum WaitForEvents
 	High
 }
 
-internal sealed class WaitForEventsConverter : JsonConverter<WaitForEvents>
+internal sealed partial class WaitForEventsConverter : System.Text.Json.Serialization.JsonConverter<WaitForEvents>
 {
-	public override WaitForEvents Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberUrgent = System.Text.Json.JsonEncodedText.Encode("urgent");
+	private static readonly System.Text.Json.JsonEncodedText MemberNormal = System.Text.Json.JsonEncodedText.Encode("normal");
+	private static readonly System.Text.Json.JsonEncodedText MemberLow = System.Text.Json.JsonEncodedText.Encode("low");
+	private static readonly System.Text.Json.JsonEncodedText MemberLanguid = System.Text.Json.JsonEncodedText.Encode("languid");
+	private static readonly System.Text.Json.JsonEncodedText MemberImmediate = System.Text.Json.JsonEncodedText.Encode("immediate");
+	private static readonly System.Text.Json.JsonEncodedText MemberHigh = System.Text.Json.JsonEncodedText.Encode("high");
+
+	public override WaitForEvents Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "urgent":
-				return WaitForEvents.Urgent;
-			case "normal":
-				return WaitForEvents.Normal;
-			case "low":
-				return WaitForEvents.Low;
-			case "languid":
-				return WaitForEvents.Languid;
-			case "immediate":
-				return WaitForEvents.Immediate;
-			case "high":
-				return WaitForEvents.High;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberUrgent))
+		{
+			return WaitForEvents.Urgent;
+		}
+
+		if (reader.ValueTextEquals(MemberNormal))
+		{
+			return WaitForEvents.Normal;
+		}
+
+		if (reader.ValueTextEquals(MemberLow))
+		{
+			return WaitForEvents.Low;
+		}
+
+		if (reader.ValueTextEquals(MemberLanguid))
+		{
+			return WaitForEvents.Languid;
+		}
+
+		if (reader.ValueTextEquals(MemberImmediate))
+		{
+			return WaitForEvents.Immediate;
+		}
+
+		if (reader.ValueTextEquals(MemberHigh))
+		{
+			return WaitForEvents.High;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(WaitForEvents)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, WaitForEvents value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, WaitForEvents value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case WaitForEvents.Urgent:
-				writer.WriteStringValue("urgent");
-				return;
+				writer.WriteStringValue(MemberUrgent);
+				break;
 			case WaitForEvents.Normal:
-				writer.WriteStringValue("normal");
-				return;
+				writer.WriteStringValue(MemberNormal);
+				break;
 			case WaitForEvents.Low:
-				writer.WriteStringValue("low");
-				return;
+				writer.WriteStringValue(MemberLow);
+				break;
 			case WaitForEvents.Languid:
-				writer.WriteStringValue("languid");
-				return;
+				writer.WriteStringValue(MemberLanguid);
+				break;
 			case WaitForEvents.Immediate:
-				writer.WriteStringValue("immediate");
-				return;
+				writer.WriteStringValue(MemberImmediate);
+				break;
 			case WaitForEvents.High:
-				writer.WriteStringValue("high");
-				return;
+				writer.WriteStringValue(MemberHigh);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(WaitForEvents)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
\ No newline at end of file
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 3af92fe8e4b..f5d0c005826 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
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Core;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport;
 using System;
@@ -43,51 +44,67 @@ public enum ChildScoreMode
 	Avg
 }
 
-internal sealed class ChildScoreModeConverter : JsonConverter<ChildScoreMode>
+internal sealed partial class ChildScoreModeConverter : System.Text.Json.Serialization.JsonConverter<ChildScoreMode>
 {
-	public override ChildScoreMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberSum = System.Text.Json.JsonEncodedText.Encode("sum");
+	private static readonly System.Text.Json.JsonEncodedText MemberNone = System.Text.Json.JsonEncodedText.Encode("none");
+	private static readonly System.Text.Json.JsonEncodedText MemberMin = System.Text.Json.JsonEncodedText.Encode("min");
+	private static readonly System.Text.Json.JsonEncodedText MemberMax = System.Text.Json.JsonEncodedText.Encode("max");
+	private static readonly System.Text.Json.JsonEncodedText MemberAvg = System.Text.Json.JsonEncodedText.Encode("avg");
+
+	public override ChildScoreMode Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "sum":
-				return ChildScoreMode.Sum;
-			case "none":
-				return ChildScoreMode.None;
-			case "min":
-				return ChildScoreMode.Min;
-			case "max":
-				return ChildScoreMode.Max;
-			case "avg":
-				return ChildScoreMode.Avg;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberSum))
+		{
+			return ChildScoreMode.Sum;
+		}
+
+		if (reader.ValueTextEquals(MemberNone))
+		{
+			return ChildScoreMode.None;
+		}
+
+		if (reader.ValueTextEquals(MemberMin))
+		{
+			return ChildScoreMode.Min;
+		}
+
+		if (reader.ValueTextEquals(MemberMax))
+		{
+			return ChildScoreMode.Max;
+		}
+
+		if (reader.ValueTextEquals(MemberAvg))
+		{
+			return ChildScoreMode.Avg;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(ChildScoreMode)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, ChildScoreMode value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ChildScoreMode value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case ChildScoreMode.Sum:
-				writer.WriteStringValue("sum");
-				return;
+				writer.WriteStringValue(MemberSum);
+				break;
 			case ChildScoreMode.None:
-				writer.WriteStringValue("none");
-				return;
+				writer.WriteStringValue(MemberNone);
+				break;
 			case ChildScoreMode.Min:
-				writer.WriteStringValue("min");
-				return;
+				writer.WriteStringValue(MemberMin);
+				break;
 			case ChildScoreMode.Max:
-				writer.WriteStringValue("max");
-				return;
+				writer.WriteStringValue(MemberMax);
+				break;
 			case ChildScoreMode.Avg:
-				writer.WriteStringValue("avg");
-				return;
+				writer.WriteStringValue(MemberAvg);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(ChildScoreMode)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -100,36 +117,40 @@ public enum CombinedFieldsOperator
 	And
 }
 
-internal sealed class CombinedFieldsOperatorConverter : JsonConverter<CombinedFieldsOperator>
+internal sealed partial class CombinedFieldsOperatorConverter : System.Text.Json.Serialization.JsonConverter<CombinedFieldsOperator>
 {
-	public override CombinedFieldsOperator Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberOr = System.Text.Json.JsonEncodedText.Encode("or");
+	private static readonly System.Text.Json.JsonEncodedText MemberAnd = System.Text.Json.JsonEncodedText.Encode("and");
+
+	public override CombinedFieldsOperator Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberOr))
+		{
+			return CombinedFieldsOperator.Or;
+		}
+
+		if (reader.ValueTextEquals(MemberAnd))
 		{
-			case "or":
-				return CombinedFieldsOperator.Or;
-			case "and":
-				return CombinedFieldsOperator.And;
+			return CombinedFieldsOperator.And;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(CombinedFieldsOperator)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, CombinedFieldsOperator value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, CombinedFieldsOperator value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case CombinedFieldsOperator.Or:
-				writer.WriteStringValue("or");
-				return;
+				writer.WriteStringValue(MemberOr);
+				break;
 			case CombinedFieldsOperator.And:
-				writer.WriteStringValue("and");
-				return;
+				writer.WriteStringValue(MemberAnd);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(CombinedFieldsOperator)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -152,36 +173,40 @@ public enum CombinedFieldsZeroTerms
 	All
 }
 
-internal sealed class CombinedFieldsZeroTermsConverter : JsonConverter<CombinedFieldsZeroTerms>
+internal sealed partial class CombinedFieldsZeroTermsConverter : System.Text.Json.Serialization.JsonConverter<CombinedFieldsZeroTerms>
 {
-	public override CombinedFieldsZeroTerms Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberNone = System.Text.Json.JsonEncodedText.Encode("none");
+	private static readonly System.Text.Json.JsonEncodedText MemberAll = System.Text.Json.JsonEncodedText.Encode("all");
+
+	public override CombinedFieldsZeroTerms Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberNone))
+		{
+			return CombinedFieldsZeroTerms.None;
+		}
+
+		if (reader.ValueTextEquals(MemberAll))
 		{
-			case "none":
-				return CombinedFieldsZeroTerms.None;
-			case "all":
-				return CombinedFieldsZeroTerms.All;
+			return CombinedFieldsZeroTerms.All;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(CombinedFieldsZeroTerms)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, CombinedFieldsZeroTerms value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, CombinedFieldsZeroTerms value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case CombinedFieldsZeroTerms.None:
-				writer.WriteStringValue("none");
-				return;
+				writer.WriteStringValue(MemberNone);
+				break;
 			case CombinedFieldsZeroTerms.All:
-				writer.WriteStringValue("all");
-				return;
+				writer.WriteStringValue(MemberAll);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(CombinedFieldsZeroTerms)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -262,76 +287,112 @@ public enum FieldValueFactorModifier
 	Ln
 }
 
-internal sealed class FieldValueFactorModifierConverter : JsonConverter<FieldValueFactorModifier>
+internal sealed partial class FieldValueFactorModifierConverter : System.Text.Json.Serialization.JsonConverter<FieldValueFactorModifier>
 {
-	public override FieldValueFactorModifier Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberSquare = System.Text.Json.JsonEncodedText.Encode("square");
+	private static readonly System.Text.Json.JsonEncodedText MemberSqrt = System.Text.Json.JsonEncodedText.Encode("sqrt");
+	private static readonly System.Text.Json.JsonEncodedText MemberReciprocal = System.Text.Json.JsonEncodedText.Encode("reciprocal");
+	private static readonly System.Text.Json.JsonEncodedText MemberNone = System.Text.Json.JsonEncodedText.Encode("none");
+	private static readonly System.Text.Json.JsonEncodedText MemberLog2p = System.Text.Json.JsonEncodedText.Encode("log2p");
+	private static readonly System.Text.Json.JsonEncodedText MemberLog1p = System.Text.Json.JsonEncodedText.Encode("log1p");
+	private static readonly System.Text.Json.JsonEncodedText MemberLog = System.Text.Json.JsonEncodedText.Encode("log");
+	private static readonly System.Text.Json.JsonEncodedText MemberLn2p = System.Text.Json.JsonEncodedText.Encode("ln2p");
+	private static readonly System.Text.Json.JsonEncodedText MemberLn1p = System.Text.Json.JsonEncodedText.Encode("ln1p");
+	private static readonly System.Text.Json.JsonEncodedText MemberLn = System.Text.Json.JsonEncodedText.Encode("ln");
+
+	public override FieldValueFactorModifier Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "square":
-				return FieldValueFactorModifier.Square;
-			case "sqrt":
-				return FieldValueFactorModifier.Sqrt;
-			case "reciprocal":
-				return FieldValueFactorModifier.Reciprocal;
-			case "none":
-				return FieldValueFactorModifier.None;
-			case "log2p":
-				return FieldValueFactorModifier.Log2p;
-			case "log1p":
-				return FieldValueFactorModifier.Log1p;
-			case "log":
-				return FieldValueFactorModifier.Log;
-			case "ln2p":
-				return FieldValueFactorModifier.Ln2p;
-			case "ln1p":
-				return FieldValueFactorModifier.Ln1p;
-			case "ln":
-				return FieldValueFactorModifier.Ln;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberSquare))
+		{
+			return FieldValueFactorModifier.Square;
+		}
+
+		if (reader.ValueTextEquals(MemberSqrt))
+		{
+			return FieldValueFactorModifier.Sqrt;
+		}
+
+		if (reader.ValueTextEquals(MemberReciprocal))
+		{
+			return FieldValueFactorModifier.Reciprocal;
+		}
+
+		if (reader.ValueTextEquals(MemberNone))
+		{
+			return FieldValueFactorModifier.None;
+		}
+
+		if (reader.ValueTextEquals(MemberLog2p))
+		{
+			return FieldValueFactorModifier.Log2p;
+		}
+
+		if (reader.ValueTextEquals(MemberLog1p))
+		{
+			return FieldValueFactorModifier.Log1p;
+		}
+
+		if (reader.ValueTextEquals(MemberLog))
+		{
+			return FieldValueFactorModifier.Log;
+		}
+
+		if (reader.ValueTextEquals(MemberLn2p))
+		{
+			return FieldValueFactorModifier.Ln2p;
+		}
+
+		if (reader.ValueTextEquals(MemberLn1p))
+		{
+			return FieldValueFactorModifier.Ln1p;
+		}
+
+		if (reader.ValueTextEquals(MemberLn))
+		{
+			return FieldValueFactorModifier.Ln;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(FieldValueFactorModifier)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, FieldValueFactorModifier value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, FieldValueFactorModifier value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case FieldValueFactorModifier.Square:
-				writer.WriteStringValue("square");
-				return;
+				writer.WriteStringValue(MemberSquare);
+				break;
 			case FieldValueFactorModifier.Sqrt:
-				writer.WriteStringValue("sqrt");
-				return;
+				writer.WriteStringValue(MemberSqrt);
+				break;
 			case FieldValueFactorModifier.Reciprocal:
-				writer.WriteStringValue("reciprocal");
-				return;
+				writer.WriteStringValue(MemberReciprocal);
+				break;
 			case FieldValueFactorModifier.None:
-				writer.WriteStringValue("none");
-				return;
+				writer.WriteStringValue(MemberNone);
+				break;
 			case FieldValueFactorModifier.Log2p:
-				writer.WriteStringValue("log2p");
-				return;
+				writer.WriteStringValue(MemberLog2p);
+				break;
 			case FieldValueFactorModifier.Log1p:
-				writer.WriteStringValue("log1p");
-				return;
+				writer.WriteStringValue(MemberLog1p);
+				break;
 			case FieldValueFactorModifier.Log:
-				writer.WriteStringValue("log");
-				return;
+				writer.WriteStringValue(MemberLog);
+				break;
 			case FieldValueFactorModifier.Ln2p:
-				writer.WriteStringValue("ln2p");
-				return;
+				writer.WriteStringValue(MemberLn2p);
+				break;
 			case FieldValueFactorModifier.Ln1p:
-				writer.WriteStringValue("ln1p");
-				return;
+				writer.WriteStringValue(MemberLn1p);
+				break;
 			case FieldValueFactorModifier.Ln:
-				writer.WriteStringValue("ln");
-				return;
+				writer.WriteStringValue(MemberLn);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(FieldValueFactorModifier)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -383,56 +444,76 @@ public enum FunctionBoostMode
 	Avg
 }
 
-internal sealed class FunctionBoostModeConverter : JsonConverter<FunctionBoostMode>
+internal sealed partial class FunctionBoostModeConverter : System.Text.Json.Serialization.JsonConverter<FunctionBoostMode>
 {
-	public override FunctionBoostMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberSum = System.Text.Json.JsonEncodedText.Encode("sum");
+	private static readonly System.Text.Json.JsonEncodedText MemberReplace = System.Text.Json.JsonEncodedText.Encode("replace");
+	private static readonly System.Text.Json.JsonEncodedText MemberMultiply = System.Text.Json.JsonEncodedText.Encode("multiply");
+	private static readonly System.Text.Json.JsonEncodedText MemberMin = System.Text.Json.JsonEncodedText.Encode("min");
+	private static readonly System.Text.Json.JsonEncodedText MemberMax = System.Text.Json.JsonEncodedText.Encode("max");
+	private static readonly System.Text.Json.JsonEncodedText MemberAvg = System.Text.Json.JsonEncodedText.Encode("avg");
+
+	public override FunctionBoostMode Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "sum":
-				return FunctionBoostMode.Sum;
-			case "replace":
-				return FunctionBoostMode.Replace;
-			case "multiply":
-				return FunctionBoostMode.Multiply;
-			case "min":
-				return FunctionBoostMode.Min;
-			case "max":
-				return FunctionBoostMode.Max;
-			case "avg":
-				return FunctionBoostMode.Avg;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberSum))
+		{
+			return FunctionBoostMode.Sum;
+		}
+
+		if (reader.ValueTextEquals(MemberReplace))
+		{
+			return FunctionBoostMode.Replace;
+		}
+
+		if (reader.ValueTextEquals(MemberMultiply))
+		{
+			return FunctionBoostMode.Multiply;
+		}
+
+		if (reader.ValueTextEquals(MemberMin))
+		{
+			return FunctionBoostMode.Min;
+		}
+
+		if (reader.ValueTextEquals(MemberMax))
+		{
+			return FunctionBoostMode.Max;
+		}
+
+		if (reader.ValueTextEquals(MemberAvg))
+		{
+			return FunctionBoostMode.Avg;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(FunctionBoostMode)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, FunctionBoostMode value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, FunctionBoostMode value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case FunctionBoostMode.Sum:
-				writer.WriteStringValue("sum");
-				return;
+				writer.WriteStringValue(MemberSum);
+				break;
 			case FunctionBoostMode.Replace:
-				writer.WriteStringValue("replace");
-				return;
+				writer.WriteStringValue(MemberReplace);
+				break;
 			case FunctionBoostMode.Multiply:
-				writer.WriteStringValue("multiply");
-				return;
+				writer.WriteStringValue(MemberMultiply);
+				break;
 			case FunctionBoostMode.Min:
-				writer.WriteStringValue("min");
-				return;
+				writer.WriteStringValue(MemberMin);
+				break;
 			case FunctionBoostMode.Max:
-				writer.WriteStringValue("max");
-				return;
+				writer.WriteStringValue(MemberMax);
+				break;
 			case FunctionBoostMode.Avg:
-				writer.WriteStringValue("avg");
-				return;
+				writer.WriteStringValue(MemberAvg);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(FunctionBoostMode)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -483,56 +564,76 @@ public enum FunctionScoreMode
 	Avg
 }
 
-internal sealed class FunctionScoreModeConverter : JsonConverter<FunctionScoreMode>
+internal sealed partial class FunctionScoreModeConverter : System.Text.Json.Serialization.JsonConverter<FunctionScoreMode>
 {
-	public override FunctionScoreMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberSum = System.Text.Json.JsonEncodedText.Encode("sum");
+	private static readonly System.Text.Json.JsonEncodedText MemberMultiply = System.Text.Json.JsonEncodedText.Encode("multiply");
+	private static readonly System.Text.Json.JsonEncodedText MemberMin = System.Text.Json.JsonEncodedText.Encode("min");
+	private static readonly System.Text.Json.JsonEncodedText MemberMax = System.Text.Json.JsonEncodedText.Encode("max");
+	private static readonly System.Text.Json.JsonEncodedText MemberFirst = System.Text.Json.JsonEncodedText.Encode("first");
+	private static readonly System.Text.Json.JsonEncodedText MemberAvg = System.Text.Json.JsonEncodedText.Encode("avg");
+
+	public override FunctionScoreMode Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "sum":
-				return FunctionScoreMode.Sum;
-			case "multiply":
-				return FunctionScoreMode.Multiply;
-			case "min":
-				return FunctionScoreMode.Min;
-			case "max":
-				return FunctionScoreMode.Max;
-			case "first":
-				return FunctionScoreMode.First;
-			case "avg":
-				return FunctionScoreMode.Avg;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberSum))
+		{
+			return FunctionScoreMode.Sum;
+		}
+
+		if (reader.ValueTextEquals(MemberMultiply))
+		{
+			return FunctionScoreMode.Multiply;
+		}
+
+		if (reader.ValueTextEquals(MemberMin))
+		{
+			return FunctionScoreMode.Min;
+		}
+
+		if (reader.ValueTextEquals(MemberMax))
+		{
+			return FunctionScoreMode.Max;
+		}
+
+		if (reader.ValueTextEquals(MemberFirst))
+		{
+			return FunctionScoreMode.First;
+		}
+
+		if (reader.ValueTextEquals(MemberAvg))
+		{
+			return FunctionScoreMode.Avg;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(FunctionScoreMode)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, FunctionScoreMode value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, FunctionScoreMode value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case FunctionScoreMode.Sum:
-				writer.WriteStringValue("sum");
-				return;
+				writer.WriteStringValue(MemberSum);
+				break;
 			case FunctionScoreMode.Multiply:
-				writer.WriteStringValue("multiply");
-				return;
+				writer.WriteStringValue(MemberMultiply);
+				break;
 			case FunctionScoreMode.Min:
-				writer.WriteStringValue("min");
-				return;
+				writer.WriteStringValue(MemberMin);
+				break;
 			case FunctionScoreMode.Max:
-				writer.WriteStringValue("max");
-				return;
+				writer.WriteStringValue(MemberMax);
+				break;
 			case FunctionScoreMode.First:
-				writer.WriteStringValue("first");
-				return;
+				writer.WriteStringValue(MemberFirst);
+				break;
 			case FunctionScoreMode.Avg:
-				writer.WriteStringValue("avg");
-				return;
+				writer.WriteStringValue(MemberAvg);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(FunctionScoreMode)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -557,41 +658,49 @@ public enum GeoValidationMethod
 	Coerce
 }
 
-internal sealed class GeoValidationMethodConverter : JsonConverter<GeoValidationMethod>
+internal sealed partial class GeoValidationMethodConverter : System.Text.Json.Serialization.JsonConverter<GeoValidationMethod>
 {
-	public override GeoValidationMethod Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberStrict = System.Text.Json.JsonEncodedText.Encode("strict");
+	private static readonly System.Text.Json.JsonEncodedText MemberIgnoreMalformed = System.Text.Json.JsonEncodedText.Encode("ignore_malformed");
+	private static readonly System.Text.Json.JsonEncodedText MemberCoerce = System.Text.Json.JsonEncodedText.Encode("coerce");
+
+	public override GeoValidationMethod Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberStrict))
+		{
+			return GeoValidationMethod.Strict;
+		}
+
+		if (reader.ValueTextEquals(MemberIgnoreMalformed))
 		{
-			case "strict":
-				return GeoValidationMethod.Strict;
-			case "ignore_malformed":
-				return GeoValidationMethod.IgnoreMalformed;
-			case "coerce":
-				return GeoValidationMethod.Coerce;
+			return GeoValidationMethod.IgnoreMalformed;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberCoerce))
+		{
+			return GeoValidationMethod.Coerce;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(GeoValidationMethod)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, GeoValidationMethod value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GeoValidationMethod value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case GeoValidationMethod.Strict:
-				writer.WriteStringValue("strict");
-				return;
+				writer.WriteStringValue(MemberStrict);
+				break;
 			case GeoValidationMethod.IgnoreMalformed:
-				writer.WriteStringValue("ignore_malformed");
-				return;
+				writer.WriteStringValue(MemberIgnoreMalformed);
+				break;
 			case GeoValidationMethod.Coerce:
-				writer.WriteStringValue("coerce");
-				return;
+				writer.WriteStringValue(MemberCoerce);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(GeoValidationMethod)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -628,46 +737,58 @@ public enum MultiValueMode
 	Avg
 }
 
-internal sealed class MultiValueModeConverter : JsonConverter<MultiValueMode>
+internal sealed partial class MultiValueModeConverter : System.Text.Json.Serialization.JsonConverter<MultiValueMode>
 {
-	public override MultiValueMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberSum = System.Text.Json.JsonEncodedText.Encode("sum");
+	private static readonly System.Text.Json.JsonEncodedText MemberMin = System.Text.Json.JsonEncodedText.Encode("min");
+	private static readonly System.Text.Json.JsonEncodedText MemberMax = System.Text.Json.JsonEncodedText.Encode("max");
+	private static readonly System.Text.Json.JsonEncodedText MemberAvg = System.Text.Json.JsonEncodedText.Encode("avg");
+
+	public override MultiValueMode Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberSum))
+		{
+			return MultiValueMode.Sum;
+		}
+
+		if (reader.ValueTextEquals(MemberMin))
+		{
+			return MultiValueMode.Min;
+		}
+
+		if (reader.ValueTextEquals(MemberMax))
+		{
+			return MultiValueMode.Max;
+		}
+
+		if (reader.ValueTextEquals(MemberAvg))
 		{
-			case "sum":
-				return MultiValueMode.Sum;
-			case "min":
-				return MultiValueMode.Min;
-			case "max":
-				return MultiValueMode.Max;
-			case "avg":
-				return MultiValueMode.Avg;
+			return MultiValueMode.Avg;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(MultiValueMode)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, MultiValueMode value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, MultiValueMode value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case MultiValueMode.Sum:
-				writer.WriteStringValue("sum");
-				return;
+				writer.WriteStringValue(MemberSum);
+				break;
 			case MultiValueMode.Min:
-				writer.WriteStringValue("min");
-				return;
+				writer.WriteStringValue(MemberMin);
+				break;
 			case MultiValueMode.Max:
-				writer.WriteStringValue("max");
-				return;
+				writer.WriteStringValue(MemberMax);
+				break;
 			case MultiValueMode.Avg:
-				writer.WriteStringValue("avg");
-				return;
+				writer.WriteStringValue(MemberAvg);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(MultiValueMode)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -680,38 +801,42 @@ public enum Operator
 	And
 }
 
-internal sealed class OperatorConverter : JsonConverter<Operator>
+internal sealed partial class OperatorConverter : System.Text.Json.Serialization.JsonConverter<Operator>
 {
-	public override Operator Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberOr = System.Text.Json.JsonEncodedText.Encode("or");
+	private static readonly System.Text.Json.JsonEncodedText MemberOr1 = System.Text.Json.JsonEncodedText.Encode("OR");
+	private static readonly System.Text.Json.JsonEncodedText MemberAnd = System.Text.Json.JsonEncodedText.Encode("and");
+	private static readonly System.Text.Json.JsonEncodedText MemberAnd1 = System.Text.Json.JsonEncodedText.Encode("AND");
+
+	public override Operator Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberOr) || reader.ValueTextEquals(MemberOr1))
+		{
+			return Operator.Or;
+		}
+
+		if (reader.ValueTextEquals(MemberAnd) || reader.ValueTextEquals(MemberAnd1))
 		{
-			case "or":
-			case "OR":
-				return Operator.Or;
-			case "and":
-			case "AND":
-				return Operator.And;
+			return Operator.And;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(Operator)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, Operator value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, Operator value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case Operator.Or:
-				writer.WriteStringValue("or");
-				return;
+				writer.WriteStringValue(MemberOr);
+				break;
 			case Operator.And:
-				writer.WriteStringValue("and");
-				return;
+				writer.WriteStringValue(MemberAnd);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(Operator)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -741,41 +866,49 @@ public enum RangeRelation
 	Contains
 }
 
-internal sealed class RangeRelationConverter : JsonConverter<RangeRelation>
+internal sealed partial class RangeRelationConverter : System.Text.Json.Serialization.JsonConverter<RangeRelation>
 {
-	public override RangeRelation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberWithin = System.Text.Json.JsonEncodedText.Encode("within");
+	private static readonly System.Text.Json.JsonEncodedText MemberIntersects = System.Text.Json.JsonEncodedText.Encode("intersects");
+	private static readonly System.Text.Json.JsonEncodedText MemberContains = System.Text.Json.JsonEncodedText.Encode("contains");
+
+	public override RangeRelation Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberWithin))
+		{
+			return RangeRelation.Within;
+		}
+
+		if (reader.ValueTextEquals(MemberIntersects))
 		{
-			case "within":
-				return RangeRelation.Within;
-			case "intersects":
-				return RangeRelation.Intersects;
-			case "contains":
-				return RangeRelation.Contains;
+			return RangeRelation.Intersects;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberContains))
+		{
+			return RangeRelation.Contains;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(RangeRelation)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, RangeRelation value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, RangeRelation value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case RangeRelation.Within:
-				writer.WriteStringValue("within");
-				return;
+				writer.WriteStringValue(MemberWithin);
+				break;
 			case RangeRelation.Intersects:
-				writer.WriteStringValue("intersects");
-				return;
+				writer.WriteStringValue(MemberIntersects);
+				break;
 			case RangeRelation.Contains:
-				writer.WriteStringValue("contains");
-				return;
+				writer.WriteStringValue(MemberContains);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(RangeRelation)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -1008,56 +1141,76 @@ public enum TextQueryType
 	BestFields
 }
 
-internal sealed class TextQueryTypeConverter : JsonConverter<TextQueryType>
+internal sealed partial class TextQueryTypeConverter : System.Text.Json.Serialization.JsonConverter<TextQueryType>
 {
-	public override TextQueryType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberPhrasePrefix = System.Text.Json.JsonEncodedText.Encode("phrase_prefix");
+	private static readonly System.Text.Json.JsonEncodedText MemberPhrase = System.Text.Json.JsonEncodedText.Encode("phrase");
+	private static readonly System.Text.Json.JsonEncodedText MemberMostFields = System.Text.Json.JsonEncodedText.Encode("most_fields");
+	private static readonly System.Text.Json.JsonEncodedText MemberCrossFields = System.Text.Json.JsonEncodedText.Encode("cross_fields");
+	private static readonly System.Text.Json.JsonEncodedText MemberBoolPrefix = System.Text.Json.JsonEncodedText.Encode("bool_prefix");
+	private static readonly System.Text.Json.JsonEncodedText MemberBestFields = System.Text.Json.JsonEncodedText.Encode("best_fields");
+
+	public override TextQueryType Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "phrase_prefix":
-				return TextQueryType.PhrasePrefix;
-			case "phrase":
-				return TextQueryType.Phrase;
-			case "most_fields":
-				return TextQueryType.MostFields;
-			case "cross_fields":
-				return TextQueryType.CrossFields;
-			case "bool_prefix":
-				return TextQueryType.BoolPrefix;
-			case "best_fields":
-				return TextQueryType.BestFields;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberPhrasePrefix))
+		{
+			return TextQueryType.PhrasePrefix;
+		}
+
+		if (reader.ValueTextEquals(MemberPhrase))
+		{
+			return TextQueryType.Phrase;
+		}
+
+		if (reader.ValueTextEquals(MemberMostFields))
+		{
+			return TextQueryType.MostFields;
+		}
+
+		if (reader.ValueTextEquals(MemberCrossFields))
+		{
+			return TextQueryType.CrossFields;
+		}
+
+		if (reader.ValueTextEquals(MemberBoolPrefix))
+		{
+			return TextQueryType.BoolPrefix;
+		}
+
+		if (reader.ValueTextEquals(MemberBestFields))
+		{
+			return TextQueryType.BestFields;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(TextQueryType)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, TextQueryType value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, TextQueryType value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case TextQueryType.PhrasePrefix:
-				writer.WriteStringValue("phrase_prefix");
-				return;
+				writer.WriteStringValue(MemberPhrasePrefix);
+				break;
 			case TextQueryType.Phrase:
-				writer.WriteStringValue("phrase");
-				return;
+				writer.WriteStringValue(MemberPhrase);
+				break;
 			case TextQueryType.MostFields:
-				writer.WriteStringValue("most_fields");
-				return;
+				writer.WriteStringValue(MemberMostFields);
+				break;
 			case TextQueryType.CrossFields:
-				writer.WriteStringValue("cross_fields");
-				return;
+				writer.WriteStringValue(MemberCrossFields);
+				break;
 			case TextQueryType.BoolPrefix:
-				writer.WriteStringValue("bool_prefix");
-				return;
+				writer.WriteStringValue(MemberBoolPrefix);
+				break;
 			case TextQueryType.BestFields:
-				writer.WriteStringValue("best_fields");
-				return;
+				writer.WriteStringValue(MemberBestFields);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(TextQueryType)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -1080,35 +1233,39 @@ public enum ZeroTermsQuery
 	All
 }
 
-internal sealed class ZeroTermsQueryConverter : JsonConverter<ZeroTermsQuery>
+internal sealed partial class ZeroTermsQueryConverter : System.Text.Json.Serialization.JsonConverter<ZeroTermsQuery>
 {
-	public override ZeroTermsQuery Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberNone = System.Text.Json.JsonEncodedText.Encode("none");
+	private static readonly System.Text.Json.JsonEncodedText MemberAll = System.Text.Json.JsonEncodedText.Encode("all");
+
+	public override ZeroTermsQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberNone))
 		{
-			case "none":
-				return ZeroTermsQuery.None;
-			case "all":
-				return ZeroTermsQuery.All;
+			return ZeroTermsQuery.None;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberAll))
+		{
+			return ZeroTermsQuery.All;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(ZeroTermsQuery)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, ZeroTermsQuery value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ZeroTermsQuery value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case ZeroTermsQuery.None:
-				writer.WriteStringValue("none");
-				return;
+				writer.WriteStringValue(MemberNone);
+				break;
 			case ZeroTermsQuery.All:
-				writer.WriteStringValue("all");
-				return;
+				writer.WriteStringValue(MemberAll);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(ZeroTermsQuery)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.QueryRules.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.QueryRules.g.cs
index 2a8f7fef228..2fbc113a33b 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.QueryRules.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.QueryRules.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Core;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport;
 using System;
@@ -57,86 +58,130 @@ public enum QueryRuleCriteriaType
 	Always
 }
 
-internal sealed class QueryRuleCriteriaTypeConverter : JsonConverter<QueryRuleCriteriaType>
+internal sealed partial class QueryRuleCriteriaTypeConverter : System.Text.Json.Serialization.JsonConverter<QueryRuleCriteriaType>
 {
-	public override QueryRuleCriteriaType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberSuffix = System.Text.Json.JsonEncodedText.Encode("suffix");
+	private static readonly System.Text.Json.JsonEncodedText MemberPrefix = System.Text.Json.JsonEncodedText.Encode("prefix");
+	private static readonly System.Text.Json.JsonEncodedText MemberLte = System.Text.Json.JsonEncodedText.Encode("lte");
+	private static readonly System.Text.Json.JsonEncodedText MemberLt = System.Text.Json.JsonEncodedText.Encode("lt");
+	private static readonly System.Text.Json.JsonEncodedText MemberGte = System.Text.Json.JsonEncodedText.Encode("gte");
+	private static readonly System.Text.Json.JsonEncodedText MemberGt = System.Text.Json.JsonEncodedText.Encode("gt");
+	private static readonly System.Text.Json.JsonEncodedText MemberGlobal = System.Text.Json.JsonEncodedText.Encode("global");
+	private static readonly System.Text.Json.JsonEncodedText MemberFuzzy = System.Text.Json.JsonEncodedText.Encode("fuzzy");
+	private static readonly System.Text.Json.JsonEncodedText MemberExactFuzzy = System.Text.Json.JsonEncodedText.Encode("exact_fuzzy");
+	private static readonly System.Text.Json.JsonEncodedText MemberExact = System.Text.Json.JsonEncodedText.Encode("exact");
+	private static readonly System.Text.Json.JsonEncodedText MemberContains = System.Text.Json.JsonEncodedText.Encode("contains");
+	private static readonly System.Text.Json.JsonEncodedText MemberAlways = System.Text.Json.JsonEncodedText.Encode("always");
+
+	public override QueryRuleCriteriaType Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "suffix":
-				return QueryRuleCriteriaType.Suffix;
-			case "prefix":
-				return QueryRuleCriteriaType.Prefix;
-			case "lte":
-				return QueryRuleCriteriaType.Lte;
-			case "lt":
-				return QueryRuleCriteriaType.Lt;
-			case "gte":
-				return QueryRuleCriteriaType.Gte;
-			case "gt":
-				return QueryRuleCriteriaType.Gt;
-			case "global":
-				return QueryRuleCriteriaType.Global;
-			case "fuzzy":
-				return QueryRuleCriteriaType.Fuzzy;
-			case "exact_fuzzy":
-				return QueryRuleCriteriaType.ExactFuzzy;
-			case "exact":
-				return QueryRuleCriteriaType.Exact;
-			case "contains":
-				return QueryRuleCriteriaType.Contains;
-			case "always":
-				return QueryRuleCriteriaType.Always;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberSuffix))
+		{
+			return QueryRuleCriteriaType.Suffix;
+		}
+
+		if (reader.ValueTextEquals(MemberPrefix))
+		{
+			return QueryRuleCriteriaType.Prefix;
+		}
+
+		if (reader.ValueTextEquals(MemberLte))
+		{
+			return QueryRuleCriteriaType.Lte;
+		}
+
+		if (reader.ValueTextEquals(MemberLt))
+		{
+			return QueryRuleCriteriaType.Lt;
+		}
+
+		if (reader.ValueTextEquals(MemberGte))
+		{
+			return QueryRuleCriteriaType.Gte;
+		}
+
+		if (reader.ValueTextEquals(MemberGt))
+		{
+			return QueryRuleCriteriaType.Gt;
+		}
+
+		if (reader.ValueTextEquals(MemberGlobal))
+		{
+			return QueryRuleCriteriaType.Global;
+		}
+
+		if (reader.ValueTextEquals(MemberFuzzy))
+		{
+			return QueryRuleCriteriaType.Fuzzy;
+		}
+
+		if (reader.ValueTextEquals(MemberExactFuzzy))
+		{
+			return QueryRuleCriteriaType.ExactFuzzy;
+		}
+
+		if (reader.ValueTextEquals(MemberExact))
+		{
+			return QueryRuleCriteriaType.Exact;
+		}
+
+		if (reader.ValueTextEquals(MemberContains))
+		{
+			return QueryRuleCriteriaType.Contains;
+		}
+
+		if (reader.ValueTextEquals(MemberAlways))
+		{
+			return QueryRuleCriteriaType.Always;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(QueryRuleCriteriaType)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, QueryRuleCriteriaType value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, QueryRuleCriteriaType value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case QueryRuleCriteriaType.Suffix:
-				writer.WriteStringValue("suffix");
-				return;
+				writer.WriteStringValue(MemberSuffix);
+				break;
 			case QueryRuleCriteriaType.Prefix:
-				writer.WriteStringValue("prefix");
-				return;
+				writer.WriteStringValue(MemberPrefix);
+				break;
 			case QueryRuleCriteriaType.Lte:
-				writer.WriteStringValue("lte");
-				return;
+				writer.WriteStringValue(MemberLte);
+				break;
 			case QueryRuleCriteriaType.Lt:
-				writer.WriteStringValue("lt");
-				return;
+				writer.WriteStringValue(MemberLt);
+				break;
 			case QueryRuleCriteriaType.Gte:
-				writer.WriteStringValue("gte");
-				return;
+				writer.WriteStringValue(MemberGte);
+				break;
 			case QueryRuleCriteriaType.Gt:
-				writer.WriteStringValue("gt");
-				return;
+				writer.WriteStringValue(MemberGt);
+				break;
 			case QueryRuleCriteriaType.Global:
-				writer.WriteStringValue("global");
-				return;
+				writer.WriteStringValue(MemberGlobal);
+				break;
 			case QueryRuleCriteriaType.Fuzzy:
-				writer.WriteStringValue("fuzzy");
-				return;
+				writer.WriteStringValue(MemberFuzzy);
+				break;
 			case QueryRuleCriteriaType.ExactFuzzy:
-				writer.WriteStringValue("exact_fuzzy");
-				return;
+				writer.WriteStringValue(MemberExactFuzzy);
+				break;
 			case QueryRuleCriteriaType.Exact:
-				writer.WriteStringValue("exact");
-				return;
+				writer.WriteStringValue(MemberExact);
+				break;
 			case QueryRuleCriteriaType.Contains:
-				writer.WriteStringValue("contains");
-				return;
+				writer.WriteStringValue(MemberContains);
+				break;
 			case QueryRuleCriteriaType.Always:
-				writer.WriteStringValue("always");
-				return;
+				writer.WriteStringValue(MemberAlways);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(QueryRuleCriteriaType)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -149,35 +194,39 @@ public enum QueryRuleType
 	Exclude
 }
 
-internal sealed class QueryRuleTypeConverter : JsonConverter<QueryRuleType>
+internal sealed partial class QueryRuleTypeConverter : System.Text.Json.Serialization.JsonConverter<QueryRuleType>
 {
-	public override QueryRuleType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberPinned = System.Text.Json.JsonEncodedText.Encode("pinned");
+	private static readonly System.Text.Json.JsonEncodedText MemberExclude = System.Text.Json.JsonEncodedText.Encode("exclude");
+
+	public override QueryRuleType Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberPinned))
 		{
-			case "pinned":
-				return QueryRuleType.Pinned;
-			case "exclude":
-				return QueryRuleType.Exclude;
+			return QueryRuleType.Pinned;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberExclude))
+		{
+			return QueryRuleType.Exclude;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(QueryRuleType)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, QueryRuleType value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, QueryRuleType value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case QueryRuleType.Pinned:
-				writer.WriteStringValue("pinned");
-				return;
+				writer.WriteStringValue(MemberPinned);
+				break;
 			case QueryRuleType.Exclude:
-				writer.WriteStringValue("exclude");
-				return;
+				writer.WriteStringValue(MemberExclude);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(QueryRuleType)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Rollup.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Rollup.g.cs
index 21d54ddc082..196dc67392d 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Rollup.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Rollup.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Core;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport;
 using System;
@@ -43,51 +44,67 @@ public enum IndexingJobState
 	Aborting
 }
 
-internal sealed class IndexingJobStateConverter : JsonConverter<IndexingJobState>
+internal sealed partial class IndexingJobStateConverter : System.Text.Json.Serialization.JsonConverter<IndexingJobState>
 {
-	public override IndexingJobState Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberStopping = System.Text.Json.JsonEncodedText.Encode("stopping");
+	private static readonly System.Text.Json.JsonEncodedText MemberStopped = System.Text.Json.JsonEncodedText.Encode("stopped");
+	private static readonly System.Text.Json.JsonEncodedText MemberStarted = System.Text.Json.JsonEncodedText.Encode("started");
+	private static readonly System.Text.Json.JsonEncodedText MemberIndexing = System.Text.Json.JsonEncodedText.Encode("indexing");
+	private static readonly System.Text.Json.JsonEncodedText MemberAborting = System.Text.Json.JsonEncodedText.Encode("aborting");
+
+	public override IndexingJobState Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberStopping))
+		{
+			return IndexingJobState.Stopping;
+		}
+
+		if (reader.ValueTextEquals(MemberStopped))
+		{
+			return IndexingJobState.Stopped;
+		}
+
+		if (reader.ValueTextEquals(MemberStarted))
 		{
-			case "stopping":
-				return IndexingJobState.Stopping;
-			case "stopped":
-				return IndexingJobState.Stopped;
-			case "started":
-				return IndexingJobState.Started;
-			case "indexing":
-				return IndexingJobState.Indexing;
-			case "aborting":
-				return IndexingJobState.Aborting;
+			return IndexingJobState.Started;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberIndexing))
+		{
+			return IndexingJobState.Indexing;
+		}
+
+		if (reader.ValueTextEquals(MemberAborting))
+		{
+			return IndexingJobState.Aborting;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(IndexingJobState)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, IndexingJobState value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IndexingJobState value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case IndexingJobState.Stopping:
-				writer.WriteStringValue("stopping");
-				return;
+				writer.WriteStringValue(MemberStopping);
+				break;
 			case IndexingJobState.Stopped:
-				writer.WriteStringValue("stopped");
-				return;
+				writer.WriteStringValue(MemberStopped);
+				break;
 			case IndexingJobState.Started:
-				writer.WriteStringValue("started");
-				return;
+				writer.WriteStringValue(MemberStarted);
+				break;
 			case IndexingJobState.Indexing:
-				writer.WriteStringValue("indexing");
-				return;
+				writer.WriteStringValue(MemberIndexing);
+				break;
 			case IndexingJobState.Aborting:
-				writer.WriteStringValue("aborting");
-				return;
+				writer.WriteStringValue(MemberAborting);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(IndexingJobState)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -106,50 +123,66 @@ public enum Metric
 	Avg
 }
 
-internal sealed class MetricConverter : JsonConverter<Metric>
+internal sealed partial class MetricConverter : System.Text.Json.Serialization.JsonConverter<Metric>
 {
-	public override Metric Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberValueCount = System.Text.Json.JsonEncodedText.Encode("value_count");
+	private static readonly System.Text.Json.JsonEncodedText MemberSum = System.Text.Json.JsonEncodedText.Encode("sum");
+	private static readonly System.Text.Json.JsonEncodedText MemberMin = System.Text.Json.JsonEncodedText.Encode("min");
+	private static readonly System.Text.Json.JsonEncodedText MemberMax = System.Text.Json.JsonEncodedText.Encode("max");
+	private static readonly System.Text.Json.JsonEncodedText MemberAvg = System.Text.Json.JsonEncodedText.Encode("avg");
+
+	public override Metric Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberValueCount))
+		{
+			return Metric.ValueCount;
+		}
+
+		if (reader.ValueTextEquals(MemberSum))
+		{
+			return Metric.Sum;
+		}
+
+		if (reader.ValueTextEquals(MemberMin))
 		{
-			case "value_count":
-				return Metric.ValueCount;
-			case "sum":
-				return Metric.Sum;
-			case "min":
-				return Metric.Min;
-			case "max":
-				return Metric.Max;
-			case "avg":
-				return Metric.Avg;
+			return Metric.Min;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberMax))
+		{
+			return Metric.Max;
+		}
+
+		if (reader.ValueTextEquals(MemberAvg))
+		{
+			return Metric.Avg;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(Metric)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, Metric value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, Metric value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case Metric.ValueCount:
-				writer.WriteStringValue("value_count");
-				return;
+				writer.WriteStringValue(MemberValueCount);
+				break;
 			case Metric.Sum:
-				writer.WriteStringValue("sum");
-				return;
+				writer.WriteStringValue(MemberSum);
+				break;
 			case Metric.Min:
-				writer.WriteStringValue("min");
-				return;
+				writer.WriteStringValue(MemberMin);
+				break;
 			case Metric.Max:
-				writer.WriteStringValue("max");
-				return;
+				writer.WriteStringValue(MemberMax);
+				break;
 			case Metric.Avg:
-				writer.WriteStringValue("avg");
-				return;
+				writer.WriteStringValue(MemberAvg);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(Metric)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.SearchApplication.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.SearchApplication.g.cs
index 0b57910379c..7c3a575e248 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.SearchApplication.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.SearchApplication.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Core;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport;
 using System;
@@ -39,40 +40,48 @@ public enum EventType
 	Pageview
 }
 
-internal sealed class EventTypeConverter : JsonConverter<EventType>
+internal sealed partial class EventTypeConverter : System.Text.Json.Serialization.JsonConverter<EventType>
 {
-	public override EventType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberSearchclick = System.Text.Json.JsonEncodedText.Encode("search_click");
+	private static readonly System.Text.Json.JsonEncodedText MemberSearch = System.Text.Json.JsonEncodedText.Encode("search");
+	private static readonly System.Text.Json.JsonEncodedText MemberPageview = System.Text.Json.JsonEncodedText.Encode("page_view");
+
+	public override EventType Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberSearchclick))
+		{
+			return EventType.Searchclick;
+		}
+
+		if (reader.ValueTextEquals(MemberSearch))
 		{
-			case "search_click":
-				return EventType.Searchclick;
-			case "search":
-				return EventType.Search;
-			case "page_view":
-				return EventType.Pageview;
+			return EventType.Search;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberPageview))
+		{
+			return EventType.Pageview;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(EventType)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, EventType value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, EventType value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case EventType.Searchclick:
-				writer.WriteStringValue("search_click");
-				return;
+				writer.WriteStringValue(MemberSearchclick);
+				break;
 			case EventType.Search:
-				writer.WriteStringValue("search");
-				return;
+				writer.WriteStringValue(MemberSearch);
+				break;
 			case EventType.Pageview:
-				writer.WriteStringValue("page_view");
-				return;
+				writer.WriteStringValue(MemberPageview);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(EventType)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.SearchableSnapshots.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.SearchableSnapshots.g.cs
index 347c56fa44b..a43317e650a 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.SearchableSnapshots.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.SearchableSnapshots.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Core;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport;
 using System;
@@ -39,40 +40,48 @@ public enum StatsLevel
 	Cluster
 }
 
-internal sealed class StatsLevelConverter : JsonConverter<StatsLevel>
+internal sealed partial class StatsLevelConverter : System.Text.Json.Serialization.JsonConverter<StatsLevel>
 {
-	public override StatsLevel Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberShards = System.Text.Json.JsonEncodedText.Encode("shards");
+	private static readonly System.Text.Json.JsonEncodedText MemberIndices = System.Text.Json.JsonEncodedText.Encode("indices");
+	private static readonly System.Text.Json.JsonEncodedText MemberCluster = System.Text.Json.JsonEncodedText.Encode("cluster");
+
+	public override StatsLevel Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberShards))
+		{
+			return StatsLevel.Shards;
+		}
+
+		if (reader.ValueTextEquals(MemberIndices))
 		{
-			case "shards":
-				return StatsLevel.Shards;
-			case "indices":
-				return StatsLevel.Indices;
-			case "cluster":
-				return StatsLevel.Cluster;
+			return StatsLevel.Indices;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberCluster))
+		{
+			return StatsLevel.Cluster;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(StatsLevel)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, StatsLevel value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, StatsLevel value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case StatsLevel.Shards:
-				writer.WriteStringValue("shards");
-				return;
+				writer.WriteStringValue(MemberShards);
+				break;
 			case StatsLevel.Indices:
-				writer.WriteStringValue("indices");
-				return;
+				writer.WriteStringValue(MemberIndices);
+				break;
 			case StatsLevel.Cluster:
-				writer.WriteStringValue("cluster");
-				return;
+				writer.WriteStringValue(MemberCluster);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(StatsLevel)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Security.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Security.g.cs
index a73a00e061d..bd2ce6cff7e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Security.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Security.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Core;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport;
 using System;
@@ -41,46 +42,58 @@ public enum AccessTokenGrantType
 	ClientCredentials
 }
 
-internal sealed class AccessTokenGrantTypeConverter : JsonConverter<AccessTokenGrantType>
+internal sealed partial class AccessTokenGrantTypeConverter : System.Text.Json.Serialization.JsonConverter<AccessTokenGrantType>
 {
-	public override AccessTokenGrantType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberRefreshToken = System.Text.Json.JsonEncodedText.Encode("refresh_token");
+	private static readonly System.Text.Json.JsonEncodedText MemberPassword = System.Text.Json.JsonEncodedText.Encode("password");
+	private static readonly System.Text.Json.JsonEncodedText MemberKerberos = System.Text.Json.JsonEncodedText.Encode("_kerberos");
+	private static readonly System.Text.Json.JsonEncodedText MemberClientCredentials = System.Text.Json.JsonEncodedText.Encode("client_credentials");
+
+	public override AccessTokenGrantType Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberRefreshToken))
+		{
+			return AccessTokenGrantType.RefreshToken;
+		}
+
+		if (reader.ValueTextEquals(MemberPassword))
 		{
-			case "refresh_token":
-				return AccessTokenGrantType.RefreshToken;
-			case "password":
-				return AccessTokenGrantType.Password;
-			case "_kerberos":
-				return AccessTokenGrantType.Kerberos;
-			case "client_credentials":
-				return AccessTokenGrantType.ClientCredentials;
+			return AccessTokenGrantType.Password;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberKerberos))
+		{
+			return AccessTokenGrantType.Kerberos;
+		}
+
+		if (reader.ValueTextEquals(MemberClientCredentials))
+		{
+			return AccessTokenGrantType.ClientCredentials;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(AccessTokenGrantType)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, AccessTokenGrantType value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, AccessTokenGrantType value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case AccessTokenGrantType.RefreshToken:
-				writer.WriteStringValue("refresh_token");
-				return;
+				writer.WriteStringValue(MemberRefreshToken);
+				break;
 			case AccessTokenGrantType.Password:
-				writer.WriteStringValue("password");
-				return;
+				writer.WriteStringValue(MemberPassword);
+				break;
 			case AccessTokenGrantType.Kerberos:
-				writer.WriteStringValue("_kerberos");
-				return;
+				writer.WriteStringValue(MemberKerberos);
+				break;
 			case AccessTokenGrantType.ClientCredentials:
-				writer.WriteStringValue("client_credentials");
-				return;
+				writer.WriteStringValue(MemberClientCredentials);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(AccessTokenGrantType)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -93,36 +106,40 @@ public enum ApiKeyGrantType
 	AccessToken
 }
 
-internal sealed class ApiKeyGrantTypeConverter : JsonConverter<ApiKeyGrantType>
+internal sealed partial class ApiKeyGrantTypeConverter : System.Text.Json.Serialization.JsonConverter<ApiKeyGrantType>
 {
-	public override ApiKeyGrantType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberPassword = System.Text.Json.JsonEncodedText.Encode("password");
+	private static readonly System.Text.Json.JsonEncodedText MemberAccessToken = System.Text.Json.JsonEncodedText.Encode("access_token");
+
+	public override ApiKeyGrantType Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberPassword))
 		{
-			case "password":
-				return ApiKeyGrantType.Password;
-			case "access_token":
-				return ApiKeyGrantType.AccessToken;
+			return ApiKeyGrantType.Password;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberAccessToken))
+		{
+			return ApiKeyGrantType.AccessToken;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(ApiKeyGrantType)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, ApiKeyGrantType value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ApiKeyGrantType value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case ApiKeyGrantType.Password:
-				writer.WriteStringValue("password");
-				return;
+				writer.WriteStringValue(MemberPassword);
+				break;
 			case ApiKeyGrantType.AccessToken:
-				writer.WriteStringValue("access_token");
-				return;
+				writer.WriteStringValue(MemberAccessToken);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(ApiKeyGrantType)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -135,36 +152,40 @@ public enum ApiKeyType
 	CrossCluster
 }
 
-internal sealed class ApiKeyTypeConverter : JsonConverter<ApiKeyType>
+internal sealed partial class ApiKeyTypeConverter : System.Text.Json.Serialization.JsonConverter<ApiKeyType>
 {
-	public override ApiKeyType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberRest = System.Text.Json.JsonEncodedText.Encode("rest");
+	private static readonly System.Text.Json.JsonEncodedText MemberCrossCluster = System.Text.Json.JsonEncodedText.Encode("cross_cluster");
+
+	public override ApiKeyType Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberRest))
 		{
-			case "rest":
-				return ApiKeyType.Rest;
-			case "cross_cluster":
-				return ApiKeyType.CrossCluster;
+			return ApiKeyType.Rest;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberCrossCluster))
+		{
+			return ApiKeyType.CrossCluster;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(ApiKeyType)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, ApiKeyType value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ApiKeyType value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case ApiKeyType.Rest:
-				writer.WriteStringValue("rest");
-				return;
+				writer.WriteStringValue(MemberRest);
+				break;
 			case ApiKeyType.CrossCluster:
-				writer.WriteStringValue("cross_cluster");
-				return;
+				writer.WriteStringValue(MemberCrossCluster);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(ApiKeyType)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -172,9 +193,11 @@ public override void Write(Utf8JsonWriter writer, ApiKeyType value, JsonSerializ
 public readonly partial struct ClusterPrivilege : IEnumStruct<ClusterPrivilege>
 {
 	public ClusterPrivilege(string value) => Value = value;
-
+#if NET7_0_OR_GREATER
+	static ClusterPrivilege IEnumStruct<ClusterPrivilege>.Create(string value) => value;
+#else
 	ClusterPrivilege IEnumStruct<ClusterPrivilege>.Create(string value) => value;
-
+#endif
 	public readonly string Value { get; }
 	public static ClusterPrivilege WriteFleetSecrets { get; } = new ClusterPrivilege("write_fleet_secrets");
 	public static ClusterPrivilege WriteConnectorSecrets { get; } = new ClusterPrivilege("write_connector_secrets");
@@ -268,36 +291,40 @@ public enum GrantType
 	AccessToken
 }
 
-internal sealed class GrantTypeConverter : JsonConverter<GrantType>
+internal sealed partial class GrantTypeConverter : System.Text.Json.Serialization.JsonConverter<GrantType>
 {
-	public override GrantType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberPassword = System.Text.Json.JsonEncodedText.Encode("password");
+	private static readonly System.Text.Json.JsonEncodedText MemberAccessToken = System.Text.Json.JsonEncodedText.Encode("access_token");
+
+	public override GrantType Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberPassword))
+		{
+			return GrantType.Password;
+		}
+
+		if (reader.ValueTextEquals(MemberAccessToken))
 		{
-			case "password":
-				return GrantType.Password;
-			case "access_token":
-				return GrantType.AccessToken;
+			return GrantType.AccessToken;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(GrantType)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, GrantType value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GrantType value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case GrantType.Password:
-				writer.WriteStringValue("password");
-				return;
+				writer.WriteStringValue(MemberPassword);
+				break;
 			case GrantType.AccessToken:
-				writer.WriteStringValue("access_token");
-				return;
+				writer.WriteStringValue(MemberAccessToken);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(GrantType)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -305,9 +332,11 @@ public override void Write(Utf8JsonWriter writer, GrantType value, JsonSerialize
 public readonly partial struct IndexPrivilege : IEnumStruct<IndexPrivilege>
 {
 	public IndexPrivilege(string value) => Value = value;
-
+#if NET7_0_OR_GREATER
+	static IndexPrivilege IEnumStruct<IndexPrivilege>.Create(string value) => value;
+#else
 	IndexPrivilege IEnumStruct<IndexPrivilege>.Create(string value) => value;
-
+#endif
 	public readonly string Value { get; }
 	public static IndexPrivilege Write { get; } = new IndexPrivilege("write");
 	public static IndexPrivilege ViewIndexMetadata { get; } = new IndexPrivilege("view_index_metadata");
@@ -354,36 +383,40 @@ public enum RemoteClusterPrivilege
 	MonitorEnrich
 }
 
-internal sealed class RemoteClusterPrivilegeConverter : JsonConverter<RemoteClusterPrivilege>
+internal sealed partial class RemoteClusterPrivilegeConverter : System.Text.Json.Serialization.JsonConverter<RemoteClusterPrivilege>
 {
-	public override RemoteClusterPrivilege Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberMonitorStats = System.Text.Json.JsonEncodedText.Encode("monitor_stats");
+	private static readonly System.Text.Json.JsonEncodedText MemberMonitorEnrich = System.Text.Json.JsonEncodedText.Encode("monitor_enrich");
+
+	public override RemoteClusterPrivilege Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberMonitorStats))
 		{
-			case "monitor_stats":
-				return RemoteClusterPrivilege.MonitorStats;
-			case "monitor_enrich":
-				return RemoteClusterPrivilege.MonitorEnrich;
+			return RemoteClusterPrivilege.MonitorStats;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberMonitorEnrich))
+		{
+			return RemoteClusterPrivilege.MonitorEnrich;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(RemoteClusterPrivilege)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, RemoteClusterPrivilege value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, RemoteClusterPrivilege value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case RemoteClusterPrivilege.MonitorStats:
-				writer.WriteStringValue("monitor_stats");
-				return;
+				writer.WriteStringValue(MemberMonitorStats);
+				break;
 			case RemoteClusterPrivilege.MonitorEnrich:
-				writer.WriteStringValue("monitor_enrich");
-				return;
+				writer.WriteStringValue(MemberMonitorEnrich);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(RemoteClusterPrivilege)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -391,9 +424,11 @@ public override void Write(Utf8JsonWriter writer, RemoteClusterPrivilege value,
 public readonly partial struct RestrictionWorkflow : IEnumStruct<RestrictionWorkflow>
 {
 	public RestrictionWorkflow(string value) => Value = value;
-
+#if NET7_0_OR_GREATER
+	static RestrictionWorkflow IEnumStruct<RestrictionWorkflow>.Create(string value) => value;
+#else
 	RestrictionWorkflow IEnumStruct<RestrictionWorkflow>.Create(string value) => value;
-
+#endif
 	public readonly string Value { get; }
 	public static RestrictionWorkflow SearchApplicationQuery { get; } = new RestrictionWorkflow("search_application_query");
 
@@ -419,35 +454,39 @@ public enum TemplateFormat
 	Json
 }
 
-internal sealed class TemplateFormatConverter : JsonConverter<TemplateFormat>
+internal sealed partial class TemplateFormatConverter : System.Text.Json.Serialization.JsonConverter<TemplateFormat>
 {
-	public override TemplateFormat Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberString = System.Text.Json.JsonEncodedText.Encode("string");
+	private static readonly System.Text.Json.JsonEncodedText MemberJson = System.Text.Json.JsonEncodedText.Encode("json");
+
+	public override TemplateFormat Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberString))
 		{
-			case "string":
-				return TemplateFormat.String;
-			case "json":
-				return TemplateFormat.Json;
+			return TemplateFormat.String;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberJson))
+		{
+			return TemplateFormat.Json;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(TemplateFormat)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, TemplateFormat value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, TemplateFormat value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case TemplateFormat.String:
-				writer.WriteStringValue("string");
-				return;
+				writer.WriteStringValue(MemberString);
+				break;
 			case TemplateFormat.Json:
-				writer.WriteStringValue("json");
-				return;
+				writer.WriteStringValue(MemberJson);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(TemplateFormat)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Snapshot.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Snapshot.g.cs
index d77f0d62976..22d17084473 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Snapshot.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Snapshot.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Core;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport;
 using System;
@@ -68,51 +69,67 @@ public enum ShardsStatsStage
 	Done
 }
 
-internal sealed class ShardsStatsStageConverter : JsonConverter<ShardsStatsStage>
+internal sealed partial class ShardsStatsStageConverter : System.Text.Json.Serialization.JsonConverter<ShardsStatsStage>
 {
-	public override ShardsStatsStage Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberStarted = System.Text.Json.JsonEncodedText.Encode("STARTED");
+	private static readonly System.Text.Json.JsonEncodedText MemberInit = System.Text.Json.JsonEncodedText.Encode("INIT");
+	private static readonly System.Text.Json.JsonEncodedText MemberFinalize = System.Text.Json.JsonEncodedText.Encode("FINALIZE");
+	private static readonly System.Text.Json.JsonEncodedText MemberFailure = System.Text.Json.JsonEncodedText.Encode("FAILURE");
+	private static readonly System.Text.Json.JsonEncodedText MemberDone = System.Text.Json.JsonEncodedText.Encode("DONE");
+
+	public override ShardsStatsStage Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberStarted))
 		{
-			case "STARTED":
-				return ShardsStatsStage.Started;
-			case "INIT":
-				return ShardsStatsStage.Init;
-			case "FINALIZE":
-				return ShardsStatsStage.Finalize;
-			case "FAILURE":
-				return ShardsStatsStage.Failure;
-			case "DONE":
-				return ShardsStatsStage.Done;
+			return ShardsStatsStage.Started;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberInit))
+		{
+			return ShardsStatsStage.Init;
+		}
+
+		if (reader.ValueTextEquals(MemberFinalize))
+		{
+			return ShardsStatsStage.Finalize;
+		}
+
+		if (reader.ValueTextEquals(MemberFailure))
+		{
+			return ShardsStatsStage.Failure;
+		}
+
+		if (reader.ValueTextEquals(MemberDone))
+		{
+			return ShardsStatsStage.Done;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(ShardsStatsStage)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, ShardsStatsStage value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ShardsStatsStage value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case ShardsStatsStage.Started:
-				writer.WriteStringValue("STARTED");
-				return;
+				writer.WriteStringValue(MemberStarted);
+				break;
 			case ShardsStatsStage.Init:
-				writer.WriteStringValue("INIT");
-				return;
+				writer.WriteStringValue(MemberInit);
+				break;
 			case ShardsStatsStage.Finalize:
-				writer.WriteStringValue("FINALIZE");
-				return;
+				writer.WriteStringValue(MemberFinalize);
+				break;
 			case ShardsStatsStage.Failure:
-				writer.WriteStringValue("FAILURE");
-				return;
+				writer.WriteStringValue(MemberFailure);
+				break;
 			case ShardsStatsStage.Done:
-				writer.WriteStringValue("DONE");
-				return;
+				writer.WriteStringValue(MemberDone);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(ShardsStatsStage)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -135,60 +152,84 @@ public enum SnapshotSort
 	Duration
 }
 
-internal sealed class SnapshotSortConverter : JsonConverter<SnapshotSort>
+internal sealed partial class SnapshotSortConverter : System.Text.Json.Serialization.JsonConverter<SnapshotSort>
 {
-	public override SnapshotSort Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberStartTime = System.Text.Json.JsonEncodedText.Encode("start_time");
+	private static readonly System.Text.Json.JsonEncodedText MemberShardCount = System.Text.Json.JsonEncodedText.Encode("shard_count");
+	private static readonly System.Text.Json.JsonEncodedText MemberRepository = System.Text.Json.JsonEncodedText.Encode("repository");
+	private static readonly System.Text.Json.JsonEncodedText MemberName = System.Text.Json.JsonEncodedText.Encode("name");
+	private static readonly System.Text.Json.JsonEncodedText MemberIndexCount = System.Text.Json.JsonEncodedText.Encode("index_count");
+	private static readonly System.Text.Json.JsonEncodedText MemberFailedShardCount = System.Text.Json.JsonEncodedText.Encode("failed_shard_count");
+	private static readonly System.Text.Json.JsonEncodedText MemberDuration = System.Text.Json.JsonEncodedText.Encode("duration");
+
+	public override SnapshotSort Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberStartTime))
+		{
+			return SnapshotSort.StartTime;
+		}
+
+		if (reader.ValueTextEquals(MemberShardCount))
 		{
-			case "start_time":
-				return SnapshotSort.StartTime;
-			case "shard_count":
-				return SnapshotSort.ShardCount;
-			case "repository":
-				return SnapshotSort.Repository;
-			case "name":
-				return SnapshotSort.Name;
-			case "index_count":
-				return SnapshotSort.IndexCount;
-			case "failed_shard_count":
-				return SnapshotSort.FailedShardCount;
-			case "duration":
-				return SnapshotSort.Duration;
+			return SnapshotSort.ShardCount;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberRepository))
+		{
+			return SnapshotSort.Repository;
+		}
+
+		if (reader.ValueTextEquals(MemberName))
+		{
+			return SnapshotSort.Name;
+		}
+
+		if (reader.ValueTextEquals(MemberIndexCount))
+		{
+			return SnapshotSort.IndexCount;
+		}
+
+		if (reader.ValueTextEquals(MemberFailedShardCount))
+		{
+			return SnapshotSort.FailedShardCount;
+		}
+
+		if (reader.ValueTextEquals(MemberDuration))
+		{
+			return SnapshotSort.Duration;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(SnapshotSort)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, SnapshotSort value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SnapshotSort value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case SnapshotSort.StartTime:
-				writer.WriteStringValue("start_time");
-				return;
+				writer.WriteStringValue(MemberStartTime);
+				break;
 			case SnapshotSort.ShardCount:
-				writer.WriteStringValue("shard_count");
-				return;
+				writer.WriteStringValue(MemberShardCount);
+				break;
 			case SnapshotSort.Repository:
-				writer.WriteStringValue("repository");
-				return;
+				writer.WriteStringValue(MemberRepository);
+				break;
 			case SnapshotSort.Name:
-				writer.WriteStringValue("name");
-				return;
+				writer.WriteStringValue(MemberName);
+				break;
 			case SnapshotSort.IndexCount:
-				writer.WriteStringValue("index_count");
-				return;
+				writer.WriteStringValue(MemberIndexCount);
+				break;
 			case SnapshotSort.FailedShardCount:
-				writer.WriteStringValue("failed_shard_count");
-				return;
+				writer.WriteStringValue(MemberFailedShardCount);
+				break;
 			case SnapshotSort.Duration:
-				writer.WriteStringValue("duration");
-				return;
+				writer.WriteStringValue(MemberDuration);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(SnapshotSort)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Sql.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Sql.g.cs
index 5b2210e7a2a..b2f50e556d6 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Sql.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Sql.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Core;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport;
 using System;
@@ -47,60 +48,84 @@ public enum SqlFormat
 	Cbor
 }
 
-internal sealed class SqlFormatConverter : JsonConverter<SqlFormat>
+internal sealed partial class SqlFormatConverter : System.Text.Json.Serialization.JsonConverter<SqlFormat>
 {
-	public override SqlFormat Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberYaml = System.Text.Json.JsonEncodedText.Encode("yaml");
+	private static readonly System.Text.Json.JsonEncodedText MemberTxt = System.Text.Json.JsonEncodedText.Encode("txt");
+	private static readonly System.Text.Json.JsonEncodedText MemberTsv = System.Text.Json.JsonEncodedText.Encode("tsv");
+	private static readonly System.Text.Json.JsonEncodedText MemberSmile = System.Text.Json.JsonEncodedText.Encode("smile");
+	private static readonly System.Text.Json.JsonEncodedText MemberJson = System.Text.Json.JsonEncodedText.Encode("json");
+	private static readonly System.Text.Json.JsonEncodedText MemberCsv = System.Text.Json.JsonEncodedText.Encode("csv");
+	private static readonly System.Text.Json.JsonEncodedText MemberCbor = System.Text.Json.JsonEncodedText.Encode("cbor");
+
+	public override SqlFormat Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberYaml))
+		{
+			return SqlFormat.Yaml;
+		}
+
+		if (reader.ValueTextEquals(MemberTxt))
+		{
+			return SqlFormat.Txt;
+		}
+
+		if (reader.ValueTextEquals(MemberTsv))
+		{
+			return SqlFormat.Tsv;
+		}
+
+		if (reader.ValueTextEquals(MemberSmile))
 		{
-			case "yaml":
-				return SqlFormat.Yaml;
-			case "txt":
-				return SqlFormat.Txt;
-			case "tsv":
-				return SqlFormat.Tsv;
-			case "smile":
-				return SqlFormat.Smile;
-			case "json":
-				return SqlFormat.Json;
-			case "csv":
-				return SqlFormat.Csv;
-			case "cbor":
-				return SqlFormat.Cbor;
+			return SqlFormat.Smile;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberJson))
+		{
+			return SqlFormat.Json;
+		}
+
+		if (reader.ValueTextEquals(MemberCsv))
+		{
+			return SqlFormat.Csv;
+		}
+
+		if (reader.ValueTextEquals(MemberCbor))
+		{
+			return SqlFormat.Cbor;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(SqlFormat)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, SqlFormat value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SqlFormat value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case SqlFormat.Yaml:
-				writer.WriteStringValue("yaml");
-				return;
+				writer.WriteStringValue(MemberYaml);
+				break;
 			case SqlFormat.Txt:
-				writer.WriteStringValue("txt");
-				return;
+				writer.WriteStringValue(MemberTxt);
+				break;
 			case SqlFormat.Tsv:
-				writer.WriteStringValue("tsv");
-				return;
+				writer.WriteStringValue(MemberTsv);
+				break;
 			case SqlFormat.Smile:
-				writer.WriteStringValue("smile");
-				return;
+				writer.WriteStringValue(MemberSmile);
+				break;
 			case SqlFormat.Json:
-				writer.WriteStringValue("json");
-				return;
+				writer.WriteStringValue(MemberJson);
+				break;
 			case SqlFormat.Csv:
-				writer.WriteStringValue("csv");
-				return;
+				writer.WriteStringValue(MemberCsv);
+				break;
 			case SqlFormat.Cbor:
-				writer.WriteStringValue("cbor");
-				return;
+				writer.WriteStringValue(MemberCbor);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(SqlFormat)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Tasks.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Tasks.g.cs
index 23950271dfa..dccc18b818c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Tasks.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Tasks.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Core;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport;
 using System;
@@ -54,40 +55,48 @@ public enum GroupBy
 	Nodes
 }
 
-internal sealed class GroupByConverter : JsonConverter<GroupBy>
+internal sealed partial class GroupByConverter : System.Text.Json.Serialization.JsonConverter<GroupBy>
 {
-	public override GroupBy Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberParents = System.Text.Json.JsonEncodedText.Encode("parents");
+	private static readonly System.Text.Json.JsonEncodedText MemberNone = System.Text.Json.JsonEncodedText.Encode("none");
+	private static readonly System.Text.Json.JsonEncodedText MemberNodes = System.Text.Json.JsonEncodedText.Encode("nodes");
+
+	public override GroupBy Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberParents))
+		{
+			return GroupBy.Parents;
+		}
+
+		if (reader.ValueTextEquals(MemberNone))
 		{
-			case "parents":
-				return GroupBy.Parents;
-			case "none":
-				return GroupBy.None;
-			case "nodes":
-				return GroupBy.Nodes;
+			return GroupBy.None;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberNodes))
+		{
+			return GroupBy.Nodes;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(GroupBy)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, GroupBy value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GroupBy value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case GroupBy.Parents:
-				writer.WriteStringValue("parents");
-				return;
+				writer.WriteStringValue(MemberParents);
+				break;
 			case GroupBy.None:
-				writer.WriteStringValue("none");
-				return;
+				writer.WriteStringValue(MemberNone);
+				break;
 			case GroupBy.Nodes:
-				writer.WriteStringValue("nodes");
-				return;
+				writer.WriteStringValue(MemberNodes);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(GroupBy)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.TextStructure.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.TextStructure.g.cs
index 3fc28166b89..cf7e0ccd3b2 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.TextStructure.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.TextStructure.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Core;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport;
 using System;
@@ -37,36 +38,40 @@ public enum EcsCompatibilityType
 	Disabled
 }
 
-internal sealed class EcsCompatibilityTypeConverter : JsonConverter<EcsCompatibilityType>
+internal sealed partial class EcsCompatibilityTypeConverter : System.Text.Json.Serialization.JsonConverter<EcsCompatibilityType>
 {
-	public override EcsCompatibilityType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberV1 = System.Text.Json.JsonEncodedText.Encode("v1");
+	private static readonly System.Text.Json.JsonEncodedText MemberDisabled = System.Text.Json.JsonEncodedText.Encode("disabled");
+
+	public override EcsCompatibilityType Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberV1))
+		{
+			return EcsCompatibilityType.V1;
+		}
+
+		if (reader.ValueTextEquals(MemberDisabled))
 		{
-			case "v1":
-				return EcsCompatibilityType.V1;
-			case "disabled":
-				return EcsCompatibilityType.Disabled;
+			return EcsCompatibilityType.Disabled;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(EcsCompatibilityType)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, EcsCompatibilityType value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, EcsCompatibilityType value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case EcsCompatibilityType.V1:
-				writer.WriteStringValue("v1");
-				return;
+				writer.WriteStringValue(MemberV1);
+				break;
 			case EcsCompatibilityType.Disabled:
-				writer.WriteStringValue("disabled");
-				return;
+				writer.WriteStringValue(MemberDisabled);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(EcsCompatibilityType)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
 
@@ -83,45 +88,57 @@ public enum FormatType
 	Delimited
 }
 
-internal sealed class FormatTypeConverter : JsonConverter<FormatType>
+internal sealed partial class FormatTypeConverter : System.Text.Json.Serialization.JsonConverter<FormatType>
 {
-	public override FormatType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberXml = System.Text.Json.JsonEncodedText.Encode("xml");
+	private static readonly System.Text.Json.JsonEncodedText MemberSemiStructuredText = System.Text.Json.JsonEncodedText.Encode("semi_structured_text");
+	private static readonly System.Text.Json.JsonEncodedText MemberNdjson = System.Text.Json.JsonEncodedText.Encode("ndjson");
+	private static readonly System.Text.Json.JsonEncodedText MemberDelimited = System.Text.Json.JsonEncodedText.Encode("delimited");
+
+	public override FormatType Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberXml))
+		{
+			return FormatType.Xml;
+		}
+
+		if (reader.ValueTextEquals(MemberSemiStructuredText))
+		{
+			return FormatType.SemiStructuredText;
+		}
+
+		if (reader.ValueTextEquals(MemberNdjson))
 		{
-			case "xml":
-				return FormatType.Xml;
-			case "semi_structured_text":
-				return FormatType.SemiStructuredText;
-			case "ndjson":
-				return FormatType.Ndjson;
-			case "delimited":
-				return FormatType.Delimited;
+			return FormatType.Ndjson;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberDelimited))
+		{
+			return FormatType.Delimited;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(FormatType)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, FormatType value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, FormatType value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case FormatType.Xml:
-				writer.WriteStringValue("xml");
-				return;
+				writer.WriteStringValue(MemberXml);
+				break;
 			case FormatType.SemiStructuredText:
-				writer.WriteStringValue("semi_structured_text");
-				return;
+				writer.WriteStringValue(MemberSemiStructuredText);
+				break;
 			case FormatType.Ndjson:
-				writer.WriteStringValue("ndjson");
-				return;
+				writer.WriteStringValue(MemberNdjson);
+				break;
 			case FormatType.Delimited:
-				writer.WriteStringValue("delimited");
-				return;
+				writer.WriteStringValue(MemberDelimited);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(FormatType)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
\ No newline at end of file
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 fdb9af07820..74abceb9f25 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
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Core;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport;
 using System;
@@ -41,45 +42,57 @@ public enum ActionStatusOptions
 	Failure
 }
 
-internal sealed class ActionStatusOptionsConverter : JsonConverter<ActionStatusOptions>
+internal sealed partial class ActionStatusOptionsConverter : System.Text.Json.Serialization.JsonConverter<ActionStatusOptions>
 {
-	public override ActionStatusOptions Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberThrottled = System.Text.Json.JsonEncodedText.Encode("throttled");
+	private static readonly System.Text.Json.JsonEncodedText MemberSuccess = System.Text.Json.JsonEncodedText.Encode("success");
+	private static readonly System.Text.Json.JsonEncodedText MemberSimulated = System.Text.Json.JsonEncodedText.Encode("simulated");
+	private static readonly System.Text.Json.JsonEncodedText MemberFailure = System.Text.Json.JsonEncodedText.Encode("failure");
+
+	public override ActionStatusOptions Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberThrottled))
+		{
+			return ActionStatusOptions.Throttled;
+		}
+
+		if (reader.ValueTextEquals(MemberSuccess))
 		{
-			case "throttled":
-				return ActionStatusOptions.Throttled;
-			case "success":
-				return ActionStatusOptions.Success;
-			case "simulated":
-				return ActionStatusOptions.Simulated;
-			case "failure":
-				return ActionStatusOptions.Failure;
+			return ActionStatusOptions.Success;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberSimulated))
+		{
+			return ActionStatusOptions.Simulated;
+		}
+
+		if (reader.ValueTextEquals(MemberFailure))
+		{
+			return ActionStatusOptions.Failure;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(ActionStatusOptions)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, ActionStatusOptions value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ActionStatusOptions value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case ActionStatusOptions.Throttled:
-				writer.WriteStringValue("throttled");
-				return;
+				writer.WriteStringValue(MemberThrottled);
+				break;
 			case ActionStatusOptions.Success:
-				writer.WriteStringValue("success");
-				return;
+				writer.WriteStringValue(MemberSuccess);
+				break;
 			case ActionStatusOptions.Simulated:
-				writer.WriteStringValue("simulated");
-				return;
+				writer.WriteStringValue(MemberSimulated);
+				break;
 			case ActionStatusOptions.Failure:
-				writer.WriteStringValue("failure");
-				return;
+				writer.WriteStringValue(MemberFailure);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(ActionStatusOptions)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Xpack.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Xpack.g.cs
index 36d2bdbd1e9..d97311e0b35 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Xpack.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Xpack.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Core;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport;
 using System;
@@ -39,40 +40,48 @@ public enum XPackCategory
 	Build
 }
 
-internal sealed class XPackCategoryConverter : JsonConverter<XPackCategory>
+internal sealed partial class XPackCategoryConverter : System.Text.Json.Serialization.JsonConverter<XPackCategory>
 {
-	public override XPackCategory Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText MemberLicense = System.Text.Json.JsonEncodedText.Encode("license");
+	private static readonly System.Text.Json.JsonEncodedText MemberFeatures = System.Text.Json.JsonEncodedText.Encode("features");
+	private static readonly System.Text.Json.JsonEncodedText MemberBuild = System.Text.Json.JsonEncodedText.Encode("build");
+
+	public override XPackCategory Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var enumString = reader.GetString();
-		switch (enumString)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.String);
+		if (reader.ValueTextEquals(MemberLicense))
+		{
+			return XPackCategory.License;
+		}
+
+		if (reader.ValueTextEquals(MemberFeatures))
 		{
-			case "license":
-				return XPackCategory.License;
-			case "features":
-				return XPackCategory.Features;
-			case "build":
-				return XPackCategory.Build;
+			return XPackCategory.Features;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		if (reader.ValueTextEquals(MemberBuild))
+		{
+			return XPackCategory.Build;
+		}
+
+		throw new System.Text.Json.JsonException($"Unknown value '{reader.GetString()}' for enum '{nameof(XPackCategory)}'.");
 	}
 
-	public override void Write(Utf8JsonWriter writer, XPackCategory value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, XPackCategory value, System.Text.Json.JsonSerializerOptions options)
 	{
 		switch (value)
 		{
 			case XPackCategory.License:
-				writer.WriteStringValue("license");
-				return;
+				writer.WriteStringValue(MemberLicense);
+				break;
 			case XPackCategory.Features:
-				writer.WriteStringValue("features");
-				return;
+				writer.WriteStringValue(MemberFeatures);
+				break;
 			case XPackCategory.Build:
-				writer.WriteStringValue("build");
-				return;
+				writer.WriteStringValue(MemberBuild);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(XPackCategory)}'.");
 		}
-
-		writer.WriteNullValue();
 	}
 }
\ 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 6ec2792b4d5..081a5016d78 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Eql/HitsEvent.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Eql/HitsEvent.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,10 +28,99 @@
 
 namespace Elastic.Clients.Elasticsearch.Eql;
 
+internal sealed partial class HitsEventConverter<TEvent> : System.Text.Json.Serialization.JsonConverter<HitsEvent<TEvent>>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("_id");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("_index");
+	private static readonly System.Text.Json.JsonEncodedText PropMissing = System.Text.Json.JsonEncodedText.Encode("missing");
+	private static readonly System.Text.Json.JsonEncodedText PropSource = System.Text.Json.JsonEncodedText.Encode("_source");
+
+	public override HitsEvent<TEvent> Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyDictionary<Elastic.Clients.Elasticsearch.Field, IReadOnlyCollection<object>>?> propFields = default;
+		LocalJsonProperty<string> propId = default;
+		LocalJsonProperty<string> propIndex = default;
+		LocalJsonProperty<bool?> propMissing = default;
+		LocalJsonProperty<TEvent> propSource = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propId.TryRead(ref reader, options, PropId))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propMissing.TryRead(ref reader, options, PropMissing))
+			{
+				continue;
+			}
+
+			if (propSource.TryRead(ref reader, options, PropSource, typeof(SourceMarker<TEvent>)))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new HitsEvent<TEvent>
+		{
+			Fields = propFields.Value
+,
+			Id = propId.Value
+,
+			Index = propIndex.Value
+,
+			Missing = propMissing.Value
+,
+			Source = propSource.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, HitsEvent<TEvent> value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropId, value.Id);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropMissing, value.Missing);
+		writer.WriteProperty(options, PropSource, value.Source, typeof(SourceMarker<TEvent>));
+		writer.WriteEndObject();
+	}
+}
+
+internal sealed partial class HitsEventConverterFactory : System.Text.Json.Serialization.JsonConverterFactory
+{
+	public override bool CanConvert(System.Type typeToConvert)
+	{
+		return typeToConvert.IsGenericType && typeToConvert.GetGenericTypeDefinition() == typeof(HitsEvent<>);
+	}
+
+	public override System.Text.Json.Serialization.JsonConverter CreateConverter(System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		var args = typeToConvert.GetGenericArguments();
+#pragma warning disable IL3050
+		var converter = (System.Text.Json.Serialization.JsonConverter)System.Activator.CreateInstance(typeof(HitsEventConverter<>).MakeGenericType(args[0]), System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public, binder: null, args: null, culture: null)!;
+#pragma warning restore IL3050
+		return converter;
+	}
+}
+
+[JsonConverter(typeof(HitsEventConverterFactory))]
 public sealed partial class HitsEvent<TEvent>
 {
-	[JsonInclude, JsonPropertyName("fields")]
-	[ReadOnlyFieldDictionaryConverter(typeof(IReadOnlyCollection<object>))]
 	public IReadOnlyDictionary<Elastic.Clients.Elasticsearch.Field, IReadOnlyCollection<object>>? Fields { get; init; }
 
 	/// <summary>
@@ -38,7 +128,6 @@ public sealed partial class HitsEvent<TEvent>
 	/// Unique identifier for the event. This ID is only unique within the index.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("_id")]
 	public string Id { get; init; }
 
 	/// <summary>
@@ -46,7 +135,6 @@ public sealed partial class HitsEvent<TEvent>
 	/// Name of the index containing the event.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("_index")]
 	public string Index { get; init; }
 
 	/// <summary>
@@ -54,7 +142,6 @@ public sealed partial class HitsEvent<TEvent>
 	/// Set to <c>true</c> for events in a timespan-constrained sequence that do not meet a given condition.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("missing")]
 	public bool? Missing { get; init; }
 
 	/// <summary>
@@ -62,7 +149,5 @@ public sealed partial class HitsEvent<TEvent>
 	/// Original JSON body passed for the event at index time.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("_source")]
-	[SourceConverter]
 	public TEvent Source { 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 55ae6e38d10..3655729fda3 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/ErrorCause.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/ErrorCause.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,72 +28,100 @@
 
 namespace Elastic.Clients.Elasticsearch;
 
-internal sealed partial class ErrorCauseConverter : JsonConverter<ErrorCause>
+internal sealed partial class ErrorCauseConverter : System.Text.Json.Serialization.JsonConverter<ErrorCause>
 {
-	public override ErrorCause Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropMetadata = System.Text.Json.JsonEncodedText.Encode("metadata");
+	private static readonly System.Text.Json.JsonEncodedText PropCausedBy = System.Text.Json.JsonEncodedText.Encode("caused_by");
+	private static readonly System.Text.Json.JsonEncodedText PropReason = System.Text.Json.JsonEncodedText.Encode("reason");
+	private static readonly System.Text.Json.JsonEncodedText PropRootCause = System.Text.Json.JsonEncodedText.Encode("root_cause");
+	private static readonly System.Text.Json.JsonEncodedText PropStackTrace = System.Text.Json.JsonEncodedText.Encode("stack_trace");
+	private static readonly System.Text.Json.JsonEncodedText PropSuppressed = System.Text.Json.JsonEncodedText.Encode("suppressed");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override ErrorCause Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		Elastic.Clients.Elasticsearch.ErrorCause? causedBy = default;
-		string? reason = default;
-		IReadOnlyCollection<Elastic.Clients.Elasticsearch.ErrorCause>? rootCause = default;
-		string? stackTrace = default;
-		IReadOnlyCollection<Elastic.Clients.Elasticsearch.ErrorCause>? suppressed = default;
-		string type = default;
-		Dictionary<string, object> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, object> propMetadata = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.ErrorCause?> propCausedBy = default;
+		LocalJsonProperty<string?> propReason = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.ErrorCause>?> propRootCause = default;
+		LocalJsonProperty<string?> propStackTrace = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.ErrorCause>?> propSuppressed = default;
+		LocalJsonProperty<string> propType = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propCausedBy.TryRead(ref reader, options, PropCausedBy))
 			{
-				var property = reader.GetString();
-				if (property == "caused_by")
-				{
-					causedBy = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.ErrorCause?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "reason")
-				{
-					reason = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "root_cause")
-				{
-					rootCause = JsonSerializer.Deserialize<IReadOnlyCollection<Elastic.Clients.Elasticsearch.ErrorCause>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "stack_trace")
-				{
-					stackTrace = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "suppressed")
-				{
-					suppressed = JsonSerializer.Deserialize<IReadOnlyCollection<Elastic.Clients.Elasticsearch.ErrorCause>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "type")
-				{
-					type = JsonSerializer.Deserialize<string>(ref reader, options);
-					continue;
-				}
-
-				additionalProperties ??= new Dictionary<string, object>();
-				var additionalValue = JsonSerializer.Deserialize<object>(ref reader, options);
-				additionalProperties.Add(property, additionalValue);
+				continue;
 			}
+
+			if (propReason.TryRead(ref reader, options, PropReason))
+			{
+				continue;
+			}
+
+			if (propRootCause.TryRead(ref reader, options, PropRootCause))
+			{
+				continue;
+			}
+
+			if (propStackTrace.TryRead(ref reader, options, PropStackTrace))
+			{
+				continue;
+			}
+
+			if (propSuppressed.TryRead(ref reader, options, PropSuppressed))
+			{
+				continue;
+			}
+
+			if (propType.TryRead(ref reader, options, PropType))
+			{
+				continue;
+			}
+
+			propMetadata ??= new System.Collections.Generic.Dictionary<string, object>();
+			reader.ReadProperty(options, out string key, out object value);
+			propMetadata[key] = value;
 		}
 
-		return new ErrorCause { CausedBy = causedBy, Metadata = additionalProperties, Reason = reason, RootCause = rootCause, StackTrace = stackTrace, Suppressed = suppressed, Type = type };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ErrorCause
+		{
+			Metadata = propMetadata
+,
+			CausedBy = propCausedBy.Value
+,
+			Reason = propReason.Value
+,
+			RootCause = propRootCause.Value
+,
+			StackTrace = propStackTrace.Value
+,
+			Suppressed = propSuppressed.Value
+,
+			Type = propType.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, ErrorCause value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ErrorCause value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'ErrorCause' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCausedBy, value.CausedBy);
+		writer.WriteProperty(options, PropReason, value.Reason);
+		writer.WriteProperty(options, PropRootCause, value.RootCause);
+		writer.WriteProperty(options, PropStackTrace, value.StackTrace);
+		writer.WriteProperty(options, PropSuppressed, value.Suppressed);
+		writer.WriteProperty(options, PropType, value.Type);
+		if (value.Metadata is not null)
+		{
+			foreach (var item in value.Metadata)
+			{
+				writer.WriteProperty(options, item.Key, item.Value);
+			}
+		}
+
+		writer.WriteEndObject();
 	}
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/FieldSort.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/FieldSort.g.cs
index 669d99a22ce..96622226fa1 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/FieldSort.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/FieldSort.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,21 +28,114 @@
 
 namespace Elastic.Clients.Elasticsearch;
 
+internal sealed partial class FieldSortConverter : System.Text.Json.Serialization.JsonConverter<FieldSort>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropFormat = System.Text.Json.JsonEncodedText.Encode("format");
+	private static readonly System.Text.Json.JsonEncodedText PropMissing = System.Text.Json.JsonEncodedText.Encode("missing");
+	private static readonly System.Text.Json.JsonEncodedText PropMode = System.Text.Json.JsonEncodedText.Encode("mode");
+	private static readonly System.Text.Json.JsonEncodedText PropNested = System.Text.Json.JsonEncodedText.Encode("nested");
+	private static readonly System.Text.Json.JsonEncodedText PropNumericType = System.Text.Json.JsonEncodedText.Encode("numeric_type");
+	private static readonly System.Text.Json.JsonEncodedText PropOrder = System.Text.Json.JsonEncodedText.Encode("order");
+	private static readonly System.Text.Json.JsonEncodedText PropUnmappedType = System.Text.Json.JsonEncodedText.Encode("unmapped_type");
+
+	public override FieldSort Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		if (reader.TokenType is not System.Text.Json.JsonTokenType.StartObject)
+		{
+			var value = reader.ReadValue<Elastic.Clients.Elasticsearch.SortOrder?>(options);
+			return new FieldSort { Order = value };
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string?> propFormat = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.FieldValue?> propMissing = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.SortMode?> propMode = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.NestedSortValue?> propNested = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.FieldSortNumericType?> propNumericType = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.SortOrder?> propOrder = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.FieldType?> propUnmappedType = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propFormat.TryRead(ref reader, options, PropFormat))
+			{
+				continue;
+			}
+
+			if (propMissing.TryRead(ref reader, options, PropMissing))
+			{
+				continue;
+			}
+
+			if (propMode.TryRead(ref reader, options, PropMode))
+			{
+				continue;
+			}
+
+			if (propNested.TryRead(ref reader, options, PropNested))
+			{
+				continue;
+			}
+
+			if (propNumericType.TryRead(ref reader, options, PropNumericType))
+			{
+				continue;
+			}
+
+			if (propOrder.TryRead(ref reader, options, PropOrder))
+			{
+				continue;
+			}
+
+			if (propUnmappedType.TryRead(ref reader, options, PropUnmappedType))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new FieldSort
+		{
+			Format = propFormat.Value
+,
+			Missing = propMissing.Value
+,
+			Mode = propMode.Value
+,
+			Nested = propNested.Value
+,
+			NumericType = propNumericType.Value
+,
+			Order = propOrder.Value
+,
+			UnmappedType = propUnmappedType.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, FieldSort value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropFormat, value.Format);
+		writer.WriteProperty(options, PropMissing, value.Missing);
+		writer.WriteProperty(options, PropMode, value.Mode);
+		writer.WriteProperty(options, PropNested, value.Nested);
+		writer.WriteProperty(options, PropNumericType, value.NumericType);
+		writer.WriteProperty(options, PropOrder, value.Order);
+		writer.WriteProperty(options, PropUnmappedType, value.UnmappedType);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(FieldSortConverter))]
 public sealed partial class FieldSort
 {
-	[JsonInclude, JsonPropertyName("format")]
 	public string? Format { get; set; }
-	[JsonInclude, JsonPropertyName("missing")]
 	public Elastic.Clients.Elasticsearch.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; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/FielddataStats.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/FielddataStats.g.cs
index f3328e0464e..996b1bef0cf 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/FielddataStats.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/FielddataStats.g.cs
@@ -32,7 +32,6 @@ 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; }
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/GeoDistanceSort.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/GeoDistanceSort.g.cs
index d3eaa418c60..deedae5cc9e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/GeoDistanceSort.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/GeoDistanceSort.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,114 +28,95 @@
 
 namespace Elastic.Clients.Elasticsearch;
 
-internal sealed partial class GeoDistanceSortConverter : JsonConverter<GeoDistanceSort>
+internal sealed partial class GeoDistanceSortConverter : System.Text.Json.Serialization.JsonConverter<GeoDistanceSort>
 {
-	public override GeoDistanceSort Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropLocation = System.Text.Json.JsonEncodedText.Encode("location");
+	private static readonly System.Text.Json.JsonEncodedText PropDistanceType = System.Text.Json.JsonEncodedText.Encode("distance_type");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreUnmapped = System.Text.Json.JsonEncodedText.Encode("ignore_unmapped");
+	private static readonly System.Text.Json.JsonEncodedText PropMode = System.Text.Json.JsonEncodedText.Encode("mode");
+	private static readonly System.Text.Json.JsonEncodedText PropNested = System.Text.Json.JsonEncodedText.Encode("nested");
+	private static readonly System.Text.Json.JsonEncodedText PropOrder = System.Text.Json.JsonEncodedText.Encode("order");
+	private static readonly System.Text.Json.JsonEncodedText PropUnit = System.Text.Json.JsonEncodedText.Encode("unit");
+
+	public override GeoDistanceSort Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		var variant = new GeoDistanceSort();
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Field> propField = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.GeoLocation>> propLocation = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.GeoDistanceType?> propDistanceType = default;
+		LocalJsonProperty<bool?> propIgnoreUnmapped = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.SortMode?> propMode = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.NestedSortValue?> propNested = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.SortOrder?> propOrder = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.DistanceUnit?> propUnit = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propDistanceType.TryRead(ref reader, options, PropDistanceType))
 			{
-				var property = reader.GetString();
-				if (property == "distance_type")
-				{
-					variant.DistanceType = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.GeoDistanceType?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "ignore_unmapped")
-				{
-					variant.IgnoreUnmapped = JsonSerializer.Deserialize<bool?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "mode")
-				{
-					variant.Mode = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.SortMode?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "nested")
-				{
-					variant.Nested = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.NestedSortValue?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "order")
-				{
-					variant.Order = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.SortOrder?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "unit")
-				{
-					variant.Unit = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.DistanceUnit?>(ref reader, options);
-					continue;
-				}
-
-				variant.Field = property;
-				reader.Read();
-				variant.Location = JsonSerializer.Deserialize<ICollection<Elastic.Clients.Elasticsearch.GeoLocation>>(ref reader, options);
+				continue;
 			}
-		}
-
-		return variant;
-	}
 
-	public override void Write(Utf8JsonWriter writer, GeoDistanceSort value, JsonSerializerOptions options)
-	{
-		writer.WriteStartObject();
-		if (value.Field is not null && value.Location is not null)
-		{
-			if (!options.TryGetClientSettings(out var settings))
+			if (propIgnoreUnmapped.TryRead(ref reader, options, PropIgnoreUnmapped))
 			{
-				ThrowHelper.ThrowJsonExceptionForMissingSettings();
+				continue;
 			}
 
-			var propertyName = settings.Inferrer.Field(value.Field);
-			writer.WritePropertyName(propertyName);
-			JsonSerializer.Serialize(writer, value.Location, options);
-		}
-
-		if (value.DistanceType is not null)
-		{
-			writer.WritePropertyName("distance_type");
-			JsonSerializer.Serialize(writer, value.DistanceType, options);
-		}
+			if (propMode.TryRead(ref reader, options, PropMode))
+			{
+				continue;
+			}
 
-		if (value.IgnoreUnmapped.HasValue)
-		{
-			writer.WritePropertyName("ignore_unmapped");
-			writer.WriteBooleanValue(value.IgnoreUnmapped.Value);
-		}
+			if (propNested.TryRead(ref reader, options, PropNested))
+			{
+				continue;
+			}
 
-		if (value.Mode is not null)
-		{
-			writer.WritePropertyName("mode");
-			JsonSerializer.Serialize(writer, value.Mode, options);
-		}
+			if (propOrder.TryRead(ref reader, options, PropOrder))
+			{
+				continue;
+			}
 
-		if (value.Nested is not null)
-		{
-			writer.WritePropertyName("nested");
-			JsonSerializer.Serialize(writer, value.Nested, options);
-		}
+			if (propUnit.TryRead(ref reader, options, PropUnit))
+			{
+				continue;
+			}
 
-		if (value.Order is not null)
-		{
-			writer.WritePropertyName("order");
-			JsonSerializer.Serialize(writer, value.Order, options);
+			propField.Initialized = propLocation.Initialized = true;
+			reader.ReadProperty(options, out propField.Value, out propLocation.Value, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.GeoLocation>, Elastic.Clients.Elasticsearch.GeoLocation>));
 		}
 
-		if (value.Unit is not null)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GeoDistanceSort
 		{
-			writer.WritePropertyName("unit");
-			JsonSerializer.Serialize(writer, value.Unit, options);
-		}
+			Field = propField.Value
+,
+			Location = propLocation.Value
+,
+			DistanceType = propDistanceType.Value
+,
+			IgnoreUnmapped = propIgnoreUnmapped.Value
+,
+			Mode = propMode.Value
+,
+			Nested = propNested.Value
+,
+			Order = propOrder.Value
+,
+			Unit = propUnit.Value
+		};
+	}
 
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GeoDistanceSort value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDistanceType, value.DistanceType);
+		writer.WriteProperty(options, PropIgnoreUnmapped, value.IgnoreUnmapped);
+		writer.WriteProperty(options, PropMode, value.Mode);
+		writer.WriteProperty(options, PropNested, value.Nested);
+		writer.WriteProperty(options, PropOrder, value.Order);
+		writer.WriteProperty(options, PropUnit, value.Unit);
+		writer.WriteProperty(options, value.Field, value.Location, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.GeoLocation>, Elastic.Clients.Elasticsearch.GeoLocation>));
 		writer.WriteEndObject();
 	}
 }
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 b2238856538..29f930915fb 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/AddAction.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/AddAction.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,140 @@
 
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
 
+internal sealed partial class AddActionConverter : System.Text.Json.Serialization.JsonConverter<AddAction>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAlias = System.Text.Json.JsonEncodedText.Encode("alias");
+	private static readonly System.Text.Json.JsonEncodedText PropAliases = System.Text.Json.JsonEncodedText.Encode("aliases");
+	private static readonly System.Text.Json.JsonEncodedText PropFilter = System.Text.Json.JsonEncodedText.Encode("filter");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropIndexRouting = System.Text.Json.JsonEncodedText.Encode("index_routing");
+	private static readonly System.Text.Json.JsonEncodedText PropIndices = System.Text.Json.JsonEncodedText.Encode("indices");
+	private static readonly System.Text.Json.JsonEncodedText PropIsHidden = System.Text.Json.JsonEncodedText.Encode("is_hidden");
+	private static readonly System.Text.Json.JsonEncodedText PropIsWriteIndex = System.Text.Json.JsonEncodedText.Encode("is_write_index");
+	private static readonly System.Text.Json.JsonEncodedText PropMustExist = System.Text.Json.JsonEncodedText.Encode("must_exist");
+	private static readonly System.Text.Json.JsonEncodedText PropRouting = System.Text.Json.JsonEncodedText.Encode("routing");
+	private static readonly System.Text.Json.JsonEncodedText PropSearchRouting = System.Text.Json.JsonEncodedText.Encode("search_routing");
+
+	public override AddAction Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.IndexAlias?> propAlias = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.IndexAlias>?> propAliases = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.QueryDsl.Query?> propFilter = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.IndexName?> propIndex = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Routing?> propIndexRouting = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Indices?> propIndices = default;
+		LocalJsonProperty<bool?> propIsHidden = default;
+		LocalJsonProperty<bool?> propIsWriteIndex = default;
+		LocalJsonProperty<bool?> propMustExist = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Routing?> propRouting = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Routing?> propSearchRouting = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAlias.TryRead(ref reader, options, PropAlias))
+			{
+				continue;
+			}
+
+			if (propAliases.TryRead(ref reader, options, PropAliases, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.IndexAlias>?, Elastic.Clients.Elasticsearch.IndexAlias>)))
+			{
+				continue;
+			}
+
+			if (propFilter.TryRead(ref reader, options, PropFilter))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propIndexRouting.TryRead(ref reader, options, PropIndexRouting))
+			{
+				continue;
+			}
+
+			if (propIndices.TryRead(ref reader, options, PropIndices))
+			{
+				continue;
+			}
+
+			if (propIsHidden.TryRead(ref reader, options, PropIsHidden))
+			{
+				continue;
+			}
+
+			if (propIsWriteIndex.TryRead(ref reader, options, PropIsWriteIndex))
+			{
+				continue;
+			}
+
+			if (propMustExist.TryRead(ref reader, options, PropMustExist))
+			{
+				continue;
+			}
+
+			if (propRouting.TryRead(ref reader, options, PropRouting))
+			{
+				continue;
+			}
+
+			if (propSearchRouting.TryRead(ref reader, options, PropSearchRouting))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new AddAction
+		{
+			Alias = propAlias.Value
+,
+			Aliases = propAliases.Value
+,
+			Filter = propFilter.Value
+,
+			Index = propIndex.Value
+,
+			IndexRouting = propIndexRouting.Value
+,
+			Indices = propIndices.Value
+,
+			IsHidden = propIsHidden.Value
+,
+			IsWriteIndex = propIsWriteIndex.Value
+,
+			MustExist = propMustExist.Value
+,
+			Routing = propRouting.Value
+,
+			SearchRouting = propSearchRouting.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, AddAction value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAlias, value.Alias);
+		writer.WriteProperty(options, PropAliases, value.Aliases, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.IndexAlias>?, Elastic.Clients.Elasticsearch.IndexAlias>));
+		writer.WriteProperty(options, PropFilter, value.Filter);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropIndexRouting, value.IndexRouting);
+		writer.WriteProperty(options, PropIndices, value.Indices);
+		writer.WriteProperty(options, PropIsHidden, value.IsHidden);
+		writer.WriteProperty(options, PropIsWriteIndex, value.IsWriteIndex);
+		writer.WriteProperty(options, PropMustExist, value.MustExist);
+		writer.WriteProperty(options, PropRouting, value.Routing);
+		writer.WriteProperty(options, PropSearchRouting, value.SearchRouting);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(AddActionConverter))]
 public sealed partial class AddAction
 {
 	/// <summary>
@@ -35,7 +170,6 @@ public sealed partial class AddAction
 	/// Index alias names support date math.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("alias")]
 	public Elastic.Clients.Elasticsearch.IndexAlias? Alias { get; set; }
 
 	/// <summary>
@@ -44,8 +178,6 @@ public sealed partial class AddAction
 	/// Index alias names support date math.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("aliases")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.IndexAlias))]
 	public ICollection<Elastic.Clients.Elasticsearch.IndexAlias>? Aliases { get; set; }
 
 	/// <summary>
@@ -53,7 +185,6 @@ public sealed partial class AddAction
 	/// Query used to limit documents the alias can access.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("filter")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.Query? Filter { get; set; }
 
 	/// <summary>
@@ -62,7 +193,6 @@ public sealed partial class AddAction
 	/// Supports wildcards (<c>*</c>).
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("index")]
 	public Elastic.Clients.Elasticsearch.IndexName? Index { get; set; }
 
 	/// <summary>
@@ -72,7 +202,6 @@ public sealed partial class AddAction
 	/// Data stream aliases don’t support this parameter.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("index_routing")]
 	public Elastic.Clients.Elasticsearch.Routing? IndexRouting { get; set; }
 
 	/// <summary>
@@ -81,7 +210,6 @@ public sealed partial class AddAction
 	/// Supports wildcards (<c>*</c>).
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("indices")]
 	public Elastic.Clients.Elasticsearch.Indices? Indices { get; set; }
 
 	/// <summary>
@@ -89,7 +217,6 @@ public sealed partial class AddAction
 	/// If <c>true</c>, the alias is hidden.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("is_hidden")]
 	public bool? IsHidden { get; set; }
 
 	/// <summary>
@@ -97,7 +224,6 @@ public sealed partial class AddAction
 	/// If <c>true</c>, sets the write index or data stream for the alias.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("is_write_index")]
 	public bool? IsWriteIndex { get; set; }
 
 	/// <summary>
@@ -105,7 +231,6 @@ public sealed partial class AddAction
 	/// If <c>true</c>, the alias must exist to perform the action.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("must_exist")]
 	public bool? MustExist { get; set; }
 
 	/// <summary>
@@ -114,7 +239,6 @@ public sealed partial class AddAction
 	/// Data stream aliases don’t support this parameter.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("routing")]
 	public Elastic.Clients.Elasticsearch.Routing? Routing { get; set; }
 
 	/// <summary>
@@ -124,7 +248,6 @@ public sealed partial class AddAction
 	/// Data stream aliases don’t support this parameter.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("search_routing")]
 	public Elastic.Clients.Elasticsearch.Routing? SearchRouting { get; set; }
 
 	public static implicit operator Elastic.Clients.Elasticsearch.IndexManagement.IndexUpdateAliasesAction(AddAction addAction) => Elastic.Clients.Elasticsearch.IndexManagement.IndexUpdateAliasesAction.Add(addAction);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/ExplainAnalyzeToken.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/ExplainAnalyzeToken.g.cs
index 266cfa6e3c0..eda9811e0ea 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/ExplainAnalyzeToken.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/ExplainAnalyzeToken.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,93 +28,130 @@
 
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
 
-internal sealed partial class ExplainAnalyzeTokenConverter : JsonConverter<ExplainAnalyzeToken>
+internal sealed partial class ExplainAnalyzeTokenConverter : System.Text.Json.Serialization.JsonConverter<ExplainAnalyzeToken>
 {
-	public override ExplainAnalyzeToken Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAttributes = System.Text.Json.JsonEncodedText.Encode("attributes");
+	private static readonly System.Text.Json.JsonEncodedText PropBytes = System.Text.Json.JsonEncodedText.Encode("bytes");
+	private static readonly System.Text.Json.JsonEncodedText PropEndOffset = System.Text.Json.JsonEncodedText.Encode("end_offset");
+	private static readonly System.Text.Json.JsonEncodedText PropKeyword = System.Text.Json.JsonEncodedText.Encode("keyword");
+	private static readonly System.Text.Json.JsonEncodedText PropPosition = System.Text.Json.JsonEncodedText.Encode("position");
+	private static readonly System.Text.Json.JsonEncodedText PropPositionlength = System.Text.Json.JsonEncodedText.Encode("positionLength");
+	private static readonly System.Text.Json.JsonEncodedText PropStartOffset = System.Text.Json.JsonEncodedText.Encode("start_offset");
+	private static readonly System.Text.Json.JsonEncodedText PropTermfrequency = System.Text.Json.JsonEncodedText.Encode("termFrequency");
+	private static readonly System.Text.Json.JsonEncodedText PropToken = System.Text.Json.JsonEncodedText.Encode("token");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override ExplainAnalyzeToken Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		string bytes = default;
-		long endOffset = default;
-		bool? keyword = default;
-		long position = default;
-		long positionlength = default;
-		long startOffset = default;
-		long termfrequency = default;
-		string token = default;
-		string type = default;
-		Dictionary<string, object> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, object> propAttributes = default;
+		LocalJsonProperty<string> propBytes = default;
+		LocalJsonProperty<long> propEndOffset = default;
+		LocalJsonProperty<bool?> propKeyword = default;
+		LocalJsonProperty<long> propPosition = default;
+		LocalJsonProperty<long> propPositionlength = default;
+		LocalJsonProperty<long> propStartOffset = default;
+		LocalJsonProperty<long> propTermfrequency = default;
+		LocalJsonProperty<string> propToken = default;
+		LocalJsonProperty<string> propType = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propBytes.TryRead(ref reader, options, PropBytes))
 			{
-				var property = reader.GetString();
-				if (property == "bytes")
-				{
-					bytes = JsonSerializer.Deserialize<string>(ref reader, options);
-					continue;
-				}
-
-				if (property == "end_offset")
-				{
-					endOffset = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "keyword")
-				{
-					keyword = JsonSerializer.Deserialize<bool?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "position")
-				{
-					position = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "positionLength")
-				{
-					positionlength = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "start_offset")
-				{
-					startOffset = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "termFrequency")
-				{
-					termfrequency = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "token")
-				{
-					token = JsonSerializer.Deserialize<string>(ref reader, options);
-					continue;
-				}
-
-				if (property == "type")
-				{
-					type = JsonSerializer.Deserialize<string>(ref reader, options);
-					continue;
-				}
-
-				additionalProperties ??= new Dictionary<string, object>();
-				var additionalValue = JsonSerializer.Deserialize<object>(ref reader, options);
-				additionalProperties.Add(property, additionalValue);
+				continue;
 			}
+
+			if (propEndOffset.TryRead(ref reader, options, PropEndOffset))
+			{
+				continue;
+			}
+
+			if (propKeyword.TryRead(ref reader, options, PropKeyword))
+			{
+				continue;
+			}
+
+			if (propPosition.TryRead(ref reader, options, PropPosition))
+			{
+				continue;
+			}
+
+			if (propPositionlength.TryRead(ref reader, options, PropPositionlength))
+			{
+				continue;
+			}
+
+			if (propStartOffset.TryRead(ref reader, options, PropStartOffset))
+			{
+				continue;
+			}
+
+			if (propTermfrequency.TryRead(ref reader, options, PropTermfrequency))
+			{
+				continue;
+			}
+
+			if (propToken.TryRead(ref reader, options, PropToken))
+			{
+				continue;
+			}
+
+			if (propType.TryRead(ref reader, options, PropType))
+			{
+				continue;
+			}
+
+			propAttributes ??= new System.Collections.Generic.Dictionary<string, object>();
+			reader.ReadProperty(options, out string key, out object value);
+			propAttributes[key] = value;
 		}
 
-		return new ExplainAnalyzeToken { Attributes = additionalProperties, Bytes = bytes, EndOffset = endOffset, Keyword = keyword, Position = position, Positionlength = positionlength, StartOffset = startOffset, Termfrequency = termfrequency, Token = token, Type = type };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ExplainAnalyzeToken
+		{
+			Attributes = propAttributes
+,
+			Bytes = propBytes.Value
+,
+			EndOffset = propEndOffset.Value
+,
+			Keyword = propKeyword.Value
+,
+			Position = propPosition.Value
+,
+			Positionlength = propPositionlength.Value
+,
+			StartOffset = propStartOffset.Value
+,
+			Termfrequency = propTermfrequency.Value
+,
+			Token = propToken.Value
+,
+			Type = propType.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, ExplainAnalyzeToken value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ExplainAnalyzeToken value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'ExplainAnalyzeToken' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBytes, value.Bytes);
+		writer.WriteProperty(options, PropEndOffset, value.EndOffset);
+		writer.WriteProperty(options, PropKeyword, value.Keyword);
+		writer.WriteProperty(options, PropPosition, value.Position);
+		writer.WriteProperty(options, PropPositionlength, value.Positionlength);
+		writer.WriteProperty(options, PropStartOffset, value.StartOffset);
+		writer.WriteProperty(options, PropTermfrequency, value.Termfrequency);
+		writer.WriteProperty(options, PropToken, value.Token);
+		writer.WriteProperty(options, PropType, value.Type);
+		if (value.Attributes is not null)
+		{
+			foreach (var item in value.Attributes)
+			{
+				writer.WriteProperty(options, item.Key, item.Value);
+			}
+		}
+
+		writer.WriteEndObject();
 	}
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexModifyDataStreamAction.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexModifyDataStreamAction.g.cs
index e8b87c850cc..f02f2f275d9 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexModifyDataStreamAction.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexModifyDataStreamAction.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -39,12 +40,16 @@ internal IndexModifyDataStreamAction(string variantName, object variant)
 			throw new ArgumentNullException(nameof(variant));
 		if (string.IsNullOrWhiteSpace(variantName))
 			throw new ArgumentException("Variant name must not be empty or whitespace.");
-		VariantName = variantName;
+		VariantType = variantName;
 		Variant = variant;
 	}
 
-	internal object Variant { get; }
-	internal string VariantName { get; }
+	internal IndexModifyDataStreamAction()
+	{
+	}
+
+	public object Variant { get; internal set; }
+	public string VariantType { get; internal set; }
 
 	public static IndexModifyDataStreamAction AddBackingIndex(Elastic.Clients.Elasticsearch.IndexManagement.IndexAndDataStreamAction indexAndDataStreamAction) => new IndexModifyDataStreamAction("add_backing_index", indexAndDataStreamAction);
 	public static IndexModifyDataStreamAction RemoveBackingIndex(Elastic.Clients.Elasticsearch.IndexManagement.IndexAndDataStreamAction indexAndDataStreamAction) => new IndexModifyDataStreamAction("remove_backing_index", indexAndDataStreamAction);
@@ -62,67 +67,56 @@ public bool TryGet<T>([NotNullWhen(true)] out T? result) where T : class
 	}
 }
 
-internal sealed partial class IndexModifyDataStreamActionConverter : JsonConverter<IndexModifyDataStreamAction>
+internal sealed partial class IndexModifyDataStreamActionConverter : System.Text.Json.Serialization.JsonConverter<IndexModifyDataStreamAction>
 {
-	public override IndexModifyDataStreamAction Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-		{
-			throw new JsonException("Expected start token.");
-		}
+	private static readonly System.Text.Json.JsonEncodedText VariantAddBackingIndex = System.Text.Json.JsonEncodedText.Encode("add_backing_index");
+	private static readonly System.Text.Json.JsonEncodedText VariantRemoveBackingIndex = System.Text.Json.JsonEncodedText.Encode("remove_backing_index");
 
-		object? variantValue = default;
-		string? variantNameValue = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+	public override IndexModifyDataStreamAction Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		var variantType = string.Empty;
+		object? variant = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
+			if (reader.ValueTextEquals(VariantAddBackingIndex))
 			{
-				throw new JsonException("Expected a property name token.");
-			}
-
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token representing the name of an Elasticsearch field.");
-			}
-
-			var propertyName = reader.GetString();
-			reader.Read();
-			if (propertyName == "add_backing_index")
-			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.IndexManagement.IndexAndDataStreamAction?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantAddBackingIndex.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.IndexManagement.IndexAndDataStreamAction?>(options);
 				continue;
 			}
 
-			if (propertyName == "remove_backing_index")
+			if (reader.ValueTextEquals(VariantRemoveBackingIndex))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.IndexManagement.IndexAndDataStreamAction?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantRemoveBackingIndex.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.IndexManagement.IndexAndDataStreamAction?>(options);
 				continue;
 			}
 
-			throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'IndexModifyDataStreamAction' from the response.");
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		var result = new IndexModifyDataStreamAction(variantNameValue, variantValue);
-		return result;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new IndexModifyDataStreamAction { VariantType = variantType, Variant = variant };
 	}
 
-	public override void Write(Utf8JsonWriter writer, IndexModifyDataStreamAction value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IndexModifyDataStreamAction value, System.Text.Json.JsonSerializerOptions options)
 	{
 		writer.WriteStartObject();
-		if (value.VariantName is not null && value.Variant is not null)
+		switch (value.VariantType)
 		{
-			writer.WritePropertyName(value.VariantName);
-			switch (value.VariantName)
-			{
-				case "add_backing_index":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.IndexManagement.IndexAndDataStreamAction>(writer, (Elastic.Clients.Elasticsearch.IndexManagement.IndexAndDataStreamAction)value.Variant, options);
-					break;
-				case "remove_backing_index":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.IndexManagement.IndexAndDataStreamAction>(writer, (Elastic.Clients.Elasticsearch.IndexManagement.IndexAndDataStreamAction)value.Variant, options);
-					break;
-			}
+			case "":
+				break;
+			case "add_backing_index":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.IndexManagement.IndexAndDataStreamAction?)value.Variant);
+				break;
+			case "remove_backing_index":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.IndexManagement.IndexAndDataStreamAction?)value.Variant);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.VariantType}' is not supported for type '{nameof(IndexModifyDataStreamAction)}'.");
 		}
 
 		writer.WriteEndObject();
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 41e475ffda0..2bb6059ad2d 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexSegmentSort.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexSegmentSort.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,19 +28,75 @@
 
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
 
+internal sealed partial class IndexSegmentSortConverter : System.Text.Json.Serialization.JsonConverter<IndexSegmentSort>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropMissing = System.Text.Json.JsonEncodedText.Encode("missing");
+	private static readonly System.Text.Json.JsonEncodedText PropMode = System.Text.Json.JsonEncodedText.Encode("mode");
+	private static readonly System.Text.Json.JsonEncodedText PropOrder = System.Text.Json.JsonEncodedText.Encode("order");
+
+	public override IndexSegmentSort Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Fields?> propField = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.IndexManagement.SegmentSortMissing>?> propMissing = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.IndexManagement.SegmentSortMode>?> propMode = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.IndexManagement.SegmentSortOrder>?> propOrder = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propField.TryRead(ref reader, options, PropField, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propMissing.TryRead(ref reader, options, PropMissing, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.IndexManagement.SegmentSortMissing>?, Elastic.Clients.Elasticsearch.IndexManagement.SegmentSortMissing>)))
+			{
+				continue;
+			}
+
+			if (propMode.TryRead(ref reader, options, PropMode, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.IndexManagement.SegmentSortMode>?, Elastic.Clients.Elasticsearch.IndexManagement.SegmentSortMode>)))
+			{
+				continue;
+			}
+
+			if (propOrder.TryRead(ref reader, options, PropOrder, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.IndexManagement.SegmentSortOrder>?, Elastic.Clients.Elasticsearch.IndexManagement.SegmentSortOrder>)))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new IndexSegmentSort
+		{
+			Field = propField.Value
+,
+			Missing = propMissing.Value
+,
+			Mode = propMode.Value
+,
+			Order = propOrder.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IndexSegmentSort value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropField, value.Field, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropMissing, value.Missing, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.IndexManagement.SegmentSortMissing>?, Elastic.Clients.Elasticsearch.IndexManagement.SegmentSortMissing>));
+		writer.WriteProperty(options, PropMode, value.Mode, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.IndexManagement.SegmentSortMode>?, Elastic.Clients.Elasticsearch.IndexManagement.SegmentSortMode>));
+		writer.WriteProperty(options, PropOrder, value.Order, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.IndexManagement.SegmentSortOrder>?, Elastic.Clients.Elasticsearch.IndexManagement.SegmentSortOrder>));
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(IndexSegmentSortConverter))]
 public sealed partial class IndexSegmentSort
 {
-	[JsonInclude, JsonPropertyName("field")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	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; }
 }
 
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 85cb6c2f4ac..8e2e55f78e7 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexSettings.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexSettings.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,711 +28,597 @@
 
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
 
-internal sealed partial class IndexSettingsConverter : JsonConverter<IndexSettings>
+internal sealed partial class IndexSettingsConverter : System.Text.Json.Serialization.JsonConverter<IndexSettings>
 {
-	public override IndexSettings Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		var variant = new IndexSettings();
-		Dictionary<string, object> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
-		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+	private static readonly System.Text.Json.JsonEncodedText PropOtherSettings = System.Text.Json.JsonEncodedText.Encode("other_settings");
+	private static readonly System.Text.Json.JsonEncodedText PropAnalysis = System.Text.Json.JsonEncodedText.Encode("analysis");
+	private static readonly System.Text.Json.JsonEncodedText PropAnalyze = System.Text.Json.JsonEncodedText.Encode("analyze");
+	private static readonly System.Text.Json.JsonEncodedText PropAutoExpandReplicas = System.Text.Json.JsonEncodedText.Encode("auto_expand_replicas");
+	private static readonly System.Text.Json.JsonEncodedText PropBlocks = System.Text.Json.JsonEncodedText.Encode("blocks");
+	private static readonly System.Text.Json.JsonEncodedText PropCheckOnStartup = System.Text.Json.JsonEncodedText.Encode("check_on_startup");
+	private static readonly System.Text.Json.JsonEncodedText PropCodec = System.Text.Json.JsonEncodedText.Encode("codec");
+	private static readonly System.Text.Json.JsonEncodedText PropCreationDate = System.Text.Json.JsonEncodedText.Encode("creation_date");
+	private static readonly System.Text.Json.JsonEncodedText PropCreationDateString = System.Text.Json.JsonEncodedText.Encode("creation_date_string");
+	private static readonly System.Text.Json.JsonEncodedText PropDefaultPipeline = System.Text.Json.JsonEncodedText.Encode("default_pipeline");
+	private static readonly System.Text.Json.JsonEncodedText PropFinalPipeline = System.Text.Json.JsonEncodedText.Encode("final_pipeline");
+	private static readonly System.Text.Json.JsonEncodedText PropFormat = System.Text.Json.JsonEncodedText.Encode("format");
+	private static readonly System.Text.Json.JsonEncodedText PropGcDeletes = System.Text.Json.JsonEncodedText.Encode("gc_deletes");
+	private static readonly System.Text.Json.JsonEncodedText PropHidden = System.Text.Json.JsonEncodedText.Encode("hidden");
+	private static readonly System.Text.Json.JsonEncodedText PropHighlight = System.Text.Json.JsonEncodedText.Encode("highlight");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropIndexingPressure = System.Text.Json.JsonEncodedText.Encode("indexing_pressure");
+	private static readonly System.Text.Json.JsonEncodedText PropIndexingSlowlog = System.Text.Json.JsonEncodedText.Encode("indexing.slowlog");
+	private static readonly System.Text.Json.JsonEncodedText PropLifecycle = System.Text.Json.JsonEncodedText.Encode("lifecycle");
+	private static readonly System.Text.Json.JsonEncodedText PropLoadFixedBitsetFiltersEagerly = System.Text.Json.JsonEncodedText.Encode("load_fixed_bitset_filters_eagerly");
+	private static readonly System.Text.Json.JsonEncodedText PropMapping = System.Text.Json.JsonEncodedText.Encode("mapping");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxDocvalueFieldsSearch = System.Text.Json.JsonEncodedText.Encode("max_docvalue_fields_search");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxInnerResultWindow = System.Text.Json.JsonEncodedText.Encode("max_inner_result_window");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxNgramDiff = System.Text.Json.JsonEncodedText.Encode("max_ngram_diff");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxRefreshListeners = System.Text.Json.JsonEncodedText.Encode("max_refresh_listeners");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxRegexLength = System.Text.Json.JsonEncodedText.Encode("max_regex_length");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxRescoreWindow = System.Text.Json.JsonEncodedText.Encode("max_rescore_window");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxResultWindow = System.Text.Json.JsonEncodedText.Encode("max_result_window");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxScriptFields = System.Text.Json.JsonEncodedText.Encode("max_script_fields");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxShingleDiff = System.Text.Json.JsonEncodedText.Encode("max_shingle_diff");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxSlicesPerScroll = System.Text.Json.JsonEncodedText.Encode("max_slices_per_scroll");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxTermsCount = System.Text.Json.JsonEncodedText.Encode("max_terms_count");
+	private static readonly System.Text.Json.JsonEncodedText PropMerge = System.Text.Json.JsonEncodedText.Encode("merge");
+	private static readonly System.Text.Json.JsonEncodedText PropMode = System.Text.Json.JsonEncodedText.Encode("mode");
+	private static readonly System.Text.Json.JsonEncodedText PropNumberOfReplicas = System.Text.Json.JsonEncodedText.Encode("number_of_replicas");
+	private static readonly System.Text.Json.JsonEncodedText PropNumberOfRoutingShards = System.Text.Json.JsonEncodedText.Encode("number_of_routing_shards");
+	private static readonly System.Text.Json.JsonEncodedText PropNumberOfShards = System.Text.Json.JsonEncodedText.Encode("number_of_shards");
+	private static readonly System.Text.Json.JsonEncodedText PropPriority = System.Text.Json.JsonEncodedText.Encode("priority");
+	private static readonly System.Text.Json.JsonEncodedText PropProvidedName = System.Text.Json.JsonEncodedText.Encode("provided_name");
+	private static readonly System.Text.Json.JsonEncodedText PropQueries = System.Text.Json.JsonEncodedText.Encode("queries");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryString = System.Text.Json.JsonEncodedText.Encode("query_string");
+	private static readonly System.Text.Json.JsonEncodedText PropRefreshInterval = System.Text.Json.JsonEncodedText.Encode("refresh_interval");
+	private static readonly System.Text.Json.JsonEncodedText PropRouting = System.Text.Json.JsonEncodedText.Encode("routing");
+	private static readonly System.Text.Json.JsonEncodedText PropRoutingPartitionSize = System.Text.Json.JsonEncodedText.Encode("routing_partition_size");
+	private static readonly System.Text.Json.JsonEncodedText PropRoutingPath = System.Text.Json.JsonEncodedText.Encode("routing_path");
+	private static readonly System.Text.Json.JsonEncodedText PropSearch = System.Text.Json.JsonEncodedText.Encode("search");
+	private static readonly System.Text.Json.JsonEncodedText PropSettings = System.Text.Json.JsonEncodedText.Encode("settings");
+	private static readonly System.Text.Json.JsonEncodedText PropSimilarity = System.Text.Json.JsonEncodedText.Encode("similarity");
+	private static readonly System.Text.Json.JsonEncodedText PropSoftDeletes = System.Text.Json.JsonEncodedText.Encode("soft_deletes");
+	private static readonly System.Text.Json.JsonEncodedText PropSort = System.Text.Json.JsonEncodedText.Encode("sort");
+	private static readonly System.Text.Json.JsonEncodedText PropStore = System.Text.Json.JsonEncodedText.Encode("store");
+	private static readonly System.Text.Json.JsonEncodedText PropTimeSeries = System.Text.Json.JsonEncodedText.Encode("time_series");
+	private static readonly System.Text.Json.JsonEncodedText PropTopMetricsMaxSize = System.Text.Json.JsonEncodedText.Encode("top_metrics_max_size");
+	private static readonly System.Text.Json.JsonEncodedText PropTranslog = System.Text.Json.JsonEncodedText.Encode("translog");
+	private static readonly System.Text.Json.JsonEncodedText PropUuid = System.Text.Json.JsonEncodedText.Encode("uuid");
+	private static readonly System.Text.Json.JsonEncodedText PropVerifiedBeforeClose = System.Text.Json.JsonEncodedText.Encode("verified_before_close");
+	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("version");
+
+	public override IndexSettings Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, object> propOtherSettings = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.IndexManagement.IndexSettingsAnalysis?> propAnalysis = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.IndexManagement.SettingsAnalyze?> propAnalyze = default;
+		LocalJsonProperty<string?> propAutoExpandReplicas = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.IndexManagement.IndexSettingBlocks?> propBlocks = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.IndexManagement.IndexCheckOnStartup?> propCheckOnStartup = default;
+		LocalJsonProperty<string?> propCodec = default;
+		LocalJsonProperty<long?> propCreationDate = default;
+		LocalJsonProperty<DateTimeOffset?> propCreationDateString = default;
+		LocalJsonProperty<string?> propDefaultPipeline = default;
+		LocalJsonProperty<string?> propFinalPipeline = default;
+		LocalJsonProperty<object?> propFormat = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Duration?> propGcDeletes = default;
+		LocalJsonProperty<object?> propHidden = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.IndexManagement.SettingsHighlight?> propHighlight = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.IndexManagement.IndexSettings?> propIndex = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.IndexManagement.IndexingPressure?> propIndexingPressure = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.IndexManagement.IndexingSlowlogSettings?> propIndexingSlowlog = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.IndexManagement.IndexSettingsLifecycle?> propLifecycle = default;
+		LocalJsonProperty<bool?> propLoadFixedBitsetFiltersEagerly = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.IndexManagement.MappingLimitSettings?> propMapping = default;
+		LocalJsonProperty<int?> propMaxDocvalueFieldsSearch = default;
+		LocalJsonProperty<int?> propMaxInnerResultWindow = default;
+		LocalJsonProperty<int?> propMaxNgramDiff = default;
+		LocalJsonProperty<int?> propMaxRefreshListeners = default;
+		LocalJsonProperty<int?> propMaxRegexLength = default;
+		LocalJsonProperty<int?> propMaxRescoreWindow = default;
+		LocalJsonProperty<int?> propMaxResultWindow = default;
+		LocalJsonProperty<int?> propMaxScriptFields = default;
+		LocalJsonProperty<int?> propMaxShingleDiff = default;
+		LocalJsonProperty<int?> propMaxSlicesPerScroll = default;
+		LocalJsonProperty<int?> propMaxTermsCount = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.IndexManagement.Merge?> propMerge = default;
+		LocalJsonProperty<string?> propMode = default;
+		LocalJsonProperty<object?> propNumberOfReplicas = default;
+		LocalJsonProperty<int?> propNumberOfRoutingShards = default;
+		LocalJsonProperty<object?> propNumberOfShards = default;
+		LocalJsonProperty<object?> propPriority = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Name?> propProvidedName = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.IndexManagement.Queries?> propQueries = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.IndexManagement.SettingsQueryString?> propQueryString = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Duration?> propRefreshInterval = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.IndexManagement.IndexRouting?> propRouting = default;
+		LocalJsonProperty<int?> propRoutingPartitionSize = default;
+		LocalJsonProperty<ICollection<string>?> propRoutingPath = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.IndexManagement.SettingsSearch?> propSearch = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.IndexManagement.IndexSettings?> propSettings = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.IndexManagement.SettingsSimilarities?> propSimilarity = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.IndexManagement.SoftDeletes?> propSoftDeletes = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.IndexManagement.IndexSegmentSort?> propSort = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.IndexManagement.Storage?> propStore = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.IndexManagement.IndexSettingsTimeSeries?> propTimeSeries = default;
+		LocalJsonProperty<int?> propTopMetricsMaxSize = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.IndexManagement.Translog?> propTranslog = default;
+		LocalJsonProperty<string?> propUuid = default;
+		LocalJsonProperty<object?> propVerifiedBeforeClose = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.IndexManagement.IndexVersioning?> propVersion = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAnalysis.TryRead(ref reader, options, PropAnalysis))
 			{
-				var property = reader.GetString();
-				if (property == "analysis")
-				{
-					variant.Analysis = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.IndexManagement.IndexSettingsAnalysis?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "analyze")
-				{
-					variant.Analyze = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.IndexManagement.SettingsAnalyze?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "auto_expand_replicas")
-				{
-					variant.AutoExpandReplicas = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "blocks")
-				{
-					variant.Blocks = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.IndexManagement.IndexSettingBlocks?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "check_on_startup")
-				{
-					variant.CheckOnStartup = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.IndexManagement.IndexCheckOnStartup?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "codec")
-				{
-					variant.Codec = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "creation_date")
-				{
-					variant.CreationDate = JsonSerializer.Deserialize<long?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "creation_date_string")
-				{
-					variant.CreationDateString = JsonSerializer.Deserialize<DateTimeOffset?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "default_pipeline")
-				{
-					variant.DefaultPipeline = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "final_pipeline")
-				{
-					variant.FinalPipeline = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "format")
-				{
-					variant.Format = JsonSerializer.Deserialize<object?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "gc_deletes")
-				{
-					variant.GcDeletes = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Duration?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "hidden")
-				{
-					variant.Hidden = JsonSerializer.Deserialize<object?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "highlight")
-				{
-					variant.Highlight = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.IndexManagement.SettingsHighlight?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "index")
-				{
-					variant.Index = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.IndexManagement.IndexSettings?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "indexing_pressure")
-				{
-					variant.IndexingPressure = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.IndexManagement.IndexingPressure?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "indexing.slowlog")
-				{
-					variant.IndexingSlowlog = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.IndexManagement.IndexingSlowlogSettings?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "lifecycle")
-				{
-					variant.Lifecycle = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.IndexManagement.IndexSettingsLifecycle?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "load_fixed_bitset_filters_eagerly")
-				{
-					variant.LoadFixedBitsetFiltersEagerly = JsonSerializer.Deserialize<bool?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "mapping")
-				{
-					variant.Mapping = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.IndexManagement.MappingLimitSettings?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "max_docvalue_fields_search")
-				{
-					variant.MaxDocvalueFieldsSearch = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "max_inner_result_window")
-				{
-					variant.MaxInnerResultWindow = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "max_ngram_diff")
-				{
-					variant.MaxNgramDiff = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "max_refresh_listeners")
-				{
-					variant.MaxRefreshListeners = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "max_regex_length")
-				{
-					variant.MaxRegexLength = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "max_rescore_window")
-				{
-					variant.MaxRescoreWindow = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "max_result_window")
-				{
-					variant.MaxResultWindow = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "max_script_fields")
-				{
-					variant.MaxScriptFields = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "max_shingle_diff")
-				{
-					variant.MaxShingleDiff = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "max_slices_per_scroll")
-				{
-					variant.MaxSlicesPerScroll = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "max_terms_count")
-				{
-					variant.MaxTermsCount = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "merge")
-				{
-					variant.Merge = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.IndexManagement.Merge?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "mode")
-				{
-					variant.Mode = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "number_of_replicas")
-				{
-					variant.NumberOfReplicas = JsonSerializer.Deserialize<object?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "number_of_routing_shards")
-				{
-					variant.NumberOfRoutingShards = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "number_of_shards")
-				{
-					variant.NumberOfShards = JsonSerializer.Deserialize<object?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "priority")
-				{
-					variant.Priority = JsonSerializer.Deserialize<object?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "provided_name")
-				{
-					variant.ProvidedName = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Name?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "queries")
-				{
-					variant.Queries = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.IndexManagement.Queries?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "query_string")
-				{
-					variant.QueryString = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.IndexManagement.SettingsQueryString?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "refresh_interval")
-				{
-					variant.RefreshInterval = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Duration?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "routing")
-				{
-					variant.Routing = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.IndexManagement.IndexRouting?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "routing_partition_size")
-				{
-					variant.RoutingPartitionSize = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "routing_path")
-				{
-					variant.RoutingPath = SingleOrManySerializationHelper.Deserialize<string>(ref reader, options);
-					continue;
-				}
-
-				if (property == "search")
-				{
-					variant.Search = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.IndexManagement.SettingsSearch?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "settings")
-				{
-					variant.Settings = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.IndexManagement.IndexSettings?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "similarity")
-				{
-					variant.Similarity = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.IndexManagement.SettingsSimilarities?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "soft_deletes")
-				{
-					variant.SoftDeletes = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.IndexManagement.SoftDeletes?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "sort")
-				{
-					variant.Sort = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.IndexManagement.IndexSegmentSort?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "store")
-				{
-					variant.Store = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.IndexManagement.Storage?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "time_series")
-				{
-					variant.TimeSeries = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.IndexManagement.IndexSettingsTimeSeries?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "top_metrics_max_size")
-				{
-					variant.TopMetricsMaxSize = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "translog")
-				{
-					variant.Translog = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.IndexManagement.Translog?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "uuid")
-				{
-					variant.Uuid = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "verified_before_close")
-				{
-					variant.VerifiedBeforeClose = JsonSerializer.Deserialize<object?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "version")
-				{
-					variant.Version = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.IndexManagement.IndexVersioning?>(ref reader, options);
-					continue;
-				}
-
-				additionalProperties ??= new Dictionary<string, object>();
-				var additionalValue = JsonSerializer.Deserialize<object>(ref reader, options);
-				additionalProperties.Add(property, additionalValue);
+				continue;
 			}
-		}
-
-		variant.OtherSettings = additionalProperties;
-		return variant;
-	}
 
-	public override void Write(Utf8JsonWriter writer, IndexSettings value, JsonSerializerOptions options)
-	{
-		writer.WriteStartObject();
-		if (value.OtherSettings is not null)
-		{
-			foreach (var additionalProperty in value.OtherSettings)
+			if (propAnalyze.TryRead(ref reader, options, PropAnalyze))
 			{
-				writer.WritePropertyName(additionalProperty.Key);
-				JsonSerializer.Serialize(writer, additionalProperty.Value, options);
+				continue;
 			}
-		}
 
-		if (value.Analysis is not null)
-		{
-			writer.WritePropertyName("analysis");
-			JsonSerializer.Serialize(writer, value.Analysis, options);
-		}
-
-		if (value.Analyze is not null)
-		{
-			writer.WritePropertyName("analyze");
-			JsonSerializer.Serialize(writer, value.Analyze, options);
-		}
+			if (propAutoExpandReplicas.TryRead(ref reader, options, PropAutoExpandReplicas))
+			{
+				continue;
+			}
 
-		if (!string.IsNullOrEmpty(value.AutoExpandReplicas))
-		{
-			writer.WritePropertyName("auto_expand_replicas");
-			writer.WriteStringValue(value.AutoExpandReplicas);
-		}
+			if (propBlocks.TryRead(ref reader, options, PropBlocks))
+			{
+				continue;
+			}
 
-		if (value.Blocks is not null)
-		{
-			writer.WritePropertyName("blocks");
-			JsonSerializer.Serialize(writer, value.Blocks, options);
-		}
+			if (propCheckOnStartup.TryRead(ref reader, options, PropCheckOnStartup))
+			{
+				continue;
+			}
 
-		if (value.CheckOnStartup is not null)
-		{
-			writer.WritePropertyName("check_on_startup");
-			JsonSerializer.Serialize(writer, value.CheckOnStartup, options);
-		}
+			if (propCodec.TryRead(ref reader, options, PropCodec))
+			{
+				continue;
+			}
 
-		if (!string.IsNullOrEmpty(value.Codec))
-		{
-			writer.WritePropertyName("codec");
-			writer.WriteStringValue(value.Codec);
-		}
+			if (propCreationDate.TryRead(ref reader, options, PropCreationDate))
+			{
+				continue;
+			}
 
-		if (value.CreationDate.HasValue)
-		{
-			writer.WritePropertyName("creation_date");
-			writer.WriteNumberValue(value.CreationDate.Value);
-		}
+			if (propCreationDateString.TryRead(ref reader, options, PropCreationDateString))
+			{
+				continue;
+			}
 
-		if (value.CreationDateString is not null)
-		{
-			writer.WritePropertyName("creation_date_string");
-			JsonSerializer.Serialize(writer, value.CreationDateString, options);
-		}
+			if (propDefaultPipeline.TryRead(ref reader, options, PropDefaultPipeline))
+			{
+				continue;
+			}
 
-		if (!string.IsNullOrEmpty(value.DefaultPipeline))
-		{
-			writer.WritePropertyName("default_pipeline");
-			writer.WriteStringValue(value.DefaultPipeline);
-		}
+			if (propFinalPipeline.TryRead(ref reader, options, PropFinalPipeline))
+			{
+				continue;
+			}
 
-		if (!string.IsNullOrEmpty(value.FinalPipeline))
-		{
-			writer.WritePropertyName("final_pipeline");
-			writer.WriteStringValue(value.FinalPipeline);
-		}
+			if (propFormat.TryRead(ref reader, options, PropFormat))
+			{
+				continue;
+			}
 
-		if (value.Format is not null)
-		{
-			writer.WritePropertyName("format");
-			JsonSerializer.Serialize(writer, value.Format, options);
-		}
+			if (propGcDeletes.TryRead(ref reader, options, PropGcDeletes))
+			{
+				continue;
+			}
 
-		if (value.GcDeletes is not null)
-		{
-			writer.WritePropertyName("gc_deletes");
-			JsonSerializer.Serialize(writer, value.GcDeletes, options);
-		}
+			if (propHidden.TryRead(ref reader, options, PropHidden))
+			{
+				continue;
+			}
 
-		if (value.Hidden is not null)
-		{
-			writer.WritePropertyName("hidden");
-			JsonSerializer.Serialize(writer, value.Hidden, options);
-		}
+			if (propHighlight.TryRead(ref reader, options, PropHighlight))
+			{
+				continue;
+			}
 
-		if (value.Highlight is not null)
-		{
-			writer.WritePropertyName("highlight");
-			JsonSerializer.Serialize(writer, value.Highlight, options);
-		}
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
 
-		if (value.Index is not null)
-		{
-			writer.WritePropertyName("index");
-			JsonSerializer.Serialize(writer, value.Index, options);
-		}
+			if (propIndexingPressure.TryRead(ref reader, options, PropIndexingPressure))
+			{
+				continue;
+			}
 
-		if (value.IndexingPressure is not null)
-		{
-			writer.WritePropertyName("indexing_pressure");
-			JsonSerializer.Serialize(writer, value.IndexingPressure, options);
-		}
+			if (propIndexingSlowlog.TryRead(ref reader, options, PropIndexingSlowlog))
+			{
+				continue;
+			}
 
-		if (value.IndexingSlowlog is not null)
-		{
-			writer.WritePropertyName("indexing.slowlog");
-			JsonSerializer.Serialize(writer, value.IndexingSlowlog, options);
-		}
+			if (propLifecycle.TryRead(ref reader, options, PropLifecycle))
+			{
+				continue;
+			}
 
-		if (value.Lifecycle is not null)
-		{
-			writer.WritePropertyName("lifecycle");
-			JsonSerializer.Serialize(writer, value.Lifecycle, options);
-		}
+			if (propLoadFixedBitsetFiltersEagerly.TryRead(ref reader, options, PropLoadFixedBitsetFiltersEagerly))
+			{
+				continue;
+			}
 
-		if (value.LoadFixedBitsetFiltersEagerly.HasValue)
-		{
-			writer.WritePropertyName("load_fixed_bitset_filters_eagerly");
-			writer.WriteBooleanValue(value.LoadFixedBitsetFiltersEagerly.Value);
-		}
+			if (propMapping.TryRead(ref reader, options, PropMapping))
+			{
+				continue;
+			}
 
-		if (value.Mapping is not null)
-		{
-			writer.WritePropertyName("mapping");
-			JsonSerializer.Serialize(writer, value.Mapping, options);
-		}
+			if (propMaxDocvalueFieldsSearch.TryRead(ref reader, options, PropMaxDocvalueFieldsSearch))
+			{
+				continue;
+			}
 
-		if (value.MaxDocvalueFieldsSearch.HasValue)
-		{
-			writer.WritePropertyName("max_docvalue_fields_search");
-			writer.WriteNumberValue(value.MaxDocvalueFieldsSearch.Value);
-		}
+			if (propMaxInnerResultWindow.TryRead(ref reader, options, PropMaxInnerResultWindow))
+			{
+				continue;
+			}
 
-		if (value.MaxInnerResultWindow.HasValue)
-		{
-			writer.WritePropertyName("max_inner_result_window");
-			writer.WriteNumberValue(value.MaxInnerResultWindow.Value);
-		}
+			if (propMaxNgramDiff.TryRead(ref reader, options, PropMaxNgramDiff))
+			{
+				continue;
+			}
 
-		if (value.MaxNgramDiff.HasValue)
-		{
-			writer.WritePropertyName("max_ngram_diff");
-			writer.WriteNumberValue(value.MaxNgramDiff.Value);
-		}
+			if (propMaxRefreshListeners.TryRead(ref reader, options, PropMaxRefreshListeners))
+			{
+				continue;
+			}
 
-		if (value.MaxRefreshListeners.HasValue)
-		{
-			writer.WritePropertyName("max_refresh_listeners");
-			writer.WriteNumberValue(value.MaxRefreshListeners.Value);
-		}
+			if (propMaxRegexLength.TryRead(ref reader, options, PropMaxRegexLength))
+			{
+				continue;
+			}
 
-		if (value.MaxRegexLength.HasValue)
-		{
-			writer.WritePropertyName("max_regex_length");
-			writer.WriteNumberValue(value.MaxRegexLength.Value);
-		}
+			if (propMaxRescoreWindow.TryRead(ref reader, options, PropMaxRescoreWindow))
+			{
+				continue;
+			}
 
-		if (value.MaxRescoreWindow.HasValue)
-		{
-			writer.WritePropertyName("max_rescore_window");
-			writer.WriteNumberValue(value.MaxRescoreWindow.Value);
-		}
+			if (propMaxResultWindow.TryRead(ref reader, options, PropMaxResultWindow))
+			{
+				continue;
+			}
 
-		if (value.MaxResultWindow.HasValue)
-		{
-			writer.WritePropertyName("max_result_window");
-			writer.WriteNumberValue(value.MaxResultWindow.Value);
-		}
+			if (propMaxScriptFields.TryRead(ref reader, options, PropMaxScriptFields))
+			{
+				continue;
+			}
 
-		if (value.MaxScriptFields.HasValue)
-		{
-			writer.WritePropertyName("max_script_fields");
-			writer.WriteNumberValue(value.MaxScriptFields.Value);
-		}
+			if (propMaxShingleDiff.TryRead(ref reader, options, PropMaxShingleDiff))
+			{
+				continue;
+			}
 
-		if (value.MaxShingleDiff.HasValue)
-		{
-			writer.WritePropertyName("max_shingle_diff");
-			writer.WriteNumberValue(value.MaxShingleDiff.Value);
-		}
+			if (propMaxSlicesPerScroll.TryRead(ref reader, options, PropMaxSlicesPerScroll))
+			{
+				continue;
+			}
 
-		if (value.MaxSlicesPerScroll.HasValue)
-		{
-			writer.WritePropertyName("max_slices_per_scroll");
-			writer.WriteNumberValue(value.MaxSlicesPerScroll.Value);
-		}
+			if (propMaxTermsCount.TryRead(ref reader, options, PropMaxTermsCount))
+			{
+				continue;
+			}
 
-		if (value.MaxTermsCount.HasValue)
-		{
-			writer.WritePropertyName("max_terms_count");
-			writer.WriteNumberValue(value.MaxTermsCount.Value);
-		}
+			if (propMerge.TryRead(ref reader, options, PropMerge))
+			{
+				continue;
+			}
 
-		if (value.Merge is not null)
-		{
-			writer.WritePropertyName("merge");
-			JsonSerializer.Serialize(writer, value.Merge, options);
-		}
+			if (propMode.TryRead(ref reader, options, PropMode))
+			{
+				continue;
+			}
 
-		if (!string.IsNullOrEmpty(value.Mode))
-		{
-			writer.WritePropertyName("mode");
-			writer.WriteStringValue(value.Mode);
-		}
+			if (propNumberOfReplicas.TryRead(ref reader, options, PropNumberOfReplicas))
+			{
+				continue;
+			}
 
-		if (value.NumberOfReplicas is not null)
-		{
-			writer.WritePropertyName("number_of_replicas");
-			JsonSerializer.Serialize(writer, value.NumberOfReplicas, options);
-		}
+			if (propNumberOfRoutingShards.TryRead(ref reader, options, PropNumberOfRoutingShards))
+			{
+				continue;
+			}
 
-		if (value.NumberOfRoutingShards.HasValue)
-		{
-			writer.WritePropertyName("number_of_routing_shards");
-			writer.WriteNumberValue(value.NumberOfRoutingShards.Value);
-		}
+			if (propNumberOfShards.TryRead(ref reader, options, PropNumberOfShards))
+			{
+				continue;
+			}
 
-		if (value.NumberOfShards is not null)
-		{
-			writer.WritePropertyName("number_of_shards");
-			JsonSerializer.Serialize(writer, value.NumberOfShards, options);
-		}
+			if (propPriority.TryRead(ref reader, options, PropPriority))
+			{
+				continue;
+			}
 
-		if (value.Priority is not null)
-		{
-			writer.WritePropertyName("priority");
-			JsonSerializer.Serialize(writer, value.Priority, options);
-		}
+			if (propProvidedName.TryRead(ref reader, options, PropProvidedName))
+			{
+				continue;
+			}
 
-		if (value.ProvidedName is not null)
-		{
-			writer.WritePropertyName("provided_name");
-			JsonSerializer.Serialize(writer, value.ProvidedName, options);
-		}
+			if (propQueries.TryRead(ref reader, options, PropQueries))
+			{
+				continue;
+			}
 
-		if (value.Queries is not null)
-		{
-			writer.WritePropertyName("queries");
-			JsonSerializer.Serialize(writer, value.Queries, options);
-		}
+			if (propQueryString.TryRead(ref reader, options, PropQueryString))
+			{
+				continue;
+			}
 
-		if (value.QueryString is not null)
-		{
-			writer.WritePropertyName("query_string");
-			JsonSerializer.Serialize(writer, value.QueryString, options);
-		}
+			if (propRefreshInterval.TryRead(ref reader, options, PropRefreshInterval))
+			{
+				continue;
+			}
 
-		if (value.RefreshInterval is not null)
-		{
-			writer.WritePropertyName("refresh_interval");
-			JsonSerializer.Serialize(writer, value.RefreshInterval, options);
-		}
+			if (propRouting.TryRead(ref reader, options, PropRouting))
+			{
+				continue;
+			}
 
-		if (value.Routing is not null)
-		{
-			writer.WritePropertyName("routing");
-			JsonSerializer.Serialize(writer, value.Routing, options);
-		}
+			if (propRoutingPartitionSize.TryRead(ref reader, options, PropRoutingPartitionSize))
+			{
+				continue;
+			}
 
-		if (value.RoutingPartitionSize.HasValue)
-		{
-			writer.WritePropertyName("routing_partition_size");
-			writer.WriteNumberValue(value.RoutingPartitionSize.Value);
-		}
+			if (propRoutingPath.TryRead(ref reader, options, PropRoutingPath, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
 
-		if (value.RoutingPath is not null)
-		{
-			writer.WritePropertyName("routing_path");
-			JsonSerializer.Serialize(writer, value.RoutingPath, options);
-		}
+			if (propSearch.TryRead(ref reader, options, PropSearch))
+			{
+				continue;
+			}
 
-		if (value.Search is not null)
-		{
-			writer.WritePropertyName("search");
-			JsonSerializer.Serialize(writer, value.Search, options);
-		}
+			if (propSettings.TryRead(ref reader, options, PropSettings))
+			{
+				continue;
+			}
 
-		if (value.Settings is not null)
-		{
-			writer.WritePropertyName("settings");
-			JsonSerializer.Serialize(writer, value.Settings, options);
-		}
+			if (propSimilarity.TryRead(ref reader, options, PropSimilarity))
+			{
+				continue;
+			}
 
-		if (value.Similarity is not null)
-		{
-			writer.WritePropertyName("similarity");
-			JsonSerializer.Serialize(writer, value.Similarity, options);
-		}
+			if (propSoftDeletes.TryRead(ref reader, options, PropSoftDeletes))
+			{
+				continue;
+			}
 
-		if (value.SoftDeletes is not null)
-		{
-			writer.WritePropertyName("soft_deletes");
-			JsonSerializer.Serialize(writer, value.SoftDeletes, options);
-		}
+			if (propSort.TryRead(ref reader, options, PropSort))
+			{
+				continue;
+			}
 
-		if (value.Sort is not null)
-		{
-			writer.WritePropertyName("sort");
-			JsonSerializer.Serialize(writer, value.Sort, options);
-		}
+			if (propStore.TryRead(ref reader, options, PropStore))
+			{
+				continue;
+			}
 
-		if (value.Store is not null)
-		{
-			writer.WritePropertyName("store");
-			JsonSerializer.Serialize(writer, value.Store, options);
-		}
+			if (propTimeSeries.TryRead(ref reader, options, PropTimeSeries))
+			{
+				continue;
+			}
 
-		if (value.TimeSeries is not null)
-		{
-			writer.WritePropertyName("time_series");
-			JsonSerializer.Serialize(writer, value.TimeSeries, options);
-		}
+			if (propTopMetricsMaxSize.TryRead(ref reader, options, PropTopMetricsMaxSize))
+			{
+				continue;
+			}
 
-		if (value.TopMetricsMaxSize.HasValue)
-		{
-			writer.WritePropertyName("top_metrics_max_size");
-			writer.WriteNumberValue(value.TopMetricsMaxSize.Value);
-		}
+			if (propTranslog.TryRead(ref reader, options, PropTranslog))
+			{
+				continue;
+			}
 
-		if (value.Translog is not null)
-		{
-			writer.WritePropertyName("translog");
-			JsonSerializer.Serialize(writer, value.Translog, options);
-		}
+			if (propUuid.TryRead(ref reader, options, PropUuid))
+			{
+				continue;
+			}
 
-		if (!string.IsNullOrEmpty(value.Uuid))
-		{
-			writer.WritePropertyName("uuid");
-			writer.WriteStringValue(value.Uuid);
-		}
+			if (propVerifiedBeforeClose.TryRead(ref reader, options, PropVerifiedBeforeClose))
+			{
+				continue;
+			}
 
-		if (value.VerifiedBeforeClose is not null)
-		{
-			writer.WritePropertyName("verified_before_close");
-			JsonSerializer.Serialize(writer, value.VerifiedBeforeClose, options);
-		}
+			if (propVersion.TryRead(ref reader, options, PropVersion))
+			{
+				continue;
+			}
 
-		if (value.Version is not null)
+			propOtherSettings ??= new System.Collections.Generic.Dictionary<string, object>();
+			reader.ReadProperty(options, out string key, out object value);
+			propOtherSettings[key] = value;
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new IndexSettings
+		{
+			OtherSettings = propOtherSettings
+,
+			Analysis = propAnalysis.Value
+,
+			Analyze = propAnalyze.Value
+,
+			AutoExpandReplicas = propAutoExpandReplicas.Value
+,
+			Blocks = propBlocks.Value
+,
+			CheckOnStartup = propCheckOnStartup.Value
+,
+			Codec = propCodec.Value
+,
+			CreationDate = propCreationDate.Value
+,
+			CreationDateString = propCreationDateString.Value
+,
+			DefaultPipeline = propDefaultPipeline.Value
+,
+			FinalPipeline = propFinalPipeline.Value
+,
+			Format = propFormat.Value
+,
+			GcDeletes = propGcDeletes.Value
+,
+			Hidden = propHidden.Value
+,
+			Highlight = propHighlight.Value
+,
+			Index = propIndex.Value
+,
+			IndexingPressure = propIndexingPressure.Value
+,
+			IndexingSlowlog = propIndexingSlowlog.Value
+,
+			Lifecycle = propLifecycle.Value
+,
+			LoadFixedBitsetFiltersEagerly = propLoadFixedBitsetFiltersEagerly.Value
+,
+			Mapping = propMapping.Value
+,
+			MaxDocvalueFieldsSearch = propMaxDocvalueFieldsSearch.Value
+,
+			MaxInnerResultWindow = propMaxInnerResultWindow.Value
+,
+			MaxNgramDiff = propMaxNgramDiff.Value
+,
+			MaxRefreshListeners = propMaxRefreshListeners.Value
+,
+			MaxRegexLength = propMaxRegexLength.Value
+,
+			MaxRescoreWindow = propMaxRescoreWindow.Value
+,
+			MaxResultWindow = propMaxResultWindow.Value
+,
+			MaxScriptFields = propMaxScriptFields.Value
+,
+			MaxShingleDiff = propMaxShingleDiff.Value
+,
+			MaxSlicesPerScroll = propMaxSlicesPerScroll.Value
+,
+			MaxTermsCount = propMaxTermsCount.Value
+,
+			Merge = propMerge.Value
+,
+			Mode = propMode.Value
+,
+			NumberOfReplicas = propNumberOfReplicas.Value
+,
+			NumberOfRoutingShards = propNumberOfRoutingShards.Value
+,
+			NumberOfShards = propNumberOfShards.Value
+,
+			Priority = propPriority.Value
+,
+			ProvidedName = propProvidedName.Value
+,
+			Queries = propQueries.Value
+,
+			QueryString = propQueryString.Value
+,
+			RefreshInterval = propRefreshInterval.Value
+,
+			Routing = propRouting.Value
+,
+			RoutingPartitionSize = propRoutingPartitionSize.Value
+,
+			RoutingPath = propRoutingPath.Value
+,
+			Search = propSearch.Value
+,
+			Settings = propSettings.Value
+,
+			Similarity = propSimilarity.Value
+,
+			SoftDeletes = propSoftDeletes.Value
+,
+			Sort = propSort.Value
+,
+			Store = propStore.Value
+,
+			TimeSeries = propTimeSeries.Value
+,
+			TopMetricsMaxSize = propTopMetricsMaxSize.Value
+,
+			Translog = propTranslog.Value
+,
+			Uuid = propUuid.Value
+,
+			VerifiedBeforeClose = propVerifiedBeforeClose.Value
+,
+			Version = propVersion.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IndexSettings value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAnalysis, value.Analysis);
+		writer.WriteProperty(options, PropAnalyze, value.Analyze);
+		writer.WriteProperty(options, PropAutoExpandReplicas, value.AutoExpandReplicas);
+		writer.WriteProperty(options, PropBlocks, value.Blocks);
+		writer.WriteProperty(options, PropCheckOnStartup, value.CheckOnStartup);
+		writer.WriteProperty(options, PropCodec, value.Codec);
+		writer.WriteProperty(options, PropCreationDate, value.CreationDate);
+		writer.WriteProperty(options, PropCreationDateString, value.CreationDateString);
+		writer.WriteProperty(options, PropDefaultPipeline, value.DefaultPipeline);
+		writer.WriteProperty(options, PropFinalPipeline, value.FinalPipeline);
+		writer.WriteProperty(options, PropFormat, value.Format);
+		writer.WriteProperty(options, PropGcDeletes, value.GcDeletes);
+		writer.WriteProperty(options, PropHidden, value.Hidden);
+		writer.WriteProperty(options, PropHighlight, value.Highlight);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropIndexingPressure, value.IndexingPressure);
+		writer.WriteProperty(options, PropIndexingSlowlog, value.IndexingSlowlog);
+		writer.WriteProperty(options, PropLifecycle, value.Lifecycle);
+		writer.WriteProperty(options, PropLoadFixedBitsetFiltersEagerly, value.LoadFixedBitsetFiltersEagerly);
+		writer.WriteProperty(options, PropMapping, value.Mapping);
+		writer.WriteProperty(options, PropMaxDocvalueFieldsSearch, value.MaxDocvalueFieldsSearch);
+		writer.WriteProperty(options, PropMaxInnerResultWindow, value.MaxInnerResultWindow);
+		writer.WriteProperty(options, PropMaxNgramDiff, value.MaxNgramDiff);
+		writer.WriteProperty(options, PropMaxRefreshListeners, value.MaxRefreshListeners);
+		writer.WriteProperty(options, PropMaxRegexLength, value.MaxRegexLength);
+		writer.WriteProperty(options, PropMaxRescoreWindow, value.MaxRescoreWindow);
+		writer.WriteProperty(options, PropMaxResultWindow, value.MaxResultWindow);
+		writer.WriteProperty(options, PropMaxScriptFields, value.MaxScriptFields);
+		writer.WriteProperty(options, PropMaxShingleDiff, value.MaxShingleDiff);
+		writer.WriteProperty(options, PropMaxSlicesPerScroll, value.MaxSlicesPerScroll);
+		writer.WriteProperty(options, PropMaxTermsCount, value.MaxTermsCount);
+		writer.WriteProperty(options, PropMerge, value.Merge);
+		writer.WriteProperty(options, PropMode, value.Mode);
+		writer.WriteProperty(options, PropNumberOfReplicas, value.NumberOfReplicas);
+		writer.WriteProperty(options, PropNumberOfRoutingShards, value.NumberOfRoutingShards);
+		writer.WriteProperty(options, PropNumberOfShards, value.NumberOfShards);
+		writer.WriteProperty(options, PropPriority, value.Priority);
+		writer.WriteProperty(options, PropProvidedName, value.ProvidedName);
+		writer.WriteProperty(options, PropQueries, value.Queries);
+		writer.WriteProperty(options, PropQueryString, value.QueryString);
+		writer.WriteProperty(options, PropRefreshInterval, value.RefreshInterval);
+		writer.WriteProperty(options, PropRouting, value.Routing);
+		writer.WriteProperty(options, PropRoutingPartitionSize, value.RoutingPartitionSize);
+		writer.WriteProperty(options, PropRoutingPath, value.RoutingPath, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropSearch, value.Search);
+		writer.WriteProperty(options, PropSettings, value.Settings);
+		writer.WriteProperty(options, PropSimilarity, value.Similarity);
+		writer.WriteProperty(options, PropSoftDeletes, value.SoftDeletes);
+		writer.WriteProperty(options, PropSort, value.Sort);
+		writer.WriteProperty(options, PropStore, value.Store);
+		writer.WriteProperty(options, PropTimeSeries, value.TimeSeries);
+		writer.WriteProperty(options, PropTopMetricsMaxSize, value.TopMetricsMaxSize);
+		writer.WriteProperty(options, PropTranslog, value.Translog);
+		writer.WriteProperty(options, PropUuid, value.Uuid);
+		writer.WriteProperty(options, PropVerifiedBeforeClose, value.VerifiedBeforeClose);
+		writer.WriteProperty(options, PropVersion, value.Version);
+		if (value.OtherSettings is not null)
 		{
-			writer.WritePropertyName("version");
-			JsonSerializer.Serialize(writer, value.Version, options);
+			foreach (var item in value.OtherSettings)
+			{
+				writer.WriteProperty(options, item.Key, item.Value);
+			}
 		}
 
 		writer.WriteEndObject();
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexUpdateAliasesAction.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexUpdateAliasesAction.g.cs
index df29e80b76f..f75eb5c56af 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexUpdateAliasesAction.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexUpdateAliasesAction.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -39,12 +40,16 @@ internal IndexUpdateAliasesAction(string variantName, object variant)
 			throw new ArgumentNullException(nameof(variant));
 		if (string.IsNullOrWhiteSpace(variantName))
 			throw new ArgumentException("Variant name must not be empty or whitespace.");
-		VariantName = variantName;
+		VariantType = variantName;
 		Variant = variant;
 	}
 
-	internal object Variant { get; }
-	internal string VariantName { get; }
+	internal IndexUpdateAliasesAction()
+	{
+	}
+
+	public object Variant { get; internal set; }
+	public string VariantType { get; internal set; }
 
 	public static IndexUpdateAliasesAction Add(Elastic.Clients.Elasticsearch.IndexManagement.AddAction addAction) => new IndexUpdateAliasesAction("add", addAction);
 	public static IndexUpdateAliasesAction Remove(Elastic.Clients.Elasticsearch.IndexManagement.RemoveAction removeAction) => new IndexUpdateAliasesAction("remove", removeAction);
@@ -63,77 +68,68 @@ public bool TryGet<T>([NotNullWhen(true)] out T? result) where T : class
 	}
 }
 
-internal sealed partial class IndexUpdateAliasesActionConverter : JsonConverter<IndexUpdateAliasesAction>
+internal sealed partial class IndexUpdateAliasesActionConverter : System.Text.Json.Serialization.JsonConverter<IndexUpdateAliasesAction>
 {
-	public override IndexUpdateAliasesAction Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-		{
-			throw new JsonException("Expected start token.");
-		}
+	private static readonly System.Text.Json.JsonEncodedText VariantAdd = System.Text.Json.JsonEncodedText.Encode("add");
+	private static readonly System.Text.Json.JsonEncodedText VariantRemove = System.Text.Json.JsonEncodedText.Encode("remove");
+	private static readonly System.Text.Json.JsonEncodedText VariantRemoveIndex = System.Text.Json.JsonEncodedText.Encode("remove_index");
 
-		object? variantValue = default;
-		string? variantNameValue = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+	public override IndexUpdateAliasesAction Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		var variantType = string.Empty;
+		object? variant = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
+			if (reader.ValueTextEquals(VariantAdd))
 			{
-				throw new JsonException("Expected a property name token.");
-			}
-
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token representing the name of an Elasticsearch field.");
-			}
-
-			var propertyName = reader.GetString();
-			reader.Read();
-			if (propertyName == "add")
-			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.IndexManagement.AddAction?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantAdd.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.IndexManagement.AddAction?>(options);
 				continue;
 			}
 
-			if (propertyName == "remove")
+			if (reader.ValueTextEquals(VariantRemove))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.IndexManagement.RemoveAction?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantRemove.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.IndexManagement.RemoveAction?>(options);
 				continue;
 			}
 
-			if (propertyName == "remove_index")
+			if (reader.ValueTextEquals(VariantRemoveIndex))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.IndexManagement.RemoveIndexAction?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantRemoveIndex.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.IndexManagement.RemoveIndexAction?>(options);
 				continue;
 			}
 
-			throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'IndexUpdateAliasesAction' from the response.");
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		var result = new IndexUpdateAliasesAction(variantNameValue, variantValue);
-		return result;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new IndexUpdateAliasesAction { VariantType = variantType, Variant = variant };
 	}
 
-	public override void Write(Utf8JsonWriter writer, IndexUpdateAliasesAction value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IndexUpdateAliasesAction value, System.Text.Json.JsonSerializerOptions options)
 	{
 		writer.WriteStartObject();
-		if (value.VariantName is not null && value.Variant is not null)
+		switch (value.VariantType)
 		{
-			writer.WritePropertyName(value.VariantName);
-			switch (value.VariantName)
-			{
-				case "add":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.IndexManagement.AddAction>(writer, (Elastic.Clients.Elasticsearch.IndexManagement.AddAction)value.Variant, options);
-					break;
-				case "remove":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.IndexManagement.RemoveAction>(writer, (Elastic.Clients.Elasticsearch.IndexManagement.RemoveAction)value.Variant, options);
-					break;
-				case "remove_index":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.IndexManagement.RemoveIndexAction>(writer, (Elastic.Clients.Elasticsearch.IndexManagement.RemoveIndexAction)value.Variant, options);
-					break;
-			}
+			case "":
+				break;
+			case "add":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.IndexManagement.AddAction?)value.Variant);
+				break;
+			case "remove":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.IndexManagement.RemoveAction?)value.Variant);
+				break;
+			case "remove_index":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.IndexManagement.RemoveIndexAction?)value.Variant);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.VariantType}' is not supported for type '{nameof(IndexUpdateAliasesAction)}'.");
 		}
 
 		writer.WriteEndObject();
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 fc2de9dd136..dece8311fd7 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/RemoveAction.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/RemoveAction.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,80 @@
 
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
 
+internal sealed partial class RemoveActionConverter : System.Text.Json.Serialization.JsonConverter<RemoveAction>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAlias = System.Text.Json.JsonEncodedText.Encode("alias");
+	private static readonly System.Text.Json.JsonEncodedText PropAliases = System.Text.Json.JsonEncodedText.Encode("aliases");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropIndices = System.Text.Json.JsonEncodedText.Encode("indices");
+	private static readonly System.Text.Json.JsonEncodedText PropMustExist = System.Text.Json.JsonEncodedText.Encode("must_exist");
+
+	public override RemoveAction Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.IndexAlias?> propAlias = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.IndexAlias>?> propAliases = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.IndexName?> propIndex = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Indices?> propIndices = default;
+		LocalJsonProperty<bool?> propMustExist = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAlias.TryRead(ref reader, options, PropAlias))
+			{
+				continue;
+			}
+
+			if (propAliases.TryRead(ref reader, options, PropAliases, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.IndexAlias>?, Elastic.Clients.Elasticsearch.IndexAlias>)))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propIndices.TryRead(ref reader, options, PropIndices))
+			{
+				continue;
+			}
+
+			if (propMustExist.TryRead(ref reader, options, PropMustExist))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new RemoveAction
+		{
+			Alias = propAlias.Value
+,
+			Aliases = propAliases.Value
+,
+			Index = propIndex.Value
+,
+			Indices = propIndices.Value
+,
+			MustExist = propMustExist.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, RemoveAction value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAlias, value.Alias);
+		writer.WriteProperty(options, PropAliases, value.Aliases, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.IndexAlias>?, Elastic.Clients.Elasticsearch.IndexAlias>));
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropIndices, value.Indices);
+		writer.WriteProperty(options, PropMustExist, value.MustExist);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(RemoveActionConverter))]
 public sealed partial class RemoveAction
 {
 	/// <summary>
@@ -35,7 +110,6 @@ public sealed partial class RemoveAction
 	/// Index alias names support date math.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("alias")]
 	public Elastic.Clients.Elasticsearch.IndexAlias? Alias { get; set; }
 
 	/// <summary>
@@ -44,8 +118,6 @@ public sealed partial class RemoveAction
 	/// Index alias names support date math.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("aliases")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.IndexAlias))]
 	public ICollection<Elastic.Clients.Elasticsearch.IndexAlias>? Aliases { get; set; }
 
 	/// <summary>
@@ -54,7 +126,6 @@ public sealed partial class RemoveAction
 	/// Supports wildcards (<c>*</c>).
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("index")]
 	public Elastic.Clients.Elasticsearch.IndexName? Index { get; set; }
 
 	/// <summary>
@@ -63,7 +134,6 @@ public sealed partial class RemoveAction
 	/// Supports wildcards (<c>*</c>).
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("indices")]
 	public Elastic.Clients.Elasticsearch.Indices? Indices { get; set; }
 
 	/// <summary>
@@ -71,7 +141,6 @@ public sealed partial class RemoveAction
 	/// If <c>true</c>, the alias must exist to perform the action.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("must_exist")]
 	public bool? MustExist { get; set; }
 
 	public static implicit operator Elastic.Clients.Elasticsearch.IndexManagement.IndexUpdateAliasesAction(RemoveAction removeAction) => Elastic.Clients.Elasticsearch.IndexManagement.IndexUpdateAliasesAction.Remove(removeAction);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/ResolveIndexAliasItem.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/ResolveIndexAliasItem.g.cs
index fee1e4ee883..64874407a80 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/ResolveIndexAliasItem.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/ResolveIndexAliasItem.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,11 +28,52 @@
 
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
 
+internal sealed partial class ResolveIndexAliasItemConverter : System.Text.Json.Serialization.JsonConverter<ResolveIndexAliasItem>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropIndices = System.Text.Json.JsonEncodedText.Encode("indices");
+	private static readonly System.Text.Json.JsonEncodedText PropName = System.Text.Json.JsonEncodedText.Encode("name");
+
+	public override ResolveIndexAliasItem Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<string>> propIndices = default;
+		LocalJsonProperty<string> propName = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propIndices.TryRead(ref reader, options, PropIndices, typeof(SingleOrManyMarker<IReadOnlyCollection<string>, string>)))
+			{
+				continue;
+			}
+
+			if (propName.TryRead(ref reader, options, PropName))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ResolveIndexAliasItem
+		{
+			Indices = propIndices.Value
+,
+			Name = propName.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ResolveIndexAliasItem value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropIndices, value.Indices, typeof(SingleOrManyMarker<IReadOnlyCollection<string>, string>));
+		writer.WriteProperty(options, PropName, value.Name);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ResolveIndexAliasItemConverter))]
 public sealed partial class ResolveIndexAliasItem
 {
-	[JsonInclude, JsonPropertyName("indices")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public IReadOnlyCollection<string> Indices { 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/ResolveIndexDataStreamsItem.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/ResolveIndexDataStreamsItem.g.cs
index bde3f17ffea..ae4c4de052f 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/ResolveIndexDataStreamsItem.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/ResolveIndexDataStreamsItem.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,13 +28,63 @@
 
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
 
+internal sealed partial class ResolveIndexDataStreamsItemConverter : System.Text.Json.Serialization.JsonConverter<ResolveIndexDataStreamsItem>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropBackingIndices = System.Text.Json.JsonEncodedText.Encode("backing_indices");
+	private static readonly System.Text.Json.JsonEncodedText PropName = System.Text.Json.JsonEncodedText.Encode("name");
+	private static readonly System.Text.Json.JsonEncodedText PropTimestampField = System.Text.Json.JsonEncodedText.Encode("timestamp_field");
+
+	public override ResolveIndexDataStreamsItem Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<string>> propBackingIndices = default;
+		LocalJsonProperty<string> propName = default;
+		LocalJsonProperty<string> propTimestampField = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBackingIndices.TryRead(ref reader, options, PropBackingIndices, typeof(SingleOrManyMarker<IReadOnlyCollection<string>, string>)))
+			{
+				continue;
+			}
+
+			if (propName.TryRead(ref reader, options, PropName))
+			{
+				continue;
+			}
+
+			if (propTimestampField.TryRead(ref reader, options, PropTimestampField))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ResolveIndexDataStreamsItem
+		{
+			BackingIndices = propBackingIndices.Value
+,
+			Name = propName.Value
+,
+			TimestampField = propTimestampField.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ResolveIndexDataStreamsItem value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBackingIndices, value.BackingIndices, typeof(SingleOrManyMarker<IReadOnlyCollection<string>, string>));
+		writer.WriteProperty(options, PropName, value.Name);
+		writer.WriteProperty(options, PropTimestampField, value.TimestampField);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ResolveIndexDataStreamsItemConverter))]
 public sealed partial class ResolveIndexDataStreamsItem
 {
-	[JsonInclude, JsonPropertyName("backing_indices")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public IReadOnlyCollection<string> BackingIndices { get; init; }
-	[JsonInclude, JsonPropertyName("name")]
 	public string Name { get; init; }
-	[JsonInclude, JsonPropertyName("timestamp_field")]
 	public string TimestampField { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/SettingsSimilarities.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/SettingsSimilarities.g.cs
index 49db5a56af3..13a5f3504fa 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/SettingsSimilarities.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/SettingsSimilarities.g.cs
@@ -19,6 +19,7 @@
 
 using Elastic.Clients.Elasticsearch.Core;
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport;
 using System;
@@ -92,80 +93,70 @@ public SettingsSimilaritiesDescriptor() : base(new SettingsSimilarities())
 	public SettingsSimilaritiesDescriptor Scripted(string settingsSimilarityName, SettingsSimilarityScripted settingsSimilarityScripted) => AssignVariant(settingsSimilarityName, settingsSimilarityScripted);
 }
 
-internal sealed partial class SettingsSimilarityInterfaceConverter : JsonConverter<ISettingsSimilarity>
+internal sealed partial class SettingsSimilarityInterfaceConverter : System.Text.Json.Serialization.JsonConverter<ISettingsSimilarity>
 {
-	public override ISettingsSimilarity Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropDiscriminator = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override ISettingsSimilarity Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var copiedReader = reader;
-		string? type = null;
-		using var jsonDoc = JsonDocument.ParseValue(ref copiedReader);
-		if (jsonDoc is not null && jsonDoc.RootElement.TryGetProperty("type", out var readType) && readType.ValueKind == JsonValueKind.String)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		var readerSnapshot = reader;
+		string? discriminator = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			type = readType.ToString();
+			if (reader.TryReadProperty(options, PropDiscriminator, ref discriminator))
+			{
+				break;
+			}
+
+			reader.Skip();
 		}
 
-		switch (type)
+		reader = readerSnapshot;
+		return discriminator switch
 		{
-			case "BM25":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.IndexManagement.SettingsSimilarityBm25>(ref reader, options);
-			case "boolean":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.IndexManagement.SettingsSimilarityBoolean>(ref reader, options);
-			case "DFI":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.IndexManagement.SettingsSimilarityDfi>(ref reader, options);
-			case "DFR":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.IndexManagement.SettingsSimilarityDfr>(ref reader, options);
-			case "IB":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.IndexManagement.SettingsSimilarityIb>(ref reader, options);
-			case "LMDirichlet":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.IndexManagement.SettingsSimilarityLmd>(ref reader, options);
-			case "LMJelinekMercer":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.IndexManagement.SettingsSimilarityLmj>(ref reader, options);
-			case "scripted":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.IndexManagement.SettingsSimilarityScripted>(ref reader, options);
-			default:
-				ThrowHelper.ThrowUnknownTaggedUnionVariantJsonException(type, typeof(ISettingsSimilarity));
-				return null;
-		}
+			"BM25" => reader.ReadValue<Elastic.Clients.Elasticsearch.IndexManagement.SettingsSimilarityBm25>(options),
+			"boolean" => reader.ReadValue<Elastic.Clients.Elasticsearch.IndexManagement.SettingsSimilarityBoolean>(options),
+			"DFI" => reader.ReadValue<Elastic.Clients.Elasticsearch.IndexManagement.SettingsSimilarityDfi>(options),
+			"DFR" => reader.ReadValue<Elastic.Clients.Elasticsearch.IndexManagement.SettingsSimilarityDfr>(options),
+			"IB" => reader.ReadValue<Elastic.Clients.Elasticsearch.IndexManagement.SettingsSimilarityIb>(options),
+			"LMDirichlet" => reader.ReadValue<Elastic.Clients.Elasticsearch.IndexManagement.SettingsSimilarityLmd>(options),
+			"LMJelinekMercer" => reader.ReadValue<Elastic.Clients.Elasticsearch.IndexManagement.SettingsSimilarityLmj>(options),
+			"scripted" => reader.ReadValue<Elastic.Clients.Elasticsearch.IndexManagement.SettingsSimilarityScripted>(options),
+			_ => throw new System.Text.Json.JsonException($"Variant '{discriminator}' is not supported for type '{nameof(ISettingsSimilarity)}'.")
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, ISettingsSimilarity value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ISettingsSimilarity value, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (value is null)
-		{
-			writer.WriteNullValue();
-			return;
-		}
-
 		switch (value.Type)
 		{
 			case "BM25":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.IndexManagement.SettingsSimilarityBm25), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.IndexManagement.SettingsSimilarityBm25)value);
+				break;
 			case "boolean":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.IndexManagement.SettingsSimilarityBoolean), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.IndexManagement.SettingsSimilarityBoolean)value);
+				break;
 			case "DFI":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.IndexManagement.SettingsSimilarityDfi), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.IndexManagement.SettingsSimilarityDfi)value);
+				break;
 			case "DFR":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.IndexManagement.SettingsSimilarityDfr), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.IndexManagement.SettingsSimilarityDfr)value);
+				break;
 			case "IB":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.IndexManagement.SettingsSimilarityIb), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.IndexManagement.SettingsSimilarityIb)value);
+				break;
 			case "LMDirichlet":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.IndexManagement.SettingsSimilarityLmd), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.IndexManagement.SettingsSimilarityLmd)value);
+				break;
 			case "LMJelinekMercer":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.IndexManagement.SettingsSimilarityLmj), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.IndexManagement.SettingsSimilarityLmj)value);
+				break;
 			case "scripted":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.IndexManagement.SettingsSimilarityScripted), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.IndexManagement.SettingsSimilarityScripted)value);
+				break;
 			default:
-				var type = value.GetType();
-				JsonSerializer.Serialize(writer, value, type, options);
-				return;
+				throw new System.Text.Json.JsonException($"Variant '{value.Type}' is not supported for type '{nameof(ISettingsSimilarity)}'.");
 		}
 	}
 }
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 76c31252cf3..445425e2872 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/ShardStats.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/ShardStats.g.cs
@@ -72,7 +72,6 @@ public sealed partial class ShardStats
 	[JsonInclude, JsonPropertyName("shard_path")]
 	public Elastic.Clients.Elasticsearch.IndexManagement.ShardPath? ShardPath { get; init; }
 	[JsonInclude, JsonPropertyName("shards")]
-	[ReadOnlyIndexNameDictionaryConverter(typeof(object))]
 	public IReadOnlyDictionary<Elastic.Clients.Elasticsearch.IndexName, object>? Shards { get; init; }
 	[JsonInclude, JsonPropertyName("shard_stats")]
 	public Elastic.Clients.Elasticsearch.IndexManagement.ShardsTotalStats? ShardStats2 { get; init; }
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/ShardStore.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/ShardStore.g.cs
index 45555b85e60..bb70a86346e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/ShardStore.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/ShardStore.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,52 +28,66 @@
 
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
 
-internal sealed partial class ShardStoreConverter : JsonConverter<ShardStore>
+internal sealed partial class ShardStoreConverter : System.Text.Json.Serialization.JsonConverter<ShardStore>
 {
-	public override ShardStore Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropNode = System.Text.Json.JsonEncodedText.Encode("node");
+	private static readonly System.Text.Json.JsonEncodedText PropNodeId = System.Text.Json.JsonEncodedText.Encode("node_id");
+	private static readonly System.Text.Json.JsonEncodedText PropAllocation = System.Text.Json.JsonEncodedText.Encode("allocation");
+	private static readonly System.Text.Json.JsonEncodedText PropAllocationId = System.Text.Json.JsonEncodedText.Encode("allocation_id");
+	private static readonly System.Text.Json.JsonEncodedText PropStoreException = System.Text.Json.JsonEncodedText.Encode("store_exception");
+
+	public override ShardStore Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		Elastic.Clients.Elasticsearch.IndexManagement.ShardStoreAllocation allocation = default;
-		string? allocationId = default;
-		Elastic.Clients.Elasticsearch.IndexManagement.ShardStoreException? storeException = default;
-		string nodeId = default;
-		Elastic.Clients.Elasticsearch.IndexManagement.ShardStoreNode node = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.IndexManagement.ShardStoreNode> propNode = default;
+		LocalJsonProperty<string> propNodeId = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.IndexManagement.ShardStoreAllocation> propAllocation = default;
+		LocalJsonProperty<string?> propAllocationId = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.IndexManagement.ShardStoreException?> propStoreException = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propAllocation.TryRead(ref reader, options, PropAllocation))
 			{
-				var property = reader.GetString();
-				if (property == "allocation")
-				{
-					allocation = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.IndexManagement.ShardStoreAllocation>(ref reader, options);
-					continue;
-				}
-
-				if (property == "allocation_id")
-				{
-					allocationId = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
+				continue;
+			}
 
-				if (property == "store_exception")
-				{
-					storeException = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.IndexManagement.ShardStoreException?>(ref reader, options);
-					continue;
-				}
+			if (propAllocationId.TryRead(ref reader, options, PropAllocationId))
+			{
+				continue;
+			}
 
-				nodeId = property;
-				reader.Read();
-				node = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.IndexManagement.ShardStoreNode>(ref reader, options);
+			if (propStoreException.TryRead(ref reader, options, PropStoreException))
+			{
+				continue;
 			}
+
+			propNodeId.Initialized = propNode.Initialized = true;
+			reader.ReadProperty(options, out propNodeId.Value, out propNode.Value);
 		}
 
-		return new ShardStore { Allocation = allocation, AllocationId = allocationId, Node = node, NodeId = nodeId, StoreException = storeException };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ShardStore
+		{
+			Node = propNode.Value
+,
+			NodeId = propNodeId.Value
+,
+			Allocation = propAllocation.Value
+,
+			AllocationId = propAllocationId.Value
+,
+			StoreException = propStoreException.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, ShardStore value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ShardStore value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'ShardStore' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAllocation, value.Allocation);
+		writer.WriteProperty(options, PropAllocationId, value.AllocationId);
+		writer.WriteProperty(options, PropStoreException, value.StoreException);
+		writer.WriteProperty(options, value.NodeId, value.Node);
+		writer.WriteEndObject();
 	}
 }
 
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 fbbf7a1f103..98603afb8a8 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/Template.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/Template.g.cs
@@ -30,7 +30,6 @@ 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; }
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 a64d9721337..c636d280745 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/TemplateMapping.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/TemplateMapping.g.cs
@@ -30,7 +30,6 @@ 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<string> IndexPatterns { get; init; }
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 c21918185ba..4f835d9ac41 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/TypeFieldMappings.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/TypeFieldMappings.g.cs
@@ -30,6 +30,5 @@ namespace Elastic.Clients.Elasticsearch.IndexManagement;
 public sealed partial class TypeFieldMappings
 {
 	[JsonInclude, JsonPropertyName("mappings")]
-	[ReadOnlyFieldDictionaryConverter(typeof(Elastic.Clients.Elasticsearch.Mapping.FieldMapping))]
 	public IReadOnlyDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.FieldMapping> Mappings { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndicesOptions.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndicesOptions.g.cs
index 39dafca28b2..bded451e973 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndicesOptions.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndicesOptions.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,12 +28,76 @@
 
 namespace Elastic.Clients.Elasticsearch;
 
+internal sealed partial class IndicesOptionsConverter : System.Text.Json.Serialization.JsonConverter<IndicesOptions>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAllowNoIndices = System.Text.Json.JsonEncodedText.Encode("allow_no_indices");
+	private static readonly System.Text.Json.JsonEncodedText PropExpandWildcards = System.Text.Json.JsonEncodedText.Encode("expand_wildcards");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreThrottled = System.Text.Json.JsonEncodedText.Encode("ignore_throttled");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreUnavailable = System.Text.Json.JsonEncodedText.Encode("ignore_unavailable");
+
+	public override IndicesOptions Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool?> propAllowNoIndices = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>?> propExpandWildcards = default;
+		LocalJsonProperty<bool?> propIgnoreThrottled = default;
+		LocalJsonProperty<bool?> propIgnoreUnavailable = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAllowNoIndices.TryRead(ref reader, options, PropAllowNoIndices))
+			{
+				continue;
+			}
+
+			if (propExpandWildcards.TryRead(ref reader, options, PropExpandWildcards, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.ExpandWildcard>?, Elastic.Clients.Elasticsearch.ExpandWildcard>)))
+			{
+				continue;
+			}
+
+			if (propIgnoreThrottled.TryRead(ref reader, options, PropIgnoreThrottled))
+			{
+				continue;
+			}
+
+			if (propIgnoreUnavailable.TryRead(ref reader, options, PropIgnoreUnavailable))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new IndicesOptions
+		{
+			AllowNoIndices = propAllowNoIndices.Value
+,
+			ExpandWildcards = propExpandWildcards.Value
+,
+			IgnoreThrottled = propIgnoreThrottled.Value
+,
+			IgnoreUnavailable = propIgnoreUnavailable.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IndicesOptions value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAllowNoIndices, value.AllowNoIndices);
+		writer.WriteProperty(options, PropExpandWildcards, value.ExpandWildcards, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.ExpandWildcard>?, Elastic.Clients.Elasticsearch.ExpandWildcard>));
+		writer.WriteProperty(options, PropIgnoreThrottled, value.IgnoreThrottled);
+		writer.WriteProperty(options, PropIgnoreUnavailable, value.IgnoreUnavailable);
+		writer.WriteEndObject();
+	}
+}
+
 /// <summary>
 /// <para>
 /// Controls how to deal with unavailable concrete indices (closed or missing), how wildcard expressions are expanded
 /// to actual indices (all, closed or open indices) and how to deal with wildcard expressions that resolve to no indices.
 /// </para>
 /// </summary>
+[JsonConverter(typeof(IndicesOptionsConverter))]
 public sealed partial class IndicesOptions
 {
 	/// <summary>
@@ -42,7 +107,6 @@ public sealed partial class IndicesOptions
 	/// a request targeting <c>foo*,bar*</c> returns an error if an index starts with <c>foo</c> but no index starts with <c>bar</c>.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("allow_no_indices")]
 	public bool? AllowNoIndices { get; set; }
 
 	/// <summary>
@@ -52,8 +116,6 @@ public sealed partial class IndicesOptions
 	/// such as <c>open,hidden</c>.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("expand_wildcards")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.ExpandWildcard))]
 	public ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? ExpandWildcards { get; set; }
 
 	/// <summary>
@@ -61,7 +123,6 @@ public sealed partial class IndicesOptions
 	/// If true, concrete, expanded or aliased indices are ignored when frozen.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("ignore_throttled")]
 	public bool? IgnoreThrottled { get; set; }
 
 	/// <summary>
@@ -69,7 +130,6 @@ public sealed partial class IndicesOptions
 	/// If true, missing or closed indices are not included in the response.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("ignore_unavailable")]
 	public bool? IgnoreUnavailable { get; set; }
 }
 
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 b609af8460c..766060c4614 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/AppendProcessor.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/AppendProcessor.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,110 @@
 
 namespace Elastic.Clients.Elasticsearch.Ingest;
 
+internal sealed partial class AppendProcessorConverter : System.Text.Json.Serialization.JsonConverter<AppendProcessor>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAllowDuplicates = System.Text.Json.JsonEncodedText.Encode("allow_duplicates");
+	private static readonly System.Text.Json.JsonEncodedText PropDescription = System.Text.Json.JsonEncodedText.Encode("description");
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropIf = System.Text.Json.JsonEncodedText.Encode("if");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreFailure = System.Text.Json.JsonEncodedText.Encode("ignore_failure");
+	private static readonly System.Text.Json.JsonEncodedText PropOnFailure = System.Text.Json.JsonEncodedText.Encode("on_failure");
+	private static readonly System.Text.Json.JsonEncodedText PropTag = System.Text.Json.JsonEncodedText.Encode("tag");
+	private static readonly System.Text.Json.JsonEncodedText PropValue = System.Text.Json.JsonEncodedText.Encode("value");
+
+	public override AppendProcessor Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool?> propAllowDuplicates = default;
+		LocalJsonProperty<string?> propDescription = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Field> propField = default;
+		LocalJsonProperty<string?> propIf = default;
+		LocalJsonProperty<bool?> propIgnoreFailure = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>?> propOnFailure = default;
+		LocalJsonProperty<string?> propTag = default;
+		LocalJsonProperty<ICollection<object>> propValue = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAllowDuplicates.TryRead(ref reader, options, PropAllowDuplicates))
+			{
+				continue;
+			}
+
+			if (propDescription.TryRead(ref reader, options, PropDescription))
+			{
+				continue;
+			}
+
+			if (propField.TryRead(ref reader, options, PropField))
+			{
+				continue;
+			}
+
+			if (propIf.TryRead(ref reader, options, PropIf))
+			{
+				continue;
+			}
+
+			if (propIgnoreFailure.TryRead(ref reader, options, PropIgnoreFailure))
+			{
+				continue;
+			}
+
+			if (propOnFailure.TryRead(ref reader, options, PropOnFailure))
+			{
+				continue;
+			}
+
+			if (propTag.TryRead(ref reader, options, PropTag))
+			{
+				continue;
+			}
+
+			if (propValue.TryRead(ref reader, options, PropValue, typeof(SingleOrManyMarker<IReadOnlyCollection<object>, object>)))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new AppendProcessor
+		{
+			AllowDuplicates = propAllowDuplicates.Value
+,
+			Description = propDescription.Value
+,
+			Field = propField.Value
+,
+			If = propIf.Value
+,
+			IgnoreFailure = propIgnoreFailure.Value
+,
+			OnFailure = propOnFailure.Value
+,
+			Tag = propTag.Value
+,
+			Value = propValue.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, AppendProcessor value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAllowDuplicates, value.AllowDuplicates);
+		writer.WriteProperty(options, PropDescription, value.Description);
+		writer.WriteProperty(options, PropField, value.Field);
+		writer.WriteProperty(options, PropIf, value.If);
+		writer.WriteProperty(options, PropIgnoreFailure, value.IgnoreFailure);
+		writer.WriteProperty(options, PropOnFailure, value.OnFailure);
+		writer.WriteProperty(options, PropTag, value.Tag);
+		writer.WriteProperty(options, PropValue, value.Value, typeof(SingleOrManyMarker<IReadOnlyCollection<object>, object>));
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(AppendProcessorConverter))]
 public sealed partial class AppendProcessor
 {
 	/// <summary>
@@ -34,7 +139,6 @@ public sealed partial class AppendProcessor
 	/// If <c>false</c>, the processor does not append values already present in the field.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("allow_duplicates")]
 	public bool? AllowDuplicates { get; set; }
 
 	/// <summary>
@@ -43,7 +147,6 @@ public sealed partial class AppendProcessor
 	/// Useful for describing the purpose of the processor or its configuration.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("description")]
 	public string? Description { get; set; }
 
 	/// <summary>
@@ -52,7 +155,6 @@ public sealed partial class AppendProcessor
 	/// Supports template snippets.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("field")]
 	public Elastic.Clients.Elasticsearch.Field Field { get; set; }
 
 	/// <summary>
@@ -60,7 +162,6 @@ public sealed partial class AppendProcessor
 	/// Conditionally execute the processor.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("if")]
 	public string? If { get; set; }
 
 	/// <summary>
@@ -68,7 +169,6 @@ public sealed partial class AppendProcessor
 	/// Ignore failures for the processor.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("ignore_failure")]
 	public bool? IgnoreFailure { get; set; }
 
 	/// <summary>
@@ -76,7 +176,6 @@ public sealed partial class AppendProcessor
 	/// Handle failures for the processor.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("on_failure")]
 	public ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailure { get; set; }
 
 	/// <summary>
@@ -85,7 +184,6 @@ public sealed partial class AppendProcessor
 	/// Useful for debugging and metrics.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("tag")]
 	public string? Tag { get; set; }
 
 	/// <summary>
@@ -93,8 +191,6 @@ public sealed partial class AppendProcessor
 	/// The value to be appended. Supports template snippets.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("value")]
-	[SingleOrManyCollectionConverter(typeof(object))]
 	public ICollection<object> Value { get; set; }
 
 	public static implicit operator Elastic.Clients.Elasticsearch.Ingest.Processor(AppendProcessor appendProcessor) => Elastic.Clients.Elasticsearch.Ingest.Processor.Append(appendProcessor);
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 a5d99c2209f..ae1a2b32715 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/CsvProcessor.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/CsvProcessor.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,150 @@
 
 namespace Elastic.Clients.Elasticsearch.Ingest;
 
+internal sealed partial class CsvProcessorConverter : System.Text.Json.Serialization.JsonConverter<CsvProcessor>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropDescription = System.Text.Json.JsonEncodedText.Encode("description");
+	private static readonly System.Text.Json.JsonEncodedText PropEmptyValue = System.Text.Json.JsonEncodedText.Encode("empty_value");
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropIf = System.Text.Json.JsonEncodedText.Encode("if");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreFailure = System.Text.Json.JsonEncodedText.Encode("ignore_failure");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreMissing = System.Text.Json.JsonEncodedText.Encode("ignore_missing");
+	private static readonly System.Text.Json.JsonEncodedText PropOnFailure = System.Text.Json.JsonEncodedText.Encode("on_failure");
+	private static readonly System.Text.Json.JsonEncodedText PropQuote = System.Text.Json.JsonEncodedText.Encode("quote");
+	private static readonly System.Text.Json.JsonEncodedText PropSeparator = System.Text.Json.JsonEncodedText.Encode("separator");
+	private static readonly System.Text.Json.JsonEncodedText PropTag = System.Text.Json.JsonEncodedText.Encode("tag");
+	private static readonly System.Text.Json.JsonEncodedText PropTargetFields = System.Text.Json.JsonEncodedText.Encode("target_fields");
+	private static readonly System.Text.Json.JsonEncodedText PropTrim = System.Text.Json.JsonEncodedText.Encode("trim");
+
+	public override CsvProcessor Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string?> propDescription = default;
+		LocalJsonProperty<object?> propEmptyValue = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Field> propField = default;
+		LocalJsonProperty<string?> propIf = default;
+		LocalJsonProperty<bool?> propIgnoreFailure = default;
+		LocalJsonProperty<bool?> propIgnoreMissing = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>?> propOnFailure = default;
+		LocalJsonProperty<string?> propQuote = default;
+		LocalJsonProperty<string?> propSeparator = default;
+		LocalJsonProperty<string?> propTag = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Fields> propTargetFields = default;
+		LocalJsonProperty<bool?> propTrim = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propDescription.TryRead(ref reader, options, PropDescription))
+			{
+				continue;
+			}
+
+			if (propEmptyValue.TryRead(ref reader, options, PropEmptyValue))
+			{
+				continue;
+			}
+
+			if (propField.TryRead(ref reader, options, PropField))
+			{
+				continue;
+			}
+
+			if (propIf.TryRead(ref reader, options, PropIf))
+			{
+				continue;
+			}
+
+			if (propIgnoreFailure.TryRead(ref reader, options, PropIgnoreFailure))
+			{
+				continue;
+			}
+
+			if (propIgnoreMissing.TryRead(ref reader, options, PropIgnoreMissing))
+			{
+				continue;
+			}
+
+			if (propOnFailure.TryRead(ref reader, options, PropOnFailure))
+			{
+				continue;
+			}
+
+			if (propQuote.TryRead(ref reader, options, PropQuote))
+			{
+				continue;
+			}
+
+			if (propSeparator.TryRead(ref reader, options, PropSeparator))
+			{
+				continue;
+			}
+
+			if (propTag.TryRead(ref reader, options, PropTag))
+			{
+				continue;
+			}
+
+			if (propTargetFields.TryRead(ref reader, options, PropTargetFields, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propTrim.TryRead(ref reader, options, PropTrim))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new CsvProcessor
+		{
+			Description = propDescription.Value
+,
+			EmptyValue = propEmptyValue.Value
+,
+			Field = propField.Value
+,
+			If = propIf.Value
+,
+			IgnoreFailure = propIgnoreFailure.Value
+,
+			IgnoreMissing = propIgnoreMissing.Value
+,
+			OnFailure = propOnFailure.Value
+,
+			Quote = propQuote.Value
+,
+			Separator = propSeparator.Value
+,
+			Tag = propTag.Value
+,
+			TargetFields = propTargetFields.Value
+,
+			Trim = propTrim.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, CsvProcessor value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDescription, value.Description);
+		writer.WriteProperty(options, PropEmptyValue, value.EmptyValue);
+		writer.WriteProperty(options, PropField, value.Field);
+		writer.WriteProperty(options, PropIf, value.If);
+		writer.WriteProperty(options, PropIgnoreFailure, value.IgnoreFailure);
+		writer.WriteProperty(options, PropIgnoreMissing, value.IgnoreMissing);
+		writer.WriteProperty(options, PropOnFailure, value.OnFailure);
+		writer.WriteProperty(options, PropQuote, value.Quote);
+		writer.WriteProperty(options, PropSeparator, value.Separator);
+		writer.WriteProperty(options, PropTag, value.Tag);
+		writer.WriteProperty(options, PropTargetFields, value.TargetFields, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropTrim, value.Trim);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(CsvProcessorConverter))]
 public sealed partial class CsvProcessor
 {
 	/// <summary>
@@ -35,7 +180,6 @@ public sealed partial class CsvProcessor
 	/// Useful for describing the purpose of the processor or its configuration.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("description")]
 	public string? Description { get; set; }
 
 	/// <summary>
@@ -45,7 +189,6 @@ public sealed partial class CsvProcessor
 	/// An empty field is one with no value (2 consecutive separators) or empty quotes (<c>""</c>).
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("empty_value")]
 	public object? EmptyValue { get; set; }
 
 	/// <summary>
@@ -53,7 +196,6 @@ public sealed partial class CsvProcessor
 	/// The field to extract data from.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("field")]
 	public Elastic.Clients.Elasticsearch.Field Field { get; set; }
 
 	/// <summary>
@@ -61,7 +203,6 @@ public sealed partial class CsvProcessor
 	/// Conditionally execute the processor.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("if")]
 	public string? If { get; set; }
 
 	/// <summary>
@@ -69,7 +210,6 @@ public sealed partial class CsvProcessor
 	/// Ignore failures for the processor.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("ignore_failure")]
 	public bool? IgnoreFailure { get; set; }
 
 	/// <summary>
@@ -77,7 +217,6 @@ public sealed partial class CsvProcessor
 	/// If <c>true</c> and <c>field</c> does not exist, the processor quietly exits without modifying the document.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("ignore_missing")]
 	public bool? IgnoreMissing { get; set; }
 
 	/// <summary>
@@ -85,7 +224,6 @@ public sealed partial class CsvProcessor
 	/// Handle failures for the processor.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("on_failure")]
 	public ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailure { get; set; }
 
 	/// <summary>
@@ -93,7 +231,6 @@ public sealed partial class CsvProcessor
 	/// Quote used in CSV, has to be single character string.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("quote")]
 	public string? Quote { get; set; }
 
 	/// <summary>
@@ -101,7 +238,6 @@ public sealed partial class CsvProcessor
 	/// Separator used in CSV, has to be single character string.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("separator")]
 	public string? Separator { get; set; }
 
 	/// <summary>
@@ -110,7 +246,6 @@ public sealed partial class CsvProcessor
 	/// Useful for debugging and metrics.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("tag")]
 	public string? Tag { get; set; }
 
 	/// <summary>
@@ -118,8 +253,6 @@ public sealed partial class CsvProcessor
 	/// The array of fields to assign extracted values to.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("target_fields")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Fields TargetFields { get; set; }
 
 	/// <summary>
@@ -127,7 +260,6 @@ public sealed partial class CsvProcessor
 	/// Trim whitespaces in unquoted fields.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("trim")]
 	public bool? Trim { get; set; }
 
 	public static implicit operator Elastic.Clients.Elasticsearch.Ingest.Processor(CsvProcessor csvProcessor) => Elastic.Clients.Elasticsearch.Ingest.Processor.Csv(csvProcessor);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/DatabaseConfiguration.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/DatabaseConfiguration.g.cs
index 0ee2cf7640a..be9436e71ff 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/DatabaseConfiguration.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/DatabaseConfiguration.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -46,12 +47,16 @@ internal DatabaseConfiguration(string variantName, object variant)
 			throw new ArgumentNullException(nameof(variant));
 		if (string.IsNullOrWhiteSpace(variantName))
 			throw new ArgumentException("Variant name must not be empty or whitespace.");
-		VariantName = variantName;
+		VariantType = variantName;
 		Variant = variant;
 	}
 
-	internal object Variant { get; }
-	internal string VariantName { get; }
+	internal DatabaseConfiguration()
+	{
+	}
+
+	public object Variant { get; internal set; }
+	public string VariantType { get; internal set; }
 
 	public static DatabaseConfiguration Ipinfo(Elastic.Clients.Elasticsearch.Ingest.Ipinfo ipinfo) => new DatabaseConfiguration("ipinfo", ipinfo);
 	public static DatabaseConfiguration Maxmind(Elastic.Clients.Elasticsearch.Ingest.Maxmind maxmind) => new DatabaseConfiguration("maxmind", maxmind);
@@ -77,83 +82,71 @@ public bool TryGet<T>([NotNullWhen(true)] out T? result) where T : class
 	}
 }
 
-internal sealed partial class DatabaseConfigurationConverter : JsonConverter<DatabaseConfiguration>
+internal sealed partial class DatabaseConfigurationConverter : System.Text.Json.Serialization.JsonConverter<DatabaseConfiguration>
 {
-	public override DatabaseConfiguration Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-		{
-			throw new JsonException("Expected start token.");
-		}
+	private static readonly System.Text.Json.JsonEncodedText PropName = System.Text.Json.JsonEncodedText.Encode("name");
+	private static readonly System.Text.Json.JsonEncodedText VariantIpinfo = System.Text.Json.JsonEncodedText.Encode("ipinfo");
+	private static readonly System.Text.Json.JsonEncodedText VariantMaxmind = System.Text.Json.JsonEncodedText.Encode("maxmind");
 
-		object? variantValue = default;
-		string? variantNameValue = default;
-		Elastic.Clients.Elasticsearch.Name nameValue = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+	public override DatabaseConfiguration Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Name> propName = default;
+		var variantType = string.Empty;
+		object? variant = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token.");
-			}
-
-			if (reader.TokenType != JsonTokenType.PropertyName)
+			if (propName.TryRead(ref reader, options, PropName))
 			{
-				throw new JsonException("Expected a property name token representing the name of an Elasticsearch field.");
-			}
-
-			var propertyName = reader.GetString();
-			reader.Read();
-			if (propertyName == "name")
-			{
-				nameValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Name>(ref reader, options);
 				continue;
 			}
 
-			if (propertyName == "ipinfo")
+			if (reader.ValueTextEquals(VariantIpinfo))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Ingest.Ipinfo?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantIpinfo.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Ingest.Ipinfo?>(options);
 				continue;
 			}
 
-			if (propertyName == "maxmind")
+			if (reader.ValueTextEquals(VariantMaxmind))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Ingest.Maxmind?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantMaxmind.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Ingest.Maxmind?>(options);
 				continue;
 			}
 
-			throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'DatabaseConfiguration' from the response.");
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		var result = new DatabaseConfiguration(variantNameValue, variantValue);
-		result.Name = nameValue;
-		return result;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DatabaseConfiguration
+		{
+			VariantType = variantType,
+			Variant = variant,
+			Name = propName.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, DatabaseConfiguration value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DatabaseConfiguration value, System.Text.Json.JsonSerializerOptions options)
 	{
 		writer.WriteStartObject();
-		if (value.Name is not null)
-		{
-			writer.WritePropertyName("name");
-			JsonSerializer.Serialize(writer, value.Name, options);
-		}
-
-		if (value.VariantName is not null && value.Variant is not null)
+		switch (value.VariantType)
 		{
-			writer.WritePropertyName(value.VariantName);
-			switch (value.VariantName)
-			{
-				case "ipinfo":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Ingest.Ipinfo>(writer, (Elastic.Clients.Elasticsearch.Ingest.Ipinfo)value.Variant, options);
-					break;
-				case "maxmind":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Ingest.Maxmind>(writer, (Elastic.Clients.Elasticsearch.Ingest.Maxmind)value.Variant, options);
-					break;
-			}
+			case "":
+				break;
+			case "ipinfo":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Ingest.Ipinfo?)value.Variant);
+				break;
+			case "maxmind":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Ingest.Maxmind?)value.Variant);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.VariantType}' is not supported for type '{nameof(DatabaseConfiguration)}'.");
 		}
 
+		writer.WriteProperty(options, PropName, value.Name);
 		writer.WriteEndObject();
 	}
 }
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/DatabaseConfigurationFull.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/DatabaseConfigurationFull.g.cs
index 153f4bd724b..6e61a535193 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/DatabaseConfigurationFull.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/DatabaseConfigurationFull.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -39,12 +40,16 @@ internal DatabaseConfigurationFull(string variantName, object variant)
 			throw new ArgumentNullException(nameof(variant));
 		if (string.IsNullOrWhiteSpace(variantName))
 			throw new ArgumentException("Variant name must not be empty or whitespace.");
-		VariantName = variantName;
+		VariantType = variantName;
 		Variant = variant;
 	}
 
-	internal object Variant { get; }
-	internal string VariantName { get; }
+	internal DatabaseConfigurationFull()
+	{
+	}
+
+	public object Variant { get; internal set; }
+	public string VariantType { get; internal set; }
 
 	public static DatabaseConfigurationFull Ipinfo(Elastic.Clients.Elasticsearch.Ingest.Ipinfo ipinfo) => new DatabaseConfigurationFull("ipinfo", ipinfo);
 	public static DatabaseConfigurationFull Local(Elastic.Clients.Elasticsearch.Ingest.Local local) => new DatabaseConfigurationFull("local", local);
@@ -72,103 +77,95 @@ public bool TryGet<T>([NotNullWhen(true)] out T? result) where T : class
 	}
 }
 
-internal sealed partial class DatabaseConfigurationFullConverter : JsonConverter<DatabaseConfigurationFull>
+internal sealed partial class DatabaseConfigurationFullConverter : System.Text.Json.Serialization.JsonConverter<DatabaseConfigurationFull>
 {
-	public override DatabaseConfigurationFull Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-		{
-			throw new JsonException("Expected start token.");
-		}
+	private static readonly System.Text.Json.JsonEncodedText PropName = System.Text.Json.JsonEncodedText.Encode("name");
+	private static readonly System.Text.Json.JsonEncodedText VariantIpinfo = System.Text.Json.JsonEncodedText.Encode("ipinfo");
+	private static readonly System.Text.Json.JsonEncodedText VariantLocal = System.Text.Json.JsonEncodedText.Encode("local");
+	private static readonly System.Text.Json.JsonEncodedText VariantMaxmind = System.Text.Json.JsonEncodedText.Encode("maxmind");
+	private static readonly System.Text.Json.JsonEncodedText VariantWeb = System.Text.Json.JsonEncodedText.Encode("web");
 
-		object? variantValue = default;
-		string? variantNameValue = default;
-		string nameValue = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+	public override DatabaseConfigurationFull Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propName = default;
+		var variantType = string.Empty;
+		object? variant = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token.");
-			}
-
-			if (reader.TokenType != JsonTokenType.PropertyName)
+			if (propName.TryRead(ref reader, options, PropName))
 			{
-				throw new JsonException("Expected a property name token representing the name of an Elasticsearch field.");
-			}
-
-			var propertyName = reader.GetString();
-			reader.Read();
-			if (propertyName == "name")
-			{
-				nameValue = JsonSerializer.Deserialize<string>(ref reader, options);
 				continue;
 			}
 
-			if (propertyName == "ipinfo")
+			if (reader.ValueTextEquals(VariantIpinfo))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Ingest.Ipinfo?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantIpinfo.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Ingest.Ipinfo?>(options);
 				continue;
 			}
 
-			if (propertyName == "local")
+			if (reader.ValueTextEquals(VariantLocal))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Ingest.Local?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantLocal.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Ingest.Local?>(options);
 				continue;
 			}
 
-			if (propertyName == "maxmind")
+			if (reader.ValueTextEquals(VariantMaxmind))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Ingest.Maxmind?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantMaxmind.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Ingest.Maxmind?>(options);
 				continue;
 			}
 
-			if (propertyName == "web")
+			if (reader.ValueTextEquals(VariantWeb))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Ingest.Web?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantWeb.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Ingest.Web?>(options);
 				continue;
 			}
 
-			throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'DatabaseConfigurationFull' from the response.");
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		var result = new DatabaseConfigurationFull(variantNameValue, variantValue);
-		result.Name = nameValue;
-		return result;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DatabaseConfigurationFull
+		{
+			VariantType = variantType,
+			Variant = variant,
+			Name = propName.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, DatabaseConfigurationFull value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DatabaseConfigurationFull value, System.Text.Json.JsonSerializerOptions options)
 	{
 		writer.WriteStartObject();
-		if (!string.IsNullOrEmpty(value.Name))
-		{
-			writer.WritePropertyName("name");
-			writer.WriteStringValue(value.Name);
-		}
-
-		if (value.VariantName is not null && value.Variant is not null)
+		switch (value.VariantType)
 		{
-			writer.WritePropertyName(value.VariantName);
-			switch (value.VariantName)
-			{
-				case "ipinfo":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Ingest.Ipinfo>(writer, (Elastic.Clients.Elasticsearch.Ingest.Ipinfo)value.Variant, options);
-					break;
-				case "local":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Ingest.Local>(writer, (Elastic.Clients.Elasticsearch.Ingest.Local)value.Variant, options);
-					break;
-				case "maxmind":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Ingest.Maxmind>(writer, (Elastic.Clients.Elasticsearch.Ingest.Maxmind)value.Variant, options);
-					break;
-				case "web":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Ingest.Web>(writer, (Elastic.Clients.Elasticsearch.Ingest.Web)value.Variant, options);
-					break;
-			}
+			case "":
+				break;
+			case "ipinfo":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Ingest.Ipinfo?)value.Variant);
+				break;
+			case "local":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Ingest.Local?)value.Variant);
+				break;
+			case "maxmind":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Ingest.Maxmind?)value.Variant);
+				break;
+			case "web":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Ingest.Web?)value.Variant);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.VariantType}' is not supported for type '{nameof(DatabaseConfigurationFull)}'.");
 		}
 
+		writer.WriteProperty(options, PropName, value.Name);
 		writer.WriteEndObject();
 	}
 }
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 2b1315027ed..868244939fb 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/DocumentSimulation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/DocumentSimulation.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,79 +28,110 @@
 
 namespace Elastic.Clients.Elasticsearch.Ingest;
 
-internal sealed partial class DocumentSimulationConverter : JsonConverter<DocumentSimulation>
+internal sealed partial class DocumentSimulationConverter : System.Text.Json.Serialization.JsonConverter<DocumentSimulation>
 {
-	public override DocumentSimulation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropMetadata = System.Text.Json.JsonEncodedText.Encode("metadata");
+	private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("_id");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("_index");
+	private static readonly System.Text.Json.JsonEncodedText PropIngest = System.Text.Json.JsonEncodedText.Encode("_ingest");
+	private static readonly System.Text.Json.JsonEncodedText PropRouting = System.Text.Json.JsonEncodedText.Encode("_routing");
+	private static readonly System.Text.Json.JsonEncodedText PropSource = System.Text.Json.JsonEncodedText.Encode("_source");
+	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("_version");
+	private static readonly System.Text.Json.JsonEncodedText PropVersionType = System.Text.Json.JsonEncodedText.Encode("_version_type");
+
+	public override DocumentSimulation Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		string id = default;
-		string index = default;
-		Elastic.Clients.Elasticsearch.Ingest.Ingest ingest = default;
-		string? routing = default;
-		IReadOnlyDictionary<string, object> source = default;
-		long? version = default;
-		Elastic.Clients.Elasticsearch.VersionType? versionType = default;
-		Dictionary<string, string> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, string> propMetadata = default;
+		LocalJsonProperty<string> propId = default;
+		LocalJsonProperty<string> propIndex = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Ingest.Ingest> propIngest = default;
+		LocalJsonProperty<string?> propRouting = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, object>> propSource = default;
+		LocalJsonProperty<long?> propVersion = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.VersionType?> propVersionType = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propId.TryRead(ref reader, options, PropId))
 			{
-				var property = reader.GetString();
-				if (property == "_id")
-				{
-					id = JsonSerializer.Deserialize<string>(ref reader, options);
-					continue;
-				}
-
-				if (property == "_index")
-				{
-					index = JsonSerializer.Deserialize<string>(ref reader, options);
-					continue;
-				}
-
-				if (property == "_ingest")
-				{
-					ingest = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Ingest.Ingest>(ref reader, options);
-					continue;
-				}
-
-				if (property == "_routing")
-				{
-					routing = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "_source")
-				{
-					source = JsonSerializer.Deserialize<IReadOnlyDictionary<string, object>>(ref reader, options);
-					continue;
-				}
-
-				if (property == "_version")
-				{
-					version = JsonSerializer.Deserialize<long?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "_version_type")
-				{
-					versionType = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.VersionType?>(ref reader, options);
-					continue;
-				}
-
-				additionalProperties ??= new Dictionary<string, string>();
-				var additionalValue = JsonSerializer.Deserialize<string>(ref reader, options);
-				additionalProperties.Add(property, additionalValue);
+				continue;
 			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propIngest.TryRead(ref reader, options, PropIngest))
+			{
+				continue;
+			}
+
+			if (propRouting.TryRead(ref reader, options, PropRouting))
+			{
+				continue;
+			}
+
+			if (propSource.TryRead(ref reader, options, PropSource))
+			{
+				continue;
+			}
+
+			if (propVersion.TryRead(ref reader, options, PropVersion))
+			{
+				continue;
+			}
+
+			if (propVersionType.TryRead(ref reader, options, PropVersionType))
+			{
+				continue;
+			}
+
+			propMetadata ??= new System.Collections.Generic.Dictionary<string, string>();
+			reader.ReadProperty(options, out string key, out string value);
+			propMetadata[key] = value;
 		}
 
-		return new DocumentSimulation { Id = id, Index = index, Ingest = ingest, Metadata = additionalProperties, Routing = routing, Source = source, Version = version, VersionType = versionType };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DocumentSimulation
+		{
+			Metadata = propMetadata
+,
+			Id = propId.Value
+,
+			Index = propIndex.Value
+,
+			Ingest = propIngest.Value
+,
+			Routing = propRouting.Value
+,
+			Source = propSource.Value
+,
+			Version = propVersion.Value
+,
+			VersionType = propVersionType.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, DocumentSimulation value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DocumentSimulation value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'DocumentSimulation' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropId, value.Id);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropIngest, value.Ingest);
+		writer.WriteProperty(options, PropRouting, value.Routing);
+		writer.WriteProperty(options, PropSource, value.Source);
+		writer.WriteProperty(options, PropVersion, value.Version);
+		writer.WriteProperty(options, PropVersionType, value.VersionType);
+		if (value.Metadata is not null)
+		{
+			foreach (var item in value.Metadata)
+			{
+				writer.WriteProperty(options, item.Key, item.Value);
+			}
+		}
+
+		writer.WriteEndObject();
 	}
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/FingerprintProcessor.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/FingerprintProcessor.g.cs
index 1242f11c013..1d20e1b5866 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/FingerprintProcessor.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/FingerprintProcessor.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,130 @@
 
 namespace Elastic.Clients.Elasticsearch.Ingest;
 
+internal sealed partial class FingerprintProcessorConverter : System.Text.Json.Serialization.JsonConverter<FingerprintProcessor>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropDescription = System.Text.Json.JsonEncodedText.Encode("description");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropIf = System.Text.Json.JsonEncodedText.Encode("if");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreFailure = System.Text.Json.JsonEncodedText.Encode("ignore_failure");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreMissing = System.Text.Json.JsonEncodedText.Encode("ignore_missing");
+	private static readonly System.Text.Json.JsonEncodedText PropMethod = System.Text.Json.JsonEncodedText.Encode("method");
+	private static readonly System.Text.Json.JsonEncodedText PropOnFailure = System.Text.Json.JsonEncodedText.Encode("on_failure");
+	private static readonly System.Text.Json.JsonEncodedText PropSalt = System.Text.Json.JsonEncodedText.Encode("salt");
+	private static readonly System.Text.Json.JsonEncodedText PropTag = System.Text.Json.JsonEncodedText.Encode("tag");
+	private static readonly System.Text.Json.JsonEncodedText PropTargetField = System.Text.Json.JsonEncodedText.Encode("target_field");
+
+	public override FingerprintProcessor Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string?> propDescription = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Fields> propFields = default;
+		LocalJsonProperty<string?> propIf = default;
+		LocalJsonProperty<bool?> propIgnoreFailure = default;
+		LocalJsonProperty<bool?> propIgnoreMissing = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Ingest.FingerprintDigest?> propMethod = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>?> propOnFailure = default;
+		LocalJsonProperty<string?> propSalt = default;
+		LocalJsonProperty<string?> propTag = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Field?> propTargetField = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propDescription.TryRead(ref reader, options, PropDescription))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propIf.TryRead(ref reader, options, PropIf))
+			{
+				continue;
+			}
+
+			if (propIgnoreFailure.TryRead(ref reader, options, PropIgnoreFailure))
+			{
+				continue;
+			}
+
+			if (propIgnoreMissing.TryRead(ref reader, options, PropIgnoreMissing))
+			{
+				continue;
+			}
+
+			if (propMethod.TryRead(ref reader, options, PropMethod))
+			{
+				continue;
+			}
+
+			if (propOnFailure.TryRead(ref reader, options, PropOnFailure))
+			{
+				continue;
+			}
+
+			if (propSalt.TryRead(ref reader, options, PropSalt))
+			{
+				continue;
+			}
+
+			if (propTag.TryRead(ref reader, options, PropTag))
+			{
+				continue;
+			}
+
+			if (propTargetField.TryRead(ref reader, options, PropTargetField))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new FingerprintProcessor
+		{
+			Description = propDescription.Value
+,
+			Fields = propFields.Value
+,
+			If = propIf.Value
+,
+			IgnoreFailure = propIgnoreFailure.Value
+,
+			IgnoreMissing = propIgnoreMissing.Value
+,
+			Method = propMethod.Value
+,
+			OnFailure = propOnFailure.Value
+,
+			Salt = propSalt.Value
+,
+			Tag = propTag.Value
+,
+			TargetField = propTargetField.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, FingerprintProcessor value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDescription, value.Description);
+		writer.WriteProperty(options, PropFields, value.Fields, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropIf, value.If);
+		writer.WriteProperty(options, PropIgnoreFailure, value.IgnoreFailure);
+		writer.WriteProperty(options, PropIgnoreMissing, value.IgnoreMissing);
+		writer.WriteProperty(options, PropMethod, value.Method);
+		writer.WriteProperty(options, PropOnFailure, value.OnFailure);
+		writer.WriteProperty(options, PropSalt, value.Salt);
+		writer.WriteProperty(options, PropTag, value.Tag);
+		writer.WriteProperty(options, PropTargetField, value.TargetField);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(FingerprintProcessorConverter))]
 public sealed partial class FingerprintProcessor
 {
 	/// <summary>
@@ -35,7 +160,6 @@ public sealed partial class FingerprintProcessor
 	/// Useful for describing the purpose of the processor or its configuration.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("description")]
 	public string? Description { get; set; }
 
 	/// <summary>
@@ -45,8 +169,6 @@ public sealed partial class FingerprintProcessor
 	/// only the field value.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("fields")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Fields Fields { get; set; }
 
 	/// <summary>
@@ -54,7 +176,6 @@ public sealed partial class FingerprintProcessor
 	/// Conditionally execute the processor.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("if")]
 	public string? If { get; set; }
 
 	/// <summary>
@@ -62,7 +183,6 @@ public sealed partial class FingerprintProcessor
 	/// Ignore failures for the processor.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("ignore_failure")]
 	public bool? IgnoreFailure { get; set; }
 
 	/// <summary>
@@ -71,7 +191,6 @@ public sealed partial class FingerprintProcessor
 	/// missing, the processor silently exits without modifying the document.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("ignore_missing")]
 	public bool? IgnoreMissing { get; set; }
 
 	/// <summary>
@@ -80,7 +199,6 @@ public sealed partial class FingerprintProcessor
 	/// SHA-256, SHA-512, or MurmurHash3.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("method")]
 	public Elastic.Clients.Elasticsearch.Ingest.FingerprintDigest? Method { get; set; }
 
 	/// <summary>
@@ -88,7 +206,6 @@ public sealed partial class FingerprintProcessor
 	/// Handle failures for the processor.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("on_failure")]
 	public ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailure { get; set; }
 
 	/// <summary>
@@ -96,7 +213,6 @@ public sealed partial class FingerprintProcessor
 	/// Salt value for the hash function.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("salt")]
 	public string? Salt { get; set; }
 
 	/// <summary>
@@ -105,7 +221,6 @@ public sealed partial class FingerprintProcessor
 	/// Useful for debugging and metrics.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("tag")]
 	public string? Tag { get; set; }
 
 	/// <summary>
@@ -113,7 +228,6 @@ public sealed partial class FingerprintProcessor
 	/// Output field for the fingerprint.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("target_field")]
 	public Elastic.Clients.Elasticsearch.Field? TargetField { get; set; }
 
 	public static implicit operator Elastic.Clients.Elasticsearch.Ingest.Processor(FingerprintProcessor fingerprintProcessor) => Elastic.Clients.Elasticsearch.Ingest.Processor.Fingerprint(fingerprintProcessor);
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 ffa884fd3af..b6acf1d6025 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/InferenceConfig.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/InferenceConfig.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -39,12 +40,16 @@ internal InferenceConfig(string variantName, object variant)
 			throw new ArgumentNullException(nameof(variant));
 		if (string.IsNullOrWhiteSpace(variantName))
 			throw new ArgumentException("Variant name must not be empty or whitespace.");
-		VariantName = variantName;
+		VariantType = variantName;
 		Variant = variant;
 	}
 
-	internal object Variant { get; }
-	internal string VariantName { get; }
+	internal InferenceConfig()
+	{
+	}
+
+	public object Variant { get; internal set; }
+	public string VariantType { get; internal set; }
 
 	public static InferenceConfig Classification(Elastic.Clients.Elasticsearch.Ingest.InferenceConfigClassification inferenceConfigClassification) => new InferenceConfig("classification", inferenceConfigClassification);
 	public static InferenceConfig Regression(Elastic.Clients.Elasticsearch.Ingest.InferenceConfigRegression inferenceConfigRegression) => new InferenceConfig("regression", inferenceConfigRegression);
@@ -62,67 +67,56 @@ public bool TryGet<T>([NotNullWhen(true)] out T? result) where T : class
 	}
 }
 
-internal sealed partial class InferenceConfigConverter : JsonConverter<InferenceConfig>
+internal sealed partial class InferenceConfigConverter : System.Text.Json.Serialization.JsonConverter<InferenceConfig>
 {
-	public override InferenceConfig Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-		{
-			throw new JsonException("Expected start token.");
-		}
+	private static readonly System.Text.Json.JsonEncodedText VariantClassification = System.Text.Json.JsonEncodedText.Encode("classification");
+	private static readonly System.Text.Json.JsonEncodedText VariantRegression = System.Text.Json.JsonEncodedText.Encode("regression");
 
-		object? variantValue = default;
-		string? variantNameValue = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+	public override InferenceConfig Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		var variantType = string.Empty;
+		object? variant = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
+			if (reader.ValueTextEquals(VariantClassification))
 			{
-				throw new JsonException("Expected a property name token.");
-			}
-
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token representing the name of an Elasticsearch field.");
-			}
-
-			var propertyName = reader.GetString();
-			reader.Read();
-			if (propertyName == "classification")
-			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Ingest.InferenceConfigClassification?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantClassification.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Ingest.InferenceConfigClassification?>(options);
 				continue;
 			}
 
-			if (propertyName == "regression")
+			if (reader.ValueTextEquals(VariantRegression))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Ingest.InferenceConfigRegression?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantRegression.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Ingest.InferenceConfigRegression?>(options);
 				continue;
 			}
 
-			throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'InferenceConfig' from the response.");
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		var result = new InferenceConfig(variantNameValue, variantValue);
-		return result;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new InferenceConfig { VariantType = variantType, Variant = variant };
 	}
 
-	public override void Write(Utf8JsonWriter writer, InferenceConfig value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, InferenceConfig value, System.Text.Json.JsonSerializerOptions options)
 	{
 		writer.WriteStartObject();
-		if (value.VariantName is not null && value.Variant is not null)
+		switch (value.VariantType)
 		{
-			writer.WritePropertyName(value.VariantName);
-			switch (value.VariantName)
-			{
-				case "classification":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Ingest.InferenceConfigClassification>(writer, (Elastic.Clients.Elasticsearch.Ingest.InferenceConfigClassification)value.Variant, options);
-					break;
-				case "regression":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Ingest.InferenceConfigRegression>(writer, (Elastic.Clients.Elasticsearch.Ingest.InferenceConfigRegression)value.Variant, options);
-					break;
-			}
+			case "":
+				break;
+			case "classification":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Ingest.InferenceConfigClassification?)value.Variant);
+				break;
+			case "regression":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Ingest.InferenceConfigRegression?)value.Variant);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.VariantType}' is not supported for type '{nameof(InferenceConfig)}'.");
 		}
 
 		writer.WriteEndObject();
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 b7020c13d1a..569965ede6e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/Processor.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/Processor.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -39,12 +40,16 @@ internal Processor(string variantName, object variant)
 			throw new ArgumentNullException(nameof(variant));
 		if (string.IsNullOrWhiteSpace(variantName))
 			throw new ArgumentException("Variant name must not be empty or whitespace.");
-		VariantName = variantName;
+		VariantType = variantName;
 		Variant = variant;
 	}
 
-	internal object Variant { get; }
-	internal string VariantName { get; }
+	internal Processor()
+	{
+	}
+
+	public object Variant { get; internal set; }
+	public string VariantType { get; internal set; }
 
 	public static Processor Append(Elastic.Clients.Elasticsearch.Ingest.AppendProcessor appendProcessor) => new Processor("append", appendProcessor);
 	public static Processor Attachment(Elastic.Clients.Elasticsearch.Ingest.AttachmentProcessor attachmentProcessor) => new Processor("attachment", attachmentProcessor);
@@ -105,497 +110,572 @@ public bool TryGet<T>([NotNullWhen(true)] out T? result) where T : class
 	}
 }
 
-internal sealed partial class ProcessorConverter : JsonConverter<Processor>
+internal sealed partial class ProcessorConverter : System.Text.Json.Serialization.JsonConverter<Processor>
 {
-	public override Processor Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText VariantAppend = System.Text.Json.JsonEncodedText.Encode("append");
+	private static readonly System.Text.Json.JsonEncodedText VariantAttachment = System.Text.Json.JsonEncodedText.Encode("attachment");
+	private static readonly System.Text.Json.JsonEncodedText VariantBytes = System.Text.Json.JsonEncodedText.Encode("bytes");
+	private static readonly System.Text.Json.JsonEncodedText VariantCircle = System.Text.Json.JsonEncodedText.Encode("circle");
+	private static readonly System.Text.Json.JsonEncodedText VariantCommunityId = System.Text.Json.JsonEncodedText.Encode("community_id");
+	private static readonly System.Text.Json.JsonEncodedText VariantConvert = System.Text.Json.JsonEncodedText.Encode("convert");
+	private static readonly System.Text.Json.JsonEncodedText VariantCsv = System.Text.Json.JsonEncodedText.Encode("csv");
+	private static readonly System.Text.Json.JsonEncodedText VariantDate = System.Text.Json.JsonEncodedText.Encode("date");
+	private static readonly System.Text.Json.JsonEncodedText VariantDateIndexName = System.Text.Json.JsonEncodedText.Encode("date_index_name");
+	private static readonly System.Text.Json.JsonEncodedText VariantDissect = System.Text.Json.JsonEncodedText.Encode("dissect");
+	private static readonly System.Text.Json.JsonEncodedText VariantDotExpander = System.Text.Json.JsonEncodedText.Encode("dot_expander");
+	private static readonly System.Text.Json.JsonEncodedText VariantDrop = System.Text.Json.JsonEncodedText.Encode("drop");
+	private static readonly System.Text.Json.JsonEncodedText VariantEnrich = System.Text.Json.JsonEncodedText.Encode("enrich");
+	private static readonly System.Text.Json.JsonEncodedText VariantFail = System.Text.Json.JsonEncodedText.Encode("fail");
+	private static readonly System.Text.Json.JsonEncodedText VariantFingerprint = System.Text.Json.JsonEncodedText.Encode("fingerprint");
+	private static readonly System.Text.Json.JsonEncodedText VariantForeach = System.Text.Json.JsonEncodedText.Encode("foreach");
+	private static readonly System.Text.Json.JsonEncodedText VariantGeoGrid = System.Text.Json.JsonEncodedText.Encode("geo_grid");
+	private static readonly System.Text.Json.JsonEncodedText VariantGeoip = System.Text.Json.JsonEncodedText.Encode("geoip");
+	private static readonly System.Text.Json.JsonEncodedText VariantGrok = System.Text.Json.JsonEncodedText.Encode("grok");
+	private static readonly System.Text.Json.JsonEncodedText VariantGsub = System.Text.Json.JsonEncodedText.Encode("gsub");
+	private static readonly System.Text.Json.JsonEncodedText VariantHtmlStrip = System.Text.Json.JsonEncodedText.Encode("html_strip");
+	private static readonly System.Text.Json.JsonEncodedText VariantInference = System.Text.Json.JsonEncodedText.Encode("inference");
+	private static readonly System.Text.Json.JsonEncodedText VariantIpLocation = System.Text.Json.JsonEncodedText.Encode("ip_location");
+	private static readonly System.Text.Json.JsonEncodedText VariantJoin = System.Text.Json.JsonEncodedText.Encode("join");
+	private static readonly System.Text.Json.JsonEncodedText VariantJson = System.Text.Json.JsonEncodedText.Encode("json");
+	private static readonly System.Text.Json.JsonEncodedText VariantKv = System.Text.Json.JsonEncodedText.Encode("kv");
+	private static readonly System.Text.Json.JsonEncodedText VariantLowercase = System.Text.Json.JsonEncodedText.Encode("lowercase");
+	private static readonly System.Text.Json.JsonEncodedText VariantNetworkDirection = System.Text.Json.JsonEncodedText.Encode("network_direction");
+	private static readonly System.Text.Json.JsonEncodedText VariantPipeline = System.Text.Json.JsonEncodedText.Encode("pipeline");
+	private static readonly System.Text.Json.JsonEncodedText VariantRedact = System.Text.Json.JsonEncodedText.Encode("redact");
+	private static readonly System.Text.Json.JsonEncodedText VariantRegisteredDomain = System.Text.Json.JsonEncodedText.Encode("registered_domain");
+	private static readonly System.Text.Json.JsonEncodedText VariantRemove = System.Text.Json.JsonEncodedText.Encode("remove");
+	private static readonly System.Text.Json.JsonEncodedText VariantRename = System.Text.Json.JsonEncodedText.Encode("rename");
+	private static readonly System.Text.Json.JsonEncodedText VariantReroute = System.Text.Json.JsonEncodedText.Encode("reroute");
+	private static readonly System.Text.Json.JsonEncodedText VariantScript = System.Text.Json.JsonEncodedText.Encode("script");
+	private static readonly System.Text.Json.JsonEncodedText VariantSet = System.Text.Json.JsonEncodedText.Encode("set");
+	private static readonly System.Text.Json.JsonEncodedText VariantSetSecurityUser = System.Text.Json.JsonEncodedText.Encode("set_security_user");
+	private static readonly System.Text.Json.JsonEncodedText VariantSort = System.Text.Json.JsonEncodedText.Encode("sort");
+	private static readonly System.Text.Json.JsonEncodedText VariantSplit = System.Text.Json.JsonEncodedText.Encode("split");
+	private static readonly System.Text.Json.JsonEncodedText VariantTerminate = System.Text.Json.JsonEncodedText.Encode("terminate");
+	private static readonly System.Text.Json.JsonEncodedText VariantTrim = System.Text.Json.JsonEncodedText.Encode("trim");
+	private static readonly System.Text.Json.JsonEncodedText VariantUppercase = System.Text.Json.JsonEncodedText.Encode("uppercase");
+	private static readonly System.Text.Json.JsonEncodedText VariantUriParts = System.Text.Json.JsonEncodedText.Encode("uri_parts");
+	private static readonly System.Text.Json.JsonEncodedText VariantUrlDecode = System.Text.Json.JsonEncodedText.Encode("urldecode");
+	private static readonly System.Text.Json.JsonEncodedText VariantUserAgent = System.Text.Json.JsonEncodedText.Encode("user_agent");
+
+	public override Processor Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		var variantType = string.Empty;
+		object? variant = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			throw new JsonException("Expected start token.");
-		}
-
-		object? variantValue = default;
-		string? variantNameValue = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
-		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
+			if (reader.ValueTextEquals(VariantAppend))
 			{
-				throw new JsonException("Expected a property name token.");
-			}
-
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token representing the name of an Elasticsearch field.");
-			}
-
-			var propertyName = reader.GetString();
-			reader.Read();
-			if (propertyName == "append")
-			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Ingest.AppendProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantAppend.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Ingest.AppendProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "attachment")
+			if (reader.ValueTextEquals(VariantAttachment))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Ingest.AttachmentProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantAttachment.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Ingest.AttachmentProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "bytes")
+			if (reader.ValueTextEquals(VariantBytes))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Ingest.BytesProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantBytes.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Ingest.BytesProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "circle")
+			if (reader.ValueTextEquals(VariantCircle))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Ingest.CircleProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantCircle.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Ingest.CircleProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "community_id")
+			if (reader.ValueTextEquals(VariantCommunityId))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Ingest.CommunityIDProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantCommunityId.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Ingest.CommunityIDProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "convert")
+			if (reader.ValueTextEquals(VariantConvert))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Ingest.ConvertProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantConvert.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Ingest.ConvertProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "csv")
+			if (reader.ValueTextEquals(VariantCsv))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Ingest.CsvProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantCsv.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Ingest.CsvProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "date")
+			if (reader.ValueTextEquals(VariantDate))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Ingest.DateProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantDate.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Ingest.DateProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "date_index_name")
+			if (reader.ValueTextEquals(VariantDateIndexName))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Ingest.DateIndexNameProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantDateIndexName.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Ingest.DateIndexNameProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "dissect")
+			if (reader.ValueTextEquals(VariantDissect))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Ingest.DissectProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantDissect.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Ingest.DissectProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "dot_expander")
+			if (reader.ValueTextEquals(VariantDotExpander))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Ingest.DotExpanderProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantDotExpander.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Ingest.DotExpanderProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "drop")
+			if (reader.ValueTextEquals(VariantDrop))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Ingest.DropProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantDrop.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Ingest.DropProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "enrich")
+			if (reader.ValueTextEquals(VariantEnrich))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Ingest.EnrichProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantEnrich.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Ingest.EnrichProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "fail")
+			if (reader.ValueTextEquals(VariantFail))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Ingest.FailProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantFail.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Ingest.FailProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "fingerprint")
+			if (reader.ValueTextEquals(VariantFingerprint))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Ingest.FingerprintProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantFingerprint.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Ingest.FingerprintProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "foreach")
+			if (reader.ValueTextEquals(VariantForeach))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Ingest.ForeachProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantForeach.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Ingest.ForeachProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "geo_grid")
+			if (reader.ValueTextEquals(VariantGeoGrid))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Ingest.GeoGridProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantGeoGrid.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Ingest.GeoGridProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "geoip")
+			if (reader.ValueTextEquals(VariantGeoip))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Ingest.GeoIpProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantGeoip.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Ingest.GeoIpProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "grok")
+			if (reader.ValueTextEquals(VariantGrok))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Ingest.GrokProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantGrok.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Ingest.GrokProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "gsub")
+			if (reader.ValueTextEquals(VariantGsub))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Ingest.GsubProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantGsub.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Ingest.GsubProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "html_strip")
+			if (reader.ValueTextEquals(VariantHtmlStrip))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Ingest.HtmlStripProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantHtmlStrip.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Ingest.HtmlStripProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "inference")
+			if (reader.ValueTextEquals(VariantInference))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Ingest.InferenceProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantInference.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Ingest.InferenceProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "ip_location")
+			if (reader.ValueTextEquals(VariantIpLocation))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Ingest.IpLocationProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantIpLocation.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Ingest.IpLocationProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "join")
+			if (reader.ValueTextEquals(VariantJoin))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Ingest.JoinProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantJoin.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Ingest.JoinProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "json")
+			if (reader.ValueTextEquals(VariantJson))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Ingest.JsonProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantJson.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Ingest.JsonProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "kv")
+			if (reader.ValueTextEquals(VariantKv))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Ingest.KeyValueProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantKv.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Ingest.KeyValueProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "lowercase")
+			if (reader.ValueTextEquals(VariantLowercase))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Ingest.LowercaseProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantLowercase.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Ingest.LowercaseProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "network_direction")
+			if (reader.ValueTextEquals(VariantNetworkDirection))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Ingest.NetworkDirectionProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantNetworkDirection.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Ingest.NetworkDirectionProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "pipeline")
+			if (reader.ValueTextEquals(VariantPipeline))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Ingest.PipelineProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantPipeline.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Ingest.PipelineProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "redact")
+			if (reader.ValueTextEquals(VariantRedact))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Ingest.RedactProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantRedact.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Ingest.RedactProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "registered_domain")
+			if (reader.ValueTextEquals(VariantRegisteredDomain))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Ingest.RegisteredDomainProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantRegisteredDomain.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Ingest.RegisteredDomainProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "remove")
+			if (reader.ValueTextEquals(VariantRemove))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Ingest.RemoveProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantRemove.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Ingest.RemoveProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "rename")
+			if (reader.ValueTextEquals(VariantRename))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Ingest.RenameProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantRename.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Ingest.RenameProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "reroute")
+			if (reader.ValueTextEquals(VariantReroute))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Ingest.RerouteProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantReroute.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Ingest.RerouteProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "script")
+			if (reader.ValueTextEquals(VariantScript))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Ingest.ScriptProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantScript.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Ingest.ScriptProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "set")
+			if (reader.ValueTextEquals(VariantSet))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Ingest.SetProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantSet.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Ingest.SetProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "set_security_user")
+			if (reader.ValueTextEquals(VariantSetSecurityUser))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Ingest.SetSecurityUserProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantSetSecurityUser.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Ingest.SetSecurityUserProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "sort")
+			if (reader.ValueTextEquals(VariantSort))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Ingest.SortProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantSort.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Ingest.SortProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "split")
+			if (reader.ValueTextEquals(VariantSplit))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Ingest.SplitProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantSplit.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Ingest.SplitProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "terminate")
+			if (reader.ValueTextEquals(VariantTerminate))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Ingest.TerminateProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantTerminate.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Ingest.TerminateProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "trim")
+			if (reader.ValueTextEquals(VariantTrim))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Ingest.TrimProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantTrim.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Ingest.TrimProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "uppercase")
+			if (reader.ValueTextEquals(VariantUppercase))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Ingest.UppercaseProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantUppercase.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Ingest.UppercaseProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "uri_parts")
+			if (reader.ValueTextEquals(VariantUriParts))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Ingest.UriPartsProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantUriParts.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Ingest.UriPartsProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "urldecode")
+			if (reader.ValueTextEquals(VariantUrlDecode))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Ingest.UrlDecodeProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantUrlDecode.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Ingest.UrlDecodeProcessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "user_agent")
+			if (reader.ValueTextEquals(VariantUserAgent))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Ingest.UserAgentProcessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantUserAgent.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Ingest.UserAgentProcessor?>(options);
 				continue;
 			}
 
-			throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'Processor' from the response.");
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		var result = new Processor(variantNameValue, variantValue);
-		return result;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new Processor { VariantType = variantType, Variant = variant };
 	}
 
-	public override void Write(Utf8JsonWriter writer, Processor value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, Processor value, System.Text.Json.JsonSerializerOptions options)
 	{
 		writer.WriteStartObject();
-		if (value.VariantName is not null && value.Variant is not null)
+		switch (value.VariantType)
 		{
-			writer.WritePropertyName(value.VariantName);
-			switch (value.VariantName)
-			{
-				case "append":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Ingest.AppendProcessor>(writer, (Elastic.Clients.Elasticsearch.Ingest.AppendProcessor)value.Variant, options);
-					break;
-				case "attachment":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Ingest.AttachmentProcessor>(writer, (Elastic.Clients.Elasticsearch.Ingest.AttachmentProcessor)value.Variant, options);
-					break;
-				case "bytes":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Ingest.BytesProcessor>(writer, (Elastic.Clients.Elasticsearch.Ingest.BytesProcessor)value.Variant, options);
-					break;
-				case "circle":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Ingest.CircleProcessor>(writer, (Elastic.Clients.Elasticsearch.Ingest.CircleProcessor)value.Variant, options);
-					break;
-				case "community_id":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Ingest.CommunityIDProcessor>(writer, (Elastic.Clients.Elasticsearch.Ingest.CommunityIDProcessor)value.Variant, options);
-					break;
-				case "convert":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Ingest.ConvertProcessor>(writer, (Elastic.Clients.Elasticsearch.Ingest.ConvertProcessor)value.Variant, options);
-					break;
-				case "csv":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Ingest.CsvProcessor>(writer, (Elastic.Clients.Elasticsearch.Ingest.CsvProcessor)value.Variant, options);
-					break;
-				case "date":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Ingest.DateProcessor>(writer, (Elastic.Clients.Elasticsearch.Ingest.DateProcessor)value.Variant, options);
-					break;
-				case "date_index_name":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Ingest.DateIndexNameProcessor>(writer, (Elastic.Clients.Elasticsearch.Ingest.DateIndexNameProcessor)value.Variant, options);
-					break;
-				case "dissect":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Ingest.DissectProcessor>(writer, (Elastic.Clients.Elasticsearch.Ingest.DissectProcessor)value.Variant, options);
-					break;
-				case "dot_expander":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Ingest.DotExpanderProcessor>(writer, (Elastic.Clients.Elasticsearch.Ingest.DotExpanderProcessor)value.Variant, options);
-					break;
-				case "drop":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Ingest.DropProcessor>(writer, (Elastic.Clients.Elasticsearch.Ingest.DropProcessor)value.Variant, options);
-					break;
-				case "enrich":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Ingest.EnrichProcessor>(writer, (Elastic.Clients.Elasticsearch.Ingest.EnrichProcessor)value.Variant, options);
-					break;
-				case "fail":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Ingest.FailProcessor>(writer, (Elastic.Clients.Elasticsearch.Ingest.FailProcessor)value.Variant, options);
-					break;
-				case "fingerprint":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Ingest.FingerprintProcessor>(writer, (Elastic.Clients.Elasticsearch.Ingest.FingerprintProcessor)value.Variant, options);
-					break;
-				case "foreach":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Ingest.ForeachProcessor>(writer, (Elastic.Clients.Elasticsearch.Ingest.ForeachProcessor)value.Variant, options);
-					break;
-				case "geo_grid":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Ingest.GeoGridProcessor>(writer, (Elastic.Clients.Elasticsearch.Ingest.GeoGridProcessor)value.Variant, options);
-					break;
-				case "geoip":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Ingest.GeoIpProcessor>(writer, (Elastic.Clients.Elasticsearch.Ingest.GeoIpProcessor)value.Variant, options);
-					break;
-				case "grok":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Ingest.GrokProcessor>(writer, (Elastic.Clients.Elasticsearch.Ingest.GrokProcessor)value.Variant, options);
-					break;
-				case "gsub":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Ingest.GsubProcessor>(writer, (Elastic.Clients.Elasticsearch.Ingest.GsubProcessor)value.Variant, options);
-					break;
-				case "html_strip":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Ingest.HtmlStripProcessor>(writer, (Elastic.Clients.Elasticsearch.Ingest.HtmlStripProcessor)value.Variant, options);
-					break;
-				case "inference":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Ingest.InferenceProcessor>(writer, (Elastic.Clients.Elasticsearch.Ingest.InferenceProcessor)value.Variant, options);
-					break;
-				case "ip_location":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Ingest.IpLocationProcessor>(writer, (Elastic.Clients.Elasticsearch.Ingest.IpLocationProcessor)value.Variant, options);
-					break;
-				case "join":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Ingest.JoinProcessor>(writer, (Elastic.Clients.Elasticsearch.Ingest.JoinProcessor)value.Variant, options);
-					break;
-				case "json":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Ingest.JsonProcessor>(writer, (Elastic.Clients.Elasticsearch.Ingest.JsonProcessor)value.Variant, options);
-					break;
-				case "kv":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Ingest.KeyValueProcessor>(writer, (Elastic.Clients.Elasticsearch.Ingest.KeyValueProcessor)value.Variant, options);
-					break;
-				case "lowercase":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Ingest.LowercaseProcessor>(writer, (Elastic.Clients.Elasticsearch.Ingest.LowercaseProcessor)value.Variant, options);
-					break;
-				case "network_direction":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Ingest.NetworkDirectionProcessor>(writer, (Elastic.Clients.Elasticsearch.Ingest.NetworkDirectionProcessor)value.Variant, options);
-					break;
-				case "pipeline":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Ingest.PipelineProcessor>(writer, (Elastic.Clients.Elasticsearch.Ingest.PipelineProcessor)value.Variant, options);
-					break;
-				case "redact":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Ingest.RedactProcessor>(writer, (Elastic.Clients.Elasticsearch.Ingest.RedactProcessor)value.Variant, options);
-					break;
-				case "registered_domain":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Ingest.RegisteredDomainProcessor>(writer, (Elastic.Clients.Elasticsearch.Ingest.RegisteredDomainProcessor)value.Variant, options);
-					break;
-				case "remove":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Ingest.RemoveProcessor>(writer, (Elastic.Clients.Elasticsearch.Ingest.RemoveProcessor)value.Variant, options);
-					break;
-				case "rename":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Ingest.RenameProcessor>(writer, (Elastic.Clients.Elasticsearch.Ingest.RenameProcessor)value.Variant, options);
-					break;
-				case "reroute":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Ingest.RerouteProcessor>(writer, (Elastic.Clients.Elasticsearch.Ingest.RerouteProcessor)value.Variant, options);
-					break;
-				case "script":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Ingest.ScriptProcessor>(writer, (Elastic.Clients.Elasticsearch.Ingest.ScriptProcessor)value.Variant, options);
-					break;
-				case "set":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Ingest.SetProcessor>(writer, (Elastic.Clients.Elasticsearch.Ingest.SetProcessor)value.Variant, options);
-					break;
-				case "set_security_user":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Ingest.SetSecurityUserProcessor>(writer, (Elastic.Clients.Elasticsearch.Ingest.SetSecurityUserProcessor)value.Variant, options);
-					break;
-				case "sort":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Ingest.SortProcessor>(writer, (Elastic.Clients.Elasticsearch.Ingest.SortProcessor)value.Variant, options);
-					break;
-				case "split":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Ingest.SplitProcessor>(writer, (Elastic.Clients.Elasticsearch.Ingest.SplitProcessor)value.Variant, options);
-					break;
-				case "terminate":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Ingest.TerminateProcessor>(writer, (Elastic.Clients.Elasticsearch.Ingest.TerminateProcessor)value.Variant, options);
-					break;
-				case "trim":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Ingest.TrimProcessor>(writer, (Elastic.Clients.Elasticsearch.Ingest.TrimProcessor)value.Variant, options);
-					break;
-				case "uppercase":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Ingest.UppercaseProcessor>(writer, (Elastic.Clients.Elasticsearch.Ingest.UppercaseProcessor)value.Variant, options);
-					break;
-				case "uri_parts":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Ingest.UriPartsProcessor>(writer, (Elastic.Clients.Elasticsearch.Ingest.UriPartsProcessor)value.Variant, options);
-					break;
-				case "urldecode":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Ingest.UrlDecodeProcessor>(writer, (Elastic.Clients.Elasticsearch.Ingest.UrlDecodeProcessor)value.Variant, options);
-					break;
-				case "user_agent":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Ingest.UserAgentProcessor>(writer, (Elastic.Clients.Elasticsearch.Ingest.UserAgentProcessor)value.Variant, options);
-					break;
-			}
+			case "":
+				break;
+			case "append":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Ingest.AppendProcessor?)value.Variant);
+				break;
+			case "attachment":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Ingest.AttachmentProcessor?)value.Variant);
+				break;
+			case "bytes":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Ingest.BytesProcessor?)value.Variant);
+				break;
+			case "circle":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Ingest.CircleProcessor?)value.Variant);
+				break;
+			case "community_id":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Ingest.CommunityIDProcessor?)value.Variant);
+				break;
+			case "convert":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Ingest.ConvertProcessor?)value.Variant);
+				break;
+			case "csv":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Ingest.CsvProcessor?)value.Variant);
+				break;
+			case "date":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Ingest.DateProcessor?)value.Variant);
+				break;
+			case "date_index_name":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Ingest.DateIndexNameProcessor?)value.Variant);
+				break;
+			case "dissect":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Ingest.DissectProcessor?)value.Variant);
+				break;
+			case "dot_expander":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Ingest.DotExpanderProcessor?)value.Variant);
+				break;
+			case "drop":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Ingest.DropProcessor?)value.Variant);
+				break;
+			case "enrich":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Ingest.EnrichProcessor?)value.Variant);
+				break;
+			case "fail":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Ingest.FailProcessor?)value.Variant);
+				break;
+			case "fingerprint":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Ingest.FingerprintProcessor?)value.Variant);
+				break;
+			case "foreach":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Ingest.ForeachProcessor?)value.Variant);
+				break;
+			case "geo_grid":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Ingest.GeoGridProcessor?)value.Variant);
+				break;
+			case "geoip":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Ingest.GeoIpProcessor?)value.Variant);
+				break;
+			case "grok":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Ingest.GrokProcessor?)value.Variant);
+				break;
+			case "gsub":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Ingest.GsubProcessor?)value.Variant);
+				break;
+			case "html_strip":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Ingest.HtmlStripProcessor?)value.Variant);
+				break;
+			case "inference":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Ingest.InferenceProcessor?)value.Variant);
+				break;
+			case "ip_location":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Ingest.IpLocationProcessor?)value.Variant);
+				break;
+			case "join":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Ingest.JoinProcessor?)value.Variant);
+				break;
+			case "json":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Ingest.JsonProcessor?)value.Variant);
+				break;
+			case "kv":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Ingest.KeyValueProcessor?)value.Variant);
+				break;
+			case "lowercase":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Ingest.LowercaseProcessor?)value.Variant);
+				break;
+			case "network_direction":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Ingest.NetworkDirectionProcessor?)value.Variant);
+				break;
+			case "pipeline":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Ingest.PipelineProcessor?)value.Variant);
+				break;
+			case "redact":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Ingest.RedactProcessor?)value.Variant);
+				break;
+			case "registered_domain":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Ingest.RegisteredDomainProcessor?)value.Variant);
+				break;
+			case "remove":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Ingest.RemoveProcessor?)value.Variant);
+				break;
+			case "rename":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Ingest.RenameProcessor?)value.Variant);
+				break;
+			case "reroute":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Ingest.RerouteProcessor?)value.Variant);
+				break;
+			case "script":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Ingest.ScriptProcessor?)value.Variant);
+				break;
+			case "set":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Ingest.SetProcessor?)value.Variant);
+				break;
+			case "set_security_user":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Ingest.SetSecurityUserProcessor?)value.Variant);
+				break;
+			case "sort":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Ingest.SortProcessor?)value.Variant);
+				break;
+			case "split":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Ingest.SplitProcessor?)value.Variant);
+				break;
+			case "terminate":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Ingest.TerminateProcessor?)value.Variant);
+				break;
+			case "trim":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Ingest.TrimProcessor?)value.Variant);
+				break;
+			case "uppercase":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Ingest.UppercaseProcessor?)value.Variant);
+				break;
+			case "uri_parts":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Ingest.UriPartsProcessor?)value.Variant);
+				break;
+			case "urldecode":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Ingest.UrlDecodeProcessor?)value.Variant);
+				break;
+			case "user_agent":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Ingest.UserAgentProcessor?)value.Variant);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.VariantType}' is not supported for type '{nameof(Processor)}'.");
 		}
 
 		writer.WriteEndObject();
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 33124de7f4a..c35ee05c2d0 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/RemoveProcessor.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/RemoveProcessor.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,110 @@
 
 namespace Elastic.Clients.Elasticsearch.Ingest;
 
+internal sealed partial class RemoveProcessorConverter : System.Text.Json.Serialization.JsonConverter<RemoveProcessor>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropDescription = System.Text.Json.JsonEncodedText.Encode("description");
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropIf = System.Text.Json.JsonEncodedText.Encode("if");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreFailure = System.Text.Json.JsonEncodedText.Encode("ignore_failure");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreMissing = System.Text.Json.JsonEncodedText.Encode("ignore_missing");
+	private static readonly System.Text.Json.JsonEncodedText PropKeep = System.Text.Json.JsonEncodedText.Encode("keep");
+	private static readonly System.Text.Json.JsonEncodedText PropOnFailure = System.Text.Json.JsonEncodedText.Encode("on_failure");
+	private static readonly System.Text.Json.JsonEncodedText PropTag = System.Text.Json.JsonEncodedText.Encode("tag");
+
+	public override RemoveProcessor Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string?> propDescription = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Fields> propField = default;
+		LocalJsonProperty<string?> propIf = default;
+		LocalJsonProperty<bool?> propIgnoreFailure = default;
+		LocalJsonProperty<bool?> propIgnoreMissing = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Fields?> propKeep = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>?> propOnFailure = default;
+		LocalJsonProperty<string?> propTag = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propDescription.TryRead(ref reader, options, PropDescription))
+			{
+				continue;
+			}
+
+			if (propField.TryRead(ref reader, options, PropField, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propIf.TryRead(ref reader, options, PropIf))
+			{
+				continue;
+			}
+
+			if (propIgnoreFailure.TryRead(ref reader, options, PropIgnoreFailure))
+			{
+				continue;
+			}
+
+			if (propIgnoreMissing.TryRead(ref reader, options, PropIgnoreMissing))
+			{
+				continue;
+			}
+
+			if (propKeep.TryRead(ref reader, options, PropKeep, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propOnFailure.TryRead(ref reader, options, PropOnFailure))
+			{
+				continue;
+			}
+
+			if (propTag.TryRead(ref reader, options, PropTag))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new RemoveProcessor
+		{
+			Description = propDescription.Value
+,
+			Field = propField.Value
+,
+			If = propIf.Value
+,
+			IgnoreFailure = propIgnoreFailure.Value
+,
+			IgnoreMissing = propIgnoreMissing.Value
+,
+			Keep = propKeep.Value
+,
+			OnFailure = propOnFailure.Value
+,
+			Tag = propTag.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, RemoveProcessor value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDescription, value.Description);
+		writer.WriteProperty(options, PropField, value.Field, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropIf, value.If);
+		writer.WriteProperty(options, PropIgnoreFailure, value.IgnoreFailure);
+		writer.WriteProperty(options, PropIgnoreMissing, value.IgnoreMissing);
+		writer.WriteProperty(options, PropKeep, value.Keep, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropOnFailure, value.OnFailure);
+		writer.WriteProperty(options, PropTag, value.Tag);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(RemoveProcessorConverter))]
 public sealed partial class RemoveProcessor
 {
 	/// <summary>
@@ -35,7 +140,6 @@ public sealed partial class RemoveProcessor
 	/// Useful for describing the purpose of the processor or its configuration.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("description")]
 	public string? Description { get; set; }
 
 	/// <summary>
@@ -43,8 +147,6 @@ public sealed partial class RemoveProcessor
 	/// Fields to be removed. Supports template snippets.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("field")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Fields Field { get; set; }
 
 	/// <summary>
@@ -52,7 +154,6 @@ public sealed partial class RemoveProcessor
 	/// Conditionally execute the processor.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("if")]
 	public string? If { get; set; }
 
 	/// <summary>
@@ -60,7 +161,6 @@ public sealed partial class RemoveProcessor
 	/// Ignore failures for the processor.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("ignore_failure")]
 	public bool? IgnoreFailure { get; set; }
 
 	/// <summary>
@@ -68,7 +168,6 @@ public sealed partial class RemoveProcessor
 	/// If <c>true</c> and <c>field</c> does not exist or is <c>null</c>, the processor quietly exits without modifying the document.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("ignore_missing")]
 	public bool? IgnoreMissing { get; set; }
 
 	/// <summary>
@@ -76,8 +175,6 @@ public sealed partial class RemoveProcessor
 	/// Fields to be kept. When set, all fields other than those specified are removed.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("keep")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Fields? Keep { get; set; }
 
 	/// <summary>
@@ -85,7 +182,6 @@ public sealed partial class RemoveProcessor
 	/// Handle failures for the processor.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("on_failure")]
 	public ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailure { get; set; }
 
 	/// <summary>
@@ -94,7 +190,6 @@ public sealed partial class RemoveProcessor
 	/// Useful for debugging and metrics.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("tag")]
 	public string? Tag { get; set; }
 
 	public static implicit operator Elastic.Clients.Elasticsearch.Ingest.Processor(RemoveProcessor removeProcessor) => Elastic.Clients.Elasticsearch.Ingest.Processor.Remove(removeProcessor);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/RerouteProcessor.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/RerouteProcessor.g.cs
index 2f92c5c108e..02117c67be3 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/RerouteProcessor.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/RerouteProcessor.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,110 @@
 
 namespace Elastic.Clients.Elasticsearch.Ingest;
 
+internal sealed partial class RerouteProcessorConverter : System.Text.Json.Serialization.JsonConverter<RerouteProcessor>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropDataset = System.Text.Json.JsonEncodedText.Encode("dataset");
+	private static readonly System.Text.Json.JsonEncodedText PropDescription = System.Text.Json.JsonEncodedText.Encode("description");
+	private static readonly System.Text.Json.JsonEncodedText PropDestination = System.Text.Json.JsonEncodedText.Encode("destination");
+	private static readonly System.Text.Json.JsonEncodedText PropIf = System.Text.Json.JsonEncodedText.Encode("if");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreFailure = System.Text.Json.JsonEncodedText.Encode("ignore_failure");
+	private static readonly System.Text.Json.JsonEncodedText PropNamespace = System.Text.Json.JsonEncodedText.Encode("namespace");
+	private static readonly System.Text.Json.JsonEncodedText PropOnFailure = System.Text.Json.JsonEncodedText.Encode("on_failure");
+	private static readonly System.Text.Json.JsonEncodedText PropTag = System.Text.Json.JsonEncodedText.Encode("tag");
+
+	public override RerouteProcessor Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propDataset = default;
+		LocalJsonProperty<string?> propDescription = default;
+		LocalJsonProperty<string?> propDestination = default;
+		LocalJsonProperty<string?> propIf = default;
+		LocalJsonProperty<bool?> propIgnoreFailure = default;
+		LocalJsonProperty<ICollection<string>?> propNamespace = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>?> propOnFailure = default;
+		LocalJsonProperty<string?> propTag = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propDataset.TryRead(ref reader, options, PropDataset, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propDescription.TryRead(ref reader, options, PropDescription))
+			{
+				continue;
+			}
+
+			if (propDestination.TryRead(ref reader, options, PropDestination))
+			{
+				continue;
+			}
+
+			if (propIf.TryRead(ref reader, options, PropIf))
+			{
+				continue;
+			}
+
+			if (propIgnoreFailure.TryRead(ref reader, options, PropIgnoreFailure))
+			{
+				continue;
+			}
+
+			if (propNamespace.TryRead(ref reader, options, PropNamespace, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propOnFailure.TryRead(ref reader, options, PropOnFailure))
+			{
+				continue;
+			}
+
+			if (propTag.TryRead(ref reader, options, PropTag))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new RerouteProcessor
+		{
+			Dataset = propDataset.Value
+,
+			Description = propDescription.Value
+,
+			Destination = propDestination.Value
+,
+			If = propIf.Value
+,
+			IgnoreFailure = propIgnoreFailure.Value
+,
+			Namespace = propNamespace.Value
+,
+			OnFailure = propOnFailure.Value
+,
+			Tag = propTag.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, RerouteProcessor value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDataset, value.Dataset, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropDescription, value.Description);
+		writer.WriteProperty(options, PropDestination, value.Destination);
+		writer.WriteProperty(options, PropIf, value.If);
+		writer.WriteProperty(options, PropIgnoreFailure, value.IgnoreFailure);
+		writer.WriteProperty(options, PropNamespace, value.Namespace, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropOnFailure, value.OnFailure);
+		writer.WriteProperty(options, PropTag, value.Tag);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(RerouteProcessorConverter))]
 public sealed partial class RerouteProcessor
 {
 	/// <summary>
@@ -44,8 +149,6 @@ public sealed partial class RerouteProcessor
 	/// default {{data_stream.dataset}}
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("dataset")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Dataset { get; set; }
 
 	/// <summary>
@@ -54,7 +157,6 @@ public sealed partial class RerouteProcessor
 	/// Useful for describing the purpose of the processor or its configuration.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("description")]
 	public string? Description { get; set; }
 
 	/// <summary>
@@ -62,7 +164,6 @@ public sealed partial class RerouteProcessor
 	/// A static value for the target. Can’t be set when the dataset or namespace option is set.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("destination")]
 	public string? Destination { get; set; }
 
 	/// <summary>
@@ -70,7 +171,6 @@ public sealed partial class RerouteProcessor
 	/// Conditionally execute the processor.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("if")]
 	public string? If { get; set; }
 
 	/// <summary>
@@ -78,7 +178,6 @@ public sealed partial class RerouteProcessor
 	/// Ignore failures for the processor.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("ignore_failure")]
 	public bool? IgnoreFailure { get; set; }
 
 	/// <summary>
@@ -95,8 +194,6 @@ public sealed partial class RerouteProcessor
 	/// default {{data_stream.namespace}}
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("namespace")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? Namespace { get; set; }
 
 	/// <summary>
@@ -104,7 +201,6 @@ public sealed partial class RerouteProcessor
 	/// Handle failures for the processor.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("on_failure")]
 	public ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailure { get; set; }
 
 	/// <summary>
@@ -113,7 +209,6 @@ public sealed partial class RerouteProcessor
 	/// Useful for debugging and metrics.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("tag")]
 	public string? Tag { get; set; }
 
 	public static implicit operator Elastic.Clients.Elasticsearch.Ingest.Processor(RerouteProcessor rerouteProcessor) => Elastic.Clients.Elasticsearch.Ingest.Processor.Reroute(rerouteProcessor);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/InlineGet.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/InlineGet.g.cs
index 8a7a7d95cd3..952c5ee8efb 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/InlineGet.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/InlineGet.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,76 +28,121 @@
 
 namespace Elastic.Clients.Elasticsearch;
 
-internal sealed partial class InlineGetConverter<TDocument> : JsonConverter<InlineGet<TDocument>>
+internal sealed partial class InlineGetConverter<TDocument> : System.Text.Json.Serialization.JsonConverter<InlineGet<TDocument>>
 {
-	public override InlineGet<TDocument> Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropMetadata = System.Text.Json.JsonEncodedText.Encode("metadata");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropFound = System.Text.Json.JsonEncodedText.Encode("found");
+	private static readonly System.Text.Json.JsonEncodedText PropPrimaryTerm = System.Text.Json.JsonEncodedText.Encode("_primary_term");
+	private static readonly System.Text.Json.JsonEncodedText PropRouting = System.Text.Json.JsonEncodedText.Encode("_routing");
+	private static readonly System.Text.Json.JsonEncodedText PropSeqNo = System.Text.Json.JsonEncodedText.Encode("_seq_no");
+	private static readonly System.Text.Json.JsonEncodedText PropSource = System.Text.Json.JsonEncodedText.Encode("_source");
+
+	public override InlineGet<TDocument> Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		IReadOnlyDictionary<string, object>? fields = default;
-		bool found = default;
-		long? primaryTerm = default;
-		string? routing = default;
-		long? seqNo = default;
-		TDocument? source = default;
-		Dictionary<string, object> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, object> propMetadata = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, object>?> propFields = default;
+		LocalJsonProperty<bool> propFound = default;
+		LocalJsonProperty<long?> propPrimaryTerm = default;
+		LocalJsonProperty<string?> propRouting = default;
+		LocalJsonProperty<long?> propSeqNo = default;
+		LocalJsonProperty<TDocument?> propSource = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propFound.TryRead(ref reader, options, PropFound))
+			{
+				continue;
+			}
+
+			if (propPrimaryTerm.TryRead(ref reader, options, PropPrimaryTerm))
+			{
+				continue;
+			}
+
+			if (propRouting.TryRead(ref reader, options, PropRouting))
+			{
+				continue;
+			}
+
+			if (propSeqNo.TryRead(ref reader, options, PropSeqNo))
+			{
+				continue;
+			}
+
+			if (propSource.TryRead(ref reader, options, PropSource, typeof(SourceMarker<TDocument?>)))
 			{
-				var property = reader.GetString();
-				if (property == "fields")
-				{
-					fields = JsonSerializer.Deserialize<IReadOnlyDictionary<string, object>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "found")
-				{
-					found = JsonSerializer.Deserialize<bool>(ref reader, options);
-					continue;
-				}
-
-				if (property == "_primary_term")
-				{
-					primaryTerm = JsonSerializer.Deserialize<long?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "_routing")
-				{
-					routing = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "_seq_no")
-				{
-					seqNo = JsonSerializer.Deserialize<long?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "_source")
-				{
-					source = JsonSerializer.Deserialize<TDocument?>(ref reader, options);
-					continue;
-				}
-
-				additionalProperties ??= new Dictionary<string, object>();
-				var additionalValue = JsonSerializer.Deserialize<object>(ref reader, options);
-				additionalProperties.Add(property, additionalValue);
+				continue;
 			}
+
+			propMetadata ??= new System.Collections.Generic.Dictionary<string, object>();
+			reader.ReadProperty(options, out string key, out object value);
+			propMetadata[key] = value;
 		}
 
-		return new InlineGet<TDocument> { Fields = fields, Found = found, Metadata = additionalProperties, PrimaryTerm = primaryTerm, Routing = routing, SeqNo = seqNo, Source = source };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new InlineGet<TDocument>
+		{
+			Metadata = propMetadata
+,
+			Fields = propFields.Value
+,
+			Found = propFound.Value
+,
+			PrimaryTerm = propPrimaryTerm.Value
+,
+			Routing = propRouting.Value
+,
+			SeqNo = propSeqNo.Value
+,
+			Source = propSource.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, InlineGet<TDocument> value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropFound, value.Found);
+		writer.WriteProperty(options, PropPrimaryTerm, value.PrimaryTerm);
+		writer.WriteProperty(options, PropRouting, value.Routing);
+		writer.WriteProperty(options, PropSeqNo, value.SeqNo);
+		writer.WriteProperty(options, PropSource, value.Source, typeof(SourceMarker<TDocument?>));
+		if (value.Metadata is not null)
+		{
+			foreach (var item in value.Metadata)
+			{
+				writer.WriteProperty(options, item.Key, item.Value);
+			}
+		}
+
+		writer.WriteEndObject();
+	}
+}
+
+internal sealed partial class InlineGetConverterFactory : System.Text.Json.Serialization.JsonConverterFactory
+{
+	public override bool CanConvert(System.Type typeToConvert)
+	{
+		return typeToConvert.IsGenericType && typeToConvert.GetGenericTypeDefinition() == typeof(InlineGet<>);
 	}
 
-	public override void Write(Utf8JsonWriter writer, InlineGet<TDocument> value, JsonSerializerOptions options)
+	public override System.Text.Json.Serialization.JsonConverter CreateConverter(System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'InlineGet' is a readonly type, used only on responses and does not support being written to JSON.");
+		var args = typeToConvert.GetGenericArguments();
+#pragma warning disable IL3050
+		var converter = (System.Text.Json.Serialization.JsonConverter)System.Activator.CreateInstance(typeof(InlineGetConverter<>).MakeGenericType(args[0]), System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public, binder: null, args: null, culture: null)!;
+#pragma warning restore IL3050
+		return converter;
 	}
 }
 
-[GenericConverter(typeof(InlineGetConverter<>), unwrap: true)]
+[JsonConverter(typeof(InlineGetConverterFactory))]
 public sealed partial class InlineGet<TDocument>
 {
 	public IReadOnlyDictionary<string, object>? Fields { get; init; }
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/KnnQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/KnnQuery.g.cs
index 8ef6b7429e7..0e2701c5a91 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/KnnQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/KnnQuery.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,120 @@
 
 namespace Elastic.Clients.Elasticsearch;
 
+internal sealed partial class KnnQueryConverter : System.Text.Json.Serialization.JsonConverter<KnnQuery>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropFilter = System.Text.Json.JsonEncodedText.Encode("filter");
+	private static readonly System.Text.Json.JsonEncodedText Propk = System.Text.Json.JsonEncodedText.Encode("k");
+	private static readonly System.Text.Json.JsonEncodedText PropNumCandidates = System.Text.Json.JsonEncodedText.Encode("num_candidates");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryName = System.Text.Json.JsonEncodedText.Encode("_name");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryVector = System.Text.Json.JsonEncodedText.Encode("query_vector");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryVectorBuilder = System.Text.Json.JsonEncodedText.Encode("query_vector_builder");
+	private static readonly System.Text.Json.JsonEncodedText PropSimilarity = System.Text.Json.JsonEncodedText.Encode("similarity");
+
+	public override KnnQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<float?> propBoost = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Field> propField = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.QueryDsl.Query>?> propFilter = default;
+		LocalJsonProperty<int?> propk = default;
+		LocalJsonProperty<int?> propNumCandidates = default;
+		LocalJsonProperty<string?> propQueryName = default;
+		LocalJsonProperty<ICollection<float>?> propQueryVector = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.QueryVectorBuilder?> propQueryVectorBuilder = default;
+		LocalJsonProperty<float?> propSimilarity = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
+
+			if (propField.TryRead(ref reader, options, PropField))
+			{
+				continue;
+			}
+
+			if (propFilter.TryRead(ref reader, options, PropFilter, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.QueryDsl.Query>?, Elastic.Clients.Elasticsearch.QueryDsl.Query>)))
+			{
+				continue;
+			}
+
+			if (propk.TryRead(ref reader, options, Propk))
+			{
+				continue;
+			}
+
+			if (propNumCandidates.TryRead(ref reader, options, PropNumCandidates))
+			{
+				continue;
+			}
+
+			if (propQueryName.TryRead(ref reader, options, PropQueryName))
+			{
+				continue;
+			}
+
+			if (propQueryVector.TryRead(ref reader, options, PropQueryVector))
+			{
+				continue;
+			}
+
+			if (propQueryVectorBuilder.TryRead(ref reader, options, PropQueryVectorBuilder))
+			{
+				continue;
+			}
+
+			if (propSimilarity.TryRead(ref reader, options, PropSimilarity))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new KnnQuery
+		{
+			Boost = propBoost.Value
+,
+			Field = propField.Value
+,
+			Filter = propFilter.Value
+,
+			k = propk.Value
+,
+			NumCandidates = propNumCandidates.Value
+,
+			QueryName = propQueryName.Value
+,
+			QueryVector = propQueryVector.Value
+,
+			QueryVectorBuilder = propQueryVectorBuilder.Value
+,
+			Similarity = propSimilarity.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, KnnQuery value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropField, value.Field);
+		writer.WriteProperty(options, PropFilter, value.Filter, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.QueryDsl.Query>?, Elastic.Clients.Elasticsearch.QueryDsl.Query>));
+		writer.WriteProperty(options, Propk, value.k);
+		writer.WriteProperty(options, PropNumCandidates, value.NumCandidates);
+		writer.WriteProperty(options, PropQueryName, value.QueryName);
+		writer.WriteProperty(options, PropQueryVector, value.QueryVector);
+		writer.WriteProperty(options, PropQueryVectorBuilder, value.QueryVectorBuilder);
+		writer.WriteProperty(options, PropSimilarity, value.Similarity);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(KnnQueryConverter))]
 public sealed partial class KnnQuery
 {
 	/// <summary>
@@ -37,7 +152,6 @@ public sealed partial class KnnQuery
 	/// A value greater than 1.0 increases the relevance score.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("boost")]
 	public float? Boost { get; set; }
 
 	/// <summary>
@@ -45,7 +159,6 @@ public sealed partial class KnnQuery
 	/// The name of the vector field to search against
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("field")]
 	public Elastic.Clients.Elasticsearch.Field Field { get; set; }
 
 	/// <summary>
@@ -53,8 +166,6 @@ public sealed partial class KnnQuery
 	/// 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>
@@ -62,7 +173,6 @@ public sealed partial class KnnQuery
 	/// The final number of nearest neighbors to return as top hits
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("k")]
 	public int? k { get; set; }
 
 	/// <summary>
@@ -70,9 +180,7 @@ public sealed partial class KnnQuery
 	/// The number of nearest neighbor candidates to consider per shard
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("num_candidates")]
 	public int? NumCandidates { get; set; }
-	[JsonInclude, JsonPropertyName("_name")]
 	public string? QueryName { get; set; }
 
 	/// <summary>
@@ -80,7 +188,6 @@ public sealed partial class KnnQuery
 	/// The query vector
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("query_vector")]
 	public ICollection<float>? QueryVector { get; set; }
 
 	/// <summary>
@@ -88,7 +195,6 @@ public sealed partial class KnnQuery
 	/// The query vector builder. You must provide a query_vector_builder or query_vector, but not both.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("query_vector_builder")]
 	public Elastic.Clients.Elasticsearch.QueryVectorBuilder? QueryVectorBuilder { get; set; }
 
 	/// <summary>
@@ -96,7 +202,6 @@ public sealed partial class KnnQuery
 	/// The minimum similarity for a vector to be considered a match
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("similarity")]
 	public float? Similarity { get; set; }
 
 	public static implicit operator Elastic.Clients.Elasticsearch.QueryDsl.Query(KnnQuery knnQuery) => Elastic.Clients.Elasticsearch.QueryDsl.Query.Knn(knnQuery);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/KnnRetriever.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/KnnRetriever.g.cs
index effdb6f24c5..69c8df711c4 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/KnnRetriever.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/KnnRetriever.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,110 @@
 
 namespace Elastic.Clients.Elasticsearch;
 
+internal sealed partial class KnnRetrieverConverter : System.Text.Json.Serialization.JsonConverter<KnnRetriever>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropFilter = System.Text.Json.JsonEncodedText.Encode("filter");
+	private static readonly System.Text.Json.JsonEncodedText Propk = System.Text.Json.JsonEncodedText.Encode("k");
+	private static readonly System.Text.Json.JsonEncodedText PropMinScore = System.Text.Json.JsonEncodedText.Encode("min_score");
+	private static readonly System.Text.Json.JsonEncodedText PropNumCandidates = System.Text.Json.JsonEncodedText.Encode("num_candidates");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryVector = System.Text.Json.JsonEncodedText.Encode("query_vector");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryVectorBuilder = System.Text.Json.JsonEncodedText.Encode("query_vector_builder");
+	private static readonly System.Text.Json.JsonEncodedText PropSimilarity = System.Text.Json.JsonEncodedText.Encode("similarity");
+
+	public override KnnRetriever Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propField = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.QueryDsl.Query>?> propFilter = default;
+		LocalJsonProperty<int> propk = default;
+		LocalJsonProperty<float?> propMinScore = default;
+		LocalJsonProperty<int> propNumCandidates = default;
+		LocalJsonProperty<ICollection<float>?> propQueryVector = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.QueryVectorBuilder?> propQueryVectorBuilder = default;
+		LocalJsonProperty<float?> propSimilarity = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propField.TryRead(ref reader, options, PropField))
+			{
+				continue;
+			}
+
+			if (propFilter.TryRead(ref reader, options, PropFilter, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.QueryDsl.Query>?, Elastic.Clients.Elasticsearch.QueryDsl.Query>)))
+			{
+				continue;
+			}
+
+			if (propk.TryRead(ref reader, options, Propk))
+			{
+				continue;
+			}
+
+			if (propMinScore.TryRead(ref reader, options, PropMinScore))
+			{
+				continue;
+			}
+
+			if (propNumCandidates.TryRead(ref reader, options, PropNumCandidates))
+			{
+				continue;
+			}
+
+			if (propQueryVector.TryRead(ref reader, options, PropQueryVector))
+			{
+				continue;
+			}
+
+			if (propQueryVectorBuilder.TryRead(ref reader, options, PropQueryVectorBuilder))
+			{
+				continue;
+			}
+
+			if (propSimilarity.TryRead(ref reader, options, PropSimilarity))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new KnnRetriever
+		{
+			Field = propField.Value
+,
+			Filter = propFilter.Value
+,
+			k = propk.Value
+,
+			MinScore = propMinScore.Value
+,
+			NumCandidates = propNumCandidates.Value
+,
+			QueryVector = propQueryVector.Value
+,
+			QueryVectorBuilder = propQueryVectorBuilder.Value
+,
+			Similarity = propSimilarity.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, KnnRetriever value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropField, value.Field);
+		writer.WriteProperty(options, PropFilter, value.Filter, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.QueryDsl.Query>?, Elastic.Clients.Elasticsearch.QueryDsl.Query>));
+		writer.WriteProperty(options, Propk, value.k);
+		writer.WriteProperty(options, PropMinScore, value.MinScore);
+		writer.WriteProperty(options, PropNumCandidates, value.NumCandidates);
+		writer.WriteProperty(options, PropQueryVector, value.QueryVector);
+		writer.WriteProperty(options, PropQueryVectorBuilder, value.QueryVectorBuilder);
+		writer.WriteProperty(options, PropSimilarity, value.Similarity);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(KnnRetrieverConverter))]
 public sealed partial class KnnRetriever
 {
 	/// <summary>
@@ -34,7 +139,6 @@ public sealed partial class KnnRetriever
 	/// The name of the vector field to search against.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("field")]
 	public string Field { get; set; }
 
 	/// <summary>
@@ -42,8 +146,6 @@ public sealed partial class KnnRetriever
 	/// Query to filter the documents that can match.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("filter")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.QueryDsl.Query))]
 	public ICollection<Elastic.Clients.Elasticsearch.QueryDsl.Query>? Filter { get; set; }
 
 	/// <summary>
@@ -51,7 +153,6 @@ public sealed partial class KnnRetriever
 	/// Number of nearest neighbors to return as top hits.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("k")]
 	public int k { get; set; }
 
 	/// <summary>
@@ -59,7 +160,6 @@ public sealed partial class KnnRetriever
 	/// Minimum _score for matching documents. Documents with a lower _score are not included in the top documents.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("min_score")]
 	public float? MinScore { get; set; }
 
 	/// <summary>
@@ -67,7 +167,6 @@ public sealed partial class KnnRetriever
 	/// Number of nearest neighbor candidates to consider per shard.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("num_candidates")]
 	public int NumCandidates { get; set; }
 
 	/// <summary>
@@ -75,7 +174,6 @@ public sealed partial class KnnRetriever
 	/// Query vector. Must have the same number of dimensions as the vector field you are searching against. You must provide a query_vector_builder or query_vector, but not both.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("query_vector")]
 	public ICollection<float>? QueryVector { get; set; }
 
 	/// <summary>
@@ -83,7 +181,6 @@ public sealed partial class KnnRetriever
 	/// Defines a model to build a query vector.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("query_vector_builder")]
 	public Elastic.Clients.Elasticsearch.QueryVectorBuilder? QueryVectorBuilder { get; set; }
 
 	/// <summary>
@@ -91,7 +188,6 @@ public sealed partial class KnnRetriever
 	/// The minimum similarity required for a document to be considered a match.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("similarity")]
 	public float? Similarity { get; set; }
 
 	public static implicit operator Elastic.Clients.Elasticsearch.Retriever(KnnRetriever knnRetriever) => Elastic.Clients.Elasticsearch.Retriever.Knn(knnRetriever);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/KnnSearch.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/KnnSearch.g.cs
index a3a664f8101..cced337c6b4 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/KnnSearch.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/KnnSearch.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,120 @@
 
 namespace Elastic.Clients.Elasticsearch;
 
+internal sealed partial class KnnSearchConverter : System.Text.Json.Serialization.JsonConverter<KnnSearch>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropFilter = System.Text.Json.JsonEncodedText.Encode("filter");
+	private static readonly System.Text.Json.JsonEncodedText PropInnerHits = System.Text.Json.JsonEncodedText.Encode("inner_hits");
+	private static readonly System.Text.Json.JsonEncodedText Propk = System.Text.Json.JsonEncodedText.Encode("k");
+	private static readonly System.Text.Json.JsonEncodedText PropNumCandidates = System.Text.Json.JsonEncodedText.Encode("num_candidates");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryVector = System.Text.Json.JsonEncodedText.Encode("query_vector");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryVectorBuilder = System.Text.Json.JsonEncodedText.Encode("query_vector_builder");
+	private static readonly System.Text.Json.JsonEncodedText PropSimilarity = System.Text.Json.JsonEncodedText.Encode("similarity");
+
+	public override KnnSearch Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<float?> propBoost = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Field> propField = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.QueryDsl.Query>?> propFilter = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Core.Search.InnerHits?> propInnerHits = default;
+		LocalJsonProperty<int?> propk = default;
+		LocalJsonProperty<int?> propNumCandidates = default;
+		LocalJsonProperty<ICollection<float>?> propQueryVector = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.QueryVectorBuilder?> propQueryVectorBuilder = default;
+		LocalJsonProperty<float?> propSimilarity = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
+
+			if (propField.TryRead(ref reader, options, PropField))
+			{
+				continue;
+			}
+
+			if (propFilter.TryRead(ref reader, options, PropFilter, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.QueryDsl.Query>?, Elastic.Clients.Elasticsearch.QueryDsl.Query>)))
+			{
+				continue;
+			}
+
+			if (propInnerHits.TryRead(ref reader, options, PropInnerHits))
+			{
+				continue;
+			}
+
+			if (propk.TryRead(ref reader, options, Propk))
+			{
+				continue;
+			}
+
+			if (propNumCandidates.TryRead(ref reader, options, PropNumCandidates))
+			{
+				continue;
+			}
+
+			if (propQueryVector.TryRead(ref reader, options, PropQueryVector))
+			{
+				continue;
+			}
+
+			if (propQueryVectorBuilder.TryRead(ref reader, options, PropQueryVectorBuilder))
+			{
+				continue;
+			}
+
+			if (propSimilarity.TryRead(ref reader, options, PropSimilarity))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new KnnSearch
+		{
+			Boost = propBoost.Value
+,
+			Field = propField.Value
+,
+			Filter = propFilter.Value
+,
+			InnerHits = propInnerHits.Value
+,
+			k = propk.Value
+,
+			NumCandidates = propNumCandidates.Value
+,
+			QueryVector = propQueryVector.Value
+,
+			QueryVectorBuilder = propQueryVectorBuilder.Value
+,
+			Similarity = propSimilarity.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, KnnSearch value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropField, value.Field);
+		writer.WriteProperty(options, PropFilter, value.Filter, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.QueryDsl.Query>?, Elastic.Clients.Elasticsearch.QueryDsl.Query>));
+		writer.WriteProperty(options, PropInnerHits, value.InnerHits);
+		writer.WriteProperty(options, Propk, value.k);
+		writer.WriteProperty(options, PropNumCandidates, value.NumCandidates);
+		writer.WriteProperty(options, PropQueryVector, value.QueryVector);
+		writer.WriteProperty(options, PropQueryVectorBuilder, value.QueryVectorBuilder);
+		writer.WriteProperty(options, PropSimilarity, value.Similarity);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(KnnSearchConverter))]
 public sealed partial class KnnSearch
 {
 	/// <summary>
@@ -34,7 +149,6 @@ public sealed partial class KnnSearch
 	/// Boost value to apply to kNN scores
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("boost")]
 	public float? Boost { get; set; }
 
 	/// <summary>
@@ -42,7 +156,6 @@ public sealed partial class KnnSearch
 	/// The name of the vector field to search against
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("field")]
 	public Elastic.Clients.Elasticsearch.Field Field { get; set; }
 
 	/// <summary>
@@ -50,8 +163,6 @@ public sealed partial class KnnSearch
 	/// 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>
@@ -59,7 +170,6 @@ public sealed partial class KnnSearch
 	/// If defined, each search hit will contain inner hits.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("inner_hits")]
 	public Elastic.Clients.Elasticsearch.Core.Search.InnerHits? InnerHits { get; set; }
 
 	/// <summary>
@@ -67,7 +177,6 @@ public sealed partial class KnnSearch
 	/// The final number of nearest neighbors to return as top hits
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("k")]
 	public int? k { get; set; }
 
 	/// <summary>
@@ -75,7 +184,6 @@ public sealed partial class KnnSearch
 	/// The number of nearest neighbor candidates to consider per shard
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("num_candidates")]
 	public int? NumCandidates { get; set; }
 
 	/// <summary>
@@ -83,7 +191,6 @@ public sealed partial class KnnSearch
 	/// The query vector
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("query_vector")]
 	public ICollection<float>? QueryVector { get; set; }
 
 	/// <summary>
@@ -91,7 +198,6 @@ public sealed partial class KnnSearch
 	/// The query vector builder. You must provide a query_vector_builder or query_vector, but not both.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("query_vector_builder")]
 	public Elastic.Clients.Elasticsearch.QueryVectorBuilder? QueryVectorBuilder { get; set; }
 
 	/// <summary>
@@ -99,7 +205,6 @@ public sealed partial class KnnSearch
 	/// The minimum similarity for a vector to be considered a match
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("similarity")]
 	public float? Similarity { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/MachineLearning/AnalysisConfig.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/MachineLearning/AnalysisConfig.g.cs
index 317b1ad5cbb..d22f631e842 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/MachineLearning/AnalysisConfig.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/MachineLearning/AnalysisConfig.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,140 @@
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
+internal sealed partial class AnalysisConfigConverter : System.Text.Json.Serialization.JsonConverter<AnalysisConfig>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropBucketSpan = System.Text.Json.JsonEncodedText.Encode("bucket_span");
+	private static readonly System.Text.Json.JsonEncodedText PropCategorizationAnalyzer = System.Text.Json.JsonEncodedText.Encode("categorization_analyzer");
+	private static readonly System.Text.Json.JsonEncodedText PropCategorizationFieldName = System.Text.Json.JsonEncodedText.Encode("categorization_field_name");
+	private static readonly System.Text.Json.JsonEncodedText PropCategorizationFilters = System.Text.Json.JsonEncodedText.Encode("categorization_filters");
+	private static readonly System.Text.Json.JsonEncodedText PropDetectors = System.Text.Json.JsonEncodedText.Encode("detectors");
+	private static readonly System.Text.Json.JsonEncodedText PropInfluencers = System.Text.Json.JsonEncodedText.Encode("influencers");
+	private static readonly System.Text.Json.JsonEncodedText PropLatency = System.Text.Json.JsonEncodedText.Encode("latency");
+	private static readonly System.Text.Json.JsonEncodedText PropModelPruneWindow = System.Text.Json.JsonEncodedText.Encode("model_prune_window");
+	private static readonly System.Text.Json.JsonEncodedText PropMultivariateByFields = System.Text.Json.JsonEncodedText.Encode("multivariate_by_fields");
+	private static readonly System.Text.Json.JsonEncodedText PropPerPartitionCategorization = System.Text.Json.JsonEncodedText.Encode("per_partition_categorization");
+	private static readonly System.Text.Json.JsonEncodedText PropSummaryCountFieldName = System.Text.Json.JsonEncodedText.Encode("summary_count_field_name");
+
+	public override AnalysisConfig Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Duration?> propBucketSpan = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.MachineLearning.CategorizationAnalyzer?> propCategorizationAnalyzer = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Field?> propCategorizationFieldName = default;
+		LocalJsonProperty<ICollection<string>?> propCategorizationFilters = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.MachineLearning.Detector>> propDetectors = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Fields?> propInfluencers = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Duration?> propLatency = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Duration?> propModelPruneWindow = default;
+		LocalJsonProperty<bool?> propMultivariateByFields = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.MachineLearning.PerPartitionCategorization?> propPerPartitionCategorization = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Field?> propSummaryCountFieldName = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBucketSpan.TryRead(ref reader, options, PropBucketSpan))
+			{
+				continue;
+			}
+
+			if (propCategorizationAnalyzer.TryRead(ref reader, options, PropCategorizationAnalyzer))
+			{
+				continue;
+			}
+
+			if (propCategorizationFieldName.TryRead(ref reader, options, PropCategorizationFieldName))
+			{
+				continue;
+			}
+
+			if (propCategorizationFilters.TryRead(ref reader, options, PropCategorizationFilters))
+			{
+				continue;
+			}
+
+			if (propDetectors.TryRead(ref reader, options, PropDetectors))
+			{
+				continue;
+			}
+
+			if (propInfluencers.TryRead(ref reader, options, PropInfluencers, typeof(FieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propLatency.TryRead(ref reader, options, PropLatency))
+			{
+				continue;
+			}
+
+			if (propModelPruneWindow.TryRead(ref reader, options, PropModelPruneWindow))
+			{
+				continue;
+			}
+
+			if (propMultivariateByFields.TryRead(ref reader, options, PropMultivariateByFields))
+			{
+				continue;
+			}
+
+			if (propPerPartitionCategorization.TryRead(ref reader, options, PropPerPartitionCategorization))
+			{
+				continue;
+			}
+
+			if (propSummaryCountFieldName.TryRead(ref reader, options, PropSummaryCountFieldName))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new AnalysisConfig
+		{
+			BucketSpan = propBucketSpan.Value
+,
+			CategorizationAnalyzer = propCategorizationAnalyzer.Value
+,
+			CategorizationFieldName = propCategorizationFieldName.Value
+,
+			CategorizationFilters = propCategorizationFilters.Value
+,
+			Detectors = propDetectors.Value
+,
+			Influencers = propInfluencers.Value
+,
+			Latency = propLatency.Value
+,
+			ModelPruneWindow = propModelPruneWindow.Value
+,
+			MultivariateByFields = propMultivariateByFields.Value
+,
+			PerPartitionCategorization = propPerPartitionCategorization.Value
+,
+			SummaryCountFieldName = propSummaryCountFieldName.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, AnalysisConfig value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBucketSpan, value.BucketSpan);
+		writer.WriteProperty(options, PropCategorizationAnalyzer, value.CategorizationAnalyzer);
+		writer.WriteProperty(options, PropCategorizationFieldName, value.CategorizationFieldName);
+		writer.WriteProperty(options, PropCategorizationFilters, value.CategorizationFilters);
+		writer.WriteProperty(options, PropDetectors, value.Detectors);
+		writer.WriteProperty(options, PropInfluencers, value.Influencers, typeof(FieldsMarker));
+		writer.WriteProperty(options, PropLatency, value.Latency);
+		writer.WriteProperty(options, PropModelPruneWindow, value.ModelPruneWindow);
+		writer.WriteProperty(options, PropMultivariateByFields, value.MultivariateByFields);
+		writer.WriteProperty(options, PropPerPartitionCategorization, value.PerPartitionCategorization);
+		writer.WriteProperty(options, PropSummaryCountFieldName, value.SummaryCountFieldName);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(AnalysisConfigConverter))]
 public sealed partial class AnalysisConfig
 {
 	/// <summary>
@@ -35,7 +170,6 @@ public sealed partial class AnalysisConfig
 	/// whole number of buckets in one day. If the anomaly detection job uses a datafeed with aggregations, this value must also be divisible by the interval of the date histogram aggregation.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("bucket_span")]
 	public Elastic.Clients.Elasticsearch.Duration? BucketSpan { get; set; }
 
 	/// <summary>
@@ -43,7 +177,6 @@ public sealed partial class AnalysisConfig
 	/// If <c>categorization_field_name</c> is specified, you can also define the analyzer that is used to interpret the categorization field. This property cannot be used at the same time as <c>categorization_filters</c>. The categorization analyzer specifies how the <c>categorization_field</c> is interpreted by the categorization process. The <c>categorization_analyzer</c> field can be specified either as a string or as an object. If it is a string, it must refer to a built-in analyzer or one added by another plugin.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("categorization_analyzer")]
 	public Elastic.Clients.Elasticsearch.MachineLearning.CategorizationAnalyzer? CategorizationAnalyzer { get; set; }
 
 	/// <summary>
@@ -51,7 +184,6 @@ public sealed partial class AnalysisConfig
 	/// If this property is specified, the values of the specified field will be categorized. The resulting categories must be used in a detector by setting <c>by_field_name</c>, <c>over_field_name</c>, or <c>partition_field_name</c> to the keyword <c>mlcategory</c>.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("categorization_field_name")]
 	public Elastic.Clients.Elasticsearch.Field? CategorizationFieldName { get; set; }
 
 	/// <summary>
@@ -59,7 +191,6 @@ public sealed partial class AnalysisConfig
 	/// If <c>categorization_field_name</c> is specified, you can also define optional filters. This property expects an array of regular expressions. The expressions are used to filter out matching sequences from the categorization field values. You can use this functionality to fine tune the categorization by excluding sequences from consideration when categories are defined. For example, you can exclude SQL statements that appear in your log files. This property cannot be used at the same time as <c>categorization_analyzer</c>. If you only want to define simple regular expression filters that are applied prior to tokenization, setting this property is the easiest method. If you also want to customize the tokenizer or post-tokenization filtering, use the <c>categorization_analyzer</c> property instead and include the filters as pattern_replace character filters. The effect is exactly the same.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("categorization_filters")]
 	public ICollection<string>? CategorizationFilters { get; set; }
 
 	/// <summary>
@@ -67,7 +198,6 @@ public sealed partial class AnalysisConfig
 	/// Detector configuration objects specify which data fields a job analyzes. They also specify which analytical functions are used. You can specify multiple detectors for a job. If the detectors array does not contain at least one detector, no analysis can occur and an error is returned.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("detectors")]
 	public ICollection<Elastic.Clients.Elasticsearch.MachineLearning.Detector> Detectors { get; set; }
 
 	/// <summary>
@@ -75,8 +205,6 @@ public sealed partial class AnalysisConfig
 	/// A comma separated list of influencer field names. Typically these can be the by, over, or partition fields that are used in the detector configuration. You might also want to use a field name that is not specifically named in a detector, but is available as part of the input data. When you use multiple detectors, the use of influencers is recommended as it aggregates results for each influencer entity.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("influencers")]
-	[JsonConverter(typeof(FieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Fields? Influencers { get; set; }
 
 	/// <summary>
@@ -84,7 +212,6 @@ public sealed partial class AnalysisConfig
 	/// The size of the window in which to expect data that is out of time order. If you specify a non-zero value, it must be greater than or equal to one second. NOTE: Latency is applicable only when you send data by using the post data API.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("latency")]
 	public Elastic.Clients.Elasticsearch.Duration? Latency { get; set; }
 
 	/// <summary>
@@ -92,7 +219,6 @@ public sealed partial class AnalysisConfig
 	/// Advanced configuration option. Affects the pruning of models that have not been updated for the given time duration. The value must be set to a multiple of the <c>bucket_span</c>. If set too low, important information may be removed from the model. For jobs created in 8.1 and later, the default value is the greater of <c>30d</c> or 20 times <c>bucket_span</c>.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("model_prune_window")]
 	public Elastic.Clients.Elasticsearch.Duration? ModelPruneWindow { get; set; }
 
 	/// <summary>
@@ -100,7 +226,6 @@ public sealed partial class AnalysisConfig
 	/// This functionality is reserved for internal use. It is not supported for use in customer environments and is not subject to the support SLA of official GA features. If set to <c>true</c>, the analysis will automatically find correlations between metrics for a given by field value and report anomalies when those correlations cease to hold. For example, suppose CPU and memory usage on host A is usually highly correlated with the same metrics on host B. Perhaps this correlation occurs because they are running a load-balanced application. If you enable this property, anomalies will be reported when, for example, CPU usage on host A is high and the value of CPU usage on host B is low. That is to say, you’ll see an anomaly when the CPU of host A is unusual given the CPU of host B. To use the <c>multivariate_by_fields</c> property, you must also specify <c>by_field_name</c> in your detector.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("multivariate_by_fields")]
 	public bool? MultivariateByFields { get; set; }
 
 	/// <summary>
@@ -108,7 +233,6 @@ public sealed partial class AnalysisConfig
 	/// Settings related to how categorization interacts with partition fields.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("per_partition_categorization")]
 	public Elastic.Clients.Elasticsearch.MachineLearning.PerPartitionCategorization? PerPartitionCategorization { get; set; }
 
 	/// <summary>
@@ -116,7 +240,6 @@ public sealed partial class AnalysisConfig
 	/// If this property is specified, the data that is fed to the job is expected to be pre-summarized. This property value is the name of the field that contains the count of raw data points that have been summarized. The same <c>summary_count_field_name</c> applies to all detectors in the job. NOTE: The <c>summary_count_field_name</c> property cannot be used with the <c>metric</c> function.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("summary_count_field_name")]
 	public Elastic.Clients.Elasticsearch.Field? SummaryCountFieldName { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/MachineLearning/Datafeed.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/MachineLearning/Datafeed.g.cs
index 399bbc72bc7..48fb86c9a77 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/MachineLearning/Datafeed.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/MachineLearning/Datafeed.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,137 +28,187 @@
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
-internal sealed partial class DatafeedConverter : JsonConverter<Datafeed>
+internal sealed partial class DatafeedConverter : System.Text.Json.Serialization.JsonConverter<Datafeed>
 {
-	public override Datafeed Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations1 = System.Text.Json.JsonEncodedText.Encode("aggs");
+	private static readonly System.Text.Json.JsonEncodedText PropAuthorization = System.Text.Json.JsonEncodedText.Encode("authorization");
+	private static readonly System.Text.Json.JsonEncodedText PropChunkingConfig = System.Text.Json.JsonEncodedText.Encode("chunking_config");
+	private static readonly System.Text.Json.JsonEncodedText PropDatafeedId = System.Text.Json.JsonEncodedText.Encode("datafeed_id");
+	private static readonly System.Text.Json.JsonEncodedText PropDelayedDataCheckConfig = System.Text.Json.JsonEncodedText.Encode("delayed_data_check_config");
+	private static readonly System.Text.Json.JsonEncodedText PropFrequency = System.Text.Json.JsonEncodedText.Encode("frequency");
+	private static readonly System.Text.Json.JsonEncodedText PropIndexes = System.Text.Json.JsonEncodedText.Encode("indexes");
+	private static readonly System.Text.Json.JsonEncodedText PropIndices = System.Text.Json.JsonEncodedText.Encode("indices");
+	private static readonly System.Text.Json.JsonEncodedText PropIndicesOptions = System.Text.Json.JsonEncodedText.Encode("indices_options");
+	private static readonly System.Text.Json.JsonEncodedText PropJobId = System.Text.Json.JsonEncodedText.Encode("job_id");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxEmptySearches = System.Text.Json.JsonEncodedText.Encode("max_empty_searches");
+	private static readonly System.Text.Json.JsonEncodedText PropQuery = System.Text.Json.JsonEncodedText.Encode("query");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryDelay = System.Text.Json.JsonEncodedText.Encode("query_delay");
+	private static readonly System.Text.Json.JsonEncodedText PropRuntimeMappings = System.Text.Json.JsonEncodedText.Encode("runtime_mappings");
+	private static readonly System.Text.Json.JsonEncodedText PropScriptFields = System.Text.Json.JsonEncodedText.Encode("script_fields");
+	private static readonly System.Text.Json.JsonEncodedText PropScrollSize = System.Text.Json.JsonEncodedText.Encode("scroll_size");
+
+	public override Datafeed Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Aggregations.Aggregation>? aggregations = default;
-		Elastic.Clients.Elasticsearch.MachineLearning.DatafeedAuthorization? authorization = default;
-		Elastic.Clients.Elasticsearch.MachineLearning.ChunkingConfig? chunkingConfig = default;
-		string datafeedId = default;
-		Elastic.Clients.Elasticsearch.MachineLearning.DelayedDataCheckConfig delayedDataCheckConfig = default;
-		Elastic.Clients.Elasticsearch.Duration? frequency = default;
-		IReadOnlyCollection<string>? indexes = default;
-		IReadOnlyCollection<string> indices = default;
-		Elastic.Clients.Elasticsearch.IndicesOptions? indicesOptions = default;
-		string jobId = default;
-		int? maxEmptySearches = default;
-		Elastic.Clients.Elasticsearch.QueryDsl.Query query = default;
-		Elastic.Clients.Elasticsearch.Duration? queryDelay = default;
-		IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>? runtimeMappings = default;
-		IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.ScriptField>? scriptFields = default;
-		int? scrollSize = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Aggregations.Aggregation>?> propAggregations = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.MachineLearning.DatafeedAuthorization?> propAuthorization = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.MachineLearning.ChunkingConfig?> propChunkingConfig = default;
+		LocalJsonProperty<string> propDatafeedId = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.MachineLearning.DelayedDataCheckConfig> propDelayedDataCheckConfig = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Duration?> propFrequency = default;
+		LocalJsonProperty<IReadOnlyCollection<string>?> propIndexes = default;
+		LocalJsonProperty<IReadOnlyCollection<string>> propIndices = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.IndicesOptions?> propIndicesOptions = default;
+		LocalJsonProperty<string> propJobId = default;
+		LocalJsonProperty<int?> propMaxEmptySearches = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.QueryDsl.Query> propQuery = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Duration?> propQueryDelay = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>?> propRuntimeMappings = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.ScriptField>?> propScriptFields = default;
+		LocalJsonProperty<int?> propScrollSize = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
-			{
-				var property = reader.GetString();
-				if (property == "aggregations" || property == "aggs")
-				{
-					aggregations = JsonSerializer.Deserialize<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Aggregations.Aggregation>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "authorization")
-				{
-					authorization = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.MachineLearning.DatafeedAuthorization?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "chunking_config")
-				{
-					chunkingConfig = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.MachineLearning.ChunkingConfig?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "datafeed_id")
-				{
-					datafeedId = JsonSerializer.Deserialize<string>(ref reader, options);
-					continue;
-				}
-
-				if (property == "delayed_data_check_config")
-				{
-					delayedDataCheckConfig = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.MachineLearning.DelayedDataCheckConfig>(ref reader, options);
-					continue;
-				}
-
-				if (property == "frequency")
-				{
-					frequency = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Duration?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "indexes")
-				{
-					indexes = JsonSerializer.Deserialize<IReadOnlyCollection<string>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "indices")
-				{
-					indices = JsonSerializer.Deserialize<IReadOnlyCollection<string>>(ref reader, options);
-					continue;
-				}
-
-				if (property == "indices_options")
-				{
-					indicesOptions = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.IndicesOptions?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "job_id")
-				{
-					jobId = JsonSerializer.Deserialize<string>(ref reader, options);
-					continue;
-				}
-
-				if (property == "max_empty_searches")
-				{
-					maxEmptySearches = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "query")
-				{
-					query = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.Query>(ref reader, options);
-					continue;
-				}
-
-				if (property == "query_delay")
-				{
-					queryDelay = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Duration?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "runtime_mappings")
-				{
-					runtimeMappings = JsonSerializer.Deserialize<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "script_fields")
-				{
-					scriptFields = JsonSerializer.Deserialize<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.ScriptField>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "scroll_size")
-				{
-					scrollSize = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
+			if (propAggregations.TryRead(ref reader, options, PropAggregations) || propAggregations.TryRead(ref reader, options, PropAggregations1))
+			{
+				continue;
+			}
+
+			if (propAuthorization.TryRead(ref reader, options, PropAuthorization))
+			{
+				continue;
+			}
+
+			if (propChunkingConfig.TryRead(ref reader, options, PropChunkingConfig))
+			{
+				continue;
+			}
+
+			if (propDatafeedId.TryRead(ref reader, options, PropDatafeedId))
+			{
+				continue;
+			}
+
+			if (propDelayedDataCheckConfig.TryRead(ref reader, options, PropDelayedDataCheckConfig))
+			{
+				continue;
+			}
+
+			if (propFrequency.TryRead(ref reader, options, PropFrequency))
+			{
+				continue;
+			}
+
+			if (propIndexes.TryRead(ref reader, options, PropIndexes))
+			{
+				continue;
+			}
+
+			if (propIndices.TryRead(ref reader, options, PropIndices))
+			{
+				continue;
+			}
+
+			if (propIndicesOptions.TryRead(ref reader, options, PropIndicesOptions))
+			{
+				continue;
+			}
+
+			if (propJobId.TryRead(ref reader, options, PropJobId))
+			{
+				continue;
+			}
+
+			if (propMaxEmptySearches.TryRead(ref reader, options, PropMaxEmptySearches))
+			{
+				continue;
+			}
+
+			if (propQuery.TryRead(ref reader, options, PropQuery))
+			{
+				continue;
+			}
+
+			if (propQueryDelay.TryRead(ref reader, options, PropQueryDelay))
+			{
+				continue;
+			}
+
+			if (propRuntimeMappings.TryRead(ref reader, options, PropRuntimeMappings))
+			{
+				continue;
+			}
+
+			if (propScriptFields.TryRead(ref reader, options, PropScriptFields))
+			{
+				continue;
+			}
+
+			if (propScrollSize.TryRead(ref reader, options, PropScrollSize))
+			{
+				continue;
 			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		return new Datafeed { Aggregations = aggregations, Authorization = authorization, ChunkingConfig = chunkingConfig, DatafeedId = datafeedId, DelayedDataCheckConfig = delayedDataCheckConfig, Frequency = frequency, Indexes = indexes, Indices = indices, IndicesOptions = indicesOptions, JobId = jobId, MaxEmptySearches = maxEmptySearches, Query = query, QueryDelay = queryDelay, RuntimeMappings = runtimeMappings, ScriptFields = scriptFields, ScrollSize = scrollSize };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new Datafeed
+		{
+			Aggregations = propAggregations.Value
+,
+			Authorization = propAuthorization.Value
+,
+			ChunkingConfig = propChunkingConfig.Value
+,
+			DatafeedId = propDatafeedId.Value
+,
+			DelayedDataCheckConfig = propDelayedDataCheckConfig.Value
+,
+			Frequency = propFrequency.Value
+,
+			Indexes = propIndexes.Value
+,
+			Indices = propIndices.Value
+,
+			IndicesOptions = propIndicesOptions.Value
+,
+			JobId = propJobId.Value
+,
+			MaxEmptySearches = propMaxEmptySearches.Value
+,
+			Query = propQuery.Value
+,
+			QueryDelay = propQueryDelay.Value
+,
+			RuntimeMappings = propRuntimeMappings.Value
+,
+			ScriptFields = propScriptFields.Value
+,
+			ScrollSize = propScrollSize.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, Datafeed value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, Datafeed value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'Datafeed' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAggregations, value.Aggregations);
+		writer.WriteProperty(options, PropAuthorization, value.Authorization);
+		writer.WriteProperty(options, PropChunkingConfig, value.ChunkingConfig);
+		writer.WriteProperty(options, PropDatafeedId, value.DatafeedId);
+		writer.WriteProperty(options, PropDelayedDataCheckConfig, value.DelayedDataCheckConfig);
+		writer.WriteProperty(options, PropFrequency, value.Frequency);
+		writer.WriteProperty(options, PropIndexes, value.Indexes);
+		writer.WriteProperty(options, PropIndices, value.Indices);
+		writer.WriteProperty(options, PropIndicesOptions, value.IndicesOptions);
+		writer.WriteProperty(options, PropJobId, value.JobId);
+		writer.WriteProperty(options, PropMaxEmptySearches, value.MaxEmptySearches);
+		writer.WriteProperty(options, PropQuery, value.Query);
+		writer.WriteProperty(options, PropQueryDelay, value.QueryDelay);
+		writer.WriteProperty(options, PropRuntimeMappings, value.RuntimeMappings);
+		writer.WriteProperty(options, PropScriptFields, value.ScriptFields);
+		writer.WriteProperty(options, PropScrollSize, value.ScrollSize);
+		writer.WriteEndObject();
 	}
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/MachineLearning/DatafeedConfig.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/MachineLearning/DatafeedConfig.g.cs
index 0402dcefb43..27e60c4bab9 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/MachineLearning/DatafeedConfig.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/MachineLearning/DatafeedConfig.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,194 +28,167 @@
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
-internal sealed partial class DatafeedConfigConverter : JsonConverter<DatafeedConfig>
+internal sealed partial class DatafeedConfigConverter : System.Text.Json.Serialization.JsonConverter<DatafeedConfig>
 {
-	public override DatafeedConfig Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations1 = System.Text.Json.JsonEncodedText.Encode("aggs");
+	private static readonly System.Text.Json.JsonEncodedText PropChunkingConfig = System.Text.Json.JsonEncodedText.Encode("chunking_config");
+	private static readonly System.Text.Json.JsonEncodedText PropDatafeedId = System.Text.Json.JsonEncodedText.Encode("datafeed_id");
+	private static readonly System.Text.Json.JsonEncodedText PropDelayedDataCheckConfig = System.Text.Json.JsonEncodedText.Encode("delayed_data_check_config");
+	private static readonly System.Text.Json.JsonEncodedText PropFrequency = System.Text.Json.JsonEncodedText.Encode("frequency");
+	private static readonly System.Text.Json.JsonEncodedText PropIndices = System.Text.Json.JsonEncodedText.Encode("indices");
+	private static readonly System.Text.Json.JsonEncodedText PropIndices1 = System.Text.Json.JsonEncodedText.Encode("indexes");
+	private static readonly System.Text.Json.JsonEncodedText PropIndicesOptions = System.Text.Json.JsonEncodedText.Encode("indices_options");
+	private static readonly System.Text.Json.JsonEncodedText PropJobId = System.Text.Json.JsonEncodedText.Encode("job_id");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxEmptySearches = System.Text.Json.JsonEncodedText.Encode("max_empty_searches");
+	private static readonly System.Text.Json.JsonEncodedText PropQuery = System.Text.Json.JsonEncodedText.Encode("query");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryDelay = System.Text.Json.JsonEncodedText.Encode("query_delay");
+	private static readonly System.Text.Json.JsonEncodedText PropRuntimeMappings = System.Text.Json.JsonEncodedText.Encode("runtime_mappings");
+	private static readonly System.Text.Json.JsonEncodedText PropScriptFields = System.Text.Json.JsonEncodedText.Encode("script_fields");
+	private static readonly System.Text.Json.JsonEncodedText PropScrollSize = System.Text.Json.JsonEncodedText.Encode("scroll_size");
+
+	public override DatafeedConfig Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		var variant = new DatafeedConfig();
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IDictionary<string, Elastic.Clients.Elasticsearch.Aggregations.Aggregation>?> propAggregations = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.MachineLearning.ChunkingConfig?> propChunkingConfig = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Id?> propDatafeedId = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.MachineLearning.DelayedDataCheckConfig?> propDelayedDataCheckConfig = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Duration?> propFrequency = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Indices?> propIndices = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.IndicesOptions?> propIndicesOptions = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Id?> propJobId = default;
+		LocalJsonProperty<int?> propMaxEmptySearches = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.QueryDsl.Query?> propQuery = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Duration?> propQueryDelay = default;
+		LocalJsonProperty<IDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>?> propRuntimeMappings = default;
+		LocalJsonProperty<IDictionary<string, Elastic.Clients.Elasticsearch.ScriptField>?> propScriptFields = default;
+		LocalJsonProperty<int?> propScrollSize = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propAggregations.TryRead(ref reader, options, PropAggregations) || propAggregations.TryRead(ref reader, options, PropAggregations1))
 			{
-				var property = reader.GetString();
-				if (property == "aggregations" || property == "aggs")
-				{
-					variant.Aggregations = JsonSerializer.Deserialize<IDictionary<string, Elastic.Clients.Elasticsearch.Aggregations.Aggregation>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "chunking_config")
-				{
-					variant.ChunkingConfig = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.MachineLearning.ChunkingConfig?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "datafeed_id")
-				{
-					variant.DatafeedId = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Id?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "delayed_data_check_config")
-				{
-					variant.DelayedDataCheckConfig = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.MachineLearning.DelayedDataCheckConfig?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "frequency")
-				{
-					variant.Frequency = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Duration?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "indices" || property == "indexes")
-				{
-					variant.Indices = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Indices?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "indices_options")
-				{
-					variant.IndicesOptions = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.IndicesOptions?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "job_id")
-				{
-					variant.JobId = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Id?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "max_empty_searches")
-				{
-					variant.MaxEmptySearches = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "query")
-				{
-					variant.Query = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.Query?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "query_delay")
-				{
-					variant.QueryDelay = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Duration?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "runtime_mappings")
-				{
-					variant.RuntimeMappings = JsonSerializer.Deserialize<IDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "script_fields")
-				{
-					variant.ScriptFields = JsonSerializer.Deserialize<IDictionary<string, Elastic.Clients.Elasticsearch.ScriptField>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "scroll_size")
-				{
-					variant.ScrollSize = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
+				continue;
 			}
-		}
 
-		return variant;
-	}
+			if (propChunkingConfig.TryRead(ref reader, options, PropChunkingConfig))
+			{
+				continue;
+			}
 
-	public override void Write(Utf8JsonWriter writer, DatafeedConfig value, JsonSerializerOptions options)
-	{
-		writer.WriteStartObject();
-		if (value.Aggregations is not null)
-		{
-			writer.WritePropertyName("aggregations");
-			JsonSerializer.Serialize(writer, value.Aggregations, options);
-		}
+			if (propDatafeedId.TryRead(ref reader, options, PropDatafeedId))
+			{
+				continue;
+			}
 
-		if (value.ChunkingConfig is not null)
-		{
-			writer.WritePropertyName("chunking_config");
-			JsonSerializer.Serialize(writer, value.ChunkingConfig, options);
-		}
+			if (propDelayedDataCheckConfig.TryRead(ref reader, options, PropDelayedDataCheckConfig))
+			{
+				continue;
+			}
 
-		if (value.DatafeedId is not null)
-		{
-			writer.WritePropertyName("datafeed_id");
-			JsonSerializer.Serialize(writer, value.DatafeedId, options);
-		}
+			if (propFrequency.TryRead(ref reader, options, PropFrequency))
+			{
+				continue;
+			}
 
-		if (value.DelayedDataCheckConfig is not null)
-		{
-			writer.WritePropertyName("delayed_data_check_config");
-			JsonSerializer.Serialize(writer, value.DelayedDataCheckConfig, options);
-		}
+			if (propIndices.TryRead(ref reader, options, PropIndices) || propIndices.TryRead(ref reader, options, PropIndices1))
+			{
+				continue;
+			}
 
-		if (value.Frequency is not null)
-		{
-			writer.WritePropertyName("frequency");
-			JsonSerializer.Serialize(writer, value.Frequency, options);
-		}
+			if (propIndicesOptions.TryRead(ref reader, options, PropIndicesOptions))
+			{
+				continue;
+			}
 
-		if (value.Indices is not null)
-		{
-			writer.WritePropertyName("indices");
-			JsonSerializer.Serialize(writer, value.Indices, options);
-		}
+			if (propJobId.TryRead(ref reader, options, PropJobId))
+			{
+				continue;
+			}
 
-		if (value.IndicesOptions is not null)
-		{
-			writer.WritePropertyName("indices_options");
-			JsonSerializer.Serialize(writer, value.IndicesOptions, options);
-		}
+			if (propMaxEmptySearches.TryRead(ref reader, options, PropMaxEmptySearches))
+			{
+				continue;
+			}
 
-		if (value.JobId is not null)
-		{
-			writer.WritePropertyName("job_id");
-			JsonSerializer.Serialize(writer, value.JobId, options);
-		}
+			if (propQuery.TryRead(ref reader, options, PropQuery))
+			{
+				continue;
+			}
 
-		if (value.MaxEmptySearches.HasValue)
-		{
-			writer.WritePropertyName("max_empty_searches");
-			writer.WriteNumberValue(value.MaxEmptySearches.Value);
-		}
+			if (propQueryDelay.TryRead(ref reader, options, PropQueryDelay))
+			{
+				continue;
+			}
 
-		if (value.Query is not null)
-		{
-			writer.WritePropertyName("query");
-			JsonSerializer.Serialize(writer, value.Query, options);
-		}
+			if (propRuntimeMappings.TryRead(ref reader, options, PropRuntimeMappings))
+			{
+				continue;
+			}
 
-		if (value.QueryDelay is not null)
-		{
-			writer.WritePropertyName("query_delay");
-			JsonSerializer.Serialize(writer, value.QueryDelay, options);
-		}
+			if (propScriptFields.TryRead(ref reader, options, PropScriptFields))
+			{
+				continue;
+			}
 
-		if (value.RuntimeMappings is not null)
-		{
-			writer.WritePropertyName("runtime_mappings");
-			JsonSerializer.Serialize(writer, value.RuntimeMappings, options);
-		}
+			if (propScrollSize.TryRead(ref reader, options, PropScrollSize))
+			{
+				continue;
+			}
 
-		if (value.ScriptFields is not null)
-		{
-			writer.WritePropertyName("script_fields");
-			JsonSerializer.Serialize(writer, value.ScriptFields, options);
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		if (value.ScrollSize.HasValue)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DatafeedConfig
 		{
-			writer.WritePropertyName("scroll_size");
-			writer.WriteNumberValue(value.ScrollSize.Value);
-		}
+			Aggregations = propAggregations.Value
+,
+			ChunkingConfig = propChunkingConfig.Value
+,
+			DatafeedId = propDatafeedId.Value
+,
+			DelayedDataCheckConfig = propDelayedDataCheckConfig.Value
+,
+			Frequency = propFrequency.Value
+,
+			Indices = propIndices.Value
+,
+			IndicesOptions = propIndicesOptions.Value
+,
+			JobId = propJobId.Value
+,
+			MaxEmptySearches = propMaxEmptySearches.Value
+,
+			Query = propQuery.Value
+,
+			QueryDelay = propQueryDelay.Value
+,
+			RuntimeMappings = propRuntimeMappings.Value
+,
+			ScriptFields = propScriptFields.Value
+,
+			ScrollSize = propScrollSize.Value
+		};
+	}
 
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DatafeedConfig value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAggregations, value.Aggregations);
+		writer.WriteProperty(options, PropChunkingConfig, value.ChunkingConfig);
+		writer.WriteProperty(options, PropDatafeedId, value.DatafeedId);
+		writer.WriteProperty(options, PropDelayedDataCheckConfig, value.DelayedDataCheckConfig);
+		writer.WriteProperty(options, PropFrequency, value.Frequency);
+		writer.WriteProperty(options, PropIndices, value.Indices);
+		writer.WriteProperty(options, PropIndicesOptions, value.IndicesOptions);
+		writer.WriteProperty(options, PropJobId, value.JobId);
+		writer.WriteProperty(options, PropMaxEmptySearches, value.MaxEmptySearches);
+		writer.WriteProperty(options, PropQuery, value.Query);
+		writer.WriteProperty(options, PropQueryDelay, value.QueryDelay);
+		writer.WriteProperty(options, PropRuntimeMappings, value.RuntimeMappings);
+		writer.WriteProperty(options, PropScriptFields, value.ScriptFields);
+		writer.WriteProperty(options, PropScrollSize, value.ScrollSize);
 		writer.WriteEndObject();
 	}
 }
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/MachineLearning/DataframeAnalysis.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/MachineLearning/DataframeAnalysis.g.cs
index f7a17f76691..1c47623e1bd 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/MachineLearning/DataframeAnalysis.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/MachineLearning/DataframeAnalysis.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -39,12 +40,16 @@ internal DataframeAnalysis(string variantName, object variant)
 			throw new ArgumentNullException(nameof(variant));
 		if (string.IsNullOrWhiteSpace(variantName))
 			throw new ArgumentException("Variant name must not be empty or whitespace.");
-		VariantName = variantName;
+		VariantType = variantName;
 		Variant = variant;
 	}
 
-	internal object Variant { get; }
-	internal string VariantName { get; }
+	internal DataframeAnalysis()
+	{
+	}
+
+	public object Variant { get; internal set; }
+	public string VariantType { get; internal set; }
 
 	public static DataframeAnalysis Classification(Elastic.Clients.Elasticsearch.MachineLearning.DataframeAnalysisClassification dataframeAnalysisClassification) => new DataframeAnalysis("classification", dataframeAnalysisClassification);
 	public static DataframeAnalysis OutlierDetection(Elastic.Clients.Elasticsearch.MachineLearning.DataframeAnalysisOutlierDetection dataframeAnalysisOutlierDetection) => new DataframeAnalysis("outlier_detection", dataframeAnalysisOutlierDetection);
@@ -63,77 +68,68 @@ public bool TryGet<T>([NotNullWhen(true)] out T? result) where T : class
 	}
 }
 
-internal sealed partial class DataframeAnalysisConverter : JsonConverter<DataframeAnalysis>
+internal sealed partial class DataframeAnalysisConverter : System.Text.Json.Serialization.JsonConverter<DataframeAnalysis>
 {
-	public override DataframeAnalysis Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-		{
-			throw new JsonException("Expected start token.");
-		}
+	private static readonly System.Text.Json.JsonEncodedText VariantClassification = System.Text.Json.JsonEncodedText.Encode("classification");
+	private static readonly System.Text.Json.JsonEncodedText VariantOutlierDetection = System.Text.Json.JsonEncodedText.Encode("outlier_detection");
+	private static readonly System.Text.Json.JsonEncodedText VariantRegression = System.Text.Json.JsonEncodedText.Encode("regression");
 
-		object? variantValue = default;
-		string? variantNameValue = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+	public override DataframeAnalysis Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		var variantType = string.Empty;
+		object? variant = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
+			if (reader.ValueTextEquals(VariantClassification))
 			{
-				throw new JsonException("Expected a property name token.");
-			}
-
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token representing the name of an Elasticsearch field.");
-			}
-
-			var propertyName = reader.GetString();
-			reader.Read();
-			if (propertyName == "classification")
-			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.MachineLearning.DataframeAnalysisClassification?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantClassification.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.MachineLearning.DataframeAnalysisClassification?>(options);
 				continue;
 			}
 
-			if (propertyName == "outlier_detection")
+			if (reader.ValueTextEquals(VariantOutlierDetection))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.MachineLearning.DataframeAnalysisOutlierDetection?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantOutlierDetection.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.MachineLearning.DataframeAnalysisOutlierDetection?>(options);
 				continue;
 			}
 
-			if (propertyName == "regression")
+			if (reader.ValueTextEquals(VariantRegression))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.MachineLearning.DataframeAnalysisRegression?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantRegression.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.MachineLearning.DataframeAnalysisRegression?>(options);
 				continue;
 			}
 
-			throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'DataframeAnalysis' from the response.");
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		var result = new DataframeAnalysis(variantNameValue, variantValue);
-		return result;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DataframeAnalysis { VariantType = variantType, Variant = variant };
 	}
 
-	public override void Write(Utf8JsonWriter writer, DataframeAnalysis value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DataframeAnalysis value, System.Text.Json.JsonSerializerOptions options)
 	{
 		writer.WriteStartObject();
-		if (value.VariantName is not null && value.Variant is not null)
+		switch (value.VariantType)
 		{
-			writer.WritePropertyName(value.VariantName);
-			switch (value.VariantName)
-			{
-				case "classification":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.MachineLearning.DataframeAnalysisClassification>(writer, (Elastic.Clients.Elasticsearch.MachineLearning.DataframeAnalysisClassification)value.Variant, options);
-					break;
-				case "outlier_detection":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.MachineLearning.DataframeAnalysisOutlierDetection>(writer, (Elastic.Clients.Elasticsearch.MachineLearning.DataframeAnalysisOutlierDetection)value.Variant, options);
-					break;
-				case "regression":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.MachineLearning.DataframeAnalysisRegression>(writer, (Elastic.Clients.Elasticsearch.MachineLearning.DataframeAnalysisRegression)value.Variant, options);
-					break;
-			}
+			case "":
+				break;
+			case "classification":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.MachineLearning.DataframeAnalysisClassification?)value.Variant);
+				break;
+			case "outlier_detection":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.MachineLearning.DataframeAnalysisOutlierDetection?)value.Variant);
+				break;
+			case "regression":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.MachineLearning.DataframeAnalysisRegression?)value.Variant);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.VariantType}' is not supported for type '{nameof(DataframeAnalysis)}'.");
 		}
 
 		writer.WriteEndObject();
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/MachineLearning/DataframeAnalysisAnalyzedFields.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/MachineLearning/DataframeAnalysisAnalyzedFields.g.cs
index 0ceb9b0f4e9..7f92c54e1b3 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/MachineLearning/DataframeAnalysisAnalyzedFields.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/MachineLearning/DataframeAnalysisAnalyzedFields.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,56 @@
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
+internal sealed partial class DataframeAnalysisAnalyzedFieldsConverter : System.Text.Json.Serialization.JsonConverter<DataframeAnalysisAnalyzedFields>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropExcludes = System.Text.Json.JsonEncodedText.Encode("excludes");
+	private static readonly System.Text.Json.JsonEncodedText PropIncludes = System.Text.Json.JsonEncodedText.Encode("includes");
+
+	public override DataframeAnalysisAnalyzedFields Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		if (reader.TokenType is not System.Text.Json.JsonTokenType.StartObject)
+		{
+			var value = reader.ReadValue<ICollection<string>>(options);
+			return new DataframeAnalysisAnalyzedFields { Includes = value };
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>> propExcludes = default;
+		LocalJsonProperty<ICollection<string>> propIncludes = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propExcludes.TryRead(ref reader, options, PropExcludes))
+			{
+				continue;
+			}
+
+			if (propIncludes.TryRead(ref reader, options, PropIncludes))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DataframeAnalysisAnalyzedFields
+		{
+			Excludes = propExcludes.Value
+,
+			Includes = propIncludes.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DataframeAnalysisAnalyzedFields value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropExcludes, value.Excludes);
+		writer.WriteProperty(options, PropIncludes, value.Includes);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DataframeAnalysisAnalyzedFieldsConverter))]
 public sealed partial class DataframeAnalysisAnalyzedFields
 {
 	/// <summary>
@@ -34,7 +85,6 @@ public sealed partial class DataframeAnalysisAnalyzedFields
 	/// An array of strings that defines the fields that will be included in the analysis.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("excludes")]
 	public ICollection<string> Excludes { get; set; }
 
 	/// <summary>
@@ -42,7 +92,6 @@ public sealed partial class DataframeAnalysisAnalyzedFields
 	/// An array of strings that defines the fields that will be excluded from the analysis. You do not need to add fields with unsupported data types to excludes, these fields are excluded from the analysis automatically.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("includes")]
 	public ICollection<string> Includes { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/MachineLearning/DataframeAnalysisClassification.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/MachineLearning/DataframeAnalysisClassification.g.cs
index 06504695f4c..5b58bf0f5b1 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/MachineLearning/DataframeAnalysisClassification.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/MachineLearning/DataframeAnalysisClassification.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,262 +28,226 @@
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
-internal sealed partial class DataframeAnalysisClassificationConverter : JsonConverter<DataframeAnalysisClassification>
+internal sealed partial class DataframeAnalysisClassificationConverter : System.Text.Json.Serialization.JsonConverter<DataframeAnalysisClassification>
 {
-	public override DataframeAnalysisClassification Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAlpha = System.Text.Json.JsonEncodedText.Encode("alpha");
+	private static readonly System.Text.Json.JsonEncodedText PropClassAssignmentObjective = System.Text.Json.JsonEncodedText.Encode("class_assignment_objective");
+	private static readonly System.Text.Json.JsonEncodedText PropDependentVariable = System.Text.Json.JsonEncodedText.Encode("dependent_variable");
+	private static readonly System.Text.Json.JsonEncodedText PropDownsampleFactor = System.Text.Json.JsonEncodedText.Encode("downsample_factor");
+	private static readonly System.Text.Json.JsonEncodedText PropEarlyStoppingEnabled = System.Text.Json.JsonEncodedText.Encode("early_stopping_enabled");
+	private static readonly System.Text.Json.JsonEncodedText PropEta = System.Text.Json.JsonEncodedText.Encode("eta");
+	private static readonly System.Text.Json.JsonEncodedText PropEtaGrowthRatePerTree = System.Text.Json.JsonEncodedText.Encode("eta_growth_rate_per_tree");
+	private static readonly System.Text.Json.JsonEncodedText PropFeatureBagFraction = System.Text.Json.JsonEncodedText.Encode("feature_bag_fraction");
+	private static readonly System.Text.Json.JsonEncodedText PropFeatureProcessors = System.Text.Json.JsonEncodedText.Encode("feature_processors");
+	private static readonly System.Text.Json.JsonEncodedText PropGamma = System.Text.Json.JsonEncodedText.Encode("gamma");
+	private static readonly System.Text.Json.JsonEncodedText PropLambda = System.Text.Json.JsonEncodedText.Encode("lambda");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxOptimizationRoundsPerHyperparameter = System.Text.Json.JsonEncodedText.Encode("max_optimization_rounds_per_hyperparameter");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxTrees = System.Text.Json.JsonEncodedText.Encode("max_trees");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxTrees1 = System.Text.Json.JsonEncodedText.Encode("maximum_number_trees");
+	private static readonly System.Text.Json.JsonEncodedText PropNumTopClasses = System.Text.Json.JsonEncodedText.Encode("num_top_classes");
+	private static readonly System.Text.Json.JsonEncodedText PropNumTopFeatureImportanceValues = System.Text.Json.JsonEncodedText.Encode("num_top_feature_importance_values");
+	private static readonly System.Text.Json.JsonEncodedText PropPredictionFieldName = System.Text.Json.JsonEncodedText.Encode("prediction_field_name");
+	private static readonly System.Text.Json.JsonEncodedText PropRandomizeSeed = System.Text.Json.JsonEncodedText.Encode("randomize_seed");
+	private static readonly System.Text.Json.JsonEncodedText PropSoftTreeDepthLimit = System.Text.Json.JsonEncodedText.Encode("soft_tree_depth_limit");
+	private static readonly System.Text.Json.JsonEncodedText PropSoftTreeDepthTolerance = System.Text.Json.JsonEncodedText.Encode("soft_tree_depth_tolerance");
+	private static readonly System.Text.Json.JsonEncodedText PropTrainingPercent = System.Text.Json.JsonEncodedText.Encode("training_percent");
+
+	public override DataframeAnalysisClassification Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		var variant = new DataframeAnalysisClassification();
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
-		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<double?> propAlpha = default;
+		LocalJsonProperty<string?> propClassAssignmentObjective = default;
+		LocalJsonProperty<string> propDependentVariable = default;
+		LocalJsonProperty<double?> propDownsampleFactor = default;
+		LocalJsonProperty<bool?> propEarlyStoppingEnabled = default;
+		LocalJsonProperty<double?> propEta = default;
+		LocalJsonProperty<double?> propEtaGrowthRatePerTree = default;
+		LocalJsonProperty<double?> propFeatureBagFraction = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.MachineLearning.DataframeAnalysisFeatureProcessor>?> propFeatureProcessors = default;
+		LocalJsonProperty<double?> propGamma = default;
+		LocalJsonProperty<double?> propLambda = default;
+		LocalJsonProperty<int?> propMaxOptimizationRoundsPerHyperparameter = default;
+		LocalJsonProperty<int?> propMaxTrees = default;
+		LocalJsonProperty<int?> propNumTopClasses = default;
+		LocalJsonProperty<int?> propNumTopFeatureImportanceValues = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Field?> propPredictionFieldName = default;
+		LocalJsonProperty<double?> propRandomizeSeed = default;
+		LocalJsonProperty<int?> propSoftTreeDepthLimit = default;
+		LocalJsonProperty<double?> propSoftTreeDepthTolerance = default;
+		LocalJsonProperty<double?> propTrainingPercent = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAlpha.TryRead(ref reader, options, PropAlpha))
 			{
-				var property = reader.GetString();
-				if (property == "alpha")
-				{
-					variant.Alpha = JsonSerializer.Deserialize<double?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "class_assignment_objective")
-				{
-					variant.ClassAssignmentObjective = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "dependent_variable")
-				{
-					variant.DependentVariable = JsonSerializer.Deserialize<string>(ref reader, options);
-					continue;
-				}
-
-				if (property == "downsample_factor")
-				{
-					variant.DownsampleFactor = JsonSerializer.Deserialize<double?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "early_stopping_enabled")
-				{
-					variant.EarlyStoppingEnabled = JsonSerializer.Deserialize<bool?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "eta")
-				{
-					variant.Eta = JsonSerializer.Deserialize<double?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "eta_growth_rate_per_tree")
-				{
-					variant.EtaGrowthRatePerTree = JsonSerializer.Deserialize<double?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "feature_bag_fraction")
-				{
-					variant.FeatureBagFraction = JsonSerializer.Deserialize<double?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "feature_processors")
-				{
-					variant.FeatureProcessors = JsonSerializer.Deserialize<ICollection<Elastic.Clients.Elasticsearch.MachineLearning.DataframeAnalysisFeatureProcessor>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "gamma")
-				{
-					variant.Gamma = JsonSerializer.Deserialize<double?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "lambda")
-				{
-					variant.Lambda = JsonSerializer.Deserialize<double?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "max_optimization_rounds_per_hyperparameter")
-				{
-					variant.MaxOptimizationRoundsPerHyperparameter = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "max_trees" || property == "maximum_number_trees")
-				{
-					variant.MaxTrees = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "num_top_classes")
-				{
-					variant.NumTopClasses = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "num_top_feature_importance_values")
-				{
-					variant.NumTopFeatureImportanceValues = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "prediction_field_name")
-				{
-					variant.PredictionFieldName = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Field?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "randomize_seed")
-				{
-					variant.RandomizeSeed = JsonSerializer.Deserialize<double?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "soft_tree_depth_limit")
-				{
-					variant.SoftTreeDepthLimit = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "soft_tree_depth_tolerance")
-				{
-					variant.SoftTreeDepthTolerance = JsonSerializer.Deserialize<double?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "training_percent")
-				{
-					variant.TrainingPercent = JsonSerializer.Deserialize<double?>(ref reader, options);
-					continue;
-				}
+				continue;
 			}
-		}
 
-		return variant;
-	}
+			if (propClassAssignmentObjective.TryRead(ref reader, options, PropClassAssignmentObjective))
+			{
+				continue;
+			}
 
-	public override void Write(Utf8JsonWriter writer, DataframeAnalysisClassification value, JsonSerializerOptions options)
-	{
-		writer.WriteStartObject();
-		if (value.Alpha.HasValue)
-		{
-			writer.WritePropertyName("alpha");
-			writer.WriteNumberValue(value.Alpha.Value);
-		}
+			if (propDependentVariable.TryRead(ref reader, options, PropDependentVariable))
+			{
+				continue;
+			}
 
-		if (!string.IsNullOrEmpty(value.ClassAssignmentObjective))
-		{
-			writer.WritePropertyName("class_assignment_objective");
-			writer.WriteStringValue(value.ClassAssignmentObjective);
-		}
+			if (propDownsampleFactor.TryRead(ref reader, options, PropDownsampleFactor))
+			{
+				continue;
+			}
 
-		writer.WritePropertyName("dependent_variable");
-		writer.WriteStringValue(value.DependentVariable);
-		if (value.DownsampleFactor.HasValue)
-		{
-			writer.WritePropertyName("downsample_factor");
-			writer.WriteNumberValue(value.DownsampleFactor.Value);
-		}
+			if (propEarlyStoppingEnabled.TryRead(ref reader, options, PropEarlyStoppingEnabled))
+			{
+				continue;
+			}
 
-		if (value.EarlyStoppingEnabled.HasValue)
-		{
-			writer.WritePropertyName("early_stopping_enabled");
-			writer.WriteBooleanValue(value.EarlyStoppingEnabled.Value);
-		}
+			if (propEta.TryRead(ref reader, options, PropEta))
+			{
+				continue;
+			}
 
-		if (value.Eta.HasValue)
-		{
-			writer.WritePropertyName("eta");
-			writer.WriteNumberValue(value.Eta.Value);
-		}
+			if (propEtaGrowthRatePerTree.TryRead(ref reader, options, PropEtaGrowthRatePerTree))
+			{
+				continue;
+			}
 
-		if (value.EtaGrowthRatePerTree.HasValue)
-		{
-			writer.WritePropertyName("eta_growth_rate_per_tree");
-			writer.WriteNumberValue(value.EtaGrowthRatePerTree.Value);
-		}
+			if (propFeatureBagFraction.TryRead(ref reader, options, PropFeatureBagFraction))
+			{
+				continue;
+			}
 
-		if (value.FeatureBagFraction.HasValue)
-		{
-			writer.WritePropertyName("feature_bag_fraction");
-			writer.WriteNumberValue(value.FeatureBagFraction.Value);
-		}
+			if (propFeatureProcessors.TryRead(ref reader, options, PropFeatureProcessors))
+			{
+				continue;
+			}
 
-		if (value.FeatureProcessors is not null)
-		{
-			writer.WritePropertyName("feature_processors");
-			JsonSerializer.Serialize(writer, value.FeatureProcessors, options);
-		}
+			if (propGamma.TryRead(ref reader, options, PropGamma))
+			{
+				continue;
+			}
 
-		if (value.Gamma.HasValue)
-		{
-			writer.WritePropertyName("gamma");
-			writer.WriteNumberValue(value.Gamma.Value);
-		}
+			if (propLambda.TryRead(ref reader, options, PropLambda))
+			{
+				continue;
+			}
 
-		if (value.Lambda.HasValue)
-		{
-			writer.WritePropertyName("lambda");
-			writer.WriteNumberValue(value.Lambda.Value);
-		}
+			if (propMaxOptimizationRoundsPerHyperparameter.TryRead(ref reader, options, PropMaxOptimizationRoundsPerHyperparameter))
+			{
+				continue;
+			}
 
-		if (value.MaxOptimizationRoundsPerHyperparameter.HasValue)
-		{
-			writer.WritePropertyName("max_optimization_rounds_per_hyperparameter");
-			writer.WriteNumberValue(value.MaxOptimizationRoundsPerHyperparameter.Value);
-		}
+			if (propMaxTrees.TryRead(ref reader, options, PropMaxTrees) || propMaxTrees.TryRead(ref reader, options, PropMaxTrees1))
+			{
+				continue;
+			}
 
-		if (value.MaxTrees.HasValue)
-		{
-			writer.WritePropertyName("max_trees");
-			writer.WriteNumberValue(value.MaxTrees.Value);
-		}
+			if (propNumTopClasses.TryRead(ref reader, options, PropNumTopClasses))
+			{
+				continue;
+			}
 
-		if (value.NumTopClasses.HasValue)
-		{
-			writer.WritePropertyName("num_top_classes");
-			writer.WriteNumberValue(value.NumTopClasses.Value);
-		}
+			if (propNumTopFeatureImportanceValues.TryRead(ref reader, options, PropNumTopFeatureImportanceValues))
+			{
+				continue;
+			}
 
-		if (value.NumTopFeatureImportanceValues.HasValue)
-		{
-			writer.WritePropertyName("num_top_feature_importance_values");
-			writer.WriteNumberValue(value.NumTopFeatureImportanceValues.Value);
-		}
+			if (propPredictionFieldName.TryRead(ref reader, options, PropPredictionFieldName))
+			{
+				continue;
+			}
 
-		if (value.PredictionFieldName is not null)
-		{
-			writer.WritePropertyName("prediction_field_name");
-			JsonSerializer.Serialize(writer, value.PredictionFieldName, options);
-		}
+			if (propRandomizeSeed.TryRead(ref reader, options, PropRandomizeSeed))
+			{
+				continue;
+			}
 
-		if (value.RandomizeSeed.HasValue)
-		{
-			writer.WritePropertyName("randomize_seed");
-			writer.WriteNumberValue(value.RandomizeSeed.Value);
-		}
+			if (propSoftTreeDepthLimit.TryRead(ref reader, options, PropSoftTreeDepthLimit))
+			{
+				continue;
+			}
 
-		if (value.SoftTreeDepthLimit.HasValue)
-		{
-			writer.WritePropertyName("soft_tree_depth_limit");
-			writer.WriteNumberValue(value.SoftTreeDepthLimit.Value);
-		}
+			if (propSoftTreeDepthTolerance.TryRead(ref reader, options, PropSoftTreeDepthTolerance))
+			{
+				continue;
+			}
 
-		if (value.SoftTreeDepthTolerance.HasValue)
-		{
-			writer.WritePropertyName("soft_tree_depth_tolerance");
-			writer.WriteNumberValue(value.SoftTreeDepthTolerance.Value);
-		}
+			if (propTrainingPercent.TryRead(ref reader, options, PropTrainingPercent))
+			{
+				continue;
+			}
 
-		if (value.TrainingPercent.HasValue)
-		{
-			writer.WritePropertyName("training_percent");
-			writer.WriteNumberValue(value.TrainingPercent.Value);
-		}
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DataframeAnalysisClassification
+		{
+			Alpha = propAlpha.Value
+,
+			ClassAssignmentObjective = propClassAssignmentObjective.Value
+,
+			DependentVariable = propDependentVariable.Value
+,
+			DownsampleFactor = propDownsampleFactor.Value
+,
+			EarlyStoppingEnabled = propEarlyStoppingEnabled.Value
+,
+			Eta = propEta.Value
+,
+			EtaGrowthRatePerTree = propEtaGrowthRatePerTree.Value
+,
+			FeatureBagFraction = propFeatureBagFraction.Value
+,
+			FeatureProcessors = propFeatureProcessors.Value
+,
+			Gamma = propGamma.Value
+,
+			Lambda = propLambda.Value
+,
+			MaxOptimizationRoundsPerHyperparameter = propMaxOptimizationRoundsPerHyperparameter.Value
+,
+			MaxTrees = propMaxTrees.Value
+,
+			NumTopClasses = propNumTopClasses.Value
+,
+			NumTopFeatureImportanceValues = propNumTopFeatureImportanceValues.Value
+,
+			PredictionFieldName = propPredictionFieldName.Value
+,
+			RandomizeSeed = propRandomizeSeed.Value
+,
+			SoftTreeDepthLimit = propSoftTreeDepthLimit.Value
+,
+			SoftTreeDepthTolerance = propSoftTreeDepthTolerance.Value
+,
+			TrainingPercent = propTrainingPercent.Value
+		};
+	}
 
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DataframeAnalysisClassification value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAlpha, value.Alpha);
+		writer.WriteProperty(options, PropClassAssignmentObjective, value.ClassAssignmentObjective);
+		writer.WriteProperty(options, PropDependentVariable, value.DependentVariable);
+		writer.WriteProperty(options, PropDownsampleFactor, value.DownsampleFactor);
+		writer.WriteProperty(options, PropEarlyStoppingEnabled, value.EarlyStoppingEnabled);
+		writer.WriteProperty(options, PropEta, value.Eta);
+		writer.WriteProperty(options, PropEtaGrowthRatePerTree, value.EtaGrowthRatePerTree);
+		writer.WriteProperty(options, PropFeatureBagFraction, value.FeatureBagFraction);
+		writer.WriteProperty(options, PropFeatureProcessors, value.FeatureProcessors);
+		writer.WriteProperty(options, PropGamma, value.Gamma);
+		writer.WriteProperty(options, PropLambda, value.Lambda);
+		writer.WriteProperty(options, PropMaxOptimizationRoundsPerHyperparameter, value.MaxOptimizationRoundsPerHyperparameter);
+		writer.WriteProperty(options, PropMaxTrees, value.MaxTrees);
+		writer.WriteProperty(options, PropNumTopClasses, value.NumTopClasses);
+		writer.WriteProperty(options, PropNumTopFeatureImportanceValues, value.NumTopFeatureImportanceValues);
+		writer.WriteProperty(options, PropPredictionFieldName, value.PredictionFieldName);
+		writer.WriteProperty(options, PropRandomizeSeed, value.RandomizeSeed);
+		writer.WriteProperty(options, PropSoftTreeDepthLimit, value.SoftTreeDepthLimit);
+		writer.WriteProperty(options, PropSoftTreeDepthTolerance, value.SoftTreeDepthTolerance);
+		writer.WriteProperty(options, PropTrainingPercent, value.TrainingPercent);
 		writer.WriteEndObject();
 	}
 }
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/MachineLearning/DataframeAnalysisFeatureProcessor.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/MachineLearning/DataframeAnalysisFeatureProcessor.g.cs
index 68a0de314d1..efd7df73e7b 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/MachineLearning/DataframeAnalysisFeatureProcessor.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/MachineLearning/DataframeAnalysisFeatureProcessor.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -39,12 +40,16 @@ internal DataframeAnalysisFeatureProcessor(string variantName, object variant)
 			throw new ArgumentNullException(nameof(variant));
 		if (string.IsNullOrWhiteSpace(variantName))
 			throw new ArgumentException("Variant name must not be empty or whitespace.");
-		VariantName = variantName;
+		VariantType = variantName;
 		Variant = variant;
 	}
 
-	internal object Variant { get; }
-	internal string VariantName { get; }
+	internal DataframeAnalysisFeatureProcessor()
+	{
+	}
+
+	public object Variant { get; internal set; }
+	public string VariantType { get; internal set; }
 
 	public static DataframeAnalysisFeatureProcessor FrequencyEncoding(Elastic.Clients.Elasticsearch.MachineLearning.DataframeAnalysisFeatureProcessorFrequencyEncoding dataframeAnalysisFeatureProcessorFrequencyEncoding) => new DataframeAnalysisFeatureProcessor("frequency_encoding", dataframeAnalysisFeatureProcessorFrequencyEncoding);
 	public static DataframeAnalysisFeatureProcessor MultiEncoding(Elastic.Clients.Elasticsearch.MachineLearning.DataframeAnalysisFeatureProcessorMultiEncoding dataframeAnalysisFeatureProcessorMultiEncoding) => new DataframeAnalysisFeatureProcessor("multi_encoding", dataframeAnalysisFeatureProcessorMultiEncoding);
@@ -65,97 +70,92 @@ public bool TryGet<T>([NotNullWhen(true)] out T? result) where T : class
 	}
 }
 
-internal sealed partial class DataframeAnalysisFeatureProcessorConverter : JsonConverter<DataframeAnalysisFeatureProcessor>
+internal sealed partial class DataframeAnalysisFeatureProcessorConverter : System.Text.Json.Serialization.JsonConverter<DataframeAnalysisFeatureProcessor>
 {
-	public override DataframeAnalysisFeatureProcessor Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-		{
-			throw new JsonException("Expected start token.");
-		}
+	private static readonly System.Text.Json.JsonEncodedText VariantFrequencyEncoding = System.Text.Json.JsonEncodedText.Encode("frequency_encoding");
+	private static readonly System.Text.Json.JsonEncodedText VariantMultiEncoding = System.Text.Json.JsonEncodedText.Encode("multi_encoding");
+	private static readonly System.Text.Json.JsonEncodedText VariantNGramEncoding = System.Text.Json.JsonEncodedText.Encode("n_gram_encoding");
+	private static readonly System.Text.Json.JsonEncodedText VariantOneHotEncoding = System.Text.Json.JsonEncodedText.Encode("one_hot_encoding");
+	private static readonly System.Text.Json.JsonEncodedText VariantTargetMeanEncoding = System.Text.Json.JsonEncodedText.Encode("target_mean_encoding");
 
-		object? variantValue = default;
-		string? variantNameValue = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+	public override DataframeAnalysisFeatureProcessor Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		var variantType = string.Empty;
+		object? variant = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
+			if (reader.ValueTextEquals(VariantFrequencyEncoding))
 			{
-				throw new JsonException("Expected a property name token.");
-			}
-
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token representing the name of an Elasticsearch field.");
-			}
-
-			var propertyName = reader.GetString();
-			reader.Read();
-			if (propertyName == "frequency_encoding")
-			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.MachineLearning.DataframeAnalysisFeatureProcessorFrequencyEncoding?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantFrequencyEncoding.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.MachineLearning.DataframeAnalysisFeatureProcessorFrequencyEncoding?>(options);
 				continue;
 			}
 
-			if (propertyName == "multi_encoding")
+			if (reader.ValueTextEquals(VariantMultiEncoding))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.MachineLearning.DataframeAnalysisFeatureProcessorMultiEncoding?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantMultiEncoding.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.MachineLearning.DataframeAnalysisFeatureProcessorMultiEncoding?>(options);
 				continue;
 			}
 
-			if (propertyName == "n_gram_encoding")
+			if (reader.ValueTextEquals(VariantNGramEncoding))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.MachineLearning.DataframeAnalysisFeatureProcessorNGramEncoding?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantNGramEncoding.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.MachineLearning.DataframeAnalysisFeatureProcessorNGramEncoding?>(options);
 				continue;
 			}
 
-			if (propertyName == "one_hot_encoding")
+			if (reader.ValueTextEquals(VariantOneHotEncoding))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.MachineLearning.DataframeAnalysisFeatureProcessorOneHotEncoding?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantOneHotEncoding.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.MachineLearning.DataframeAnalysisFeatureProcessorOneHotEncoding?>(options);
 				continue;
 			}
 
-			if (propertyName == "target_mean_encoding")
+			if (reader.ValueTextEquals(VariantTargetMeanEncoding))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.MachineLearning.DataframeAnalysisFeatureProcessorTargetMeanEncoding?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantTargetMeanEncoding.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.MachineLearning.DataframeAnalysisFeatureProcessorTargetMeanEncoding?>(options);
 				continue;
 			}
 
-			throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'DataframeAnalysisFeatureProcessor' from the response.");
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		var result = new DataframeAnalysisFeatureProcessor(variantNameValue, variantValue);
-		return result;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DataframeAnalysisFeatureProcessor { VariantType = variantType, Variant = variant };
 	}
 
-	public override void Write(Utf8JsonWriter writer, DataframeAnalysisFeatureProcessor value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DataframeAnalysisFeatureProcessor value, System.Text.Json.JsonSerializerOptions options)
 	{
 		writer.WriteStartObject();
-		if (value.VariantName is not null && value.Variant is not null)
+		switch (value.VariantType)
 		{
-			writer.WritePropertyName(value.VariantName);
-			switch (value.VariantName)
-			{
-				case "frequency_encoding":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.MachineLearning.DataframeAnalysisFeatureProcessorFrequencyEncoding>(writer, (Elastic.Clients.Elasticsearch.MachineLearning.DataframeAnalysisFeatureProcessorFrequencyEncoding)value.Variant, options);
-					break;
-				case "multi_encoding":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.MachineLearning.DataframeAnalysisFeatureProcessorMultiEncoding>(writer, (Elastic.Clients.Elasticsearch.MachineLearning.DataframeAnalysisFeatureProcessorMultiEncoding)value.Variant, options);
-					break;
-				case "n_gram_encoding":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.MachineLearning.DataframeAnalysisFeatureProcessorNGramEncoding>(writer, (Elastic.Clients.Elasticsearch.MachineLearning.DataframeAnalysisFeatureProcessorNGramEncoding)value.Variant, options);
-					break;
-				case "one_hot_encoding":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.MachineLearning.DataframeAnalysisFeatureProcessorOneHotEncoding>(writer, (Elastic.Clients.Elasticsearch.MachineLearning.DataframeAnalysisFeatureProcessorOneHotEncoding)value.Variant, options);
-					break;
-				case "target_mean_encoding":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.MachineLearning.DataframeAnalysisFeatureProcessorTargetMeanEncoding>(writer, (Elastic.Clients.Elasticsearch.MachineLearning.DataframeAnalysisFeatureProcessorTargetMeanEncoding)value.Variant, options);
-					break;
-			}
+			case "":
+				break;
+			case "frequency_encoding":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.MachineLearning.DataframeAnalysisFeatureProcessorFrequencyEncoding?)value.Variant);
+				break;
+			case "multi_encoding":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.MachineLearning.DataframeAnalysisFeatureProcessorMultiEncoding?)value.Variant);
+				break;
+			case "n_gram_encoding":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.MachineLearning.DataframeAnalysisFeatureProcessorNGramEncoding?)value.Variant);
+				break;
+			case "one_hot_encoding":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.MachineLearning.DataframeAnalysisFeatureProcessorOneHotEncoding?)value.Variant);
+				break;
+			case "target_mean_encoding":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.MachineLearning.DataframeAnalysisFeatureProcessorTargetMeanEncoding?)value.Variant);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.VariantType}' is not supported for type '{nameof(DataframeAnalysisFeatureProcessor)}'.");
 		}
 
 		writer.WriteEndObject();
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/MachineLearning/DataframeAnalysisRegression.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/MachineLearning/DataframeAnalysisRegression.g.cs
index 33f1f359972..dfc545c5586 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/MachineLearning/DataframeAnalysisRegression.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/MachineLearning/DataframeAnalysisRegression.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,262 +28,226 @@
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
-internal sealed partial class DataframeAnalysisRegressionConverter : JsonConverter<DataframeAnalysisRegression>
+internal sealed partial class DataframeAnalysisRegressionConverter : System.Text.Json.Serialization.JsonConverter<DataframeAnalysisRegression>
 {
-	public override DataframeAnalysisRegression Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAlpha = System.Text.Json.JsonEncodedText.Encode("alpha");
+	private static readonly System.Text.Json.JsonEncodedText PropDependentVariable = System.Text.Json.JsonEncodedText.Encode("dependent_variable");
+	private static readonly System.Text.Json.JsonEncodedText PropDownsampleFactor = System.Text.Json.JsonEncodedText.Encode("downsample_factor");
+	private static readonly System.Text.Json.JsonEncodedText PropEarlyStoppingEnabled = System.Text.Json.JsonEncodedText.Encode("early_stopping_enabled");
+	private static readonly System.Text.Json.JsonEncodedText PropEta = System.Text.Json.JsonEncodedText.Encode("eta");
+	private static readonly System.Text.Json.JsonEncodedText PropEtaGrowthRatePerTree = System.Text.Json.JsonEncodedText.Encode("eta_growth_rate_per_tree");
+	private static readonly System.Text.Json.JsonEncodedText PropFeatureBagFraction = System.Text.Json.JsonEncodedText.Encode("feature_bag_fraction");
+	private static readonly System.Text.Json.JsonEncodedText PropFeatureProcessors = System.Text.Json.JsonEncodedText.Encode("feature_processors");
+	private static readonly System.Text.Json.JsonEncodedText PropGamma = System.Text.Json.JsonEncodedText.Encode("gamma");
+	private static readonly System.Text.Json.JsonEncodedText PropLambda = System.Text.Json.JsonEncodedText.Encode("lambda");
+	private static readonly System.Text.Json.JsonEncodedText PropLossFunction = System.Text.Json.JsonEncodedText.Encode("loss_function");
+	private static readonly System.Text.Json.JsonEncodedText PropLossFunctionParameter = System.Text.Json.JsonEncodedText.Encode("loss_function_parameter");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxOptimizationRoundsPerHyperparameter = System.Text.Json.JsonEncodedText.Encode("max_optimization_rounds_per_hyperparameter");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxTrees = System.Text.Json.JsonEncodedText.Encode("max_trees");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxTrees1 = System.Text.Json.JsonEncodedText.Encode("maximum_number_trees");
+	private static readonly System.Text.Json.JsonEncodedText PropNumTopFeatureImportanceValues = System.Text.Json.JsonEncodedText.Encode("num_top_feature_importance_values");
+	private static readonly System.Text.Json.JsonEncodedText PropPredictionFieldName = System.Text.Json.JsonEncodedText.Encode("prediction_field_name");
+	private static readonly System.Text.Json.JsonEncodedText PropRandomizeSeed = System.Text.Json.JsonEncodedText.Encode("randomize_seed");
+	private static readonly System.Text.Json.JsonEncodedText PropSoftTreeDepthLimit = System.Text.Json.JsonEncodedText.Encode("soft_tree_depth_limit");
+	private static readonly System.Text.Json.JsonEncodedText PropSoftTreeDepthTolerance = System.Text.Json.JsonEncodedText.Encode("soft_tree_depth_tolerance");
+	private static readonly System.Text.Json.JsonEncodedText PropTrainingPercent = System.Text.Json.JsonEncodedText.Encode("training_percent");
+
+	public override DataframeAnalysisRegression Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		var variant = new DataframeAnalysisRegression();
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
-		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<double?> propAlpha = default;
+		LocalJsonProperty<string> propDependentVariable = default;
+		LocalJsonProperty<double?> propDownsampleFactor = default;
+		LocalJsonProperty<bool?> propEarlyStoppingEnabled = default;
+		LocalJsonProperty<double?> propEta = default;
+		LocalJsonProperty<double?> propEtaGrowthRatePerTree = default;
+		LocalJsonProperty<double?> propFeatureBagFraction = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.MachineLearning.DataframeAnalysisFeatureProcessor>?> propFeatureProcessors = default;
+		LocalJsonProperty<double?> propGamma = default;
+		LocalJsonProperty<double?> propLambda = default;
+		LocalJsonProperty<string?> propLossFunction = default;
+		LocalJsonProperty<double?> propLossFunctionParameter = default;
+		LocalJsonProperty<int?> propMaxOptimizationRoundsPerHyperparameter = default;
+		LocalJsonProperty<int?> propMaxTrees = default;
+		LocalJsonProperty<int?> propNumTopFeatureImportanceValues = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Field?> propPredictionFieldName = default;
+		LocalJsonProperty<double?> propRandomizeSeed = default;
+		LocalJsonProperty<int?> propSoftTreeDepthLimit = default;
+		LocalJsonProperty<double?> propSoftTreeDepthTolerance = default;
+		LocalJsonProperty<double?> propTrainingPercent = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAlpha.TryRead(ref reader, options, PropAlpha))
 			{
-				var property = reader.GetString();
-				if (property == "alpha")
-				{
-					variant.Alpha = JsonSerializer.Deserialize<double?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "dependent_variable")
-				{
-					variant.DependentVariable = JsonSerializer.Deserialize<string>(ref reader, options);
-					continue;
-				}
-
-				if (property == "downsample_factor")
-				{
-					variant.DownsampleFactor = JsonSerializer.Deserialize<double?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "early_stopping_enabled")
-				{
-					variant.EarlyStoppingEnabled = JsonSerializer.Deserialize<bool?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "eta")
-				{
-					variant.Eta = JsonSerializer.Deserialize<double?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "eta_growth_rate_per_tree")
-				{
-					variant.EtaGrowthRatePerTree = JsonSerializer.Deserialize<double?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "feature_bag_fraction")
-				{
-					variant.FeatureBagFraction = JsonSerializer.Deserialize<double?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "feature_processors")
-				{
-					variant.FeatureProcessors = JsonSerializer.Deserialize<ICollection<Elastic.Clients.Elasticsearch.MachineLearning.DataframeAnalysisFeatureProcessor>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "gamma")
-				{
-					variant.Gamma = JsonSerializer.Deserialize<double?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "lambda")
-				{
-					variant.Lambda = JsonSerializer.Deserialize<double?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "loss_function")
-				{
-					variant.LossFunction = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "loss_function_parameter")
-				{
-					variant.LossFunctionParameter = JsonSerializer.Deserialize<double?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "max_optimization_rounds_per_hyperparameter")
-				{
-					variant.MaxOptimizationRoundsPerHyperparameter = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "max_trees" || property == "maximum_number_trees")
-				{
-					variant.MaxTrees = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "num_top_feature_importance_values")
-				{
-					variant.NumTopFeatureImportanceValues = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "prediction_field_name")
-				{
-					variant.PredictionFieldName = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Field?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "randomize_seed")
-				{
-					variant.RandomizeSeed = JsonSerializer.Deserialize<double?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "soft_tree_depth_limit")
-				{
-					variant.SoftTreeDepthLimit = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "soft_tree_depth_tolerance")
-				{
-					variant.SoftTreeDepthTolerance = JsonSerializer.Deserialize<double?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "training_percent")
-				{
-					variant.TrainingPercent = JsonSerializer.Deserialize<double?>(ref reader, options);
-					continue;
-				}
+				continue;
 			}
-		}
 
-		return variant;
-	}
+			if (propDependentVariable.TryRead(ref reader, options, PropDependentVariable))
+			{
+				continue;
+			}
 
-	public override void Write(Utf8JsonWriter writer, DataframeAnalysisRegression value, JsonSerializerOptions options)
-	{
-		writer.WriteStartObject();
-		if (value.Alpha.HasValue)
-		{
-			writer.WritePropertyName("alpha");
-			writer.WriteNumberValue(value.Alpha.Value);
-		}
+			if (propDownsampleFactor.TryRead(ref reader, options, PropDownsampleFactor))
+			{
+				continue;
+			}
 
-		writer.WritePropertyName("dependent_variable");
-		writer.WriteStringValue(value.DependentVariable);
-		if (value.DownsampleFactor.HasValue)
-		{
-			writer.WritePropertyName("downsample_factor");
-			writer.WriteNumberValue(value.DownsampleFactor.Value);
-		}
+			if (propEarlyStoppingEnabled.TryRead(ref reader, options, PropEarlyStoppingEnabled))
+			{
+				continue;
+			}
 
-		if (value.EarlyStoppingEnabled.HasValue)
-		{
-			writer.WritePropertyName("early_stopping_enabled");
-			writer.WriteBooleanValue(value.EarlyStoppingEnabled.Value);
-		}
+			if (propEta.TryRead(ref reader, options, PropEta))
+			{
+				continue;
+			}
 
-		if (value.Eta.HasValue)
-		{
-			writer.WritePropertyName("eta");
-			writer.WriteNumberValue(value.Eta.Value);
-		}
+			if (propEtaGrowthRatePerTree.TryRead(ref reader, options, PropEtaGrowthRatePerTree))
+			{
+				continue;
+			}
 
-		if (value.EtaGrowthRatePerTree.HasValue)
-		{
-			writer.WritePropertyName("eta_growth_rate_per_tree");
-			writer.WriteNumberValue(value.EtaGrowthRatePerTree.Value);
-		}
+			if (propFeatureBagFraction.TryRead(ref reader, options, PropFeatureBagFraction))
+			{
+				continue;
+			}
 
-		if (value.FeatureBagFraction.HasValue)
-		{
-			writer.WritePropertyName("feature_bag_fraction");
-			writer.WriteNumberValue(value.FeatureBagFraction.Value);
-		}
+			if (propFeatureProcessors.TryRead(ref reader, options, PropFeatureProcessors))
+			{
+				continue;
+			}
 
-		if (value.FeatureProcessors is not null)
-		{
-			writer.WritePropertyName("feature_processors");
-			JsonSerializer.Serialize(writer, value.FeatureProcessors, options);
-		}
+			if (propGamma.TryRead(ref reader, options, PropGamma))
+			{
+				continue;
+			}
 
-		if (value.Gamma.HasValue)
-		{
-			writer.WritePropertyName("gamma");
-			writer.WriteNumberValue(value.Gamma.Value);
-		}
+			if (propLambda.TryRead(ref reader, options, PropLambda))
+			{
+				continue;
+			}
 
-		if (value.Lambda.HasValue)
-		{
-			writer.WritePropertyName("lambda");
-			writer.WriteNumberValue(value.Lambda.Value);
-		}
+			if (propLossFunction.TryRead(ref reader, options, PropLossFunction))
+			{
+				continue;
+			}
 
-		if (!string.IsNullOrEmpty(value.LossFunction))
-		{
-			writer.WritePropertyName("loss_function");
-			writer.WriteStringValue(value.LossFunction);
-		}
+			if (propLossFunctionParameter.TryRead(ref reader, options, PropLossFunctionParameter))
+			{
+				continue;
+			}
 
-		if (value.LossFunctionParameter.HasValue)
-		{
-			writer.WritePropertyName("loss_function_parameter");
-			writer.WriteNumberValue(value.LossFunctionParameter.Value);
-		}
+			if (propMaxOptimizationRoundsPerHyperparameter.TryRead(ref reader, options, PropMaxOptimizationRoundsPerHyperparameter))
+			{
+				continue;
+			}
 
-		if (value.MaxOptimizationRoundsPerHyperparameter.HasValue)
-		{
-			writer.WritePropertyName("max_optimization_rounds_per_hyperparameter");
-			writer.WriteNumberValue(value.MaxOptimizationRoundsPerHyperparameter.Value);
-		}
+			if (propMaxTrees.TryRead(ref reader, options, PropMaxTrees) || propMaxTrees.TryRead(ref reader, options, PropMaxTrees1))
+			{
+				continue;
+			}
 
-		if (value.MaxTrees.HasValue)
-		{
-			writer.WritePropertyName("max_trees");
-			writer.WriteNumberValue(value.MaxTrees.Value);
-		}
+			if (propNumTopFeatureImportanceValues.TryRead(ref reader, options, PropNumTopFeatureImportanceValues))
+			{
+				continue;
+			}
 
-		if (value.NumTopFeatureImportanceValues.HasValue)
-		{
-			writer.WritePropertyName("num_top_feature_importance_values");
-			writer.WriteNumberValue(value.NumTopFeatureImportanceValues.Value);
-		}
+			if (propPredictionFieldName.TryRead(ref reader, options, PropPredictionFieldName))
+			{
+				continue;
+			}
 
-		if (value.PredictionFieldName is not null)
-		{
-			writer.WritePropertyName("prediction_field_name");
-			JsonSerializer.Serialize(writer, value.PredictionFieldName, options);
-		}
+			if (propRandomizeSeed.TryRead(ref reader, options, PropRandomizeSeed))
+			{
+				continue;
+			}
 
-		if (value.RandomizeSeed.HasValue)
-		{
-			writer.WritePropertyName("randomize_seed");
-			writer.WriteNumberValue(value.RandomizeSeed.Value);
-		}
+			if (propSoftTreeDepthLimit.TryRead(ref reader, options, PropSoftTreeDepthLimit))
+			{
+				continue;
+			}
 
-		if (value.SoftTreeDepthLimit.HasValue)
-		{
-			writer.WritePropertyName("soft_tree_depth_limit");
-			writer.WriteNumberValue(value.SoftTreeDepthLimit.Value);
-		}
+			if (propSoftTreeDepthTolerance.TryRead(ref reader, options, PropSoftTreeDepthTolerance))
+			{
+				continue;
+			}
 
-		if (value.SoftTreeDepthTolerance.HasValue)
-		{
-			writer.WritePropertyName("soft_tree_depth_tolerance");
-			writer.WriteNumberValue(value.SoftTreeDepthTolerance.Value);
-		}
+			if (propTrainingPercent.TryRead(ref reader, options, PropTrainingPercent))
+			{
+				continue;
+			}
 
-		if (value.TrainingPercent.HasValue)
-		{
-			writer.WritePropertyName("training_percent");
-			writer.WriteNumberValue(value.TrainingPercent.Value);
-		}
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DataframeAnalysisRegression
+		{
+			Alpha = propAlpha.Value
+,
+			DependentVariable = propDependentVariable.Value
+,
+			DownsampleFactor = propDownsampleFactor.Value
+,
+			EarlyStoppingEnabled = propEarlyStoppingEnabled.Value
+,
+			Eta = propEta.Value
+,
+			EtaGrowthRatePerTree = propEtaGrowthRatePerTree.Value
+,
+			FeatureBagFraction = propFeatureBagFraction.Value
+,
+			FeatureProcessors = propFeatureProcessors.Value
+,
+			Gamma = propGamma.Value
+,
+			Lambda = propLambda.Value
+,
+			LossFunction = propLossFunction.Value
+,
+			LossFunctionParameter = propLossFunctionParameter.Value
+,
+			MaxOptimizationRoundsPerHyperparameter = propMaxOptimizationRoundsPerHyperparameter.Value
+,
+			MaxTrees = propMaxTrees.Value
+,
+			NumTopFeatureImportanceValues = propNumTopFeatureImportanceValues.Value
+,
+			PredictionFieldName = propPredictionFieldName.Value
+,
+			RandomizeSeed = propRandomizeSeed.Value
+,
+			SoftTreeDepthLimit = propSoftTreeDepthLimit.Value
+,
+			SoftTreeDepthTolerance = propSoftTreeDepthTolerance.Value
+,
+			TrainingPercent = propTrainingPercent.Value
+		};
+	}
 
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DataframeAnalysisRegression value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAlpha, value.Alpha);
+		writer.WriteProperty(options, PropDependentVariable, value.DependentVariable);
+		writer.WriteProperty(options, PropDownsampleFactor, value.DownsampleFactor);
+		writer.WriteProperty(options, PropEarlyStoppingEnabled, value.EarlyStoppingEnabled);
+		writer.WriteProperty(options, PropEta, value.Eta);
+		writer.WriteProperty(options, PropEtaGrowthRatePerTree, value.EtaGrowthRatePerTree);
+		writer.WriteProperty(options, PropFeatureBagFraction, value.FeatureBagFraction);
+		writer.WriteProperty(options, PropFeatureProcessors, value.FeatureProcessors);
+		writer.WriteProperty(options, PropGamma, value.Gamma);
+		writer.WriteProperty(options, PropLambda, value.Lambda);
+		writer.WriteProperty(options, PropLossFunction, value.LossFunction);
+		writer.WriteProperty(options, PropLossFunctionParameter, value.LossFunctionParameter);
+		writer.WriteProperty(options, PropMaxOptimizationRoundsPerHyperparameter, value.MaxOptimizationRoundsPerHyperparameter);
+		writer.WriteProperty(options, PropMaxTrees, value.MaxTrees);
+		writer.WriteProperty(options, PropNumTopFeatureImportanceValues, value.NumTopFeatureImportanceValues);
+		writer.WriteProperty(options, PropPredictionFieldName, value.PredictionFieldName);
+		writer.WriteProperty(options, PropRandomizeSeed, value.RandomizeSeed);
+		writer.WriteProperty(options, PropSoftTreeDepthLimit, value.SoftTreeDepthLimit);
+		writer.WriteProperty(options, PropSoftTreeDepthTolerance, value.SoftTreeDepthTolerance);
+		writer.WriteProperty(options, PropTrainingPercent, value.TrainingPercent);
 		writer.WriteEndObject();
 	}
 }
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/MachineLearning/DataframeEvaluation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/MachineLearning/DataframeEvaluation.g.cs
index 28d0462487e..4a9b2c72e97 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/MachineLearning/DataframeEvaluation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/MachineLearning/DataframeEvaluation.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -39,12 +40,16 @@ internal DataframeEvaluation(string variantName, object variant)
 			throw new ArgumentNullException(nameof(variant));
 		if (string.IsNullOrWhiteSpace(variantName))
 			throw new ArgumentException("Variant name must not be empty or whitespace.");
-		VariantName = variantName;
+		VariantType = variantName;
 		Variant = variant;
 	}
 
-	internal object Variant { get; }
-	internal string VariantName { get; }
+	internal DataframeEvaluation()
+	{
+	}
+
+	public object Variant { get; internal set; }
+	public string VariantType { get; internal set; }
 
 	public static DataframeEvaluation Classification(Elastic.Clients.Elasticsearch.MachineLearning.DataframeEvaluationClassification dataframeEvaluationClassification) => new DataframeEvaluation("classification", dataframeEvaluationClassification);
 	public static DataframeEvaluation OutlierDetection(Elastic.Clients.Elasticsearch.MachineLearning.DataframeEvaluationOutlierDetection dataframeEvaluationOutlierDetection) => new DataframeEvaluation("outlier_detection", dataframeEvaluationOutlierDetection);
@@ -63,77 +68,68 @@ public bool TryGet<T>([NotNullWhen(true)] out T? result) where T : class
 	}
 }
 
-internal sealed partial class DataframeEvaluationConverter : JsonConverter<DataframeEvaluation>
+internal sealed partial class DataframeEvaluationConverter : System.Text.Json.Serialization.JsonConverter<DataframeEvaluation>
 {
-	public override DataframeEvaluation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-		{
-			throw new JsonException("Expected start token.");
-		}
+	private static readonly System.Text.Json.JsonEncodedText VariantClassification = System.Text.Json.JsonEncodedText.Encode("classification");
+	private static readonly System.Text.Json.JsonEncodedText VariantOutlierDetection = System.Text.Json.JsonEncodedText.Encode("outlier_detection");
+	private static readonly System.Text.Json.JsonEncodedText VariantRegression = System.Text.Json.JsonEncodedText.Encode("regression");
 
-		object? variantValue = default;
-		string? variantNameValue = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+	public override DataframeEvaluation Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		var variantType = string.Empty;
+		object? variant = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
+			if (reader.ValueTextEquals(VariantClassification))
 			{
-				throw new JsonException("Expected a property name token.");
-			}
-
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token representing the name of an Elasticsearch field.");
-			}
-
-			var propertyName = reader.GetString();
-			reader.Read();
-			if (propertyName == "classification")
-			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.MachineLearning.DataframeEvaluationClassification?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantClassification.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.MachineLearning.DataframeEvaluationClassification?>(options);
 				continue;
 			}
 
-			if (propertyName == "outlier_detection")
+			if (reader.ValueTextEquals(VariantOutlierDetection))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.MachineLearning.DataframeEvaluationOutlierDetection?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantOutlierDetection.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.MachineLearning.DataframeEvaluationOutlierDetection?>(options);
 				continue;
 			}
 
-			if (propertyName == "regression")
+			if (reader.ValueTextEquals(VariantRegression))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.MachineLearning.DataframeEvaluationRegression?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantRegression.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.MachineLearning.DataframeEvaluationRegression?>(options);
 				continue;
 			}
 
-			throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'DataframeEvaluation' from the response.");
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		var result = new DataframeEvaluation(variantNameValue, variantValue);
-		return result;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DataframeEvaluation { VariantType = variantType, Variant = variant };
 	}
 
-	public override void Write(Utf8JsonWriter writer, DataframeEvaluation value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DataframeEvaluation value, System.Text.Json.JsonSerializerOptions options)
 	{
 		writer.WriteStartObject();
-		if (value.VariantName is not null && value.Variant is not null)
+		switch (value.VariantType)
 		{
-			writer.WritePropertyName(value.VariantName);
-			switch (value.VariantName)
-			{
-				case "classification":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.MachineLearning.DataframeEvaluationClassification>(writer, (Elastic.Clients.Elasticsearch.MachineLearning.DataframeEvaluationClassification)value.Variant, options);
-					break;
-				case "outlier_detection":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.MachineLearning.DataframeEvaluationOutlierDetection>(writer, (Elastic.Clients.Elasticsearch.MachineLearning.DataframeEvaluationOutlierDetection)value.Variant, options);
-					break;
-				case "regression":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.MachineLearning.DataframeEvaluationRegression>(writer, (Elastic.Clients.Elasticsearch.MachineLearning.DataframeEvaluationRegression)value.Variant, options);
-					break;
-			}
+			case "":
+				break;
+			case "classification":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.MachineLearning.DataframeEvaluationClassification?)value.Variant);
+				break;
+			case "outlier_detection":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.MachineLearning.DataframeEvaluationOutlierDetection?)value.Variant);
+				break;
+			case "regression":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.MachineLearning.DataframeEvaluationRegression?)value.Variant);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.VariantType}' is not supported for type '{nameof(DataframeEvaluation)}'.");
 		}
 
 		writer.WriteEndObject();
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/MachineLearning/InferenceConfigCreate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/MachineLearning/InferenceConfigCreate.g.cs
index 7521192e9fc..361a21e2078 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/MachineLearning/InferenceConfigCreate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/MachineLearning/InferenceConfigCreate.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -44,12 +45,16 @@ internal InferenceConfigCreate(string variantName, object variant)
 			throw new ArgumentNullException(nameof(variant));
 		if (string.IsNullOrWhiteSpace(variantName))
 			throw new ArgumentException("Variant name must not be empty or whitespace.");
-		VariantName = variantName;
+		VariantType = variantName;
 		Variant = variant;
 	}
 
-	internal object Variant { get; }
-	internal string VariantName { get; }
+	internal InferenceConfigCreate()
+	{
+	}
+
+	public object Variant { get; internal set; }
+	public string VariantType { get; internal set; }
 
 	public static InferenceConfigCreate Classification(Elastic.Clients.Elasticsearch.MachineLearning.ClassificationInferenceOptions classificationInferenceOptions) => new InferenceConfigCreate("classification", classificationInferenceOptions);
 	public static InferenceConfigCreate FillMask(Elastic.Clients.Elasticsearch.MachineLearning.FillMaskInferenceOptions fillMaskInferenceOptions) => new InferenceConfigCreate("fill_mask", fillMaskInferenceOptions);
@@ -75,147 +80,152 @@ public bool TryGet<T>([NotNullWhen(true)] out T? result) where T : class
 	}
 }
 
-internal sealed partial class InferenceConfigCreateConverter : JsonConverter<InferenceConfigCreate>
+internal sealed partial class InferenceConfigCreateConverter : System.Text.Json.Serialization.JsonConverter<InferenceConfigCreate>
 {
-	public override InferenceConfigCreate Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText VariantClassification = System.Text.Json.JsonEncodedText.Encode("classification");
+	private static readonly System.Text.Json.JsonEncodedText VariantFillMask = System.Text.Json.JsonEncodedText.Encode("fill_mask");
+	private static readonly System.Text.Json.JsonEncodedText VariantNer = System.Text.Json.JsonEncodedText.Encode("ner");
+	private static readonly System.Text.Json.JsonEncodedText VariantPassThrough = System.Text.Json.JsonEncodedText.Encode("pass_through");
+	private static readonly System.Text.Json.JsonEncodedText VariantQuestionAnswering = System.Text.Json.JsonEncodedText.Encode("question_answering");
+	private static readonly System.Text.Json.JsonEncodedText VariantRegression = System.Text.Json.JsonEncodedText.Encode("regression");
+	private static readonly System.Text.Json.JsonEncodedText VariantTextClassification = System.Text.Json.JsonEncodedText.Encode("text_classification");
+	private static readonly System.Text.Json.JsonEncodedText VariantTextEmbedding = System.Text.Json.JsonEncodedText.Encode("text_embedding");
+	private static readonly System.Text.Json.JsonEncodedText VariantTextExpansion = System.Text.Json.JsonEncodedText.Encode("text_expansion");
+	private static readonly System.Text.Json.JsonEncodedText VariantZeroShotClassification = System.Text.Json.JsonEncodedText.Encode("zero_shot_classification");
+
+	public override InferenceConfigCreate Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		var variantType = string.Empty;
+		object? variant = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			throw new JsonException("Expected start token.");
-		}
-
-		object? variantValue = default;
-		string? variantNameValue = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
-		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token.");
-			}
-
-			if (reader.TokenType != JsonTokenType.PropertyName)
+			if (reader.ValueTextEquals(VariantClassification))
 			{
-				throw new JsonException("Expected a property name token representing the name of an Elasticsearch field.");
-			}
-
-			var propertyName = reader.GetString();
-			reader.Read();
-			if (propertyName == "classification")
-			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.MachineLearning.ClassificationInferenceOptions?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantClassification.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.MachineLearning.ClassificationInferenceOptions?>(options);
 				continue;
 			}
 
-			if (propertyName == "fill_mask")
+			if (reader.ValueTextEquals(VariantFillMask))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.MachineLearning.FillMaskInferenceOptions?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantFillMask.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.MachineLearning.FillMaskInferenceOptions?>(options);
 				continue;
 			}
 
-			if (propertyName == "ner")
+			if (reader.ValueTextEquals(VariantNer))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.MachineLearning.NerInferenceOptions?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantNer.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.MachineLearning.NerInferenceOptions?>(options);
 				continue;
 			}
 
-			if (propertyName == "pass_through")
+			if (reader.ValueTextEquals(VariantPassThrough))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.MachineLearning.PassThroughInferenceOptions?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantPassThrough.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.MachineLearning.PassThroughInferenceOptions?>(options);
 				continue;
 			}
 
-			if (propertyName == "question_answering")
+			if (reader.ValueTextEquals(VariantQuestionAnswering))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.MachineLearning.QuestionAnsweringInferenceOptions?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantQuestionAnswering.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.MachineLearning.QuestionAnsweringInferenceOptions?>(options);
 				continue;
 			}
 
-			if (propertyName == "regression")
+			if (reader.ValueTextEquals(VariantRegression))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.MachineLearning.RegressionInferenceOptions?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantRegression.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.MachineLearning.RegressionInferenceOptions?>(options);
 				continue;
 			}
 
-			if (propertyName == "text_classification")
+			if (reader.ValueTextEquals(VariantTextClassification))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.MachineLearning.TextClassificationInferenceOptions?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantTextClassification.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.MachineLearning.TextClassificationInferenceOptions?>(options);
 				continue;
 			}
 
-			if (propertyName == "text_embedding")
+			if (reader.ValueTextEquals(VariantTextEmbedding))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.MachineLearning.TextEmbeddingInferenceOptions?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantTextEmbedding.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.MachineLearning.TextEmbeddingInferenceOptions?>(options);
 				continue;
 			}
 
-			if (propertyName == "text_expansion")
+			if (reader.ValueTextEquals(VariantTextExpansion))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.MachineLearning.TextExpansionInferenceOptions?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantTextExpansion.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.MachineLearning.TextExpansionInferenceOptions?>(options);
 				continue;
 			}
 
-			if (propertyName == "zero_shot_classification")
+			if (reader.ValueTextEquals(VariantZeroShotClassification))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.MachineLearning.ZeroShotClassificationInferenceOptions?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantZeroShotClassification.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.MachineLearning.ZeroShotClassificationInferenceOptions?>(options);
 				continue;
 			}
 
-			throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'InferenceConfigCreate' from the response.");
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		var result = new InferenceConfigCreate(variantNameValue, variantValue);
-		return result;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new InferenceConfigCreate { VariantType = variantType, Variant = variant };
 	}
 
-	public override void Write(Utf8JsonWriter writer, InferenceConfigCreate value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, InferenceConfigCreate value, System.Text.Json.JsonSerializerOptions options)
 	{
 		writer.WriteStartObject();
-		if (value.VariantName is not null && value.Variant is not null)
+		switch (value.VariantType)
 		{
-			writer.WritePropertyName(value.VariantName);
-			switch (value.VariantName)
-			{
-				case "classification":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.MachineLearning.ClassificationInferenceOptions>(writer, (Elastic.Clients.Elasticsearch.MachineLearning.ClassificationInferenceOptions)value.Variant, options);
-					break;
-				case "fill_mask":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.MachineLearning.FillMaskInferenceOptions>(writer, (Elastic.Clients.Elasticsearch.MachineLearning.FillMaskInferenceOptions)value.Variant, options);
-					break;
-				case "ner":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.MachineLearning.NerInferenceOptions>(writer, (Elastic.Clients.Elasticsearch.MachineLearning.NerInferenceOptions)value.Variant, options);
-					break;
-				case "pass_through":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.MachineLearning.PassThroughInferenceOptions>(writer, (Elastic.Clients.Elasticsearch.MachineLearning.PassThroughInferenceOptions)value.Variant, options);
-					break;
-				case "question_answering":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.MachineLearning.QuestionAnsweringInferenceOptions>(writer, (Elastic.Clients.Elasticsearch.MachineLearning.QuestionAnsweringInferenceOptions)value.Variant, options);
-					break;
-				case "regression":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.MachineLearning.RegressionInferenceOptions>(writer, (Elastic.Clients.Elasticsearch.MachineLearning.RegressionInferenceOptions)value.Variant, options);
-					break;
-				case "text_classification":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.MachineLearning.TextClassificationInferenceOptions>(writer, (Elastic.Clients.Elasticsearch.MachineLearning.TextClassificationInferenceOptions)value.Variant, options);
-					break;
-				case "text_embedding":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.MachineLearning.TextEmbeddingInferenceOptions>(writer, (Elastic.Clients.Elasticsearch.MachineLearning.TextEmbeddingInferenceOptions)value.Variant, options);
-					break;
-				case "text_expansion":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.MachineLearning.TextExpansionInferenceOptions>(writer, (Elastic.Clients.Elasticsearch.MachineLearning.TextExpansionInferenceOptions)value.Variant, options);
-					break;
-				case "zero_shot_classification":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.MachineLearning.ZeroShotClassificationInferenceOptions>(writer, (Elastic.Clients.Elasticsearch.MachineLearning.ZeroShotClassificationInferenceOptions)value.Variant, options);
-					break;
-			}
+			case "":
+				break;
+			case "classification":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.MachineLearning.ClassificationInferenceOptions?)value.Variant);
+				break;
+			case "fill_mask":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.MachineLearning.FillMaskInferenceOptions?)value.Variant);
+				break;
+			case "ner":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.MachineLearning.NerInferenceOptions?)value.Variant);
+				break;
+			case "pass_through":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.MachineLearning.PassThroughInferenceOptions?)value.Variant);
+				break;
+			case "question_answering":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.MachineLearning.QuestionAnsweringInferenceOptions?)value.Variant);
+				break;
+			case "regression":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.MachineLearning.RegressionInferenceOptions?)value.Variant);
+				break;
+			case "text_classification":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.MachineLearning.TextClassificationInferenceOptions?)value.Variant);
+				break;
+			case "text_embedding":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.MachineLearning.TextEmbeddingInferenceOptions?)value.Variant);
+				break;
+			case "text_expansion":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.MachineLearning.TextExpansionInferenceOptions?)value.Variant);
+				break;
+			case "zero_shot_classification":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.MachineLearning.ZeroShotClassificationInferenceOptions?)value.Variant);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.VariantType}' is not supported for type '{nameof(InferenceConfigCreate)}'.");
 		}
 
 		writer.WriteEndObject();
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/MachineLearning/InferenceConfigUpdate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/MachineLearning/InferenceConfigUpdate.g.cs
index fea26716443..f1746ce2629 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/MachineLearning/InferenceConfigUpdate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/MachineLearning/InferenceConfigUpdate.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -39,12 +40,16 @@ internal InferenceConfigUpdate(string variantName, object variant)
 			throw new ArgumentNullException(nameof(variant));
 		if (string.IsNullOrWhiteSpace(variantName))
 			throw new ArgumentException("Variant name must not be empty or whitespace.");
-		VariantName = variantName;
+		VariantType = variantName;
 		Variant = variant;
 	}
 
-	internal object Variant { get; }
-	internal string VariantName { get; }
+	internal InferenceConfigUpdate()
+	{
+	}
+
+	public object Variant { get; internal set; }
+	public string VariantType { get; internal set; }
 
 	public static InferenceConfigUpdate Classification(Elastic.Clients.Elasticsearch.MachineLearning.ClassificationInferenceOptions classificationInferenceOptions) => new InferenceConfigUpdate("classification", classificationInferenceOptions);
 	public static InferenceConfigUpdate FillMask(Elastic.Clients.Elasticsearch.MachineLearning.FillMaskInferenceUpdateOptions fillMaskInferenceUpdateOptions) => new InferenceConfigUpdate("fill_mask", fillMaskInferenceUpdateOptions);
@@ -70,147 +75,152 @@ public bool TryGet<T>([NotNullWhen(true)] out T? result) where T : class
 	}
 }
 
-internal sealed partial class InferenceConfigUpdateConverter : JsonConverter<InferenceConfigUpdate>
+internal sealed partial class InferenceConfigUpdateConverter : System.Text.Json.Serialization.JsonConverter<InferenceConfigUpdate>
 {
-	public override InferenceConfigUpdate Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText VariantClassification = System.Text.Json.JsonEncodedText.Encode("classification");
+	private static readonly System.Text.Json.JsonEncodedText VariantFillMask = System.Text.Json.JsonEncodedText.Encode("fill_mask");
+	private static readonly System.Text.Json.JsonEncodedText VariantNer = System.Text.Json.JsonEncodedText.Encode("ner");
+	private static readonly System.Text.Json.JsonEncodedText VariantPassThrough = System.Text.Json.JsonEncodedText.Encode("pass_through");
+	private static readonly System.Text.Json.JsonEncodedText VariantQuestionAnswering = System.Text.Json.JsonEncodedText.Encode("question_answering");
+	private static readonly System.Text.Json.JsonEncodedText VariantRegression = System.Text.Json.JsonEncodedText.Encode("regression");
+	private static readonly System.Text.Json.JsonEncodedText VariantTextClassification = System.Text.Json.JsonEncodedText.Encode("text_classification");
+	private static readonly System.Text.Json.JsonEncodedText VariantTextEmbedding = System.Text.Json.JsonEncodedText.Encode("text_embedding");
+	private static readonly System.Text.Json.JsonEncodedText VariantTextExpansion = System.Text.Json.JsonEncodedText.Encode("text_expansion");
+	private static readonly System.Text.Json.JsonEncodedText VariantZeroShotClassification = System.Text.Json.JsonEncodedText.Encode("zero_shot_classification");
+
+	public override InferenceConfigUpdate Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		var variantType = string.Empty;
+		object? variant = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			throw new JsonException("Expected start token.");
-		}
-
-		object? variantValue = default;
-		string? variantNameValue = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
-		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token.");
-			}
-
-			if (reader.TokenType != JsonTokenType.PropertyName)
+			if (reader.ValueTextEquals(VariantClassification))
 			{
-				throw new JsonException("Expected a property name token representing the name of an Elasticsearch field.");
-			}
-
-			var propertyName = reader.GetString();
-			reader.Read();
-			if (propertyName == "classification")
-			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.MachineLearning.ClassificationInferenceOptions?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantClassification.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.MachineLearning.ClassificationInferenceOptions?>(options);
 				continue;
 			}
 
-			if (propertyName == "fill_mask")
+			if (reader.ValueTextEquals(VariantFillMask))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.MachineLearning.FillMaskInferenceUpdateOptions?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantFillMask.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.MachineLearning.FillMaskInferenceUpdateOptions?>(options);
 				continue;
 			}
 
-			if (propertyName == "ner")
+			if (reader.ValueTextEquals(VariantNer))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.MachineLearning.NerInferenceUpdateOptions?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantNer.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.MachineLearning.NerInferenceUpdateOptions?>(options);
 				continue;
 			}
 
-			if (propertyName == "pass_through")
+			if (reader.ValueTextEquals(VariantPassThrough))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.MachineLearning.PassThroughInferenceUpdateOptions?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantPassThrough.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.MachineLearning.PassThroughInferenceUpdateOptions?>(options);
 				continue;
 			}
 
-			if (propertyName == "question_answering")
+			if (reader.ValueTextEquals(VariantQuestionAnswering))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.MachineLearning.QuestionAnsweringInferenceUpdateOptions?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantQuestionAnswering.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.MachineLearning.QuestionAnsweringInferenceUpdateOptions?>(options);
 				continue;
 			}
 
-			if (propertyName == "regression")
+			if (reader.ValueTextEquals(VariantRegression))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.MachineLearning.RegressionInferenceOptions?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantRegression.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.MachineLearning.RegressionInferenceOptions?>(options);
 				continue;
 			}
 
-			if (propertyName == "text_classification")
+			if (reader.ValueTextEquals(VariantTextClassification))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.MachineLearning.TextClassificationInferenceUpdateOptions?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantTextClassification.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.MachineLearning.TextClassificationInferenceUpdateOptions?>(options);
 				continue;
 			}
 
-			if (propertyName == "text_embedding")
+			if (reader.ValueTextEquals(VariantTextEmbedding))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.MachineLearning.TextEmbeddingInferenceUpdateOptions?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantTextEmbedding.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.MachineLearning.TextEmbeddingInferenceUpdateOptions?>(options);
 				continue;
 			}
 
-			if (propertyName == "text_expansion")
+			if (reader.ValueTextEquals(VariantTextExpansion))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.MachineLearning.TextExpansionInferenceUpdateOptions?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantTextExpansion.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.MachineLearning.TextExpansionInferenceUpdateOptions?>(options);
 				continue;
 			}
 
-			if (propertyName == "zero_shot_classification")
+			if (reader.ValueTextEquals(VariantZeroShotClassification))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.MachineLearning.ZeroShotClassificationInferenceUpdateOptions?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantZeroShotClassification.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.MachineLearning.ZeroShotClassificationInferenceUpdateOptions?>(options);
 				continue;
 			}
 
-			throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'InferenceConfigUpdate' from the response.");
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		var result = new InferenceConfigUpdate(variantNameValue, variantValue);
-		return result;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new InferenceConfigUpdate { VariantType = variantType, Variant = variant };
 	}
 
-	public override void Write(Utf8JsonWriter writer, InferenceConfigUpdate value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, InferenceConfigUpdate value, System.Text.Json.JsonSerializerOptions options)
 	{
 		writer.WriteStartObject();
-		if (value.VariantName is not null && value.Variant is not null)
+		switch (value.VariantType)
 		{
-			writer.WritePropertyName(value.VariantName);
-			switch (value.VariantName)
-			{
-				case "classification":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.MachineLearning.ClassificationInferenceOptions>(writer, (Elastic.Clients.Elasticsearch.MachineLearning.ClassificationInferenceOptions)value.Variant, options);
-					break;
-				case "fill_mask":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.MachineLearning.FillMaskInferenceUpdateOptions>(writer, (Elastic.Clients.Elasticsearch.MachineLearning.FillMaskInferenceUpdateOptions)value.Variant, options);
-					break;
-				case "ner":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.MachineLearning.NerInferenceUpdateOptions>(writer, (Elastic.Clients.Elasticsearch.MachineLearning.NerInferenceUpdateOptions)value.Variant, options);
-					break;
-				case "pass_through":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.MachineLearning.PassThroughInferenceUpdateOptions>(writer, (Elastic.Clients.Elasticsearch.MachineLearning.PassThroughInferenceUpdateOptions)value.Variant, options);
-					break;
-				case "question_answering":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.MachineLearning.QuestionAnsweringInferenceUpdateOptions>(writer, (Elastic.Clients.Elasticsearch.MachineLearning.QuestionAnsweringInferenceUpdateOptions)value.Variant, options);
-					break;
-				case "regression":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.MachineLearning.RegressionInferenceOptions>(writer, (Elastic.Clients.Elasticsearch.MachineLearning.RegressionInferenceOptions)value.Variant, options);
-					break;
-				case "text_classification":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.MachineLearning.TextClassificationInferenceUpdateOptions>(writer, (Elastic.Clients.Elasticsearch.MachineLearning.TextClassificationInferenceUpdateOptions)value.Variant, options);
-					break;
-				case "text_embedding":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.MachineLearning.TextEmbeddingInferenceUpdateOptions>(writer, (Elastic.Clients.Elasticsearch.MachineLearning.TextEmbeddingInferenceUpdateOptions)value.Variant, options);
-					break;
-				case "text_expansion":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.MachineLearning.TextExpansionInferenceUpdateOptions>(writer, (Elastic.Clients.Elasticsearch.MachineLearning.TextExpansionInferenceUpdateOptions)value.Variant, options);
-					break;
-				case "zero_shot_classification":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.MachineLearning.ZeroShotClassificationInferenceUpdateOptions>(writer, (Elastic.Clients.Elasticsearch.MachineLearning.ZeroShotClassificationInferenceUpdateOptions)value.Variant, options);
-					break;
-			}
+			case "":
+				break;
+			case "classification":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.MachineLearning.ClassificationInferenceOptions?)value.Variant);
+				break;
+			case "fill_mask":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.MachineLearning.FillMaskInferenceUpdateOptions?)value.Variant);
+				break;
+			case "ner":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.MachineLearning.NerInferenceUpdateOptions?)value.Variant);
+				break;
+			case "pass_through":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.MachineLearning.PassThroughInferenceUpdateOptions?)value.Variant);
+				break;
+			case "question_answering":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.MachineLearning.QuestionAnsweringInferenceUpdateOptions?)value.Variant);
+				break;
+			case "regression":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.MachineLearning.RegressionInferenceOptions?)value.Variant);
+				break;
+			case "text_classification":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.MachineLearning.TextClassificationInferenceUpdateOptions?)value.Variant);
+				break;
+			case "text_embedding":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.MachineLearning.TextEmbeddingInferenceUpdateOptions?)value.Variant);
+				break;
+			case "text_expansion":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.MachineLearning.TextExpansionInferenceUpdateOptions?)value.Variant);
+				break;
+			case "zero_shot_classification":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.MachineLearning.ZeroShotClassificationInferenceUpdateOptions?)value.Variant);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.VariantType}' is not supported for type '{nameof(InferenceConfigUpdate)}'.");
 		}
 
 		writer.WriteEndObject();
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/MachineLearning/InferenceResponseResult.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/MachineLearning/InferenceResponseResult.g.cs
index afa959c72f1..d2a97c65fc5 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/MachineLearning/InferenceResponseResult.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/MachineLearning/InferenceResponseResult.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,120 @@
 
 namespace Elastic.Clients.Elasticsearch.MachineLearning;
 
+internal sealed partial class InferenceResponseResultConverter : System.Text.Json.Serialization.JsonConverter<InferenceResponseResult>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropEntities = System.Text.Json.JsonEncodedText.Encode("entities");
+	private static readonly System.Text.Json.JsonEncodedText PropFeatureImportance = System.Text.Json.JsonEncodedText.Encode("feature_importance");
+	private static readonly System.Text.Json.JsonEncodedText PropIsTruncated = System.Text.Json.JsonEncodedText.Encode("is_truncated");
+	private static readonly System.Text.Json.JsonEncodedText PropPredictedValue = System.Text.Json.JsonEncodedText.Encode("predicted_value");
+	private static readonly System.Text.Json.JsonEncodedText PropPredictedValueSequence = System.Text.Json.JsonEncodedText.Encode("predicted_value_sequence");
+	private static readonly System.Text.Json.JsonEncodedText PropPredictionProbability = System.Text.Json.JsonEncodedText.Encode("prediction_probability");
+	private static readonly System.Text.Json.JsonEncodedText PropPredictionScore = System.Text.Json.JsonEncodedText.Encode("prediction_score");
+	private static readonly System.Text.Json.JsonEncodedText PropTopClasses = System.Text.Json.JsonEncodedText.Encode("top_classes");
+	private static readonly System.Text.Json.JsonEncodedText PropWarning = System.Text.Json.JsonEncodedText.Encode("warning");
+
+	public override InferenceResponseResult Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.MachineLearning.TrainedModelEntities>?> propEntities = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.MachineLearning.TrainedModelInferenceFeatureImportance>?> propFeatureImportance = default;
+		LocalJsonProperty<bool?> propIsTruncated = default;
+		LocalJsonProperty<IReadOnlyCollection<object>?> propPredictedValue = default;
+		LocalJsonProperty<string?> propPredictedValueSequence = default;
+		LocalJsonProperty<double?> propPredictionProbability = default;
+		LocalJsonProperty<double?> propPredictionScore = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.MachineLearning.TopClassEntry>?> propTopClasses = default;
+		LocalJsonProperty<string?> propWarning = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propEntities.TryRead(ref reader, options, PropEntities))
+			{
+				continue;
+			}
+
+			if (propFeatureImportance.TryRead(ref reader, options, PropFeatureImportance))
+			{
+				continue;
+			}
+
+			if (propIsTruncated.TryRead(ref reader, options, PropIsTruncated))
+			{
+				continue;
+			}
+
+			if (propPredictedValue.TryRead(ref reader, options, PropPredictedValue, typeof(SingleOrManyMarker<IReadOnlyCollection<object>?, object>)))
+			{
+				continue;
+			}
+
+			if (propPredictedValueSequence.TryRead(ref reader, options, PropPredictedValueSequence))
+			{
+				continue;
+			}
+
+			if (propPredictionProbability.TryRead(ref reader, options, PropPredictionProbability))
+			{
+				continue;
+			}
+
+			if (propPredictionScore.TryRead(ref reader, options, PropPredictionScore))
+			{
+				continue;
+			}
+
+			if (propTopClasses.TryRead(ref reader, options, PropTopClasses))
+			{
+				continue;
+			}
+
+			if (propWarning.TryRead(ref reader, options, PropWarning))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new InferenceResponseResult
+		{
+			Entities = propEntities.Value
+,
+			FeatureImportance = propFeatureImportance.Value
+,
+			IsTruncated = propIsTruncated.Value
+,
+			PredictedValue = propPredictedValue.Value
+,
+			PredictedValueSequence = propPredictedValueSequence.Value
+,
+			PredictionProbability = propPredictionProbability.Value
+,
+			PredictionScore = propPredictionScore.Value
+,
+			TopClasses = propTopClasses.Value
+,
+			Warning = propWarning.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, InferenceResponseResult value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropEntities, value.Entities);
+		writer.WriteProperty(options, PropFeatureImportance, value.FeatureImportance);
+		writer.WriteProperty(options, PropIsTruncated, value.IsTruncated);
+		writer.WriteProperty(options, PropPredictedValue, value.PredictedValue, typeof(SingleOrManyMarker<IReadOnlyCollection<object>?, object>));
+		writer.WriteProperty(options, PropPredictedValueSequence, value.PredictedValueSequence);
+		writer.WriteProperty(options, PropPredictionProbability, value.PredictionProbability);
+		writer.WriteProperty(options, PropPredictionScore, value.PredictionScore);
+		writer.WriteProperty(options, PropTopClasses, value.TopClasses);
+		writer.WriteProperty(options, PropWarning, value.Warning);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(InferenceResponseResultConverter))]
 public sealed partial class InferenceResponseResult
 {
 	/// <summary>
@@ -34,7 +149,6 @@ public sealed partial class InferenceResponseResult
 	/// If the model is trained for named entity recognition (NER) tasks, the response contains the recognized entities.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("entities")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.MachineLearning.TrainedModelEntities>? Entities { get; init; }
 
 	/// <summary>
@@ -42,7 +156,6 @@ public sealed partial class InferenceResponseResult
 	/// The feature importance for the inference results. Relevant only for classification or regression models
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("feature_importance")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.MachineLearning.TrainedModelInferenceFeatureImportance>? FeatureImportance { get; init; }
 
 	/// <summary>
@@ -51,7 +164,6 @@ public sealed partial class InferenceResponseResult
 	/// is present only when it is true.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("is_truncated")]
 	public bool? IsTruncated { get; init; }
 
 	/// <summary>
@@ -65,8 +177,6 @@ public sealed partial class InferenceResponseResult
 	/// For classification models, it may be an integer, double, boolean or string depending on prediction type
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("predicted_value")]
-	[SingleOrManyCollectionConverter(typeof(object))]
 	public IReadOnlyCollection<object>? PredictedValue { get; init; }
 
 	/// <summary>
@@ -76,7 +186,6 @@ public sealed partial class InferenceResponseResult
 	/// Additionally
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("predicted_value_sequence")]
 	public string? PredictedValueSequence { get; init; }
 
 	/// <summary>
@@ -84,7 +193,6 @@ public sealed partial class InferenceResponseResult
 	/// Specifies a probability for the predicted value.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("prediction_probability")]
 	public double? PredictionProbability { get; init; }
 
 	/// <summary>
@@ -92,7 +200,6 @@ public sealed partial class InferenceResponseResult
 	/// Specifies a confidence score for the predicted value.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("prediction_score")]
 	public double? PredictionScore { get; init; }
 
 	/// <summary>
@@ -101,7 +208,6 @@ public sealed partial class InferenceResponseResult
 	/// class entries.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("top_classes")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.MachineLearning.TopClassEntry>? TopClasses { get; init; }
 
 	/// <summary>
@@ -109,6 +215,5 @@ public sealed partial class InferenceResponseResult
 	/// If the request failed, the response contains the reason for the failure.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("warning")]
 	public string? Warning { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/MachineLearning/Preprocessor.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/MachineLearning/Preprocessor.g.cs
index c20929f486d..95f774cf0c5 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/MachineLearning/Preprocessor.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/MachineLearning/Preprocessor.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -39,12 +40,16 @@ internal Preprocessor(string variantName, object variant)
 			throw new ArgumentNullException(nameof(variant));
 		if (string.IsNullOrWhiteSpace(variantName))
 			throw new ArgumentException("Variant name must not be empty or whitespace.");
-		VariantName = variantName;
+		VariantType = variantName;
 		Variant = variant;
 	}
 
-	internal object Variant { get; }
-	internal string VariantName { get; }
+	internal Preprocessor()
+	{
+	}
+
+	public object Variant { get; internal set; }
+	public string VariantType { get; internal set; }
 
 	public static Preprocessor FrequencyEncoding(Elastic.Clients.Elasticsearch.MachineLearning.FrequencyEncodingPreprocessor frequencyEncodingPreprocessor) => new Preprocessor("frequency_encoding", frequencyEncodingPreprocessor);
 	public static Preprocessor OneHotEncoding(Elastic.Clients.Elasticsearch.MachineLearning.OneHotEncodingPreprocessor oneHotEncodingPreprocessor) => new Preprocessor("one_hot_encoding", oneHotEncodingPreprocessor);
@@ -63,77 +68,68 @@ public bool TryGet<T>([NotNullWhen(true)] out T? result) where T : class
 	}
 }
 
-internal sealed partial class PreprocessorConverter : JsonConverter<Preprocessor>
+internal sealed partial class PreprocessorConverter : System.Text.Json.Serialization.JsonConverter<Preprocessor>
 {
-	public override Preprocessor Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-		{
-			throw new JsonException("Expected start token.");
-		}
+	private static readonly System.Text.Json.JsonEncodedText VariantFrequencyEncoding = System.Text.Json.JsonEncodedText.Encode("frequency_encoding");
+	private static readonly System.Text.Json.JsonEncodedText VariantOneHotEncoding = System.Text.Json.JsonEncodedText.Encode("one_hot_encoding");
+	private static readonly System.Text.Json.JsonEncodedText VariantTargetMeanEncoding = System.Text.Json.JsonEncodedText.Encode("target_mean_encoding");
 
-		object? variantValue = default;
-		string? variantNameValue = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+	public override Preprocessor Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		var variantType = string.Empty;
+		object? variant = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
+			if (reader.ValueTextEquals(VariantFrequencyEncoding))
 			{
-				throw new JsonException("Expected a property name token.");
-			}
-
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token representing the name of an Elasticsearch field.");
-			}
-
-			var propertyName = reader.GetString();
-			reader.Read();
-			if (propertyName == "frequency_encoding")
-			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.MachineLearning.FrequencyEncodingPreprocessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantFrequencyEncoding.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.MachineLearning.FrequencyEncodingPreprocessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "one_hot_encoding")
+			if (reader.ValueTextEquals(VariantOneHotEncoding))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.MachineLearning.OneHotEncodingPreprocessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantOneHotEncoding.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.MachineLearning.OneHotEncodingPreprocessor?>(options);
 				continue;
 			}
 
-			if (propertyName == "target_mean_encoding")
+			if (reader.ValueTextEquals(VariantTargetMeanEncoding))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.MachineLearning.TargetMeanEncodingPreprocessor?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantTargetMeanEncoding.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.MachineLearning.TargetMeanEncodingPreprocessor?>(options);
 				continue;
 			}
 
-			throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'Preprocessor' from the response.");
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		var result = new Preprocessor(variantNameValue, variantValue);
-		return result;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new Preprocessor { VariantType = variantType, Variant = variant };
 	}
 
-	public override void Write(Utf8JsonWriter writer, Preprocessor value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, Preprocessor value, System.Text.Json.JsonSerializerOptions options)
 	{
 		writer.WriteStartObject();
-		if (value.VariantName is not null && value.Variant is not null)
+		switch (value.VariantType)
 		{
-			writer.WritePropertyName(value.VariantName);
-			switch (value.VariantName)
-			{
-				case "frequency_encoding":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.MachineLearning.FrequencyEncodingPreprocessor>(writer, (Elastic.Clients.Elasticsearch.MachineLearning.FrequencyEncodingPreprocessor)value.Variant, options);
-					break;
-				case "one_hot_encoding":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.MachineLearning.OneHotEncodingPreprocessor>(writer, (Elastic.Clients.Elasticsearch.MachineLearning.OneHotEncodingPreprocessor)value.Variant, options);
-					break;
-				case "target_mean_encoding":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.MachineLearning.TargetMeanEncodingPreprocessor>(writer, (Elastic.Clients.Elasticsearch.MachineLearning.TargetMeanEncodingPreprocessor)value.Variant, options);
-					break;
-			}
+			case "":
+				break;
+			case "frequency_encoding":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.MachineLearning.FrequencyEncodingPreprocessor?)value.Variant);
+				break;
+			case "one_hot_encoding":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.MachineLearning.OneHotEncodingPreprocessor?)value.Variant);
+				break;
+			case "target_mean_encoding":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.MachineLearning.TargetMeanEncodingPreprocessor?)value.Variant);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.VariantType}' is not supported for type '{nameof(Preprocessor)}'.");
 		}
 
 		writer.WriteEndObject();
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/MachineLearning/TokenizationConfig.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/MachineLearning/TokenizationConfig.g.cs
index e3dc630aebf..f6fb5666c2b 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/MachineLearning/TokenizationConfig.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/MachineLearning/TokenizationConfig.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -44,12 +45,16 @@ internal TokenizationConfig(string variantName, object variant)
 			throw new ArgumentNullException(nameof(variant));
 		if (string.IsNullOrWhiteSpace(variantName))
 			throw new ArgumentException("Variant name must not be empty or whitespace.");
-		VariantName = variantName;
+		VariantType = variantName;
 		Variant = variant;
 	}
 
-	internal object Variant { get; }
-	internal string VariantName { get; }
+	internal TokenizationConfig()
+	{
+	}
+
+	public object Variant { get; internal set; }
+	public string VariantType { get; internal set; }
 
 	public static TokenizationConfig Bert(Elastic.Clients.Elasticsearch.MachineLearning.NlpBertTokenizationConfig nlpBertTokenizationConfig) => new TokenizationConfig("bert", nlpBertTokenizationConfig);
 	public static TokenizationConfig BertJa(Elastic.Clients.Elasticsearch.MachineLearning.NlpBertTokenizationConfig nlpBertTokenizationConfig) => new TokenizationConfig("bert_ja", nlpBertTokenizationConfig);
@@ -69,87 +74,80 @@ public bool TryGet<T>([NotNullWhen(true)] out T? result) where T : class
 	}
 }
 
-internal sealed partial class TokenizationConfigConverter : JsonConverter<TokenizationConfig>
+internal sealed partial class TokenizationConfigConverter : System.Text.Json.Serialization.JsonConverter<TokenizationConfig>
 {
-	public override TokenizationConfig Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-		{
-			throw new JsonException("Expected start token.");
-		}
+	private static readonly System.Text.Json.JsonEncodedText VariantBert = System.Text.Json.JsonEncodedText.Encode("bert");
+	private static readonly System.Text.Json.JsonEncodedText VariantBertJa = System.Text.Json.JsonEncodedText.Encode("bert_ja");
+	private static readonly System.Text.Json.JsonEncodedText VariantMpnet = System.Text.Json.JsonEncodedText.Encode("mpnet");
+	private static readonly System.Text.Json.JsonEncodedText VariantRoberta = System.Text.Json.JsonEncodedText.Encode("roberta");
 
-		object? variantValue = default;
-		string? variantNameValue = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+	public override TokenizationConfig Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		var variantType = string.Empty;
+		object? variant = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
+			if (reader.ValueTextEquals(VariantBert))
 			{
-				throw new JsonException("Expected a property name token.");
-			}
-
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token representing the name of an Elasticsearch field.");
-			}
-
-			var propertyName = reader.GetString();
-			reader.Read();
-			if (propertyName == "bert")
-			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.MachineLearning.NlpBertTokenizationConfig?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantBert.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.MachineLearning.NlpBertTokenizationConfig?>(options);
 				continue;
 			}
 
-			if (propertyName == "bert_ja")
+			if (reader.ValueTextEquals(VariantBertJa))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.MachineLearning.NlpBertTokenizationConfig?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantBertJa.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.MachineLearning.NlpBertTokenizationConfig?>(options);
 				continue;
 			}
 
-			if (propertyName == "mpnet")
+			if (reader.ValueTextEquals(VariantMpnet))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.MachineLearning.NlpBertTokenizationConfig?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantMpnet.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.MachineLearning.NlpBertTokenizationConfig?>(options);
 				continue;
 			}
 
-			if (propertyName == "roberta")
+			if (reader.ValueTextEquals(VariantRoberta))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.MachineLearning.NlpRobertaTokenizationConfig?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantRoberta.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.MachineLearning.NlpRobertaTokenizationConfig?>(options);
 				continue;
 			}
 
-			throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'TokenizationConfig' from the response.");
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		var result = new TokenizationConfig(variantNameValue, variantValue);
-		return result;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new TokenizationConfig { VariantType = variantType, Variant = variant };
 	}
 
-	public override void Write(Utf8JsonWriter writer, TokenizationConfig value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, TokenizationConfig value, System.Text.Json.JsonSerializerOptions options)
 	{
 		writer.WriteStartObject();
-		if (value.VariantName is not null && value.Variant is not null)
+		switch (value.VariantType)
 		{
-			writer.WritePropertyName(value.VariantName);
-			switch (value.VariantName)
-			{
-				case "bert":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.MachineLearning.NlpBertTokenizationConfig>(writer, (Elastic.Clients.Elasticsearch.MachineLearning.NlpBertTokenizationConfig)value.Variant, options);
-					break;
-				case "bert_ja":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.MachineLearning.NlpBertTokenizationConfig>(writer, (Elastic.Clients.Elasticsearch.MachineLearning.NlpBertTokenizationConfig)value.Variant, options);
-					break;
-				case "mpnet":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.MachineLearning.NlpBertTokenizationConfig>(writer, (Elastic.Clients.Elasticsearch.MachineLearning.NlpBertTokenizationConfig)value.Variant, options);
-					break;
-				case "roberta":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.MachineLearning.NlpRobertaTokenizationConfig>(writer, (Elastic.Clients.Elasticsearch.MachineLearning.NlpRobertaTokenizationConfig)value.Variant, options);
-					break;
-			}
+			case "":
+				break;
+			case "bert":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.MachineLearning.NlpBertTokenizationConfig?)value.Variant);
+				break;
+			case "bert_ja":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.MachineLearning.NlpBertTokenizationConfig?)value.Variant);
+				break;
+			case "mpnet":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.MachineLearning.NlpBertTokenizationConfig?)value.Variant);
+				break;
+			case "roberta":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.MachineLearning.NlpRobertaTokenizationConfig?)value.Variant);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.VariantType}' is not supported for type '{nameof(TokenizationConfig)}'.");
 		}
 
 		writer.WriteEndObject();
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 a27bb3c9071..44146c1ae55 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/BinaryProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/BinaryProperty.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,18 +28,124 @@
 
 namespace Elastic.Clients.Elasticsearch.Mapping;
 
+internal sealed partial class BinaryPropertyConverter : System.Text.Json.Serialization.JsonConverter<BinaryProperty>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCopyTo = System.Text.Json.JsonEncodedText.Encode("copy_to");
+	private static readonly System.Text.Json.JsonEncodedText PropDocValues = System.Text.Json.JsonEncodedText.Encode("doc_values");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamic = System.Text.Json.JsonEncodedText.Encode("dynamic");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreAbove = System.Text.Json.JsonEncodedText.Encode("ignore_above");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropProperties = System.Text.Json.JsonEncodedText.Encode("properties");
+	private static readonly System.Text.Json.JsonEncodedText PropStore = System.Text.Json.JsonEncodedText.Encode("store");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override BinaryProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Fields?> propCopyTo = default;
+		LocalJsonProperty<bool?> propDocValues = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.DynamicMapping?> propDynamic = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.Properties?> propFields = default;
+		LocalJsonProperty<int?> propIgnoreAbove = default;
+		LocalJsonProperty<IDictionary<string, string>?> propMeta = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.Properties?> propProperties = default;
+		LocalJsonProperty<bool?> propStore = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCopyTo.TryRead(ref reader, options, PropCopyTo, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propDocValues.TryRead(ref reader, options, PropDocValues))
+			{
+				continue;
+			}
+
+			if (propDynamic.TryRead(ref reader, options, PropDynamic))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propIgnoreAbove.TryRead(ref reader, options, PropIgnoreAbove))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propProperties.TryRead(ref reader, options, PropProperties))
+			{
+				continue;
+			}
+
+			if (propStore.TryRead(ref reader, options, PropStore))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new BinaryProperty
+		{
+			CopyTo = propCopyTo.Value
+,
+			DocValues = propDocValues.Value
+,
+			Dynamic = propDynamic.Value
+,
+			Fields = propFields.Value
+,
+			IgnoreAbove = propIgnoreAbove.Value
+,
+			Meta = propMeta.Value
+,
+			Properties = propProperties.Value
+,
+			Store = propStore.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, BinaryProperty value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCopyTo, value.CopyTo, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropDocValues, value.DocValues);
+		writer.WriteProperty(options, PropDynamic, value.Dynamic);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropIgnoreAbove, value.IgnoreAbove);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropProperties, value.Properties);
+		writer.WriteProperty(options, PropStore, value.Store);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(BinaryPropertyConverter))]
 public sealed partial class BinaryProperty : IProperty
 {
-	[JsonInclude, JsonPropertyName("copy_to")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	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; }
 
 	/// <summary>
@@ -46,14 +153,10 @@ public sealed partial class BinaryProperty : IProperty
 	/// Metadata about the field.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Properties { get; set; }
-	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "binary";
 }
 
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 f0f377e59a1..ac60037c08b 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/BooleanProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/BooleanProperty.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,24 +28,167 @@
 
 namespace Elastic.Clients.Elasticsearch.Mapping;
 
+internal sealed partial class BooleanPropertyConverter : System.Text.Json.Serialization.JsonConverter<BooleanProperty>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropCopyTo = System.Text.Json.JsonEncodedText.Encode("copy_to");
+	private static readonly System.Text.Json.JsonEncodedText PropDocValues = System.Text.Json.JsonEncodedText.Encode("doc_values");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamic = System.Text.Json.JsonEncodedText.Encode("dynamic");
+	private static readonly System.Text.Json.JsonEncodedText PropFielddata = System.Text.Json.JsonEncodedText.Encode("fielddata");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreAbove = System.Text.Json.JsonEncodedText.Encode("ignore_above");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropNullValue = System.Text.Json.JsonEncodedText.Encode("null_value");
+	private static readonly System.Text.Json.JsonEncodedText PropProperties = System.Text.Json.JsonEncodedText.Encode("properties");
+	private static readonly System.Text.Json.JsonEncodedText PropStore = System.Text.Json.JsonEncodedText.Encode("store");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override BooleanProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<double?> propBoost = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Fields?> propCopyTo = default;
+		LocalJsonProperty<bool?> propDocValues = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.DynamicMapping?> propDynamic = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.IndexManagement.NumericFielddata?> propFielddata = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.Properties?> propFields = default;
+		LocalJsonProperty<int?> propIgnoreAbove = default;
+		LocalJsonProperty<bool?> propIndex = default;
+		LocalJsonProperty<IDictionary<string, string>?> propMeta = default;
+		LocalJsonProperty<bool?> propNullValue = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.Properties?> propProperties = default;
+		LocalJsonProperty<bool?> propStore = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
+
+			if (propCopyTo.TryRead(ref reader, options, PropCopyTo, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propDocValues.TryRead(ref reader, options, PropDocValues))
+			{
+				continue;
+			}
+
+			if (propDynamic.TryRead(ref reader, options, PropDynamic))
+			{
+				continue;
+			}
+
+			if (propFielddata.TryRead(ref reader, options, PropFielddata))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propIgnoreAbove.TryRead(ref reader, options, PropIgnoreAbove))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propNullValue.TryRead(ref reader, options, PropNullValue))
+			{
+				continue;
+			}
+
+			if (propProperties.TryRead(ref reader, options, PropProperties))
+			{
+				continue;
+			}
+
+			if (propStore.TryRead(ref reader, options, PropStore))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new BooleanProperty
+		{
+			Boost = propBoost.Value
+,
+			CopyTo = propCopyTo.Value
+,
+			DocValues = propDocValues.Value
+,
+			Dynamic = propDynamic.Value
+,
+			Fielddata = propFielddata.Value
+,
+			Fields = propFields.Value
+,
+			IgnoreAbove = propIgnoreAbove.Value
+,
+			Index = propIndex.Value
+,
+			Meta = propMeta.Value
+,
+			NullValue = propNullValue.Value
+,
+			Properties = propProperties.Value
+,
+			Store = propStore.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, BooleanProperty value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropCopyTo, value.CopyTo, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropDocValues, value.DocValues);
+		writer.WriteProperty(options, PropDynamic, value.Dynamic);
+		writer.WriteProperty(options, PropFielddata, value.Fielddata);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropIgnoreAbove, value.IgnoreAbove);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropNullValue, value.NullValue);
+		writer.WriteProperty(options, PropProperties, value.Properties);
+		writer.WriteProperty(options, PropStore, value.Store);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(BooleanPropertyConverter))]
 public sealed partial class BooleanProperty : IProperty
 {
-	[JsonInclude, JsonPropertyName("boost")]
 	public double? Boost { get; set; }
-	[JsonInclude, JsonPropertyName("copy_to")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	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; }
 
 	/// <summary>
@@ -52,16 +196,11 @@ public sealed partial class BooleanProperty : IProperty
 	/// Metadata about the field.
 	/// </para>
 	/// </summary>
-	[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("store")]
 	public bool? Store { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "boolean";
 }
 
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 71d104cab4c..b9b50b6f8ed 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/ByteNumberProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/ByteNumberProperty.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,26 +28,218 @@
 
 namespace Elastic.Clients.Elasticsearch.Mapping;
 
+internal sealed partial class ByteNumberPropertyConverter : System.Text.Json.Serialization.JsonConverter<ByteNumberProperty>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropCoerce = System.Text.Json.JsonEncodedText.Encode("coerce");
+	private static readonly System.Text.Json.JsonEncodedText PropCopyTo = System.Text.Json.JsonEncodedText.Encode("copy_to");
+	private static readonly System.Text.Json.JsonEncodedText PropDocValues = System.Text.Json.JsonEncodedText.Encode("doc_values");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamic = System.Text.Json.JsonEncodedText.Encode("dynamic");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreAbove = System.Text.Json.JsonEncodedText.Encode("ignore_above");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreMalformed = System.Text.Json.JsonEncodedText.Encode("ignore_malformed");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropNullValue = System.Text.Json.JsonEncodedText.Encode("null_value");
+	private static readonly System.Text.Json.JsonEncodedText PropOnScriptError = System.Text.Json.JsonEncodedText.Encode("on_script_error");
+	private static readonly System.Text.Json.JsonEncodedText PropProperties = System.Text.Json.JsonEncodedText.Encode("properties");
+	private static readonly System.Text.Json.JsonEncodedText PropScript = System.Text.Json.JsonEncodedText.Encode("script");
+	private static readonly System.Text.Json.JsonEncodedText PropStore = System.Text.Json.JsonEncodedText.Encode("store");
+	private static readonly System.Text.Json.JsonEncodedText PropTimeSeriesDimension = System.Text.Json.JsonEncodedText.Encode("time_series_dimension");
+	private static readonly System.Text.Json.JsonEncodedText PropTimeSeriesMetric = System.Text.Json.JsonEncodedText.Encode("time_series_metric");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override ByteNumberProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<double?> propBoost = default;
+		LocalJsonProperty<bool?> propCoerce = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Fields?> propCopyTo = default;
+		LocalJsonProperty<bool?> propDocValues = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.DynamicMapping?> propDynamic = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.Properties?> propFields = default;
+		LocalJsonProperty<int?> propIgnoreAbove = default;
+		LocalJsonProperty<bool?> propIgnoreMalformed = default;
+		LocalJsonProperty<bool?> propIndex = default;
+		LocalJsonProperty<IDictionary<string, string>?> propMeta = default;
+		LocalJsonProperty<byte?> propNullValue = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.OnScriptError?> propOnScriptError = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.Properties?> propProperties = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Script?> propScript = default;
+		LocalJsonProperty<bool?> propStore = default;
+		LocalJsonProperty<bool?> propTimeSeriesDimension = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.TimeSeriesMetricType?> propTimeSeriesMetric = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
+
+			if (propCoerce.TryRead(ref reader, options, PropCoerce))
+			{
+				continue;
+			}
+
+			if (propCopyTo.TryRead(ref reader, options, PropCopyTo, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propDocValues.TryRead(ref reader, options, PropDocValues))
+			{
+				continue;
+			}
+
+			if (propDynamic.TryRead(ref reader, options, PropDynamic))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propIgnoreAbove.TryRead(ref reader, options, PropIgnoreAbove))
+			{
+				continue;
+			}
+
+			if (propIgnoreMalformed.TryRead(ref reader, options, PropIgnoreMalformed))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propNullValue.TryRead(ref reader, options, PropNullValue))
+			{
+				continue;
+			}
+
+			if (propOnScriptError.TryRead(ref reader, options, PropOnScriptError))
+			{
+				continue;
+			}
+
+			if (propProperties.TryRead(ref reader, options, PropProperties))
+			{
+				continue;
+			}
+
+			if (propScript.TryRead(ref reader, options, PropScript))
+			{
+				continue;
+			}
+
+			if (propStore.TryRead(ref reader, options, PropStore))
+			{
+				continue;
+			}
+
+			if (propTimeSeriesDimension.TryRead(ref reader, options, PropTimeSeriesDimension))
+			{
+				continue;
+			}
+
+			if (propTimeSeriesMetric.TryRead(ref reader, options, PropTimeSeriesMetric))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ByteNumberProperty
+		{
+			Boost = propBoost.Value
+,
+			Coerce = propCoerce.Value
+,
+			CopyTo = propCopyTo.Value
+,
+			DocValues = propDocValues.Value
+,
+			Dynamic = propDynamic.Value
+,
+			Fields = propFields.Value
+,
+			IgnoreAbove = propIgnoreAbove.Value
+,
+			IgnoreMalformed = propIgnoreMalformed.Value
+,
+			Index = propIndex.Value
+,
+			Meta = propMeta.Value
+,
+			NullValue = propNullValue.Value
+,
+			OnScriptError = propOnScriptError.Value
+,
+			Properties = propProperties.Value
+,
+			Script = propScript.Value
+,
+			Store = propStore.Value
+,
+			TimeSeriesDimension = propTimeSeriesDimension.Value
+,
+			TimeSeriesMetric = propTimeSeriesMetric.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ByteNumberProperty value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropCoerce, value.Coerce);
+		writer.WriteProperty(options, PropCopyTo, value.CopyTo, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropDocValues, value.DocValues);
+		writer.WriteProperty(options, PropDynamic, value.Dynamic);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropIgnoreAbove, value.IgnoreAbove);
+		writer.WriteProperty(options, PropIgnoreMalformed, value.IgnoreMalformed);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropNullValue, value.NullValue);
+		writer.WriteProperty(options, PropOnScriptError, value.OnScriptError);
+		writer.WriteProperty(options, PropProperties, value.Properties);
+		writer.WriteProperty(options, PropScript, value.Script);
+		writer.WriteProperty(options, PropStore, value.Store);
+		writer.WriteProperty(options, PropTimeSeriesDimension, value.TimeSeriesDimension);
+		writer.WriteProperty(options, PropTimeSeriesMetric, value.TimeSeriesMetric);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ByteNumberPropertyConverter))]
 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")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	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; }
 
 	/// <summary>
@@ -54,17 +247,11 @@ public sealed partial class ByteNumberProperty : IProperty
 	/// Metadata about the field.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-	[JsonInclude, JsonPropertyName("null_value")]
 	public byte? 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("store")]
 	public bool? Store { get; set; }
 
 	/// <summary>
@@ -72,7 +259,6 @@ public sealed partial class ByteNumberProperty : IProperty
 	/// 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; }
 
 	/// <summary>
@@ -80,10 +266,8 @@ public sealed partial class ByteNumberProperty : IProperty
 	/// For internal use by Elastic only. Marks the field as a time series dimension. Defaults to false.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("time_series_metric")]
 	public Elastic.Clients.Elasticsearch.Mapping.TimeSeriesMetricType? TimeSeriesMetric { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "byte";
 }
 
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 c0074fde8a4..2d76c623e8b 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/CompletionProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/CompletionProperty.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,24 +28,187 @@
 
 namespace Elastic.Clients.Elasticsearch.Mapping;
 
+internal sealed partial class CompletionPropertyConverter : System.Text.Json.Serialization.JsonConverter<CompletionProperty>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAnalyzer = System.Text.Json.JsonEncodedText.Encode("analyzer");
+	private static readonly System.Text.Json.JsonEncodedText PropContexts = System.Text.Json.JsonEncodedText.Encode("contexts");
+	private static readonly System.Text.Json.JsonEncodedText PropCopyTo = System.Text.Json.JsonEncodedText.Encode("copy_to");
+	private static readonly System.Text.Json.JsonEncodedText PropDocValues = System.Text.Json.JsonEncodedText.Encode("doc_values");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamic = System.Text.Json.JsonEncodedText.Encode("dynamic");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreAbove = System.Text.Json.JsonEncodedText.Encode("ignore_above");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxInputLength = System.Text.Json.JsonEncodedText.Encode("max_input_length");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropPreservePositionIncrements = System.Text.Json.JsonEncodedText.Encode("preserve_position_increments");
+	private static readonly System.Text.Json.JsonEncodedText PropPreserveSeparators = System.Text.Json.JsonEncodedText.Encode("preserve_separators");
+	private static readonly System.Text.Json.JsonEncodedText PropProperties = System.Text.Json.JsonEncodedText.Encode("properties");
+	private static readonly System.Text.Json.JsonEncodedText PropSearchAnalyzer = System.Text.Json.JsonEncodedText.Encode("search_analyzer");
+	private static readonly System.Text.Json.JsonEncodedText PropStore = System.Text.Json.JsonEncodedText.Encode("store");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override CompletionProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string?> propAnalyzer = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Mapping.SuggestContext>?> propContexts = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Fields?> propCopyTo = default;
+		LocalJsonProperty<bool?> propDocValues = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.DynamicMapping?> propDynamic = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.Properties?> propFields = default;
+		LocalJsonProperty<int?> propIgnoreAbove = default;
+		LocalJsonProperty<int?> propMaxInputLength = default;
+		LocalJsonProperty<IDictionary<string, string>?> propMeta = default;
+		LocalJsonProperty<bool?> propPreservePositionIncrements = default;
+		LocalJsonProperty<bool?> propPreserveSeparators = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.Properties?> propProperties = default;
+		LocalJsonProperty<string?> propSearchAnalyzer = default;
+		LocalJsonProperty<bool?> propStore = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAnalyzer.TryRead(ref reader, options, PropAnalyzer))
+			{
+				continue;
+			}
+
+			if (propContexts.TryRead(ref reader, options, PropContexts))
+			{
+				continue;
+			}
+
+			if (propCopyTo.TryRead(ref reader, options, PropCopyTo, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propDocValues.TryRead(ref reader, options, PropDocValues))
+			{
+				continue;
+			}
+
+			if (propDynamic.TryRead(ref reader, options, PropDynamic))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propIgnoreAbove.TryRead(ref reader, options, PropIgnoreAbove))
+			{
+				continue;
+			}
+
+			if (propMaxInputLength.TryRead(ref reader, options, PropMaxInputLength))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propPreservePositionIncrements.TryRead(ref reader, options, PropPreservePositionIncrements))
+			{
+				continue;
+			}
+
+			if (propPreserveSeparators.TryRead(ref reader, options, PropPreserveSeparators))
+			{
+				continue;
+			}
+
+			if (propProperties.TryRead(ref reader, options, PropProperties))
+			{
+				continue;
+			}
+
+			if (propSearchAnalyzer.TryRead(ref reader, options, PropSearchAnalyzer))
+			{
+				continue;
+			}
+
+			if (propStore.TryRead(ref reader, options, PropStore))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new CompletionProperty
+		{
+			Analyzer = propAnalyzer.Value
+,
+			Contexts = propContexts.Value
+,
+			CopyTo = propCopyTo.Value
+,
+			DocValues = propDocValues.Value
+,
+			Dynamic = propDynamic.Value
+,
+			Fields = propFields.Value
+,
+			IgnoreAbove = propIgnoreAbove.Value
+,
+			MaxInputLength = propMaxInputLength.Value
+,
+			Meta = propMeta.Value
+,
+			PreservePositionIncrements = propPreservePositionIncrements.Value
+,
+			PreserveSeparators = propPreserveSeparators.Value
+,
+			Properties = propProperties.Value
+,
+			SearchAnalyzer = propSearchAnalyzer.Value
+,
+			Store = propStore.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, CompletionProperty value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAnalyzer, value.Analyzer);
+		writer.WriteProperty(options, PropContexts, value.Contexts);
+		writer.WriteProperty(options, PropCopyTo, value.CopyTo, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropDocValues, value.DocValues);
+		writer.WriteProperty(options, PropDynamic, value.Dynamic);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropIgnoreAbove, value.IgnoreAbove);
+		writer.WriteProperty(options, PropMaxInputLength, value.MaxInputLength);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropPreservePositionIncrements, value.PreservePositionIncrements);
+		writer.WriteProperty(options, PropPreserveSeparators, value.PreserveSeparators);
+		writer.WriteProperty(options, PropProperties, value.Properties);
+		writer.WriteProperty(options, PropSearchAnalyzer, value.SearchAnalyzer);
+		writer.WriteProperty(options, PropStore, value.Store);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(CompletionPropertyConverter))]
 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")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	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; }
 
 	/// <summary>
@@ -52,20 +216,13 @@ public sealed partial class CompletionProperty : IProperty
 	/// Metadata about the field.
 	/// </para>
 	/// </summary>
-	[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("store")]
 	public bool? Store { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "completion";
 }
 
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 fab89d7abb4..cc2be351ffe 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/DateNanosProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/DateNanosProperty.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,26 +28,188 @@
 
 namespace Elastic.Clients.Elasticsearch.Mapping;
 
+internal sealed partial class DateNanosPropertyConverter : System.Text.Json.Serialization.JsonConverter<DateNanosProperty>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropCopyTo = System.Text.Json.JsonEncodedText.Encode("copy_to");
+	private static readonly System.Text.Json.JsonEncodedText PropDocValues = System.Text.Json.JsonEncodedText.Encode("doc_values");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamic = System.Text.Json.JsonEncodedText.Encode("dynamic");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropFormat = System.Text.Json.JsonEncodedText.Encode("format");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreAbove = System.Text.Json.JsonEncodedText.Encode("ignore_above");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreMalformed = System.Text.Json.JsonEncodedText.Encode("ignore_malformed");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropNullValue = System.Text.Json.JsonEncodedText.Encode("null_value");
+	private static readonly System.Text.Json.JsonEncodedText PropPrecisionStep = System.Text.Json.JsonEncodedText.Encode("precision_step");
+	private static readonly System.Text.Json.JsonEncodedText PropProperties = System.Text.Json.JsonEncodedText.Encode("properties");
+	private static readonly System.Text.Json.JsonEncodedText PropStore = System.Text.Json.JsonEncodedText.Encode("store");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override DateNanosProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<double?> propBoost = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Fields?> propCopyTo = default;
+		LocalJsonProperty<bool?> propDocValues = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.DynamicMapping?> propDynamic = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.Properties?> propFields = default;
+		LocalJsonProperty<string?> propFormat = default;
+		LocalJsonProperty<int?> propIgnoreAbove = default;
+		LocalJsonProperty<bool?> propIgnoreMalformed = default;
+		LocalJsonProperty<bool?> propIndex = default;
+		LocalJsonProperty<IDictionary<string, string>?> propMeta = default;
+		LocalJsonProperty<DateTimeOffset?> propNullValue = default;
+		LocalJsonProperty<int?> propPrecisionStep = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.Properties?> propProperties = default;
+		LocalJsonProperty<bool?> propStore = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
+
+			if (propCopyTo.TryRead(ref reader, options, PropCopyTo, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propDocValues.TryRead(ref reader, options, PropDocValues))
+			{
+				continue;
+			}
+
+			if (propDynamic.TryRead(ref reader, options, PropDynamic))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propFormat.TryRead(ref reader, options, PropFormat))
+			{
+				continue;
+			}
+
+			if (propIgnoreAbove.TryRead(ref reader, options, PropIgnoreAbove))
+			{
+				continue;
+			}
+
+			if (propIgnoreMalformed.TryRead(ref reader, options, PropIgnoreMalformed))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propNullValue.TryRead(ref reader, options, PropNullValue))
+			{
+				continue;
+			}
+
+			if (propPrecisionStep.TryRead(ref reader, options, PropPrecisionStep))
+			{
+				continue;
+			}
+
+			if (propProperties.TryRead(ref reader, options, PropProperties))
+			{
+				continue;
+			}
+
+			if (propStore.TryRead(ref reader, options, PropStore))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DateNanosProperty
+		{
+			Boost = propBoost.Value
+,
+			CopyTo = propCopyTo.Value
+,
+			DocValues = propDocValues.Value
+,
+			Dynamic = propDynamic.Value
+,
+			Fields = propFields.Value
+,
+			Format = propFormat.Value
+,
+			IgnoreAbove = propIgnoreAbove.Value
+,
+			IgnoreMalformed = propIgnoreMalformed.Value
+,
+			Index = propIndex.Value
+,
+			Meta = propMeta.Value
+,
+			NullValue = propNullValue.Value
+,
+			PrecisionStep = propPrecisionStep.Value
+,
+			Properties = propProperties.Value
+,
+			Store = propStore.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DateNanosProperty value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropCopyTo, value.CopyTo, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropDocValues, value.DocValues);
+		writer.WriteProperty(options, PropDynamic, value.Dynamic);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropFormat, value.Format);
+		writer.WriteProperty(options, PropIgnoreAbove, value.IgnoreAbove);
+		writer.WriteProperty(options, PropIgnoreMalformed, value.IgnoreMalformed);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropNullValue, value.NullValue);
+		writer.WriteProperty(options, PropPrecisionStep, value.PrecisionStep);
+		writer.WriteProperty(options, PropProperties, value.Properties);
+		writer.WriteProperty(options, PropStore, value.Store);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DateNanosPropertyConverter))]
 public sealed partial class DateNanosProperty : IProperty
 {
-	[JsonInclude, JsonPropertyName("boost")]
 	public double? Boost { get; set; }
-	[JsonInclude, JsonPropertyName("copy_to")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	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; }
 
 	/// <summary>
@@ -54,18 +217,12 @@ public sealed partial class DateNanosProperty : IProperty
 	/// Metadata about the field.
 	/// </para>
 	/// </summary>
-	[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("store")]
 	public bool? Store { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "date_nanos";
 }
 
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 39b0ac3fdaa..a02602e0764 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/DateProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/DateProperty.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,30 +28,210 @@
 
 namespace Elastic.Clients.Elasticsearch.Mapping;
 
+internal sealed partial class DatePropertyConverter : System.Text.Json.Serialization.JsonConverter<DateProperty>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropCopyTo = System.Text.Json.JsonEncodedText.Encode("copy_to");
+	private static readonly System.Text.Json.JsonEncodedText PropDocValues = System.Text.Json.JsonEncodedText.Encode("doc_values");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamic = System.Text.Json.JsonEncodedText.Encode("dynamic");
+	private static readonly System.Text.Json.JsonEncodedText PropFielddata = System.Text.Json.JsonEncodedText.Encode("fielddata");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropFormat = System.Text.Json.JsonEncodedText.Encode("format");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreAbove = System.Text.Json.JsonEncodedText.Encode("ignore_above");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreMalformed = System.Text.Json.JsonEncodedText.Encode("ignore_malformed");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropLocale = System.Text.Json.JsonEncodedText.Encode("locale");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropNullValue = System.Text.Json.JsonEncodedText.Encode("null_value");
+	private static readonly System.Text.Json.JsonEncodedText PropPrecisionStep = System.Text.Json.JsonEncodedText.Encode("precision_step");
+	private static readonly System.Text.Json.JsonEncodedText PropProperties = System.Text.Json.JsonEncodedText.Encode("properties");
+	private static readonly System.Text.Json.JsonEncodedText PropStore = System.Text.Json.JsonEncodedText.Encode("store");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override DateProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<double?> propBoost = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Fields?> propCopyTo = default;
+		LocalJsonProperty<bool?> propDocValues = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.DynamicMapping?> propDynamic = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.IndexManagement.NumericFielddata?> propFielddata = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.Properties?> propFields = default;
+		LocalJsonProperty<string?> propFormat = default;
+		LocalJsonProperty<int?> propIgnoreAbove = default;
+		LocalJsonProperty<bool?> propIgnoreMalformed = default;
+		LocalJsonProperty<bool?> propIndex = default;
+		LocalJsonProperty<string?> propLocale = default;
+		LocalJsonProperty<IDictionary<string, string>?> propMeta = default;
+		LocalJsonProperty<DateTimeOffset?> propNullValue = default;
+		LocalJsonProperty<int?> propPrecisionStep = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.Properties?> propProperties = default;
+		LocalJsonProperty<bool?> propStore = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
+
+			if (propCopyTo.TryRead(ref reader, options, PropCopyTo, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propDocValues.TryRead(ref reader, options, PropDocValues))
+			{
+				continue;
+			}
+
+			if (propDynamic.TryRead(ref reader, options, PropDynamic))
+			{
+				continue;
+			}
+
+			if (propFielddata.TryRead(ref reader, options, PropFielddata))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propFormat.TryRead(ref reader, options, PropFormat))
+			{
+				continue;
+			}
+
+			if (propIgnoreAbove.TryRead(ref reader, options, PropIgnoreAbove))
+			{
+				continue;
+			}
+
+			if (propIgnoreMalformed.TryRead(ref reader, options, PropIgnoreMalformed))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propLocale.TryRead(ref reader, options, PropLocale))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propNullValue.TryRead(ref reader, options, PropNullValue))
+			{
+				continue;
+			}
+
+			if (propPrecisionStep.TryRead(ref reader, options, PropPrecisionStep))
+			{
+				continue;
+			}
+
+			if (propProperties.TryRead(ref reader, options, PropProperties))
+			{
+				continue;
+			}
+
+			if (propStore.TryRead(ref reader, options, PropStore))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DateProperty
+		{
+			Boost = propBoost.Value
+,
+			CopyTo = propCopyTo.Value
+,
+			DocValues = propDocValues.Value
+,
+			Dynamic = propDynamic.Value
+,
+			Fielddata = propFielddata.Value
+,
+			Fields = propFields.Value
+,
+			Format = propFormat.Value
+,
+			IgnoreAbove = propIgnoreAbove.Value
+,
+			IgnoreMalformed = propIgnoreMalformed.Value
+,
+			Index = propIndex.Value
+,
+			Locale = propLocale.Value
+,
+			Meta = propMeta.Value
+,
+			NullValue = propNullValue.Value
+,
+			PrecisionStep = propPrecisionStep.Value
+,
+			Properties = propProperties.Value
+,
+			Store = propStore.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DateProperty value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropCopyTo, value.CopyTo, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropDocValues, value.DocValues);
+		writer.WriteProperty(options, PropDynamic, value.Dynamic);
+		writer.WriteProperty(options, PropFielddata, value.Fielddata);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropFormat, value.Format);
+		writer.WriteProperty(options, PropIgnoreAbove, value.IgnoreAbove);
+		writer.WriteProperty(options, PropIgnoreMalformed, value.IgnoreMalformed);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropLocale, value.Locale);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropNullValue, value.NullValue);
+		writer.WriteProperty(options, PropPrecisionStep, value.PrecisionStep);
+		writer.WriteProperty(options, PropProperties, value.Properties);
+		writer.WriteProperty(options, PropStore, value.Store);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DatePropertyConverter))]
 public sealed partial class DateProperty : IProperty
 {
-	[JsonInclude, JsonPropertyName("boost")]
 	public double? Boost { get; set; }
-	[JsonInclude, JsonPropertyName("copy_to")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	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; }
 
 	/// <summary>
@@ -58,18 +239,12 @@ public sealed partial class DateProperty : IProperty
 	/// Metadata about the field.
 	/// </para>
 	/// </summary>
-	[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("store")]
 	public bool? Store { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "date";
 }
 
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 bb5b8d54471..664c3f55f7d 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/DateRangeProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/DateRangeProperty.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,26 +28,168 @@
 
 namespace Elastic.Clients.Elasticsearch.Mapping;
 
+internal sealed partial class DateRangePropertyConverter : System.Text.Json.Serialization.JsonConverter<DateRangeProperty>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropCoerce = System.Text.Json.JsonEncodedText.Encode("coerce");
+	private static readonly System.Text.Json.JsonEncodedText PropCopyTo = System.Text.Json.JsonEncodedText.Encode("copy_to");
+	private static readonly System.Text.Json.JsonEncodedText PropDocValues = System.Text.Json.JsonEncodedText.Encode("doc_values");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamic = System.Text.Json.JsonEncodedText.Encode("dynamic");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropFormat = System.Text.Json.JsonEncodedText.Encode("format");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreAbove = System.Text.Json.JsonEncodedText.Encode("ignore_above");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropProperties = System.Text.Json.JsonEncodedText.Encode("properties");
+	private static readonly System.Text.Json.JsonEncodedText PropStore = System.Text.Json.JsonEncodedText.Encode("store");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override DateRangeProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<double?> propBoost = default;
+		LocalJsonProperty<bool?> propCoerce = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Fields?> propCopyTo = default;
+		LocalJsonProperty<bool?> propDocValues = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.DynamicMapping?> propDynamic = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.Properties?> propFields = default;
+		LocalJsonProperty<string?> propFormat = default;
+		LocalJsonProperty<int?> propIgnoreAbove = default;
+		LocalJsonProperty<bool?> propIndex = default;
+		LocalJsonProperty<IDictionary<string, string>?> propMeta = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.Properties?> propProperties = default;
+		LocalJsonProperty<bool?> propStore = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
+
+			if (propCoerce.TryRead(ref reader, options, PropCoerce))
+			{
+				continue;
+			}
+
+			if (propCopyTo.TryRead(ref reader, options, PropCopyTo, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propDocValues.TryRead(ref reader, options, PropDocValues))
+			{
+				continue;
+			}
+
+			if (propDynamic.TryRead(ref reader, options, PropDynamic))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propFormat.TryRead(ref reader, options, PropFormat))
+			{
+				continue;
+			}
+
+			if (propIgnoreAbove.TryRead(ref reader, options, PropIgnoreAbove))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propProperties.TryRead(ref reader, options, PropProperties))
+			{
+				continue;
+			}
+
+			if (propStore.TryRead(ref reader, options, PropStore))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DateRangeProperty
+		{
+			Boost = propBoost.Value
+,
+			Coerce = propCoerce.Value
+,
+			CopyTo = propCopyTo.Value
+,
+			DocValues = propDocValues.Value
+,
+			Dynamic = propDynamic.Value
+,
+			Fields = propFields.Value
+,
+			Format = propFormat.Value
+,
+			IgnoreAbove = propIgnoreAbove.Value
+,
+			Index = propIndex.Value
+,
+			Meta = propMeta.Value
+,
+			Properties = propProperties.Value
+,
+			Store = propStore.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DateRangeProperty value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropCoerce, value.Coerce);
+		writer.WriteProperty(options, PropCopyTo, value.CopyTo, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropDocValues, value.DocValues);
+		writer.WriteProperty(options, PropDynamic, value.Dynamic);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropFormat, value.Format);
+		writer.WriteProperty(options, PropIgnoreAbove, value.IgnoreAbove);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropProperties, value.Properties);
+		writer.WriteProperty(options, PropStore, value.Store);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DateRangePropertyConverter))]
 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")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	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; }
 
 	/// <summary>
@@ -54,14 +197,10 @@ public sealed partial class DateRangeProperty : IProperty
 	/// Metadata about the field.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Properties { get; set; }
-	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "date_range";
 }
 
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 923e630d9fa..51240d895be 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/DoubleNumberProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/DoubleNumberProperty.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,26 +28,218 @@
 
 namespace Elastic.Clients.Elasticsearch.Mapping;
 
+internal sealed partial class DoubleNumberPropertyConverter : System.Text.Json.Serialization.JsonConverter<DoubleNumberProperty>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropCoerce = System.Text.Json.JsonEncodedText.Encode("coerce");
+	private static readonly System.Text.Json.JsonEncodedText PropCopyTo = System.Text.Json.JsonEncodedText.Encode("copy_to");
+	private static readonly System.Text.Json.JsonEncodedText PropDocValues = System.Text.Json.JsonEncodedText.Encode("doc_values");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamic = System.Text.Json.JsonEncodedText.Encode("dynamic");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreAbove = System.Text.Json.JsonEncodedText.Encode("ignore_above");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreMalformed = System.Text.Json.JsonEncodedText.Encode("ignore_malformed");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropNullValue = System.Text.Json.JsonEncodedText.Encode("null_value");
+	private static readonly System.Text.Json.JsonEncodedText PropOnScriptError = System.Text.Json.JsonEncodedText.Encode("on_script_error");
+	private static readonly System.Text.Json.JsonEncodedText PropProperties = System.Text.Json.JsonEncodedText.Encode("properties");
+	private static readonly System.Text.Json.JsonEncodedText PropScript = System.Text.Json.JsonEncodedText.Encode("script");
+	private static readonly System.Text.Json.JsonEncodedText PropStore = System.Text.Json.JsonEncodedText.Encode("store");
+	private static readonly System.Text.Json.JsonEncodedText PropTimeSeriesDimension = System.Text.Json.JsonEncodedText.Encode("time_series_dimension");
+	private static readonly System.Text.Json.JsonEncodedText PropTimeSeriesMetric = System.Text.Json.JsonEncodedText.Encode("time_series_metric");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override DoubleNumberProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<double?> propBoost = default;
+		LocalJsonProperty<bool?> propCoerce = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Fields?> propCopyTo = default;
+		LocalJsonProperty<bool?> propDocValues = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.DynamicMapping?> propDynamic = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.Properties?> propFields = default;
+		LocalJsonProperty<int?> propIgnoreAbove = default;
+		LocalJsonProperty<bool?> propIgnoreMalformed = default;
+		LocalJsonProperty<bool?> propIndex = default;
+		LocalJsonProperty<IDictionary<string, string>?> propMeta = default;
+		LocalJsonProperty<double?> propNullValue = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.OnScriptError?> propOnScriptError = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.Properties?> propProperties = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Script?> propScript = default;
+		LocalJsonProperty<bool?> propStore = default;
+		LocalJsonProperty<bool?> propTimeSeriesDimension = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.TimeSeriesMetricType?> propTimeSeriesMetric = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
+
+			if (propCoerce.TryRead(ref reader, options, PropCoerce))
+			{
+				continue;
+			}
+
+			if (propCopyTo.TryRead(ref reader, options, PropCopyTo, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propDocValues.TryRead(ref reader, options, PropDocValues))
+			{
+				continue;
+			}
+
+			if (propDynamic.TryRead(ref reader, options, PropDynamic))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propIgnoreAbove.TryRead(ref reader, options, PropIgnoreAbove))
+			{
+				continue;
+			}
+
+			if (propIgnoreMalformed.TryRead(ref reader, options, PropIgnoreMalformed))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propNullValue.TryRead(ref reader, options, PropNullValue))
+			{
+				continue;
+			}
+
+			if (propOnScriptError.TryRead(ref reader, options, PropOnScriptError))
+			{
+				continue;
+			}
+
+			if (propProperties.TryRead(ref reader, options, PropProperties))
+			{
+				continue;
+			}
+
+			if (propScript.TryRead(ref reader, options, PropScript))
+			{
+				continue;
+			}
+
+			if (propStore.TryRead(ref reader, options, PropStore))
+			{
+				continue;
+			}
+
+			if (propTimeSeriesDimension.TryRead(ref reader, options, PropTimeSeriesDimension))
+			{
+				continue;
+			}
+
+			if (propTimeSeriesMetric.TryRead(ref reader, options, PropTimeSeriesMetric))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DoubleNumberProperty
+		{
+			Boost = propBoost.Value
+,
+			Coerce = propCoerce.Value
+,
+			CopyTo = propCopyTo.Value
+,
+			DocValues = propDocValues.Value
+,
+			Dynamic = propDynamic.Value
+,
+			Fields = propFields.Value
+,
+			IgnoreAbove = propIgnoreAbove.Value
+,
+			IgnoreMalformed = propIgnoreMalformed.Value
+,
+			Index = propIndex.Value
+,
+			Meta = propMeta.Value
+,
+			NullValue = propNullValue.Value
+,
+			OnScriptError = propOnScriptError.Value
+,
+			Properties = propProperties.Value
+,
+			Script = propScript.Value
+,
+			Store = propStore.Value
+,
+			TimeSeriesDimension = propTimeSeriesDimension.Value
+,
+			TimeSeriesMetric = propTimeSeriesMetric.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DoubleNumberProperty value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropCoerce, value.Coerce);
+		writer.WriteProperty(options, PropCopyTo, value.CopyTo, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropDocValues, value.DocValues);
+		writer.WriteProperty(options, PropDynamic, value.Dynamic);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropIgnoreAbove, value.IgnoreAbove);
+		writer.WriteProperty(options, PropIgnoreMalformed, value.IgnoreMalformed);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropNullValue, value.NullValue);
+		writer.WriteProperty(options, PropOnScriptError, value.OnScriptError);
+		writer.WriteProperty(options, PropProperties, value.Properties);
+		writer.WriteProperty(options, PropScript, value.Script);
+		writer.WriteProperty(options, PropStore, value.Store);
+		writer.WriteProperty(options, PropTimeSeriesDimension, value.TimeSeriesDimension);
+		writer.WriteProperty(options, PropTimeSeriesMetric, value.TimeSeriesMetric);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DoubleNumberPropertyConverter))]
 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")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	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; }
 
 	/// <summary>
@@ -54,17 +247,11 @@ public sealed partial class DoubleNumberProperty : IProperty
 	/// Metadata about the field.
 	/// </para>
 	/// </summary>
-	[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("store")]
 	public bool? Store { get; set; }
 
 	/// <summary>
@@ -72,7 +259,6 @@ public sealed partial class DoubleNumberProperty : IProperty
 	/// 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; }
 
 	/// <summary>
@@ -80,10 +266,8 @@ public sealed partial class DoubleNumberProperty : IProperty
 	/// For internal use by Elastic only. Marks the field as a time series dimension. Defaults to false.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("time_series_metric")]
 	public Elastic.Clients.Elasticsearch.Mapping.TimeSeriesMetricType? TimeSeriesMetric { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "double";
 }
 
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 4c0c6868967..b6346d2ebb7 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/DoubleRangeProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/DoubleRangeProperty.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,24 +28,157 @@
 
 namespace Elastic.Clients.Elasticsearch.Mapping;
 
+internal sealed partial class DoubleRangePropertyConverter : System.Text.Json.Serialization.JsonConverter<DoubleRangeProperty>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropCoerce = System.Text.Json.JsonEncodedText.Encode("coerce");
+	private static readonly System.Text.Json.JsonEncodedText PropCopyTo = System.Text.Json.JsonEncodedText.Encode("copy_to");
+	private static readonly System.Text.Json.JsonEncodedText PropDocValues = System.Text.Json.JsonEncodedText.Encode("doc_values");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamic = System.Text.Json.JsonEncodedText.Encode("dynamic");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreAbove = System.Text.Json.JsonEncodedText.Encode("ignore_above");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropProperties = System.Text.Json.JsonEncodedText.Encode("properties");
+	private static readonly System.Text.Json.JsonEncodedText PropStore = System.Text.Json.JsonEncodedText.Encode("store");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override DoubleRangeProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<double?> propBoost = default;
+		LocalJsonProperty<bool?> propCoerce = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Fields?> propCopyTo = default;
+		LocalJsonProperty<bool?> propDocValues = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.DynamicMapping?> propDynamic = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.Properties?> propFields = default;
+		LocalJsonProperty<int?> propIgnoreAbove = default;
+		LocalJsonProperty<bool?> propIndex = default;
+		LocalJsonProperty<IDictionary<string, string>?> propMeta = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.Properties?> propProperties = default;
+		LocalJsonProperty<bool?> propStore = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
+
+			if (propCoerce.TryRead(ref reader, options, PropCoerce))
+			{
+				continue;
+			}
+
+			if (propCopyTo.TryRead(ref reader, options, PropCopyTo, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propDocValues.TryRead(ref reader, options, PropDocValues))
+			{
+				continue;
+			}
+
+			if (propDynamic.TryRead(ref reader, options, PropDynamic))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propIgnoreAbove.TryRead(ref reader, options, PropIgnoreAbove))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propProperties.TryRead(ref reader, options, PropProperties))
+			{
+				continue;
+			}
+
+			if (propStore.TryRead(ref reader, options, PropStore))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DoubleRangeProperty
+		{
+			Boost = propBoost.Value
+,
+			Coerce = propCoerce.Value
+,
+			CopyTo = propCopyTo.Value
+,
+			DocValues = propDocValues.Value
+,
+			Dynamic = propDynamic.Value
+,
+			Fields = propFields.Value
+,
+			IgnoreAbove = propIgnoreAbove.Value
+,
+			Index = propIndex.Value
+,
+			Meta = propMeta.Value
+,
+			Properties = propProperties.Value
+,
+			Store = propStore.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DoubleRangeProperty value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropCoerce, value.Coerce);
+		writer.WriteProperty(options, PropCopyTo, value.CopyTo, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropDocValues, value.DocValues);
+		writer.WriteProperty(options, PropDynamic, value.Dynamic);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropIgnoreAbove, value.IgnoreAbove);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropProperties, value.Properties);
+		writer.WriteProperty(options, PropStore, value.Store);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DoubleRangePropertyConverter))]
 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")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	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; }
 
 	/// <summary>
@@ -52,14 +186,10 @@ public sealed partial class DoubleRangeProperty : IProperty
 	/// Metadata about the field.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Properties { get; set; }
-	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "double_range";
 }
 
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 e44d585e58d..41843482d23 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/DynamicProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/DynamicProperty.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,42 +28,356 @@
 
 namespace Elastic.Clients.Elasticsearch.Mapping;
 
+internal sealed partial class DynamicPropertyConverter : System.Text.Json.Serialization.JsonConverter<DynamicProperty>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAnalyzer = System.Text.Json.JsonEncodedText.Encode("analyzer");
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropCoerce = System.Text.Json.JsonEncodedText.Encode("coerce");
+	private static readonly System.Text.Json.JsonEncodedText PropCopyTo = System.Text.Json.JsonEncodedText.Encode("copy_to");
+	private static readonly System.Text.Json.JsonEncodedText PropDocValues = System.Text.Json.JsonEncodedText.Encode("doc_values");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamic = System.Text.Json.JsonEncodedText.Encode("dynamic");
+	private static readonly System.Text.Json.JsonEncodedText PropEagerGlobalOrdinals = System.Text.Json.JsonEncodedText.Encode("eager_global_ordinals");
+	private static readonly System.Text.Json.JsonEncodedText PropEnabled = System.Text.Json.JsonEncodedText.Encode("enabled");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropFormat = System.Text.Json.JsonEncodedText.Encode("format");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreAbove = System.Text.Json.JsonEncodedText.Encode("ignore_above");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreMalformed = System.Text.Json.JsonEncodedText.Encode("ignore_malformed");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropIndexOptions = System.Text.Json.JsonEncodedText.Encode("index_options");
+	private static readonly System.Text.Json.JsonEncodedText PropIndexPhrases = System.Text.Json.JsonEncodedText.Encode("index_phrases");
+	private static readonly System.Text.Json.JsonEncodedText PropIndexPrefixes = System.Text.Json.JsonEncodedText.Encode("index_prefixes");
+	private static readonly System.Text.Json.JsonEncodedText PropLocale = System.Text.Json.JsonEncodedText.Encode("locale");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropNorms = System.Text.Json.JsonEncodedText.Encode("norms");
+	private static readonly System.Text.Json.JsonEncodedText PropNullValue = System.Text.Json.JsonEncodedText.Encode("null_value");
+	private static readonly System.Text.Json.JsonEncodedText PropOnScriptError = System.Text.Json.JsonEncodedText.Encode("on_script_error");
+	private static readonly System.Text.Json.JsonEncodedText PropPositionIncrementGap = System.Text.Json.JsonEncodedText.Encode("position_increment_gap");
+	private static readonly System.Text.Json.JsonEncodedText PropPrecisionStep = System.Text.Json.JsonEncodedText.Encode("precision_step");
+	private static readonly System.Text.Json.JsonEncodedText PropProperties = System.Text.Json.JsonEncodedText.Encode("properties");
+	private static readonly System.Text.Json.JsonEncodedText PropScript = System.Text.Json.JsonEncodedText.Encode("script");
+	private static readonly System.Text.Json.JsonEncodedText PropSearchAnalyzer = System.Text.Json.JsonEncodedText.Encode("search_analyzer");
+	private static readonly System.Text.Json.JsonEncodedText PropSearchQuoteAnalyzer = System.Text.Json.JsonEncodedText.Encode("search_quote_analyzer");
+	private static readonly System.Text.Json.JsonEncodedText PropStore = System.Text.Json.JsonEncodedText.Encode("store");
+	private static readonly System.Text.Json.JsonEncodedText PropTermVector = System.Text.Json.JsonEncodedText.Encode("term_vector");
+	private static readonly System.Text.Json.JsonEncodedText PropTimeSeriesMetric = System.Text.Json.JsonEncodedText.Encode("time_series_metric");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override DynamicProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string?> propAnalyzer = default;
+		LocalJsonProperty<double?> propBoost = default;
+		LocalJsonProperty<bool?> propCoerce = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Fields?> propCopyTo = default;
+		LocalJsonProperty<bool?> propDocValues = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.DynamicMapping?> propDynamic = default;
+		LocalJsonProperty<bool?> propEagerGlobalOrdinals = default;
+		LocalJsonProperty<bool?> propEnabled = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.Properties?> propFields = default;
+		LocalJsonProperty<string?> propFormat = default;
+		LocalJsonProperty<int?> propIgnoreAbove = default;
+		LocalJsonProperty<bool?> propIgnoreMalformed = default;
+		LocalJsonProperty<bool?> propIndex = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.IndexOptions?> propIndexOptions = default;
+		LocalJsonProperty<bool?> propIndexPhrases = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.TextIndexPrefixes?> propIndexPrefixes = default;
+		LocalJsonProperty<string?> propLocale = default;
+		LocalJsonProperty<IDictionary<string, string>?> propMeta = default;
+		LocalJsonProperty<bool?> propNorms = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.FieldValue?> propNullValue = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.OnScriptError?> propOnScriptError = default;
+		LocalJsonProperty<int?> propPositionIncrementGap = default;
+		LocalJsonProperty<int?> propPrecisionStep = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.Properties?> propProperties = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Script?> propScript = default;
+		LocalJsonProperty<string?> propSearchAnalyzer = default;
+		LocalJsonProperty<string?> propSearchQuoteAnalyzer = default;
+		LocalJsonProperty<bool?> propStore = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.TermVectorOption?> propTermVector = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.TimeSeriesMetricType?> propTimeSeriesMetric = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAnalyzer.TryRead(ref reader, options, PropAnalyzer))
+			{
+				continue;
+			}
+
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
+
+			if (propCoerce.TryRead(ref reader, options, PropCoerce))
+			{
+				continue;
+			}
+
+			if (propCopyTo.TryRead(ref reader, options, PropCopyTo, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propDocValues.TryRead(ref reader, options, PropDocValues))
+			{
+				continue;
+			}
+
+			if (propDynamic.TryRead(ref reader, options, PropDynamic))
+			{
+				continue;
+			}
+
+			if (propEagerGlobalOrdinals.TryRead(ref reader, options, PropEagerGlobalOrdinals))
+			{
+				continue;
+			}
+
+			if (propEnabled.TryRead(ref reader, options, PropEnabled))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propFormat.TryRead(ref reader, options, PropFormat))
+			{
+				continue;
+			}
+
+			if (propIgnoreAbove.TryRead(ref reader, options, PropIgnoreAbove))
+			{
+				continue;
+			}
+
+			if (propIgnoreMalformed.TryRead(ref reader, options, PropIgnoreMalformed))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propIndexOptions.TryRead(ref reader, options, PropIndexOptions))
+			{
+				continue;
+			}
+
+			if (propIndexPhrases.TryRead(ref reader, options, PropIndexPhrases))
+			{
+				continue;
+			}
+
+			if (propIndexPrefixes.TryRead(ref reader, options, PropIndexPrefixes))
+			{
+				continue;
+			}
+
+			if (propLocale.TryRead(ref reader, options, PropLocale))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propNorms.TryRead(ref reader, options, PropNorms))
+			{
+				continue;
+			}
+
+			if (propNullValue.TryRead(ref reader, options, PropNullValue))
+			{
+				continue;
+			}
+
+			if (propOnScriptError.TryRead(ref reader, options, PropOnScriptError))
+			{
+				continue;
+			}
+
+			if (propPositionIncrementGap.TryRead(ref reader, options, PropPositionIncrementGap))
+			{
+				continue;
+			}
+
+			if (propPrecisionStep.TryRead(ref reader, options, PropPrecisionStep))
+			{
+				continue;
+			}
+
+			if (propProperties.TryRead(ref reader, options, PropProperties))
+			{
+				continue;
+			}
+
+			if (propScript.TryRead(ref reader, options, PropScript))
+			{
+				continue;
+			}
+
+			if (propSearchAnalyzer.TryRead(ref reader, options, PropSearchAnalyzer))
+			{
+				continue;
+			}
+
+			if (propSearchQuoteAnalyzer.TryRead(ref reader, options, PropSearchQuoteAnalyzer))
+			{
+				continue;
+			}
+
+			if (propStore.TryRead(ref reader, options, PropStore))
+			{
+				continue;
+			}
+
+			if (propTermVector.TryRead(ref reader, options, PropTermVector))
+			{
+				continue;
+			}
+
+			if (propTimeSeriesMetric.TryRead(ref reader, options, PropTimeSeriesMetric))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DynamicProperty
+		{
+			Analyzer = propAnalyzer.Value
+,
+			Boost = propBoost.Value
+,
+			Coerce = propCoerce.Value
+,
+			CopyTo = propCopyTo.Value
+,
+			DocValues = propDocValues.Value
+,
+			Dynamic = propDynamic.Value
+,
+			EagerGlobalOrdinals = propEagerGlobalOrdinals.Value
+,
+			Enabled = propEnabled.Value
+,
+			Fields = propFields.Value
+,
+			Format = propFormat.Value
+,
+			IgnoreAbove = propIgnoreAbove.Value
+,
+			IgnoreMalformed = propIgnoreMalformed.Value
+,
+			Index = propIndex.Value
+,
+			IndexOptions = propIndexOptions.Value
+,
+			IndexPhrases = propIndexPhrases.Value
+,
+			IndexPrefixes = propIndexPrefixes.Value
+,
+			Locale = propLocale.Value
+,
+			Meta = propMeta.Value
+,
+			Norms = propNorms.Value
+,
+			NullValue = propNullValue.Value
+,
+			OnScriptError = propOnScriptError.Value
+,
+			PositionIncrementGap = propPositionIncrementGap.Value
+,
+			PrecisionStep = propPrecisionStep.Value
+,
+			Properties = propProperties.Value
+,
+			Script = propScript.Value
+,
+			SearchAnalyzer = propSearchAnalyzer.Value
+,
+			SearchQuoteAnalyzer = propSearchQuoteAnalyzer.Value
+,
+			Store = propStore.Value
+,
+			TermVector = propTermVector.Value
+,
+			TimeSeriesMetric = propTimeSeriesMetric.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DynamicProperty value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAnalyzer, value.Analyzer);
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropCoerce, value.Coerce);
+		writer.WriteProperty(options, PropCopyTo, value.CopyTo, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropDocValues, value.DocValues);
+		writer.WriteProperty(options, PropDynamic, value.Dynamic);
+		writer.WriteProperty(options, PropEagerGlobalOrdinals, value.EagerGlobalOrdinals);
+		writer.WriteProperty(options, PropEnabled, value.Enabled);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropFormat, value.Format);
+		writer.WriteProperty(options, PropIgnoreAbove, value.IgnoreAbove);
+		writer.WriteProperty(options, PropIgnoreMalformed, value.IgnoreMalformed);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropIndexOptions, value.IndexOptions);
+		writer.WriteProperty(options, PropIndexPhrases, value.IndexPhrases);
+		writer.WriteProperty(options, PropIndexPrefixes, value.IndexPrefixes);
+		writer.WriteProperty(options, PropLocale, value.Locale);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropNorms, value.Norms);
+		writer.WriteProperty(options, PropNullValue, value.NullValue);
+		writer.WriteProperty(options, PropOnScriptError, value.OnScriptError);
+		writer.WriteProperty(options, PropPositionIncrementGap, value.PositionIncrementGap);
+		writer.WriteProperty(options, PropPrecisionStep, value.PrecisionStep);
+		writer.WriteProperty(options, PropProperties, value.Properties);
+		writer.WriteProperty(options, PropScript, value.Script);
+		writer.WriteProperty(options, PropSearchAnalyzer, value.SearchAnalyzer);
+		writer.WriteProperty(options, PropSearchQuoteAnalyzer, value.SearchQuoteAnalyzer);
+		writer.WriteProperty(options, PropStore, value.Store);
+		writer.WriteProperty(options, PropTermVector, value.TermVector);
+		writer.WriteProperty(options, PropTimeSeriesMetric, value.TimeSeriesMetric);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(DynamicPropertyConverter))]
 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")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	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; }
 
 	/// <summary>
@@ -70,34 +385,20 @@ public sealed partial class DynamicProperty : IProperty
 	/// Metadata about the field.
 	/// </para>
 	/// </summary>
-	[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("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")]
 	public string Type => "{dynamic_type}";
 }
 
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 fa40241afaa..8d6c8a2e3ee 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/DynamicTemplate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/DynamicTemplate.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -39,12 +40,16 @@ internal DynamicTemplate(string variantName, object variant)
 			throw new ArgumentNullException(nameof(variant));
 		if (string.IsNullOrWhiteSpace(variantName))
 			throw new ArgumentException("Variant name must not be empty or whitespace.");
-		VariantName = variantName;
+		VariantType = variantName;
 		Variant = variant;
 	}
 
-	internal object Variant { get; }
-	internal string VariantName { get; }
+	internal DynamicTemplate()
+	{
+	}
+
+	public object Variant { get; internal set; }
+	public string VariantType { get; internal set; }
 
 	public static DynamicTemplate Mapping(Elastic.Clients.Elasticsearch.Mapping.IProperty property) => new DynamicTemplate("mapping", property);
 	public static DynamicTemplate Runtime(Elastic.Clients.Elasticsearch.Mapping.IProperty property) => new DynamicTemplate("runtime", property);
@@ -77,167 +82,131 @@ public bool TryGet<T>([NotNullWhen(true)] out T? result) where T : class
 	}
 }
 
-internal sealed partial class DynamicTemplateConverter : JsonConverter<DynamicTemplate>
+internal sealed partial class DynamicTemplateConverter : System.Text.Json.Serialization.JsonConverter<DynamicTemplate>
 {
-	public override DynamicTemplate Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropMatch = System.Text.Json.JsonEncodedText.Encode("match");
+	private static readonly System.Text.Json.JsonEncodedText PropMatchMappingType = System.Text.Json.JsonEncodedText.Encode("match_mapping_type");
+	private static readonly System.Text.Json.JsonEncodedText PropMatchPattern = System.Text.Json.JsonEncodedText.Encode("match_pattern");
+	private static readonly System.Text.Json.JsonEncodedText PropPathMatch = System.Text.Json.JsonEncodedText.Encode("path_match");
+	private static readonly System.Text.Json.JsonEncodedText PropPathUnmatch = System.Text.Json.JsonEncodedText.Encode("path_unmatch");
+	private static readonly System.Text.Json.JsonEncodedText PropUnmatch = System.Text.Json.JsonEncodedText.Encode("unmatch");
+	private static readonly System.Text.Json.JsonEncodedText PropUnmatchMappingType = System.Text.Json.JsonEncodedText.Encode("unmatch_mapping_type");
+	private static readonly System.Text.Json.JsonEncodedText VariantMapping = System.Text.Json.JsonEncodedText.Encode("mapping");
+	private static readonly System.Text.Json.JsonEncodedText VariantRuntime = System.Text.Json.JsonEncodedText.Encode("runtime");
+
+	public override DynamicTemplate Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-		{
-			throw new JsonException("Expected start token.");
-		}
-
-		object? variantValue = default;
-		string? variantNameValue = default;
-		ICollection<string>? matchValue = default;
-		ICollection<string>? matchMappingTypeValue = default;
-		Elastic.Clients.Elasticsearch.Mapping.MatchType? matchPatternValue = default;
-		ICollection<string>? pathMatchValue = default;
-		ICollection<string>? pathUnmatchValue = default;
-		ICollection<string>? unmatchValue = default;
-		ICollection<string>? unmatchMappingTypeValue = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<string>?> propMatch = default;
+		LocalJsonProperty<ICollection<string>?> propMatchMappingType = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.MatchType?> propMatchPattern = default;
+		LocalJsonProperty<ICollection<string>?> propPathMatch = default;
+		LocalJsonProperty<ICollection<string>?> propPathUnmatch = default;
+		LocalJsonProperty<ICollection<string>?> propUnmatch = default;
+		LocalJsonProperty<ICollection<string>?> propUnmatchMappingType = default;
+		var variantType = string.Empty;
+		object? variant = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token.");
-			}
-
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token representing the name of an Elasticsearch field.");
-			}
-
-			var propertyName = reader.GetString();
-			reader.Read();
-			if (propertyName == "match")
+			if (propMatch.TryRead(ref reader, options, PropMatch, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
 			{
-				matchValue = SingleOrManySerializationHelper.Deserialize<string>(ref reader, options);
 				continue;
 			}
 
-			if (propertyName == "match_mapping_type")
+			if (propMatchMappingType.TryRead(ref reader, options, PropMatchMappingType, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
 			{
-				matchMappingTypeValue = SingleOrManySerializationHelper.Deserialize<string>(ref reader, options);
 				continue;
 			}
 
-			if (propertyName == "match_pattern")
+			if (propMatchPattern.TryRead(ref reader, options, PropMatchPattern))
 			{
-				matchPatternValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Mapping.MatchType?>(ref reader, options);
 				continue;
 			}
 
-			if (propertyName == "path_match")
+			if (propPathMatch.TryRead(ref reader, options, PropPathMatch, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
 			{
-				pathMatchValue = SingleOrManySerializationHelper.Deserialize<string>(ref reader, options);
 				continue;
 			}
 
-			if (propertyName == "path_unmatch")
+			if (propPathUnmatch.TryRead(ref reader, options, PropPathUnmatch, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
 			{
-				pathUnmatchValue = SingleOrManySerializationHelper.Deserialize<string>(ref reader, options);
 				continue;
 			}
 
-			if (propertyName == "unmatch")
+			if (propUnmatch.TryRead(ref reader, options, PropUnmatch, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
 			{
-				unmatchValue = SingleOrManySerializationHelper.Deserialize<string>(ref reader, options);
 				continue;
 			}
 
-			if (propertyName == "unmatch_mapping_type")
+			if (propUnmatchMappingType.TryRead(ref reader, options, PropUnmatchMappingType, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
 			{
-				unmatchMappingTypeValue = SingleOrManySerializationHelper.Deserialize<string>(ref reader, options);
 				continue;
 			}
 
-			if (propertyName == "mapping")
+			if (reader.ValueTextEquals(VariantMapping))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Mapping.IProperty?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantMapping.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Mapping.IProperty?>(options);
 				continue;
 			}
 
-			if (propertyName == "runtime")
+			if (reader.ValueTextEquals(VariantRuntime))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Mapping.IProperty?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantRuntime.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Mapping.IProperty?>(options);
 				continue;
 			}
 
-			throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'DynamicTemplate' from the response.");
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		var result = new DynamicTemplate(variantNameValue, variantValue);
-		result.Match = matchValue;
-		result.MatchMappingType = matchMappingTypeValue;
-		result.MatchPattern = matchPatternValue;
-		result.PathMatch = pathMatchValue;
-		result.PathUnmatch = pathUnmatchValue;
-		result.Unmatch = unmatchValue;
-		result.UnmatchMappingType = unmatchMappingTypeValue;
-		return result;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DynamicTemplate
+		{
+			VariantType = variantType,
+			Variant = variant,
+			Match = propMatch.Value
+,
+			MatchMappingType = propMatchMappingType.Value
+,
+			MatchPattern = propMatchPattern.Value
+,
+			PathMatch = propPathMatch.Value
+,
+			PathUnmatch = propPathUnmatch.Value
+,
+			Unmatch = propUnmatch.Value
+,
+			UnmatchMappingType = propUnmatchMappingType.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, DynamicTemplate value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DynamicTemplate value, System.Text.Json.JsonSerializerOptions options)
 	{
 		writer.WriteStartObject();
-		if (value.Match is not null)
-		{
-			writer.WritePropertyName("match");
-			SingleOrManySerializationHelper.Serialize<string>(value.Match, writer, options);
-		}
-
-		if (value.MatchMappingType is not null)
+		switch (value.VariantType)
 		{
-			writer.WritePropertyName("match_mapping_type");
-			SingleOrManySerializationHelper.Serialize<string>(value.MatchMappingType, writer, options);
-		}
-
-		if (value.MatchPattern is not null)
-		{
-			writer.WritePropertyName("match_pattern");
-			JsonSerializer.Serialize(writer, value.MatchPattern, options);
-		}
-
-		if (value.PathMatch is not null)
-		{
-			writer.WritePropertyName("path_match");
-			SingleOrManySerializationHelper.Serialize<string>(value.PathMatch, writer, options);
-		}
-
-		if (value.PathUnmatch is not null)
-		{
-			writer.WritePropertyName("path_unmatch");
-			SingleOrManySerializationHelper.Serialize<string>(value.PathUnmatch, writer, options);
-		}
-
-		if (value.Unmatch is not null)
-		{
-			writer.WritePropertyName("unmatch");
-			SingleOrManySerializationHelper.Serialize<string>(value.Unmatch, writer, options);
-		}
-
-		if (value.UnmatchMappingType is not null)
-		{
-			writer.WritePropertyName("unmatch_mapping_type");
-			SingleOrManySerializationHelper.Serialize<string>(value.UnmatchMappingType, writer, options);
-		}
-
-		if (value.VariantName is not null && value.Variant is not null)
-		{
-			writer.WritePropertyName(value.VariantName);
-			switch (value.VariantName)
-			{
-				case "mapping":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Mapping.IProperty>(writer, (Elastic.Clients.Elasticsearch.Mapping.IProperty)value.Variant, options);
-					break;
-				case "runtime":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Mapping.IProperty>(writer, (Elastic.Clients.Elasticsearch.Mapping.IProperty)value.Variant, options);
-					break;
-			}
+			case "":
+				break;
+			case "mapping":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Mapping.IProperty?)value.Variant);
+				break;
+			case "runtime":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Mapping.IProperty?)value.Variant);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.VariantType}' is not supported for type '{nameof(DynamicTemplate)}'.");
 		}
 
+		writer.WriteProperty(options, PropMatch, value.Match, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropMatchMappingType, value.MatchMappingType, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropMatchPattern, value.MatchPattern);
+		writer.WriteProperty(options, PropPathMatch, value.PathMatch, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropPathUnmatch, value.PathUnmatch, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropUnmatch, value.Unmatch, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropUnmatchMappingType, value.UnmatchMappingType, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
 		writer.WriteEndObject();
 	}
 }
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 78b51afb62b..0c7be13fbe3 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/FloatNumberProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/FloatNumberProperty.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,26 +28,218 @@
 
 namespace Elastic.Clients.Elasticsearch.Mapping;
 
+internal sealed partial class FloatNumberPropertyConverter : System.Text.Json.Serialization.JsonConverter<FloatNumberProperty>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropCoerce = System.Text.Json.JsonEncodedText.Encode("coerce");
+	private static readonly System.Text.Json.JsonEncodedText PropCopyTo = System.Text.Json.JsonEncodedText.Encode("copy_to");
+	private static readonly System.Text.Json.JsonEncodedText PropDocValues = System.Text.Json.JsonEncodedText.Encode("doc_values");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamic = System.Text.Json.JsonEncodedText.Encode("dynamic");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreAbove = System.Text.Json.JsonEncodedText.Encode("ignore_above");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreMalformed = System.Text.Json.JsonEncodedText.Encode("ignore_malformed");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropNullValue = System.Text.Json.JsonEncodedText.Encode("null_value");
+	private static readonly System.Text.Json.JsonEncodedText PropOnScriptError = System.Text.Json.JsonEncodedText.Encode("on_script_error");
+	private static readonly System.Text.Json.JsonEncodedText PropProperties = System.Text.Json.JsonEncodedText.Encode("properties");
+	private static readonly System.Text.Json.JsonEncodedText PropScript = System.Text.Json.JsonEncodedText.Encode("script");
+	private static readonly System.Text.Json.JsonEncodedText PropStore = System.Text.Json.JsonEncodedText.Encode("store");
+	private static readonly System.Text.Json.JsonEncodedText PropTimeSeriesDimension = System.Text.Json.JsonEncodedText.Encode("time_series_dimension");
+	private static readonly System.Text.Json.JsonEncodedText PropTimeSeriesMetric = System.Text.Json.JsonEncodedText.Encode("time_series_metric");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override FloatNumberProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<double?> propBoost = default;
+		LocalJsonProperty<bool?> propCoerce = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Fields?> propCopyTo = default;
+		LocalJsonProperty<bool?> propDocValues = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.DynamicMapping?> propDynamic = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.Properties?> propFields = default;
+		LocalJsonProperty<int?> propIgnoreAbove = default;
+		LocalJsonProperty<bool?> propIgnoreMalformed = default;
+		LocalJsonProperty<bool?> propIndex = default;
+		LocalJsonProperty<IDictionary<string, string>?> propMeta = default;
+		LocalJsonProperty<float?> propNullValue = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.OnScriptError?> propOnScriptError = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.Properties?> propProperties = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Script?> propScript = default;
+		LocalJsonProperty<bool?> propStore = default;
+		LocalJsonProperty<bool?> propTimeSeriesDimension = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.TimeSeriesMetricType?> propTimeSeriesMetric = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
+
+			if (propCoerce.TryRead(ref reader, options, PropCoerce))
+			{
+				continue;
+			}
+
+			if (propCopyTo.TryRead(ref reader, options, PropCopyTo, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propDocValues.TryRead(ref reader, options, PropDocValues))
+			{
+				continue;
+			}
+
+			if (propDynamic.TryRead(ref reader, options, PropDynamic))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propIgnoreAbove.TryRead(ref reader, options, PropIgnoreAbove))
+			{
+				continue;
+			}
+
+			if (propIgnoreMalformed.TryRead(ref reader, options, PropIgnoreMalformed))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propNullValue.TryRead(ref reader, options, PropNullValue))
+			{
+				continue;
+			}
+
+			if (propOnScriptError.TryRead(ref reader, options, PropOnScriptError))
+			{
+				continue;
+			}
+
+			if (propProperties.TryRead(ref reader, options, PropProperties))
+			{
+				continue;
+			}
+
+			if (propScript.TryRead(ref reader, options, PropScript))
+			{
+				continue;
+			}
+
+			if (propStore.TryRead(ref reader, options, PropStore))
+			{
+				continue;
+			}
+
+			if (propTimeSeriesDimension.TryRead(ref reader, options, PropTimeSeriesDimension))
+			{
+				continue;
+			}
+
+			if (propTimeSeriesMetric.TryRead(ref reader, options, PropTimeSeriesMetric))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new FloatNumberProperty
+		{
+			Boost = propBoost.Value
+,
+			Coerce = propCoerce.Value
+,
+			CopyTo = propCopyTo.Value
+,
+			DocValues = propDocValues.Value
+,
+			Dynamic = propDynamic.Value
+,
+			Fields = propFields.Value
+,
+			IgnoreAbove = propIgnoreAbove.Value
+,
+			IgnoreMalformed = propIgnoreMalformed.Value
+,
+			Index = propIndex.Value
+,
+			Meta = propMeta.Value
+,
+			NullValue = propNullValue.Value
+,
+			OnScriptError = propOnScriptError.Value
+,
+			Properties = propProperties.Value
+,
+			Script = propScript.Value
+,
+			Store = propStore.Value
+,
+			TimeSeriesDimension = propTimeSeriesDimension.Value
+,
+			TimeSeriesMetric = propTimeSeriesMetric.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, FloatNumberProperty value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropCoerce, value.Coerce);
+		writer.WriteProperty(options, PropCopyTo, value.CopyTo, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropDocValues, value.DocValues);
+		writer.WriteProperty(options, PropDynamic, value.Dynamic);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropIgnoreAbove, value.IgnoreAbove);
+		writer.WriteProperty(options, PropIgnoreMalformed, value.IgnoreMalformed);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropNullValue, value.NullValue);
+		writer.WriteProperty(options, PropOnScriptError, value.OnScriptError);
+		writer.WriteProperty(options, PropProperties, value.Properties);
+		writer.WriteProperty(options, PropScript, value.Script);
+		writer.WriteProperty(options, PropStore, value.Store);
+		writer.WriteProperty(options, PropTimeSeriesDimension, value.TimeSeriesDimension);
+		writer.WriteProperty(options, PropTimeSeriesMetric, value.TimeSeriesMetric);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(FloatNumberPropertyConverter))]
 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")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	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; }
 
 	/// <summary>
@@ -54,17 +247,11 @@ public sealed partial class FloatNumberProperty : IProperty
 	/// Metadata about the field.
 	/// </para>
 	/// </summary>
-	[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("store")]
 	public bool? Store { get; set; }
 
 	/// <summary>
@@ -72,7 +259,6 @@ public sealed partial class FloatNumberProperty : IProperty
 	/// 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; }
 
 	/// <summary>
@@ -80,10 +266,8 @@ public sealed partial class FloatNumberProperty : IProperty
 	/// For internal use by Elastic only. Marks the field as a time series dimension. Defaults to false.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("time_series_metric")]
 	public Elastic.Clients.Elasticsearch.Mapping.TimeSeriesMetricType? TimeSeriesMetric { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "float";
 }
 
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 baba3f12be0..5a2caad8f41 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/FloatRangeProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/FloatRangeProperty.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,24 +28,157 @@
 
 namespace Elastic.Clients.Elasticsearch.Mapping;
 
+internal sealed partial class FloatRangePropertyConverter : System.Text.Json.Serialization.JsonConverter<FloatRangeProperty>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropCoerce = System.Text.Json.JsonEncodedText.Encode("coerce");
+	private static readonly System.Text.Json.JsonEncodedText PropCopyTo = System.Text.Json.JsonEncodedText.Encode("copy_to");
+	private static readonly System.Text.Json.JsonEncodedText PropDocValues = System.Text.Json.JsonEncodedText.Encode("doc_values");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamic = System.Text.Json.JsonEncodedText.Encode("dynamic");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreAbove = System.Text.Json.JsonEncodedText.Encode("ignore_above");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropProperties = System.Text.Json.JsonEncodedText.Encode("properties");
+	private static readonly System.Text.Json.JsonEncodedText PropStore = System.Text.Json.JsonEncodedText.Encode("store");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override FloatRangeProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<double?> propBoost = default;
+		LocalJsonProperty<bool?> propCoerce = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Fields?> propCopyTo = default;
+		LocalJsonProperty<bool?> propDocValues = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.DynamicMapping?> propDynamic = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.Properties?> propFields = default;
+		LocalJsonProperty<int?> propIgnoreAbove = default;
+		LocalJsonProperty<bool?> propIndex = default;
+		LocalJsonProperty<IDictionary<string, string>?> propMeta = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.Properties?> propProperties = default;
+		LocalJsonProperty<bool?> propStore = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
+
+			if (propCoerce.TryRead(ref reader, options, PropCoerce))
+			{
+				continue;
+			}
+
+			if (propCopyTo.TryRead(ref reader, options, PropCopyTo, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propDocValues.TryRead(ref reader, options, PropDocValues))
+			{
+				continue;
+			}
+
+			if (propDynamic.TryRead(ref reader, options, PropDynamic))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propIgnoreAbove.TryRead(ref reader, options, PropIgnoreAbove))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propProperties.TryRead(ref reader, options, PropProperties))
+			{
+				continue;
+			}
+
+			if (propStore.TryRead(ref reader, options, PropStore))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new FloatRangeProperty
+		{
+			Boost = propBoost.Value
+,
+			Coerce = propCoerce.Value
+,
+			CopyTo = propCopyTo.Value
+,
+			DocValues = propDocValues.Value
+,
+			Dynamic = propDynamic.Value
+,
+			Fields = propFields.Value
+,
+			IgnoreAbove = propIgnoreAbove.Value
+,
+			Index = propIndex.Value
+,
+			Meta = propMeta.Value
+,
+			Properties = propProperties.Value
+,
+			Store = propStore.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, FloatRangeProperty value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropCoerce, value.Coerce);
+		writer.WriteProperty(options, PropCopyTo, value.CopyTo, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropDocValues, value.DocValues);
+		writer.WriteProperty(options, PropDynamic, value.Dynamic);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropIgnoreAbove, value.IgnoreAbove);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropProperties, value.Properties);
+		writer.WriteProperty(options, PropStore, value.Store);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(FloatRangePropertyConverter))]
 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")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	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; }
 
 	/// <summary>
@@ -52,14 +186,10 @@ public sealed partial class FloatRangeProperty : IProperty
 	/// Metadata about the field.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Properties { get; set; }
-	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "float_range";
 }
 
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 8151792a3a9..c3818344877 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/GeoPointProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/GeoPointProperty.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,24 +28,187 @@
 
 namespace Elastic.Clients.Elasticsearch.Mapping;
 
+internal sealed partial class GeoPointPropertyConverter : System.Text.Json.Serialization.JsonConverter<GeoPointProperty>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCopyTo = System.Text.Json.JsonEncodedText.Encode("copy_to");
+	private static readonly System.Text.Json.JsonEncodedText PropDocValues = System.Text.Json.JsonEncodedText.Encode("doc_values");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamic = System.Text.Json.JsonEncodedText.Encode("dynamic");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreAbove = System.Text.Json.JsonEncodedText.Encode("ignore_above");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreMalformed = System.Text.Json.JsonEncodedText.Encode("ignore_malformed");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreZValue = System.Text.Json.JsonEncodedText.Encode("ignore_z_value");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropNullValue = System.Text.Json.JsonEncodedText.Encode("null_value");
+	private static readonly System.Text.Json.JsonEncodedText PropOnScriptError = System.Text.Json.JsonEncodedText.Encode("on_script_error");
+	private static readonly System.Text.Json.JsonEncodedText PropProperties = System.Text.Json.JsonEncodedText.Encode("properties");
+	private static readonly System.Text.Json.JsonEncodedText PropScript = System.Text.Json.JsonEncodedText.Encode("script");
+	private static readonly System.Text.Json.JsonEncodedText PropStore = System.Text.Json.JsonEncodedText.Encode("store");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override GeoPointProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Fields?> propCopyTo = default;
+		LocalJsonProperty<bool?> propDocValues = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.DynamicMapping?> propDynamic = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.Properties?> propFields = default;
+		LocalJsonProperty<int?> propIgnoreAbove = default;
+		LocalJsonProperty<bool?> propIgnoreMalformed = default;
+		LocalJsonProperty<bool?> propIgnoreZValue = default;
+		LocalJsonProperty<bool?> propIndex = default;
+		LocalJsonProperty<IDictionary<string, string>?> propMeta = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.GeoLocation?> propNullValue = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.OnScriptError?> propOnScriptError = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.Properties?> propProperties = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Script?> propScript = default;
+		LocalJsonProperty<bool?> propStore = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCopyTo.TryRead(ref reader, options, PropCopyTo, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propDocValues.TryRead(ref reader, options, PropDocValues))
+			{
+				continue;
+			}
+
+			if (propDynamic.TryRead(ref reader, options, PropDynamic))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propIgnoreAbove.TryRead(ref reader, options, PropIgnoreAbove))
+			{
+				continue;
+			}
+
+			if (propIgnoreMalformed.TryRead(ref reader, options, PropIgnoreMalformed))
+			{
+				continue;
+			}
+
+			if (propIgnoreZValue.TryRead(ref reader, options, PropIgnoreZValue))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propNullValue.TryRead(ref reader, options, PropNullValue))
+			{
+				continue;
+			}
+
+			if (propOnScriptError.TryRead(ref reader, options, PropOnScriptError))
+			{
+				continue;
+			}
+
+			if (propProperties.TryRead(ref reader, options, PropProperties))
+			{
+				continue;
+			}
+
+			if (propScript.TryRead(ref reader, options, PropScript))
+			{
+				continue;
+			}
+
+			if (propStore.TryRead(ref reader, options, PropStore))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GeoPointProperty
+		{
+			CopyTo = propCopyTo.Value
+,
+			DocValues = propDocValues.Value
+,
+			Dynamic = propDynamic.Value
+,
+			Fields = propFields.Value
+,
+			IgnoreAbove = propIgnoreAbove.Value
+,
+			IgnoreMalformed = propIgnoreMalformed.Value
+,
+			IgnoreZValue = propIgnoreZValue.Value
+,
+			Index = propIndex.Value
+,
+			Meta = propMeta.Value
+,
+			NullValue = propNullValue.Value
+,
+			OnScriptError = propOnScriptError.Value
+,
+			Properties = propProperties.Value
+,
+			Script = propScript.Value
+,
+			Store = propStore.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GeoPointProperty value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCopyTo, value.CopyTo, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropDocValues, value.DocValues);
+		writer.WriteProperty(options, PropDynamic, value.Dynamic);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropIgnoreAbove, value.IgnoreAbove);
+		writer.WriteProperty(options, PropIgnoreMalformed, value.IgnoreMalformed);
+		writer.WriteProperty(options, PropIgnoreZValue, value.IgnoreZValue);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropNullValue, value.NullValue);
+		writer.WriteProperty(options, PropOnScriptError, value.OnScriptError);
+		writer.WriteProperty(options, PropProperties, value.Properties);
+		writer.WriteProperty(options, PropScript, value.Script);
+		writer.WriteProperty(options, PropStore, value.Store);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GeoPointPropertyConverter))]
 public sealed partial class GeoPointProperty : IProperty
 {
-	[JsonInclude, JsonPropertyName("copy_to")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	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("index")]
 	public bool? Index { get; set; }
 
 	/// <summary>
@@ -52,20 +216,13 @@ public sealed partial class GeoPointProperty : IProperty
 	/// Metadata about the field.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-	[JsonInclude, JsonPropertyName("null_value")]
 	public Elastic.Clients.Elasticsearch.GeoLocation? 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("store")]
 	public bool? Store { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "geo_point";
 }
 
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 0563e2b83b6..367257ade27 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/GeoShapeProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/GeoShapeProperty.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,167 @@
 
 namespace Elastic.Clients.Elasticsearch.Mapping;
 
+internal sealed partial class GeoShapePropertyConverter : System.Text.Json.Serialization.JsonConverter<GeoShapeProperty>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCoerce = System.Text.Json.JsonEncodedText.Encode("coerce");
+	private static readonly System.Text.Json.JsonEncodedText PropCopyTo = System.Text.Json.JsonEncodedText.Encode("copy_to");
+	private static readonly System.Text.Json.JsonEncodedText PropDocValues = System.Text.Json.JsonEncodedText.Encode("doc_values");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamic = System.Text.Json.JsonEncodedText.Encode("dynamic");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreAbove = System.Text.Json.JsonEncodedText.Encode("ignore_above");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreMalformed = System.Text.Json.JsonEncodedText.Encode("ignore_malformed");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreZValue = System.Text.Json.JsonEncodedText.Encode("ignore_z_value");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropOrientation = System.Text.Json.JsonEncodedText.Encode("orientation");
+	private static readonly System.Text.Json.JsonEncodedText PropProperties = System.Text.Json.JsonEncodedText.Encode("properties");
+	private static readonly System.Text.Json.JsonEncodedText PropStore = System.Text.Json.JsonEncodedText.Encode("store");
+	private static readonly System.Text.Json.JsonEncodedText PropStrategy = System.Text.Json.JsonEncodedText.Encode("strategy");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override GeoShapeProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool?> propCoerce = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Fields?> propCopyTo = default;
+		LocalJsonProperty<bool?> propDocValues = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.DynamicMapping?> propDynamic = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.Properties?> propFields = default;
+		LocalJsonProperty<int?> propIgnoreAbove = default;
+		LocalJsonProperty<bool?> propIgnoreMalformed = default;
+		LocalJsonProperty<bool?> propIgnoreZValue = default;
+		LocalJsonProperty<IDictionary<string, string>?> propMeta = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.GeoOrientation?> propOrientation = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.Properties?> propProperties = default;
+		LocalJsonProperty<bool?> propStore = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.GeoStrategy?> propStrategy = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCoerce.TryRead(ref reader, options, PropCoerce))
+			{
+				continue;
+			}
+
+			if (propCopyTo.TryRead(ref reader, options, PropCopyTo, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propDocValues.TryRead(ref reader, options, PropDocValues))
+			{
+				continue;
+			}
+
+			if (propDynamic.TryRead(ref reader, options, PropDynamic))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propIgnoreAbove.TryRead(ref reader, options, PropIgnoreAbove))
+			{
+				continue;
+			}
+
+			if (propIgnoreMalformed.TryRead(ref reader, options, PropIgnoreMalformed))
+			{
+				continue;
+			}
+
+			if (propIgnoreZValue.TryRead(ref reader, options, PropIgnoreZValue))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propOrientation.TryRead(ref reader, options, PropOrientation))
+			{
+				continue;
+			}
+
+			if (propProperties.TryRead(ref reader, options, PropProperties))
+			{
+				continue;
+			}
+
+			if (propStore.TryRead(ref reader, options, PropStore))
+			{
+				continue;
+			}
+
+			if (propStrategy.TryRead(ref reader, options, PropStrategy))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GeoShapeProperty
+		{
+			Coerce = propCoerce.Value
+,
+			CopyTo = propCopyTo.Value
+,
+			DocValues = propDocValues.Value
+,
+			Dynamic = propDynamic.Value
+,
+			Fields = propFields.Value
+,
+			IgnoreAbove = propIgnoreAbove.Value
+,
+			IgnoreMalformed = propIgnoreMalformed.Value
+,
+			IgnoreZValue = propIgnoreZValue.Value
+,
+			Meta = propMeta.Value
+,
+			Orientation = propOrientation.Value
+,
+			Properties = propProperties.Value
+,
+			Store = propStore.Value
+,
+			Strategy = propStrategy.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GeoShapeProperty value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCoerce, value.Coerce);
+		writer.WriteProperty(options, PropCopyTo, value.CopyTo, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropDocValues, value.DocValues);
+		writer.WriteProperty(options, PropDynamic, value.Dynamic);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropIgnoreAbove, value.IgnoreAbove);
+		writer.WriteProperty(options, PropIgnoreMalformed, value.IgnoreMalformed);
+		writer.WriteProperty(options, PropIgnoreZValue, value.IgnoreZValue);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropOrientation, value.Orientation);
+		writer.WriteProperty(options, PropProperties, value.Properties);
+		writer.WriteProperty(options, PropStore, value.Store);
+		writer.WriteProperty(options, PropStrategy, value.Strategy);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
 /// <summary>
 /// <para>
 /// The <c>geo_shape</c> data type facilitates the indexing of and searching with arbitrary geo shapes such as rectangles
@@ -34,24 +196,16 @@ namespace Elastic.Clients.Elasticsearch.Mapping;
 /// </para>
 /// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/8.17/geo-shape.html">Learn more about this API in the Elasticsearch documentation.</see></para>
 /// </summary>
+[JsonConverter(typeof(GeoShapePropertyConverter))]
 public sealed partial class GeoShapeProperty : IProperty
 {
-	[JsonInclude, JsonPropertyName("coerce")]
 	public bool? Coerce { get; set; }
-	[JsonInclude, JsonPropertyName("copy_to")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	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; }
 
 	/// <summary>
@@ -59,18 +213,12 @@ public sealed partial class GeoShapeProperty : IProperty
 	/// Metadata about the field.
 	/// </para>
 	/// </summary>
-	[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("store")]
 	public bool? Store { get; set; }
-	[JsonInclude, JsonPropertyName("strategy")]
 	public Elastic.Clients.Elasticsearch.Mapping.GeoStrategy? Strategy { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "geo_shape";
 }
 
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 5dadc17bb15..ee096b1d305 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/HalfFloatNumberProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/HalfFloatNumberProperty.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,26 +28,218 @@
 
 namespace Elastic.Clients.Elasticsearch.Mapping;
 
+internal sealed partial class HalfFloatNumberPropertyConverter : System.Text.Json.Serialization.JsonConverter<HalfFloatNumberProperty>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropCoerce = System.Text.Json.JsonEncodedText.Encode("coerce");
+	private static readonly System.Text.Json.JsonEncodedText PropCopyTo = System.Text.Json.JsonEncodedText.Encode("copy_to");
+	private static readonly System.Text.Json.JsonEncodedText PropDocValues = System.Text.Json.JsonEncodedText.Encode("doc_values");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamic = System.Text.Json.JsonEncodedText.Encode("dynamic");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreAbove = System.Text.Json.JsonEncodedText.Encode("ignore_above");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreMalformed = System.Text.Json.JsonEncodedText.Encode("ignore_malformed");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropNullValue = System.Text.Json.JsonEncodedText.Encode("null_value");
+	private static readonly System.Text.Json.JsonEncodedText PropOnScriptError = System.Text.Json.JsonEncodedText.Encode("on_script_error");
+	private static readonly System.Text.Json.JsonEncodedText PropProperties = System.Text.Json.JsonEncodedText.Encode("properties");
+	private static readonly System.Text.Json.JsonEncodedText PropScript = System.Text.Json.JsonEncodedText.Encode("script");
+	private static readonly System.Text.Json.JsonEncodedText PropStore = System.Text.Json.JsonEncodedText.Encode("store");
+	private static readonly System.Text.Json.JsonEncodedText PropTimeSeriesDimension = System.Text.Json.JsonEncodedText.Encode("time_series_dimension");
+	private static readonly System.Text.Json.JsonEncodedText PropTimeSeriesMetric = System.Text.Json.JsonEncodedText.Encode("time_series_metric");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override HalfFloatNumberProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<double?> propBoost = default;
+		LocalJsonProperty<bool?> propCoerce = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Fields?> propCopyTo = default;
+		LocalJsonProperty<bool?> propDocValues = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.DynamicMapping?> propDynamic = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.Properties?> propFields = default;
+		LocalJsonProperty<int?> propIgnoreAbove = default;
+		LocalJsonProperty<bool?> propIgnoreMalformed = default;
+		LocalJsonProperty<bool?> propIndex = default;
+		LocalJsonProperty<IDictionary<string, string>?> propMeta = default;
+		LocalJsonProperty<float?> propNullValue = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.OnScriptError?> propOnScriptError = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.Properties?> propProperties = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Script?> propScript = default;
+		LocalJsonProperty<bool?> propStore = default;
+		LocalJsonProperty<bool?> propTimeSeriesDimension = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.TimeSeriesMetricType?> propTimeSeriesMetric = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
+
+			if (propCoerce.TryRead(ref reader, options, PropCoerce))
+			{
+				continue;
+			}
+
+			if (propCopyTo.TryRead(ref reader, options, PropCopyTo, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propDocValues.TryRead(ref reader, options, PropDocValues))
+			{
+				continue;
+			}
+
+			if (propDynamic.TryRead(ref reader, options, PropDynamic))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propIgnoreAbove.TryRead(ref reader, options, PropIgnoreAbove))
+			{
+				continue;
+			}
+
+			if (propIgnoreMalformed.TryRead(ref reader, options, PropIgnoreMalformed))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propNullValue.TryRead(ref reader, options, PropNullValue))
+			{
+				continue;
+			}
+
+			if (propOnScriptError.TryRead(ref reader, options, PropOnScriptError))
+			{
+				continue;
+			}
+
+			if (propProperties.TryRead(ref reader, options, PropProperties))
+			{
+				continue;
+			}
+
+			if (propScript.TryRead(ref reader, options, PropScript))
+			{
+				continue;
+			}
+
+			if (propStore.TryRead(ref reader, options, PropStore))
+			{
+				continue;
+			}
+
+			if (propTimeSeriesDimension.TryRead(ref reader, options, PropTimeSeriesDimension))
+			{
+				continue;
+			}
+
+			if (propTimeSeriesMetric.TryRead(ref reader, options, PropTimeSeriesMetric))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new HalfFloatNumberProperty
+		{
+			Boost = propBoost.Value
+,
+			Coerce = propCoerce.Value
+,
+			CopyTo = propCopyTo.Value
+,
+			DocValues = propDocValues.Value
+,
+			Dynamic = propDynamic.Value
+,
+			Fields = propFields.Value
+,
+			IgnoreAbove = propIgnoreAbove.Value
+,
+			IgnoreMalformed = propIgnoreMalformed.Value
+,
+			Index = propIndex.Value
+,
+			Meta = propMeta.Value
+,
+			NullValue = propNullValue.Value
+,
+			OnScriptError = propOnScriptError.Value
+,
+			Properties = propProperties.Value
+,
+			Script = propScript.Value
+,
+			Store = propStore.Value
+,
+			TimeSeriesDimension = propTimeSeriesDimension.Value
+,
+			TimeSeriesMetric = propTimeSeriesMetric.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, HalfFloatNumberProperty value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropCoerce, value.Coerce);
+		writer.WriteProperty(options, PropCopyTo, value.CopyTo, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropDocValues, value.DocValues);
+		writer.WriteProperty(options, PropDynamic, value.Dynamic);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropIgnoreAbove, value.IgnoreAbove);
+		writer.WriteProperty(options, PropIgnoreMalformed, value.IgnoreMalformed);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropNullValue, value.NullValue);
+		writer.WriteProperty(options, PropOnScriptError, value.OnScriptError);
+		writer.WriteProperty(options, PropProperties, value.Properties);
+		writer.WriteProperty(options, PropScript, value.Script);
+		writer.WriteProperty(options, PropStore, value.Store);
+		writer.WriteProperty(options, PropTimeSeriesDimension, value.TimeSeriesDimension);
+		writer.WriteProperty(options, PropTimeSeriesMetric, value.TimeSeriesMetric);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(HalfFloatNumberPropertyConverter))]
 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")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	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; }
 
 	/// <summary>
@@ -54,17 +247,11 @@ public sealed partial class HalfFloatNumberProperty : IProperty
 	/// Metadata about the field.
 	/// </para>
 	/// </summary>
-	[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("store")]
 	public bool? Store { get; set; }
 
 	/// <summary>
@@ -72,7 +259,6 @@ public sealed partial class HalfFloatNumberProperty : IProperty
 	/// 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; }
 
 	/// <summary>
@@ -80,10 +266,8 @@ public sealed partial class HalfFloatNumberProperty : IProperty
 	/// For internal use by Elastic only. Marks the field as a time series dimension. Defaults to false.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("time_series_metric")]
 	public Elastic.Clients.Elasticsearch.Mapping.TimeSeriesMetricType? TimeSeriesMetric { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "half_float";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/IcuCollationProperty.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/IcuCollationProperty.g.cs
index 5acfa164441..e046fbe3d4b 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/IcuCollationProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/IcuCollationProperty.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,30 +28,290 @@
 
 namespace Elastic.Clients.Elasticsearch.Mapping;
 
+internal sealed partial class IcuCollationPropertyConverter : System.Text.Json.Serialization.JsonConverter<IcuCollationProperty>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAlternate = System.Text.Json.JsonEncodedText.Encode("alternate");
+	private static readonly System.Text.Json.JsonEncodedText PropCaseFirst = System.Text.Json.JsonEncodedText.Encode("case_first");
+	private static readonly System.Text.Json.JsonEncodedText PropCaseLevel = System.Text.Json.JsonEncodedText.Encode("case_level");
+	private static readonly System.Text.Json.JsonEncodedText PropCopyTo = System.Text.Json.JsonEncodedText.Encode("copy_to");
+	private static readonly System.Text.Json.JsonEncodedText PropCountry = System.Text.Json.JsonEncodedText.Encode("country");
+	private static readonly System.Text.Json.JsonEncodedText PropDecomposition = System.Text.Json.JsonEncodedText.Encode("decomposition");
+	private static readonly System.Text.Json.JsonEncodedText PropDocValues = System.Text.Json.JsonEncodedText.Encode("doc_values");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamic = System.Text.Json.JsonEncodedText.Encode("dynamic");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropHiraganaQuaternaryMode = System.Text.Json.JsonEncodedText.Encode("hiragana_quaternary_mode");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreAbove = System.Text.Json.JsonEncodedText.Encode("ignore_above");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropIndexOptions = System.Text.Json.JsonEncodedText.Encode("index_options");
+	private static readonly System.Text.Json.JsonEncodedText PropLanguage = System.Text.Json.JsonEncodedText.Encode("language");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropNorms = System.Text.Json.JsonEncodedText.Encode("norms");
+	private static readonly System.Text.Json.JsonEncodedText PropNullValue = System.Text.Json.JsonEncodedText.Encode("null_value");
+	private static readonly System.Text.Json.JsonEncodedText PropNumeric = System.Text.Json.JsonEncodedText.Encode("numeric");
+	private static readonly System.Text.Json.JsonEncodedText PropProperties = System.Text.Json.JsonEncodedText.Encode("properties");
+	private static readonly System.Text.Json.JsonEncodedText PropRules = System.Text.Json.JsonEncodedText.Encode("rules");
+	private static readonly System.Text.Json.JsonEncodedText PropStore = System.Text.Json.JsonEncodedText.Encode("store");
+	private static readonly System.Text.Json.JsonEncodedText PropStrength = System.Text.Json.JsonEncodedText.Encode("strength");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+	private static readonly System.Text.Json.JsonEncodedText PropVariableTop = System.Text.Json.JsonEncodedText.Encode("variable_top");
+	private static readonly System.Text.Json.JsonEncodedText PropVariant = System.Text.Json.JsonEncodedText.Encode("variant");
+
+	public override IcuCollationProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Analysis.IcuCollationAlternate?> propAlternate = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Analysis.IcuCollationCaseFirst?> propCaseFirst = default;
+		LocalJsonProperty<bool?> propCaseLevel = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Fields?> propCopyTo = default;
+		LocalJsonProperty<string?> propCountry = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Analysis.IcuCollationDecomposition?> propDecomposition = default;
+		LocalJsonProperty<bool?> propDocValues = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.DynamicMapping?> propDynamic = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.Properties?> propFields = default;
+		LocalJsonProperty<bool?> propHiraganaQuaternaryMode = default;
+		LocalJsonProperty<int?> propIgnoreAbove = default;
+		LocalJsonProperty<bool?> propIndex = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.IndexOptions?> propIndexOptions = default;
+		LocalJsonProperty<string?> propLanguage = default;
+		LocalJsonProperty<IDictionary<string, string>?> propMeta = default;
+		LocalJsonProperty<bool?> propNorms = default;
+		LocalJsonProperty<string?> propNullValue = default;
+		LocalJsonProperty<bool?> propNumeric = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.Properties?> propProperties = default;
+		LocalJsonProperty<string?> propRules = default;
+		LocalJsonProperty<bool?> propStore = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Analysis.IcuCollationStrength?> propStrength = default;
+		LocalJsonProperty<string?> propVariableTop = default;
+		LocalJsonProperty<string?> propVariant = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAlternate.TryRead(ref reader, options, PropAlternate))
+			{
+				continue;
+			}
+
+			if (propCaseFirst.TryRead(ref reader, options, PropCaseFirst))
+			{
+				continue;
+			}
+
+			if (propCaseLevel.TryRead(ref reader, options, PropCaseLevel))
+			{
+				continue;
+			}
+
+			if (propCopyTo.TryRead(ref reader, options, PropCopyTo, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propCountry.TryRead(ref reader, options, PropCountry))
+			{
+				continue;
+			}
+
+			if (propDecomposition.TryRead(ref reader, options, PropDecomposition))
+			{
+				continue;
+			}
+
+			if (propDocValues.TryRead(ref reader, options, PropDocValues))
+			{
+				continue;
+			}
+
+			if (propDynamic.TryRead(ref reader, options, PropDynamic))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propHiraganaQuaternaryMode.TryRead(ref reader, options, PropHiraganaQuaternaryMode))
+			{
+				continue;
+			}
+
+			if (propIgnoreAbove.TryRead(ref reader, options, PropIgnoreAbove))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propIndexOptions.TryRead(ref reader, options, PropIndexOptions))
+			{
+				continue;
+			}
+
+			if (propLanguage.TryRead(ref reader, options, PropLanguage))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propNorms.TryRead(ref reader, options, PropNorms))
+			{
+				continue;
+			}
+
+			if (propNullValue.TryRead(ref reader, options, PropNullValue))
+			{
+				continue;
+			}
+
+			if (propNumeric.TryRead(ref reader, options, PropNumeric))
+			{
+				continue;
+			}
+
+			if (propProperties.TryRead(ref reader, options, PropProperties))
+			{
+				continue;
+			}
+
+			if (propRules.TryRead(ref reader, options, PropRules))
+			{
+				continue;
+			}
+
+			if (propStore.TryRead(ref reader, options, PropStore))
+			{
+				continue;
+			}
+
+			if (propStrength.TryRead(ref reader, options, PropStrength))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			if (propVariableTop.TryRead(ref reader, options, PropVariableTop))
+			{
+				continue;
+			}
+
+			if (propVariant.TryRead(ref reader, options, PropVariant))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new IcuCollationProperty
+		{
+			Alternate = propAlternate.Value
+,
+			CaseFirst = propCaseFirst.Value
+,
+			CaseLevel = propCaseLevel.Value
+,
+			CopyTo = propCopyTo.Value
+,
+			Country = propCountry.Value
+,
+			Decomposition = propDecomposition.Value
+,
+			DocValues = propDocValues.Value
+,
+			Dynamic = propDynamic.Value
+,
+			Fields = propFields.Value
+,
+			HiraganaQuaternaryMode = propHiraganaQuaternaryMode.Value
+,
+			IgnoreAbove = propIgnoreAbove.Value
+,
+			Index = propIndex.Value
+,
+			IndexOptions = propIndexOptions.Value
+,
+			Language = propLanguage.Value
+,
+			Meta = propMeta.Value
+,
+			Norms = propNorms.Value
+,
+			NullValue = propNullValue.Value
+,
+			Numeric = propNumeric.Value
+,
+			Properties = propProperties.Value
+,
+			Rules = propRules.Value
+,
+			Store = propStore.Value
+,
+			Strength = propStrength.Value
+,
+			VariableTop = propVariableTop.Value
+,
+			Variant = propVariant.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IcuCollationProperty value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAlternate, value.Alternate);
+		writer.WriteProperty(options, PropCaseFirst, value.CaseFirst);
+		writer.WriteProperty(options, PropCaseLevel, value.CaseLevel);
+		writer.WriteProperty(options, PropCopyTo, value.CopyTo, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropCountry, value.Country);
+		writer.WriteProperty(options, PropDecomposition, value.Decomposition);
+		writer.WriteProperty(options, PropDocValues, value.DocValues);
+		writer.WriteProperty(options, PropDynamic, value.Dynamic);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropHiraganaQuaternaryMode, value.HiraganaQuaternaryMode);
+		writer.WriteProperty(options, PropIgnoreAbove, value.IgnoreAbove);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropIndexOptions, value.IndexOptions);
+		writer.WriteProperty(options, PropLanguage, value.Language);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropNorms, value.Norms);
+		writer.WriteProperty(options, PropNullValue, value.NullValue);
+		writer.WriteProperty(options, PropNumeric, value.Numeric);
+		writer.WriteProperty(options, PropProperties, value.Properties);
+		writer.WriteProperty(options, PropRules, value.Rules);
+		writer.WriteProperty(options, PropStore, value.Store);
+		writer.WriteProperty(options, PropStrength, value.Strength);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteProperty(options, PropVariableTop, value.VariableTop);
+		writer.WriteProperty(options, PropVariant, value.Variant);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(IcuCollationPropertyConverter))]
 public sealed partial class IcuCollationProperty : IProperty
 {
-	[JsonInclude, JsonPropertyName("alternate")]
 	public Elastic.Clients.Elasticsearch.Analysis.IcuCollationAlternate? Alternate { get; set; }
-	[JsonInclude, JsonPropertyName("case_first")]
 	public Elastic.Clients.Elasticsearch.Analysis.IcuCollationCaseFirst? CaseFirst { get; set; }
-	[JsonInclude, JsonPropertyName("case_level")]
 	public bool? CaseLevel { get; set; }
-	[JsonInclude, JsonPropertyName("copy_to")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Fields? CopyTo { get; set; }
-	[JsonInclude, JsonPropertyName("country")]
 	public string? Country { get; set; }
-	[JsonInclude, JsonPropertyName("decomposition")]
 	public Elastic.Clients.Elasticsearch.Analysis.IcuCollationDecomposition? Decomposition { 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("hiragana_quaternary_mode")]
 	public bool? HiraganaQuaternaryMode { get; set; }
-	[JsonInclude, JsonPropertyName("ignore_above")]
 	public int? IgnoreAbove { get; set; }
 
 	/// <summary>
@@ -58,11 +319,8 @@ public sealed partial class IcuCollationProperty : IProperty
 	/// Should the field be searchable?
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("index")]
 	public bool? Index { get; set; }
-	[JsonInclude, JsonPropertyName("index_options")]
 	public Elastic.Clients.Elasticsearch.Mapping.IndexOptions? IndexOptions { get; set; }
-	[JsonInclude, JsonPropertyName("language")]
 	public string? Language { get; set; }
 
 	/// <summary>
@@ -70,9 +328,7 @@ public sealed partial class IcuCollationProperty : IProperty
 	/// Metadata about the field.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-	[JsonInclude, JsonPropertyName("norms")]
 	public bool? Norms { get; set; }
 
 	/// <summary>
@@ -80,25 +336,16 @@ public sealed partial class IcuCollationProperty : IProperty
 	/// Accepts a string value which is substituted for any explicit null values. Defaults to null, which means the field is treated as missing.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("null_value")]
 	public string? NullValue { get; set; }
-	[JsonInclude, JsonPropertyName("numeric")]
 	public bool? Numeric { get; set; }
-	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Properties { get; set; }
-	[JsonInclude, JsonPropertyName("rules")]
 	public string? Rules { get; set; }
-	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
-	[JsonInclude, JsonPropertyName("strength")]
 	public Elastic.Clients.Elasticsearch.Analysis.IcuCollationStrength? Strength { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "icu_collation_keyword";
 
-	[JsonInclude, JsonPropertyName("variable_top")]
 	public string? VariableTop { get; set; }
-	[JsonInclude, JsonPropertyName("variant")]
 	public string? Variant { get; set; }
 }
 
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 8d2512bed63..43a1a83a0f9 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/IntegerNumberProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/IntegerNumberProperty.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,26 +28,218 @@
 
 namespace Elastic.Clients.Elasticsearch.Mapping;
 
+internal sealed partial class IntegerNumberPropertyConverter : System.Text.Json.Serialization.JsonConverter<IntegerNumberProperty>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropCoerce = System.Text.Json.JsonEncodedText.Encode("coerce");
+	private static readonly System.Text.Json.JsonEncodedText PropCopyTo = System.Text.Json.JsonEncodedText.Encode("copy_to");
+	private static readonly System.Text.Json.JsonEncodedText PropDocValues = System.Text.Json.JsonEncodedText.Encode("doc_values");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamic = System.Text.Json.JsonEncodedText.Encode("dynamic");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreAbove = System.Text.Json.JsonEncodedText.Encode("ignore_above");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreMalformed = System.Text.Json.JsonEncodedText.Encode("ignore_malformed");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropNullValue = System.Text.Json.JsonEncodedText.Encode("null_value");
+	private static readonly System.Text.Json.JsonEncodedText PropOnScriptError = System.Text.Json.JsonEncodedText.Encode("on_script_error");
+	private static readonly System.Text.Json.JsonEncodedText PropProperties = System.Text.Json.JsonEncodedText.Encode("properties");
+	private static readonly System.Text.Json.JsonEncodedText PropScript = System.Text.Json.JsonEncodedText.Encode("script");
+	private static readonly System.Text.Json.JsonEncodedText PropStore = System.Text.Json.JsonEncodedText.Encode("store");
+	private static readonly System.Text.Json.JsonEncodedText PropTimeSeriesDimension = System.Text.Json.JsonEncodedText.Encode("time_series_dimension");
+	private static readonly System.Text.Json.JsonEncodedText PropTimeSeriesMetric = System.Text.Json.JsonEncodedText.Encode("time_series_metric");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override IntegerNumberProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<double?> propBoost = default;
+		LocalJsonProperty<bool?> propCoerce = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Fields?> propCopyTo = default;
+		LocalJsonProperty<bool?> propDocValues = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.DynamicMapping?> propDynamic = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.Properties?> propFields = default;
+		LocalJsonProperty<int?> propIgnoreAbove = default;
+		LocalJsonProperty<bool?> propIgnoreMalformed = default;
+		LocalJsonProperty<bool?> propIndex = default;
+		LocalJsonProperty<IDictionary<string, string>?> propMeta = default;
+		LocalJsonProperty<int?> propNullValue = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.OnScriptError?> propOnScriptError = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.Properties?> propProperties = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Script?> propScript = default;
+		LocalJsonProperty<bool?> propStore = default;
+		LocalJsonProperty<bool?> propTimeSeriesDimension = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.TimeSeriesMetricType?> propTimeSeriesMetric = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
+
+			if (propCoerce.TryRead(ref reader, options, PropCoerce))
+			{
+				continue;
+			}
+
+			if (propCopyTo.TryRead(ref reader, options, PropCopyTo, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propDocValues.TryRead(ref reader, options, PropDocValues))
+			{
+				continue;
+			}
+
+			if (propDynamic.TryRead(ref reader, options, PropDynamic))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propIgnoreAbove.TryRead(ref reader, options, PropIgnoreAbove))
+			{
+				continue;
+			}
+
+			if (propIgnoreMalformed.TryRead(ref reader, options, PropIgnoreMalformed))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propNullValue.TryRead(ref reader, options, PropNullValue))
+			{
+				continue;
+			}
+
+			if (propOnScriptError.TryRead(ref reader, options, PropOnScriptError))
+			{
+				continue;
+			}
+
+			if (propProperties.TryRead(ref reader, options, PropProperties))
+			{
+				continue;
+			}
+
+			if (propScript.TryRead(ref reader, options, PropScript))
+			{
+				continue;
+			}
+
+			if (propStore.TryRead(ref reader, options, PropStore))
+			{
+				continue;
+			}
+
+			if (propTimeSeriesDimension.TryRead(ref reader, options, PropTimeSeriesDimension))
+			{
+				continue;
+			}
+
+			if (propTimeSeriesMetric.TryRead(ref reader, options, PropTimeSeriesMetric))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new IntegerNumberProperty
+		{
+			Boost = propBoost.Value
+,
+			Coerce = propCoerce.Value
+,
+			CopyTo = propCopyTo.Value
+,
+			DocValues = propDocValues.Value
+,
+			Dynamic = propDynamic.Value
+,
+			Fields = propFields.Value
+,
+			IgnoreAbove = propIgnoreAbove.Value
+,
+			IgnoreMalformed = propIgnoreMalformed.Value
+,
+			Index = propIndex.Value
+,
+			Meta = propMeta.Value
+,
+			NullValue = propNullValue.Value
+,
+			OnScriptError = propOnScriptError.Value
+,
+			Properties = propProperties.Value
+,
+			Script = propScript.Value
+,
+			Store = propStore.Value
+,
+			TimeSeriesDimension = propTimeSeriesDimension.Value
+,
+			TimeSeriesMetric = propTimeSeriesMetric.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IntegerNumberProperty value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropCoerce, value.Coerce);
+		writer.WriteProperty(options, PropCopyTo, value.CopyTo, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropDocValues, value.DocValues);
+		writer.WriteProperty(options, PropDynamic, value.Dynamic);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropIgnoreAbove, value.IgnoreAbove);
+		writer.WriteProperty(options, PropIgnoreMalformed, value.IgnoreMalformed);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropNullValue, value.NullValue);
+		writer.WriteProperty(options, PropOnScriptError, value.OnScriptError);
+		writer.WriteProperty(options, PropProperties, value.Properties);
+		writer.WriteProperty(options, PropScript, value.Script);
+		writer.WriteProperty(options, PropStore, value.Store);
+		writer.WriteProperty(options, PropTimeSeriesDimension, value.TimeSeriesDimension);
+		writer.WriteProperty(options, PropTimeSeriesMetric, value.TimeSeriesMetric);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(IntegerNumberPropertyConverter))]
 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")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	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; }
 
 	/// <summary>
@@ -54,17 +247,11 @@ public sealed partial class IntegerNumberProperty : IProperty
 	/// Metadata about the field.
 	/// </para>
 	/// </summary>
-	[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("store")]
 	public bool? Store { get; set; }
 
 	/// <summary>
@@ -72,7 +259,6 @@ public sealed partial class IntegerNumberProperty : IProperty
 	/// 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; }
 
 	/// <summary>
@@ -80,10 +266,8 @@ public sealed partial class IntegerNumberProperty : IProperty
 	/// For internal use by Elastic only. Marks the field as a time series dimension. Defaults to false.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("time_series_metric")]
 	public Elastic.Clients.Elasticsearch.Mapping.TimeSeriesMetricType? TimeSeriesMetric { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "integer";
 }
 
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 47b66fc7aaf..c4db40ec02d 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/IntegerRangeProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/IntegerRangeProperty.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,24 +28,157 @@
 
 namespace Elastic.Clients.Elasticsearch.Mapping;
 
+internal sealed partial class IntegerRangePropertyConverter : System.Text.Json.Serialization.JsonConverter<IntegerRangeProperty>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropCoerce = System.Text.Json.JsonEncodedText.Encode("coerce");
+	private static readonly System.Text.Json.JsonEncodedText PropCopyTo = System.Text.Json.JsonEncodedText.Encode("copy_to");
+	private static readonly System.Text.Json.JsonEncodedText PropDocValues = System.Text.Json.JsonEncodedText.Encode("doc_values");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamic = System.Text.Json.JsonEncodedText.Encode("dynamic");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreAbove = System.Text.Json.JsonEncodedText.Encode("ignore_above");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropProperties = System.Text.Json.JsonEncodedText.Encode("properties");
+	private static readonly System.Text.Json.JsonEncodedText PropStore = System.Text.Json.JsonEncodedText.Encode("store");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override IntegerRangeProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<double?> propBoost = default;
+		LocalJsonProperty<bool?> propCoerce = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Fields?> propCopyTo = default;
+		LocalJsonProperty<bool?> propDocValues = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.DynamicMapping?> propDynamic = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.Properties?> propFields = default;
+		LocalJsonProperty<int?> propIgnoreAbove = default;
+		LocalJsonProperty<bool?> propIndex = default;
+		LocalJsonProperty<IDictionary<string, string>?> propMeta = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.Properties?> propProperties = default;
+		LocalJsonProperty<bool?> propStore = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
+
+			if (propCoerce.TryRead(ref reader, options, PropCoerce))
+			{
+				continue;
+			}
+
+			if (propCopyTo.TryRead(ref reader, options, PropCopyTo, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propDocValues.TryRead(ref reader, options, PropDocValues))
+			{
+				continue;
+			}
+
+			if (propDynamic.TryRead(ref reader, options, PropDynamic))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propIgnoreAbove.TryRead(ref reader, options, PropIgnoreAbove))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propProperties.TryRead(ref reader, options, PropProperties))
+			{
+				continue;
+			}
+
+			if (propStore.TryRead(ref reader, options, PropStore))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new IntegerRangeProperty
+		{
+			Boost = propBoost.Value
+,
+			Coerce = propCoerce.Value
+,
+			CopyTo = propCopyTo.Value
+,
+			DocValues = propDocValues.Value
+,
+			Dynamic = propDynamic.Value
+,
+			Fields = propFields.Value
+,
+			IgnoreAbove = propIgnoreAbove.Value
+,
+			Index = propIndex.Value
+,
+			Meta = propMeta.Value
+,
+			Properties = propProperties.Value
+,
+			Store = propStore.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IntegerRangeProperty value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropCoerce, value.Coerce);
+		writer.WriteProperty(options, PropCopyTo, value.CopyTo, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropDocValues, value.DocValues);
+		writer.WriteProperty(options, PropDynamic, value.Dynamic);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropIgnoreAbove, value.IgnoreAbove);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropProperties, value.Properties);
+		writer.WriteProperty(options, PropStore, value.Store);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(IntegerRangePropertyConverter))]
 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")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	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; }
 
 	/// <summary>
@@ -52,14 +186,10 @@ public sealed partial class IntegerRangeProperty : IProperty
 	/// Metadata about the field.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Properties { get; set; }
-	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "integer_range";
 }
 
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 8a4ebec39cb..f8532548d1b 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/IpProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/IpProperty.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,24 +28,197 @@
 
 namespace Elastic.Clients.Elasticsearch.Mapping;
 
+internal sealed partial class IpPropertyConverter : System.Text.Json.Serialization.JsonConverter<IpProperty>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropCopyTo = System.Text.Json.JsonEncodedText.Encode("copy_to");
+	private static readonly System.Text.Json.JsonEncodedText PropDocValues = System.Text.Json.JsonEncodedText.Encode("doc_values");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamic = System.Text.Json.JsonEncodedText.Encode("dynamic");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreAbove = System.Text.Json.JsonEncodedText.Encode("ignore_above");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreMalformed = System.Text.Json.JsonEncodedText.Encode("ignore_malformed");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropNullValue = System.Text.Json.JsonEncodedText.Encode("null_value");
+	private static readonly System.Text.Json.JsonEncodedText PropOnScriptError = System.Text.Json.JsonEncodedText.Encode("on_script_error");
+	private static readonly System.Text.Json.JsonEncodedText PropProperties = System.Text.Json.JsonEncodedText.Encode("properties");
+	private static readonly System.Text.Json.JsonEncodedText PropScript = System.Text.Json.JsonEncodedText.Encode("script");
+	private static readonly System.Text.Json.JsonEncodedText PropStore = System.Text.Json.JsonEncodedText.Encode("store");
+	private static readonly System.Text.Json.JsonEncodedText PropTimeSeriesDimension = System.Text.Json.JsonEncodedText.Encode("time_series_dimension");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override IpProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<double?> propBoost = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Fields?> propCopyTo = default;
+		LocalJsonProperty<bool?> propDocValues = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.DynamicMapping?> propDynamic = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.Properties?> propFields = default;
+		LocalJsonProperty<int?> propIgnoreAbove = default;
+		LocalJsonProperty<bool?> propIgnoreMalformed = default;
+		LocalJsonProperty<bool?> propIndex = default;
+		LocalJsonProperty<IDictionary<string, string>?> propMeta = default;
+		LocalJsonProperty<string?> propNullValue = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.OnScriptError?> propOnScriptError = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.Properties?> propProperties = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Script?> propScript = default;
+		LocalJsonProperty<bool?> propStore = default;
+		LocalJsonProperty<bool?> propTimeSeriesDimension = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
+
+			if (propCopyTo.TryRead(ref reader, options, PropCopyTo, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propDocValues.TryRead(ref reader, options, PropDocValues))
+			{
+				continue;
+			}
+
+			if (propDynamic.TryRead(ref reader, options, PropDynamic))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propIgnoreAbove.TryRead(ref reader, options, PropIgnoreAbove))
+			{
+				continue;
+			}
+
+			if (propIgnoreMalformed.TryRead(ref reader, options, PropIgnoreMalformed))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propNullValue.TryRead(ref reader, options, PropNullValue))
+			{
+				continue;
+			}
+
+			if (propOnScriptError.TryRead(ref reader, options, PropOnScriptError))
+			{
+				continue;
+			}
+
+			if (propProperties.TryRead(ref reader, options, PropProperties))
+			{
+				continue;
+			}
+
+			if (propScript.TryRead(ref reader, options, PropScript))
+			{
+				continue;
+			}
+
+			if (propStore.TryRead(ref reader, options, PropStore))
+			{
+				continue;
+			}
+
+			if (propTimeSeriesDimension.TryRead(ref reader, options, PropTimeSeriesDimension))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new IpProperty
+		{
+			Boost = propBoost.Value
+,
+			CopyTo = propCopyTo.Value
+,
+			DocValues = propDocValues.Value
+,
+			Dynamic = propDynamic.Value
+,
+			Fields = propFields.Value
+,
+			IgnoreAbove = propIgnoreAbove.Value
+,
+			IgnoreMalformed = propIgnoreMalformed.Value
+,
+			Index = propIndex.Value
+,
+			Meta = propMeta.Value
+,
+			NullValue = propNullValue.Value
+,
+			OnScriptError = propOnScriptError.Value
+,
+			Properties = propProperties.Value
+,
+			Script = propScript.Value
+,
+			Store = propStore.Value
+,
+			TimeSeriesDimension = propTimeSeriesDimension.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IpProperty value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropCopyTo, value.CopyTo, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropDocValues, value.DocValues);
+		writer.WriteProperty(options, PropDynamic, value.Dynamic);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropIgnoreAbove, value.IgnoreAbove);
+		writer.WriteProperty(options, PropIgnoreMalformed, value.IgnoreMalformed);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropNullValue, value.NullValue);
+		writer.WriteProperty(options, PropOnScriptError, value.OnScriptError);
+		writer.WriteProperty(options, PropProperties, value.Properties);
+		writer.WriteProperty(options, PropScript, value.Script);
+		writer.WriteProperty(options, PropStore, value.Store);
+		writer.WriteProperty(options, PropTimeSeriesDimension, value.TimeSeriesDimension);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(IpPropertyConverter))]
 public sealed partial class IpProperty : IProperty
 {
-	[JsonInclude, JsonPropertyName("boost")]
 	public double? Boost { get; set; }
-	[JsonInclude, JsonPropertyName("copy_to")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	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; }
 
 	/// <summary>
@@ -52,17 +226,11 @@ public sealed partial class IpProperty : IProperty
 	/// Metadata about the field.
 	/// </para>
 	/// </summary>
-	[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("store")]
 	public bool? Store { get; set; }
 
 	/// <summary>
@@ -70,10 +238,8 @@ public sealed partial class IpProperty : IProperty
 	/// 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")]
 	public string Type => "ip";
 }
 
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 d714a86ad87..cb517d0fc52 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/IpRangeProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/IpRangeProperty.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,24 +28,157 @@
 
 namespace Elastic.Clients.Elasticsearch.Mapping;
 
+internal sealed partial class IpRangePropertyConverter : System.Text.Json.Serialization.JsonConverter<IpRangeProperty>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropCoerce = System.Text.Json.JsonEncodedText.Encode("coerce");
+	private static readonly System.Text.Json.JsonEncodedText PropCopyTo = System.Text.Json.JsonEncodedText.Encode("copy_to");
+	private static readonly System.Text.Json.JsonEncodedText PropDocValues = System.Text.Json.JsonEncodedText.Encode("doc_values");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamic = System.Text.Json.JsonEncodedText.Encode("dynamic");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreAbove = System.Text.Json.JsonEncodedText.Encode("ignore_above");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropProperties = System.Text.Json.JsonEncodedText.Encode("properties");
+	private static readonly System.Text.Json.JsonEncodedText PropStore = System.Text.Json.JsonEncodedText.Encode("store");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override IpRangeProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<double?> propBoost = default;
+		LocalJsonProperty<bool?> propCoerce = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Fields?> propCopyTo = default;
+		LocalJsonProperty<bool?> propDocValues = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.DynamicMapping?> propDynamic = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.Properties?> propFields = default;
+		LocalJsonProperty<int?> propIgnoreAbove = default;
+		LocalJsonProperty<bool?> propIndex = default;
+		LocalJsonProperty<IDictionary<string, string>?> propMeta = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.Properties?> propProperties = default;
+		LocalJsonProperty<bool?> propStore = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
+
+			if (propCoerce.TryRead(ref reader, options, PropCoerce))
+			{
+				continue;
+			}
+
+			if (propCopyTo.TryRead(ref reader, options, PropCopyTo, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propDocValues.TryRead(ref reader, options, PropDocValues))
+			{
+				continue;
+			}
+
+			if (propDynamic.TryRead(ref reader, options, PropDynamic))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propIgnoreAbove.TryRead(ref reader, options, PropIgnoreAbove))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propProperties.TryRead(ref reader, options, PropProperties))
+			{
+				continue;
+			}
+
+			if (propStore.TryRead(ref reader, options, PropStore))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new IpRangeProperty
+		{
+			Boost = propBoost.Value
+,
+			Coerce = propCoerce.Value
+,
+			CopyTo = propCopyTo.Value
+,
+			DocValues = propDocValues.Value
+,
+			Dynamic = propDynamic.Value
+,
+			Fields = propFields.Value
+,
+			IgnoreAbove = propIgnoreAbove.Value
+,
+			Index = propIndex.Value
+,
+			Meta = propMeta.Value
+,
+			Properties = propProperties.Value
+,
+			Store = propStore.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IpRangeProperty value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropCoerce, value.Coerce);
+		writer.WriteProperty(options, PropCopyTo, value.CopyTo, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropDocValues, value.DocValues);
+		writer.WriteProperty(options, PropDynamic, value.Dynamic);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropIgnoreAbove, value.IgnoreAbove);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropProperties, value.Properties);
+		writer.WriteProperty(options, PropStore, value.Store);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(IpRangePropertyConverter))]
 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")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	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; }
 
 	/// <summary>
@@ -52,14 +186,10 @@ public sealed partial class IpRangeProperty : IProperty
 	/// Metadata about the field.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Properties { get; set; }
-	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "ip_range";
 }
 
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 8b3f61ce264..efc3e5bc7e5 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/KeywordProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/KeywordProperty.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,26 +28,248 @@
 
 namespace Elastic.Clients.Elasticsearch.Mapping;
 
+internal sealed partial class KeywordPropertyConverter : System.Text.Json.Serialization.JsonConverter<KeywordProperty>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropCopyTo = System.Text.Json.JsonEncodedText.Encode("copy_to");
+	private static readonly System.Text.Json.JsonEncodedText PropDocValues = System.Text.Json.JsonEncodedText.Encode("doc_values");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamic = System.Text.Json.JsonEncodedText.Encode("dynamic");
+	private static readonly System.Text.Json.JsonEncodedText PropEagerGlobalOrdinals = System.Text.Json.JsonEncodedText.Encode("eager_global_ordinals");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreAbove = System.Text.Json.JsonEncodedText.Encode("ignore_above");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropIndexOptions = System.Text.Json.JsonEncodedText.Encode("index_options");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropNormalizer = System.Text.Json.JsonEncodedText.Encode("normalizer");
+	private static readonly System.Text.Json.JsonEncodedText PropNorms = System.Text.Json.JsonEncodedText.Encode("norms");
+	private static readonly System.Text.Json.JsonEncodedText PropNullValue = System.Text.Json.JsonEncodedText.Encode("null_value");
+	private static readonly System.Text.Json.JsonEncodedText PropOnScriptError = System.Text.Json.JsonEncodedText.Encode("on_script_error");
+	private static readonly System.Text.Json.JsonEncodedText PropProperties = System.Text.Json.JsonEncodedText.Encode("properties");
+	private static readonly System.Text.Json.JsonEncodedText PropScript = System.Text.Json.JsonEncodedText.Encode("script");
+	private static readonly System.Text.Json.JsonEncodedText PropSimilarity = System.Text.Json.JsonEncodedText.Encode("similarity");
+	private static readonly System.Text.Json.JsonEncodedText PropSplitQueriesOnWhitespace = System.Text.Json.JsonEncodedText.Encode("split_queries_on_whitespace");
+	private static readonly System.Text.Json.JsonEncodedText PropStore = System.Text.Json.JsonEncodedText.Encode("store");
+	private static readonly System.Text.Json.JsonEncodedText PropTimeSeriesDimension = System.Text.Json.JsonEncodedText.Encode("time_series_dimension");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override KeywordProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<double?> propBoost = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Fields?> propCopyTo = default;
+		LocalJsonProperty<bool?> propDocValues = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.DynamicMapping?> propDynamic = default;
+		LocalJsonProperty<bool?> propEagerGlobalOrdinals = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.Properties?> propFields = default;
+		LocalJsonProperty<int?> propIgnoreAbove = default;
+		LocalJsonProperty<bool?> propIndex = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.IndexOptions?> propIndexOptions = default;
+		LocalJsonProperty<IDictionary<string, string>?> propMeta = default;
+		LocalJsonProperty<string?> propNormalizer = default;
+		LocalJsonProperty<bool?> propNorms = default;
+		LocalJsonProperty<string?> propNullValue = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.OnScriptError?> propOnScriptError = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.Properties?> propProperties = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Script?> propScript = default;
+		LocalJsonProperty<string?> propSimilarity = default;
+		LocalJsonProperty<bool?> propSplitQueriesOnWhitespace = default;
+		LocalJsonProperty<bool?> propStore = default;
+		LocalJsonProperty<bool?> propTimeSeriesDimension = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
+
+			if (propCopyTo.TryRead(ref reader, options, PropCopyTo, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propDocValues.TryRead(ref reader, options, PropDocValues))
+			{
+				continue;
+			}
+
+			if (propDynamic.TryRead(ref reader, options, PropDynamic))
+			{
+				continue;
+			}
+
+			if (propEagerGlobalOrdinals.TryRead(ref reader, options, PropEagerGlobalOrdinals))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propIgnoreAbove.TryRead(ref reader, options, PropIgnoreAbove))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propIndexOptions.TryRead(ref reader, options, PropIndexOptions))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propNormalizer.TryRead(ref reader, options, PropNormalizer))
+			{
+				continue;
+			}
+
+			if (propNorms.TryRead(ref reader, options, PropNorms))
+			{
+				continue;
+			}
+
+			if (propNullValue.TryRead(ref reader, options, PropNullValue))
+			{
+				continue;
+			}
+
+			if (propOnScriptError.TryRead(ref reader, options, PropOnScriptError))
+			{
+				continue;
+			}
+
+			if (propProperties.TryRead(ref reader, options, PropProperties))
+			{
+				continue;
+			}
+
+			if (propScript.TryRead(ref reader, options, PropScript))
+			{
+				continue;
+			}
+
+			if (propSimilarity.TryRead(ref reader, options, PropSimilarity))
+			{
+				continue;
+			}
+
+			if (propSplitQueriesOnWhitespace.TryRead(ref reader, options, PropSplitQueriesOnWhitespace))
+			{
+				continue;
+			}
+
+			if (propStore.TryRead(ref reader, options, PropStore))
+			{
+				continue;
+			}
+
+			if (propTimeSeriesDimension.TryRead(ref reader, options, PropTimeSeriesDimension))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new KeywordProperty
+		{
+			Boost = propBoost.Value
+,
+			CopyTo = propCopyTo.Value
+,
+			DocValues = propDocValues.Value
+,
+			Dynamic = propDynamic.Value
+,
+			EagerGlobalOrdinals = propEagerGlobalOrdinals.Value
+,
+			Fields = propFields.Value
+,
+			IgnoreAbove = propIgnoreAbove.Value
+,
+			Index = propIndex.Value
+,
+			IndexOptions = propIndexOptions.Value
+,
+			Meta = propMeta.Value
+,
+			Normalizer = propNormalizer.Value
+,
+			Norms = propNorms.Value
+,
+			NullValue = propNullValue.Value
+,
+			OnScriptError = propOnScriptError.Value
+,
+			Properties = propProperties.Value
+,
+			Script = propScript.Value
+,
+			Similarity = propSimilarity.Value
+,
+			SplitQueriesOnWhitespace = propSplitQueriesOnWhitespace.Value
+,
+			Store = propStore.Value
+,
+			TimeSeriesDimension = propTimeSeriesDimension.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, KeywordProperty value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropCopyTo, value.CopyTo, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropDocValues, value.DocValues);
+		writer.WriteProperty(options, PropDynamic, value.Dynamic);
+		writer.WriteProperty(options, PropEagerGlobalOrdinals, value.EagerGlobalOrdinals);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropIgnoreAbove, value.IgnoreAbove);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropIndexOptions, value.IndexOptions);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropNormalizer, value.Normalizer);
+		writer.WriteProperty(options, PropNorms, value.Norms);
+		writer.WriteProperty(options, PropNullValue, value.NullValue);
+		writer.WriteProperty(options, PropOnScriptError, value.OnScriptError);
+		writer.WriteProperty(options, PropProperties, value.Properties);
+		writer.WriteProperty(options, PropScript, value.Script);
+		writer.WriteProperty(options, PropSimilarity, value.Similarity);
+		writer.WriteProperty(options, PropSplitQueriesOnWhitespace, value.SplitQueriesOnWhitespace);
+		writer.WriteProperty(options, PropStore, value.Store);
+		writer.WriteProperty(options, PropTimeSeriesDimension, value.TimeSeriesDimension);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(KeywordPropertyConverter))]
 public sealed partial class KeywordProperty : IProperty
 {
-	[JsonInclude, JsonPropertyName("boost")]
 	public double? Boost { get; set; }
-	[JsonInclude, JsonPropertyName("copy_to")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	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; }
 
 	/// <summary>
@@ -54,25 +277,15 @@ public sealed partial class KeywordProperty : IProperty
 	/// Metadata about the field.
 	/// </para>
 	/// </summary>
-	[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("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("split_queries_on_whitespace")]
 	public bool? SplitQueriesOnWhitespace { get; set; }
-	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
 
 	/// <summary>
@@ -80,10 +293,8 @@ public sealed partial class KeywordProperty : IProperty
 	/// 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")]
 	public string Type => "keyword";
 }
 
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 e2454a28973..51fafed3cac 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/LongNumberProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/LongNumberProperty.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,26 +28,218 @@
 
 namespace Elastic.Clients.Elasticsearch.Mapping;
 
+internal sealed partial class LongNumberPropertyConverter : System.Text.Json.Serialization.JsonConverter<LongNumberProperty>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropCoerce = System.Text.Json.JsonEncodedText.Encode("coerce");
+	private static readonly System.Text.Json.JsonEncodedText PropCopyTo = System.Text.Json.JsonEncodedText.Encode("copy_to");
+	private static readonly System.Text.Json.JsonEncodedText PropDocValues = System.Text.Json.JsonEncodedText.Encode("doc_values");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamic = System.Text.Json.JsonEncodedText.Encode("dynamic");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreAbove = System.Text.Json.JsonEncodedText.Encode("ignore_above");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreMalformed = System.Text.Json.JsonEncodedText.Encode("ignore_malformed");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropNullValue = System.Text.Json.JsonEncodedText.Encode("null_value");
+	private static readonly System.Text.Json.JsonEncodedText PropOnScriptError = System.Text.Json.JsonEncodedText.Encode("on_script_error");
+	private static readonly System.Text.Json.JsonEncodedText PropProperties = System.Text.Json.JsonEncodedText.Encode("properties");
+	private static readonly System.Text.Json.JsonEncodedText PropScript = System.Text.Json.JsonEncodedText.Encode("script");
+	private static readonly System.Text.Json.JsonEncodedText PropStore = System.Text.Json.JsonEncodedText.Encode("store");
+	private static readonly System.Text.Json.JsonEncodedText PropTimeSeriesDimension = System.Text.Json.JsonEncodedText.Encode("time_series_dimension");
+	private static readonly System.Text.Json.JsonEncodedText PropTimeSeriesMetric = System.Text.Json.JsonEncodedText.Encode("time_series_metric");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override LongNumberProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<double?> propBoost = default;
+		LocalJsonProperty<bool?> propCoerce = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Fields?> propCopyTo = default;
+		LocalJsonProperty<bool?> propDocValues = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.DynamicMapping?> propDynamic = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.Properties?> propFields = default;
+		LocalJsonProperty<int?> propIgnoreAbove = default;
+		LocalJsonProperty<bool?> propIgnoreMalformed = default;
+		LocalJsonProperty<bool?> propIndex = default;
+		LocalJsonProperty<IDictionary<string, string>?> propMeta = default;
+		LocalJsonProperty<long?> propNullValue = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.OnScriptError?> propOnScriptError = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.Properties?> propProperties = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Script?> propScript = default;
+		LocalJsonProperty<bool?> propStore = default;
+		LocalJsonProperty<bool?> propTimeSeriesDimension = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.TimeSeriesMetricType?> propTimeSeriesMetric = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
+
+			if (propCoerce.TryRead(ref reader, options, PropCoerce))
+			{
+				continue;
+			}
+
+			if (propCopyTo.TryRead(ref reader, options, PropCopyTo, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propDocValues.TryRead(ref reader, options, PropDocValues))
+			{
+				continue;
+			}
+
+			if (propDynamic.TryRead(ref reader, options, PropDynamic))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propIgnoreAbove.TryRead(ref reader, options, PropIgnoreAbove))
+			{
+				continue;
+			}
+
+			if (propIgnoreMalformed.TryRead(ref reader, options, PropIgnoreMalformed))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propNullValue.TryRead(ref reader, options, PropNullValue))
+			{
+				continue;
+			}
+
+			if (propOnScriptError.TryRead(ref reader, options, PropOnScriptError))
+			{
+				continue;
+			}
+
+			if (propProperties.TryRead(ref reader, options, PropProperties))
+			{
+				continue;
+			}
+
+			if (propScript.TryRead(ref reader, options, PropScript))
+			{
+				continue;
+			}
+
+			if (propStore.TryRead(ref reader, options, PropStore))
+			{
+				continue;
+			}
+
+			if (propTimeSeriesDimension.TryRead(ref reader, options, PropTimeSeriesDimension))
+			{
+				continue;
+			}
+
+			if (propTimeSeriesMetric.TryRead(ref reader, options, PropTimeSeriesMetric))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new LongNumberProperty
+		{
+			Boost = propBoost.Value
+,
+			Coerce = propCoerce.Value
+,
+			CopyTo = propCopyTo.Value
+,
+			DocValues = propDocValues.Value
+,
+			Dynamic = propDynamic.Value
+,
+			Fields = propFields.Value
+,
+			IgnoreAbove = propIgnoreAbove.Value
+,
+			IgnoreMalformed = propIgnoreMalformed.Value
+,
+			Index = propIndex.Value
+,
+			Meta = propMeta.Value
+,
+			NullValue = propNullValue.Value
+,
+			OnScriptError = propOnScriptError.Value
+,
+			Properties = propProperties.Value
+,
+			Script = propScript.Value
+,
+			Store = propStore.Value
+,
+			TimeSeriesDimension = propTimeSeriesDimension.Value
+,
+			TimeSeriesMetric = propTimeSeriesMetric.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, LongNumberProperty value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropCoerce, value.Coerce);
+		writer.WriteProperty(options, PropCopyTo, value.CopyTo, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropDocValues, value.DocValues);
+		writer.WriteProperty(options, PropDynamic, value.Dynamic);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropIgnoreAbove, value.IgnoreAbove);
+		writer.WriteProperty(options, PropIgnoreMalformed, value.IgnoreMalformed);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropNullValue, value.NullValue);
+		writer.WriteProperty(options, PropOnScriptError, value.OnScriptError);
+		writer.WriteProperty(options, PropProperties, value.Properties);
+		writer.WriteProperty(options, PropScript, value.Script);
+		writer.WriteProperty(options, PropStore, value.Store);
+		writer.WriteProperty(options, PropTimeSeriesDimension, value.TimeSeriesDimension);
+		writer.WriteProperty(options, PropTimeSeriesMetric, value.TimeSeriesMetric);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(LongNumberPropertyConverter))]
 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")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	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; }
 
 	/// <summary>
@@ -54,17 +247,11 @@ public sealed partial class LongNumberProperty : IProperty
 	/// Metadata about the field.
 	/// </para>
 	/// </summary>
-	[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("store")]
 	public bool? Store { get; set; }
 
 	/// <summary>
@@ -72,7 +259,6 @@ public sealed partial class LongNumberProperty : IProperty
 	/// 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; }
 
 	/// <summary>
@@ -80,10 +266,8 @@ public sealed partial class LongNumberProperty : IProperty
 	/// For internal use by Elastic only. Marks the field as a time series dimension. Defaults to false.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("time_series_metric")]
 	public Elastic.Clients.Elasticsearch.Mapping.TimeSeriesMetricType? TimeSeriesMetric { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "long";
 }
 
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 301a1c2d56a..ee5894d1cbf 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/LongRangeProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/LongRangeProperty.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,24 +28,157 @@
 
 namespace Elastic.Clients.Elasticsearch.Mapping;
 
+internal sealed partial class LongRangePropertyConverter : System.Text.Json.Serialization.JsonConverter<LongRangeProperty>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropCoerce = System.Text.Json.JsonEncodedText.Encode("coerce");
+	private static readonly System.Text.Json.JsonEncodedText PropCopyTo = System.Text.Json.JsonEncodedText.Encode("copy_to");
+	private static readonly System.Text.Json.JsonEncodedText PropDocValues = System.Text.Json.JsonEncodedText.Encode("doc_values");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamic = System.Text.Json.JsonEncodedText.Encode("dynamic");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreAbove = System.Text.Json.JsonEncodedText.Encode("ignore_above");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropProperties = System.Text.Json.JsonEncodedText.Encode("properties");
+	private static readonly System.Text.Json.JsonEncodedText PropStore = System.Text.Json.JsonEncodedText.Encode("store");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override LongRangeProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<double?> propBoost = default;
+		LocalJsonProperty<bool?> propCoerce = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Fields?> propCopyTo = default;
+		LocalJsonProperty<bool?> propDocValues = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.DynamicMapping?> propDynamic = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.Properties?> propFields = default;
+		LocalJsonProperty<int?> propIgnoreAbove = default;
+		LocalJsonProperty<bool?> propIndex = default;
+		LocalJsonProperty<IDictionary<string, string>?> propMeta = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.Properties?> propProperties = default;
+		LocalJsonProperty<bool?> propStore = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
+
+			if (propCoerce.TryRead(ref reader, options, PropCoerce))
+			{
+				continue;
+			}
+
+			if (propCopyTo.TryRead(ref reader, options, PropCopyTo, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propDocValues.TryRead(ref reader, options, PropDocValues))
+			{
+				continue;
+			}
+
+			if (propDynamic.TryRead(ref reader, options, PropDynamic))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propIgnoreAbove.TryRead(ref reader, options, PropIgnoreAbove))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propProperties.TryRead(ref reader, options, PropProperties))
+			{
+				continue;
+			}
+
+			if (propStore.TryRead(ref reader, options, PropStore))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new LongRangeProperty
+		{
+			Boost = propBoost.Value
+,
+			Coerce = propCoerce.Value
+,
+			CopyTo = propCopyTo.Value
+,
+			DocValues = propDocValues.Value
+,
+			Dynamic = propDynamic.Value
+,
+			Fields = propFields.Value
+,
+			IgnoreAbove = propIgnoreAbove.Value
+,
+			Index = propIndex.Value
+,
+			Meta = propMeta.Value
+,
+			Properties = propProperties.Value
+,
+			Store = propStore.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, LongRangeProperty value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropCoerce, value.Coerce);
+		writer.WriteProperty(options, PropCopyTo, value.CopyTo, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropDocValues, value.DocValues);
+		writer.WriteProperty(options, PropDynamic, value.Dynamic);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropIgnoreAbove, value.IgnoreAbove);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropProperties, value.Properties);
+		writer.WriteProperty(options, PropStore, value.Store);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(LongRangePropertyConverter))]
 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")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	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; }
 
 	/// <summary>
@@ -52,14 +186,10 @@ public sealed partial class LongRangeProperty : IProperty
 	/// Metadata about the field.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Properties { get; set; }
-	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "long_range";
 }
 
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 4f7566ec1b8..3496b0e2252 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/MatchOnlyTextProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/MatchOnlyTextProperty.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,67 @@
 
 namespace Elastic.Clients.Elasticsearch.Mapping;
 
+internal sealed partial class MatchOnlyTextPropertyConverter : System.Text.Json.Serialization.JsonConverter<MatchOnlyTextProperty>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCopyTo = System.Text.Json.JsonEncodedText.Encode("copy_to");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override MatchOnlyTextProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Fields?> propCopyTo = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.Properties?> propFields = default;
+		LocalJsonProperty<IDictionary<string, string>?> propMeta = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCopyTo.TryRead(ref reader, options, PropCopyTo, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new MatchOnlyTextProperty
+		{
+			CopyTo = propCopyTo.Value
+,
+			Fields = propFields.Value
+,
+			Meta = propMeta.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, MatchOnlyTextProperty value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCopyTo, value.CopyTo, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
 /// <summary>
 /// <para>
 /// A variant of text that trades scoring and efficiency of positional queries for space efficiency. This field
@@ -36,6 +98,7 @@ namespace Elastic.Clients.Elasticsearch.Mapping;
 /// to verify whether a phrase matches. All queries return constant scores that are equal to 1.0.
 /// </para>
 /// </summary>
+[JsonConverter(typeof(MatchOnlyTextPropertyConverter))]
 public sealed partial class MatchOnlyTextProperty : IProperty
 {
 	/// <summary>
@@ -44,8 +107,6 @@ public sealed partial class MatchOnlyTextProperty : IProperty
 	/// field, which can then be queried as a single field.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("copy_to")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Fields? CopyTo { get; set; }
 
 	/// <summary>
@@ -54,7 +115,6 @@ public sealed partial class MatchOnlyTextProperty : IProperty
 	/// 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>
@@ -62,10 +122,8 @@ public sealed partial class MatchOnlyTextProperty : IProperty
 	/// Metadata about the field.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "match_only_text";
 }
 
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 13bf5f0c702..0b8a290b9a9 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/Murmur3HashProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/Murmur3HashProperty.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,18 +28,124 @@
 
 namespace Elastic.Clients.Elasticsearch.Mapping;
 
+internal sealed partial class Murmur3HashPropertyConverter : System.Text.Json.Serialization.JsonConverter<Murmur3HashProperty>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCopyTo = System.Text.Json.JsonEncodedText.Encode("copy_to");
+	private static readonly System.Text.Json.JsonEncodedText PropDocValues = System.Text.Json.JsonEncodedText.Encode("doc_values");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamic = System.Text.Json.JsonEncodedText.Encode("dynamic");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreAbove = System.Text.Json.JsonEncodedText.Encode("ignore_above");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropProperties = System.Text.Json.JsonEncodedText.Encode("properties");
+	private static readonly System.Text.Json.JsonEncodedText PropStore = System.Text.Json.JsonEncodedText.Encode("store");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override Murmur3HashProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Fields?> propCopyTo = default;
+		LocalJsonProperty<bool?> propDocValues = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.DynamicMapping?> propDynamic = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.Properties?> propFields = default;
+		LocalJsonProperty<int?> propIgnoreAbove = default;
+		LocalJsonProperty<IDictionary<string, string>?> propMeta = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.Properties?> propProperties = default;
+		LocalJsonProperty<bool?> propStore = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCopyTo.TryRead(ref reader, options, PropCopyTo, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propDocValues.TryRead(ref reader, options, PropDocValues))
+			{
+				continue;
+			}
+
+			if (propDynamic.TryRead(ref reader, options, PropDynamic))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propIgnoreAbove.TryRead(ref reader, options, PropIgnoreAbove))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propProperties.TryRead(ref reader, options, PropProperties))
+			{
+				continue;
+			}
+
+			if (propStore.TryRead(ref reader, options, PropStore))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new Murmur3HashProperty
+		{
+			CopyTo = propCopyTo.Value
+,
+			DocValues = propDocValues.Value
+,
+			Dynamic = propDynamic.Value
+,
+			Fields = propFields.Value
+,
+			IgnoreAbove = propIgnoreAbove.Value
+,
+			Meta = propMeta.Value
+,
+			Properties = propProperties.Value
+,
+			Store = propStore.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, Murmur3HashProperty value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCopyTo, value.CopyTo, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropDocValues, value.DocValues);
+		writer.WriteProperty(options, PropDynamic, value.Dynamic);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropIgnoreAbove, value.IgnoreAbove);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropProperties, value.Properties);
+		writer.WriteProperty(options, PropStore, value.Store);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(Murmur3HashPropertyConverter))]
 public sealed partial class Murmur3HashProperty : IProperty
 {
-	[JsonInclude, JsonPropertyName("copy_to")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	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; }
 
 	/// <summary>
@@ -46,14 +153,10 @@ public sealed partial class Murmur3HashProperty : IProperty
 	/// Metadata about the field.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Properties { get; set; }
-	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "murmur3";
 }
 
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 959c90ccf45..c95c043483d 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/NestedProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/NestedProperty.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,22 +28,146 @@
 
 namespace Elastic.Clients.Elasticsearch.Mapping;
 
+internal sealed partial class NestedPropertyConverter : System.Text.Json.Serialization.JsonConverter<NestedProperty>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCopyTo = System.Text.Json.JsonEncodedText.Encode("copy_to");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamic = System.Text.Json.JsonEncodedText.Encode("dynamic");
+	private static readonly System.Text.Json.JsonEncodedText PropEnabled = System.Text.Json.JsonEncodedText.Encode("enabled");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreAbove = System.Text.Json.JsonEncodedText.Encode("ignore_above");
+	private static readonly System.Text.Json.JsonEncodedText PropIncludeInParent = System.Text.Json.JsonEncodedText.Encode("include_in_parent");
+	private static readonly System.Text.Json.JsonEncodedText PropIncludeInRoot = System.Text.Json.JsonEncodedText.Encode("include_in_root");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropProperties = System.Text.Json.JsonEncodedText.Encode("properties");
+	private static readonly System.Text.Json.JsonEncodedText PropStore = System.Text.Json.JsonEncodedText.Encode("store");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override NestedProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Fields?> propCopyTo = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.DynamicMapping?> propDynamic = default;
+		LocalJsonProperty<bool?> propEnabled = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.Properties?> propFields = default;
+		LocalJsonProperty<int?> propIgnoreAbove = default;
+		LocalJsonProperty<bool?> propIncludeInParent = default;
+		LocalJsonProperty<bool?> propIncludeInRoot = default;
+		LocalJsonProperty<IDictionary<string, string>?> propMeta = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.Properties?> propProperties = default;
+		LocalJsonProperty<bool?> propStore = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCopyTo.TryRead(ref reader, options, PropCopyTo, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propDynamic.TryRead(ref reader, options, PropDynamic))
+			{
+				continue;
+			}
+
+			if (propEnabled.TryRead(ref reader, options, PropEnabled))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propIgnoreAbove.TryRead(ref reader, options, PropIgnoreAbove))
+			{
+				continue;
+			}
+
+			if (propIncludeInParent.TryRead(ref reader, options, PropIncludeInParent))
+			{
+				continue;
+			}
+
+			if (propIncludeInRoot.TryRead(ref reader, options, PropIncludeInRoot))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propProperties.TryRead(ref reader, options, PropProperties))
+			{
+				continue;
+			}
+
+			if (propStore.TryRead(ref reader, options, PropStore))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new NestedProperty
+		{
+			CopyTo = propCopyTo.Value
+,
+			Dynamic = propDynamic.Value
+,
+			Enabled = propEnabled.Value
+,
+			Fields = propFields.Value
+,
+			IgnoreAbove = propIgnoreAbove.Value
+,
+			IncludeInParent = propIncludeInParent.Value
+,
+			IncludeInRoot = propIncludeInRoot.Value
+,
+			Meta = propMeta.Value
+,
+			Properties = propProperties.Value
+,
+			Store = propStore.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, NestedProperty value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCopyTo, value.CopyTo, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropDynamic, value.Dynamic);
+		writer.WriteProperty(options, PropEnabled, value.Enabled);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropIgnoreAbove, value.IgnoreAbove);
+		writer.WriteProperty(options, PropIncludeInParent, value.IncludeInParent);
+		writer.WriteProperty(options, PropIncludeInRoot, value.IncludeInRoot);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropProperties, value.Properties);
+		writer.WriteProperty(options, PropStore, value.Store);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(NestedPropertyConverter))]
 public sealed partial class NestedProperty : IProperty
 {
-	[JsonInclude, JsonPropertyName("copy_to")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	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; }
 
 	/// <summary>
@@ -50,14 +175,10 @@ public sealed partial class NestedProperty : IProperty
 	/// Metadata about the field.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Properties { get; set; }
-	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "nested";
 }
 
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 72b364f5dea..979f89dc112 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/ObjectProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/ObjectProperty.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,18 +28,134 @@
 
 namespace Elastic.Clients.Elasticsearch.Mapping;
 
+internal sealed partial class ObjectPropertyConverter : System.Text.Json.Serialization.JsonConverter<ObjectProperty>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCopyTo = System.Text.Json.JsonEncodedText.Encode("copy_to");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamic = System.Text.Json.JsonEncodedText.Encode("dynamic");
+	private static readonly System.Text.Json.JsonEncodedText PropEnabled = System.Text.Json.JsonEncodedText.Encode("enabled");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreAbove = System.Text.Json.JsonEncodedText.Encode("ignore_above");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropProperties = System.Text.Json.JsonEncodedText.Encode("properties");
+	private static readonly System.Text.Json.JsonEncodedText PropStore = System.Text.Json.JsonEncodedText.Encode("store");
+	private static readonly System.Text.Json.JsonEncodedText PropSubobjects = System.Text.Json.JsonEncodedText.Encode("subobjects");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override ObjectProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Fields?> propCopyTo = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.DynamicMapping?> propDynamic = default;
+		LocalJsonProperty<bool?> propEnabled = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.Properties?> propFields = default;
+		LocalJsonProperty<int?> propIgnoreAbove = default;
+		LocalJsonProperty<IDictionary<string, string>?> propMeta = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.Properties?> propProperties = default;
+		LocalJsonProperty<bool?> propStore = default;
+		LocalJsonProperty<bool?> propSubobjects = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCopyTo.TryRead(ref reader, options, PropCopyTo, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propDynamic.TryRead(ref reader, options, PropDynamic))
+			{
+				continue;
+			}
+
+			if (propEnabled.TryRead(ref reader, options, PropEnabled))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propIgnoreAbove.TryRead(ref reader, options, PropIgnoreAbove))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propProperties.TryRead(ref reader, options, PropProperties))
+			{
+				continue;
+			}
+
+			if (propStore.TryRead(ref reader, options, PropStore))
+			{
+				continue;
+			}
+
+			if (propSubobjects.TryRead(ref reader, options, PropSubobjects))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ObjectProperty
+		{
+			CopyTo = propCopyTo.Value
+,
+			Dynamic = propDynamic.Value
+,
+			Enabled = propEnabled.Value
+,
+			Fields = propFields.Value
+,
+			IgnoreAbove = propIgnoreAbove.Value
+,
+			Meta = propMeta.Value
+,
+			Properties = propProperties.Value
+,
+			Store = propStore.Value
+,
+			Subobjects = propSubobjects.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ObjectProperty value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCopyTo, value.CopyTo, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropDynamic, value.Dynamic);
+		writer.WriteProperty(options, PropEnabled, value.Enabled);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropIgnoreAbove, value.IgnoreAbove);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropProperties, value.Properties);
+		writer.WriteProperty(options, PropStore, value.Store);
+		writer.WriteProperty(options, PropSubobjects, value.Subobjects);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ObjectPropertyConverter))]
 public sealed partial class ObjectProperty : IProperty
 {
-	[JsonInclude, JsonPropertyName("copy_to")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	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; }
 
 	/// <summary>
@@ -46,16 +163,11 @@ public sealed partial class ObjectProperty : IProperty
 	/// Metadata about the field.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Properties { get; set; }
-	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
-	[JsonInclude, JsonPropertyName("subobjects")]
 	public bool? Subobjects { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "object";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/PassthroughObjectProperty.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/PassthroughObjectProperty.g.cs
index db4a8355410..738c81de3a9 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/PassthroughObjectProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/PassthroughObjectProperty.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,18 +28,144 @@
 
 namespace Elastic.Clients.Elasticsearch.Mapping;
 
+internal sealed partial class PassthroughObjectPropertyConverter : System.Text.Json.Serialization.JsonConverter<PassthroughObjectProperty>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCopyTo = System.Text.Json.JsonEncodedText.Encode("copy_to");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamic = System.Text.Json.JsonEncodedText.Encode("dynamic");
+	private static readonly System.Text.Json.JsonEncodedText PropEnabled = System.Text.Json.JsonEncodedText.Encode("enabled");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreAbove = System.Text.Json.JsonEncodedText.Encode("ignore_above");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropPriority = System.Text.Json.JsonEncodedText.Encode("priority");
+	private static readonly System.Text.Json.JsonEncodedText PropProperties = System.Text.Json.JsonEncodedText.Encode("properties");
+	private static readonly System.Text.Json.JsonEncodedText PropStore = System.Text.Json.JsonEncodedText.Encode("store");
+	private static readonly System.Text.Json.JsonEncodedText PropTimeSeriesDimension = System.Text.Json.JsonEncodedText.Encode("time_series_dimension");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override PassthroughObjectProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Fields?> propCopyTo = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.DynamicMapping?> propDynamic = default;
+		LocalJsonProperty<bool?> propEnabled = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.Properties?> propFields = default;
+		LocalJsonProperty<int?> propIgnoreAbove = default;
+		LocalJsonProperty<IDictionary<string, string>?> propMeta = default;
+		LocalJsonProperty<int?> propPriority = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.Properties?> propProperties = default;
+		LocalJsonProperty<bool?> propStore = default;
+		LocalJsonProperty<bool?> propTimeSeriesDimension = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCopyTo.TryRead(ref reader, options, PropCopyTo, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propDynamic.TryRead(ref reader, options, PropDynamic))
+			{
+				continue;
+			}
+
+			if (propEnabled.TryRead(ref reader, options, PropEnabled))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propIgnoreAbove.TryRead(ref reader, options, PropIgnoreAbove))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propPriority.TryRead(ref reader, options, PropPriority))
+			{
+				continue;
+			}
+
+			if (propProperties.TryRead(ref reader, options, PropProperties))
+			{
+				continue;
+			}
+
+			if (propStore.TryRead(ref reader, options, PropStore))
+			{
+				continue;
+			}
+
+			if (propTimeSeriesDimension.TryRead(ref reader, options, PropTimeSeriesDimension))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PassthroughObjectProperty
+		{
+			CopyTo = propCopyTo.Value
+,
+			Dynamic = propDynamic.Value
+,
+			Enabled = propEnabled.Value
+,
+			Fields = propFields.Value
+,
+			IgnoreAbove = propIgnoreAbove.Value
+,
+			Meta = propMeta.Value
+,
+			Priority = propPriority.Value
+,
+			Properties = propProperties.Value
+,
+			Store = propStore.Value
+,
+			TimeSeriesDimension = propTimeSeriesDimension.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PassthroughObjectProperty value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCopyTo, value.CopyTo, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropDynamic, value.Dynamic);
+		writer.WriteProperty(options, PropEnabled, value.Enabled);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropIgnoreAbove, value.IgnoreAbove);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropPriority, value.Priority);
+		writer.WriteProperty(options, PropProperties, value.Properties);
+		writer.WriteProperty(options, PropStore, value.Store);
+		writer.WriteProperty(options, PropTimeSeriesDimension, value.TimeSeriesDimension);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PassthroughObjectPropertyConverter))]
 public sealed partial class PassthroughObjectProperty : IProperty
 {
-	[JsonInclude, JsonPropertyName("copy_to")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	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; }
 
 	/// <summary>
@@ -46,18 +173,12 @@ public sealed partial class PassthroughObjectProperty : IProperty
 	/// Metadata about the field.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-	[JsonInclude, JsonPropertyName("priority")]
 	public int? Priority { get; set; }
-	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Properties { get; set; }
-	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
-	[JsonInclude, JsonPropertyName("time_series_dimension")]
 	public bool? TimeSeriesDimension { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "passthrough";
 }
 
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 b02111781c2..117e508e093 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/PointProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/PointProperty.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,22 +28,156 @@
 
 namespace Elastic.Clients.Elasticsearch.Mapping;
 
+internal sealed partial class PointPropertyConverter : System.Text.Json.Serialization.JsonConverter<PointProperty>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCopyTo = System.Text.Json.JsonEncodedText.Encode("copy_to");
+	private static readonly System.Text.Json.JsonEncodedText PropDocValues = System.Text.Json.JsonEncodedText.Encode("doc_values");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamic = System.Text.Json.JsonEncodedText.Encode("dynamic");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreAbove = System.Text.Json.JsonEncodedText.Encode("ignore_above");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreMalformed = System.Text.Json.JsonEncodedText.Encode("ignore_malformed");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreZValue = System.Text.Json.JsonEncodedText.Encode("ignore_z_value");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropNullValue = System.Text.Json.JsonEncodedText.Encode("null_value");
+	private static readonly System.Text.Json.JsonEncodedText PropProperties = System.Text.Json.JsonEncodedText.Encode("properties");
+	private static readonly System.Text.Json.JsonEncodedText PropStore = System.Text.Json.JsonEncodedText.Encode("store");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override PointProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Fields?> propCopyTo = default;
+		LocalJsonProperty<bool?> propDocValues = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.DynamicMapping?> propDynamic = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.Properties?> propFields = default;
+		LocalJsonProperty<int?> propIgnoreAbove = default;
+		LocalJsonProperty<bool?> propIgnoreMalformed = default;
+		LocalJsonProperty<bool?> propIgnoreZValue = default;
+		LocalJsonProperty<IDictionary<string, string>?> propMeta = default;
+		LocalJsonProperty<string?> propNullValue = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.Properties?> propProperties = default;
+		LocalJsonProperty<bool?> propStore = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCopyTo.TryRead(ref reader, options, PropCopyTo, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propDocValues.TryRead(ref reader, options, PropDocValues))
+			{
+				continue;
+			}
+
+			if (propDynamic.TryRead(ref reader, options, PropDynamic))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propIgnoreAbove.TryRead(ref reader, options, PropIgnoreAbove))
+			{
+				continue;
+			}
+
+			if (propIgnoreMalformed.TryRead(ref reader, options, PropIgnoreMalformed))
+			{
+				continue;
+			}
+
+			if (propIgnoreZValue.TryRead(ref reader, options, PropIgnoreZValue))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propNullValue.TryRead(ref reader, options, PropNullValue))
+			{
+				continue;
+			}
+
+			if (propProperties.TryRead(ref reader, options, PropProperties))
+			{
+				continue;
+			}
+
+			if (propStore.TryRead(ref reader, options, PropStore))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PointProperty
+		{
+			CopyTo = propCopyTo.Value
+,
+			DocValues = propDocValues.Value
+,
+			Dynamic = propDynamic.Value
+,
+			Fields = propFields.Value
+,
+			IgnoreAbove = propIgnoreAbove.Value
+,
+			IgnoreMalformed = propIgnoreMalformed.Value
+,
+			IgnoreZValue = propIgnoreZValue.Value
+,
+			Meta = propMeta.Value
+,
+			NullValue = propNullValue.Value
+,
+			Properties = propProperties.Value
+,
+			Store = propStore.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PointProperty value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCopyTo, value.CopyTo, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropDocValues, value.DocValues);
+		writer.WriteProperty(options, PropDynamic, value.Dynamic);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropIgnoreAbove, value.IgnoreAbove);
+		writer.WriteProperty(options, PropIgnoreMalformed, value.IgnoreMalformed);
+		writer.WriteProperty(options, PropIgnoreZValue, value.IgnoreZValue);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropNullValue, value.NullValue);
+		writer.WriteProperty(options, PropProperties, value.Properties);
+		writer.WriteProperty(options, PropStore, value.Store);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(PointPropertyConverter))]
 public sealed partial class PointProperty : IProperty
 {
-	[JsonInclude, JsonPropertyName("copy_to")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	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; }
 
 	/// <summary>
@@ -50,16 +185,11 @@ public sealed partial class PointProperty : IProperty
 	/// Metadata about the field.
 	/// </para>
 	/// </summary>
-	[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("store")]
 	public bool? Store { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "point";
 }
 
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 b3b3c49457d..6369c00829b 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/Properties.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/Properties.g.cs
@@ -19,6 +19,7 @@
 
 using Elastic.Clients.Elasticsearch.Core;
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport;
 using System;
@@ -318,289 +319,238 @@ public PropertiesDescriptor() : base(new Properties())
 	public PropertiesDescriptor<TDocument> Wildcard(Expression<Func<TDocument, object>> propertyName, Action<Elastic.Clients.Elasticsearch.Mapping.WildcardPropertyDescriptor<TDocument>> configure) => AssignVariant<Elastic.Clients.Elasticsearch.Mapping.WildcardPropertyDescriptor<TDocument>, WildcardProperty>(propertyName, configure);
 }
 
-internal sealed partial class PropertyInterfaceConverter : JsonConverter<IProperty>
+internal sealed partial class PropertyInterfaceConverter : System.Text.Json.Serialization.JsonConverter<IProperty>
 {
-	public override IProperty Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropDiscriminator = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override IProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var copiedReader = reader;
-		string? type = null;
-		using var jsonDoc = JsonDocument.ParseValue(ref copiedReader);
-		if (jsonDoc is not null && jsonDoc.RootElement.TryGetProperty("type", out var readType) && readType.ValueKind == JsonValueKind.String)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		var readerSnapshot = reader;
+		string? discriminator = "object";
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			type = readType.ToString();
+			if (reader.TryReadProperty(options, PropDiscriminator, ref discriminator))
+			{
+				break;
+			}
+
+			reader.Skip();
 		}
 
-		switch (type)
+		reader = readerSnapshot;
+		return discriminator switch
 		{
-			case "aggregate_metric_double":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Mapping.AggregateMetricDoubleProperty>(ref reader, options);
-			case "binary":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Mapping.BinaryProperty>(ref reader, options);
-			case "boolean":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Mapping.BooleanProperty>(ref reader, options);
-			case "byte":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Mapping.ByteNumberProperty>(ref reader, options);
-			case "completion":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Mapping.CompletionProperty>(ref reader, options);
-			case "constant_keyword":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Mapping.ConstantKeywordProperty>(ref reader, options);
-			case "date_nanos":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Mapping.DateNanosProperty>(ref reader, options);
-			case "date":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Mapping.DateProperty>(ref reader, options);
-			case "date_range":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Mapping.DateRangeProperty>(ref reader, options);
-			case "dense_vector":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Mapping.DenseVectorProperty>(ref reader, options);
-			case "double":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Mapping.DoubleNumberProperty>(ref reader, options);
-			case "double_range":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Mapping.DoubleRangeProperty>(ref reader, options);
-			case "{dynamic_type}":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Mapping.DynamicProperty>(ref reader, options);
-			case "alias":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Mapping.FieldAliasProperty>(ref reader, options);
-			case "flattened":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Mapping.FlattenedProperty>(ref reader, options);
-			case "float":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Mapping.FloatNumberProperty>(ref reader, options);
-			case "float_range":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Mapping.FloatRangeProperty>(ref reader, options);
-			case "geo_point":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Mapping.GeoPointProperty>(ref reader, options);
-			case "geo_shape":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Mapping.GeoShapeProperty>(ref reader, options);
-			case "half_float":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Mapping.HalfFloatNumberProperty>(ref reader, options);
-			case "histogram":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Mapping.HistogramProperty>(ref reader, options);
-			case "icu_collation_keyword":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Mapping.IcuCollationProperty>(ref reader, options);
-			case "integer":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Mapping.IntegerNumberProperty>(ref reader, options);
-			case "integer_range":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Mapping.IntegerRangeProperty>(ref reader, options);
-			case "ip":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Mapping.IpProperty>(ref reader, options);
-			case "ip_range":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Mapping.IpRangeProperty>(ref reader, options);
-			case "join":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Mapping.JoinProperty>(ref reader, options);
-			case "keyword":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Mapping.KeywordProperty>(ref reader, options);
-			case "long":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Mapping.LongNumberProperty>(ref reader, options);
-			case "long_range":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Mapping.LongRangeProperty>(ref reader, options);
-			case "match_only_text":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Mapping.MatchOnlyTextProperty>(ref reader, options);
-			case "murmur3":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Mapping.Murmur3HashProperty>(ref reader, options);
-			case "nested":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Mapping.NestedProperty>(ref reader, options);
-			case "object":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Mapping.ObjectProperty>(ref reader, options);
-			case "passthrough":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Mapping.PassthroughObjectProperty>(ref reader, options);
-			case "percolator":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Mapping.PercolatorProperty>(ref reader, options);
-			case "point":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Mapping.PointProperty>(ref reader, options);
-			case "rank_feature":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Mapping.RankFeatureProperty>(ref reader, options);
-			case "rank_features":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Mapping.RankFeaturesProperty>(ref reader, options);
-			case "scaled_float":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Mapping.ScaledFloatNumberProperty>(ref reader, options);
-			case "search_as_you_type":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Mapping.SearchAsYouTypeProperty>(ref reader, options);
-			case "semantic_text":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Mapping.SemanticTextProperty>(ref reader, options);
-			case "shape":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Mapping.ShapeProperty>(ref reader, options);
-			case "short":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Mapping.ShortNumberProperty>(ref reader, options);
-			case "sparse_vector":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Mapping.SparseVectorProperty>(ref reader, options);
-			case "text":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Mapping.TextProperty>(ref reader, options);
-			case "token_count":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Mapping.TokenCountProperty>(ref reader, options);
-			case "unsigned_long":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Mapping.UnsignedLongNumberProperty>(ref reader, options);
-			case "version":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Mapping.VersionProperty>(ref reader, options);
-			case "wildcard":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Mapping.WildcardProperty>(ref reader, options);
-			default:
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Mapping.ObjectProperty>(ref reader, options);
-		}
+			"aggregate_metric_double" => reader.ReadValue<Elastic.Clients.Elasticsearch.Mapping.AggregateMetricDoubleProperty>(options),
+			"binary" => reader.ReadValue<Elastic.Clients.Elasticsearch.Mapping.BinaryProperty>(options),
+			"boolean" => reader.ReadValue<Elastic.Clients.Elasticsearch.Mapping.BooleanProperty>(options),
+			"byte" => reader.ReadValue<Elastic.Clients.Elasticsearch.Mapping.ByteNumberProperty>(options),
+			"completion" => reader.ReadValue<Elastic.Clients.Elasticsearch.Mapping.CompletionProperty>(options),
+			"constant_keyword" => reader.ReadValue<Elastic.Clients.Elasticsearch.Mapping.ConstantKeywordProperty>(options),
+			"date_nanos" => reader.ReadValue<Elastic.Clients.Elasticsearch.Mapping.DateNanosProperty>(options),
+			"date" => reader.ReadValue<Elastic.Clients.Elasticsearch.Mapping.DateProperty>(options),
+			"date_range" => reader.ReadValue<Elastic.Clients.Elasticsearch.Mapping.DateRangeProperty>(options),
+			"dense_vector" => reader.ReadValue<Elastic.Clients.Elasticsearch.Mapping.DenseVectorProperty>(options),
+			"double" => reader.ReadValue<Elastic.Clients.Elasticsearch.Mapping.DoubleNumberProperty>(options),
+			"double_range" => reader.ReadValue<Elastic.Clients.Elasticsearch.Mapping.DoubleRangeProperty>(options),
+			"{dynamic_type}" => reader.ReadValue<Elastic.Clients.Elasticsearch.Mapping.DynamicProperty>(options),
+			"alias" => reader.ReadValue<Elastic.Clients.Elasticsearch.Mapping.FieldAliasProperty>(options),
+			"flattened" => reader.ReadValue<Elastic.Clients.Elasticsearch.Mapping.FlattenedProperty>(options),
+			"float" => reader.ReadValue<Elastic.Clients.Elasticsearch.Mapping.FloatNumberProperty>(options),
+			"float_range" => reader.ReadValue<Elastic.Clients.Elasticsearch.Mapping.FloatRangeProperty>(options),
+			"geo_point" => reader.ReadValue<Elastic.Clients.Elasticsearch.Mapping.GeoPointProperty>(options),
+			"geo_shape" => reader.ReadValue<Elastic.Clients.Elasticsearch.Mapping.GeoShapeProperty>(options),
+			"half_float" => reader.ReadValue<Elastic.Clients.Elasticsearch.Mapping.HalfFloatNumberProperty>(options),
+			"histogram" => reader.ReadValue<Elastic.Clients.Elasticsearch.Mapping.HistogramProperty>(options),
+			"icu_collation_keyword" => reader.ReadValue<Elastic.Clients.Elasticsearch.Mapping.IcuCollationProperty>(options),
+			"integer" => reader.ReadValue<Elastic.Clients.Elasticsearch.Mapping.IntegerNumberProperty>(options),
+			"integer_range" => reader.ReadValue<Elastic.Clients.Elasticsearch.Mapping.IntegerRangeProperty>(options),
+			"ip" => reader.ReadValue<Elastic.Clients.Elasticsearch.Mapping.IpProperty>(options),
+			"ip_range" => reader.ReadValue<Elastic.Clients.Elasticsearch.Mapping.IpRangeProperty>(options),
+			"join" => reader.ReadValue<Elastic.Clients.Elasticsearch.Mapping.JoinProperty>(options),
+			"keyword" => reader.ReadValue<Elastic.Clients.Elasticsearch.Mapping.KeywordProperty>(options),
+			"long" => reader.ReadValue<Elastic.Clients.Elasticsearch.Mapping.LongNumberProperty>(options),
+			"long_range" => reader.ReadValue<Elastic.Clients.Elasticsearch.Mapping.LongRangeProperty>(options),
+			"match_only_text" => reader.ReadValue<Elastic.Clients.Elasticsearch.Mapping.MatchOnlyTextProperty>(options),
+			"murmur3" => reader.ReadValue<Elastic.Clients.Elasticsearch.Mapping.Murmur3HashProperty>(options),
+			"nested" => reader.ReadValue<Elastic.Clients.Elasticsearch.Mapping.NestedProperty>(options),
+			"object" => reader.ReadValue<Elastic.Clients.Elasticsearch.Mapping.ObjectProperty>(options),
+			"passthrough" => reader.ReadValue<Elastic.Clients.Elasticsearch.Mapping.PassthroughObjectProperty>(options),
+			"percolator" => reader.ReadValue<Elastic.Clients.Elasticsearch.Mapping.PercolatorProperty>(options),
+			"point" => reader.ReadValue<Elastic.Clients.Elasticsearch.Mapping.PointProperty>(options),
+			"rank_feature" => reader.ReadValue<Elastic.Clients.Elasticsearch.Mapping.RankFeatureProperty>(options),
+			"rank_features" => reader.ReadValue<Elastic.Clients.Elasticsearch.Mapping.RankFeaturesProperty>(options),
+			"scaled_float" => reader.ReadValue<Elastic.Clients.Elasticsearch.Mapping.ScaledFloatNumberProperty>(options),
+			"search_as_you_type" => reader.ReadValue<Elastic.Clients.Elasticsearch.Mapping.SearchAsYouTypeProperty>(options),
+			"semantic_text" => reader.ReadValue<Elastic.Clients.Elasticsearch.Mapping.SemanticTextProperty>(options),
+			"shape" => reader.ReadValue<Elastic.Clients.Elasticsearch.Mapping.ShapeProperty>(options),
+			"short" => reader.ReadValue<Elastic.Clients.Elasticsearch.Mapping.ShortNumberProperty>(options),
+			"sparse_vector" => reader.ReadValue<Elastic.Clients.Elasticsearch.Mapping.SparseVectorProperty>(options),
+			"text" => reader.ReadValue<Elastic.Clients.Elasticsearch.Mapping.TextProperty>(options),
+			"token_count" => reader.ReadValue<Elastic.Clients.Elasticsearch.Mapping.TokenCountProperty>(options),
+			"unsigned_long" => reader.ReadValue<Elastic.Clients.Elasticsearch.Mapping.UnsignedLongNumberProperty>(options),
+			"version" => reader.ReadValue<Elastic.Clients.Elasticsearch.Mapping.VersionProperty>(options),
+			"wildcard" => reader.ReadValue<Elastic.Clients.Elasticsearch.Mapping.WildcardProperty>(options),
+			_ => throw new System.Text.Json.JsonException($"Variant '{discriminator}' is not supported for type '{nameof(IProperty)}'.")
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, IProperty value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IProperty value, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (value is null)
-		{
-			writer.WriteNullValue();
-			return;
-		}
-
 		switch (value.Type)
 		{
 			case "aggregate_metric_double":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Mapping.AggregateMetricDoubleProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Mapping.AggregateMetricDoubleProperty)value);
+				break;
 			case "binary":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Mapping.BinaryProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Mapping.BinaryProperty)value);
+				break;
 			case "boolean":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Mapping.BooleanProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Mapping.BooleanProperty)value);
+				break;
 			case "byte":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Mapping.ByteNumberProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Mapping.ByteNumberProperty)value);
+				break;
 			case "completion":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Mapping.CompletionProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Mapping.CompletionProperty)value);
+				break;
 			case "constant_keyword":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Mapping.ConstantKeywordProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Mapping.ConstantKeywordProperty)value);
+				break;
 			case "date_nanos":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Mapping.DateNanosProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Mapping.DateNanosProperty)value);
+				break;
 			case "date":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Mapping.DateProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Mapping.DateProperty)value);
+				break;
 			case "date_range":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Mapping.DateRangeProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Mapping.DateRangeProperty)value);
+				break;
 			case "dense_vector":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Mapping.DenseVectorProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Mapping.DenseVectorProperty)value);
+				break;
 			case "double":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Mapping.DoubleNumberProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Mapping.DoubleNumberProperty)value);
+				break;
 			case "double_range":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Mapping.DoubleRangeProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Mapping.DoubleRangeProperty)value);
+				break;
 			case "{dynamic_type}":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Mapping.DynamicProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Mapping.DynamicProperty)value);
+				break;
 			case "alias":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Mapping.FieldAliasProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Mapping.FieldAliasProperty)value);
+				break;
 			case "flattened":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Mapping.FlattenedProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Mapping.FlattenedProperty)value);
+				break;
 			case "float":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Mapping.FloatNumberProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Mapping.FloatNumberProperty)value);
+				break;
 			case "float_range":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Mapping.FloatRangeProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Mapping.FloatRangeProperty)value);
+				break;
 			case "geo_point":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Mapping.GeoPointProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Mapping.GeoPointProperty)value);
+				break;
 			case "geo_shape":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Mapping.GeoShapeProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Mapping.GeoShapeProperty)value);
+				break;
 			case "half_float":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Mapping.HalfFloatNumberProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Mapping.HalfFloatNumberProperty)value);
+				break;
 			case "histogram":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Mapping.HistogramProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Mapping.HistogramProperty)value);
+				break;
 			case "icu_collation_keyword":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Mapping.IcuCollationProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Mapping.IcuCollationProperty)value);
+				break;
 			case "integer":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Mapping.IntegerNumberProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Mapping.IntegerNumberProperty)value);
+				break;
 			case "integer_range":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Mapping.IntegerRangeProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Mapping.IntegerRangeProperty)value);
+				break;
 			case "ip":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Mapping.IpProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Mapping.IpProperty)value);
+				break;
 			case "ip_range":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Mapping.IpRangeProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Mapping.IpRangeProperty)value);
+				break;
 			case "join":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Mapping.JoinProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Mapping.JoinProperty)value);
+				break;
 			case "keyword":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Mapping.KeywordProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Mapping.KeywordProperty)value);
+				break;
 			case "long":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Mapping.LongNumberProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Mapping.LongNumberProperty)value);
+				break;
 			case "long_range":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Mapping.LongRangeProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Mapping.LongRangeProperty)value);
+				break;
 			case "match_only_text":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Mapping.MatchOnlyTextProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Mapping.MatchOnlyTextProperty)value);
+				break;
 			case "murmur3":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Mapping.Murmur3HashProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Mapping.Murmur3HashProperty)value);
+				break;
 			case "nested":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Mapping.NestedProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Mapping.NestedProperty)value);
+				break;
 			case "object":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Mapping.ObjectProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Mapping.ObjectProperty)value);
+				break;
 			case "passthrough":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Mapping.PassthroughObjectProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Mapping.PassthroughObjectProperty)value);
+				break;
 			case "percolator":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Mapping.PercolatorProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Mapping.PercolatorProperty)value);
+				break;
 			case "point":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Mapping.PointProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Mapping.PointProperty)value);
+				break;
 			case "rank_feature":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Mapping.RankFeatureProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Mapping.RankFeatureProperty)value);
+				break;
 			case "rank_features":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Mapping.RankFeaturesProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Mapping.RankFeaturesProperty)value);
+				break;
 			case "scaled_float":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Mapping.ScaledFloatNumberProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Mapping.ScaledFloatNumberProperty)value);
+				break;
 			case "search_as_you_type":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Mapping.SearchAsYouTypeProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Mapping.SearchAsYouTypeProperty)value);
+				break;
 			case "semantic_text":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Mapping.SemanticTextProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Mapping.SemanticTextProperty)value);
+				break;
 			case "shape":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Mapping.ShapeProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Mapping.ShapeProperty)value);
+				break;
 			case "short":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Mapping.ShortNumberProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Mapping.ShortNumberProperty)value);
+				break;
 			case "sparse_vector":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Mapping.SparseVectorProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Mapping.SparseVectorProperty)value);
+				break;
 			case "text":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Mapping.TextProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Mapping.TextProperty)value);
+				break;
 			case "token_count":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Mapping.TokenCountProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Mapping.TokenCountProperty)value);
+				break;
 			case "unsigned_long":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Mapping.UnsignedLongNumberProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Mapping.UnsignedLongNumberProperty)value);
+				break;
 			case "version":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Mapping.VersionProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Mapping.VersionProperty)value);
+				break;
 			case "wildcard":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Mapping.WildcardProperty), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Mapping.WildcardProperty)value);
+				break;
 			default:
-				var type = value.GetType();
-				JsonSerializer.Serialize(writer, value, type, options);
-				return;
+				throw new System.Text.Json.JsonException($"Variant '{value.Type}' is not supported for type '{nameof(IProperty)}'.");
 		}
 	}
 }
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/RuntimeFieldFetchFields.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/RuntimeFieldFetchFields.g.cs
index e541c98952f..9f3fa9acc62 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/RuntimeFieldFetchFields.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/RuntimeFieldFetchFields.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,11 +28,63 @@
 
 namespace Elastic.Clients.Elasticsearch.Mapping;
 
+internal sealed partial class RuntimeFieldFetchFieldsConverter : System.Text.Json.Serialization.JsonConverter<RuntimeFieldFetchFields>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropFormat = System.Text.Json.JsonEncodedText.Encode("format");
+
+	public override RuntimeFieldFetchFields Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		var readerSnapshot = reader;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Field> propField = default;
+		LocalJsonProperty<string?> propFormat = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propField.TryRead(ref reader, options, PropField))
+			{
+				continue;
+			}
+
+			if (propFormat.TryRead(ref reader, options, PropFormat))
+			{
+				continue;
+			}
+
+			try
+			{
+				reader = readerSnapshot;
+				var result = reader.ReadValue<Elastic.Clients.Elasticsearch.Field>(options);
+				return new RuntimeFieldFetchFields { Field = result };
+			}
+			catch (System.Text.Json.JsonException)
+			{
+				throw;
+			}
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new RuntimeFieldFetchFields
+		{
+			Field = propField.Value
+,
+			Format = propFormat.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, RuntimeFieldFetchFields value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropField, value.Field);
+		writer.WriteProperty(options, PropFormat, value.Format);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(RuntimeFieldFetchFieldsConverter))]
 public sealed partial class RuntimeFieldFetchFields
 {
-	[JsonInclude, JsonPropertyName("field")]
 	public Elastic.Clients.Elasticsearch.Field Field { get; set; }
-	[JsonInclude, JsonPropertyName("format")]
 	public string? Format { get; set; }
 }
 
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 af85a307d39..eb483b32b56 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/ScaledFloatNumberProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/ScaledFloatNumberProperty.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,26 +28,228 @@
 
 namespace Elastic.Clients.Elasticsearch.Mapping;
 
+internal sealed partial class ScaledFloatNumberPropertyConverter : System.Text.Json.Serialization.JsonConverter<ScaledFloatNumberProperty>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropCoerce = System.Text.Json.JsonEncodedText.Encode("coerce");
+	private static readonly System.Text.Json.JsonEncodedText PropCopyTo = System.Text.Json.JsonEncodedText.Encode("copy_to");
+	private static readonly System.Text.Json.JsonEncodedText PropDocValues = System.Text.Json.JsonEncodedText.Encode("doc_values");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamic = System.Text.Json.JsonEncodedText.Encode("dynamic");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreAbove = System.Text.Json.JsonEncodedText.Encode("ignore_above");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreMalformed = System.Text.Json.JsonEncodedText.Encode("ignore_malformed");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropNullValue = System.Text.Json.JsonEncodedText.Encode("null_value");
+	private static readonly System.Text.Json.JsonEncodedText PropOnScriptError = System.Text.Json.JsonEncodedText.Encode("on_script_error");
+	private static readonly System.Text.Json.JsonEncodedText PropProperties = System.Text.Json.JsonEncodedText.Encode("properties");
+	private static readonly System.Text.Json.JsonEncodedText PropScalingFactor = System.Text.Json.JsonEncodedText.Encode("scaling_factor");
+	private static readonly System.Text.Json.JsonEncodedText PropScript = System.Text.Json.JsonEncodedText.Encode("script");
+	private static readonly System.Text.Json.JsonEncodedText PropStore = System.Text.Json.JsonEncodedText.Encode("store");
+	private static readonly System.Text.Json.JsonEncodedText PropTimeSeriesDimension = System.Text.Json.JsonEncodedText.Encode("time_series_dimension");
+	private static readonly System.Text.Json.JsonEncodedText PropTimeSeriesMetric = System.Text.Json.JsonEncodedText.Encode("time_series_metric");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override ScaledFloatNumberProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<double?> propBoost = default;
+		LocalJsonProperty<bool?> propCoerce = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Fields?> propCopyTo = default;
+		LocalJsonProperty<bool?> propDocValues = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.DynamicMapping?> propDynamic = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.Properties?> propFields = default;
+		LocalJsonProperty<int?> propIgnoreAbove = default;
+		LocalJsonProperty<bool?> propIgnoreMalformed = default;
+		LocalJsonProperty<bool?> propIndex = default;
+		LocalJsonProperty<IDictionary<string, string>?> propMeta = default;
+		LocalJsonProperty<double?> propNullValue = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.OnScriptError?> propOnScriptError = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.Properties?> propProperties = default;
+		LocalJsonProperty<double?> propScalingFactor = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Script?> propScript = default;
+		LocalJsonProperty<bool?> propStore = default;
+		LocalJsonProperty<bool?> propTimeSeriesDimension = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.TimeSeriesMetricType?> propTimeSeriesMetric = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
+
+			if (propCoerce.TryRead(ref reader, options, PropCoerce))
+			{
+				continue;
+			}
+
+			if (propCopyTo.TryRead(ref reader, options, PropCopyTo, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propDocValues.TryRead(ref reader, options, PropDocValues))
+			{
+				continue;
+			}
+
+			if (propDynamic.TryRead(ref reader, options, PropDynamic))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propIgnoreAbove.TryRead(ref reader, options, PropIgnoreAbove))
+			{
+				continue;
+			}
+
+			if (propIgnoreMalformed.TryRead(ref reader, options, PropIgnoreMalformed))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propNullValue.TryRead(ref reader, options, PropNullValue))
+			{
+				continue;
+			}
+
+			if (propOnScriptError.TryRead(ref reader, options, PropOnScriptError))
+			{
+				continue;
+			}
+
+			if (propProperties.TryRead(ref reader, options, PropProperties))
+			{
+				continue;
+			}
+
+			if (propScalingFactor.TryRead(ref reader, options, PropScalingFactor))
+			{
+				continue;
+			}
+
+			if (propScript.TryRead(ref reader, options, PropScript))
+			{
+				continue;
+			}
+
+			if (propStore.TryRead(ref reader, options, PropStore))
+			{
+				continue;
+			}
+
+			if (propTimeSeriesDimension.TryRead(ref reader, options, PropTimeSeriesDimension))
+			{
+				continue;
+			}
+
+			if (propTimeSeriesMetric.TryRead(ref reader, options, PropTimeSeriesMetric))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ScaledFloatNumberProperty
+		{
+			Boost = propBoost.Value
+,
+			Coerce = propCoerce.Value
+,
+			CopyTo = propCopyTo.Value
+,
+			DocValues = propDocValues.Value
+,
+			Dynamic = propDynamic.Value
+,
+			Fields = propFields.Value
+,
+			IgnoreAbove = propIgnoreAbove.Value
+,
+			IgnoreMalformed = propIgnoreMalformed.Value
+,
+			Index = propIndex.Value
+,
+			Meta = propMeta.Value
+,
+			NullValue = propNullValue.Value
+,
+			OnScriptError = propOnScriptError.Value
+,
+			Properties = propProperties.Value
+,
+			ScalingFactor = propScalingFactor.Value
+,
+			Script = propScript.Value
+,
+			Store = propStore.Value
+,
+			TimeSeriesDimension = propTimeSeriesDimension.Value
+,
+			TimeSeriesMetric = propTimeSeriesMetric.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ScaledFloatNumberProperty value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropCoerce, value.Coerce);
+		writer.WriteProperty(options, PropCopyTo, value.CopyTo, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropDocValues, value.DocValues);
+		writer.WriteProperty(options, PropDynamic, value.Dynamic);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropIgnoreAbove, value.IgnoreAbove);
+		writer.WriteProperty(options, PropIgnoreMalformed, value.IgnoreMalformed);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropNullValue, value.NullValue);
+		writer.WriteProperty(options, PropOnScriptError, value.OnScriptError);
+		writer.WriteProperty(options, PropProperties, value.Properties);
+		writer.WriteProperty(options, PropScalingFactor, value.ScalingFactor);
+		writer.WriteProperty(options, PropScript, value.Script);
+		writer.WriteProperty(options, PropStore, value.Store);
+		writer.WriteProperty(options, PropTimeSeriesDimension, value.TimeSeriesDimension);
+		writer.WriteProperty(options, PropTimeSeriesMetric, value.TimeSeriesMetric);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ScaledFloatNumberPropertyConverter))]
 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")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	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; }
 
 	/// <summary>
@@ -54,19 +257,12 @@ public sealed partial class ScaledFloatNumberProperty : IProperty
 	/// Metadata about the field.
 	/// </para>
 	/// </summary>
-	[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("store")]
 	public bool? Store { get; set; }
 
 	/// <summary>
@@ -74,7 +270,6 @@ public sealed partial class ScaledFloatNumberProperty : IProperty
 	/// 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; }
 
 	/// <summary>
@@ -82,10 +277,8 @@ public sealed partial class ScaledFloatNumberProperty : IProperty
 	/// For internal use by Elastic only. Marks the field as a time series dimension. Defaults to false.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("time_series_metric")]
 	public Elastic.Clients.Elasticsearch.Mapping.TimeSeriesMetricType? TimeSeriesMetric { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "scaled_float";
 }
 
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 01869286d25..e23741ab68e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/SearchAsYouTypeProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/SearchAsYouTypeProperty.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,24 +28,207 @@
 
 namespace Elastic.Clients.Elasticsearch.Mapping;
 
+internal sealed partial class SearchAsYouTypePropertyConverter : System.Text.Json.Serialization.JsonConverter<SearchAsYouTypeProperty>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAnalyzer = System.Text.Json.JsonEncodedText.Encode("analyzer");
+	private static readonly System.Text.Json.JsonEncodedText PropCopyTo = System.Text.Json.JsonEncodedText.Encode("copy_to");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamic = System.Text.Json.JsonEncodedText.Encode("dynamic");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreAbove = System.Text.Json.JsonEncodedText.Encode("ignore_above");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropIndexOptions = System.Text.Json.JsonEncodedText.Encode("index_options");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxShingleSize = System.Text.Json.JsonEncodedText.Encode("max_shingle_size");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropNorms = System.Text.Json.JsonEncodedText.Encode("norms");
+	private static readonly System.Text.Json.JsonEncodedText PropProperties = System.Text.Json.JsonEncodedText.Encode("properties");
+	private static readonly System.Text.Json.JsonEncodedText PropSearchAnalyzer = System.Text.Json.JsonEncodedText.Encode("search_analyzer");
+	private static readonly System.Text.Json.JsonEncodedText PropSearchQuoteAnalyzer = System.Text.Json.JsonEncodedText.Encode("search_quote_analyzer");
+	private static readonly System.Text.Json.JsonEncodedText PropSimilarity = System.Text.Json.JsonEncodedText.Encode("similarity");
+	private static readonly System.Text.Json.JsonEncodedText PropStore = System.Text.Json.JsonEncodedText.Encode("store");
+	private static readonly System.Text.Json.JsonEncodedText PropTermVector = System.Text.Json.JsonEncodedText.Encode("term_vector");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override SearchAsYouTypeProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string?> propAnalyzer = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Fields?> propCopyTo = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.DynamicMapping?> propDynamic = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.Properties?> propFields = default;
+		LocalJsonProperty<int?> propIgnoreAbove = default;
+		LocalJsonProperty<bool?> propIndex = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.IndexOptions?> propIndexOptions = default;
+		LocalJsonProperty<int?> propMaxShingleSize = default;
+		LocalJsonProperty<IDictionary<string, string>?> propMeta = default;
+		LocalJsonProperty<bool?> propNorms = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.Properties?> propProperties = default;
+		LocalJsonProperty<string?> propSearchAnalyzer = default;
+		LocalJsonProperty<string?> propSearchQuoteAnalyzer = default;
+		LocalJsonProperty<string?> propSimilarity = default;
+		LocalJsonProperty<bool?> propStore = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.TermVectorOption?> propTermVector = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAnalyzer.TryRead(ref reader, options, PropAnalyzer))
+			{
+				continue;
+			}
+
+			if (propCopyTo.TryRead(ref reader, options, PropCopyTo, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propDynamic.TryRead(ref reader, options, PropDynamic))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propIgnoreAbove.TryRead(ref reader, options, PropIgnoreAbove))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propIndexOptions.TryRead(ref reader, options, PropIndexOptions))
+			{
+				continue;
+			}
+
+			if (propMaxShingleSize.TryRead(ref reader, options, PropMaxShingleSize))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propNorms.TryRead(ref reader, options, PropNorms))
+			{
+				continue;
+			}
+
+			if (propProperties.TryRead(ref reader, options, PropProperties))
+			{
+				continue;
+			}
+
+			if (propSearchAnalyzer.TryRead(ref reader, options, PropSearchAnalyzer))
+			{
+				continue;
+			}
+
+			if (propSearchQuoteAnalyzer.TryRead(ref reader, options, PropSearchQuoteAnalyzer))
+			{
+				continue;
+			}
+
+			if (propSimilarity.TryRead(ref reader, options, PropSimilarity))
+			{
+				continue;
+			}
+
+			if (propStore.TryRead(ref reader, options, PropStore))
+			{
+				continue;
+			}
+
+			if (propTermVector.TryRead(ref reader, options, PropTermVector))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SearchAsYouTypeProperty
+		{
+			Analyzer = propAnalyzer.Value
+,
+			CopyTo = propCopyTo.Value
+,
+			Dynamic = propDynamic.Value
+,
+			Fields = propFields.Value
+,
+			IgnoreAbove = propIgnoreAbove.Value
+,
+			Index = propIndex.Value
+,
+			IndexOptions = propIndexOptions.Value
+,
+			MaxShingleSize = propMaxShingleSize.Value
+,
+			Meta = propMeta.Value
+,
+			Norms = propNorms.Value
+,
+			Properties = propProperties.Value
+,
+			SearchAnalyzer = propSearchAnalyzer.Value
+,
+			SearchQuoteAnalyzer = propSearchQuoteAnalyzer.Value
+,
+			Similarity = propSimilarity.Value
+,
+			Store = propStore.Value
+,
+			TermVector = propTermVector.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SearchAsYouTypeProperty value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAnalyzer, value.Analyzer);
+		writer.WriteProperty(options, PropCopyTo, value.CopyTo, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropDynamic, value.Dynamic);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropIgnoreAbove, value.IgnoreAbove);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropIndexOptions, value.IndexOptions);
+		writer.WriteProperty(options, PropMaxShingleSize, value.MaxShingleSize);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropNorms, value.Norms);
+		writer.WriteProperty(options, PropProperties, value.Properties);
+		writer.WriteProperty(options, PropSearchAnalyzer, value.SearchAnalyzer);
+		writer.WriteProperty(options, PropSearchQuoteAnalyzer, value.SearchQuoteAnalyzer);
+		writer.WriteProperty(options, PropSimilarity, value.Similarity);
+		writer.WriteProperty(options, PropStore, value.Store);
+		writer.WriteProperty(options, PropTermVector, value.TermVector);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(SearchAsYouTypePropertyConverter))]
 public sealed partial class SearchAsYouTypeProperty : IProperty
 {
-	[JsonInclude, JsonPropertyName("analyzer")]
 	public string? Analyzer { get; set; }
-	[JsonInclude, JsonPropertyName("copy_to")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	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; }
 
 	/// <summary>
@@ -52,24 +236,15 @@ public sealed partial class SearchAsYouTypeProperty : IProperty
 	/// Metadata about the field.
 	/// </para>
 	/// </summary>
-	[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")]
 	public string Type => "search_as_you_type";
 }
 
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 746ae77f100..396bb9dd07a 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/ShapeProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/ShapeProperty.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,157 @@
 
 namespace Elastic.Clients.Elasticsearch.Mapping;
 
+internal sealed partial class ShapePropertyConverter : System.Text.Json.Serialization.JsonConverter<ShapeProperty>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCoerce = System.Text.Json.JsonEncodedText.Encode("coerce");
+	private static readonly System.Text.Json.JsonEncodedText PropCopyTo = System.Text.Json.JsonEncodedText.Encode("copy_to");
+	private static readonly System.Text.Json.JsonEncodedText PropDocValues = System.Text.Json.JsonEncodedText.Encode("doc_values");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamic = System.Text.Json.JsonEncodedText.Encode("dynamic");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreAbove = System.Text.Json.JsonEncodedText.Encode("ignore_above");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreMalformed = System.Text.Json.JsonEncodedText.Encode("ignore_malformed");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreZValue = System.Text.Json.JsonEncodedText.Encode("ignore_z_value");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropOrientation = System.Text.Json.JsonEncodedText.Encode("orientation");
+	private static readonly System.Text.Json.JsonEncodedText PropProperties = System.Text.Json.JsonEncodedText.Encode("properties");
+	private static readonly System.Text.Json.JsonEncodedText PropStore = System.Text.Json.JsonEncodedText.Encode("store");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override ShapeProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool?> propCoerce = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Fields?> propCopyTo = default;
+		LocalJsonProperty<bool?> propDocValues = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.DynamicMapping?> propDynamic = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.Properties?> propFields = default;
+		LocalJsonProperty<int?> propIgnoreAbove = default;
+		LocalJsonProperty<bool?> propIgnoreMalformed = default;
+		LocalJsonProperty<bool?> propIgnoreZValue = default;
+		LocalJsonProperty<IDictionary<string, string>?> propMeta = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.GeoOrientation?> propOrientation = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.Properties?> propProperties = default;
+		LocalJsonProperty<bool?> propStore = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCoerce.TryRead(ref reader, options, PropCoerce))
+			{
+				continue;
+			}
+
+			if (propCopyTo.TryRead(ref reader, options, PropCopyTo, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propDocValues.TryRead(ref reader, options, PropDocValues))
+			{
+				continue;
+			}
+
+			if (propDynamic.TryRead(ref reader, options, PropDynamic))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propIgnoreAbove.TryRead(ref reader, options, PropIgnoreAbove))
+			{
+				continue;
+			}
+
+			if (propIgnoreMalformed.TryRead(ref reader, options, PropIgnoreMalformed))
+			{
+				continue;
+			}
+
+			if (propIgnoreZValue.TryRead(ref reader, options, PropIgnoreZValue))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propOrientation.TryRead(ref reader, options, PropOrientation))
+			{
+				continue;
+			}
+
+			if (propProperties.TryRead(ref reader, options, PropProperties))
+			{
+				continue;
+			}
+
+			if (propStore.TryRead(ref reader, options, PropStore))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ShapeProperty
+		{
+			Coerce = propCoerce.Value
+,
+			CopyTo = propCopyTo.Value
+,
+			DocValues = propDocValues.Value
+,
+			Dynamic = propDynamic.Value
+,
+			Fields = propFields.Value
+,
+			IgnoreAbove = propIgnoreAbove.Value
+,
+			IgnoreMalformed = propIgnoreMalformed.Value
+,
+			IgnoreZValue = propIgnoreZValue.Value
+,
+			Meta = propMeta.Value
+,
+			Orientation = propOrientation.Value
+,
+			Properties = propProperties.Value
+,
+			Store = propStore.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ShapeProperty value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCoerce, value.Coerce);
+		writer.WriteProperty(options, PropCopyTo, value.CopyTo, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropDocValues, value.DocValues);
+		writer.WriteProperty(options, PropDynamic, value.Dynamic);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropIgnoreAbove, value.IgnoreAbove);
+		writer.WriteProperty(options, PropIgnoreMalformed, value.IgnoreMalformed);
+		writer.WriteProperty(options, PropIgnoreZValue, value.IgnoreZValue);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropOrientation, value.Orientation);
+		writer.WriteProperty(options, PropProperties, value.Properties);
+		writer.WriteProperty(options, PropStore, value.Store);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
 /// <summary>
 /// <para>
 /// The <c>shape</c> data type facilitates the indexing of and searching with arbitrary <c>x, y</c> cartesian shapes such as
@@ -34,24 +186,16 @@ namespace Elastic.Clients.Elasticsearch.Mapping;
 /// </para>
 /// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/8.17/shape.html">Learn more about this API in the Elasticsearch documentation.</see></para>
 /// </summary>
+[JsonConverter(typeof(ShapePropertyConverter))]
 public sealed partial class ShapeProperty : IProperty
 {
-	[JsonInclude, JsonPropertyName("coerce")]
 	public bool? Coerce { get; set; }
-	[JsonInclude, JsonPropertyName("copy_to")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	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; }
 
 	/// <summary>
@@ -59,16 +203,11 @@ public sealed partial class ShapeProperty : IProperty
 	/// Metadata about the field.
 	/// </para>
 	/// </summary>
-	[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("store")]
 	public bool? Store { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "shape";
 }
 
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 828c1519a6d..76fc138d938 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/ShortNumberProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/ShortNumberProperty.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,26 +28,218 @@
 
 namespace Elastic.Clients.Elasticsearch.Mapping;
 
+internal sealed partial class ShortNumberPropertyConverter : System.Text.Json.Serialization.JsonConverter<ShortNumberProperty>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropCoerce = System.Text.Json.JsonEncodedText.Encode("coerce");
+	private static readonly System.Text.Json.JsonEncodedText PropCopyTo = System.Text.Json.JsonEncodedText.Encode("copy_to");
+	private static readonly System.Text.Json.JsonEncodedText PropDocValues = System.Text.Json.JsonEncodedText.Encode("doc_values");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamic = System.Text.Json.JsonEncodedText.Encode("dynamic");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreAbove = System.Text.Json.JsonEncodedText.Encode("ignore_above");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreMalformed = System.Text.Json.JsonEncodedText.Encode("ignore_malformed");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropNullValue = System.Text.Json.JsonEncodedText.Encode("null_value");
+	private static readonly System.Text.Json.JsonEncodedText PropOnScriptError = System.Text.Json.JsonEncodedText.Encode("on_script_error");
+	private static readonly System.Text.Json.JsonEncodedText PropProperties = System.Text.Json.JsonEncodedText.Encode("properties");
+	private static readonly System.Text.Json.JsonEncodedText PropScript = System.Text.Json.JsonEncodedText.Encode("script");
+	private static readonly System.Text.Json.JsonEncodedText PropStore = System.Text.Json.JsonEncodedText.Encode("store");
+	private static readonly System.Text.Json.JsonEncodedText PropTimeSeriesDimension = System.Text.Json.JsonEncodedText.Encode("time_series_dimension");
+	private static readonly System.Text.Json.JsonEncodedText PropTimeSeriesMetric = System.Text.Json.JsonEncodedText.Encode("time_series_metric");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override ShortNumberProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<double?> propBoost = default;
+		LocalJsonProperty<bool?> propCoerce = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Fields?> propCopyTo = default;
+		LocalJsonProperty<bool?> propDocValues = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.DynamicMapping?> propDynamic = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.Properties?> propFields = default;
+		LocalJsonProperty<int?> propIgnoreAbove = default;
+		LocalJsonProperty<bool?> propIgnoreMalformed = default;
+		LocalJsonProperty<bool?> propIndex = default;
+		LocalJsonProperty<IDictionary<string, string>?> propMeta = default;
+		LocalJsonProperty<short?> propNullValue = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.OnScriptError?> propOnScriptError = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.Properties?> propProperties = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Script?> propScript = default;
+		LocalJsonProperty<bool?> propStore = default;
+		LocalJsonProperty<bool?> propTimeSeriesDimension = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.TimeSeriesMetricType?> propTimeSeriesMetric = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
+
+			if (propCoerce.TryRead(ref reader, options, PropCoerce))
+			{
+				continue;
+			}
+
+			if (propCopyTo.TryRead(ref reader, options, PropCopyTo, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propDocValues.TryRead(ref reader, options, PropDocValues))
+			{
+				continue;
+			}
+
+			if (propDynamic.TryRead(ref reader, options, PropDynamic))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propIgnoreAbove.TryRead(ref reader, options, PropIgnoreAbove))
+			{
+				continue;
+			}
+
+			if (propIgnoreMalformed.TryRead(ref reader, options, PropIgnoreMalformed))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propNullValue.TryRead(ref reader, options, PropNullValue))
+			{
+				continue;
+			}
+
+			if (propOnScriptError.TryRead(ref reader, options, PropOnScriptError))
+			{
+				continue;
+			}
+
+			if (propProperties.TryRead(ref reader, options, PropProperties))
+			{
+				continue;
+			}
+
+			if (propScript.TryRead(ref reader, options, PropScript))
+			{
+				continue;
+			}
+
+			if (propStore.TryRead(ref reader, options, PropStore))
+			{
+				continue;
+			}
+
+			if (propTimeSeriesDimension.TryRead(ref reader, options, PropTimeSeriesDimension))
+			{
+				continue;
+			}
+
+			if (propTimeSeriesMetric.TryRead(ref reader, options, PropTimeSeriesMetric))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ShortNumberProperty
+		{
+			Boost = propBoost.Value
+,
+			Coerce = propCoerce.Value
+,
+			CopyTo = propCopyTo.Value
+,
+			DocValues = propDocValues.Value
+,
+			Dynamic = propDynamic.Value
+,
+			Fields = propFields.Value
+,
+			IgnoreAbove = propIgnoreAbove.Value
+,
+			IgnoreMalformed = propIgnoreMalformed.Value
+,
+			Index = propIndex.Value
+,
+			Meta = propMeta.Value
+,
+			NullValue = propNullValue.Value
+,
+			OnScriptError = propOnScriptError.Value
+,
+			Properties = propProperties.Value
+,
+			Script = propScript.Value
+,
+			Store = propStore.Value
+,
+			TimeSeriesDimension = propTimeSeriesDimension.Value
+,
+			TimeSeriesMetric = propTimeSeriesMetric.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ShortNumberProperty value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropCoerce, value.Coerce);
+		writer.WriteProperty(options, PropCopyTo, value.CopyTo, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropDocValues, value.DocValues);
+		writer.WriteProperty(options, PropDynamic, value.Dynamic);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropIgnoreAbove, value.IgnoreAbove);
+		writer.WriteProperty(options, PropIgnoreMalformed, value.IgnoreMalformed);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropNullValue, value.NullValue);
+		writer.WriteProperty(options, PropOnScriptError, value.OnScriptError);
+		writer.WriteProperty(options, PropProperties, value.Properties);
+		writer.WriteProperty(options, PropScript, value.Script);
+		writer.WriteProperty(options, PropStore, value.Store);
+		writer.WriteProperty(options, PropTimeSeriesDimension, value.TimeSeriesDimension);
+		writer.WriteProperty(options, PropTimeSeriesMetric, value.TimeSeriesMetric);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ShortNumberPropertyConverter))]
 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")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	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; }
 
 	/// <summary>
@@ -54,17 +247,11 @@ public sealed partial class ShortNumberProperty : IProperty
 	/// Metadata about the field.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-	[JsonInclude, JsonPropertyName("null_value")]
 	public short? 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("store")]
 	public bool? Store { get; set; }
 
 	/// <summary>
@@ -72,7 +259,6 @@ public sealed partial class ShortNumberProperty : IProperty
 	/// 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; }
 
 	/// <summary>
@@ -80,10 +266,8 @@ public sealed partial class ShortNumberProperty : IProperty
 	/// For internal use by Elastic only. Marks the field as a time series dimension. Defaults to false.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("time_series_metric")]
 	public Elastic.Clients.Elasticsearch.Mapping.TimeSeriesMetricType? TimeSeriesMetric { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "short";
 }
 
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 507e09126cc..ac59d4d7c49 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/TextProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/TextProperty.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,34 +28,272 @@
 
 namespace Elastic.Clients.Elasticsearch.Mapping;
 
+internal sealed partial class TextPropertyConverter : System.Text.Json.Serialization.JsonConverter<TextProperty>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAnalyzer = System.Text.Json.JsonEncodedText.Encode("analyzer");
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropCopyTo = System.Text.Json.JsonEncodedText.Encode("copy_to");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamic = System.Text.Json.JsonEncodedText.Encode("dynamic");
+	private static readonly System.Text.Json.JsonEncodedText PropEagerGlobalOrdinals = System.Text.Json.JsonEncodedText.Encode("eager_global_ordinals");
+	private static readonly System.Text.Json.JsonEncodedText PropFielddata = System.Text.Json.JsonEncodedText.Encode("fielddata");
+	private static readonly System.Text.Json.JsonEncodedText PropFielddataFrequencyFilter = System.Text.Json.JsonEncodedText.Encode("fielddata_frequency_filter");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreAbove = System.Text.Json.JsonEncodedText.Encode("ignore_above");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropIndexOptions = System.Text.Json.JsonEncodedText.Encode("index_options");
+	private static readonly System.Text.Json.JsonEncodedText PropIndexPhrases = System.Text.Json.JsonEncodedText.Encode("index_phrases");
+	private static readonly System.Text.Json.JsonEncodedText PropIndexPrefixes = System.Text.Json.JsonEncodedText.Encode("index_prefixes");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropNorms = System.Text.Json.JsonEncodedText.Encode("norms");
+	private static readonly System.Text.Json.JsonEncodedText PropPositionIncrementGap = System.Text.Json.JsonEncodedText.Encode("position_increment_gap");
+	private static readonly System.Text.Json.JsonEncodedText PropProperties = System.Text.Json.JsonEncodedText.Encode("properties");
+	private static readonly System.Text.Json.JsonEncodedText PropSearchAnalyzer = System.Text.Json.JsonEncodedText.Encode("search_analyzer");
+	private static readonly System.Text.Json.JsonEncodedText PropSearchQuoteAnalyzer = System.Text.Json.JsonEncodedText.Encode("search_quote_analyzer");
+	private static readonly System.Text.Json.JsonEncodedText PropSimilarity = System.Text.Json.JsonEncodedText.Encode("similarity");
+	private static readonly System.Text.Json.JsonEncodedText PropStore = System.Text.Json.JsonEncodedText.Encode("store");
+	private static readonly System.Text.Json.JsonEncodedText PropTermVector = System.Text.Json.JsonEncodedText.Encode("term_vector");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override TextProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string?> propAnalyzer = default;
+		LocalJsonProperty<double?> propBoost = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Fields?> propCopyTo = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.DynamicMapping?> propDynamic = default;
+		LocalJsonProperty<bool?> propEagerGlobalOrdinals = default;
+		LocalJsonProperty<bool?> propFielddata = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.IndexManagement.FielddataFrequencyFilter?> propFielddataFrequencyFilter = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.Properties?> propFields = default;
+		LocalJsonProperty<int?> propIgnoreAbove = default;
+		LocalJsonProperty<bool?> propIndex = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.IndexOptions?> propIndexOptions = default;
+		LocalJsonProperty<bool?> propIndexPhrases = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.TextIndexPrefixes?> propIndexPrefixes = default;
+		LocalJsonProperty<IDictionary<string, string>?> propMeta = default;
+		LocalJsonProperty<bool?> propNorms = default;
+		LocalJsonProperty<int?> propPositionIncrementGap = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.Properties?> propProperties = default;
+		LocalJsonProperty<string?> propSearchAnalyzer = default;
+		LocalJsonProperty<string?> propSearchQuoteAnalyzer = default;
+		LocalJsonProperty<string?> propSimilarity = default;
+		LocalJsonProperty<bool?> propStore = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.TermVectorOption?> propTermVector = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAnalyzer.TryRead(ref reader, options, PropAnalyzer))
+			{
+				continue;
+			}
+
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
+
+			if (propCopyTo.TryRead(ref reader, options, PropCopyTo, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propDynamic.TryRead(ref reader, options, PropDynamic))
+			{
+				continue;
+			}
+
+			if (propEagerGlobalOrdinals.TryRead(ref reader, options, PropEagerGlobalOrdinals))
+			{
+				continue;
+			}
+
+			if (propFielddata.TryRead(ref reader, options, PropFielddata))
+			{
+				continue;
+			}
+
+			if (propFielddataFrequencyFilter.TryRead(ref reader, options, PropFielddataFrequencyFilter))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propIgnoreAbove.TryRead(ref reader, options, PropIgnoreAbove))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propIndexOptions.TryRead(ref reader, options, PropIndexOptions))
+			{
+				continue;
+			}
+
+			if (propIndexPhrases.TryRead(ref reader, options, PropIndexPhrases))
+			{
+				continue;
+			}
+
+			if (propIndexPrefixes.TryRead(ref reader, options, PropIndexPrefixes))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propNorms.TryRead(ref reader, options, PropNorms))
+			{
+				continue;
+			}
+
+			if (propPositionIncrementGap.TryRead(ref reader, options, PropPositionIncrementGap))
+			{
+				continue;
+			}
+
+			if (propProperties.TryRead(ref reader, options, PropProperties))
+			{
+				continue;
+			}
+
+			if (propSearchAnalyzer.TryRead(ref reader, options, PropSearchAnalyzer))
+			{
+				continue;
+			}
+
+			if (propSearchQuoteAnalyzer.TryRead(ref reader, options, PropSearchQuoteAnalyzer))
+			{
+				continue;
+			}
+
+			if (propSimilarity.TryRead(ref reader, options, PropSimilarity))
+			{
+				continue;
+			}
+
+			if (propStore.TryRead(ref reader, options, PropStore))
+			{
+				continue;
+			}
+
+			if (propTermVector.TryRead(ref reader, options, PropTermVector))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new TextProperty
+		{
+			Analyzer = propAnalyzer.Value
+,
+			Boost = propBoost.Value
+,
+			CopyTo = propCopyTo.Value
+,
+			Dynamic = propDynamic.Value
+,
+			EagerGlobalOrdinals = propEagerGlobalOrdinals.Value
+,
+			Fielddata = propFielddata.Value
+,
+			FielddataFrequencyFilter = propFielddataFrequencyFilter.Value
+,
+			Fields = propFields.Value
+,
+			IgnoreAbove = propIgnoreAbove.Value
+,
+			Index = propIndex.Value
+,
+			IndexOptions = propIndexOptions.Value
+,
+			IndexPhrases = propIndexPhrases.Value
+,
+			IndexPrefixes = propIndexPrefixes.Value
+,
+			Meta = propMeta.Value
+,
+			Norms = propNorms.Value
+,
+			PositionIncrementGap = propPositionIncrementGap.Value
+,
+			Properties = propProperties.Value
+,
+			SearchAnalyzer = propSearchAnalyzer.Value
+,
+			SearchQuoteAnalyzer = propSearchQuoteAnalyzer.Value
+,
+			Similarity = propSimilarity.Value
+,
+			Store = propStore.Value
+,
+			TermVector = propTermVector.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, TextProperty value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAnalyzer, value.Analyzer);
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropCopyTo, value.CopyTo, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropDynamic, value.Dynamic);
+		writer.WriteProperty(options, PropEagerGlobalOrdinals, value.EagerGlobalOrdinals);
+		writer.WriteProperty(options, PropFielddata, value.Fielddata);
+		writer.WriteProperty(options, PropFielddataFrequencyFilter, value.FielddataFrequencyFilter);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropIgnoreAbove, value.IgnoreAbove);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropIndexOptions, value.IndexOptions);
+		writer.WriteProperty(options, PropIndexPhrases, value.IndexPhrases);
+		writer.WriteProperty(options, PropIndexPrefixes, value.IndexPrefixes);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropNorms, value.Norms);
+		writer.WriteProperty(options, PropPositionIncrementGap, value.PositionIncrementGap);
+		writer.WriteProperty(options, PropProperties, value.Properties);
+		writer.WriteProperty(options, PropSearchAnalyzer, value.SearchAnalyzer);
+		writer.WriteProperty(options, PropSearchQuoteAnalyzer, value.SearchQuoteAnalyzer);
+		writer.WriteProperty(options, PropSimilarity, value.Similarity);
+		writer.WriteProperty(options, PropStore, value.Store);
+		writer.WriteProperty(options, PropTermVector, value.TermVector);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(TextPropertyConverter))]
 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")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	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; }
 
 	/// <summary>
@@ -62,26 +301,16 @@ public sealed partial class TextProperty : IProperty
 	/// Metadata about the field.
 	/// </para>
 	/// </summary>
-	[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")]
 	public string Type => "text";
 }
 
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 6a9e2302b3e..163bab249dd 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/TokenCountProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/TokenCountProperty.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,26 +28,178 @@
 
 namespace Elastic.Clients.Elasticsearch.Mapping;
 
+internal sealed partial class TokenCountPropertyConverter : System.Text.Json.Serialization.JsonConverter<TokenCountProperty>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAnalyzer = System.Text.Json.JsonEncodedText.Encode("analyzer");
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropCopyTo = System.Text.Json.JsonEncodedText.Encode("copy_to");
+	private static readonly System.Text.Json.JsonEncodedText PropDocValues = System.Text.Json.JsonEncodedText.Encode("doc_values");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamic = System.Text.Json.JsonEncodedText.Encode("dynamic");
+	private static readonly System.Text.Json.JsonEncodedText PropEnablePositionIncrements = System.Text.Json.JsonEncodedText.Encode("enable_position_increments");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreAbove = System.Text.Json.JsonEncodedText.Encode("ignore_above");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropNullValue = System.Text.Json.JsonEncodedText.Encode("null_value");
+	private static readonly System.Text.Json.JsonEncodedText PropProperties = System.Text.Json.JsonEncodedText.Encode("properties");
+	private static readonly System.Text.Json.JsonEncodedText PropStore = System.Text.Json.JsonEncodedText.Encode("store");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override TokenCountProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string?> propAnalyzer = default;
+		LocalJsonProperty<double?> propBoost = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Fields?> propCopyTo = default;
+		LocalJsonProperty<bool?> propDocValues = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.DynamicMapping?> propDynamic = default;
+		LocalJsonProperty<bool?> propEnablePositionIncrements = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.Properties?> propFields = default;
+		LocalJsonProperty<int?> propIgnoreAbove = default;
+		LocalJsonProperty<bool?> propIndex = default;
+		LocalJsonProperty<IDictionary<string, string>?> propMeta = default;
+		LocalJsonProperty<double?> propNullValue = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.Properties?> propProperties = default;
+		LocalJsonProperty<bool?> propStore = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAnalyzer.TryRead(ref reader, options, PropAnalyzer))
+			{
+				continue;
+			}
+
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
+
+			if (propCopyTo.TryRead(ref reader, options, PropCopyTo, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propDocValues.TryRead(ref reader, options, PropDocValues))
+			{
+				continue;
+			}
+
+			if (propDynamic.TryRead(ref reader, options, PropDynamic))
+			{
+				continue;
+			}
+
+			if (propEnablePositionIncrements.TryRead(ref reader, options, PropEnablePositionIncrements))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propIgnoreAbove.TryRead(ref reader, options, PropIgnoreAbove))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propNullValue.TryRead(ref reader, options, PropNullValue))
+			{
+				continue;
+			}
+
+			if (propProperties.TryRead(ref reader, options, PropProperties))
+			{
+				continue;
+			}
+
+			if (propStore.TryRead(ref reader, options, PropStore))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new TokenCountProperty
+		{
+			Analyzer = propAnalyzer.Value
+,
+			Boost = propBoost.Value
+,
+			CopyTo = propCopyTo.Value
+,
+			DocValues = propDocValues.Value
+,
+			Dynamic = propDynamic.Value
+,
+			EnablePositionIncrements = propEnablePositionIncrements.Value
+,
+			Fields = propFields.Value
+,
+			IgnoreAbove = propIgnoreAbove.Value
+,
+			Index = propIndex.Value
+,
+			Meta = propMeta.Value
+,
+			NullValue = propNullValue.Value
+,
+			Properties = propProperties.Value
+,
+			Store = propStore.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, TokenCountProperty value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAnalyzer, value.Analyzer);
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropCopyTo, value.CopyTo, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropDocValues, value.DocValues);
+		writer.WriteProperty(options, PropDynamic, value.Dynamic);
+		writer.WriteProperty(options, PropEnablePositionIncrements, value.EnablePositionIncrements);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropIgnoreAbove, value.IgnoreAbove);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropNullValue, value.NullValue);
+		writer.WriteProperty(options, PropProperties, value.Properties);
+		writer.WriteProperty(options, PropStore, value.Store);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(TokenCountPropertyConverter))]
 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")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	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; }
 
 	/// <summary>
@@ -54,16 +207,11 @@ public sealed partial class TokenCountProperty : IProperty
 	/// Metadata about the field.
 	/// </para>
 	/// </summary>
-	[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("store")]
 	public bool? Store { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "token_count";
 }
 
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 0d7d4bebd18..b91594e6e0c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/UnsignedLongNumberProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/UnsignedLongNumberProperty.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,26 +28,218 @@
 
 namespace Elastic.Clients.Elasticsearch.Mapping;
 
+internal sealed partial class UnsignedLongNumberPropertyConverter : System.Text.Json.Serialization.JsonConverter<UnsignedLongNumberProperty>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropCoerce = System.Text.Json.JsonEncodedText.Encode("coerce");
+	private static readonly System.Text.Json.JsonEncodedText PropCopyTo = System.Text.Json.JsonEncodedText.Encode("copy_to");
+	private static readonly System.Text.Json.JsonEncodedText PropDocValues = System.Text.Json.JsonEncodedText.Encode("doc_values");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamic = System.Text.Json.JsonEncodedText.Encode("dynamic");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreAbove = System.Text.Json.JsonEncodedText.Encode("ignore_above");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreMalformed = System.Text.Json.JsonEncodedText.Encode("ignore_malformed");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropNullValue = System.Text.Json.JsonEncodedText.Encode("null_value");
+	private static readonly System.Text.Json.JsonEncodedText PropOnScriptError = System.Text.Json.JsonEncodedText.Encode("on_script_error");
+	private static readonly System.Text.Json.JsonEncodedText PropProperties = System.Text.Json.JsonEncodedText.Encode("properties");
+	private static readonly System.Text.Json.JsonEncodedText PropScript = System.Text.Json.JsonEncodedText.Encode("script");
+	private static readonly System.Text.Json.JsonEncodedText PropStore = System.Text.Json.JsonEncodedText.Encode("store");
+	private static readonly System.Text.Json.JsonEncodedText PropTimeSeriesDimension = System.Text.Json.JsonEncodedText.Encode("time_series_dimension");
+	private static readonly System.Text.Json.JsonEncodedText PropTimeSeriesMetric = System.Text.Json.JsonEncodedText.Encode("time_series_metric");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override UnsignedLongNumberProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<double?> propBoost = default;
+		LocalJsonProperty<bool?> propCoerce = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Fields?> propCopyTo = default;
+		LocalJsonProperty<bool?> propDocValues = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.DynamicMapping?> propDynamic = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.Properties?> propFields = default;
+		LocalJsonProperty<int?> propIgnoreAbove = default;
+		LocalJsonProperty<bool?> propIgnoreMalformed = default;
+		LocalJsonProperty<bool?> propIndex = default;
+		LocalJsonProperty<IDictionary<string, string>?> propMeta = default;
+		LocalJsonProperty<long?> propNullValue = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.OnScriptError?> propOnScriptError = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.Properties?> propProperties = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Script?> propScript = default;
+		LocalJsonProperty<bool?> propStore = default;
+		LocalJsonProperty<bool?> propTimeSeriesDimension = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.TimeSeriesMetricType?> propTimeSeriesMetric = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
+
+			if (propCoerce.TryRead(ref reader, options, PropCoerce))
+			{
+				continue;
+			}
+
+			if (propCopyTo.TryRead(ref reader, options, PropCopyTo, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propDocValues.TryRead(ref reader, options, PropDocValues))
+			{
+				continue;
+			}
+
+			if (propDynamic.TryRead(ref reader, options, PropDynamic))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propIgnoreAbove.TryRead(ref reader, options, PropIgnoreAbove))
+			{
+				continue;
+			}
+
+			if (propIgnoreMalformed.TryRead(ref reader, options, PropIgnoreMalformed))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propNullValue.TryRead(ref reader, options, PropNullValue))
+			{
+				continue;
+			}
+
+			if (propOnScriptError.TryRead(ref reader, options, PropOnScriptError))
+			{
+				continue;
+			}
+
+			if (propProperties.TryRead(ref reader, options, PropProperties))
+			{
+				continue;
+			}
+
+			if (propScript.TryRead(ref reader, options, PropScript))
+			{
+				continue;
+			}
+
+			if (propStore.TryRead(ref reader, options, PropStore))
+			{
+				continue;
+			}
+
+			if (propTimeSeriesDimension.TryRead(ref reader, options, PropTimeSeriesDimension))
+			{
+				continue;
+			}
+
+			if (propTimeSeriesMetric.TryRead(ref reader, options, PropTimeSeriesMetric))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new UnsignedLongNumberProperty
+		{
+			Boost = propBoost.Value
+,
+			Coerce = propCoerce.Value
+,
+			CopyTo = propCopyTo.Value
+,
+			DocValues = propDocValues.Value
+,
+			Dynamic = propDynamic.Value
+,
+			Fields = propFields.Value
+,
+			IgnoreAbove = propIgnoreAbove.Value
+,
+			IgnoreMalformed = propIgnoreMalformed.Value
+,
+			Index = propIndex.Value
+,
+			Meta = propMeta.Value
+,
+			NullValue = propNullValue.Value
+,
+			OnScriptError = propOnScriptError.Value
+,
+			Properties = propProperties.Value
+,
+			Script = propScript.Value
+,
+			Store = propStore.Value
+,
+			TimeSeriesDimension = propTimeSeriesDimension.Value
+,
+			TimeSeriesMetric = propTimeSeriesMetric.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, UnsignedLongNumberProperty value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropCoerce, value.Coerce);
+		writer.WriteProperty(options, PropCopyTo, value.CopyTo, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropDocValues, value.DocValues);
+		writer.WriteProperty(options, PropDynamic, value.Dynamic);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropIgnoreAbove, value.IgnoreAbove);
+		writer.WriteProperty(options, PropIgnoreMalformed, value.IgnoreMalformed);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropNullValue, value.NullValue);
+		writer.WriteProperty(options, PropOnScriptError, value.OnScriptError);
+		writer.WriteProperty(options, PropProperties, value.Properties);
+		writer.WriteProperty(options, PropScript, value.Script);
+		writer.WriteProperty(options, PropStore, value.Store);
+		writer.WriteProperty(options, PropTimeSeriesDimension, value.TimeSeriesDimension);
+		writer.WriteProperty(options, PropTimeSeriesMetric, value.TimeSeriesMetric);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(UnsignedLongNumberPropertyConverter))]
 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")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	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; }
 
 	/// <summary>
@@ -54,17 +247,11 @@ public sealed partial class UnsignedLongNumberProperty : IProperty
 	/// Metadata about the field.
 	/// </para>
 	/// </summary>
-	[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("store")]
 	public bool? Store { get; set; }
 
 	/// <summary>
@@ -72,7 +259,6 @@ public sealed partial class UnsignedLongNumberProperty : IProperty
 	/// 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; }
 
 	/// <summary>
@@ -80,10 +266,8 @@ public sealed partial class UnsignedLongNumberProperty : IProperty
 	/// For internal use by Elastic only. Marks the field as a time series dimension. Defaults to false.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("time_series_metric")]
 	public Elastic.Clients.Elasticsearch.Mapping.TimeSeriesMetricType? TimeSeriesMetric { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "unsigned_long";
 }
 
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 aeab1142b5e..a982736a26d 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/VersionProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/VersionProperty.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,18 +28,124 @@
 
 namespace Elastic.Clients.Elasticsearch.Mapping;
 
+internal sealed partial class VersionPropertyConverter : System.Text.Json.Serialization.JsonConverter<VersionProperty>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCopyTo = System.Text.Json.JsonEncodedText.Encode("copy_to");
+	private static readonly System.Text.Json.JsonEncodedText PropDocValues = System.Text.Json.JsonEncodedText.Encode("doc_values");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamic = System.Text.Json.JsonEncodedText.Encode("dynamic");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreAbove = System.Text.Json.JsonEncodedText.Encode("ignore_above");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropProperties = System.Text.Json.JsonEncodedText.Encode("properties");
+	private static readonly System.Text.Json.JsonEncodedText PropStore = System.Text.Json.JsonEncodedText.Encode("store");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override VersionProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Fields?> propCopyTo = default;
+		LocalJsonProperty<bool?> propDocValues = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.DynamicMapping?> propDynamic = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.Properties?> propFields = default;
+		LocalJsonProperty<int?> propIgnoreAbove = default;
+		LocalJsonProperty<IDictionary<string, string>?> propMeta = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.Properties?> propProperties = default;
+		LocalJsonProperty<bool?> propStore = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCopyTo.TryRead(ref reader, options, PropCopyTo, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propDocValues.TryRead(ref reader, options, PropDocValues))
+			{
+				continue;
+			}
+
+			if (propDynamic.TryRead(ref reader, options, PropDynamic))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propIgnoreAbove.TryRead(ref reader, options, PropIgnoreAbove))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propProperties.TryRead(ref reader, options, PropProperties))
+			{
+				continue;
+			}
+
+			if (propStore.TryRead(ref reader, options, PropStore))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new VersionProperty
+		{
+			CopyTo = propCopyTo.Value
+,
+			DocValues = propDocValues.Value
+,
+			Dynamic = propDynamic.Value
+,
+			Fields = propFields.Value
+,
+			IgnoreAbove = propIgnoreAbove.Value
+,
+			Meta = propMeta.Value
+,
+			Properties = propProperties.Value
+,
+			Store = propStore.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, VersionProperty value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCopyTo, value.CopyTo, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropDocValues, value.DocValues);
+		writer.WriteProperty(options, PropDynamic, value.Dynamic);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropIgnoreAbove, value.IgnoreAbove);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropProperties, value.Properties);
+		writer.WriteProperty(options, PropStore, value.Store);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(VersionPropertyConverter))]
 public sealed partial class VersionProperty : IProperty
 {
-	[JsonInclude, JsonPropertyName("copy_to")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	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; }
 
 	/// <summary>
@@ -46,14 +153,10 @@ public sealed partial class VersionProperty : IProperty
 	/// Metadata about the field.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Properties { get; set; }
-	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "version";
 }
 
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 a35b3b65721..82c5f955a34 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/WildcardProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/WildcardProperty.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,18 +28,134 @@
 
 namespace Elastic.Clients.Elasticsearch.Mapping;
 
+internal sealed partial class WildcardPropertyConverter : System.Text.Json.Serialization.JsonConverter<WildcardProperty>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCopyTo = System.Text.Json.JsonEncodedText.Encode("copy_to");
+	private static readonly System.Text.Json.JsonEncodedText PropDocValues = System.Text.Json.JsonEncodedText.Encode("doc_values");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamic = System.Text.Json.JsonEncodedText.Encode("dynamic");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreAbove = System.Text.Json.JsonEncodedText.Encode("ignore_above");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText PropNullValue = System.Text.Json.JsonEncodedText.Encode("null_value");
+	private static readonly System.Text.Json.JsonEncodedText PropProperties = System.Text.Json.JsonEncodedText.Encode("properties");
+	private static readonly System.Text.Json.JsonEncodedText PropStore = System.Text.Json.JsonEncodedText.Encode("store");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override WildcardProperty Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Fields?> propCopyTo = default;
+		LocalJsonProperty<bool?> propDocValues = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.DynamicMapping?> propDynamic = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.Properties?> propFields = default;
+		LocalJsonProperty<int?> propIgnoreAbove = default;
+		LocalJsonProperty<IDictionary<string, string>?> propMeta = default;
+		LocalJsonProperty<string?> propNullValue = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Mapping.Properties?> propProperties = default;
+		LocalJsonProperty<bool?> propStore = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCopyTo.TryRead(ref reader, options, PropCopyTo, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propDocValues.TryRead(ref reader, options, PropDocValues))
+			{
+				continue;
+			}
+
+			if (propDynamic.TryRead(ref reader, options, PropDynamic))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields))
+			{
+				continue;
+			}
+
+			if (propIgnoreAbove.TryRead(ref reader, options, PropIgnoreAbove))
+			{
+				continue;
+			}
+
+			if (propMeta.TryRead(ref reader, options, PropMeta))
+			{
+				continue;
+			}
+
+			if (propNullValue.TryRead(ref reader, options, PropNullValue))
+			{
+				continue;
+			}
+
+			if (propProperties.TryRead(ref reader, options, PropProperties))
+			{
+				continue;
+			}
+
+			if (propStore.TryRead(ref reader, options, PropStore))
+			{
+				continue;
+			}
+
+			if (reader.ValueTextEquals(PropType))
+			{
+				reader.Skip();
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new WildcardProperty
+		{
+			CopyTo = propCopyTo.Value
+,
+			DocValues = propDocValues.Value
+,
+			Dynamic = propDynamic.Value
+,
+			Fields = propFields.Value
+,
+			IgnoreAbove = propIgnoreAbove.Value
+,
+			Meta = propMeta.Value
+,
+			NullValue = propNullValue.Value
+,
+			Properties = propProperties.Value
+,
+			Store = propStore.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, WildcardProperty value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCopyTo, value.CopyTo, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropDocValues, value.DocValues);
+		writer.WriteProperty(options, PropDynamic, value.Dynamic);
+		writer.WriteProperty(options, PropFields, value.Fields);
+		writer.WriteProperty(options, PropIgnoreAbove, value.IgnoreAbove);
+		writer.WriteProperty(options, PropMeta, value.Meta);
+		writer.WriteProperty(options, PropNullValue, value.NullValue);
+		writer.WriteProperty(options, PropProperties, value.Properties);
+		writer.WriteProperty(options, PropStore, value.Store);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(WildcardPropertyConverter))]
 public sealed partial class WildcardProperty : IProperty
 {
-	[JsonInclude, JsonPropertyName("copy_to")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	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; }
 
 	/// <summary>
@@ -46,16 +163,11 @@ public sealed partial class WildcardProperty : IProperty
 	/// Metadata about the field.
 	/// </para>
 	/// </summary>
-	[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("store")]
 	public bool? Store { get; set; }
 
-	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "wildcard";
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Nodes/NodeInfoDiscover.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Nodes/NodeInfoDiscover.g.cs
index 82482a861f6..cbafbb85e22 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Nodes/NodeInfoDiscover.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Nodes/NodeInfoDiscover.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,51 +28,70 @@
 
 namespace Elastic.Clients.Elasticsearch.Nodes;
 
-internal sealed partial class NodeInfoDiscoverConverter : JsonConverter<NodeInfoDiscover>
+internal sealed partial class NodeInfoDiscoverConverter : System.Text.Json.Serialization.JsonConverter<NodeInfoDiscover>
 {
-	public override NodeInfoDiscover Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropSettings = System.Text.Json.JsonEncodedText.Encode("settings");
+	private static readonly System.Text.Json.JsonEncodedText PropSeedHosts = System.Text.Json.JsonEncodedText.Encode("seed_hosts");
+	private static readonly System.Text.Json.JsonEncodedText PropSeedProviders = System.Text.Json.JsonEncodedText.Encode("seed_providers");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override NodeInfoDiscover Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		IReadOnlyCollection<string>? seedHosts = default;
-		IReadOnlyCollection<string>? seedProviders = default;
-		string? type = default;
-		Dictionary<string, object> additionalProperties = null;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		System.Collections.Generic.Dictionary<string, object> propSettings = default;
+		LocalJsonProperty<IReadOnlyCollection<string>?> propSeedHosts = default;
+		LocalJsonProperty<IReadOnlyCollection<string>?> propSeedProviders = default;
+		LocalJsonProperty<string?> propType = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propSeedHosts.TryRead(ref reader, options, PropSeedHosts))
 			{
-				var property = reader.GetString();
-				if (property == "seed_hosts")
-				{
-					seedHosts = JsonSerializer.Deserialize<IReadOnlyCollection<string>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "seed_providers")
-				{
-					seedProviders = JsonSerializer.Deserialize<IReadOnlyCollection<string>?>(ref reader, options);
-					continue;
-				}
+				continue;
+			}
 
-				if (property == "type")
-				{
-					type = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
+			if (propSeedProviders.TryRead(ref reader, options, PropSeedProviders))
+			{
+				continue;
+			}
 
-				additionalProperties ??= new Dictionary<string, object>();
-				var additionalValue = JsonSerializer.Deserialize<object>(ref reader, options);
-				additionalProperties.Add(property, additionalValue);
+			if (propType.TryRead(ref reader, options, PropType))
+			{
+				continue;
 			}
+
+			propSettings ??= new System.Collections.Generic.Dictionary<string, object>();
+			reader.ReadProperty(options, out string key, out object value);
+			propSettings[key] = value;
 		}
 
-		return new NodeInfoDiscover { SeedHosts = seedHosts, SeedProviders = seedProviders, Settings = additionalProperties, Type = type };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new NodeInfoDiscover
+		{
+			Settings = propSettings
+,
+			SeedHosts = propSeedHosts.Value
+,
+			SeedProviders = propSeedProviders.Value
+,
+			Type = propType.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, NodeInfoDiscover value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, NodeInfoDiscover value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'NodeInfoDiscover' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropSeedHosts, value.SeedHosts);
+		writer.WriteProperty(options, PropSeedProviders, value.SeedProviders);
+		writer.WriteProperty(options, PropType, value.Type);
+		if (value.Settings is not null)
+		{
+			foreach (var item in value.Settings)
+			{
+				writer.WriteProperty(options, item.Key, item.Value);
+			}
+		}
+
+		writer.WriteEndObject();
 	}
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Nodes/NodeInfoPath.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Nodes/NodeInfoPath.g.cs
index d80db597c5b..5682a8320f0 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Nodes/NodeInfoPath.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Nodes/NodeInfoPath.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,15 +28,74 @@
 
 namespace Elastic.Clients.Elasticsearch.Nodes;
 
+internal sealed partial class NodeInfoPathConverter : System.Text.Json.Serialization.JsonConverter<NodeInfoPath>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropData = System.Text.Json.JsonEncodedText.Encode("data");
+	private static readonly System.Text.Json.JsonEncodedText PropHome = System.Text.Json.JsonEncodedText.Encode("home");
+	private static readonly System.Text.Json.JsonEncodedText PropLogs = System.Text.Json.JsonEncodedText.Encode("logs");
+	private static readonly System.Text.Json.JsonEncodedText PropRepo = System.Text.Json.JsonEncodedText.Encode("repo");
+
+	public override NodeInfoPath Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<string>?> propData = default;
+		LocalJsonProperty<string?> propHome = default;
+		LocalJsonProperty<string?> propLogs = default;
+		LocalJsonProperty<IReadOnlyCollection<string>?> propRepo = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propData.TryRead(ref reader, options, PropData, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propHome.TryRead(ref reader, options, PropHome))
+			{
+				continue;
+			}
+
+			if (propLogs.TryRead(ref reader, options, PropLogs))
+			{
+				continue;
+			}
+
+			if (propRepo.TryRead(ref reader, options, PropRepo))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new NodeInfoPath
+		{
+			Data = propData.Value
+,
+			Home = propHome.Value
+,
+			Logs = propLogs.Value
+,
+			Repo = propRepo.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, NodeInfoPath value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropData, value.Data, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropHome, value.Home);
+		writer.WriteProperty(options, PropLogs, value.Logs);
+		writer.WriteProperty(options, PropRepo, value.Repo);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(NodeInfoPathConverter))]
 public sealed partial class NodeInfoPath
 {
-	[JsonInclude, JsonPropertyName("data")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public IReadOnlyCollection<string>? Data { get; init; }
-	[JsonInclude, JsonPropertyName("home")]
 	public string? Home { get; init; }
-	[JsonInclude, JsonPropertyName("logs")]
 	public string? Logs { get; init; }
-	[JsonInclude, JsonPropertyName("repo")]
 	public IReadOnlyCollection<string>? Repo { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Nodes/NodeInfoSettingsHttpType.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Nodes/NodeInfoSettingsHttpType.g.cs
index 59254699ab8..2bee957dd7f 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Nodes/NodeInfoSettingsHttpType.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Nodes/NodeInfoSettingsHttpType.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,8 +28,47 @@
 
 namespace Elastic.Clients.Elasticsearch.Nodes;
 
+internal sealed partial class NodeInfoSettingsHttpTypeConverter : System.Text.Json.Serialization.JsonConverter<NodeInfoSettingsHttpType>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropDefault = System.Text.Json.JsonEncodedText.Encode("default");
+
+	public override NodeInfoSettingsHttpType Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		if (reader.TokenType is not System.Text.Json.JsonTokenType.StartObject)
+		{
+			var value = reader.ReadValue<string>(options);
+			return new NodeInfoSettingsHttpType { Default = value };
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propDefault = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propDefault.TryRead(ref reader, options, PropDefault))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new NodeInfoSettingsHttpType
+		{
+			Default = propDefault.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, NodeInfoSettingsHttpType value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDefault, value.Default);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(NodeInfoSettingsHttpTypeConverter))]
 public sealed partial class NodeInfoSettingsHttpType
 {
-	[JsonInclude, JsonPropertyName("default")]
 	public string Default { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Nodes/NodeInfoSettingsNetwork.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Nodes/NodeInfoSettingsNetwork.g.cs
index 34db00f7452..6231579310d 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Nodes/NodeInfoSettingsNetwork.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Nodes/NodeInfoSettingsNetwork.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,9 +28,41 @@
 
 namespace Elastic.Clients.Elasticsearch.Nodes;
 
+internal sealed partial class NodeInfoSettingsNetworkConverter : System.Text.Json.Serialization.JsonConverter<NodeInfoSettingsNetwork>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropHost = System.Text.Json.JsonEncodedText.Encode("host");
+
+	public override NodeInfoSettingsNetwork Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<string>?> propHost = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propHost.TryRead(ref reader, options, PropHost, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new NodeInfoSettingsNetwork
+		{
+			Host = propHost.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, NodeInfoSettingsNetwork value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropHost, value.Host, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(NodeInfoSettingsNetworkConverter))]
 public sealed partial class NodeInfoSettingsNetwork
 {
-	[JsonInclude, JsonPropertyName("host")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public IReadOnlyCollection<string>? Host { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Nodes/NodeInfoSettingsTransportType.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Nodes/NodeInfoSettingsTransportType.g.cs
index 4ffc3899a83..1636cfeb6af 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Nodes/NodeInfoSettingsTransportType.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Nodes/NodeInfoSettingsTransportType.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,8 +28,47 @@
 
 namespace Elastic.Clients.Elasticsearch.Nodes;
 
+internal sealed partial class NodeInfoSettingsTransportTypeConverter : System.Text.Json.Serialization.JsonConverter<NodeInfoSettingsTransportType>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropDefault = System.Text.Json.JsonEncodedText.Encode("default");
+
+	public override NodeInfoSettingsTransportType Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		if (reader.TokenType is not System.Text.Json.JsonTokenType.StartObject)
+		{
+			var value = reader.ReadValue<string>(options);
+			return new NodeInfoSettingsTransportType { Default = value };
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propDefault = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propDefault.TryRead(ref reader, options, PropDefault))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new NodeInfoSettingsTransportType
+		{
+			Default = propDefault.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, NodeInfoSettingsTransportType value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDefault, value.Default);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(NodeInfoSettingsTransportTypeConverter))]
 public sealed partial class NodeInfoSettingsTransportType
 {
-	[JsonInclude, JsonPropertyName("default")]
 	public string Default { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Nodes/NodeJvmInfo.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Nodes/NodeJvmInfo.g.cs
index 47707519655..888eb8c89e0 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Nodes/NodeJvmInfo.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Nodes/NodeJvmInfo.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,109 +28,147 @@
 
 namespace Elastic.Clients.Elasticsearch.Nodes;
 
-internal sealed partial class NodeJvmInfoConverter : JsonConverter<NodeJvmInfo>
+internal sealed partial class NodeJvmInfoConverter : System.Text.Json.Serialization.JsonConverter<NodeJvmInfo>
 {
-	public override NodeJvmInfo Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropGcCollectors = System.Text.Json.JsonEncodedText.Encode("gc_collectors");
+	private static readonly System.Text.Json.JsonEncodedText PropInputArguments = System.Text.Json.JsonEncodedText.Encode("input_arguments");
+	private static readonly System.Text.Json.JsonEncodedText PropMem = System.Text.Json.JsonEncodedText.Encode("mem");
+	private static readonly System.Text.Json.JsonEncodedText PropMemoryPools = System.Text.Json.JsonEncodedText.Encode("memory_pools");
+	private static readonly System.Text.Json.JsonEncodedText PropPid = System.Text.Json.JsonEncodedText.Encode("pid");
+	private static readonly System.Text.Json.JsonEncodedText PropStartTimeInMillis = System.Text.Json.JsonEncodedText.Encode("start_time_in_millis");
+	private static readonly System.Text.Json.JsonEncodedText PropUsingBundledJdk = System.Text.Json.JsonEncodedText.Encode("using_bundled_jdk");
+	private static readonly System.Text.Json.JsonEncodedText PropUsingBundledJdk1 = System.Text.Json.JsonEncodedText.Encode("bundled_jdk");
+	private static readonly System.Text.Json.JsonEncodedText PropUsingCompressedOrdinaryObjectPointers = System.Text.Json.JsonEncodedText.Encode("using_compressed_ordinary_object_pointers");
+	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("version");
+	private static readonly System.Text.Json.JsonEncodedText PropVmName = System.Text.Json.JsonEncodedText.Encode("vm_name");
+	private static readonly System.Text.Json.JsonEncodedText PropVmVendor = System.Text.Json.JsonEncodedText.Encode("vm_vendor");
+	private static readonly System.Text.Json.JsonEncodedText PropVmVersion = System.Text.Json.JsonEncodedText.Encode("vm_version");
+
+	public override NodeJvmInfo Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		IReadOnlyCollection<string> gcCollectors = default;
-		IReadOnlyCollection<string> inputArguments = default;
-		Elastic.Clients.Elasticsearch.Nodes.NodeInfoJvmMemory mem = default;
-		IReadOnlyCollection<string> memoryPools = default;
-		int pid = default;
-		long startTimeInMillis = default;
-		bool usingBundledJdk = default;
-		object? usingCompressedOrdinaryObjectPointers = default;
-		string version = default;
-		string vmName = default;
-		string vmVendor = default;
-		string vmVersion = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<string>> propGcCollectors = default;
+		LocalJsonProperty<IReadOnlyCollection<string>> propInputArguments = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Nodes.NodeInfoJvmMemory> propMem = default;
+		LocalJsonProperty<IReadOnlyCollection<string>> propMemoryPools = default;
+		LocalJsonProperty<int> propPid = default;
+		LocalJsonProperty<long> propStartTimeInMillis = default;
+		LocalJsonProperty<bool> propUsingBundledJdk = default;
+		LocalJsonProperty<object?> propUsingCompressedOrdinaryObjectPointers = default;
+		LocalJsonProperty<string> propVersion = default;
+		LocalJsonProperty<string> propVmName = default;
+		LocalJsonProperty<string> propVmVendor = default;
+		LocalJsonProperty<string> propVmVersion = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propGcCollectors.TryRead(ref reader, options, PropGcCollectors))
 			{
-				var property = reader.GetString();
-				if (property == "gc_collectors")
-				{
-					gcCollectors = JsonSerializer.Deserialize<IReadOnlyCollection<string>>(ref reader, options);
-					continue;
-				}
-
-				if (property == "input_arguments")
-				{
-					inputArguments = JsonSerializer.Deserialize<IReadOnlyCollection<string>>(ref reader, options);
-					continue;
-				}
-
-				if (property == "mem")
-				{
-					mem = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Nodes.NodeInfoJvmMemory>(ref reader, options);
-					continue;
-				}
-
-				if (property == "memory_pools")
-				{
-					memoryPools = JsonSerializer.Deserialize<IReadOnlyCollection<string>>(ref reader, options);
-					continue;
-				}
-
-				if (property == "pid")
-				{
-					pid = JsonSerializer.Deserialize<int>(ref reader, options);
-					continue;
-				}
-
-				if (property == "start_time_in_millis")
-				{
-					startTimeInMillis = JsonSerializer.Deserialize<long>(ref reader, options);
-					continue;
-				}
-
-				if (property == "using_bundled_jdk" || property == "bundled_jdk")
-				{
-					usingBundledJdk = JsonSerializer.Deserialize<bool>(ref reader, options);
-					continue;
-				}
-
-				if (property == "using_compressed_ordinary_object_pointers")
-				{
-					usingCompressedOrdinaryObjectPointers = JsonSerializer.Deserialize<object?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "version")
-				{
-					version = JsonSerializer.Deserialize<string>(ref reader, options);
-					continue;
-				}
-
-				if (property == "vm_name")
-				{
-					vmName = JsonSerializer.Deserialize<string>(ref reader, options);
-					continue;
-				}
-
-				if (property == "vm_vendor")
-				{
-					vmVendor = JsonSerializer.Deserialize<string>(ref reader, options);
-					continue;
-				}
-
-				if (property == "vm_version")
-				{
-					vmVersion = JsonSerializer.Deserialize<string>(ref reader, options);
-					continue;
-				}
+				continue;
 			}
+
+			if (propInputArguments.TryRead(ref reader, options, PropInputArguments))
+			{
+				continue;
+			}
+
+			if (propMem.TryRead(ref reader, options, PropMem))
+			{
+				continue;
+			}
+
+			if (propMemoryPools.TryRead(ref reader, options, PropMemoryPools))
+			{
+				continue;
+			}
+
+			if (propPid.TryRead(ref reader, options, PropPid))
+			{
+				continue;
+			}
+
+			if (propStartTimeInMillis.TryRead(ref reader, options, PropStartTimeInMillis))
+			{
+				continue;
+			}
+
+			if (propUsingBundledJdk.TryRead(ref reader, options, PropUsingBundledJdk) || propUsingBundledJdk.TryRead(ref reader, options, PropUsingBundledJdk1))
+			{
+				continue;
+			}
+
+			if (propUsingCompressedOrdinaryObjectPointers.TryRead(ref reader, options, PropUsingCompressedOrdinaryObjectPointers))
+			{
+				continue;
+			}
+
+			if (propVersion.TryRead(ref reader, options, PropVersion))
+			{
+				continue;
+			}
+
+			if (propVmName.TryRead(ref reader, options, PropVmName))
+			{
+				continue;
+			}
+
+			if (propVmVendor.TryRead(ref reader, options, PropVmVendor))
+			{
+				continue;
+			}
+
+			if (propVmVersion.TryRead(ref reader, options, PropVmVersion))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		return new NodeJvmInfo { GcCollectors = gcCollectors, InputArguments = inputArguments, Mem = mem, MemoryPools = memoryPools, Pid = pid, StartTimeInMillis = startTimeInMillis, UsingBundledJdk = usingBundledJdk, UsingCompressedOrdinaryObjectPointers = usingCompressedOrdinaryObjectPointers, Version = version, VmName = vmName, VmVendor = vmVendor, VmVersion = vmVersion };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new NodeJvmInfo
+		{
+			GcCollectors = propGcCollectors.Value
+,
+			InputArguments = propInputArguments.Value
+,
+			Mem = propMem.Value
+,
+			MemoryPools = propMemoryPools.Value
+,
+			Pid = propPid.Value
+,
+			StartTimeInMillis = propStartTimeInMillis.Value
+,
+			UsingBundledJdk = propUsingBundledJdk.Value
+,
+			UsingCompressedOrdinaryObjectPointers = propUsingCompressedOrdinaryObjectPointers.Value
+,
+			Version = propVersion.Value
+,
+			VmName = propVmName.Value
+,
+			VmVendor = propVmVendor.Value
+,
+			VmVersion = propVmVersion.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, NodeJvmInfo value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, NodeJvmInfo value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'NodeJvmInfo' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropGcCollectors, value.GcCollectors);
+		writer.WriteProperty(options, PropInputArguments, value.InputArguments);
+		writer.WriteProperty(options, PropMem, value.Mem);
+		writer.WriteProperty(options, PropMemoryPools, value.MemoryPools);
+		writer.WriteProperty(options, PropPid, value.Pid);
+		writer.WriteProperty(options, PropStartTimeInMillis, value.StartTimeInMillis);
+		writer.WriteProperty(options, PropUsingBundledJdk, value.UsingBundledJdk);
+		writer.WriteProperty(options, PropUsingCompressedOrdinaryObjectPointers, value.UsingCompressedOrdinaryObjectPointers);
+		writer.WriteProperty(options, PropVersion, value.Version);
+		writer.WriteProperty(options, PropVmName, value.VmName);
+		writer.WriteProperty(options, PropVmVendor, value.VmVendor);
+		writer.WriteProperty(options, PropVmVersion, value.VmVersion);
+		writer.WriteEndObject();
 	}
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Nodes/Stats.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Nodes/Stats.g.cs
index 069731edd49..3848ff225d3 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Nodes/Stats.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Nodes/Stats.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,250 @@
 
 namespace Elastic.Clients.Elasticsearch.Nodes;
 
+internal sealed partial class StatsConverter : System.Text.Json.Serialization.JsonConverter<Stats>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAdaptiveSelection = System.Text.Json.JsonEncodedText.Encode("adaptive_selection");
+	private static readonly System.Text.Json.JsonEncodedText PropAttributes = System.Text.Json.JsonEncodedText.Encode("attributes");
+	private static readonly System.Text.Json.JsonEncodedText PropBreakers = System.Text.Json.JsonEncodedText.Encode("breakers");
+	private static readonly System.Text.Json.JsonEncodedText PropDiscovery = System.Text.Json.JsonEncodedText.Encode("discovery");
+	private static readonly System.Text.Json.JsonEncodedText PropFs = System.Text.Json.JsonEncodedText.Encode("fs");
+	private static readonly System.Text.Json.JsonEncodedText PropHost = System.Text.Json.JsonEncodedText.Encode("host");
+	private static readonly System.Text.Json.JsonEncodedText PropHttp = System.Text.Json.JsonEncodedText.Encode("http");
+	private static readonly System.Text.Json.JsonEncodedText PropIndexingPressure = System.Text.Json.JsonEncodedText.Encode("indexing_pressure");
+	private static readonly System.Text.Json.JsonEncodedText PropIndices = System.Text.Json.JsonEncodedText.Encode("indices");
+	private static readonly System.Text.Json.JsonEncodedText PropIngest = System.Text.Json.JsonEncodedText.Encode("ingest");
+	private static readonly System.Text.Json.JsonEncodedText PropIp = System.Text.Json.JsonEncodedText.Encode("ip");
+	private static readonly System.Text.Json.JsonEncodedText PropJvm = System.Text.Json.JsonEncodedText.Encode("jvm");
+	private static readonly System.Text.Json.JsonEncodedText PropName = System.Text.Json.JsonEncodedText.Encode("name");
+	private static readonly System.Text.Json.JsonEncodedText PropOs = System.Text.Json.JsonEncodedText.Encode("os");
+	private static readonly System.Text.Json.JsonEncodedText PropProcess = System.Text.Json.JsonEncodedText.Encode("process");
+	private static readonly System.Text.Json.JsonEncodedText PropRoles = System.Text.Json.JsonEncodedText.Encode("roles");
+	private static readonly System.Text.Json.JsonEncodedText PropScript = System.Text.Json.JsonEncodedText.Encode("script");
+	private static readonly System.Text.Json.JsonEncodedText PropScriptCache = System.Text.Json.JsonEncodedText.Encode("script_cache");
+	private static readonly System.Text.Json.JsonEncodedText PropThreadPool = System.Text.Json.JsonEncodedText.Encode("thread_pool");
+	private static readonly System.Text.Json.JsonEncodedText PropTimestamp = System.Text.Json.JsonEncodedText.Encode("timestamp");
+	private static readonly System.Text.Json.JsonEncodedText PropTransport = System.Text.Json.JsonEncodedText.Encode("transport");
+	private static readonly System.Text.Json.JsonEncodedText PropTransportAddress = System.Text.Json.JsonEncodedText.Encode("transport_address");
+
+	public override Stats Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Nodes.AdaptiveSelection>?> propAdaptiveSelection = default;
+		LocalJsonProperty<IReadOnlyDictionary<Elastic.Clients.Elasticsearch.Field, string>?> propAttributes = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Nodes.Breaker>?> propBreakers = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Nodes.Discovery?> propDiscovery = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Nodes.FileSystem?> propFs = default;
+		LocalJsonProperty<string?> propHost = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Nodes.Http?> propHttp = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Nodes.IndexingPressure?> propIndexingPressure = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.IndexManagement.ShardStats?> propIndices = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Nodes.Ingest?> propIngest = default;
+		LocalJsonProperty<IReadOnlyCollection<string>?> propIp = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Nodes.Jvm?> propJvm = default;
+		LocalJsonProperty<string?> propName = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Nodes.OperatingSystem?> propOs = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Nodes.Process?> propProcess = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.NodeRole>?> propRoles = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Nodes.Scripting?> propScript = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, Union<Elastic.Clients.Elasticsearch.Nodes.ScriptCache, IReadOnlyCollection<Elastic.Clients.Elasticsearch.Nodes.ScriptCache>>>?> propScriptCache = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Nodes.ThreadCount>?> propThreadPool = default;
+		LocalJsonProperty<long?> propTimestamp = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Nodes.Transport?> propTransport = default;
+		LocalJsonProperty<string?> propTransportAddress = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAdaptiveSelection.TryRead(ref reader, options, PropAdaptiveSelection))
+			{
+				continue;
+			}
+
+			if (propAttributes.TryRead(ref reader, options, PropAttributes))
+			{
+				continue;
+			}
+
+			if (propBreakers.TryRead(ref reader, options, PropBreakers))
+			{
+				continue;
+			}
+
+			if (propDiscovery.TryRead(ref reader, options, PropDiscovery))
+			{
+				continue;
+			}
+
+			if (propFs.TryRead(ref reader, options, PropFs))
+			{
+				continue;
+			}
+
+			if (propHost.TryRead(ref reader, options, PropHost))
+			{
+				continue;
+			}
+
+			if (propHttp.TryRead(ref reader, options, PropHttp))
+			{
+				continue;
+			}
+
+			if (propIndexingPressure.TryRead(ref reader, options, PropIndexingPressure))
+			{
+				continue;
+			}
+
+			if (propIndices.TryRead(ref reader, options, PropIndices))
+			{
+				continue;
+			}
+
+			if (propIngest.TryRead(ref reader, options, PropIngest))
+			{
+				continue;
+			}
+
+			if (propIp.TryRead(ref reader, options, PropIp, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propJvm.TryRead(ref reader, options, PropJvm))
+			{
+				continue;
+			}
+
+			if (propName.TryRead(ref reader, options, PropName))
+			{
+				continue;
+			}
+
+			if (propOs.TryRead(ref reader, options, PropOs))
+			{
+				continue;
+			}
+
+			if (propProcess.TryRead(ref reader, options, PropProcess))
+			{
+				continue;
+			}
+
+			if (propRoles.TryRead(ref reader, options, PropRoles))
+			{
+				continue;
+			}
+
+			if (propScript.TryRead(ref reader, options, PropScript))
+			{
+				continue;
+			}
+
+			if (propScriptCache.TryRead(ref reader, options, PropScriptCache))
+			{
+				continue;
+			}
+
+			if (propThreadPool.TryRead(ref reader, options, PropThreadPool))
+			{
+				continue;
+			}
+
+			if (propTimestamp.TryRead(ref reader, options, PropTimestamp))
+			{
+				continue;
+			}
+
+			if (propTransport.TryRead(ref reader, options, PropTransport))
+			{
+				continue;
+			}
+
+			if (propTransportAddress.TryRead(ref reader, options, PropTransportAddress))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new Stats
+		{
+			AdaptiveSelection = propAdaptiveSelection.Value
+,
+			Attributes = propAttributes.Value
+,
+			Breakers = propBreakers.Value
+,
+			Discovery = propDiscovery.Value
+,
+			Fs = propFs.Value
+,
+			Host = propHost.Value
+,
+			Http = propHttp.Value
+,
+			IndexingPressure = propIndexingPressure.Value
+,
+			Indices = propIndices.Value
+,
+			Ingest = propIngest.Value
+,
+			Ip = propIp.Value
+,
+			Jvm = propJvm.Value
+,
+			Name = propName.Value
+,
+			Os = propOs.Value
+,
+			Process = propProcess.Value
+,
+			Roles = propRoles.Value
+,
+			Script = propScript.Value
+,
+			ScriptCache = propScriptCache.Value
+,
+			ThreadPool = propThreadPool.Value
+,
+			Timestamp = propTimestamp.Value
+,
+			Transport = propTransport.Value
+,
+			TransportAddress = propTransportAddress.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, Stats value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAdaptiveSelection, value.AdaptiveSelection);
+		writer.WriteProperty(options, PropAttributes, value.Attributes);
+		writer.WriteProperty(options, PropBreakers, value.Breakers);
+		writer.WriteProperty(options, PropDiscovery, value.Discovery);
+		writer.WriteProperty(options, PropFs, value.Fs);
+		writer.WriteProperty(options, PropHost, value.Host);
+		writer.WriteProperty(options, PropHttp, value.Http);
+		writer.WriteProperty(options, PropIndexingPressure, value.IndexingPressure);
+		writer.WriteProperty(options, PropIndices, value.Indices);
+		writer.WriteProperty(options, PropIngest, value.Ingest);
+		writer.WriteProperty(options, PropIp, value.Ip, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropJvm, value.Jvm);
+		writer.WriteProperty(options, PropName, value.Name);
+		writer.WriteProperty(options, PropOs, value.Os);
+		writer.WriteProperty(options, PropProcess, value.Process);
+		writer.WriteProperty(options, PropRoles, value.Roles);
+		writer.WriteProperty(options, PropScript, value.Script);
+		writer.WriteProperty(options, PropScriptCache, value.ScriptCache);
+		writer.WriteProperty(options, PropThreadPool, value.ThreadPool);
+		writer.WriteProperty(options, PropTimestamp, value.Timestamp);
+		writer.WriteProperty(options, PropTransport, value.Transport);
+		writer.WriteProperty(options, PropTransportAddress, value.TransportAddress);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(StatsConverter))]
 public sealed partial class Stats
 {
 	/// <summary>
@@ -34,7 +279,6 @@ public sealed partial class Stats
 	/// Statistics about adaptive replica selection.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("adaptive_selection")]
 	public IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Nodes.AdaptiveSelection>? AdaptiveSelection { get; init; }
 
 	/// <summary>
@@ -42,8 +286,6 @@ public sealed partial class Stats
 	/// Contains a list of attributes for the node.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("attributes")]
-	[ReadOnlyFieldDictionaryConverter(typeof(string))]
 	public IReadOnlyDictionary<Elastic.Clients.Elasticsearch.Field, string>? Attributes { get; init; }
 
 	/// <summary>
@@ -51,7 +293,6 @@ public sealed partial class Stats
 	/// Statistics about the field data circuit breaker.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("breakers")]
 	public IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Nodes.Breaker>? Breakers { get; init; }
 
 	/// <summary>
@@ -59,7 +300,6 @@ public sealed partial class Stats
 	/// Contains node discovery statistics for the node.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("discovery")]
 	public Elastic.Clients.Elasticsearch.Nodes.Discovery? Discovery { get; init; }
 
 	/// <summary>
@@ -67,7 +307,6 @@ public sealed partial class Stats
 	/// File system information, data path, free disk space, read/write stats.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("fs")]
 	public Elastic.Clients.Elasticsearch.Nodes.FileSystem? Fs { get; init; }
 
 	/// <summary>
@@ -75,7 +314,6 @@ public sealed partial class Stats
 	/// Network host for the node, based on the network host setting.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("host")]
 	public string? Host { get; init; }
 
 	/// <summary>
@@ -83,7 +321,6 @@ public sealed partial class Stats
 	/// HTTP connection information.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("http")]
 	public Elastic.Clients.Elasticsearch.Nodes.Http? Http { get; init; }
 
 	/// <summary>
@@ -91,7 +328,6 @@ public sealed partial class Stats
 	/// Contains indexing pressure statistics for the node.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("indexing_pressure")]
 	public Elastic.Clients.Elasticsearch.Nodes.IndexingPressure? IndexingPressure { get; init; }
 
 	/// <summary>
@@ -99,7 +335,6 @@ public sealed partial class Stats
 	/// Indices stats about size, document count, indexing and deletion times, search times, field cache size, merges and flushes.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("indices")]
 	public Elastic.Clients.Elasticsearch.IndexManagement.ShardStats? Indices { get; init; }
 
 	/// <summary>
@@ -107,7 +342,6 @@ public sealed partial class Stats
 	/// Statistics about ingest preprocessing.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("ingest")]
 	public Elastic.Clients.Elasticsearch.Nodes.Ingest? Ingest { get; init; }
 
 	/// <summary>
@@ -115,8 +349,6 @@ public sealed partial class Stats
 	/// IP address and port for the node.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("ip")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public IReadOnlyCollection<string>? Ip { get; init; }
 
 	/// <summary>
@@ -124,7 +356,6 @@ public sealed partial class Stats
 	/// JVM stats, memory pool information, garbage collection, buffer pools, number of loaded/unloaded classes.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("jvm")]
 	public Elastic.Clients.Elasticsearch.Nodes.Jvm? Jvm { get; init; }
 
 	/// <summary>
@@ -133,7 +364,6 @@ public sealed partial class Stats
 	/// Based on the node name setting.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("name")]
 	public string? Name { get; init; }
 
 	/// <summary>
@@ -141,7 +371,6 @@ public sealed partial class Stats
 	/// Operating system stats, load average, mem, swap.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("os")]
 	public Elastic.Clients.Elasticsearch.Nodes.OperatingSystem? Os { get; init; }
 
 	/// <summary>
@@ -149,7 +378,6 @@ public sealed partial class Stats
 	/// Process statistics, memory consumption, cpu usage, open file descriptors.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("process")]
 	public Elastic.Clients.Elasticsearch.Nodes.Process? Process { get; init; }
 
 	/// <summary>
@@ -157,7 +385,6 @@ public sealed partial class Stats
 	/// Roles assigned to the node.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("roles")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.NodeRole>? Roles { get; init; }
 
 	/// <summary>
@@ -165,9 +392,7 @@ public sealed partial class Stats
 	/// Contains script statistics for the node.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("script")]
 	public Elastic.Clients.Elasticsearch.Nodes.Scripting? Script { get; init; }
-	[JsonInclude, JsonPropertyName("script_cache")]
 	public IReadOnlyDictionary<string, Union<Elastic.Clients.Elasticsearch.Nodes.ScriptCache, IReadOnlyCollection<Elastic.Clients.Elasticsearch.Nodes.ScriptCache>>>? ScriptCache { get; init; }
 
 	/// <summary>
@@ -175,9 +400,7 @@ public sealed partial class Stats
 	/// Statistics about each thread pool, including current size, queue and rejected tasks.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("thread_pool")]
 	public IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Nodes.ThreadCount>? ThreadPool { get; init; }
-	[JsonInclude, JsonPropertyName("timestamp")]
 	public long? Timestamp { get; init; }
 
 	/// <summary>
@@ -185,7 +408,6 @@ public sealed partial class Stats
 	/// Transport statistics about sent and received bytes in cluster communication.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("transport")]
 	public Elastic.Clients.Elasticsearch.Nodes.Transport? Transport { get; init; }
 
 	/// <summary>
@@ -193,6 +415,5 @@ public sealed partial class Stats
 	/// Host and port for the transport layer, used for internal communication between nodes in a cluster.
 	/// </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/QueryDsl/BoolQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/BoolQuery.g.cs
index bbf7f54b574..e4e878b1437 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/BoolQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/BoolQuery.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,100 @@
 
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
 
+internal sealed partial class BoolQueryConverter : System.Text.Json.Serialization.JsonConverter<BoolQuery>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropFilter = System.Text.Json.JsonEncodedText.Encode("filter");
+	private static readonly System.Text.Json.JsonEncodedText PropMinimumShouldMatch = System.Text.Json.JsonEncodedText.Encode("minimum_should_match");
+	private static readonly System.Text.Json.JsonEncodedText PropMust = System.Text.Json.JsonEncodedText.Encode("must");
+	private static readonly System.Text.Json.JsonEncodedText PropMustNot = System.Text.Json.JsonEncodedText.Encode("must_not");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryName = System.Text.Json.JsonEncodedText.Encode("_name");
+	private static readonly System.Text.Json.JsonEncodedText PropShould = System.Text.Json.JsonEncodedText.Encode("should");
+
+	public override BoolQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<float?> propBoost = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.QueryDsl.Query>?> propFilter = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.MinimumShouldMatch?> propMinimumShouldMatch = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.QueryDsl.Query>?> propMust = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.QueryDsl.Query>?> propMustNot = default;
+		LocalJsonProperty<string?> propQueryName = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.QueryDsl.Query>?> propShould = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
+
+			if (propFilter.TryRead(ref reader, options, PropFilter, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.QueryDsl.Query>?, Elastic.Clients.Elasticsearch.QueryDsl.Query>)))
+			{
+				continue;
+			}
+
+			if (propMinimumShouldMatch.TryRead(ref reader, options, PropMinimumShouldMatch))
+			{
+				continue;
+			}
+
+			if (propMust.TryRead(ref reader, options, PropMust, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.QueryDsl.Query>?, Elastic.Clients.Elasticsearch.QueryDsl.Query>)))
+			{
+				continue;
+			}
+
+			if (propMustNot.TryRead(ref reader, options, PropMustNot, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.QueryDsl.Query>?, Elastic.Clients.Elasticsearch.QueryDsl.Query>)))
+			{
+				continue;
+			}
+
+			if (propQueryName.TryRead(ref reader, options, PropQueryName))
+			{
+				continue;
+			}
+
+			if (propShould.TryRead(ref reader, options, PropShould, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.QueryDsl.Query>?, Elastic.Clients.Elasticsearch.QueryDsl.Query>)))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new BoolQuery
+		{
+			Boost = propBoost.Value
+,
+			Filter = propFilter.Value
+,
+			MinimumShouldMatch = propMinimumShouldMatch.Value
+,
+			Must = propMust.Value
+,
+			MustNot = propMustNot.Value
+,
+			QueryName = propQueryName.Value
+,
+			Should = propShould.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, BoolQuery value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropFilter, value.Filter, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.QueryDsl.Query>?, Elastic.Clients.Elasticsearch.QueryDsl.Query>));
+		writer.WriteProperty(options, PropMinimumShouldMatch, value.MinimumShouldMatch);
+		writer.WriteProperty(options, PropMust, value.Must, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.QueryDsl.Query>?, Elastic.Clients.Elasticsearch.QueryDsl.Query>));
+		writer.WriteProperty(options, PropMustNot, value.MustNot, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.QueryDsl.Query>?, Elastic.Clients.Elasticsearch.QueryDsl.Query>));
+		writer.WriteProperty(options, PropQueryName, value.QueryName);
+		writer.WriteProperty(options, PropShould, value.Should, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.QueryDsl.Query>?, Elastic.Clients.Elasticsearch.QueryDsl.Query>));
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(BoolQueryConverter))]
 public sealed partial class BoolQuery
 {
 	/// <summary>
@@ -37,7 +132,6 @@ public sealed partial class BoolQuery
 	/// A value greater than 1.0 increases the relevance score.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("boost")]
 	public float? Boost { get; set; }
 
 	/// <summary>
@@ -46,8 +140,6 @@ public sealed partial class BoolQuery
 	/// However, unlike <c>must</c>, the score of the query will be ignored.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("filter")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.QueryDsl.Query))]
 	public ICollection<Elastic.Clients.Elasticsearch.QueryDsl.Query>? Filter { get; set; }
 
 	/// <summary>
@@ -55,7 +147,6 @@ public sealed partial class BoolQuery
 	/// Specifies the number or percentage of <c>should</c> clauses returned documents must match.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("minimum_should_match")]
 	public Elastic.Clients.Elasticsearch.MinimumShouldMatch? MinimumShouldMatch { get; set; }
 
 	/// <summary>
@@ -63,8 +154,6 @@ public sealed partial class BoolQuery
 	/// The clause (query) must appear in matching documents and will contribute to the score.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("must")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.QueryDsl.Query))]
 	public ICollection<Elastic.Clients.Elasticsearch.QueryDsl.Query>? Must { get; set; }
 
 	/// <summary>
@@ -73,10 +162,7 @@ public sealed partial class BoolQuery
 	/// Because scoring is ignored, a score of <c>0</c> is returned for all documents.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("must_not")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.QueryDsl.Query))]
 	public ICollection<Elastic.Clients.Elasticsearch.QueryDsl.Query>? MustNot { get; set; }
-	[JsonInclude, JsonPropertyName("_name")]
 	public string? QueryName { get; set; }
 
 	/// <summary>
@@ -84,8 +170,6 @@ public sealed partial class BoolQuery
 	/// The clause (query) should appear in the matching document.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("should")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.QueryDsl.Query))]
 	public ICollection<Elastic.Clients.Elasticsearch.QueryDsl.Query>? Should { get; set; }
 
 	public static implicit operator Elastic.Clients.Elasticsearch.QueryDsl.Query(BoolQuery boolQuery) => Elastic.Clients.Elasticsearch.QueryDsl.Query.Bool(boolQuery);
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 387ff96f3a0..751a7be3bea 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/CombinedFieldsQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/CombinedFieldsQuery.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,110 @@
 
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
 
+internal sealed partial class CombinedFieldsQueryConverter : System.Text.Json.Serialization.JsonConverter<CombinedFieldsQuery>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAutoGenerateSynonymsPhraseQuery = System.Text.Json.JsonEncodedText.Encode("auto_generate_synonyms_phrase_query");
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropMinimumShouldMatch = System.Text.Json.JsonEncodedText.Encode("minimum_should_match");
+	private static readonly System.Text.Json.JsonEncodedText PropOperator = System.Text.Json.JsonEncodedText.Encode("operator");
+	private static readonly System.Text.Json.JsonEncodedText PropQuery = System.Text.Json.JsonEncodedText.Encode("query");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryName = System.Text.Json.JsonEncodedText.Encode("_name");
+	private static readonly System.Text.Json.JsonEncodedText PropZeroTermsQuery = System.Text.Json.JsonEncodedText.Encode("zero_terms_query");
+
+	public override CombinedFieldsQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool?> propAutoGenerateSynonymsPhraseQuery = default;
+		LocalJsonProperty<float?> propBoost = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Fields> propFields = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.MinimumShouldMatch?> propMinimumShouldMatch = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.QueryDsl.CombinedFieldsOperator?> propOperator = default;
+		LocalJsonProperty<string> propQuery = default;
+		LocalJsonProperty<string?> propQueryName = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.QueryDsl.CombinedFieldsZeroTerms?> propZeroTermsQuery = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAutoGenerateSynonymsPhraseQuery.TryRead(ref reader, options, PropAutoGenerateSynonymsPhraseQuery))
+			{
+				continue;
+			}
+
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields, typeof(FieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propMinimumShouldMatch.TryRead(ref reader, options, PropMinimumShouldMatch))
+			{
+				continue;
+			}
+
+			if (propOperator.TryRead(ref reader, options, PropOperator))
+			{
+				continue;
+			}
+
+			if (propQuery.TryRead(ref reader, options, PropQuery))
+			{
+				continue;
+			}
+
+			if (propQueryName.TryRead(ref reader, options, PropQueryName))
+			{
+				continue;
+			}
+
+			if (propZeroTermsQuery.TryRead(ref reader, options, PropZeroTermsQuery))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new CombinedFieldsQuery
+		{
+			AutoGenerateSynonymsPhraseQuery = propAutoGenerateSynonymsPhraseQuery.Value
+,
+			Boost = propBoost.Value
+,
+			Fields = propFields.Value
+,
+			MinimumShouldMatch = propMinimumShouldMatch.Value
+,
+			Operator = propOperator.Value
+,
+			Query = propQuery.Value
+,
+			QueryName = propQueryName.Value
+,
+			ZeroTermsQuery = propZeroTermsQuery.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, CombinedFieldsQuery value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAutoGenerateSynonymsPhraseQuery, value.AutoGenerateSynonymsPhraseQuery);
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropFields, value.Fields, typeof(FieldsMarker));
+		writer.WriteProperty(options, PropMinimumShouldMatch, value.MinimumShouldMatch);
+		writer.WriteProperty(options, PropOperator, value.Operator);
+		writer.WriteProperty(options, PropQuery, value.Query);
+		writer.WriteProperty(options, PropQueryName, value.QueryName);
+		writer.WriteProperty(options, PropZeroTermsQuery, value.ZeroTermsQuery);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(CombinedFieldsQueryConverter))]
 public sealed partial class CombinedFieldsQuery
 {
 	/// <summary>
@@ -34,7 +139,6 @@ public sealed partial class CombinedFieldsQuery
 	/// If true, match phrase queries are automatically created for multi-term synonyms.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("auto_generate_synonyms_phrase_query")]
 	public bool? AutoGenerateSynonymsPhraseQuery { get; set; }
 
 	/// <summary>
@@ -45,7 +149,6 @@ public sealed partial class CombinedFieldsQuery
 	/// A value greater than 1.0 increases the relevance score.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("boost")]
 	public float? Boost { get; set; }
 
 	/// <summary>
@@ -53,8 +156,6 @@ public sealed partial class CombinedFieldsQuery
 	/// List of fields to search. Field wildcard patterns are allowed. Only <c>text</c> fields are supported, and they must all have the same search <c>analyzer</c>.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("fields")]
-	[JsonConverter(typeof(FieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Fields Fields { get; set; }
 
 	/// <summary>
@@ -62,7 +163,6 @@ public sealed partial class CombinedFieldsQuery
 	/// Minimum number of clauses that must match for a document to be returned.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("minimum_should_match")]
 	public Elastic.Clients.Elasticsearch.MinimumShouldMatch? MinimumShouldMatch { get; set; }
 
 	/// <summary>
@@ -70,7 +170,6 @@ public sealed partial class CombinedFieldsQuery
 	/// Boolean logic used to interpret text in the query value.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("operator")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.CombinedFieldsOperator? Operator { get; set; }
 
 	/// <summary>
@@ -79,9 +178,7 @@ public sealed partial class CombinedFieldsQuery
 	/// The <c>combined_fields</c> query analyzes the provided text before performing a search.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("query")]
 	public string Query { get; set; }
-	[JsonInclude, JsonPropertyName("_name")]
 	public string? QueryName { get; set; }
 
 	/// <summary>
@@ -89,7 +186,6 @@ public sealed partial class CombinedFieldsQuery
 	/// Indicates whether no documents are returned if the analyzer removes all tokens, such as when using a <c>stop</c> filter.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("zero_terms_query")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.CombinedFieldsZeroTerms? ZeroTermsQuery { get; set; }
 
 	public static implicit operator Elastic.Clients.Elasticsearch.QueryDsl.Query(CombinedFieldsQuery combinedFieldsQuery) => Elastic.Clients.Elasticsearch.QueryDsl.Query.CombinedFields(combinedFieldsQuery);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/DateDecayFunction.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/DateDecayFunction.g.cs
index 2694b98502b..57fdc9d0ff7 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/DateDecayFunction.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/DateDecayFunction.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,60 +28,51 @@
 
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
 
-internal sealed partial class DateDecayFunctionConverter : JsonConverter<DateDecayFunction>
+internal sealed partial class DateDecayFunctionConverter : System.Text.Json.Serialization.JsonConverter<DateDecayFunction>
 {
-	public override DateDecayFunction Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		var variant = new DateDecayFunction();
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
-		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
-			{
-				var property = reader.GetString();
-				if (property == "multi_value_mode")
-				{
-					variant.MultiValueMode = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.MultiValueMode?>(ref reader, options);
-					continue;
-				}
-
-				variant.Field = property;
-				reader.Read();
-				variant.Placement = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.DecayPlacement<Elastic.Clients.Elasticsearch.DateMath, Elastic.Clients.Elasticsearch.Duration>>(ref reader, options);
-			}
-		}
-
-		return variant;
-	}
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropPlacement = System.Text.Json.JsonEncodedText.Encode("placement");
+	private static readonly System.Text.Json.JsonEncodedText PropMultiValueMode = System.Text.Json.JsonEncodedText.Encode("multi_value_mode");
 
-	public override void Write(Utf8JsonWriter writer, DateDecayFunction value, JsonSerializerOptions options)
+	public override DateDecayFunction Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		writer.WriteStartObject();
-		if (value.Field is not null && value.Placement is not null)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Field> propField = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.QueryDsl.DecayPlacement<Elastic.Clients.Elasticsearch.DateMath, Elastic.Clients.Elasticsearch.Duration>> propPlacement = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.QueryDsl.MultiValueMode?> propMultiValueMode = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (!options.TryGetClientSettings(out var settings))
+			if (propMultiValueMode.TryRead(ref reader, options, PropMultiValueMode))
 			{
-				ThrowHelper.ThrowJsonExceptionForMissingSettings();
+				continue;
 			}
 
-			var propertyName = settings.Inferrer.Field(value.Field);
-			writer.WritePropertyName(propertyName);
-			JsonSerializer.Serialize(writer, value.Placement, options);
+			propField.Initialized = propPlacement.Initialized = true;
+			reader.ReadProperty(options, out propField.Value, out propPlacement.Value);
 		}
 
-		if (value.MultiValueMode is not null)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DateDecayFunction
 		{
-			writer.WritePropertyName("multi_value_mode");
-			JsonSerializer.Serialize(writer, value.MultiValueMode, options);
-		}
+			Field = propField.Value
+,
+			Placement = propPlacement.Value
+,
+			MultiValueMode = propMultiValueMode.Value
+		};
+	}
 
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DateDecayFunction value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropMultiValueMode, value.MultiValueMode);
+		writer.WriteProperty(options, value.Field, value.Placement);
 		writer.WriteEndObject();
 	}
 }
 
 [JsonConverter(typeof(DateDecayFunctionConverter))]
-public sealed partial class DateDecayFunction
+public sealed partial class DateDecayFunction : IDecayFunction
 {
 	public Elastic.Clients.Elasticsearch.Field Field { get; set; }
 
@@ -91,6 +83,8 @@ public sealed partial class DateDecayFunction
 	/// </summary>
 	public Elastic.Clients.Elasticsearch.QueryDsl.MultiValueMode? MultiValueMode { get; set; }
 	public Elastic.Clients.Elasticsearch.QueryDsl.DecayPlacement<Elastic.Clients.Elasticsearch.DateMath, Elastic.Clients.Elasticsearch.Duration> Placement { get; set; }
+
+	public string Type => "datedecayfunction";
 }
 
 public sealed partial class DateDecayFunctionDescriptor<TDocument> : SerializableDescriptor<DateDecayFunctionDescriptor<TDocument>>
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/DateDistanceFeatureQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/DateDistanceFeatureQuery.g.cs
index bfa49e3ec4b..1606b09c462 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/DateDistanceFeatureQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/DateDistanceFeatureQuery.g.cs
@@ -27,7 +27,7 @@
 
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
 
-public sealed partial class DateDistanceFeatureQuery
+public sealed partial class DateDistanceFeatureQuery : IDistanceFeatureQuery
 {
 	/// <summary>
 	/// <para>
@@ -72,6 +72,9 @@ public sealed partial class DateDistanceFeatureQuery
 	public Elastic.Clients.Elasticsearch.Duration Pivot { get; set; }
 	[JsonInclude, JsonPropertyName("_name")]
 	public string? QueryName { get; set; }
+
+	[JsonInclude, JsonPropertyName("")]
+	public string Type => "datedistancefeaturequery";
 }
 
 public sealed partial class DateDistanceFeatureQueryDescriptor<TDocument> : SerializableDescriptor<DateDistanceFeatureQueryDescriptor<TDocument>>
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 537b0a37d46..19028e14ca5 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/DateRangeQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/DateRangeQuery.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,151 +28,135 @@
 
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
 
-internal sealed partial class DateRangeQueryConverter : JsonConverter<DateRangeQuery>
+internal sealed partial class DateRangeQueryConverter : System.Text.Json.Serialization.JsonConverter<DateRangeQuery>
 {
-	public override DateRangeQuery Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropFormat = System.Text.Json.JsonEncodedText.Encode("format");
+	private static readonly System.Text.Json.JsonEncodedText PropGt = System.Text.Json.JsonEncodedText.Encode("gt");
+	private static readonly System.Text.Json.JsonEncodedText PropGte = System.Text.Json.JsonEncodedText.Encode("gte");
+	private static readonly System.Text.Json.JsonEncodedText PropLt = System.Text.Json.JsonEncodedText.Encode("lt");
+	private static readonly System.Text.Json.JsonEncodedText PropLte = System.Text.Json.JsonEncodedText.Encode("lte");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryName = System.Text.Json.JsonEncodedText.Encode("_name");
+	private static readonly System.Text.Json.JsonEncodedText PropRelation = System.Text.Json.JsonEncodedText.Encode("relation");
+	private static readonly System.Text.Json.JsonEncodedText PropTimeZone = System.Text.Json.JsonEncodedText.Encode("time_zone");
+
+	public override DateRangeQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Field> propField = default;
 		reader.Read();
-		var fieldName = reader.GetString();
+		propField.Value = reader.ReadValue<Elastic.Clients.Elasticsearch.Field>(options);
+		propField.Initialized = true;
 		reader.Read();
-		var variant = new DateRangeQuery(fieldName);
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<float?> propBoost = default;
+		LocalJsonProperty<string?> propFormat = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.DateMath?> propGt = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.DateMath?> propGte = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.DateMath?> propLt = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.DateMath?> propLte = default;
+		LocalJsonProperty<string?> propQueryName = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.QueryDsl.RangeRelation?> propRelation = default;
+		LocalJsonProperty<string?> propTimeZone = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propBoost.TryRead(ref reader, options, PropBoost))
 			{
-				var property = reader.GetString();
-				if (property == "boost")
-				{
-					variant.Boost = JsonSerializer.Deserialize<float?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "format")
-				{
-					variant.Format = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "gt")
-				{
-					variant.Gt = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.DateMath?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "gte")
-				{
-					variant.Gte = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.DateMath?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "lt")
-				{
-					variant.Lt = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.DateMath?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "lte")
-				{
-					variant.Lte = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.DateMath?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "_name")
-				{
-					variant.QueryName = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "relation")
-				{
-					variant.Relation = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.RangeRelation?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "time_zone")
-				{
-					variant.TimeZone = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
+				continue;
 			}
-		}
 
-		reader.Read();
-		return variant;
-	}
+			if (propFormat.TryRead(ref reader, options, PropFormat))
+			{
+				continue;
+			}
 
-	public override void Write(Utf8JsonWriter writer, DateRangeQuery value, JsonSerializerOptions options)
-	{
-		if (value.Field is null)
-			throw new JsonException("Unable to serialize DateRangeQuery because the `Field` property is not set. Field name queries must include a valid field name.");
-		if (!options.TryGetClientSettings(out var settings))
-			throw new JsonException("Unable to retrieve client settings required to infer field.");
-		writer.WriteStartObject();
-		writer.WritePropertyName(settings.Inferrer.Field(value.Field));
-		writer.WriteStartObject();
-		if (value.Boost.HasValue)
-		{
-			writer.WritePropertyName("boost");
-			writer.WriteNumberValue(value.Boost.Value);
-		}
+			if (propGt.TryRead(ref reader, options, PropGt))
+			{
+				continue;
+			}
 
-		if (!string.IsNullOrEmpty(value.Format))
-		{
-			writer.WritePropertyName("format");
-			writer.WriteStringValue(value.Format);
-		}
+			if (propGte.TryRead(ref reader, options, PropGte))
+			{
+				continue;
+			}
 
-		if (value.Gt is not null)
-		{
-			writer.WritePropertyName("gt");
-			JsonSerializer.Serialize(writer, value.Gt, options);
-		}
+			if (propLt.TryRead(ref reader, options, PropLt))
+			{
+				continue;
+			}
 
-		if (value.Gte is not null)
-		{
-			writer.WritePropertyName("gte");
-			JsonSerializer.Serialize(writer, value.Gte, options);
-		}
+			if (propLte.TryRead(ref reader, options, PropLte))
+			{
+				continue;
+			}
 
-		if (value.Lt is not null)
-		{
-			writer.WritePropertyName("lt");
-			JsonSerializer.Serialize(writer, value.Lt, options);
-		}
+			if (propQueryName.TryRead(ref reader, options, PropQueryName))
+			{
+				continue;
+			}
 
-		if (value.Lte is not null)
-		{
-			writer.WritePropertyName("lte");
-			JsonSerializer.Serialize(writer, value.Lte, options);
-		}
+			if (propRelation.TryRead(ref reader, options, PropRelation))
+			{
+				continue;
+			}
 
-		if (!string.IsNullOrEmpty(value.QueryName))
-		{
-			writer.WritePropertyName("_name");
-			writer.WriteStringValue(value.QueryName);
-		}
+			if (propTimeZone.TryRead(ref reader, options, PropTimeZone))
+			{
+				continue;
+			}
 
-		if (value.Relation is not null)
-		{
-			writer.WritePropertyName("relation");
-			JsonSerializer.Serialize(writer, value.Relation, options);
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		if (!string.IsNullOrEmpty(value.TimeZone))
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		reader.Read();
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DateRangeQuery
 		{
-			writer.WritePropertyName("time_zone");
-			writer.WriteStringValue(value.TimeZone);
-		}
+			Boost = propBoost.Value
+,
+			Field = propField.Value
+,
+			Format = propFormat.Value
+,
+			Gt = propGt.Value
+,
+			Gte = propGte.Value
+,
+			Lt = propLt.Value
+,
+			Lte = propLte.Value
+,
+			QueryName = propQueryName.Value
+,
+			Relation = propRelation.Value
+,
+			TimeZone = propTimeZone.Value
+		};
+	}
 
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DateRangeQuery value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WritePropertyName(options, value.Field);
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropFormat, value.Format);
+		writer.WriteProperty(options, PropGt, value.Gt);
+		writer.WriteProperty(options, PropGte, value.Gte);
+		writer.WriteProperty(options, PropLt, value.Lt);
+		writer.WriteProperty(options, PropLte, value.Lte);
+		writer.WriteProperty(options, PropQueryName, value.QueryName);
+		writer.WriteProperty(options, PropRelation, value.Relation);
+		writer.WriteProperty(options, PropTimeZone, value.TimeZone);
 		writer.WriteEndObject();
 		writer.WriteEndObject();
 	}
 }
 
 [JsonConverter(typeof(DateRangeQueryConverter))]
-public sealed partial class DateRangeQuery
+public sealed partial class DateRangeQuery : IRangeQuery
 {
 	public DateRangeQuery(Elastic.Clients.Elasticsearch.Field field)
 	{
@@ -180,6 +165,10 @@ public DateRangeQuery(Elastic.Clients.Elasticsearch.Field field)
 		Field = field;
 	}
 
+	internal DateRangeQuery()
+	{
+	}
+
 	/// <summary>
 	/// <para>
 	/// Floating point number used to decrease or increase the relevance scores of the query.
@@ -240,6 +229,8 @@ public DateRangeQuery(Elastic.Clients.Elasticsearch.Field field)
 	/// </para>
 	/// </summary>
 	public string? TimeZone { get; set; }
+
+	public string Type => "daterangequery";
 }
 
 public sealed partial class DateRangeQueryDescriptor<TDocument> : SerializableDescriptor<DateRangeQueryDescriptor<TDocument>>
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/DecayFunction.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/DecayFunction.g.cs
new file mode 100644
index 00000000000..055e964fc45
--- /dev/null
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/DecayFunction.g.cs
@@ -0,0 +1,64 @@
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information.
+//
+// ███╗   ██╗ ██████╗ ████████╗██╗ ██████╗███████╗
+// ████╗  ██║██╔═══██╗╚══██╔══╝██║██╔════╝██╔════╝
+// ██╔██╗ ██║██║   ██║   ██║   ██║██║     █████╗
+// ██║╚██╗██║██║   ██║   ██║   ██║██║     ██╔══╝
+// ██║ ╚████║╚██████╔╝   ██║   ██║╚██████╗███████╗
+// ╚═╝  ╚═══╝ ╚═════╝    ╚═╝   ╚═╝ ╚═════╝╚══════╝
+// ------------------------------------------------
+//
+// This file is automatically generated.
+// Please do not edit these files manually.
+//
+// ------------------------------------------------
+
+#nullable restore
+
+using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
+using Elastic.Clients.Elasticsearch.Serialization;
+using System;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Elastic.Clients.Elasticsearch.QueryDsl;
+
+[JsonConverter(typeof(DecayFunctionConverter))]
+public partial interface IDecayFunction
+{
+	public string? Type { get; }
+}
+
+internal sealed partial class DecayFunctionConverter : System.Text.Json.Serialization.JsonConverter<IDecayFunction>
+{
+	public override IDecayFunction Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		return reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.UntypedDecayFunction>(options);
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IDecayFunction value, System.Text.Json.JsonSerializerOptions options)
+	{
+		switch (value)
+		{
+			case Elastic.Clients.Elasticsearch.QueryDsl.DateDecayFunction v:
+				writer.WriteValue(options, v);
+				break;
+			case Elastic.Clients.Elasticsearch.QueryDsl.GeoDecayFunction v:
+				writer.WriteValue(options, v);
+				break;
+			case Elastic.Clients.Elasticsearch.QueryDsl.NumericDecayFunction v:
+				writer.WriteValue(options, v);
+				break;
+			case Elastic.Clients.Elasticsearch.QueryDsl.UntypedDecayFunction v:
+				writer.WriteValue(options, v);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.Type}' is not supported for type '{nameof(IDecayFunction)}'.");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/DecayPlacement.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/DecayPlacement.g.cs
index cd6e15ce644..2f4583546b1 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/DecayPlacement.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/DecayPlacement.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,87 @@
 
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
 
+internal sealed partial class DecayPlacementConverter<TOrigin, TScale> : System.Text.Json.Serialization.JsonConverter<DecayPlacement<TOrigin, TScale>>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropDecay = System.Text.Json.JsonEncodedText.Encode("decay");
+	private static readonly System.Text.Json.JsonEncodedText PropOffset = System.Text.Json.JsonEncodedText.Encode("offset");
+	private static readonly System.Text.Json.JsonEncodedText PropOrigin = System.Text.Json.JsonEncodedText.Encode("origin");
+	private static readonly System.Text.Json.JsonEncodedText PropScale = System.Text.Json.JsonEncodedText.Encode("scale");
+
+	public override DecayPlacement<TOrigin, TScale> Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<double?> propDecay = default;
+		LocalJsonProperty<TScale?> propOffset = default;
+		LocalJsonProperty<TOrigin?> propOrigin = default;
+		LocalJsonProperty<TScale?> propScale = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propDecay.TryRead(ref reader, options, PropDecay))
+			{
+				continue;
+			}
+
+			if (propOffset.TryRead(ref reader, options, PropOffset, typeof(SourceMarker<TScale?>)))
+			{
+				continue;
+			}
+
+			if (propOrigin.TryRead(ref reader, options, PropOrigin, typeof(SourceMarker<TOrigin?>)))
+			{
+				continue;
+			}
+
+			if (propScale.TryRead(ref reader, options, PropScale, typeof(SourceMarker<TScale?>)))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new DecayPlacement<TOrigin, TScale>
+		{
+			Decay = propDecay.Value
+,
+			Offset = propOffset.Value
+,
+			Origin = propOrigin.Value
+,
+			Scale = propScale.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, DecayPlacement<TOrigin, TScale> value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDecay, value.Decay);
+		writer.WriteProperty(options, PropOffset, value.Offset, typeof(SourceMarker<TScale?>));
+		writer.WriteProperty(options, PropOrigin, value.Origin, typeof(SourceMarker<TOrigin?>));
+		writer.WriteProperty(options, PropScale, value.Scale, typeof(SourceMarker<TScale?>));
+		writer.WriteEndObject();
+	}
+}
+
+internal sealed partial class DecayPlacementConverterFactory : System.Text.Json.Serialization.JsonConverterFactory
+{
+	public override bool CanConvert(System.Type typeToConvert)
+	{
+		return typeToConvert.IsGenericType && typeToConvert.GetGenericTypeDefinition() == typeof(DecayPlacement<,>);
+	}
+
+	public override System.Text.Json.Serialization.JsonConverter CreateConverter(System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		var args = typeToConvert.GetGenericArguments();
+#pragma warning disable IL3050
+		var converter = (System.Text.Json.Serialization.JsonConverter)System.Activator.CreateInstance(typeof(DecayPlacementConverter<,>).MakeGenericType(args[0], args[1]), System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public, binder: null, args: null, culture: null)!;
+#pragma warning restore IL3050
+		return converter;
+	}
+}
+
+[JsonConverter(typeof(DecayPlacementConverterFactory))]
 public sealed partial class DecayPlacement<TOrigin, TScale>
 {
 	/// <summary>
@@ -34,7 +116,6 @@ public sealed partial class DecayPlacement<TOrigin, TScale>
 	/// Defines how documents are scored at the distance given at scale.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("decay")]
 	public double? Decay { get; set; }
 
 	/// <summary>
@@ -42,8 +123,6 @@ public sealed partial class DecayPlacement<TOrigin, TScale>
 	/// If defined, the decay function will only compute the decay function for documents with a distance greater than the defined <c>offset</c>.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("offset")]
-	[SourceConverter]
 	public TScale? Offset { get; set; }
 
 	/// <summary>
@@ -51,8 +130,6 @@ public sealed partial class DecayPlacement<TOrigin, TScale>
 	/// The point of origin used for calculating distance. Must be given as a number for numeric field, date for date fields and geo point for geo fields.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("origin")]
-	[SourceConverter]
 	public TOrigin? Origin { get; set; }
 
 	/// <summary>
@@ -60,7 +137,5 @@ public sealed partial class DecayPlacement<TOrigin, TScale>
 	/// Defines the distance from origin + offset at which the computed score will equal <c>decay</c> parameter.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("scale")]
-	[SourceConverter]
 	public TScale? Scale { get; set; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/DistanceFeatureQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/DistanceFeatureQuery.g.cs
new file mode 100644
index 00000000000..79493c30358
--- /dev/null
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/DistanceFeatureQuery.g.cs
@@ -0,0 +1,61 @@
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information.
+//
+// ███╗   ██╗ ██████╗ ████████╗██╗ ██████╗███████╗
+// ████╗  ██║██╔═══██╗╚══██╔══╝██║██╔════╝██╔════╝
+// ██╔██╗ ██║██║   ██║   ██║   ██║██║     █████╗
+// ██║╚██╗██║██║   ██║   ██║   ██║██║     ██╔══╝
+// ██║ ╚████║╚██████╔╝   ██║   ██║╚██████╗███████╗
+// ╚═╝  ╚═══╝ ╚═════╝    ╚═╝   ╚═╝ ╚═════╝╚══════╝
+// ------------------------------------------------
+//
+// This file is automatically generated.
+// Please do not edit these files manually.
+//
+// ------------------------------------------------
+
+#nullable restore
+
+using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
+using Elastic.Clients.Elasticsearch.Serialization;
+using System;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Elastic.Clients.Elasticsearch.QueryDsl;
+
+[JsonConverter(typeof(DistanceFeatureQueryConverter))]
+public partial interface IDistanceFeatureQuery
+{
+	public string? Type { get; }
+}
+
+internal sealed partial class DistanceFeatureQueryConverter : System.Text.Json.Serialization.JsonConverter<IDistanceFeatureQuery>
+{
+	public override IDistanceFeatureQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		return reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.UntypedDistanceFeatureQuery>(options);
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IDistanceFeatureQuery value, System.Text.Json.JsonSerializerOptions options)
+	{
+		switch (value)
+		{
+			case Elastic.Clients.Elasticsearch.QueryDsl.DateDistanceFeatureQuery v:
+				writer.WriteValue(options, v);
+				break;
+			case Elastic.Clients.Elasticsearch.QueryDsl.GeoDistanceFeatureQuery v:
+				writer.WriteValue(options, v);
+				break;
+			case Elastic.Clients.Elasticsearch.QueryDsl.UntypedDistanceFeatureQuery v:
+				writer.WriteValue(options, v);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.Type}' is not supported for type '{nameof(IDistanceFeatureQuery)}'.");
+		}
+	}
+}
\ No newline at end of file
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 16db583ecbe..d1e2bc4f7b5 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/FieldAndFormat.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/FieldAndFormat.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,11 +28,75 @@
 
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
 
+internal sealed partial class FieldAndFormatConverter : System.Text.Json.Serialization.JsonConverter<FieldAndFormat>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropFormat = System.Text.Json.JsonEncodedText.Encode("format");
+	private static readonly System.Text.Json.JsonEncodedText PropIncludeUnmapped = System.Text.Json.JsonEncodedText.Encode("include_unmapped");
+
+	public override FieldAndFormat Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		var readerSnapshot = reader;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Field> propField = default;
+		LocalJsonProperty<string?> propFormat = default;
+		LocalJsonProperty<bool?> propIncludeUnmapped = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propField.TryRead(ref reader, options, PropField))
+			{
+				continue;
+			}
+
+			if (propFormat.TryRead(ref reader, options, PropFormat))
+			{
+				continue;
+			}
+
+			if (propIncludeUnmapped.TryRead(ref reader, options, PropIncludeUnmapped))
+			{
+				continue;
+			}
+
+			try
+			{
+				reader = readerSnapshot;
+				var result = reader.ReadValue<Elastic.Clients.Elasticsearch.Field>(options);
+				return new FieldAndFormat { Field = result };
+			}
+			catch (System.Text.Json.JsonException)
+			{
+				throw;
+			}
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new FieldAndFormat
+		{
+			Field = propField.Value
+,
+			Format = propFormat.Value
+,
+			IncludeUnmapped = propIncludeUnmapped.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, FieldAndFormat value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropField, value.Field);
+		writer.WriteProperty(options, PropFormat, value.Format);
+		writer.WriteProperty(options, PropIncludeUnmapped, value.IncludeUnmapped);
+		writer.WriteEndObject();
+	}
+}
+
 /// <summary>
 /// <para>
 /// A reference to a field with formatting instructions on how to return the value
 /// </para>
 /// </summary>
+[JsonConverter(typeof(FieldAndFormatConverter))]
 public sealed partial class FieldAndFormat
 {
 	/// <summary>
@@ -39,7 +104,6 @@ public sealed partial class FieldAndFormat
 	/// 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>
@@ -47,9 +111,7 @@ public sealed partial class FieldAndFormat
 	/// 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; }
 }
 
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 15eea6a6ae2..2d8fc9a9957 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/FunctionScore.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/FunctionScore.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -39,22 +40,29 @@ internal FunctionScore(string variantName, object variant)
 			throw new ArgumentNullException(nameof(variant));
 		if (string.IsNullOrWhiteSpace(variantName))
 			throw new ArgumentException("Variant name must not be empty or whitespace.");
-		VariantName = variantName;
+		VariantType = variantName;
 		Variant = variant;
 	}
 
-	internal object Variant { get; }
-	internal string VariantName { get; }
+	internal FunctionScore()
+	{
+	}
+
+	public object Variant { get; internal set; }
+	public string VariantType { get; internal set; }
 
+	public static FunctionScore Exp(Elastic.Clients.Elasticsearch.QueryDsl.IDecayFunction decayFunction) => new FunctionScore("exp", decayFunction);
 	public static FunctionScore Exp(Elastic.Clients.Elasticsearch.QueryDsl.UntypedDecayFunction decayFunction) => new FunctionScore("exp", decayFunction);
 	public static FunctionScore Exp(Elastic.Clients.Elasticsearch.QueryDsl.DateDecayFunction decayFunction) => new FunctionScore("exp", decayFunction);
 	public static FunctionScore Exp(Elastic.Clients.Elasticsearch.QueryDsl.NumericDecayFunction decayFunction) => new FunctionScore("exp", decayFunction);
 	public static FunctionScore Exp(Elastic.Clients.Elasticsearch.QueryDsl.GeoDecayFunction decayFunction) => new FunctionScore("exp", decayFunction);
 	public static FunctionScore FieldValueFactor(Elastic.Clients.Elasticsearch.QueryDsl.FieldValueFactorScoreFunction fieldValueFactorScoreFunction) => new FunctionScore("field_value_factor", fieldValueFactorScoreFunction);
+	public static FunctionScore Gauss(Elastic.Clients.Elasticsearch.QueryDsl.IDecayFunction decayFunction) => new FunctionScore("gauss", decayFunction);
 	public static FunctionScore Gauss(Elastic.Clients.Elasticsearch.QueryDsl.UntypedDecayFunction decayFunction) => new FunctionScore("gauss", decayFunction);
 	public static FunctionScore Gauss(Elastic.Clients.Elasticsearch.QueryDsl.DateDecayFunction decayFunction) => new FunctionScore("gauss", decayFunction);
 	public static FunctionScore Gauss(Elastic.Clients.Elasticsearch.QueryDsl.NumericDecayFunction decayFunction) => new FunctionScore("gauss", decayFunction);
 	public static FunctionScore Gauss(Elastic.Clients.Elasticsearch.QueryDsl.GeoDecayFunction decayFunction) => new FunctionScore("gauss", decayFunction);
+	public static FunctionScore Linear(Elastic.Clients.Elasticsearch.QueryDsl.IDecayFunction decayFunction) => new FunctionScore("linear", decayFunction);
 	public static FunctionScore Linear(Elastic.Clients.Elasticsearch.QueryDsl.UntypedDecayFunction decayFunction) => new FunctionScore("linear", decayFunction);
 	public static FunctionScore Linear(Elastic.Clients.Elasticsearch.QueryDsl.DateDecayFunction decayFunction) => new FunctionScore("linear", decayFunction);
 	public static FunctionScore Linear(Elastic.Clients.Elasticsearch.QueryDsl.NumericDecayFunction decayFunction) => new FunctionScore("linear", decayFunction);
@@ -80,137 +88,129 @@ public bool TryGet<T>([NotNullWhen(true)] out T? result) where T : class
 	}
 }
 
-internal sealed partial class FunctionScoreConverter : JsonConverter<FunctionScore>
+internal sealed partial class FunctionScoreConverter : System.Text.Json.Serialization.JsonConverter<FunctionScore>
 {
-	public override FunctionScore Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropFilter = System.Text.Json.JsonEncodedText.Encode("filter");
+	private static readonly System.Text.Json.JsonEncodedText PropWeight = System.Text.Json.JsonEncodedText.Encode("weight");
+	private static readonly System.Text.Json.JsonEncodedText VariantExp = System.Text.Json.JsonEncodedText.Encode("exp");
+	private static readonly System.Text.Json.JsonEncodedText VariantFieldValueFactor = System.Text.Json.JsonEncodedText.Encode("field_value_factor");
+	private static readonly System.Text.Json.JsonEncodedText VariantGauss = System.Text.Json.JsonEncodedText.Encode("gauss");
+	private static readonly System.Text.Json.JsonEncodedText VariantLinear = System.Text.Json.JsonEncodedText.Encode("linear");
+	private static readonly System.Text.Json.JsonEncodedText VariantRandomScore = System.Text.Json.JsonEncodedText.Encode("random_score");
+	private static readonly System.Text.Json.JsonEncodedText VariantScriptScore = System.Text.Json.JsonEncodedText.Encode("script_score");
+
+	public override FunctionScore Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-		{
-			throw new JsonException("Expected start token.");
-		}
-
-		object? variantValue = default;
-		string? variantNameValue = default;
-		Elastic.Clients.Elasticsearch.QueryDsl.Query? filterValue = default;
-		double? weightValue = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.QueryDsl.Query?> propFilter = default;
+		LocalJsonProperty<double?> propWeight = default;
+		var variantType = string.Empty;
+		object? variant = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token.");
-			}
-
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token representing the name of an Elasticsearch field.");
-			}
-
-			var propertyName = reader.GetString();
-			reader.Read();
-			if (propertyName == "filter")
+			if (propFilter.TryRead(ref reader, options, PropFilter))
 			{
-				filterValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.Query?>(ref reader, options);
 				continue;
 			}
 
-			if (propertyName == "weight")
+			if (propWeight.TryRead(ref reader, options, PropWeight))
 			{
-				weightValue = JsonSerializer.Deserialize<double?>(ref reader, options);
 				continue;
 			}
 
-			if (propertyName == "exp")
+			if (reader.ValueTextEquals(VariantExp))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.UntypedDecayFunction>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantExp.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.IDecayFunction>(options);
 				continue;
 			}
 
-			if (propertyName == "field_value_factor")
+			if (reader.ValueTextEquals(VariantFieldValueFactor))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.FieldValueFactorScoreFunction?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantFieldValueFactor.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.FieldValueFactorScoreFunction?>(options);
 				continue;
 			}
 
-			if (propertyName == "gauss")
+			if (reader.ValueTextEquals(VariantGauss))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.UntypedDecayFunction>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantGauss.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.IDecayFunction>(options);
 				continue;
 			}
 
-			if (propertyName == "linear")
+			if (reader.ValueTextEquals(VariantLinear))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.UntypedDecayFunction>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantLinear.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.IDecayFunction>(options);
 				continue;
 			}
 
-			if (propertyName == "random_score")
+			if (reader.ValueTextEquals(VariantRandomScore))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.RandomScoreFunction?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantRandomScore.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.RandomScoreFunction?>(options);
 				continue;
 			}
 
-			if (propertyName == "script_score")
+			if (reader.ValueTextEquals(VariantScriptScore))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.ScriptScoreFunction?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantScriptScore.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.ScriptScoreFunction?>(options);
 				continue;
 			}
 
-			throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'FunctionScore' from the response.");
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		var result = new FunctionScore(variantNameValue, variantValue);
-		result.Filter = filterValue;
-		result.Weight = weightValue;
-		return result;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new FunctionScore
+		{
+			VariantType = variantType,
+			Variant = variant,
+			Filter = propFilter.Value
+,
+			Weight = propWeight.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, FunctionScore value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, FunctionScore value, System.Text.Json.JsonSerializerOptions options)
 	{
 		writer.WriteStartObject();
-		if (value.Filter is not null)
-		{
-			writer.WritePropertyName("filter");
-			JsonSerializer.Serialize(writer, value.Filter, options);
-		}
-
-		if (value.Weight.HasValue)
+		switch (value.VariantType)
 		{
-			writer.WritePropertyName("weight");
-			writer.WriteNumberValue(value.Weight.Value);
-		}
-
-		if (value.VariantName is not null && value.Variant is not null)
-		{
-			writer.WritePropertyName(value.VariantName);
-			switch (value.VariantName)
-			{
-				case "exp":
-					JsonSerializer.Serialize(writer, value.Variant, value.Variant.GetType(), options);
-					break;
-				case "field_value_factor":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.FieldValueFactorScoreFunction>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.FieldValueFactorScoreFunction)value.Variant, options);
-					break;
-				case "gauss":
-					JsonSerializer.Serialize(writer, value.Variant, value.Variant.GetType(), options);
-					break;
-				case "linear":
-					JsonSerializer.Serialize(writer, value.Variant, value.Variant.GetType(), options);
-					break;
-				case "random_score":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.RandomScoreFunction>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.RandomScoreFunction)value.Variant, options);
-					break;
-				case "script_score":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.ScriptScoreFunction>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.ScriptScoreFunction)value.Variant, options);
-					break;
-			}
+			case "":
+				break;
+			case "exp":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.IDecayFunction)value.Variant);
+				break;
+			case "field_value_factor":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.FieldValueFactorScoreFunction?)value.Variant);
+				break;
+			case "gauss":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.IDecayFunction)value.Variant);
+				break;
+			case "linear":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.IDecayFunction)value.Variant);
+				break;
+			case "random_score":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.RandomScoreFunction?)value.Variant);
+				break;
+			case "script_score":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.ScriptScoreFunction?)value.Variant);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.VariantType}' is not supported for type '{nameof(FunctionScore)}'.");
 		}
 
+		writer.WriteProperty(options, PropFilter, value.Filter);
+		writer.WriteProperty(options, PropWeight, value.Weight);
 		writer.WriteEndObject();
 	}
 }
@@ -261,16 +261,19 @@ public FunctionScoreDescriptor<TDocument> Weight(double? weight)
 		return Self;
 	}
 
+	public FunctionScoreDescriptor<TDocument> Exp(Elastic.Clients.Elasticsearch.QueryDsl.IDecayFunction decayFunction) => Set(decayFunction, "exp");
 	public FunctionScoreDescriptor<TDocument> Exp(Elastic.Clients.Elasticsearch.QueryDsl.UntypedDecayFunction decayFunction) => Set(decayFunction, "exp");
 	public FunctionScoreDescriptor<TDocument> Exp(Elastic.Clients.Elasticsearch.QueryDsl.DateDecayFunction decayFunction) => Set(decayFunction, "exp");
 	public FunctionScoreDescriptor<TDocument> Exp(Elastic.Clients.Elasticsearch.QueryDsl.NumericDecayFunction decayFunction) => Set(decayFunction, "exp");
 	public FunctionScoreDescriptor<TDocument> Exp(Elastic.Clients.Elasticsearch.QueryDsl.GeoDecayFunction decayFunction) => Set(decayFunction, "exp");
 	public FunctionScoreDescriptor<TDocument> FieldValueFactor(Elastic.Clients.Elasticsearch.QueryDsl.FieldValueFactorScoreFunction fieldValueFactorScoreFunction) => Set(fieldValueFactorScoreFunction, "field_value_factor");
 	public FunctionScoreDescriptor<TDocument> FieldValueFactor(Action<Elastic.Clients.Elasticsearch.QueryDsl.FieldValueFactorScoreFunctionDescriptor<TDocument>> configure) => Set(configure, "field_value_factor");
+	public FunctionScoreDescriptor<TDocument> Gauss(Elastic.Clients.Elasticsearch.QueryDsl.IDecayFunction decayFunction) => Set(decayFunction, "gauss");
 	public FunctionScoreDescriptor<TDocument> Gauss(Elastic.Clients.Elasticsearch.QueryDsl.UntypedDecayFunction decayFunction) => Set(decayFunction, "gauss");
 	public FunctionScoreDescriptor<TDocument> Gauss(Elastic.Clients.Elasticsearch.QueryDsl.DateDecayFunction decayFunction) => Set(decayFunction, "gauss");
 	public FunctionScoreDescriptor<TDocument> Gauss(Elastic.Clients.Elasticsearch.QueryDsl.NumericDecayFunction decayFunction) => Set(decayFunction, "gauss");
 	public FunctionScoreDescriptor<TDocument> Gauss(Elastic.Clients.Elasticsearch.QueryDsl.GeoDecayFunction decayFunction) => Set(decayFunction, "gauss");
+	public FunctionScoreDescriptor<TDocument> Linear(Elastic.Clients.Elasticsearch.QueryDsl.IDecayFunction decayFunction) => Set(decayFunction, "linear");
 	public FunctionScoreDescriptor<TDocument> Linear(Elastic.Clients.Elasticsearch.QueryDsl.UntypedDecayFunction decayFunction) => Set(decayFunction, "linear");
 	public FunctionScoreDescriptor<TDocument> Linear(Elastic.Clients.Elasticsearch.QueryDsl.DateDecayFunction decayFunction) => Set(decayFunction, "linear");
 	public FunctionScoreDescriptor<TDocument> Linear(Elastic.Clients.Elasticsearch.QueryDsl.NumericDecayFunction decayFunction) => Set(decayFunction, "linear");
@@ -358,16 +361,19 @@ public FunctionScoreDescriptor Weight(double? weight)
 		return Self;
 	}
 
+	public FunctionScoreDescriptor Exp(Elastic.Clients.Elasticsearch.QueryDsl.IDecayFunction decayFunction) => Set(decayFunction, "exp");
 	public FunctionScoreDescriptor Exp(Elastic.Clients.Elasticsearch.QueryDsl.UntypedDecayFunction decayFunction) => Set(decayFunction, "exp");
 	public FunctionScoreDescriptor Exp(Elastic.Clients.Elasticsearch.QueryDsl.DateDecayFunction decayFunction) => Set(decayFunction, "exp");
 	public FunctionScoreDescriptor Exp(Elastic.Clients.Elasticsearch.QueryDsl.NumericDecayFunction decayFunction) => Set(decayFunction, "exp");
 	public FunctionScoreDescriptor Exp(Elastic.Clients.Elasticsearch.QueryDsl.GeoDecayFunction decayFunction) => Set(decayFunction, "exp");
 	public FunctionScoreDescriptor FieldValueFactor(Elastic.Clients.Elasticsearch.QueryDsl.FieldValueFactorScoreFunction fieldValueFactorScoreFunction) => Set(fieldValueFactorScoreFunction, "field_value_factor");
 	public FunctionScoreDescriptor FieldValueFactor<TDocument>(Action<Elastic.Clients.Elasticsearch.QueryDsl.FieldValueFactorScoreFunctionDescriptor> configure) => Set(configure, "field_value_factor");
+	public FunctionScoreDescriptor Gauss(Elastic.Clients.Elasticsearch.QueryDsl.IDecayFunction decayFunction) => Set(decayFunction, "gauss");
 	public FunctionScoreDescriptor Gauss(Elastic.Clients.Elasticsearch.QueryDsl.UntypedDecayFunction decayFunction) => Set(decayFunction, "gauss");
 	public FunctionScoreDescriptor Gauss(Elastic.Clients.Elasticsearch.QueryDsl.DateDecayFunction decayFunction) => Set(decayFunction, "gauss");
 	public FunctionScoreDescriptor Gauss(Elastic.Clients.Elasticsearch.QueryDsl.NumericDecayFunction decayFunction) => Set(decayFunction, "gauss");
 	public FunctionScoreDescriptor Gauss(Elastic.Clients.Elasticsearch.QueryDsl.GeoDecayFunction decayFunction) => Set(decayFunction, "gauss");
+	public FunctionScoreDescriptor Linear(Elastic.Clients.Elasticsearch.QueryDsl.IDecayFunction decayFunction) => Set(decayFunction, "linear");
 	public FunctionScoreDescriptor Linear(Elastic.Clients.Elasticsearch.QueryDsl.UntypedDecayFunction decayFunction) => Set(decayFunction, "linear");
 	public FunctionScoreDescriptor Linear(Elastic.Clients.Elasticsearch.QueryDsl.DateDecayFunction decayFunction) => Set(decayFunction, "linear");
 	public FunctionScoreDescriptor Linear(Elastic.Clients.Elasticsearch.QueryDsl.NumericDecayFunction decayFunction) => Set(decayFunction, "linear");
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 0b27f35c415..97935dfa6d4 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/FunctionScoreQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/FunctionScoreQuery.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,116 @@
 
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
 
+internal sealed partial class FunctionScoreQueryConverter : System.Text.Json.Serialization.JsonConverter<FunctionScoreQuery>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropBoostMode = System.Text.Json.JsonEncodedText.Encode("boost_mode");
+	private static readonly System.Text.Json.JsonEncodedText PropFunctions = System.Text.Json.JsonEncodedText.Encode("functions");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxBoost = System.Text.Json.JsonEncodedText.Encode("max_boost");
+	private static readonly System.Text.Json.JsonEncodedText PropMinScore = System.Text.Json.JsonEncodedText.Encode("min_score");
+	private static readonly System.Text.Json.JsonEncodedText PropQuery = System.Text.Json.JsonEncodedText.Encode("query");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryName = System.Text.Json.JsonEncodedText.Encode("_name");
+	private static readonly System.Text.Json.JsonEncodedText PropScoreMode = System.Text.Json.JsonEncodedText.Encode("score_mode");
+
+	public override FunctionScoreQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		if (reader.TokenType is not System.Text.Json.JsonTokenType.StartObject)
+		{
+			var value = reader.ReadValue<ICollection<Elastic.Clients.Elasticsearch.QueryDsl.FunctionScore>?>(options);
+			return new FunctionScoreQuery { Functions = value };
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<float?> propBoost = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.QueryDsl.FunctionBoostMode?> propBoostMode = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.QueryDsl.FunctionScore>?> propFunctions = default;
+		LocalJsonProperty<double?> propMaxBoost = default;
+		LocalJsonProperty<double?> propMinScore = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.QueryDsl.Query?> propQuery = default;
+		LocalJsonProperty<string?> propQueryName = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.QueryDsl.FunctionScoreMode?> propScoreMode = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
+
+			if (propBoostMode.TryRead(ref reader, options, PropBoostMode))
+			{
+				continue;
+			}
+
+			if (propFunctions.TryRead(ref reader, options, PropFunctions))
+			{
+				continue;
+			}
+
+			if (propMaxBoost.TryRead(ref reader, options, PropMaxBoost))
+			{
+				continue;
+			}
+
+			if (propMinScore.TryRead(ref reader, options, PropMinScore))
+			{
+				continue;
+			}
+
+			if (propQuery.TryRead(ref reader, options, PropQuery))
+			{
+				continue;
+			}
+
+			if (propQueryName.TryRead(ref reader, options, PropQueryName))
+			{
+				continue;
+			}
+
+			if (propScoreMode.TryRead(ref reader, options, PropScoreMode))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new FunctionScoreQuery
+		{
+			Boost = propBoost.Value
+,
+			BoostMode = propBoostMode.Value
+,
+			Functions = propFunctions.Value
+,
+			MaxBoost = propMaxBoost.Value
+,
+			MinScore = propMinScore.Value
+,
+			Query = propQuery.Value
+,
+			QueryName = propQueryName.Value
+,
+			ScoreMode = propScoreMode.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, FunctionScoreQuery value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropBoostMode, value.BoostMode);
+		writer.WriteProperty(options, PropFunctions, value.Functions);
+		writer.WriteProperty(options, PropMaxBoost, value.MaxBoost);
+		writer.WriteProperty(options, PropMinScore, value.MinScore);
+		writer.WriteProperty(options, PropQuery, value.Query);
+		writer.WriteProperty(options, PropQueryName, value.QueryName);
+		writer.WriteProperty(options, PropScoreMode, value.ScoreMode);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(FunctionScoreQueryConverter))]
 public sealed partial class FunctionScoreQuery
 {
 	/// <summary>
@@ -37,7 +148,6 @@ public sealed partial class FunctionScoreQuery
 	/// A value greater than 1.0 increases the relevance score.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("boost")]
 	public float? Boost { get; set; }
 
 	/// <summary>
@@ -45,7 +155,6 @@ public sealed partial class FunctionScoreQuery
 	/// Defines how he newly computed score is combined with the score of the query
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("boost_mode")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.FunctionBoostMode? BoostMode { get; set; }
 
 	/// <summary>
@@ -53,7 +162,6 @@ public sealed partial class FunctionScoreQuery
 	/// One or more functions that compute a new score for each document returned by the query.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("functions")]
 	public ICollection<Elastic.Clients.Elasticsearch.QueryDsl.FunctionScore>? Functions { get; set; }
 
 	/// <summary>
@@ -61,7 +169,6 @@ public sealed partial class FunctionScoreQuery
 	/// Restricts the new score to not exceed the provided limit.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("max_boost")]
 	public double? MaxBoost { get; set; }
 
 	/// <summary>
@@ -69,7 +176,6 @@ public sealed partial class FunctionScoreQuery
 	/// Excludes documents that do not meet the provided score threshold.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("min_score")]
 	public double? MinScore { get; set; }
 
 	/// <summary>
@@ -77,9 +183,7 @@ public sealed partial class FunctionScoreQuery
 	/// A query that determines the documents for which a new score is computed.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("query")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.Query? Query { get; set; }
-	[JsonInclude, JsonPropertyName("_name")]
 	public string? QueryName { get; set; }
 
 	/// <summary>
@@ -87,7 +191,6 @@ public sealed partial class FunctionScoreQuery
 	/// Specifies how the computed scores are combined
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("score_mode")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.FunctionScoreMode? ScoreMode { get; set; }
 
 	public static implicit operator Elastic.Clients.Elasticsearch.QueryDsl.Query(FunctionScoreQuery functionScoreQuery) => Elastic.Clients.Elasticsearch.QueryDsl.Query.FunctionScore(functionScoreQuery);
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 511e2e5009d..a12f08ac11b 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/FuzzyQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/FuzzyQuery.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,128 +28,125 @@
 
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
 
-internal sealed partial class FuzzyQueryConverter : JsonConverter<FuzzyQuery>
+internal sealed partial class FuzzyQueryConverter : System.Text.Json.Serialization.JsonConverter<FuzzyQuery>
 {
-	public override FuzzyQuery Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropFuzziness = System.Text.Json.JsonEncodedText.Encode("fuzziness");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxExpansions = System.Text.Json.JsonEncodedText.Encode("max_expansions");
+	private static readonly System.Text.Json.JsonEncodedText PropPrefixLength = System.Text.Json.JsonEncodedText.Encode("prefix_length");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryName = System.Text.Json.JsonEncodedText.Encode("_name");
+	private static readonly System.Text.Json.JsonEncodedText PropRewrite = System.Text.Json.JsonEncodedText.Encode("rewrite");
+	private static readonly System.Text.Json.JsonEncodedText PropTranspositions = System.Text.Json.JsonEncodedText.Encode("transpositions");
+	private static readonly System.Text.Json.JsonEncodedText PropValue = System.Text.Json.JsonEncodedText.Encode("value");
+
+	public override FuzzyQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Field> propField = default;
 		reader.Read();
-		var fieldName = reader.GetString();
+		propField.Value = reader.ReadValue<Elastic.Clients.Elasticsearch.Field>(options);
+		propField.Initialized = true;
 		reader.Read();
-		var variant = new FuzzyQuery(fieldName);
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		if (reader.TokenType is not System.Text.Json.JsonTokenType.StartObject)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			var value = reader.ReadValue<object>(options);
+			reader.Read();
+			return new FuzzyQuery { Value = value };
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<float?> propBoost = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Fuzziness?> propFuzziness = default;
+		LocalJsonProperty<int?> propMaxExpansions = default;
+		LocalJsonProperty<int?> propPrefixLength = default;
+		LocalJsonProperty<string?> propQueryName = default;
+		LocalJsonProperty<string?> propRewrite = default;
+		LocalJsonProperty<bool?> propTranspositions = default;
+		LocalJsonProperty<object> propValue = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBoost.TryRead(ref reader, options, PropBoost))
 			{
-				var property = reader.GetString();
-				if (property == "boost")
-				{
-					variant.Boost = JsonSerializer.Deserialize<float?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "fuzziness")
-				{
-					variant.Fuzziness = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Fuzziness?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "max_expansions")
-				{
-					variant.MaxExpansions = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "prefix_length")
-				{
-					variant.PrefixLength = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "_name")
-				{
-					variant.QueryName = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "rewrite")
-				{
-					variant.Rewrite = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "transpositions")
-				{
-					variant.Transpositions = JsonSerializer.Deserialize<bool?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "value")
-				{
-					variant.Value = JsonSerializer.Deserialize<object>(ref reader, options);
-					continue;
-				}
+				continue;
 			}
-		}
 
-		reader.Read();
-		return variant;
-	}
+			if (propFuzziness.TryRead(ref reader, options, PropFuzziness))
+			{
+				continue;
+			}
 
-	public override void Write(Utf8JsonWriter writer, FuzzyQuery value, JsonSerializerOptions options)
-	{
-		if (value.Field is null)
-			throw new JsonException("Unable to serialize FuzzyQuery because the `Field` property is not set. Field name queries must include a valid field name.");
-		if (!options.TryGetClientSettings(out var settings))
-			throw new JsonException("Unable to retrieve client settings required to infer field.");
-		writer.WriteStartObject();
-		writer.WritePropertyName(settings.Inferrer.Field(value.Field));
-		writer.WriteStartObject();
-		if (value.Boost.HasValue)
-		{
-			writer.WritePropertyName("boost");
-			writer.WriteNumberValue(value.Boost.Value);
-		}
+			if (propMaxExpansions.TryRead(ref reader, options, PropMaxExpansions))
+			{
+				continue;
+			}
 
-		if (value.Fuzziness is not null)
-		{
-			writer.WritePropertyName("fuzziness");
-			JsonSerializer.Serialize(writer, value.Fuzziness, options);
-		}
+			if (propPrefixLength.TryRead(ref reader, options, PropPrefixLength))
+			{
+				continue;
+			}
 
-		if (value.MaxExpansions.HasValue)
-		{
-			writer.WritePropertyName("max_expansions");
-			writer.WriteNumberValue(value.MaxExpansions.Value);
-		}
+			if (propQueryName.TryRead(ref reader, options, PropQueryName))
+			{
+				continue;
+			}
 
-		if (value.PrefixLength.HasValue)
-		{
-			writer.WritePropertyName("prefix_length");
-			writer.WriteNumberValue(value.PrefixLength.Value);
-		}
+			if (propRewrite.TryRead(ref reader, options, PropRewrite))
+			{
+				continue;
+			}
 
-		if (!string.IsNullOrEmpty(value.QueryName))
-		{
-			writer.WritePropertyName("_name");
-			writer.WriteStringValue(value.QueryName);
-		}
+			if (propTranspositions.TryRead(ref reader, options, PropTranspositions))
+			{
+				continue;
+			}
 
-		if (!string.IsNullOrEmpty(value.Rewrite))
-		{
-			writer.WritePropertyName("rewrite");
-			writer.WriteStringValue(value.Rewrite);
+			if (propValue.TryRead(ref reader, options, PropValue))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		if (value.Transpositions.HasValue)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		reader.Read();
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new FuzzyQuery
 		{
-			writer.WritePropertyName("transpositions");
-			writer.WriteBooleanValue(value.Transpositions.Value);
-		}
+			Boost = propBoost.Value
+,
+			Field = propField.Value
+,
+			Fuzziness = propFuzziness.Value
+,
+			MaxExpansions = propMaxExpansions.Value
+,
+			PrefixLength = propPrefixLength.Value
+,
+			QueryName = propQueryName.Value
+,
+			Rewrite = propRewrite.Value
+,
+			Transpositions = propTranspositions.Value
+,
+			Value = propValue.Value
+		};
+	}
 
-		writer.WritePropertyName("value");
-		JsonSerializer.Serialize(writer, value.Value, options);
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, FuzzyQuery value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WritePropertyName(options, value.Field);
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropFuzziness, value.Fuzziness);
+		writer.WriteProperty(options, PropMaxExpansions, value.MaxExpansions);
+		writer.WriteProperty(options, PropPrefixLength, value.PrefixLength);
+		writer.WriteProperty(options, PropQueryName, value.QueryName);
+		writer.WriteProperty(options, PropRewrite, value.Rewrite);
+		writer.WriteProperty(options, PropTranspositions, value.Transpositions);
+		writer.WriteProperty(options, PropValue, value.Value);
 		writer.WriteEndObject();
 		writer.WriteEndObject();
 	}
@@ -164,6 +162,10 @@ public FuzzyQuery(Elastic.Clients.Elasticsearch.Field field)
 		Field = field;
 	}
 
+	internal FuzzyQuery()
+	{
+	}
+
 	/// <summary>
 	/// <para>
 	/// Floating point number used to decrease or increase the relevance scores of the query.
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 8833c66c219..0f56107d09a 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/GeoBoundingBoxQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/GeoBoundingBoxQuery.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,90 +28,75 @@
 
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
 
-internal sealed partial class GeoBoundingBoxQueryConverter : JsonConverter<GeoBoundingBoxQuery>
+internal sealed partial class GeoBoundingBoxQueryConverter : System.Text.Json.Serialization.JsonConverter<GeoBoundingBoxQuery>
 {
-	public override GeoBoundingBoxQuery Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropBoundingBox = System.Text.Json.JsonEncodedText.Encode("bounding_box");
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreUnmapped = System.Text.Json.JsonEncodedText.Encode("ignore_unmapped");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryName = System.Text.Json.JsonEncodedText.Encode("_name");
+	private static readonly System.Text.Json.JsonEncodedText PropValidationMethod = System.Text.Json.JsonEncodedText.Encode("validation_method");
+
+	public override GeoBoundingBoxQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		var variant = new GeoBoundingBoxQuery();
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.GeoBounds> propBoundingBox = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Field> propField = default;
+		LocalJsonProperty<float?> propBoost = default;
+		LocalJsonProperty<bool?> propIgnoreUnmapped = default;
+		LocalJsonProperty<string?> propQueryName = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.QueryDsl.GeoValidationMethod?> propValidationMethod = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propBoost.TryRead(ref reader, options, PropBoost))
 			{
-				var property = reader.GetString();
-				if (property == "boost")
-				{
-					variant.Boost = JsonSerializer.Deserialize<float?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "ignore_unmapped")
-				{
-					variant.IgnoreUnmapped = JsonSerializer.Deserialize<bool?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "_name")
-				{
-					variant.QueryName = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "validation_method")
-				{
-					variant.ValidationMethod = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.GeoValidationMethod?>(ref reader, options);
-					continue;
-				}
-
-				variant.Field = property;
-				reader.Read();
-				variant.BoundingBox = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.GeoBounds>(ref reader, options);
+				continue;
 			}
-		}
-
-		return variant;
-	}
 
-	public override void Write(Utf8JsonWriter writer, GeoBoundingBoxQuery value, JsonSerializerOptions options)
-	{
-		writer.WriteStartObject();
-		if (value.Field is not null && value.BoundingBox is not null)
-		{
-			if (!options.TryGetClientSettings(out var settings))
+			if (propIgnoreUnmapped.TryRead(ref reader, options, PropIgnoreUnmapped))
 			{
-				ThrowHelper.ThrowJsonExceptionForMissingSettings();
+				continue;
 			}
 
-			var propertyName = settings.Inferrer.Field(value.Field);
-			writer.WritePropertyName(propertyName);
-			JsonSerializer.Serialize(writer, value.BoundingBox, options);
-		}
-
-		if (value.Boost.HasValue)
-		{
-			writer.WritePropertyName("boost");
-			writer.WriteNumberValue(value.Boost.Value);
-		}
+			if (propQueryName.TryRead(ref reader, options, PropQueryName))
+			{
+				continue;
+			}
 
-		if (value.IgnoreUnmapped.HasValue)
-		{
-			writer.WritePropertyName("ignore_unmapped");
-			writer.WriteBooleanValue(value.IgnoreUnmapped.Value);
-		}
+			if (propValidationMethod.TryRead(ref reader, options, PropValidationMethod))
+			{
+				continue;
+			}
 
-		if (!string.IsNullOrEmpty(value.QueryName))
-		{
-			writer.WritePropertyName("_name");
-			writer.WriteStringValue(value.QueryName);
+			propField.Initialized = propBoundingBox.Initialized = true;
+			reader.ReadProperty(options, out propField.Value, out propBoundingBox.Value);
 		}
 
-		if (value.ValidationMethod is not null)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GeoBoundingBoxQuery
 		{
-			writer.WritePropertyName("validation_method");
-			JsonSerializer.Serialize(writer, value.ValidationMethod, options);
-		}
+			BoundingBox = propBoundingBox.Value
+,
+			Field = propField.Value
+,
+			Boost = propBoost.Value
+,
+			IgnoreUnmapped = propIgnoreUnmapped.Value
+,
+			QueryName = propQueryName.Value
+,
+			ValidationMethod = propValidationMethod.Value
+		};
+	}
 
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GeoBoundingBoxQuery value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropIgnoreUnmapped, value.IgnoreUnmapped);
+		writer.WriteProperty(options, PropQueryName, value.QueryName);
+		writer.WriteProperty(options, PropValidationMethod, value.ValidationMethod);
+		writer.WriteProperty(options, value.Field, value.BoundingBox);
 		writer.WriteEndObject();
 	}
 }
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/GeoDecayFunction.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/GeoDecayFunction.g.cs
index 446768423be..a5d3246c10a 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/GeoDecayFunction.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/GeoDecayFunction.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,60 +28,51 @@
 
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
 
-internal sealed partial class GeoDecayFunctionConverter : JsonConverter<GeoDecayFunction>
+internal sealed partial class GeoDecayFunctionConverter : System.Text.Json.Serialization.JsonConverter<GeoDecayFunction>
 {
-	public override GeoDecayFunction Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		var variant = new GeoDecayFunction();
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
-		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
-			{
-				var property = reader.GetString();
-				if (property == "multi_value_mode")
-				{
-					variant.MultiValueMode = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.MultiValueMode?>(ref reader, options);
-					continue;
-				}
-
-				variant.Field = property;
-				reader.Read();
-				variant.Placement = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.DecayPlacement<Elastic.Clients.Elasticsearch.GeoLocation, string>>(ref reader, options);
-			}
-		}
-
-		return variant;
-	}
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropPlacement = System.Text.Json.JsonEncodedText.Encode("placement");
+	private static readonly System.Text.Json.JsonEncodedText PropMultiValueMode = System.Text.Json.JsonEncodedText.Encode("multi_value_mode");
 
-	public override void Write(Utf8JsonWriter writer, GeoDecayFunction value, JsonSerializerOptions options)
+	public override GeoDecayFunction Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		writer.WriteStartObject();
-		if (value.Field is not null && value.Placement is not null)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Field> propField = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.QueryDsl.DecayPlacement<Elastic.Clients.Elasticsearch.GeoLocation, string>> propPlacement = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.QueryDsl.MultiValueMode?> propMultiValueMode = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (!options.TryGetClientSettings(out var settings))
+			if (propMultiValueMode.TryRead(ref reader, options, PropMultiValueMode))
 			{
-				ThrowHelper.ThrowJsonExceptionForMissingSettings();
+				continue;
 			}
 
-			var propertyName = settings.Inferrer.Field(value.Field);
-			writer.WritePropertyName(propertyName);
-			JsonSerializer.Serialize(writer, value.Placement, options);
+			propField.Initialized = propPlacement.Initialized = true;
+			reader.ReadProperty(options, out propField.Value, out propPlacement.Value);
 		}
 
-		if (value.MultiValueMode is not null)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GeoDecayFunction
 		{
-			writer.WritePropertyName("multi_value_mode");
-			JsonSerializer.Serialize(writer, value.MultiValueMode, options);
-		}
+			Field = propField.Value
+,
+			Placement = propPlacement.Value
+,
+			MultiValueMode = propMultiValueMode.Value
+		};
+	}
 
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GeoDecayFunction value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropMultiValueMode, value.MultiValueMode);
+		writer.WriteProperty(options, value.Field, value.Placement);
 		writer.WriteEndObject();
 	}
 }
 
 [JsonConverter(typeof(GeoDecayFunctionConverter))]
-public sealed partial class GeoDecayFunction
+public sealed partial class GeoDecayFunction : IDecayFunction
 {
 	public Elastic.Clients.Elasticsearch.Field Field { get; set; }
 
@@ -91,6 +83,8 @@ public sealed partial class GeoDecayFunction
 	/// </summary>
 	public Elastic.Clients.Elasticsearch.QueryDsl.MultiValueMode? MultiValueMode { get; set; }
 	public Elastic.Clients.Elasticsearch.QueryDsl.DecayPlacement<Elastic.Clients.Elasticsearch.GeoLocation, string> Placement { get; set; }
+
+	public string Type => "geodecayfunction";
 }
 
 public sealed partial class GeoDecayFunctionDescriptor<TDocument> : SerializableDescriptor<GeoDecayFunctionDescriptor<TDocument>>
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/GeoDistanceFeatureQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/GeoDistanceFeatureQuery.g.cs
index 5c04cad4816..e93b625fb09 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/GeoDistanceFeatureQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/GeoDistanceFeatureQuery.g.cs
@@ -27,7 +27,7 @@
 
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
 
-public sealed partial class GeoDistanceFeatureQuery
+public sealed partial class GeoDistanceFeatureQuery : IDistanceFeatureQuery
 {
 	/// <summary>
 	/// <para>
@@ -72,6 +72,9 @@ public sealed partial class GeoDistanceFeatureQuery
 	public string Pivot { get; set; }
 	[JsonInclude, JsonPropertyName("_name")]
 	public string? QueryName { get; set; }
+
+	[JsonInclude, JsonPropertyName("")]
+	public string Type => "geodistancefeaturequery";
 }
 
 public sealed partial class GeoDistanceFeatureQueryDescriptor<TDocument> : SerializableDescriptor<GeoDistanceFeatureQueryDescriptor<TDocument>>
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 04dae04ae98..22e219b85de 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/GeoDistanceQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/GeoDistanceQuery.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,110 +28,95 @@
 
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
 
-internal sealed partial class GeoDistanceQueryConverter : JsonConverter<GeoDistanceQuery>
+internal sealed partial class GeoDistanceQueryConverter : System.Text.Json.Serialization.JsonConverter<GeoDistanceQuery>
 {
-	public override GeoDistanceQuery Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropLocation = System.Text.Json.JsonEncodedText.Encode("location");
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropDistance = System.Text.Json.JsonEncodedText.Encode("distance");
+	private static readonly System.Text.Json.JsonEncodedText PropDistanceType = System.Text.Json.JsonEncodedText.Encode("distance_type");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreUnmapped = System.Text.Json.JsonEncodedText.Encode("ignore_unmapped");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryName = System.Text.Json.JsonEncodedText.Encode("_name");
+	private static readonly System.Text.Json.JsonEncodedText PropValidationMethod = System.Text.Json.JsonEncodedText.Encode("validation_method");
+
+	public override GeoDistanceQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		var variant = new GeoDistanceQuery();
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Field> propField = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.GeoLocation> propLocation = default;
+		LocalJsonProperty<float?> propBoost = default;
+		LocalJsonProperty<string> propDistance = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.GeoDistanceType?> propDistanceType = default;
+		LocalJsonProperty<bool?> propIgnoreUnmapped = default;
+		LocalJsonProperty<string?> propQueryName = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.QueryDsl.GeoValidationMethod?> propValidationMethod = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propBoost.TryRead(ref reader, options, PropBoost))
 			{
-				var property = reader.GetString();
-				if (property == "boost")
-				{
-					variant.Boost = JsonSerializer.Deserialize<float?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "distance")
-				{
-					variant.Distance = JsonSerializer.Deserialize<string>(ref reader, options);
-					continue;
-				}
-
-				if (property == "distance_type")
-				{
-					variant.DistanceType = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.GeoDistanceType?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "ignore_unmapped")
-				{
-					variant.IgnoreUnmapped = JsonSerializer.Deserialize<bool?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "_name")
-				{
-					variant.QueryName = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "validation_method")
-				{
-					variant.ValidationMethod = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.GeoValidationMethod?>(ref reader, options);
-					continue;
-				}
-
-				variant.Field = property;
-				reader.Read();
-				variant.Location = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.GeoLocation>(ref reader, options);
+				continue;
 			}
-		}
-
-		return variant;
-	}
 
-	public override void Write(Utf8JsonWriter writer, GeoDistanceQuery value, JsonSerializerOptions options)
-	{
-		writer.WriteStartObject();
-		if (value.Field is not null && value.Location is not null)
-		{
-			if (!options.TryGetClientSettings(out var settings))
+			if (propDistance.TryRead(ref reader, options, PropDistance))
 			{
-				ThrowHelper.ThrowJsonExceptionForMissingSettings();
+				continue;
 			}
 
-			var propertyName = settings.Inferrer.Field(value.Field);
-			writer.WritePropertyName(propertyName);
-			JsonSerializer.Serialize(writer, value.Location, options);
-		}
+			if (propDistanceType.TryRead(ref reader, options, PropDistanceType))
+			{
+				continue;
+			}
 
-		if (value.Boost.HasValue)
-		{
-			writer.WritePropertyName("boost");
-			writer.WriteNumberValue(value.Boost.Value);
-		}
+			if (propIgnoreUnmapped.TryRead(ref reader, options, PropIgnoreUnmapped))
+			{
+				continue;
+			}
 
-		writer.WritePropertyName("distance");
-		writer.WriteStringValue(value.Distance);
-		if (value.DistanceType is not null)
-		{
-			writer.WritePropertyName("distance_type");
-			JsonSerializer.Serialize(writer, value.DistanceType, options);
-		}
+			if (propQueryName.TryRead(ref reader, options, PropQueryName))
+			{
+				continue;
+			}
 
-		if (value.IgnoreUnmapped.HasValue)
-		{
-			writer.WritePropertyName("ignore_unmapped");
-			writer.WriteBooleanValue(value.IgnoreUnmapped.Value);
-		}
+			if (propValidationMethod.TryRead(ref reader, options, PropValidationMethod))
+			{
+				continue;
+			}
 
-		if (!string.IsNullOrEmpty(value.QueryName))
-		{
-			writer.WritePropertyName("_name");
-			writer.WriteStringValue(value.QueryName);
+			propField.Initialized = propLocation.Initialized = true;
+			reader.ReadProperty(options, out propField.Value, out propLocation.Value);
 		}
 
-		if (value.ValidationMethod is not null)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GeoDistanceQuery
 		{
-			writer.WritePropertyName("validation_method");
-			JsonSerializer.Serialize(writer, value.ValidationMethod, options);
-		}
+			Field = propField.Value
+,
+			Location = propLocation.Value
+,
+			Boost = propBoost.Value
+,
+			Distance = propDistance.Value
+,
+			DistanceType = propDistanceType.Value
+,
+			IgnoreUnmapped = propIgnoreUnmapped.Value
+,
+			QueryName = propQueryName.Value
+,
+			ValidationMethod = propValidationMethod.Value
+		};
+	}
 
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GeoDistanceQuery value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropDistance, value.Distance);
+		writer.WriteProperty(options, PropDistanceType, value.DistanceType);
+		writer.WriteProperty(options, PropIgnoreUnmapped, value.IgnoreUnmapped);
+		writer.WriteProperty(options, PropQueryName, value.QueryName);
+		writer.WriteProperty(options, PropValidationMethod, value.ValidationMethod);
+		writer.WriteProperty(options, value.Field, value.Location);
 		writer.WriteEndObject();
 	}
 }
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/GeoShapeQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/GeoShapeQuery.g.cs
index ec6e5429145..130de46ecff 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/GeoShapeQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/GeoShapeQuery.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,78 +28,65 @@
 
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
 
-internal sealed partial class GeoShapeQueryConverter : JsonConverter<GeoShapeQuery>
+internal sealed partial class GeoShapeQueryConverter : System.Text.Json.Serialization.JsonConverter<GeoShapeQuery>
 {
-	public override GeoShapeQuery Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropShape = System.Text.Json.JsonEncodedText.Encode("shape");
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreUnmapped = System.Text.Json.JsonEncodedText.Encode("ignore_unmapped");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryName = System.Text.Json.JsonEncodedText.Encode("_name");
+
+	public override GeoShapeQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		var variant = new GeoShapeQuery();
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Field> propField = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.QueryDsl.GeoShapeFieldQuery> propShape = default;
+		LocalJsonProperty<float?> propBoost = default;
+		LocalJsonProperty<bool?> propIgnoreUnmapped = default;
+		LocalJsonProperty<string?> propQueryName = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propBoost.TryRead(ref reader, options, PropBoost))
 			{
-				var property = reader.GetString();
-				if (property == "boost")
-				{
-					variant.Boost = JsonSerializer.Deserialize<float?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "ignore_unmapped")
-				{
-					variant.IgnoreUnmapped = JsonSerializer.Deserialize<bool?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "_name")
-				{
-					variant.QueryName = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				variant.Field = property;
-				reader.Read();
-				variant.Shape = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.GeoShapeFieldQuery>(ref reader, options);
+				continue;
 			}
-		}
-
-		return variant;
-	}
 
-	public override void Write(Utf8JsonWriter writer, GeoShapeQuery value, JsonSerializerOptions options)
-	{
-		writer.WriteStartObject();
-		if (value.Field is not null && value.Shape is not null)
-		{
-			if (!options.TryGetClientSettings(out var settings))
+			if (propIgnoreUnmapped.TryRead(ref reader, options, PropIgnoreUnmapped))
 			{
-				ThrowHelper.ThrowJsonExceptionForMissingSettings();
+				continue;
 			}
 
-			var propertyName = settings.Inferrer.Field(value.Field);
-			writer.WritePropertyName(propertyName);
-			JsonSerializer.Serialize(writer, value.Shape, options);
-		}
-
-		if (value.Boost.HasValue)
-		{
-			writer.WritePropertyName("boost");
-			writer.WriteNumberValue(value.Boost.Value);
-		}
+			if (propQueryName.TryRead(ref reader, options, PropQueryName))
+			{
+				continue;
+			}
 
-		if (value.IgnoreUnmapped.HasValue)
-		{
-			writer.WritePropertyName("ignore_unmapped");
-			writer.WriteBooleanValue(value.IgnoreUnmapped.Value);
+			propField.Initialized = propShape.Initialized = true;
+			reader.ReadProperty(options, out propField.Value, out propShape.Value);
 		}
 
-		if (!string.IsNullOrEmpty(value.QueryName))
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GeoShapeQuery
 		{
-			writer.WritePropertyName("_name");
-			writer.WriteStringValue(value.QueryName);
-		}
+			Field = propField.Value
+,
+			Shape = propShape.Value
+,
+			Boost = propBoost.Value
+,
+			IgnoreUnmapped = propIgnoreUnmapped.Value
+,
+			QueryName = propQueryName.Value
+		};
+	}
 
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GeoShapeQuery value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropIgnoreUnmapped, value.IgnoreUnmapped);
+		writer.WriteProperty(options, PropQueryName, value.QueryName);
+		writer.WriteProperty(options, value.Field, value.Shape);
 		writer.WriteEndObject();
 	}
 }
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 dc8261d52d0..abb56735f0f 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/Intervals.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/Intervals.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -39,12 +40,16 @@ internal Intervals(string variantName, object variant)
 			throw new ArgumentNullException(nameof(variant));
 		if (string.IsNullOrWhiteSpace(variantName))
 			throw new ArgumentException("Variant name must not be empty or whitespace.");
-		VariantName = variantName;
+		VariantType = variantName;
 		Variant = variant;
 	}
 
-	internal object Variant { get; }
-	internal string VariantName { get; }
+	internal Intervals()
+	{
+	}
+
+	public object Variant { get; internal set; }
+	public string VariantType { get; internal set; }
 
 	public static Intervals AllOf(Elastic.Clients.Elasticsearch.QueryDsl.IntervalsAllOf intervalsAllOf) => new Intervals("all_of", intervalsAllOf);
 	public static Intervals AnyOf(Elastic.Clients.Elasticsearch.QueryDsl.IntervalsAnyOf intervalsAnyOf) => new Intervals("any_of", intervalsAnyOf);
@@ -66,107 +71,104 @@ public bool TryGet<T>([NotNullWhen(true)] out T? result) where T : class
 	}
 }
 
-internal sealed partial class IntervalsConverter : JsonConverter<Intervals>
+internal sealed partial class IntervalsConverter : System.Text.Json.Serialization.JsonConverter<Intervals>
 {
-	public override Intervals Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText VariantAllOf = System.Text.Json.JsonEncodedText.Encode("all_of");
+	private static readonly System.Text.Json.JsonEncodedText VariantAnyOf = System.Text.Json.JsonEncodedText.Encode("any_of");
+	private static readonly System.Text.Json.JsonEncodedText VariantFuzzy = System.Text.Json.JsonEncodedText.Encode("fuzzy");
+	private static readonly System.Text.Json.JsonEncodedText VariantMatch = System.Text.Json.JsonEncodedText.Encode("match");
+	private static readonly System.Text.Json.JsonEncodedText VariantPrefix = System.Text.Json.JsonEncodedText.Encode("prefix");
+	private static readonly System.Text.Json.JsonEncodedText VariantWildcard = System.Text.Json.JsonEncodedText.Encode("wildcard");
+
+	public override Intervals Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		var variantType = string.Empty;
+		object? variant = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			throw new JsonException("Expected start token.");
-		}
-
-		object? variantValue = default;
-		string? variantNameValue = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
-		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token.");
-			}
-
-			if (reader.TokenType != JsonTokenType.PropertyName)
+			if (reader.ValueTextEquals(VariantAllOf))
 			{
-				throw new JsonException("Expected a property name token representing the name of an Elasticsearch field.");
-			}
-
-			var propertyName = reader.GetString();
-			reader.Read();
-			if (propertyName == "all_of")
-			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.IntervalsAllOf?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantAllOf.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.IntervalsAllOf?>(options);
 				continue;
 			}
 
-			if (propertyName == "any_of")
+			if (reader.ValueTextEquals(VariantAnyOf))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.IntervalsAnyOf?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantAnyOf.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.IntervalsAnyOf?>(options);
 				continue;
 			}
 
-			if (propertyName == "fuzzy")
+			if (reader.ValueTextEquals(VariantFuzzy))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.IntervalsFuzzy?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantFuzzy.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.IntervalsFuzzy?>(options);
 				continue;
 			}
 
-			if (propertyName == "match")
+			if (reader.ValueTextEquals(VariantMatch))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.IntervalsMatch?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantMatch.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.IntervalsMatch?>(options);
 				continue;
 			}
 
-			if (propertyName == "prefix")
+			if (reader.ValueTextEquals(VariantPrefix))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.IntervalsPrefix?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantPrefix.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.IntervalsPrefix?>(options);
 				continue;
 			}
 
-			if (propertyName == "wildcard")
+			if (reader.ValueTextEquals(VariantWildcard))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.IntervalsWildcard?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantWildcard.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.IntervalsWildcard?>(options);
 				continue;
 			}
 
-			throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'Intervals' from the response.");
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		var result = new Intervals(variantNameValue, variantValue);
-		return result;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new Intervals { VariantType = variantType, Variant = variant };
 	}
 
-	public override void Write(Utf8JsonWriter writer, Intervals value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, Intervals value, System.Text.Json.JsonSerializerOptions options)
 	{
 		writer.WriteStartObject();
-		if (value.VariantName is not null && value.Variant is not null)
+		switch (value.VariantType)
 		{
-			writer.WritePropertyName(value.VariantName);
-			switch (value.VariantName)
-			{
-				case "all_of":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.IntervalsAllOf>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.IntervalsAllOf)value.Variant, options);
-					break;
-				case "any_of":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.IntervalsAnyOf>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.IntervalsAnyOf)value.Variant, options);
-					break;
-				case "fuzzy":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.IntervalsFuzzy>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.IntervalsFuzzy)value.Variant, options);
-					break;
-				case "match":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.IntervalsMatch>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.IntervalsMatch)value.Variant, options);
-					break;
-				case "prefix":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.IntervalsPrefix>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.IntervalsPrefix)value.Variant, options);
-					break;
-				case "wildcard":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.IntervalsWildcard>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.IntervalsWildcard)value.Variant, options);
-					break;
-			}
+			case "":
+				break;
+			case "all_of":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.IntervalsAllOf?)value.Variant);
+				break;
+			case "any_of":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.IntervalsAnyOf?)value.Variant);
+				break;
+			case "fuzzy":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.IntervalsFuzzy?)value.Variant);
+				break;
+			case "match":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.IntervalsMatch?)value.Variant);
+				break;
+			case "prefix":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.IntervalsPrefix?)value.Variant);
+				break;
+			case "wildcard":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.IntervalsWildcard?)value.Variant);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.VariantType}' is not supported for type '{nameof(Intervals)}'.");
 		}
 
 		writer.WriteEndObject();
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 09e338e1fe9..d2933ad8df3 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsFilter.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsFilter.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -39,12 +40,16 @@ internal IntervalsFilter(string variantName, object variant)
 			throw new ArgumentNullException(nameof(variant));
 		if (string.IsNullOrWhiteSpace(variantName))
 			throw new ArgumentException("Variant name must not be empty or whitespace.");
-		VariantName = variantName;
+		VariantType = variantName;
 		Variant = variant;
 	}
 
-	internal object Variant { get; }
-	internal string VariantName { get; }
+	internal IntervalsFilter()
+	{
+	}
+
+	public object Variant { get; internal set; }
+	public string VariantType { get; internal set; }
 
 	public static IntervalsFilter After(Elastic.Clients.Elasticsearch.QueryDsl.Intervals intervalsContainer) => new IntervalsFilter("after", intervalsContainer);
 	public static IntervalsFilter Before(Elastic.Clients.Elasticsearch.QueryDsl.Intervals intervalsContainer) => new IntervalsFilter("before", intervalsContainer);
@@ -69,137 +74,140 @@ public bool TryGet<T>([NotNullWhen(true)] out T? result) where T : class
 	}
 }
 
-internal sealed partial class IntervalsFilterConverter : JsonConverter<IntervalsFilter>
+internal sealed partial class IntervalsFilterConverter : System.Text.Json.Serialization.JsonConverter<IntervalsFilter>
 {
-	public override IntervalsFilter Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText VariantAfter = System.Text.Json.JsonEncodedText.Encode("after");
+	private static readonly System.Text.Json.JsonEncodedText VariantBefore = System.Text.Json.JsonEncodedText.Encode("before");
+	private static readonly System.Text.Json.JsonEncodedText VariantContainedBy = System.Text.Json.JsonEncodedText.Encode("contained_by");
+	private static readonly System.Text.Json.JsonEncodedText VariantContaining = System.Text.Json.JsonEncodedText.Encode("containing");
+	private static readonly System.Text.Json.JsonEncodedText VariantNotContainedBy = System.Text.Json.JsonEncodedText.Encode("not_contained_by");
+	private static readonly System.Text.Json.JsonEncodedText VariantNotContaining = System.Text.Json.JsonEncodedText.Encode("not_containing");
+	private static readonly System.Text.Json.JsonEncodedText VariantNotOverlapping = System.Text.Json.JsonEncodedText.Encode("not_overlapping");
+	private static readonly System.Text.Json.JsonEncodedText VariantOverlapping = System.Text.Json.JsonEncodedText.Encode("overlapping");
+	private static readonly System.Text.Json.JsonEncodedText VariantScript = System.Text.Json.JsonEncodedText.Encode("script");
+
+	public override IntervalsFilter Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		var variantType = string.Empty;
+		object? variant = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			throw new JsonException("Expected start token.");
-		}
-
-		object? variantValue = default;
-		string? variantNameValue = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
-		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token.");
-			}
-
-			if (reader.TokenType != JsonTokenType.PropertyName)
+			if (reader.ValueTextEquals(VariantAfter))
 			{
-				throw new JsonException("Expected a property name token representing the name of an Elasticsearch field.");
-			}
-
-			var propertyName = reader.GetString();
-			reader.Read();
-			if (propertyName == "after")
-			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.Intervals?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantAfter.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.Intervals?>(options);
 				continue;
 			}
 
-			if (propertyName == "before")
+			if (reader.ValueTextEquals(VariantBefore))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.Intervals?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantBefore.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.Intervals?>(options);
 				continue;
 			}
 
-			if (propertyName == "contained_by")
+			if (reader.ValueTextEquals(VariantContainedBy))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.Intervals?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantContainedBy.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.Intervals?>(options);
 				continue;
 			}
 
-			if (propertyName == "containing")
+			if (reader.ValueTextEquals(VariantContaining))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.Intervals?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantContaining.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.Intervals?>(options);
 				continue;
 			}
 
-			if (propertyName == "not_contained_by")
+			if (reader.ValueTextEquals(VariantNotContainedBy))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.Intervals?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantNotContainedBy.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.Intervals?>(options);
 				continue;
 			}
 
-			if (propertyName == "not_containing")
+			if (reader.ValueTextEquals(VariantNotContaining))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.Intervals?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantNotContaining.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.Intervals?>(options);
 				continue;
 			}
 
-			if (propertyName == "not_overlapping")
+			if (reader.ValueTextEquals(VariantNotOverlapping))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.Intervals?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantNotOverlapping.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.Intervals?>(options);
 				continue;
 			}
 
-			if (propertyName == "overlapping")
+			if (reader.ValueTextEquals(VariantOverlapping))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.Intervals?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantOverlapping.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.Intervals?>(options);
 				continue;
 			}
 
-			if (propertyName == "script")
+			if (reader.ValueTextEquals(VariantScript))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Script?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantScript.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Script?>(options);
 				continue;
 			}
 
-			throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'IntervalsFilter' from the response.");
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		var result = new IntervalsFilter(variantNameValue, variantValue);
-		return result;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new IntervalsFilter { VariantType = variantType, Variant = variant };
 	}
 
-	public override void Write(Utf8JsonWriter writer, IntervalsFilter value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IntervalsFilter value, System.Text.Json.JsonSerializerOptions options)
 	{
 		writer.WriteStartObject();
-		if (value.VariantName is not null && value.Variant is not null)
+		switch (value.VariantType)
 		{
-			writer.WritePropertyName(value.VariantName);
-			switch (value.VariantName)
-			{
-				case "after":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.Intervals>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.Intervals)value.Variant, options);
-					break;
-				case "before":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.Intervals>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.Intervals)value.Variant, options);
-					break;
-				case "contained_by":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.Intervals>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.Intervals)value.Variant, options);
-					break;
-				case "containing":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.Intervals>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.Intervals)value.Variant, options);
-					break;
-				case "not_contained_by":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.Intervals>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.Intervals)value.Variant, options);
-					break;
-				case "not_containing":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.Intervals>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.Intervals)value.Variant, options);
-					break;
-				case "not_overlapping":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.Intervals>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.Intervals)value.Variant, options);
-					break;
-				case "overlapping":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.Intervals>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.Intervals)value.Variant, options);
-					break;
-				case "script":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Script>(writer, (Elastic.Clients.Elasticsearch.Script)value.Variant, options);
-					break;
-			}
+			case "":
+				break;
+			case "after":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.Intervals?)value.Variant);
+				break;
+			case "before":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.Intervals?)value.Variant);
+				break;
+			case "contained_by":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.Intervals?)value.Variant);
+				break;
+			case "containing":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.Intervals?)value.Variant);
+				break;
+			case "not_contained_by":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.Intervals?)value.Variant);
+				break;
+			case "not_containing":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.Intervals?)value.Variant);
+				break;
+			case "not_overlapping":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.Intervals?)value.Variant);
+				break;
+			case "overlapping":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.Intervals?)value.Variant);
+				break;
+			case "script":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Script?)value.Variant);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.VariantType}' is not supported for type '{nameof(IntervalsFilter)}'.");
 		}
 
 		writer.WriteEndObject();
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 bf1ea817e74..f1eb49a8cb4 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsQuery.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -39,12 +40,16 @@ internal IntervalsQuery(string variantName, object variant)
 			throw new ArgumentNullException(nameof(variant));
 		if (string.IsNullOrWhiteSpace(variantName))
 			throw new ArgumentException("Variant name must not be empty or whitespace.");
-		VariantName = variantName;
+		VariantType = variantName;
 		Variant = variant;
 	}
 
-	internal object Variant { get; }
-	internal string VariantName { get; }
+	internal IntervalsQuery()
+	{
+	}
+
+	public object Variant { get; internal set; }
+	public string VariantType { get; internal set; }
 
 	public static IntervalsQuery AllOf(Elastic.Clients.Elasticsearch.QueryDsl.IntervalsAllOf intervalsAllOf) => new IntervalsQuery("all_of", intervalsAllOf);
 	public static IntervalsQuery AnyOf(Elastic.Clients.Elasticsearch.QueryDsl.IntervalsAnyOf intervalsAnyOf) => new IntervalsQuery("any_of", intervalsAnyOf);
@@ -81,149 +86,139 @@ public bool TryGet<T>([NotNullWhen(true)] out T? result) where T : class
 	}
 }
 
-internal sealed partial class IntervalsQueryConverter : JsonConverter<IntervalsQuery>
+internal sealed partial class IntervalsQueryConverter : System.Text.Json.Serialization.JsonConverter<IntervalsQuery>
 {
-	public override IntervalsQuery Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryName = System.Text.Json.JsonEncodedText.Encode("_name");
+	private static readonly System.Text.Json.JsonEncodedText VariantAllOf = System.Text.Json.JsonEncodedText.Encode("all_of");
+	private static readonly System.Text.Json.JsonEncodedText VariantAnyOf = System.Text.Json.JsonEncodedText.Encode("any_of");
+	private static readonly System.Text.Json.JsonEncodedText VariantFuzzy = System.Text.Json.JsonEncodedText.Encode("fuzzy");
+	private static readonly System.Text.Json.JsonEncodedText VariantMatch = System.Text.Json.JsonEncodedText.Encode("match");
+	private static readonly System.Text.Json.JsonEncodedText VariantPrefix = System.Text.Json.JsonEncodedText.Encode("prefix");
+	private static readonly System.Text.Json.JsonEncodedText VariantWildcard = System.Text.Json.JsonEncodedText.Encode("wildcard");
+
+	public override IntervalsQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-		{
-			throw new JsonException("Expected start token.");
-		}
-
-		reader.Read();
-		var fieldName = reader.GetString();
-		reader.Read();
-		object? variantValue = default;
-		string? variantNameValue = default;
-		float? boostValue = default;
-		string? queryNameValue = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<float?> propBoost = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Field> propField = default;
+		LocalJsonProperty<string?> propQueryName = default;
+		var variantType = string.Empty;
+		object? variant = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
+			if (propBoost.TryRead(ref reader, options, PropBoost))
 			{
-				throw new JsonException("Expected a property name token.");
-			}
-
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token representing the name of an Elasticsearch field.");
+				continue;
 			}
 
-			var propertyName = reader.GetString();
-			reader.Read();
-			if (propertyName == "boost")
+			if (propField.TryRead(ref reader, options, PropField))
 			{
-				boostValue = JsonSerializer.Deserialize<float?>(ref reader, options);
 				continue;
 			}
 
-			if (propertyName == "_name")
+			if (propQueryName.TryRead(ref reader, options, PropQueryName))
 			{
-				queryNameValue = JsonSerializer.Deserialize<string?>(ref reader, options);
 				continue;
 			}
 
-			if (propertyName == "all_of")
+			if (reader.ValueTextEquals(VariantAllOf))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.IntervalsAllOf?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantAllOf.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.IntervalsAllOf?>(options);
 				continue;
 			}
 
-			if (propertyName == "any_of")
+			if (reader.ValueTextEquals(VariantAnyOf))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.IntervalsAnyOf?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantAnyOf.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.IntervalsAnyOf?>(options);
 				continue;
 			}
 
-			if (propertyName == "fuzzy")
+			if (reader.ValueTextEquals(VariantFuzzy))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.IntervalsFuzzy?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantFuzzy.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.IntervalsFuzzy?>(options);
 				continue;
 			}
 
-			if (propertyName == "match")
+			if (reader.ValueTextEquals(VariantMatch))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.IntervalsMatch?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantMatch.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.IntervalsMatch?>(options);
 				continue;
 			}
 
-			if (propertyName == "prefix")
+			if (reader.ValueTextEquals(VariantPrefix))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.IntervalsPrefix?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantPrefix.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.IntervalsPrefix?>(options);
 				continue;
 			}
 
-			if (propertyName == "wildcard")
+			if (reader.ValueTextEquals(VariantWildcard))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.IntervalsWildcard?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantWildcard.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.IntervalsWildcard?>(options);
 				continue;
 			}
 
-			throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'IntervalsQuery' from the response.");
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		reader.Read();
-		var result = new IntervalsQuery(variantNameValue, variantValue);
-		result.Boost = boostValue;
-		result.Field = fieldName;
-		result.QueryName = queryNameValue;
-		return result;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new IntervalsQuery
+		{
+			VariantType = variantType,
+			Variant = variant,
+			Boost = propBoost.Value
+	,
+			Field = propField.Value
+	,
+			QueryName = propQueryName.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, IntervalsQuery value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IntervalsQuery value, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (value.Field is null)
-			throw new JsonException("Unable to serialize IntervalsQuery because the `Field` property is not set. Field name queries must include a valid field name.");
-		if (!options.TryGetClientSettings(out var settings))
-			throw new JsonException("Unable to retrieve client settings required to infer field.");
-		writer.WriteStartObject();
-		writer.WritePropertyName(settings.Inferrer.Field(value.Field));
 		writer.WriteStartObject();
-		if (value.Boost.HasValue)
+		switch (value.VariantType)
 		{
-			writer.WritePropertyName("boost");
-			writer.WriteNumberValue(value.Boost.Value);
-		}
-
-		if (!string.IsNullOrEmpty(value.QueryName))
-		{
-			writer.WritePropertyName("_name");
-			writer.WriteStringValue(value.QueryName);
+			case "":
+				break;
+			case "all_of":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.IntervalsAllOf?)value.Variant);
+				break;
+			case "any_of":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.IntervalsAnyOf?)value.Variant);
+				break;
+			case "fuzzy":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.IntervalsFuzzy?)value.Variant);
+				break;
+			case "match":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.IntervalsMatch?)value.Variant);
+				break;
+			case "prefix":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.IntervalsPrefix?)value.Variant);
+				break;
+			case "wildcard":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.IntervalsWildcard?)value.Variant);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.VariantType}' is not supported for type '{nameof(IntervalsQuery)}'.");
 		}
 
-		if (value.VariantName is not null && value.Variant is not null)
-		{
-			writer.WritePropertyName(value.VariantName);
-			switch (value.VariantName)
-			{
-				case "all_of":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.IntervalsAllOf>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.IntervalsAllOf)value.Variant, options);
-					break;
-				case "any_of":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.IntervalsAnyOf>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.IntervalsAnyOf)value.Variant, options);
-					break;
-				case "fuzzy":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.IntervalsFuzzy>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.IntervalsFuzzy)value.Variant, options);
-					break;
-				case "match":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.IntervalsMatch>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.IntervalsMatch)value.Variant, options);
-					break;
-				case "prefix":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.IntervalsPrefix>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.IntervalsPrefix)value.Variant, options);
-					break;
-				case "wildcard":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.IntervalsWildcard>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.IntervalsWildcard)value.Variant, options);
-					break;
-			}
-		}
-
-		writer.WriteEndObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropField, value.Field);
+		writer.WriteProperty(options, PropQueryName, value.QueryName);
 		writer.WriteEndObject();
 	}
 }
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 181ce211247..a4ef53580bc 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/LikeDocument.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/LikeDocument.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,110 @@
 
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
 
+internal sealed partial class LikeDocumentConverter : System.Text.Json.Serialization.JsonConverter<LikeDocument>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropDoc = System.Text.Json.JsonEncodedText.Encode("doc");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("_id");
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("_index");
+	private static readonly System.Text.Json.JsonEncodedText PropPerFieldAnalyzer = System.Text.Json.JsonEncodedText.Encode("per_field_analyzer");
+	private static readonly System.Text.Json.JsonEncodedText PropRouting = System.Text.Json.JsonEncodedText.Encode("routing");
+	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("version");
+	private static readonly System.Text.Json.JsonEncodedText PropVersionType = System.Text.Json.JsonEncodedText.Encode("version_type");
+
+	public override LikeDocument Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<object?> propDoc = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Fields?> propFields = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Id?> propId = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.IndexName?> propIndex = default;
+		LocalJsonProperty<IDictionary<Elastic.Clients.Elasticsearch.Field, string>?> propPerFieldAnalyzer = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Routing?> propRouting = default;
+		LocalJsonProperty<long?> propVersion = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.VersionType?> propVersionType = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propDoc.TryRead(ref reader, options, PropDoc))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields, typeof(FieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propId.TryRead(ref reader, options, PropId))
+			{
+				continue;
+			}
+
+			if (propIndex.TryRead(ref reader, options, PropIndex))
+			{
+				continue;
+			}
+
+			if (propPerFieldAnalyzer.TryRead(ref reader, options, PropPerFieldAnalyzer))
+			{
+				continue;
+			}
+
+			if (propRouting.TryRead(ref reader, options, PropRouting))
+			{
+				continue;
+			}
+
+			if (propVersion.TryRead(ref reader, options, PropVersion))
+			{
+				continue;
+			}
+
+			if (propVersionType.TryRead(ref reader, options, PropVersionType))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new LikeDocument
+		{
+			Doc = propDoc.Value
+,
+			Fields = propFields.Value
+,
+			Id = propId.Value
+,
+			Index = propIndex.Value
+,
+			PerFieldAnalyzer = propPerFieldAnalyzer.Value
+,
+			Routing = propRouting.Value
+,
+			Version = propVersion.Value
+,
+			VersionType = propVersionType.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, LikeDocument value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropDoc, value.Doc);
+		writer.WriteProperty(options, PropFields, value.Fields, typeof(FieldsMarker));
+		writer.WriteProperty(options, PropId, value.Id);
+		writer.WriteProperty(options, PropIndex, value.Index);
+		writer.WriteProperty(options, PropPerFieldAnalyzer, value.PerFieldAnalyzer);
+		writer.WriteProperty(options, PropRouting, value.Routing);
+		writer.WriteProperty(options, PropVersion, value.Version);
+		writer.WriteProperty(options, PropVersionType, value.VersionType);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(LikeDocumentConverter))]
 public sealed partial class LikeDocument
 {
 	/// <summary>
@@ -34,10 +139,7 @@ public sealed partial class LikeDocument
 	/// A document not present in the index.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("doc")]
 	public object? Doc { get; set; }
-	[JsonInclude, JsonPropertyName("fields")]
-	[JsonConverter(typeof(FieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Fields? Fields { get; set; }
 
 	/// <summary>
@@ -45,7 +147,6 @@ public sealed partial class LikeDocument
 	/// ID of a document.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("_id")]
 	public Elastic.Clients.Elasticsearch.Id? Id { get; set; }
 
 	/// <summary>
@@ -53,7 +154,6 @@ public sealed partial class LikeDocument
 	/// Index of a document.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("_index")]
 	public Elastic.Clients.Elasticsearch.IndexName? Index { get; set; }
 
 	/// <summary>
@@ -61,13 +161,9 @@ public sealed partial class LikeDocument
 	/// Overrides the default analyzer.
 	/// </para>
 	/// </summary>
-	[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; }
 }
 
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 4d56cdd27b8..401418bbaae 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/MatchBoolPrefixQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/MatchBoolPrefixQuery.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,164 +28,155 @@
 
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
 
-internal sealed partial class MatchBoolPrefixQueryConverter : JsonConverter<MatchBoolPrefixQuery>
+internal sealed partial class MatchBoolPrefixQueryConverter : System.Text.Json.Serialization.JsonConverter<MatchBoolPrefixQuery>
 {
-	public override MatchBoolPrefixQuery Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
+	private static readonly System.Text.Json.JsonEncodedText PropAnalyzer = System.Text.Json.JsonEncodedText.Encode("analyzer");
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropFuzziness = System.Text.Json.JsonEncodedText.Encode("fuzziness");
+	private static readonly System.Text.Json.JsonEncodedText PropFuzzyRewrite = System.Text.Json.JsonEncodedText.Encode("fuzzy_rewrite");
+	private static readonly System.Text.Json.JsonEncodedText PropFuzzyTranspositions = System.Text.Json.JsonEncodedText.Encode("fuzzy_transpositions");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxExpansions = System.Text.Json.JsonEncodedText.Encode("max_expansions");
+	private static readonly System.Text.Json.JsonEncodedText PropMinimumShouldMatch = System.Text.Json.JsonEncodedText.Encode("minimum_should_match");
+	private static readonly System.Text.Json.JsonEncodedText PropOperator = System.Text.Json.JsonEncodedText.Encode("operator");
+	private static readonly System.Text.Json.JsonEncodedText PropPrefixLength = System.Text.Json.JsonEncodedText.Encode("prefix_length");
+	private static readonly System.Text.Json.JsonEncodedText PropQuery = System.Text.Json.JsonEncodedText.Encode("query");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryName = System.Text.Json.JsonEncodedText.Encode("_name");
+
+	public override MatchBoolPrefixQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Field> propField = default;
 		reader.Read();
-		var fieldName = reader.GetString();
+		propField.Value = reader.ReadValue<Elastic.Clients.Elasticsearch.Field>(options);
+		propField.Initialized = true;
 		reader.Read();
-		var variant = new MatchBoolPrefixQuery(fieldName);
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		if (reader.TokenType is not System.Text.Json.JsonTokenType.StartObject)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			var value = reader.ReadValue<string>(options);
+			reader.Read();
+			return new MatchBoolPrefixQuery { Query = value };
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string?> propAnalyzer = default;
+		LocalJsonProperty<float?> propBoost = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Fuzziness?> propFuzziness = default;
+		LocalJsonProperty<string?> propFuzzyRewrite = default;
+		LocalJsonProperty<bool?> propFuzzyTranspositions = default;
+		LocalJsonProperty<int?> propMaxExpansions = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.MinimumShouldMatch?> propMinimumShouldMatch = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.QueryDsl.Operator?> propOperator = default;
+		LocalJsonProperty<int?> propPrefixLength = default;
+		LocalJsonProperty<string> propQuery = default;
+		LocalJsonProperty<string?> propQueryName = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAnalyzer.TryRead(ref reader, options, PropAnalyzer))
 			{
-				var property = reader.GetString();
-				if (property == "analyzer")
-				{
-					variant.Analyzer = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "boost")
-				{
-					variant.Boost = JsonSerializer.Deserialize<float?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "fuzziness")
-				{
-					variant.Fuzziness = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Fuzziness?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "fuzzy_rewrite")
-				{
-					variant.FuzzyRewrite = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "fuzzy_transpositions")
-				{
-					variant.FuzzyTranspositions = JsonSerializer.Deserialize<bool?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "max_expansions")
-				{
-					variant.MaxExpansions = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "minimum_should_match")
-				{
-					variant.MinimumShouldMatch = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.MinimumShouldMatch?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "operator")
-				{
-					variant.Operator = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.Operator?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "prefix_length")
-				{
-					variant.PrefixLength = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "query")
-				{
-					variant.Query = JsonSerializer.Deserialize<string>(ref reader, options);
-					continue;
-				}
-
-				if (property == "_name")
-				{
-					variant.QueryName = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
+				continue;
 			}
-		}
 
-		reader.Read();
-		return variant;
-	}
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
 
-	public override void Write(Utf8JsonWriter writer, MatchBoolPrefixQuery value, JsonSerializerOptions options)
-	{
-		if (value.Field is null)
-			throw new JsonException("Unable to serialize MatchBoolPrefixQuery because the `Field` property is not set. Field name queries must include a valid field name.");
-		if (!options.TryGetClientSettings(out var settings))
-			throw new JsonException("Unable to retrieve client settings required to infer field.");
-		writer.WriteStartObject();
-		writer.WritePropertyName(settings.Inferrer.Field(value.Field));
-		writer.WriteStartObject();
-		if (!string.IsNullOrEmpty(value.Analyzer))
-		{
-			writer.WritePropertyName("analyzer");
-			writer.WriteStringValue(value.Analyzer);
-		}
+			if (propFuzziness.TryRead(ref reader, options, PropFuzziness))
+			{
+				continue;
+			}
 
-		if (value.Boost.HasValue)
-		{
-			writer.WritePropertyName("boost");
-			writer.WriteNumberValue(value.Boost.Value);
-		}
+			if (propFuzzyRewrite.TryRead(ref reader, options, PropFuzzyRewrite))
+			{
+				continue;
+			}
 
-		if (value.Fuzziness is not null)
-		{
-			writer.WritePropertyName("fuzziness");
-			JsonSerializer.Serialize(writer, value.Fuzziness, options);
-		}
+			if (propFuzzyTranspositions.TryRead(ref reader, options, PropFuzzyTranspositions))
+			{
+				continue;
+			}
 
-		if (!string.IsNullOrEmpty(value.FuzzyRewrite))
-		{
-			writer.WritePropertyName("fuzzy_rewrite");
-			writer.WriteStringValue(value.FuzzyRewrite);
-		}
+			if (propMaxExpansions.TryRead(ref reader, options, PropMaxExpansions))
+			{
+				continue;
+			}
 
-		if (value.FuzzyTranspositions.HasValue)
-		{
-			writer.WritePropertyName("fuzzy_transpositions");
-			writer.WriteBooleanValue(value.FuzzyTranspositions.Value);
-		}
+			if (propMinimumShouldMatch.TryRead(ref reader, options, PropMinimumShouldMatch))
+			{
+				continue;
+			}
 
-		if (value.MaxExpansions.HasValue)
-		{
-			writer.WritePropertyName("max_expansions");
-			writer.WriteNumberValue(value.MaxExpansions.Value);
-		}
+			if (propOperator.TryRead(ref reader, options, PropOperator))
+			{
+				continue;
+			}
 
-		if (value.MinimumShouldMatch is not null)
-		{
-			writer.WritePropertyName("minimum_should_match");
-			JsonSerializer.Serialize(writer, value.MinimumShouldMatch, options);
-		}
+			if (propPrefixLength.TryRead(ref reader, options, PropPrefixLength))
+			{
+				continue;
+			}
 
-		if (value.Operator is not null)
-		{
-			writer.WritePropertyName("operator");
-			JsonSerializer.Serialize(writer, value.Operator, options);
-		}
+			if (propQuery.TryRead(ref reader, options, PropQuery))
+			{
+				continue;
+			}
 
-		if (value.PrefixLength.HasValue)
-		{
-			writer.WritePropertyName("prefix_length");
-			writer.WriteNumberValue(value.PrefixLength.Value);
-		}
+			if (propQueryName.TryRead(ref reader, options, PropQueryName))
+			{
+				continue;
+			}
 
-		writer.WritePropertyName("query");
-		writer.WriteStringValue(value.Query);
-		if (!string.IsNullOrEmpty(value.QueryName))
-		{
-			writer.WritePropertyName("_name");
-			writer.WriteStringValue(value.QueryName);
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		reader.Read();
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new MatchBoolPrefixQuery
+		{
+			Analyzer = propAnalyzer.Value
+,
+			Boost = propBoost.Value
+,
+			Field = propField.Value
+,
+			Fuzziness = propFuzziness.Value
+,
+			FuzzyRewrite = propFuzzyRewrite.Value
+,
+			FuzzyTranspositions = propFuzzyTranspositions.Value
+,
+			MaxExpansions = propMaxExpansions.Value
+,
+			MinimumShouldMatch = propMinimumShouldMatch.Value
+,
+			Operator = propOperator.Value
+,
+			PrefixLength = propPrefixLength.Value
+,
+			Query = propQuery.Value
+,
+			QueryName = propQueryName.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, MatchBoolPrefixQuery value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WritePropertyName(options, value.Field);
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAnalyzer, value.Analyzer);
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropFuzziness, value.Fuzziness);
+		writer.WriteProperty(options, PropFuzzyRewrite, value.FuzzyRewrite);
+		writer.WriteProperty(options, PropFuzzyTranspositions, value.FuzzyTranspositions);
+		writer.WriteProperty(options, PropMaxExpansions, value.MaxExpansions);
+		writer.WriteProperty(options, PropMinimumShouldMatch, value.MinimumShouldMatch);
+		writer.WriteProperty(options, PropOperator, value.Operator);
+		writer.WriteProperty(options, PropPrefixLength, value.PrefixLength);
+		writer.WriteProperty(options, PropQuery, value.Query);
+		writer.WriteProperty(options, PropQueryName, value.QueryName);
 		writer.WriteEndObject();
 		writer.WriteEndObject();
 	}
@@ -200,6 +192,10 @@ public MatchBoolPrefixQuery(Elastic.Clients.Elasticsearch.Field field)
 		Field = field;
 	}
 
+	internal MatchBoolPrefixQuery()
+	{
+	}
+
 	/// <summary>
 	/// <para>
 	/// Analyzer used to convert the text in the query value into tokens.
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 3a1f22002b6..5e6f754b19f 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/MatchPhrasePrefixQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/MatchPhrasePrefixQuery.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,116 +28,115 @@
 
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
 
-internal sealed partial class MatchPhrasePrefixQueryConverter : JsonConverter<MatchPhrasePrefixQuery>
+internal sealed partial class MatchPhrasePrefixQueryConverter : System.Text.Json.Serialization.JsonConverter<MatchPhrasePrefixQuery>
 {
-	public override MatchPhrasePrefixQuery Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAnalyzer = System.Text.Json.JsonEncodedText.Encode("analyzer");
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxExpansions = System.Text.Json.JsonEncodedText.Encode("max_expansions");
+	private static readonly System.Text.Json.JsonEncodedText PropQuery = System.Text.Json.JsonEncodedText.Encode("query");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryName = System.Text.Json.JsonEncodedText.Encode("_name");
+	private static readonly System.Text.Json.JsonEncodedText PropSlop = System.Text.Json.JsonEncodedText.Encode("slop");
+	private static readonly System.Text.Json.JsonEncodedText PropZeroTermsQuery = System.Text.Json.JsonEncodedText.Encode("zero_terms_query");
+
+	public override MatchPhrasePrefixQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Field> propField = default;
 		reader.Read();
-		var fieldName = reader.GetString();
+		propField.Value = reader.ReadValue<Elastic.Clients.Elasticsearch.Field>(options);
+		propField.Initialized = true;
 		reader.Read();
-		var variant = new MatchPhrasePrefixQuery(fieldName);
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		if (reader.TokenType is not System.Text.Json.JsonTokenType.StartObject)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			var value = reader.ReadValue<string>(options);
+			reader.Read();
+			return new MatchPhrasePrefixQuery { Query = value };
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string?> propAnalyzer = default;
+		LocalJsonProperty<float?> propBoost = default;
+		LocalJsonProperty<int?> propMaxExpansions = default;
+		LocalJsonProperty<string> propQuery = default;
+		LocalJsonProperty<string?> propQueryName = default;
+		LocalJsonProperty<int?> propSlop = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.QueryDsl.ZeroTermsQuery?> propZeroTermsQuery = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAnalyzer.TryRead(ref reader, options, PropAnalyzer))
 			{
-				var property = reader.GetString();
-				if (property == "analyzer")
-				{
-					variant.Analyzer = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "boost")
-				{
-					variant.Boost = JsonSerializer.Deserialize<float?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "max_expansions")
-				{
-					variant.MaxExpansions = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "query")
-				{
-					variant.Query = JsonSerializer.Deserialize<string>(ref reader, options);
-					continue;
-				}
-
-				if (property == "_name")
-				{
-					variant.QueryName = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "slop")
-				{
-					variant.Slop = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "zero_terms_query")
-				{
-					variant.ZeroTermsQuery = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.ZeroTermsQuery?>(ref reader, options);
-					continue;
-				}
+				continue;
 			}
-		}
 
-		reader.Read();
-		return variant;
-	}
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
 
-	public override void Write(Utf8JsonWriter writer, MatchPhrasePrefixQuery value, JsonSerializerOptions options)
-	{
-		if (value.Field is null)
-			throw new JsonException("Unable to serialize MatchPhrasePrefixQuery because the `Field` property is not set. Field name queries must include a valid field name.");
-		if (!options.TryGetClientSettings(out var settings))
-			throw new JsonException("Unable to retrieve client settings required to infer field.");
-		writer.WriteStartObject();
-		writer.WritePropertyName(settings.Inferrer.Field(value.Field));
-		writer.WriteStartObject();
-		if (!string.IsNullOrEmpty(value.Analyzer))
-		{
-			writer.WritePropertyName("analyzer");
-			writer.WriteStringValue(value.Analyzer);
-		}
+			if (propMaxExpansions.TryRead(ref reader, options, PropMaxExpansions))
+			{
+				continue;
+			}
 
-		if (value.Boost.HasValue)
-		{
-			writer.WritePropertyName("boost");
-			writer.WriteNumberValue(value.Boost.Value);
-		}
+			if (propQuery.TryRead(ref reader, options, PropQuery))
+			{
+				continue;
+			}
 
-		if (value.MaxExpansions.HasValue)
-		{
-			writer.WritePropertyName("max_expansions");
-			writer.WriteNumberValue(value.MaxExpansions.Value);
-		}
+			if (propQueryName.TryRead(ref reader, options, PropQueryName))
+			{
+				continue;
+			}
 
-		writer.WritePropertyName("query");
-		writer.WriteStringValue(value.Query);
-		if (!string.IsNullOrEmpty(value.QueryName))
-		{
-			writer.WritePropertyName("_name");
-			writer.WriteStringValue(value.QueryName);
-		}
+			if (propSlop.TryRead(ref reader, options, PropSlop))
+			{
+				continue;
+			}
 
-		if (value.Slop.HasValue)
-		{
-			writer.WritePropertyName("slop");
-			writer.WriteNumberValue(value.Slop.Value);
+			if (propZeroTermsQuery.TryRead(ref reader, options, PropZeroTermsQuery))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		if (value.ZeroTermsQuery is not null)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		reader.Read();
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new MatchPhrasePrefixQuery
 		{
-			writer.WritePropertyName("zero_terms_query");
-			JsonSerializer.Serialize(writer, value.ZeroTermsQuery, options);
-		}
+			Analyzer = propAnalyzer.Value
+,
+			Boost = propBoost.Value
+,
+			Field = propField.Value
+,
+			MaxExpansions = propMaxExpansions.Value
+,
+			Query = propQuery.Value
+,
+			QueryName = propQueryName.Value
+,
+			Slop = propSlop.Value
+,
+			ZeroTermsQuery = propZeroTermsQuery.Value
+		};
+	}
 
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, MatchPhrasePrefixQuery value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WritePropertyName(options, value.Field);
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAnalyzer, value.Analyzer);
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropMaxExpansions, value.MaxExpansions);
+		writer.WriteProperty(options, PropQuery, value.Query);
+		writer.WriteProperty(options, PropQueryName, value.QueryName);
+		writer.WriteProperty(options, PropSlop, value.Slop);
+		writer.WriteProperty(options, PropZeroTermsQuery, value.ZeroTermsQuery);
 		writer.WriteEndObject();
 		writer.WriteEndObject();
 	}
@@ -152,6 +152,10 @@ public MatchPhrasePrefixQuery(Elastic.Clients.Elasticsearch.Field field)
 		Field = field;
 	}
 
+	internal MatchPhrasePrefixQuery()
+	{
+	}
+
 	/// <summary>
 	/// <para>
 	/// Analyzer used to convert text in the query value into tokens.
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 ff6632c7399..5df22a858ea 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/MatchPhraseQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/MatchPhraseQuery.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,104 +28,105 @@
 
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
 
-internal sealed partial class MatchPhraseQueryConverter : JsonConverter<MatchPhraseQuery>
+internal sealed partial class MatchPhraseQueryConverter : System.Text.Json.Serialization.JsonConverter<MatchPhraseQuery>
 {
-	public override MatchPhraseQuery Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAnalyzer = System.Text.Json.JsonEncodedText.Encode("analyzer");
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropQuery = System.Text.Json.JsonEncodedText.Encode("query");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryName = System.Text.Json.JsonEncodedText.Encode("_name");
+	private static readonly System.Text.Json.JsonEncodedText PropSlop = System.Text.Json.JsonEncodedText.Encode("slop");
+	private static readonly System.Text.Json.JsonEncodedText PropZeroTermsQuery = System.Text.Json.JsonEncodedText.Encode("zero_terms_query");
+
+	public override MatchPhraseQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Field> propField = default;
 		reader.Read();
-		var fieldName = reader.GetString();
+		propField.Value = reader.ReadValue<Elastic.Clients.Elasticsearch.Field>(options);
+		propField.Initialized = true;
 		reader.Read();
-		var variant = new MatchPhraseQuery(fieldName);
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		if (reader.TokenType is not System.Text.Json.JsonTokenType.StartObject)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			var value = reader.ReadValue<string>(options);
+			reader.Read();
+			return new MatchPhraseQuery { Query = value };
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string?> propAnalyzer = default;
+		LocalJsonProperty<float?> propBoost = default;
+		LocalJsonProperty<string> propQuery = default;
+		LocalJsonProperty<string?> propQueryName = default;
+		LocalJsonProperty<int?> propSlop = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.QueryDsl.ZeroTermsQuery?> propZeroTermsQuery = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAnalyzer.TryRead(ref reader, options, PropAnalyzer))
 			{
-				var property = reader.GetString();
-				if (property == "analyzer")
-				{
-					variant.Analyzer = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "boost")
-				{
-					variant.Boost = JsonSerializer.Deserialize<float?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "query")
-				{
-					variant.Query = JsonSerializer.Deserialize<string>(ref reader, options);
-					continue;
-				}
-
-				if (property == "_name")
-				{
-					variant.QueryName = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "slop")
-				{
-					variant.Slop = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "zero_terms_query")
-				{
-					variant.ZeroTermsQuery = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.ZeroTermsQuery?>(ref reader, options);
-					continue;
-				}
+				continue;
 			}
-		}
 
-		reader.Read();
-		return variant;
-	}
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
 
-	public override void Write(Utf8JsonWriter writer, MatchPhraseQuery value, JsonSerializerOptions options)
-	{
-		if (value.Field is null)
-			throw new JsonException("Unable to serialize MatchPhraseQuery because the `Field` property is not set. Field name queries must include a valid field name.");
-		if (!options.TryGetClientSettings(out var settings))
-			throw new JsonException("Unable to retrieve client settings required to infer field.");
-		writer.WriteStartObject();
-		writer.WritePropertyName(settings.Inferrer.Field(value.Field));
-		writer.WriteStartObject();
-		if (!string.IsNullOrEmpty(value.Analyzer))
-		{
-			writer.WritePropertyName("analyzer");
-			writer.WriteStringValue(value.Analyzer);
-		}
+			if (propQuery.TryRead(ref reader, options, PropQuery))
+			{
+				continue;
+			}
 
-		if (value.Boost.HasValue)
-		{
-			writer.WritePropertyName("boost");
-			writer.WriteNumberValue(value.Boost.Value);
-		}
+			if (propQueryName.TryRead(ref reader, options, PropQueryName))
+			{
+				continue;
+			}
 
-		writer.WritePropertyName("query");
-		writer.WriteStringValue(value.Query);
-		if (!string.IsNullOrEmpty(value.QueryName))
-		{
-			writer.WritePropertyName("_name");
-			writer.WriteStringValue(value.QueryName);
-		}
+			if (propSlop.TryRead(ref reader, options, PropSlop))
+			{
+				continue;
+			}
 
-		if (value.Slop.HasValue)
-		{
-			writer.WritePropertyName("slop");
-			writer.WriteNumberValue(value.Slop.Value);
+			if (propZeroTermsQuery.TryRead(ref reader, options, PropZeroTermsQuery))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		if (value.ZeroTermsQuery is not null)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		reader.Read();
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new MatchPhraseQuery
 		{
-			writer.WritePropertyName("zero_terms_query");
-			JsonSerializer.Serialize(writer, value.ZeroTermsQuery, options);
-		}
+			Analyzer = propAnalyzer.Value
+,
+			Boost = propBoost.Value
+,
+			Field = propField.Value
+,
+			Query = propQuery.Value
+,
+			QueryName = propQueryName.Value
+,
+			Slop = propSlop.Value
+,
+			ZeroTermsQuery = propZeroTermsQuery.Value
+		};
+	}
 
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, MatchPhraseQuery value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WritePropertyName(options, value.Field);
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAnalyzer, value.Analyzer);
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropQuery, value.Query);
+		writer.WriteProperty(options, PropQueryName, value.QueryName);
+		writer.WriteProperty(options, PropSlop, value.Slop);
+		writer.WriteProperty(options, PropZeroTermsQuery, value.ZeroTermsQuery);
 		writer.WriteEndObject();
 		writer.WriteEndObject();
 	}
@@ -140,6 +142,10 @@ public MatchPhraseQuery(Elastic.Clients.Elasticsearch.Field field)
 		Field = field;
 	}
 
+	internal MatchPhraseQuery()
+	{
+	}
+
 	/// <summary>
 	/// <para>
 	/// Analyzer used to convert the text in the query value into tokens.
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 21611f7384a..22c98ea579b 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/MatchQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/MatchQuery.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,200 +28,185 @@
 
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
 
-internal sealed partial class MatchQueryConverter : JsonConverter<MatchQuery>
+internal sealed partial class MatchQueryConverter : System.Text.Json.Serialization.JsonConverter<MatchQuery>
 {
-	public override MatchQuery Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
+	private static readonly System.Text.Json.JsonEncodedText PropAnalyzer = System.Text.Json.JsonEncodedText.Encode("analyzer");
+	private static readonly System.Text.Json.JsonEncodedText PropAutoGenerateSynonymsPhraseQuery = System.Text.Json.JsonEncodedText.Encode("auto_generate_synonyms_phrase_query");
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropFuzziness = System.Text.Json.JsonEncodedText.Encode("fuzziness");
+	private static readonly System.Text.Json.JsonEncodedText PropFuzzyRewrite = System.Text.Json.JsonEncodedText.Encode("fuzzy_rewrite");
+	private static readonly System.Text.Json.JsonEncodedText PropFuzzyTranspositions = System.Text.Json.JsonEncodedText.Encode("fuzzy_transpositions");
+	private static readonly System.Text.Json.JsonEncodedText PropLenient = System.Text.Json.JsonEncodedText.Encode("lenient");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxExpansions = System.Text.Json.JsonEncodedText.Encode("max_expansions");
+	private static readonly System.Text.Json.JsonEncodedText PropMinimumShouldMatch = System.Text.Json.JsonEncodedText.Encode("minimum_should_match");
+	private static readonly System.Text.Json.JsonEncodedText PropOperator = System.Text.Json.JsonEncodedText.Encode("operator");
+	private static readonly System.Text.Json.JsonEncodedText PropPrefixLength = System.Text.Json.JsonEncodedText.Encode("prefix_length");
+	private static readonly System.Text.Json.JsonEncodedText PropQuery = System.Text.Json.JsonEncodedText.Encode("query");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryName = System.Text.Json.JsonEncodedText.Encode("_name");
+	private static readonly System.Text.Json.JsonEncodedText PropZeroTermsQuery = System.Text.Json.JsonEncodedText.Encode("zero_terms_query");
+
+	public override MatchQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Field> propField = default;
 		reader.Read();
-		var fieldName = reader.GetString();
+		propField.Value = reader.ReadValue<Elastic.Clients.Elasticsearch.Field>(options);
+		propField.Initialized = true;
 		reader.Read();
-		var variant = new MatchQuery(fieldName);
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
-		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+		if (reader.TokenType is not System.Text.Json.JsonTokenType.StartObject)
+		{
+			var value = reader.ReadValue<object>(options);
+			reader.Read();
+			return new MatchQuery { Query = value };
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string?> propAnalyzer = default;
+		LocalJsonProperty<bool?> propAutoGenerateSynonymsPhraseQuery = default;
+		LocalJsonProperty<float?> propBoost = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Fuzziness?> propFuzziness = default;
+		LocalJsonProperty<string?> propFuzzyRewrite = default;
+		LocalJsonProperty<bool?> propFuzzyTranspositions = default;
+		LocalJsonProperty<bool?> propLenient = default;
+		LocalJsonProperty<int?> propMaxExpansions = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.MinimumShouldMatch?> propMinimumShouldMatch = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.QueryDsl.Operator?> propOperator = default;
+		LocalJsonProperty<int?> propPrefixLength = default;
+		LocalJsonProperty<object> propQuery = default;
+		LocalJsonProperty<string?> propQueryName = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.QueryDsl.ZeroTermsQuery?> propZeroTermsQuery = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAnalyzer.TryRead(ref reader, options, PropAnalyzer))
 			{
-				var property = reader.GetString();
-				if (property == "analyzer")
-				{
-					variant.Analyzer = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "auto_generate_synonyms_phrase_query")
-				{
-					variant.AutoGenerateSynonymsPhraseQuery = JsonSerializer.Deserialize<bool?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "boost")
-				{
-					variant.Boost = JsonSerializer.Deserialize<float?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "fuzziness")
-				{
-					variant.Fuzziness = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Fuzziness?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "fuzzy_rewrite")
-				{
-					variant.FuzzyRewrite = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "fuzzy_transpositions")
-				{
-					variant.FuzzyTranspositions = JsonSerializer.Deserialize<bool?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "lenient")
-				{
-					variant.Lenient = JsonSerializer.Deserialize<bool?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "max_expansions")
-				{
-					variant.MaxExpansions = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "minimum_should_match")
-				{
-					variant.MinimumShouldMatch = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.MinimumShouldMatch?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "operator")
-				{
-					variant.Operator = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.Operator?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "prefix_length")
-				{
-					variant.PrefixLength = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "query")
-				{
-					variant.Query = JsonSerializer.Deserialize<object>(ref reader, options);
-					continue;
-				}
-
-				if (property == "_name")
-				{
-					variant.QueryName = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "zero_terms_query")
-				{
-					variant.ZeroTermsQuery = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.ZeroTermsQuery?>(ref reader, options);
-					continue;
-				}
+				continue;
 			}
-		}
 
-		reader.Read();
-		return variant;
-	}
+			if (propAutoGenerateSynonymsPhraseQuery.TryRead(ref reader, options, PropAutoGenerateSynonymsPhraseQuery))
+			{
+				continue;
+			}
 
-	public override void Write(Utf8JsonWriter writer, MatchQuery value, JsonSerializerOptions options)
-	{
-		if (value.Field is null)
-			throw new JsonException("Unable to serialize MatchQuery because the `Field` property is not set. Field name queries must include a valid field name.");
-		if (!options.TryGetClientSettings(out var settings))
-			throw new JsonException("Unable to retrieve client settings required to infer field.");
-		writer.WriteStartObject();
-		writer.WritePropertyName(settings.Inferrer.Field(value.Field));
-		writer.WriteStartObject();
-		if (!string.IsNullOrEmpty(value.Analyzer))
-		{
-			writer.WritePropertyName("analyzer");
-			writer.WriteStringValue(value.Analyzer);
-		}
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
 
-		if (value.AutoGenerateSynonymsPhraseQuery.HasValue)
-		{
-			writer.WritePropertyName("auto_generate_synonyms_phrase_query");
-			writer.WriteBooleanValue(value.AutoGenerateSynonymsPhraseQuery.Value);
-		}
+			if (propFuzziness.TryRead(ref reader, options, PropFuzziness))
+			{
+				continue;
+			}
 
-		if (value.Boost.HasValue)
-		{
-			writer.WritePropertyName("boost");
-			writer.WriteNumberValue(value.Boost.Value);
-		}
+			if (propFuzzyRewrite.TryRead(ref reader, options, PropFuzzyRewrite))
+			{
+				continue;
+			}
 
-		if (value.Fuzziness is not null)
-		{
-			writer.WritePropertyName("fuzziness");
-			JsonSerializer.Serialize(writer, value.Fuzziness, options);
-		}
+			if (propFuzzyTranspositions.TryRead(ref reader, options, PropFuzzyTranspositions))
+			{
+				continue;
+			}
 
-		if (!string.IsNullOrEmpty(value.FuzzyRewrite))
-		{
-			writer.WritePropertyName("fuzzy_rewrite");
-			writer.WriteStringValue(value.FuzzyRewrite);
-		}
+			if (propLenient.TryRead(ref reader, options, PropLenient))
+			{
+				continue;
+			}
 
-		if (value.FuzzyTranspositions.HasValue)
-		{
-			writer.WritePropertyName("fuzzy_transpositions");
-			writer.WriteBooleanValue(value.FuzzyTranspositions.Value);
-		}
+			if (propMaxExpansions.TryRead(ref reader, options, PropMaxExpansions))
+			{
+				continue;
+			}
 
-		if (value.Lenient.HasValue)
-		{
-			writer.WritePropertyName("lenient");
-			writer.WriteBooleanValue(value.Lenient.Value);
-		}
+			if (propMinimumShouldMatch.TryRead(ref reader, options, PropMinimumShouldMatch))
+			{
+				continue;
+			}
 
-		if (value.MaxExpansions.HasValue)
-		{
-			writer.WritePropertyName("max_expansions");
-			writer.WriteNumberValue(value.MaxExpansions.Value);
-		}
+			if (propOperator.TryRead(ref reader, options, PropOperator))
+			{
+				continue;
+			}
 
-		if (value.MinimumShouldMatch is not null)
-		{
-			writer.WritePropertyName("minimum_should_match");
-			JsonSerializer.Serialize(writer, value.MinimumShouldMatch, options);
-		}
+			if (propPrefixLength.TryRead(ref reader, options, PropPrefixLength))
+			{
+				continue;
+			}
 
-		if (value.Operator is not null)
-		{
-			writer.WritePropertyName("operator");
-			JsonSerializer.Serialize(writer, value.Operator, options);
-		}
+			if (propQuery.TryRead(ref reader, options, PropQuery))
+			{
+				continue;
+			}
 
-		if (value.PrefixLength.HasValue)
-		{
-			writer.WritePropertyName("prefix_length");
-			writer.WriteNumberValue(value.PrefixLength.Value);
-		}
+			if (propQueryName.TryRead(ref reader, options, PropQueryName))
+			{
+				continue;
+			}
 
-		writer.WritePropertyName("query");
-		JsonSerializer.Serialize(writer, value.Query, options);
-		if (!string.IsNullOrEmpty(value.QueryName))
-		{
-			writer.WritePropertyName("_name");
-			writer.WriteStringValue(value.QueryName);
-		}
+			if (propZeroTermsQuery.TryRead(ref reader, options, PropZeroTermsQuery))
+			{
+				continue;
+			}
 
-		if (value.ZeroTermsQuery is not null)
-		{
-			writer.WritePropertyName("zero_terms_query");
-			JsonSerializer.Serialize(writer, value.ZeroTermsQuery, options);
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		reader.Read();
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new MatchQuery
+		{
+			Analyzer = propAnalyzer.Value
+,
+			AutoGenerateSynonymsPhraseQuery = propAutoGenerateSynonymsPhraseQuery.Value
+,
+			Boost = propBoost.Value
+,
+			Field = propField.Value
+,
+			Fuzziness = propFuzziness.Value
+,
+			FuzzyRewrite = propFuzzyRewrite.Value
+,
+			FuzzyTranspositions = propFuzzyTranspositions.Value
+,
+			Lenient = propLenient.Value
+,
+			MaxExpansions = propMaxExpansions.Value
+,
+			MinimumShouldMatch = propMinimumShouldMatch.Value
+,
+			Operator = propOperator.Value
+,
+			PrefixLength = propPrefixLength.Value
+,
+			Query = propQuery.Value
+,
+			QueryName = propQueryName.Value
+,
+			ZeroTermsQuery = propZeroTermsQuery.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, MatchQuery value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WritePropertyName(options, value.Field);
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAnalyzer, value.Analyzer);
+		writer.WriteProperty(options, PropAutoGenerateSynonymsPhraseQuery, value.AutoGenerateSynonymsPhraseQuery);
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropFuzziness, value.Fuzziness);
+		writer.WriteProperty(options, PropFuzzyRewrite, value.FuzzyRewrite);
+		writer.WriteProperty(options, PropFuzzyTranspositions, value.FuzzyTranspositions);
+		writer.WriteProperty(options, PropLenient, value.Lenient);
+		writer.WriteProperty(options, PropMaxExpansions, value.MaxExpansions);
+		writer.WriteProperty(options, PropMinimumShouldMatch, value.MinimumShouldMatch);
+		writer.WriteProperty(options, PropOperator, value.Operator);
+		writer.WriteProperty(options, PropPrefixLength, value.PrefixLength);
+		writer.WriteProperty(options, PropQuery, value.Query);
+		writer.WriteProperty(options, PropQueryName, value.QueryName);
+		writer.WriteProperty(options, PropZeroTermsQuery, value.ZeroTermsQuery);
 		writer.WriteEndObject();
 		writer.WriteEndObject();
 	}
@@ -236,6 +222,10 @@ public MatchQuery(Elastic.Clients.Elasticsearch.Field field)
 		Field = field;
 	}
 
+	internal MatchQuery()
+	{
+	}
+
 	/// <summary>
 	/// <para>
 	/// Analyzer used to convert the text in the query value into tokens.
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 30e777edcfb..294642e063e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/MoreLikeThisQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/MoreLikeThisQuery.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,230 @@
 
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
 
+internal sealed partial class MoreLikeThisQueryConverter : System.Text.Json.Serialization.JsonConverter<MoreLikeThisQuery>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAnalyzer = System.Text.Json.JsonEncodedText.Encode("analyzer");
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropBoostTerms = System.Text.Json.JsonEncodedText.Encode("boost_terms");
+	private static readonly System.Text.Json.JsonEncodedText PropFailOnUnsupportedField = System.Text.Json.JsonEncodedText.Encode("fail_on_unsupported_field");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropInclude = System.Text.Json.JsonEncodedText.Encode("include");
+	private static readonly System.Text.Json.JsonEncodedText PropLike = System.Text.Json.JsonEncodedText.Encode("like");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxDocFreq = System.Text.Json.JsonEncodedText.Encode("max_doc_freq");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxQueryTerms = System.Text.Json.JsonEncodedText.Encode("max_query_terms");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxWordLength = System.Text.Json.JsonEncodedText.Encode("max_word_length");
+	private static readonly System.Text.Json.JsonEncodedText PropMinDocFreq = System.Text.Json.JsonEncodedText.Encode("min_doc_freq");
+	private static readonly System.Text.Json.JsonEncodedText PropMinimumShouldMatch = System.Text.Json.JsonEncodedText.Encode("minimum_should_match");
+	private static readonly System.Text.Json.JsonEncodedText PropMinTermFreq = System.Text.Json.JsonEncodedText.Encode("min_term_freq");
+	private static readonly System.Text.Json.JsonEncodedText PropMinWordLength = System.Text.Json.JsonEncodedText.Encode("min_word_length");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryName = System.Text.Json.JsonEncodedText.Encode("_name");
+	private static readonly System.Text.Json.JsonEncodedText PropRouting = System.Text.Json.JsonEncodedText.Encode("routing");
+	private static readonly System.Text.Json.JsonEncodedText PropStopWords = System.Text.Json.JsonEncodedText.Encode("stop_words");
+	private static readonly System.Text.Json.JsonEncodedText PropUnlike = System.Text.Json.JsonEncodedText.Encode("unlike");
+	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("version");
+	private static readonly System.Text.Json.JsonEncodedText PropVersionType = System.Text.Json.JsonEncodedText.Encode("version_type");
+
+	public override MoreLikeThisQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string?> propAnalyzer = default;
+		LocalJsonProperty<float?> propBoost = default;
+		LocalJsonProperty<double?> propBoostTerms = default;
+		LocalJsonProperty<bool?> propFailOnUnsupportedField = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Fields?> propFields = default;
+		LocalJsonProperty<bool?> propInclude = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.QueryDsl.Like>> propLike = default;
+		LocalJsonProperty<int?> propMaxDocFreq = default;
+		LocalJsonProperty<int?> propMaxQueryTerms = default;
+		LocalJsonProperty<int?> propMaxWordLength = default;
+		LocalJsonProperty<int?> propMinDocFreq = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.MinimumShouldMatch?> propMinimumShouldMatch = default;
+		LocalJsonProperty<int?> propMinTermFreq = default;
+		LocalJsonProperty<int?> propMinWordLength = default;
+		LocalJsonProperty<string?> propQueryName = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Routing?> propRouting = default;
+		LocalJsonProperty<ICollection<string>?> propStopWords = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.QueryDsl.Like>?> propUnlike = default;
+		LocalJsonProperty<long?> propVersion = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.VersionType?> propVersionType = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAnalyzer.TryRead(ref reader, options, PropAnalyzer))
+			{
+				continue;
+			}
+
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
+
+			if (propBoostTerms.TryRead(ref reader, options, PropBoostTerms))
+			{
+				continue;
+			}
+
+			if (propFailOnUnsupportedField.TryRead(ref reader, options, PropFailOnUnsupportedField))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields, typeof(FieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propInclude.TryRead(ref reader, options, PropInclude))
+			{
+				continue;
+			}
+
+			if (propLike.TryRead(ref reader, options, PropLike, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.QueryDsl.Like>, Elastic.Clients.Elasticsearch.QueryDsl.Like>)))
+			{
+				continue;
+			}
+
+			if (propMaxDocFreq.TryRead(ref reader, options, PropMaxDocFreq))
+			{
+				continue;
+			}
+
+			if (propMaxQueryTerms.TryRead(ref reader, options, PropMaxQueryTerms))
+			{
+				continue;
+			}
+
+			if (propMaxWordLength.TryRead(ref reader, options, PropMaxWordLength))
+			{
+				continue;
+			}
+
+			if (propMinDocFreq.TryRead(ref reader, options, PropMinDocFreq))
+			{
+				continue;
+			}
+
+			if (propMinimumShouldMatch.TryRead(ref reader, options, PropMinimumShouldMatch))
+			{
+				continue;
+			}
+
+			if (propMinTermFreq.TryRead(ref reader, options, PropMinTermFreq))
+			{
+				continue;
+			}
+
+			if (propMinWordLength.TryRead(ref reader, options, PropMinWordLength))
+			{
+				continue;
+			}
+
+			if (propQueryName.TryRead(ref reader, options, PropQueryName))
+			{
+				continue;
+			}
+
+			if (propRouting.TryRead(ref reader, options, PropRouting))
+			{
+				continue;
+			}
+
+			if (propStopWords.TryRead(ref reader, options, PropStopWords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>)))
+			{
+				continue;
+			}
+
+			if (propUnlike.TryRead(ref reader, options, PropUnlike, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.QueryDsl.Like>?, Elastic.Clients.Elasticsearch.QueryDsl.Like>)))
+			{
+				continue;
+			}
+
+			if (propVersion.TryRead(ref reader, options, PropVersion))
+			{
+				continue;
+			}
+
+			if (propVersionType.TryRead(ref reader, options, PropVersionType))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new MoreLikeThisQuery
+		{
+			Analyzer = propAnalyzer.Value
+,
+			Boost = propBoost.Value
+,
+			BoostTerms = propBoostTerms.Value
+,
+			FailOnUnsupportedField = propFailOnUnsupportedField.Value
+,
+			Fields = propFields.Value
+,
+			Include = propInclude.Value
+,
+			Like = propLike.Value
+,
+			MaxDocFreq = propMaxDocFreq.Value
+,
+			MaxQueryTerms = propMaxQueryTerms.Value
+,
+			MaxWordLength = propMaxWordLength.Value
+,
+			MinDocFreq = propMinDocFreq.Value
+,
+			MinimumShouldMatch = propMinimumShouldMatch.Value
+,
+			MinTermFreq = propMinTermFreq.Value
+,
+			MinWordLength = propMinWordLength.Value
+,
+			QueryName = propQueryName.Value
+,
+			Routing = propRouting.Value
+,
+			StopWords = propStopWords.Value
+,
+			Unlike = propUnlike.Value
+,
+			Version = propVersion.Value
+,
+			VersionType = propVersionType.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, MoreLikeThisQuery value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAnalyzer, value.Analyzer);
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropBoostTerms, value.BoostTerms);
+		writer.WriteProperty(options, PropFailOnUnsupportedField, value.FailOnUnsupportedField);
+		writer.WriteProperty(options, PropFields, value.Fields, typeof(FieldsMarker));
+		writer.WriteProperty(options, PropInclude, value.Include);
+		writer.WriteProperty(options, PropLike, value.Like, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.QueryDsl.Like>, Elastic.Clients.Elasticsearch.QueryDsl.Like>));
+		writer.WriteProperty(options, PropMaxDocFreq, value.MaxDocFreq);
+		writer.WriteProperty(options, PropMaxQueryTerms, value.MaxQueryTerms);
+		writer.WriteProperty(options, PropMaxWordLength, value.MaxWordLength);
+		writer.WriteProperty(options, PropMinDocFreq, value.MinDocFreq);
+		writer.WriteProperty(options, PropMinimumShouldMatch, value.MinimumShouldMatch);
+		writer.WriteProperty(options, PropMinTermFreq, value.MinTermFreq);
+		writer.WriteProperty(options, PropMinWordLength, value.MinWordLength);
+		writer.WriteProperty(options, PropQueryName, value.QueryName);
+		writer.WriteProperty(options, PropRouting, value.Routing);
+		writer.WriteProperty(options, PropStopWords, value.StopWords, typeof(SingleOrManyMarker<IReadOnlyCollection<string>?, string>));
+		writer.WriteProperty(options, PropUnlike, value.Unlike, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.QueryDsl.Like>?, Elastic.Clients.Elasticsearch.QueryDsl.Like>));
+		writer.WriteProperty(options, PropVersion, value.Version);
+		writer.WriteProperty(options, PropVersionType, value.VersionType);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(MoreLikeThisQueryConverter))]
 public sealed partial class MoreLikeThisQuery
 {
 	/// <summary>
@@ -35,7 +260,6 @@ public sealed partial class MoreLikeThisQuery
 	/// Defaults to the analyzer associated with the first field in fields.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("analyzer")]
 	public string? Analyzer { get; set; }
 
 	/// <summary>
@@ -46,7 +270,6 @@ public sealed partial class MoreLikeThisQuery
 	/// A value greater than 1.0 increases the relevance score.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("boost")]
 	public float? Boost { get; set; }
 
 	/// <summary>
@@ -56,7 +279,6 @@ public sealed partial class MoreLikeThisQuery
 	/// Defaults to deactivated (0).
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("boost_terms")]
 	public double? BoostTerms { get; set; }
 
 	/// <summary>
@@ -64,7 +286,6 @@ public sealed partial class MoreLikeThisQuery
 	/// Controls whether the query should fail (throw an exception) if any of the specified fields are not of the supported types (<c>text</c> or <c>keyword</c>).
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("fail_on_unsupported_field")]
 	public bool? FailOnUnsupportedField { get; set; }
 
 	/// <summary>
@@ -73,8 +294,6 @@ public sealed partial class MoreLikeThisQuery
 	/// Defaults to the <c>index.query.default_field</c> index setting, which has a default value of <c>*</c>.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("fields")]
-	[JsonConverter(typeof(FieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Fields? Fields { get; set; }
 
 	/// <summary>
@@ -82,7 +301,6 @@ public sealed partial class MoreLikeThisQuery
 	/// Specifies whether the input documents should also be included in the search results returned.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("include")]
 	public bool? Include { get; set; }
 
 	/// <summary>
@@ -90,8 +308,6 @@ public sealed partial class MoreLikeThisQuery
 	/// Specifies free form text and/or a single or multiple documents for which you want to find similar documents.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("like")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.QueryDsl.Like))]
 	public ICollection<Elastic.Clients.Elasticsearch.QueryDsl.Like> Like { get; set; }
 
 	/// <summary>
@@ -99,7 +315,6 @@ public sealed partial class MoreLikeThisQuery
 	/// The maximum document frequency above which the terms are ignored from the input document.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("max_doc_freq")]
 	public int? MaxDocFreq { get; set; }
 
 	/// <summary>
@@ -107,7 +322,6 @@ public sealed partial class MoreLikeThisQuery
 	/// The maximum number of query terms that can be selected.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("max_query_terms")]
 	public int? MaxQueryTerms { get; set; }
 
 	/// <summary>
@@ -116,7 +330,6 @@ public sealed partial class MoreLikeThisQuery
 	/// Defaults to unbounded (<c>0</c>).
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("max_word_length")]
 	public int? MaxWordLength { get; set; }
 
 	/// <summary>
@@ -124,7 +337,6 @@ public sealed partial class MoreLikeThisQuery
 	/// The minimum document frequency below which the terms are ignored from the input document.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("min_doc_freq")]
 	public int? MinDocFreq { get; set; }
 
 	/// <summary>
@@ -132,7 +344,6 @@ public sealed partial class MoreLikeThisQuery
 	/// After the disjunctive query has been formed, this parameter controls the number of terms that must match.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("minimum_should_match")]
 	public Elastic.Clients.Elasticsearch.MinimumShouldMatch? MinimumShouldMatch { get; set; }
 
 	/// <summary>
@@ -140,7 +351,6 @@ public sealed partial class MoreLikeThisQuery
 	/// The minimum term frequency below which the terms are ignored from the input document.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("min_term_freq")]
 	public int? MinTermFreq { get; set; }
 
 	/// <summary>
@@ -148,11 +358,8 @@ public sealed partial class MoreLikeThisQuery
 	/// The minimum word length below which the terms are ignored.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("min_word_length")]
 	public int? MinWordLength { get; set; }
-	[JsonInclude, JsonPropertyName("_name")]
 	public string? QueryName { get; set; }
-	[JsonInclude, JsonPropertyName("routing")]
 	public Elastic.Clients.Elasticsearch.Routing? Routing { get; set; }
 
 	/// <summary>
@@ -161,8 +368,6 @@ public sealed partial class MoreLikeThisQuery
 	/// Any word in this set is ignored.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("stop_words")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? StopWords { get; set; }
 
 	/// <summary>
@@ -170,12 +375,8 @@ public sealed partial class MoreLikeThisQuery
 	/// Used in combination with <c>like</c> to exclude documents that match a set of terms.
 	/// </para>
 	/// </summary>
-	[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; }
 
 	public static implicit operator Elastic.Clients.Elasticsearch.QueryDsl.Query(MoreLikeThisQuery moreLikeThisQuery) => Elastic.Clients.Elasticsearch.QueryDsl.Query.MoreLikeThis(moreLikeThisQuery);
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 8a01d0b1f4c..3f5ed00af24 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/MultiMatchQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/MultiMatchQuery.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,210 @@
 
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
 
+internal sealed partial class MultiMatchQueryConverter : System.Text.Json.Serialization.JsonConverter<MultiMatchQuery>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAnalyzer = System.Text.Json.JsonEncodedText.Encode("analyzer");
+	private static readonly System.Text.Json.JsonEncodedText PropAutoGenerateSynonymsPhraseQuery = System.Text.Json.JsonEncodedText.Encode("auto_generate_synonyms_phrase_query");
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropFuzziness = System.Text.Json.JsonEncodedText.Encode("fuzziness");
+	private static readonly System.Text.Json.JsonEncodedText PropFuzzyRewrite = System.Text.Json.JsonEncodedText.Encode("fuzzy_rewrite");
+	private static readonly System.Text.Json.JsonEncodedText PropFuzzyTranspositions = System.Text.Json.JsonEncodedText.Encode("fuzzy_transpositions");
+	private static readonly System.Text.Json.JsonEncodedText PropLenient = System.Text.Json.JsonEncodedText.Encode("lenient");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxExpansions = System.Text.Json.JsonEncodedText.Encode("max_expansions");
+	private static readonly System.Text.Json.JsonEncodedText PropMinimumShouldMatch = System.Text.Json.JsonEncodedText.Encode("minimum_should_match");
+	private static readonly System.Text.Json.JsonEncodedText PropOperator = System.Text.Json.JsonEncodedText.Encode("operator");
+	private static readonly System.Text.Json.JsonEncodedText PropPrefixLength = System.Text.Json.JsonEncodedText.Encode("prefix_length");
+	private static readonly System.Text.Json.JsonEncodedText PropQuery = System.Text.Json.JsonEncodedText.Encode("query");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryName = System.Text.Json.JsonEncodedText.Encode("_name");
+	private static readonly System.Text.Json.JsonEncodedText PropSlop = System.Text.Json.JsonEncodedText.Encode("slop");
+	private static readonly System.Text.Json.JsonEncodedText PropTieBreaker = System.Text.Json.JsonEncodedText.Encode("tie_breaker");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+	private static readonly System.Text.Json.JsonEncodedText PropZeroTermsQuery = System.Text.Json.JsonEncodedText.Encode("zero_terms_query");
+
+	public override MultiMatchQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string?> propAnalyzer = default;
+		LocalJsonProperty<bool?> propAutoGenerateSynonymsPhraseQuery = default;
+		LocalJsonProperty<float?> propBoost = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Fields?> propFields = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Fuzziness?> propFuzziness = default;
+		LocalJsonProperty<string?> propFuzzyRewrite = default;
+		LocalJsonProperty<bool?> propFuzzyTranspositions = default;
+		LocalJsonProperty<bool?> propLenient = default;
+		LocalJsonProperty<int?> propMaxExpansions = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.MinimumShouldMatch?> propMinimumShouldMatch = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.QueryDsl.Operator?> propOperator = default;
+		LocalJsonProperty<int?> propPrefixLength = default;
+		LocalJsonProperty<string> propQuery = default;
+		LocalJsonProperty<string?> propQueryName = default;
+		LocalJsonProperty<int?> propSlop = default;
+		LocalJsonProperty<double?> propTieBreaker = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.QueryDsl.TextQueryType?> propType = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.QueryDsl.ZeroTermsQuery?> propZeroTermsQuery = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAnalyzer.TryRead(ref reader, options, PropAnalyzer))
+			{
+				continue;
+			}
+
+			if (propAutoGenerateSynonymsPhraseQuery.TryRead(ref reader, options, PropAutoGenerateSynonymsPhraseQuery))
+			{
+				continue;
+			}
+
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propFuzziness.TryRead(ref reader, options, PropFuzziness))
+			{
+				continue;
+			}
+
+			if (propFuzzyRewrite.TryRead(ref reader, options, PropFuzzyRewrite))
+			{
+				continue;
+			}
+
+			if (propFuzzyTranspositions.TryRead(ref reader, options, PropFuzzyTranspositions))
+			{
+				continue;
+			}
+
+			if (propLenient.TryRead(ref reader, options, PropLenient))
+			{
+				continue;
+			}
+
+			if (propMaxExpansions.TryRead(ref reader, options, PropMaxExpansions))
+			{
+				continue;
+			}
+
+			if (propMinimumShouldMatch.TryRead(ref reader, options, PropMinimumShouldMatch))
+			{
+				continue;
+			}
+
+			if (propOperator.TryRead(ref reader, options, PropOperator))
+			{
+				continue;
+			}
+
+			if (propPrefixLength.TryRead(ref reader, options, PropPrefixLength))
+			{
+				continue;
+			}
+
+			if (propQuery.TryRead(ref reader, options, PropQuery))
+			{
+				continue;
+			}
+
+			if (propQueryName.TryRead(ref reader, options, PropQueryName))
+			{
+				continue;
+			}
+
+			if (propSlop.TryRead(ref reader, options, PropSlop))
+			{
+				continue;
+			}
+
+			if (propTieBreaker.TryRead(ref reader, options, PropTieBreaker))
+			{
+				continue;
+			}
+
+			if (propType.TryRead(ref reader, options, PropType))
+			{
+				continue;
+			}
+
+			if (propZeroTermsQuery.TryRead(ref reader, options, PropZeroTermsQuery))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new MultiMatchQuery
+		{
+			Analyzer = propAnalyzer.Value
+,
+			AutoGenerateSynonymsPhraseQuery = propAutoGenerateSynonymsPhraseQuery.Value
+,
+			Boost = propBoost.Value
+,
+			Fields = propFields.Value
+,
+			Fuzziness = propFuzziness.Value
+,
+			FuzzyRewrite = propFuzzyRewrite.Value
+,
+			FuzzyTranspositions = propFuzzyTranspositions.Value
+,
+			Lenient = propLenient.Value
+,
+			MaxExpansions = propMaxExpansions.Value
+,
+			MinimumShouldMatch = propMinimumShouldMatch.Value
+,
+			Operator = propOperator.Value
+,
+			PrefixLength = propPrefixLength.Value
+,
+			Query = propQuery.Value
+,
+			QueryName = propQueryName.Value
+,
+			Slop = propSlop.Value
+,
+			TieBreaker = propTieBreaker.Value
+,
+			Type = propType.Value
+,
+			ZeroTermsQuery = propZeroTermsQuery.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, MultiMatchQuery value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAnalyzer, value.Analyzer);
+		writer.WriteProperty(options, PropAutoGenerateSynonymsPhraseQuery, value.AutoGenerateSynonymsPhraseQuery);
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropFields, value.Fields, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropFuzziness, value.Fuzziness);
+		writer.WriteProperty(options, PropFuzzyRewrite, value.FuzzyRewrite);
+		writer.WriteProperty(options, PropFuzzyTranspositions, value.FuzzyTranspositions);
+		writer.WriteProperty(options, PropLenient, value.Lenient);
+		writer.WriteProperty(options, PropMaxExpansions, value.MaxExpansions);
+		writer.WriteProperty(options, PropMinimumShouldMatch, value.MinimumShouldMatch);
+		writer.WriteProperty(options, PropOperator, value.Operator);
+		writer.WriteProperty(options, PropPrefixLength, value.PrefixLength);
+		writer.WriteProperty(options, PropQuery, value.Query);
+		writer.WriteProperty(options, PropQueryName, value.QueryName);
+		writer.WriteProperty(options, PropSlop, value.Slop);
+		writer.WriteProperty(options, PropTieBreaker, value.TieBreaker);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteProperty(options, PropZeroTermsQuery, value.ZeroTermsQuery);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(MultiMatchQueryConverter))]
 public sealed partial class MultiMatchQuery
 {
 	/// <summary>
@@ -34,7 +239,6 @@ public sealed partial class MultiMatchQuery
 	/// Analyzer used to convert the text in the query value into tokens.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("analyzer")]
 	public string? Analyzer { get; set; }
 
 	/// <summary>
@@ -42,7 +246,6 @@ public sealed partial class MultiMatchQuery
 	/// If <c>true</c>, match phrase queries are automatically created for multi-term synonyms.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("auto_generate_synonyms_phrase_query")]
 	public bool? AutoGenerateSynonymsPhraseQuery { get; set; }
 
 	/// <summary>
@@ -53,7 +256,6 @@ public sealed partial class MultiMatchQuery
 	/// A value greater than 1.0 increases the relevance score.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("boost")]
 	public float? Boost { get; set; }
 
 	/// <summary>
@@ -62,8 +264,6 @@ public sealed partial class MultiMatchQuery
 	/// Defaults to the <c>index.query.default_field</c> index settings, which in turn defaults to <c>*</c>.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("fields")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Fields? Fields { get; set; }
 
 	/// <summary>
@@ -71,7 +271,6 @@ public sealed partial class MultiMatchQuery
 	/// Maximum edit distance allowed for matching.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("fuzziness")]
 	public Elastic.Clients.Elasticsearch.Fuzziness? Fuzziness { get; set; }
 
 	/// <summary>
@@ -79,7 +278,6 @@ public sealed partial class MultiMatchQuery
 	/// Method used to rewrite the query.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("fuzzy_rewrite")]
 	public string? FuzzyRewrite { get; set; }
 
 	/// <summary>
@@ -88,7 +286,6 @@ public sealed partial class MultiMatchQuery
 	/// Can be applied to the term subqueries constructed for all terms but the final term.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("fuzzy_transpositions")]
 	public bool? FuzzyTranspositions { get; set; }
 
 	/// <summary>
@@ -96,7 +293,6 @@ public sealed partial class MultiMatchQuery
 	/// If <c>true</c>, format-based errors, such as providing a text query value for a numeric field, are ignored.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("lenient")]
 	public bool? Lenient { get; set; }
 
 	/// <summary>
@@ -104,7 +300,6 @@ public sealed partial class MultiMatchQuery
 	/// Maximum number of terms to which the query will expand.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("max_expansions")]
 	public int? MaxExpansions { get; set; }
 
 	/// <summary>
@@ -112,7 +307,6 @@ public sealed partial class MultiMatchQuery
 	/// Minimum number of clauses that must match for a document to be returned.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("minimum_should_match")]
 	public Elastic.Clients.Elasticsearch.MinimumShouldMatch? MinimumShouldMatch { get; set; }
 
 	/// <summary>
@@ -120,7 +314,6 @@ public sealed partial class MultiMatchQuery
 	/// Boolean logic used to interpret text in the query value.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("operator")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.Operator? Operator { get; set; }
 
 	/// <summary>
@@ -128,7 +321,6 @@ public sealed partial class MultiMatchQuery
 	/// Number of beginning characters left unchanged for fuzzy matching.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("prefix_length")]
 	public int? PrefixLength { get; set; }
 
 	/// <summary>
@@ -136,9 +328,7 @@ public sealed partial class MultiMatchQuery
 	/// Text, number, boolean value or date you wish to find in the provided field.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("query")]
 	public string Query { get; set; }
-	[JsonInclude, JsonPropertyName("_name")]
 	public string? QueryName { get; set; }
 
 	/// <summary>
@@ -146,7 +336,6 @@ public sealed partial class MultiMatchQuery
 	/// Maximum number of positions allowed between matching tokens.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("slop")]
 	public int? Slop { get; set; }
 
 	/// <summary>
@@ -154,7 +343,6 @@ public sealed partial class MultiMatchQuery
 	/// Determines how scores for each per-term blended query and scores across groups are combined.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("tie_breaker")]
 	public double? TieBreaker { get; set; }
 
 	/// <summary>
@@ -162,7 +350,6 @@ public sealed partial class MultiMatchQuery
 	/// How <c>the</c> multi_match query is executed internally.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("type")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.TextQueryType? Type { get; set; }
 
 	/// <summary>
@@ -170,7 +357,6 @@ public sealed partial class MultiMatchQuery
 	/// Indicates whether no documents are returned if the <c>analyzer</c> removes all tokens, such as when using a <c>stop</c> filter.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("zero_terms_query")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.ZeroTermsQuery? ZeroTermsQuery { get; set; }
 
 	public static implicit operator Elastic.Clients.Elasticsearch.QueryDsl.Query(MultiMatchQuery multiMatchQuery) => Elastic.Clients.Elasticsearch.QueryDsl.Query.MultiMatch(multiMatchQuery);
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 cfbc2a0079e..84a7a951487 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/NumberRangeQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/NumberRangeQuery.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,127 +28,115 @@
 
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
 
-internal sealed partial class NumberRangeQueryConverter : JsonConverter<NumberRangeQuery>
+internal sealed partial class NumberRangeQueryConverter : System.Text.Json.Serialization.JsonConverter<NumberRangeQuery>
 {
-	public override NumberRangeQuery Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropGt = System.Text.Json.JsonEncodedText.Encode("gt");
+	private static readonly System.Text.Json.JsonEncodedText PropGte = System.Text.Json.JsonEncodedText.Encode("gte");
+	private static readonly System.Text.Json.JsonEncodedText PropLt = System.Text.Json.JsonEncodedText.Encode("lt");
+	private static readonly System.Text.Json.JsonEncodedText PropLte = System.Text.Json.JsonEncodedText.Encode("lte");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryName = System.Text.Json.JsonEncodedText.Encode("_name");
+	private static readonly System.Text.Json.JsonEncodedText PropRelation = System.Text.Json.JsonEncodedText.Encode("relation");
+
+	public override NumberRangeQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Field> propField = default;
 		reader.Read();
-		var fieldName = reader.GetString();
+		propField.Value = reader.ReadValue<Elastic.Clients.Elasticsearch.Field>(options);
+		propField.Initialized = true;
 		reader.Read();
-		var variant = new NumberRangeQuery(fieldName);
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<float?> propBoost = default;
+		LocalJsonProperty<double?> propGt = default;
+		LocalJsonProperty<double?> propGte = default;
+		LocalJsonProperty<double?> propLt = default;
+		LocalJsonProperty<double?> propLte = default;
+		LocalJsonProperty<string?> propQueryName = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.QueryDsl.RangeRelation?> propRelation = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propBoost.TryRead(ref reader, options, PropBoost))
 			{
-				var property = reader.GetString();
-				if (property == "boost")
-				{
-					variant.Boost = JsonSerializer.Deserialize<float?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "gt")
-				{
-					variant.Gt = JsonSerializer.Deserialize<double?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "gte")
-				{
-					variant.Gte = JsonSerializer.Deserialize<double?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "lt")
-				{
-					variant.Lt = JsonSerializer.Deserialize<double?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "lte")
-				{
-					variant.Lte = JsonSerializer.Deserialize<double?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "_name")
-				{
-					variant.QueryName = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "relation")
-				{
-					variant.Relation = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.RangeRelation?>(ref reader, options);
-					continue;
-				}
+				continue;
 			}
-		}
 
-		reader.Read();
-		return variant;
-	}
+			if (propGt.TryRead(ref reader, options, PropGt))
+			{
+				continue;
+			}
 
-	public override void Write(Utf8JsonWriter writer, NumberRangeQuery value, JsonSerializerOptions options)
-	{
-		if (value.Field is null)
-			throw new JsonException("Unable to serialize NumberRangeQuery because the `Field` property is not set. Field name queries must include a valid field name.");
-		if (!options.TryGetClientSettings(out var settings))
-			throw new JsonException("Unable to retrieve client settings required to infer field.");
-		writer.WriteStartObject();
-		writer.WritePropertyName(settings.Inferrer.Field(value.Field));
-		writer.WriteStartObject();
-		if (value.Boost.HasValue)
-		{
-			writer.WritePropertyName("boost");
-			writer.WriteNumberValue(value.Boost.Value);
-		}
+			if (propGte.TryRead(ref reader, options, PropGte))
+			{
+				continue;
+			}
 
-		if (value.Gt.HasValue)
-		{
-			writer.WritePropertyName("gt");
-			writer.WriteNumberValue(value.Gt.Value);
-		}
+			if (propLt.TryRead(ref reader, options, PropLt))
+			{
+				continue;
+			}
 
-		if (value.Gte.HasValue)
-		{
-			writer.WritePropertyName("gte");
-			writer.WriteNumberValue(value.Gte.Value);
-		}
+			if (propLte.TryRead(ref reader, options, PropLte))
+			{
+				continue;
+			}
 
-		if (value.Lt.HasValue)
-		{
-			writer.WritePropertyName("lt");
-			writer.WriteNumberValue(value.Lt.Value);
-		}
+			if (propQueryName.TryRead(ref reader, options, PropQueryName))
+			{
+				continue;
+			}
 
-		if (value.Lte.HasValue)
-		{
-			writer.WritePropertyName("lte");
-			writer.WriteNumberValue(value.Lte.Value);
-		}
+			if (propRelation.TryRead(ref reader, options, PropRelation))
+			{
+				continue;
+			}
 
-		if (!string.IsNullOrEmpty(value.QueryName))
-		{
-			writer.WritePropertyName("_name");
-			writer.WriteStringValue(value.QueryName);
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		if (value.Relation is not null)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		reader.Read();
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new NumberRangeQuery
 		{
-			writer.WritePropertyName("relation");
-			JsonSerializer.Serialize(writer, value.Relation, options);
-		}
+			Boost = propBoost.Value
+,
+			Field = propField.Value
+,
+			Gt = propGt.Value
+,
+			Gte = propGte.Value
+,
+			Lt = propLt.Value
+,
+			Lte = propLte.Value
+,
+			QueryName = propQueryName.Value
+,
+			Relation = propRelation.Value
+		};
+	}
 
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, NumberRangeQuery value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WritePropertyName(options, value.Field);
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropGt, value.Gt);
+		writer.WriteProperty(options, PropGte, value.Gte);
+		writer.WriteProperty(options, PropLt, value.Lt);
+		writer.WriteProperty(options, PropLte, value.Lte);
+		writer.WriteProperty(options, PropQueryName, value.QueryName);
+		writer.WriteProperty(options, PropRelation, value.Relation);
 		writer.WriteEndObject();
 		writer.WriteEndObject();
 	}
 }
 
 [JsonConverter(typeof(NumberRangeQueryConverter))]
-public sealed partial class NumberRangeQuery
+public sealed partial class NumberRangeQuery : IRangeQuery
 {
 	public NumberRangeQuery(Elastic.Clients.Elasticsearch.Field field)
 	{
@@ -156,6 +145,10 @@ public NumberRangeQuery(Elastic.Clients.Elasticsearch.Field field)
 		Field = field;
 	}
 
+	internal NumberRangeQuery()
+	{
+	}
+
 	/// <summary>
 	/// <para>
 	/// Floating point number used to decrease or increase the relevance scores of the query.
@@ -202,6 +195,8 @@ public NumberRangeQuery(Elastic.Clients.Elasticsearch.Field field)
 	/// </para>
 	/// </summary>
 	public Elastic.Clients.Elasticsearch.QueryDsl.RangeRelation? Relation { get; set; }
+
+	public string Type => "numberrangequery";
 }
 
 public sealed partial class NumberRangeQueryDescriptor<TDocument> : SerializableDescriptor<NumberRangeQueryDescriptor<TDocument>>
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/NumericDecayFunction.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/NumericDecayFunction.g.cs
index 7b69411a236..0a997969cc2 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/NumericDecayFunction.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/NumericDecayFunction.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,60 +28,51 @@
 
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
 
-internal sealed partial class NumericDecayFunctionConverter : JsonConverter<NumericDecayFunction>
+internal sealed partial class NumericDecayFunctionConverter : System.Text.Json.Serialization.JsonConverter<NumericDecayFunction>
 {
-	public override NumericDecayFunction Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		var variant = new NumericDecayFunction();
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
-		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
-			{
-				var property = reader.GetString();
-				if (property == "multi_value_mode")
-				{
-					variant.MultiValueMode = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.MultiValueMode?>(ref reader, options);
-					continue;
-				}
-
-				variant.Field = property;
-				reader.Read();
-				variant.Placement = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.DecayPlacement<double, double>>(ref reader, options);
-			}
-		}
-
-		return variant;
-	}
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropPlacement = System.Text.Json.JsonEncodedText.Encode("placement");
+	private static readonly System.Text.Json.JsonEncodedText PropMultiValueMode = System.Text.Json.JsonEncodedText.Encode("multi_value_mode");
 
-	public override void Write(Utf8JsonWriter writer, NumericDecayFunction value, JsonSerializerOptions options)
+	public override NumericDecayFunction Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		writer.WriteStartObject();
-		if (value.Field is not null && value.Placement is not null)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Field> propField = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.QueryDsl.DecayPlacement<double, double>> propPlacement = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.QueryDsl.MultiValueMode?> propMultiValueMode = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (!options.TryGetClientSettings(out var settings))
+			if (propMultiValueMode.TryRead(ref reader, options, PropMultiValueMode))
 			{
-				ThrowHelper.ThrowJsonExceptionForMissingSettings();
+				continue;
 			}
 
-			var propertyName = settings.Inferrer.Field(value.Field);
-			writer.WritePropertyName(propertyName);
-			JsonSerializer.Serialize(writer, value.Placement, options);
+			propField.Initialized = propPlacement.Initialized = true;
+			reader.ReadProperty(options, out propField.Value, out propPlacement.Value);
 		}
 
-		if (value.MultiValueMode is not null)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new NumericDecayFunction
 		{
-			writer.WritePropertyName("multi_value_mode");
-			JsonSerializer.Serialize(writer, value.MultiValueMode, options);
-		}
+			Field = propField.Value
+,
+			Placement = propPlacement.Value
+,
+			MultiValueMode = propMultiValueMode.Value
+		};
+	}
 
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, NumericDecayFunction value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropMultiValueMode, value.MultiValueMode);
+		writer.WriteProperty(options, value.Field, value.Placement);
 		writer.WriteEndObject();
 	}
 }
 
 [JsonConverter(typeof(NumericDecayFunctionConverter))]
-public sealed partial class NumericDecayFunction
+public sealed partial class NumericDecayFunction : IDecayFunction
 {
 	public Elastic.Clients.Elasticsearch.Field Field { get; set; }
 
@@ -91,6 +83,8 @@ public sealed partial class NumericDecayFunction
 	/// </summary>
 	public Elastic.Clients.Elasticsearch.QueryDsl.MultiValueMode? MultiValueMode { get; set; }
 	public Elastic.Clients.Elasticsearch.QueryDsl.DecayPlacement<double, double> Placement { get; set; }
+
+	public string Type => "numericdecayfunction";
 }
 
 public sealed partial class NumericDecayFunctionDescriptor<TDocument> : SerializableDescriptor<NumericDecayFunctionDescriptor<TDocument>>
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/PinnedQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/PinnedQuery.g.cs
index 26dd33fbbfb..d37ca4f8e6e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/PinnedQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/PinnedQuery.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -39,12 +40,16 @@ internal PinnedQuery(string variantName, object variant)
 			throw new ArgumentNullException(nameof(variant));
 		if (string.IsNullOrWhiteSpace(variantName))
 			throw new ArgumentException("Variant name must not be empty or whitespace.");
-		VariantName = variantName;
+		VariantType = variantName;
 		Variant = variant;
 	}
 
-	internal object Variant { get; }
-	internal string VariantName { get; }
+	internal PinnedQuery()
+	{
+	}
+
+	public object Variant { get; internal set; }
+	public string VariantType { get; internal set; }
 
 	public static PinnedQuery Docs(IReadOnlyCollection<Elastic.Clients.Elasticsearch.QueryDsl.PinnedDoc> pinnedDoc) => new PinnedQuery("docs", pinnedDoc);
 	public static PinnedQuery Ids(IReadOnlyCollection<Elastic.Clients.Elasticsearch.Id> id) => new PinnedQuery("ids", id);
@@ -83,111 +88,91 @@ public bool TryGet<T>([NotNullWhen(true)] out T? result) where T : class
 	}
 }
 
-internal sealed partial class PinnedQueryConverter : JsonConverter<PinnedQuery>
+internal sealed partial class PinnedQueryConverter : System.Text.Json.Serialization.JsonConverter<PinnedQuery>
 {
-	public override PinnedQuery Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-		{
-			throw new JsonException("Expected start token.");
-		}
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropOrganic = System.Text.Json.JsonEncodedText.Encode("organic");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryName = System.Text.Json.JsonEncodedText.Encode("_name");
+	private static readonly System.Text.Json.JsonEncodedText VariantDocs = System.Text.Json.JsonEncodedText.Encode("docs");
+	private static readonly System.Text.Json.JsonEncodedText VariantIds = System.Text.Json.JsonEncodedText.Encode("ids");
 
-		object? variantValue = default;
-		string? variantNameValue = default;
-		float? boostValue = default;
-		Elastic.Clients.Elasticsearch.QueryDsl.Query organicValue = default;
-		string? queryNameValue = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+	public override PinnedQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<float?> propBoost = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.QueryDsl.Query> propOrganic = default;
+		LocalJsonProperty<string?> propQueryName = default;
+		var variantType = string.Empty;
+		object? variant = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
+			if (propBoost.TryRead(ref reader, options, PropBoost))
 			{
-				throw new JsonException("Expected a property name token.");
-			}
-
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token representing the name of an Elasticsearch field.");
-			}
-
-			var propertyName = reader.GetString();
-			reader.Read();
-			if (propertyName == "boost")
-			{
-				boostValue = JsonSerializer.Deserialize<float?>(ref reader, options);
 				continue;
 			}
 
-			if (propertyName == "organic")
+			if (propOrganic.TryRead(ref reader, options, PropOrganic))
 			{
-				organicValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.Query>(ref reader, options);
 				continue;
 			}
 
-			if (propertyName == "_name")
+			if (propQueryName.TryRead(ref reader, options, PropQueryName))
 			{
-				queryNameValue = JsonSerializer.Deserialize<string?>(ref reader, options);
 				continue;
 			}
 
-			if (propertyName == "docs")
+			if (reader.ValueTextEquals(VariantDocs))
 			{
-				variantValue = JsonSerializer.Deserialize<ICollection<Elastic.Clients.Elasticsearch.QueryDsl.PinnedDoc>?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantDocs.Value;
+				reader.Read();
+				variant = reader.ReadValue<ICollection<Elastic.Clients.Elasticsearch.QueryDsl.PinnedDoc>?>(options);
 				continue;
 			}
 
-			if (propertyName == "ids")
+			if (reader.ValueTextEquals(VariantIds))
 			{
-				variantValue = JsonSerializer.Deserialize<ICollection<Elastic.Clients.Elasticsearch.Id>?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantIds.Value;
+				reader.Read();
+				variant = reader.ReadValue<ICollection<Elastic.Clients.Elasticsearch.Id>?>(options);
 				continue;
 			}
 
-			throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'PinnedQuery' from the response.");
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		var result = new PinnedQuery(variantNameValue, variantValue);
-		result.Boost = boostValue;
-		result.Organic = organicValue;
-		result.QueryName = queryNameValue;
-		return result;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PinnedQuery
+		{
+			VariantType = variantType,
+			Variant = variant,
+			Boost = propBoost.Value
+	,
+			Organic = propOrganic.Value
+	,
+			QueryName = propQueryName.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, PinnedQuery value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PinnedQuery value, System.Text.Json.JsonSerializerOptions options)
 	{
 		writer.WriteStartObject();
-		if (value.Boost.HasValue)
+		switch (value.VariantType)
 		{
-			writer.WritePropertyName("boost");
-			writer.WriteNumberValue(value.Boost.Value);
-		}
-
-		if (value.Organic is not null)
-		{
-			writer.WritePropertyName("organic");
-			JsonSerializer.Serialize(writer, value.Organic, options);
-		}
-
-		if (!string.IsNullOrEmpty(value.QueryName))
-		{
-			writer.WritePropertyName("_name");
-			writer.WriteStringValue(value.QueryName);
-		}
-
-		if (value.VariantName is not null && value.Variant is not null)
-		{
-			writer.WritePropertyName(value.VariantName);
-			switch (value.VariantName)
-			{
-				case "docs":
-					JsonSerializer.Serialize<IReadOnlyCollection<Elastic.Clients.Elasticsearch.QueryDsl.PinnedDoc>>(writer, (IReadOnlyCollection<Elastic.Clients.Elasticsearch.QueryDsl.PinnedDoc>)value.Variant, options);
-					break;
-				case "ids":
-					JsonSerializer.Serialize<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Id>>(writer, (IReadOnlyCollection<Elastic.Clients.Elasticsearch.Id>)value.Variant, options);
-					break;
-			}
+			case "":
+				break;
+			case "docs":
+				writer.WriteProperty(options, value.VariantType, (ICollection<Elastic.Clients.Elasticsearch.QueryDsl.PinnedDoc>?)value.Variant);
+				break;
+			case "ids":
+				writer.WriteProperty(options, value.VariantType, (ICollection<Elastic.Clients.Elasticsearch.Id>?)value.Variant);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.VariantType}' is not supported for type '{nameof(PinnedQuery)}'.");
 		}
 
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropOrganic, value.Organic);
+		writer.WriteProperty(options, PropQueryName, value.QueryName);
 		writer.WriteEndObject();
 	}
 }
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 bf5373da149..dbd33001d53 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/PrefixQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/PrefixQuery.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,92 +28,95 @@
 
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
 
-internal sealed partial class PrefixQueryConverter : JsonConverter<PrefixQuery>
+internal sealed partial class PrefixQueryConverter : System.Text.Json.Serialization.JsonConverter<PrefixQuery>
 {
-	public override PrefixQuery Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropCaseInsensitive = System.Text.Json.JsonEncodedText.Encode("case_insensitive");
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryName = System.Text.Json.JsonEncodedText.Encode("_name");
+	private static readonly System.Text.Json.JsonEncodedText PropRewrite = System.Text.Json.JsonEncodedText.Encode("rewrite");
+	private static readonly System.Text.Json.JsonEncodedText PropValue = System.Text.Json.JsonEncodedText.Encode("value");
+
+	public override PrefixQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Field> propField = default;
 		reader.Read();
-		var fieldName = reader.GetString();
+		propField.Value = reader.ReadValue<Elastic.Clients.Elasticsearch.Field>(options);
+		propField.Initialized = true;
 		reader.Read();
-		var variant = new PrefixQuery(fieldName);
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		if (reader.TokenType is not System.Text.Json.JsonTokenType.StartObject)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			var value = reader.ReadValue<string>(options);
+			reader.Read();
+			return new PrefixQuery { Value = value };
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<float?> propBoost = default;
+		LocalJsonProperty<bool?> propCaseInsensitive = default;
+		LocalJsonProperty<string?> propQueryName = default;
+		LocalJsonProperty<string?> propRewrite = default;
+		LocalJsonProperty<string> propValue = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBoost.TryRead(ref reader, options, PropBoost))
 			{
-				var property = reader.GetString();
-				if (property == "boost")
-				{
-					variant.Boost = JsonSerializer.Deserialize<float?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "case_insensitive")
-				{
-					variant.CaseInsensitive = JsonSerializer.Deserialize<bool?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "_name")
-				{
-					variant.QueryName = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "rewrite")
-				{
-					variant.Rewrite = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "value")
-				{
-					variant.Value = JsonSerializer.Deserialize<string>(ref reader, options);
-					continue;
-				}
+				continue;
 			}
-		}
 
-		reader.Read();
-		return variant;
-	}
+			if (propCaseInsensitive.TryRead(ref reader, options, PropCaseInsensitive))
+			{
+				continue;
+			}
 
-	public override void Write(Utf8JsonWriter writer, PrefixQuery value, JsonSerializerOptions options)
-	{
-		if (value.Field is null)
-			throw new JsonException("Unable to serialize PrefixQuery because the `Field` property is not set. Field name queries must include a valid field name.");
-		if (!options.TryGetClientSettings(out var settings))
-			throw new JsonException("Unable to retrieve client settings required to infer field.");
-		writer.WriteStartObject();
-		writer.WritePropertyName(settings.Inferrer.Field(value.Field));
-		writer.WriteStartObject();
-		if (value.Boost.HasValue)
-		{
-			writer.WritePropertyName("boost");
-			writer.WriteNumberValue(value.Boost.Value);
-		}
+			if (propQueryName.TryRead(ref reader, options, PropQueryName))
+			{
+				continue;
+			}
 
-		if (value.CaseInsensitive.HasValue)
-		{
-			writer.WritePropertyName("case_insensitive");
-			writer.WriteBooleanValue(value.CaseInsensitive.Value);
-		}
+			if (propRewrite.TryRead(ref reader, options, PropRewrite))
+			{
+				continue;
+			}
 
-		if (!string.IsNullOrEmpty(value.QueryName))
-		{
-			writer.WritePropertyName("_name");
-			writer.WriteStringValue(value.QueryName);
+			if (propValue.TryRead(ref reader, options, PropValue))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		if (!string.IsNullOrEmpty(value.Rewrite))
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		reader.Read();
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PrefixQuery
 		{
-			writer.WritePropertyName("rewrite");
-			writer.WriteStringValue(value.Rewrite);
-		}
+			Boost = propBoost.Value
+,
+			CaseInsensitive = propCaseInsensitive.Value
+,
+			Field = propField.Value
+,
+			QueryName = propQueryName.Value
+,
+			Rewrite = propRewrite.Value
+,
+			Value = propValue.Value
+		};
+	}
 
-		writer.WritePropertyName("value");
-		writer.WriteStringValue(value.Value);
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PrefixQuery value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WritePropertyName(options, value.Field);
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropCaseInsensitive, value.CaseInsensitive);
+		writer.WriteProperty(options, PropQueryName, value.QueryName);
+		writer.WriteProperty(options, PropRewrite, value.Rewrite);
+		writer.WriteProperty(options, PropValue, value.Value);
 		writer.WriteEndObject();
 		writer.WriteEndObject();
 	}
@@ -128,6 +132,10 @@ public PrefixQuery(Elastic.Clients.Elasticsearch.Field field)
 		Field = field;
 	}
 
+	internal PrefixQuery()
+	{
+	}
+
 	/// <summary>
 	/// <para>
 	/// Floating point number used to decrease or increase the relevance scores of the query.
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 af15e4dd3d6..ca7f53cb8ce 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/Query.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/Query.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -44,18 +45,23 @@ internal Query(string variantName, object variant)
 			throw new ArgumentNullException(nameof(variant));
 		if (string.IsNullOrWhiteSpace(variantName))
 			throw new ArgumentException("Variant name must not be empty or whitespace.");
-		VariantName = variantName;
+		VariantType = variantName;
 		Variant = variant;
 	}
 
-	internal object Variant { get; }
-	internal string VariantName { get; }
+	internal Query()
+	{
+	}
+
+	public object Variant { get; internal set; }
+	public string VariantType { get; internal set; }
 
 	public static Query Bool(Elastic.Clients.Elasticsearch.QueryDsl.BoolQuery boolQuery) => new Query("bool", boolQuery);
 	public static Query Boosting(Elastic.Clients.Elasticsearch.QueryDsl.BoostingQuery boostingQuery) => new Query("boosting", boostingQuery);
 	public static Query CombinedFields(Elastic.Clients.Elasticsearch.QueryDsl.CombinedFieldsQuery combinedFieldsQuery) => new Query("combined_fields", combinedFieldsQuery);
 	public static Query ConstantScore(Elastic.Clients.Elasticsearch.QueryDsl.ConstantScoreQuery constantScoreQuery) => new Query("constant_score", constantScoreQuery);
 	public static Query DisMax(Elastic.Clients.Elasticsearch.QueryDsl.DisMaxQuery disMaxQuery) => new Query("dis_max", disMaxQuery);
+	public static Query DistanceFeature(Elastic.Clients.Elasticsearch.QueryDsl.IDistanceFeatureQuery distanceFeatureQuery) => new Query("distance_feature", distanceFeatureQuery);
 	public static Query DistanceFeature(Elastic.Clients.Elasticsearch.QueryDsl.UntypedDistanceFeatureQuery distanceFeatureQuery) => new Query("distance_feature", distanceFeatureQuery);
 	public static Query DistanceFeature(Elastic.Clients.Elasticsearch.QueryDsl.GeoDistanceFeatureQuery distanceFeatureQuery) => new Query("distance_feature", distanceFeatureQuery);
 	public static Query DistanceFeature(Elastic.Clients.Elasticsearch.QueryDsl.DateDistanceFeatureQuery distanceFeatureQuery) => new Query("distance_feature", distanceFeatureQuery);
@@ -84,6 +90,7 @@ internal Query(string variantName, object variant)
 	public static Query Pinned(Elastic.Clients.Elasticsearch.QueryDsl.PinnedQuery pinnedQuery) => new Query("pinned", pinnedQuery);
 	public static Query Prefix(Elastic.Clients.Elasticsearch.QueryDsl.PrefixQuery prefixQuery) => new Query("prefix", prefixQuery);
 	public static Query QueryString(Elastic.Clients.Elasticsearch.QueryDsl.QueryStringQuery queryStringQuery) => new Query("query_string", queryStringQuery);
+	public static Query Range(Elastic.Clients.Elasticsearch.QueryDsl.IRangeQuery rangeQuery) => new Query("range", rangeQuery);
 	public static Query Range(Elastic.Clients.Elasticsearch.QueryDsl.UntypedRangeQuery rangeQuery) => new Query("range", rangeQuery);
 	public static Query Range(Elastic.Clients.Elasticsearch.QueryDsl.DateRangeQuery rangeQuery) => new Query("range", rangeQuery);
 	public static Query Range(Elastic.Clients.Elasticsearch.QueryDsl.NumberRangeQuery rangeQuery) => new Query("range", rangeQuery);
@@ -126,607 +133,704 @@ public bool TryGet<T>([NotNullWhen(true)] out T? result) where T : class
 	}
 }
 
-internal sealed partial class QueryConverter : JsonConverter<Query>
+internal sealed partial class QueryConverter : System.Text.Json.Serialization.JsonConverter<Query>
 {
-	public override Query Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText VariantBool = System.Text.Json.JsonEncodedText.Encode("bool");
+	private static readonly System.Text.Json.JsonEncodedText VariantBoosting = System.Text.Json.JsonEncodedText.Encode("boosting");
+	private static readonly System.Text.Json.JsonEncodedText VariantCombinedFields = System.Text.Json.JsonEncodedText.Encode("combined_fields");
+	private static readonly System.Text.Json.JsonEncodedText VariantConstantScore = System.Text.Json.JsonEncodedText.Encode("constant_score");
+	private static readonly System.Text.Json.JsonEncodedText VariantDisMax = System.Text.Json.JsonEncodedText.Encode("dis_max");
+	private static readonly System.Text.Json.JsonEncodedText VariantDistanceFeature = System.Text.Json.JsonEncodedText.Encode("distance_feature");
+	private static readonly System.Text.Json.JsonEncodedText VariantExists = System.Text.Json.JsonEncodedText.Encode("exists");
+	private static readonly System.Text.Json.JsonEncodedText VariantFunctionScore = System.Text.Json.JsonEncodedText.Encode("function_score");
+	private static readonly System.Text.Json.JsonEncodedText VariantFuzzy = System.Text.Json.JsonEncodedText.Encode("fuzzy");
+	private static readonly System.Text.Json.JsonEncodedText VariantGeoBoundingBox = System.Text.Json.JsonEncodedText.Encode("geo_bounding_box");
+	private static readonly System.Text.Json.JsonEncodedText VariantGeoDistance = System.Text.Json.JsonEncodedText.Encode("geo_distance");
+	private static readonly System.Text.Json.JsonEncodedText VariantGeoShape = System.Text.Json.JsonEncodedText.Encode("geo_shape");
+	private static readonly System.Text.Json.JsonEncodedText VariantHasChild = System.Text.Json.JsonEncodedText.Encode("has_child");
+	private static readonly System.Text.Json.JsonEncodedText VariantHasParent = System.Text.Json.JsonEncodedText.Encode("has_parent");
+	private static readonly System.Text.Json.JsonEncodedText VariantIds = System.Text.Json.JsonEncodedText.Encode("ids");
+	private static readonly System.Text.Json.JsonEncodedText VariantIntervals = System.Text.Json.JsonEncodedText.Encode("intervals");
+	private static readonly System.Text.Json.JsonEncodedText VariantKnn = System.Text.Json.JsonEncodedText.Encode("knn");
+	private static readonly System.Text.Json.JsonEncodedText VariantMatch = System.Text.Json.JsonEncodedText.Encode("match");
+	private static readonly System.Text.Json.JsonEncodedText VariantMatchAll = System.Text.Json.JsonEncodedText.Encode("match_all");
+	private static readonly System.Text.Json.JsonEncodedText VariantMatchBoolPrefix = System.Text.Json.JsonEncodedText.Encode("match_bool_prefix");
+	private static readonly System.Text.Json.JsonEncodedText VariantMatchNone = System.Text.Json.JsonEncodedText.Encode("match_none");
+	private static readonly System.Text.Json.JsonEncodedText VariantMatchPhrase = System.Text.Json.JsonEncodedText.Encode("match_phrase");
+	private static readonly System.Text.Json.JsonEncodedText VariantMatchPhrasePrefix = System.Text.Json.JsonEncodedText.Encode("match_phrase_prefix");
+	private static readonly System.Text.Json.JsonEncodedText VariantMoreLikeThis = System.Text.Json.JsonEncodedText.Encode("more_like_this");
+	private static readonly System.Text.Json.JsonEncodedText VariantMultiMatch = System.Text.Json.JsonEncodedText.Encode("multi_match");
+	private static readonly System.Text.Json.JsonEncodedText VariantNested = System.Text.Json.JsonEncodedText.Encode("nested");
+	private static readonly System.Text.Json.JsonEncodedText VariantParentId = System.Text.Json.JsonEncodedText.Encode("parent_id");
+	private static readonly System.Text.Json.JsonEncodedText VariantPercolate = System.Text.Json.JsonEncodedText.Encode("percolate");
+	private static readonly System.Text.Json.JsonEncodedText VariantPinned = System.Text.Json.JsonEncodedText.Encode("pinned");
+	private static readonly System.Text.Json.JsonEncodedText VariantPrefix = System.Text.Json.JsonEncodedText.Encode("prefix");
+	private static readonly System.Text.Json.JsonEncodedText VariantQueryString = System.Text.Json.JsonEncodedText.Encode("query_string");
+	private static readonly System.Text.Json.JsonEncodedText VariantRange = System.Text.Json.JsonEncodedText.Encode("range");
+	private static readonly System.Text.Json.JsonEncodedText VariantRankFeature = System.Text.Json.JsonEncodedText.Encode("rank_feature");
+	private static readonly System.Text.Json.JsonEncodedText VariantRawJson = System.Text.Json.JsonEncodedText.Encode("raw_json");
+	private static readonly System.Text.Json.JsonEncodedText VariantRegexp = System.Text.Json.JsonEncodedText.Encode("regexp");
+	private static readonly System.Text.Json.JsonEncodedText VariantRule = System.Text.Json.JsonEncodedText.Encode("rule");
+	private static readonly System.Text.Json.JsonEncodedText VariantScript = System.Text.Json.JsonEncodedText.Encode("script");
+	private static readonly System.Text.Json.JsonEncodedText VariantScriptScore = System.Text.Json.JsonEncodedText.Encode("script_score");
+	private static readonly System.Text.Json.JsonEncodedText VariantSemantic = System.Text.Json.JsonEncodedText.Encode("semantic");
+	private static readonly System.Text.Json.JsonEncodedText VariantShape = System.Text.Json.JsonEncodedText.Encode("shape");
+	private static readonly System.Text.Json.JsonEncodedText VariantSimpleQueryString = System.Text.Json.JsonEncodedText.Encode("simple_query_string");
+	private static readonly System.Text.Json.JsonEncodedText VariantSpanContaining = System.Text.Json.JsonEncodedText.Encode("span_containing");
+	private static readonly System.Text.Json.JsonEncodedText VariantSpanFieldMasking = System.Text.Json.JsonEncodedText.Encode("span_field_masking");
+	private static readonly System.Text.Json.JsonEncodedText VariantSpanFirst = System.Text.Json.JsonEncodedText.Encode("span_first");
+	private static readonly System.Text.Json.JsonEncodedText VariantSpanMulti = System.Text.Json.JsonEncodedText.Encode("span_multi");
+	private static readonly System.Text.Json.JsonEncodedText VariantSpanNear = System.Text.Json.JsonEncodedText.Encode("span_near");
+	private static readonly System.Text.Json.JsonEncodedText VariantSpanNot = System.Text.Json.JsonEncodedText.Encode("span_not");
+	private static readonly System.Text.Json.JsonEncodedText VariantSpanOr = System.Text.Json.JsonEncodedText.Encode("span_or");
+	private static readonly System.Text.Json.JsonEncodedText VariantSpanTerm = System.Text.Json.JsonEncodedText.Encode("span_term");
+	private static readonly System.Text.Json.JsonEncodedText VariantSpanWithin = System.Text.Json.JsonEncodedText.Encode("span_within");
+	private static readonly System.Text.Json.JsonEncodedText VariantSparseVector = System.Text.Json.JsonEncodedText.Encode("sparse_vector");
+	private static readonly System.Text.Json.JsonEncodedText VariantTerm = System.Text.Json.JsonEncodedText.Encode("term");
+	private static readonly System.Text.Json.JsonEncodedText VariantTerms = System.Text.Json.JsonEncodedText.Encode("terms");
+	private static readonly System.Text.Json.JsonEncodedText VariantTermsSet = System.Text.Json.JsonEncodedText.Encode("terms_set");
+	private static readonly System.Text.Json.JsonEncodedText VariantWildcard = System.Text.Json.JsonEncodedText.Encode("wildcard");
+	private static readonly System.Text.Json.JsonEncodedText VariantWrapper = System.Text.Json.JsonEncodedText.Encode("wrapper");
+
+	public override Query Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		var variantType = string.Empty;
+		object? variant = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			throw new JsonException("Expected start token.");
-		}
-
-		object? variantValue = default;
-		string? variantNameValue = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
-		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token.");
-			}
-
-			if (reader.TokenType != JsonTokenType.PropertyName)
+			if (reader.ValueTextEquals(VariantBool))
 			{
-				throw new JsonException("Expected a property name token representing the name of an Elasticsearch field.");
-			}
-
-			var propertyName = reader.GetString();
-			reader.Read();
-			if (propertyName == "bool")
-			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.BoolQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantBool.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.BoolQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "boosting")
+			if (reader.ValueTextEquals(VariantBoosting))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.BoostingQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantBoosting.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.BoostingQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "combined_fields")
+			if (reader.ValueTextEquals(VariantCombinedFields))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.CombinedFieldsQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantCombinedFields.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.CombinedFieldsQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "constant_score")
+			if (reader.ValueTextEquals(VariantConstantScore))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.ConstantScoreQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantConstantScore.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.ConstantScoreQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "dis_max")
+			if (reader.ValueTextEquals(VariantDisMax))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.DisMaxQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantDisMax.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.DisMaxQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "distance_feature")
+			if (reader.ValueTextEquals(VariantDistanceFeature))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.UntypedDistanceFeatureQuery>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantDistanceFeature.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.IDistanceFeatureQuery>(options);
 				continue;
 			}
 
-			if (propertyName == "exists")
+			if (reader.ValueTextEquals(VariantExists))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.ExistsQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantExists.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.ExistsQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "function_score")
+			if (reader.ValueTextEquals(VariantFunctionScore))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.FunctionScoreQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantFunctionScore.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.FunctionScoreQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "fuzzy")
+			if (reader.ValueTextEquals(VariantFuzzy))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.FuzzyQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantFuzzy.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.FuzzyQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "geo_bounding_box")
+			if (reader.ValueTextEquals(VariantGeoBoundingBox))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.GeoBoundingBoxQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantGeoBoundingBox.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.GeoBoundingBoxQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "geo_distance")
+			if (reader.ValueTextEquals(VariantGeoDistance))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.GeoDistanceQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantGeoDistance.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.GeoDistanceQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "geo_shape")
+			if (reader.ValueTextEquals(VariantGeoShape))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.GeoShapeQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantGeoShape.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.GeoShapeQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "has_child")
+			if (reader.ValueTextEquals(VariantHasChild))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.HasChildQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantHasChild.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.HasChildQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "has_parent")
+			if (reader.ValueTextEquals(VariantHasParent))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.HasParentQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantHasParent.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.HasParentQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "ids")
+			if (reader.ValueTextEquals(VariantIds))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.IdsQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantIds.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.IdsQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "intervals")
+			if (reader.ValueTextEquals(VariantIntervals))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.IntervalsQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantIntervals.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.IntervalsQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "knn")
+			if (reader.ValueTextEquals(VariantKnn))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.KnnQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantKnn.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.KnnQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "match")
+			if (reader.ValueTextEquals(VariantMatch))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.MatchQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantMatch.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.MatchQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "match_all")
+			if (reader.ValueTextEquals(VariantMatchAll))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.MatchAllQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantMatchAll.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.MatchAllQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "match_bool_prefix")
+			if (reader.ValueTextEquals(VariantMatchBoolPrefix))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.MatchBoolPrefixQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantMatchBoolPrefix.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.MatchBoolPrefixQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "match_none")
+			if (reader.ValueTextEquals(VariantMatchNone))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.MatchNoneQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantMatchNone.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.MatchNoneQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "match_phrase")
+			if (reader.ValueTextEquals(VariantMatchPhrase))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.MatchPhraseQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantMatchPhrase.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.MatchPhraseQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "match_phrase_prefix")
+			if (reader.ValueTextEquals(VariantMatchPhrasePrefix))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.MatchPhrasePrefixQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantMatchPhrasePrefix.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.MatchPhrasePrefixQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "more_like_this")
+			if (reader.ValueTextEquals(VariantMoreLikeThis))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.MoreLikeThisQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantMoreLikeThis.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.MoreLikeThisQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "multi_match")
+			if (reader.ValueTextEquals(VariantMultiMatch))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.MultiMatchQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantMultiMatch.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.MultiMatchQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "nested")
+			if (reader.ValueTextEquals(VariantNested))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.NestedQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantNested.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.NestedQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "parent_id")
+			if (reader.ValueTextEquals(VariantParentId))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.ParentIdQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantParentId.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.ParentIdQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "percolate")
+			if (reader.ValueTextEquals(VariantPercolate))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.PercolateQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantPercolate.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.PercolateQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "pinned")
+			if (reader.ValueTextEquals(VariantPinned))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.PinnedQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantPinned.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.PinnedQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "prefix")
+			if (reader.ValueTextEquals(VariantPrefix))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.PrefixQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantPrefix.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.PrefixQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "query_string")
+			if (reader.ValueTextEquals(VariantQueryString))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.QueryStringQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantQueryString.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.QueryStringQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "range")
+			if (reader.ValueTextEquals(VariantRange))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.UntypedRangeQuery>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantRange.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.IRangeQuery>(options);
 				continue;
 			}
 
-			if (propertyName == "rank_feature")
+			if (reader.ValueTextEquals(VariantRankFeature))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.RankFeatureQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantRankFeature.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.RankFeatureQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "raw_json")
+			if (reader.ValueTextEquals(VariantRawJson))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.RawJsonQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantRawJson.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.RawJsonQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "regexp")
+			if (reader.ValueTextEquals(VariantRegexp))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.RegexpQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantRegexp.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.RegexpQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "rule")
+			if (reader.ValueTextEquals(VariantRule))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.RuleQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantRule.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.RuleQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "script")
+			if (reader.ValueTextEquals(VariantScript))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.ScriptQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantScript.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.ScriptQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "script_score")
+			if (reader.ValueTextEquals(VariantScriptScore))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.ScriptScoreQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantScriptScore.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.ScriptScoreQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "semantic")
+			if (reader.ValueTextEquals(VariantSemantic))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.SemanticQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantSemantic.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.SemanticQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "shape")
+			if (reader.ValueTextEquals(VariantShape))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.ShapeQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantShape.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.ShapeQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "simple_query_string")
+			if (reader.ValueTextEquals(VariantSimpleQueryString))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.SimpleQueryStringQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantSimpleQueryString.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.SimpleQueryStringQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "span_containing")
+			if (reader.ValueTextEquals(VariantSpanContaining))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.SpanContainingQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantSpanContaining.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.SpanContainingQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "span_field_masking")
+			if (reader.ValueTextEquals(VariantSpanFieldMasking))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.SpanFieldMaskingQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantSpanFieldMasking.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.SpanFieldMaskingQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "span_first")
+			if (reader.ValueTextEquals(VariantSpanFirst))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.SpanFirstQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantSpanFirst.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.SpanFirstQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "span_multi")
+			if (reader.ValueTextEquals(VariantSpanMulti))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.SpanMultiTermQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantSpanMulti.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.SpanMultiTermQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "span_near")
+			if (reader.ValueTextEquals(VariantSpanNear))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.SpanNearQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantSpanNear.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.SpanNearQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "span_not")
+			if (reader.ValueTextEquals(VariantSpanNot))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.SpanNotQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantSpanNot.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.SpanNotQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "span_or")
+			if (reader.ValueTextEquals(VariantSpanOr))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.SpanOrQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantSpanOr.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.SpanOrQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "span_term")
+			if (reader.ValueTextEquals(VariantSpanTerm))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.SpanTermQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantSpanTerm.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.SpanTermQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "span_within")
+			if (reader.ValueTextEquals(VariantSpanWithin))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.SpanWithinQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantSpanWithin.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.SpanWithinQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "sparse_vector")
+			if (reader.ValueTextEquals(VariantSparseVector))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.SparseVectorQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantSparseVector.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.SparseVectorQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "term")
+			if (reader.ValueTextEquals(VariantTerm))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.TermQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantTerm.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.TermQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "terms")
+			if (reader.ValueTextEquals(VariantTerms))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.TermsQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantTerms.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.TermsQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "terms_set")
+			if (reader.ValueTextEquals(VariantTermsSet))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.TermsSetQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantTermsSet.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.TermsSetQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "wildcard")
+			if (reader.ValueTextEquals(VariantWildcard))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.WildcardQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantWildcard.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.WildcardQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "wrapper")
+			if (reader.ValueTextEquals(VariantWrapper))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.WrapperQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantWrapper.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.WrapperQuery?>(options);
 				continue;
 			}
 
-			throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'Query' from the response.");
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		var result = new Query(variantNameValue, variantValue);
-		return result;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new Query { VariantType = variantType, Variant = variant };
 	}
 
-	public override void Write(Utf8JsonWriter writer, Query value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, Query value, System.Text.Json.JsonSerializerOptions options)
 	{
 		writer.WriteStartObject();
-		if (value.VariantName is not null && value.Variant is not null)
+		switch (value.VariantType)
 		{
-			writer.WritePropertyName(value.VariantName);
-			switch (value.VariantName)
-			{
-				case "bool":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.BoolQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.BoolQuery)value.Variant, options);
-					break;
-				case "boosting":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.BoostingQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.BoostingQuery)value.Variant, options);
-					break;
-				case "combined_fields":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.CombinedFieldsQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.CombinedFieldsQuery)value.Variant, options);
-					break;
-				case "constant_score":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.ConstantScoreQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.ConstantScoreQuery)value.Variant, options);
-					break;
-				case "dis_max":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.DisMaxQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.DisMaxQuery)value.Variant, options);
-					break;
-				case "distance_feature":
-					JsonSerializer.Serialize(writer, value.Variant, value.Variant.GetType(), options);
-					break;
-				case "exists":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.ExistsQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.ExistsQuery)value.Variant, options);
-					break;
-				case "function_score":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.FunctionScoreQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.FunctionScoreQuery)value.Variant, options);
-					break;
-				case "fuzzy":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.FuzzyQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.FuzzyQuery)value.Variant, options);
-					break;
-				case "geo_bounding_box":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.GeoBoundingBoxQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.GeoBoundingBoxQuery)value.Variant, options);
-					break;
-				case "geo_distance":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.GeoDistanceQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.GeoDistanceQuery)value.Variant, options);
-					break;
-				case "geo_shape":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.GeoShapeQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.GeoShapeQuery)value.Variant, options);
-					break;
-				case "has_child":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.HasChildQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.HasChildQuery)value.Variant, options);
-					break;
-				case "has_parent":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.HasParentQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.HasParentQuery)value.Variant, options);
-					break;
-				case "ids":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.IdsQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.IdsQuery)value.Variant, options);
-					break;
-				case "intervals":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.IntervalsQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.IntervalsQuery)value.Variant, options);
-					break;
-				case "knn":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.KnnQuery>(writer, (Elastic.Clients.Elasticsearch.KnnQuery)value.Variant, options);
-					break;
-				case "match":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.MatchQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.MatchQuery)value.Variant, options);
-					break;
-				case "match_all":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.MatchAllQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.MatchAllQuery)value.Variant, options);
-					break;
-				case "match_bool_prefix":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.MatchBoolPrefixQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.MatchBoolPrefixQuery)value.Variant, options);
-					break;
-				case "match_none":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.MatchNoneQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.MatchNoneQuery)value.Variant, options);
-					break;
-				case "match_phrase":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.MatchPhraseQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.MatchPhraseQuery)value.Variant, options);
-					break;
-				case "match_phrase_prefix":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.MatchPhrasePrefixQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.MatchPhrasePrefixQuery)value.Variant, options);
-					break;
-				case "more_like_this":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.MoreLikeThisQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.MoreLikeThisQuery)value.Variant, options);
-					break;
-				case "multi_match":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.MultiMatchQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.MultiMatchQuery)value.Variant, options);
-					break;
-				case "nested":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.NestedQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.NestedQuery)value.Variant, options);
-					break;
-				case "parent_id":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.ParentIdQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.ParentIdQuery)value.Variant, options);
-					break;
-				case "percolate":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.PercolateQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.PercolateQuery)value.Variant, options);
-					break;
-				case "pinned":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.PinnedQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.PinnedQuery)value.Variant, options);
-					break;
-				case "prefix":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.PrefixQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.PrefixQuery)value.Variant, options);
-					break;
-				case "query_string":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.QueryStringQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.QueryStringQuery)value.Variant, options);
-					break;
-				case "range":
-					JsonSerializer.Serialize(writer, value.Variant, value.Variant.GetType(), options);
-					break;
-				case "rank_feature":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.RankFeatureQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.RankFeatureQuery)value.Variant, options);
-					break;
-				case "raw_json":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.RawJsonQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.RawJsonQuery)value.Variant, options);
-					break;
-				case "regexp":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.RegexpQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.RegexpQuery)value.Variant, options);
-					break;
-				case "rule":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.RuleQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.RuleQuery)value.Variant, options);
-					break;
-				case "script":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.ScriptQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.ScriptQuery)value.Variant, options);
-					break;
-				case "script_score":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.ScriptScoreQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.ScriptScoreQuery)value.Variant, options);
-					break;
-				case "semantic":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.SemanticQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.SemanticQuery)value.Variant, options);
-					break;
-				case "shape":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.ShapeQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.ShapeQuery)value.Variant, options);
-					break;
-				case "simple_query_string":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.SimpleQueryStringQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.SimpleQueryStringQuery)value.Variant, options);
-					break;
-				case "span_containing":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.SpanContainingQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.SpanContainingQuery)value.Variant, options);
-					break;
-				case "span_field_masking":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.SpanFieldMaskingQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.SpanFieldMaskingQuery)value.Variant, options);
-					break;
-				case "span_first":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.SpanFirstQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.SpanFirstQuery)value.Variant, options);
-					break;
-				case "span_multi":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.SpanMultiTermQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.SpanMultiTermQuery)value.Variant, options);
-					break;
-				case "span_near":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.SpanNearQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.SpanNearQuery)value.Variant, options);
-					break;
-				case "span_not":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.SpanNotQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.SpanNotQuery)value.Variant, options);
-					break;
-				case "span_or":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.SpanOrQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.SpanOrQuery)value.Variant, options);
-					break;
-				case "span_term":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.SpanTermQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.SpanTermQuery)value.Variant, options);
-					break;
-				case "span_within":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.SpanWithinQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.SpanWithinQuery)value.Variant, options);
-					break;
-				case "sparse_vector":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.SparseVectorQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.SparseVectorQuery)value.Variant, options);
-					break;
-				case "term":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.TermQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.TermQuery)value.Variant, options);
-					break;
-				case "terms":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.TermsQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.TermsQuery)value.Variant, options);
-					break;
-				case "terms_set":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.TermsSetQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.TermsSetQuery)value.Variant, options);
-					break;
-				case "wildcard":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.WildcardQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.WildcardQuery)value.Variant, options);
-					break;
-				case "wrapper":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.WrapperQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.WrapperQuery)value.Variant, options);
-					break;
-			}
+			case "":
+				break;
+			case "bool":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.BoolQuery?)value.Variant);
+				break;
+			case "boosting":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.BoostingQuery?)value.Variant);
+				break;
+			case "combined_fields":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.CombinedFieldsQuery?)value.Variant);
+				break;
+			case "constant_score":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.ConstantScoreQuery?)value.Variant);
+				break;
+			case "dis_max":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.DisMaxQuery?)value.Variant);
+				break;
+			case "distance_feature":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.IDistanceFeatureQuery)value.Variant);
+				break;
+			case "exists":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.ExistsQuery?)value.Variant);
+				break;
+			case "function_score":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.FunctionScoreQuery?)value.Variant);
+				break;
+			case "fuzzy":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.FuzzyQuery?)value.Variant);
+				break;
+			case "geo_bounding_box":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.GeoBoundingBoxQuery?)value.Variant);
+				break;
+			case "geo_distance":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.GeoDistanceQuery?)value.Variant);
+				break;
+			case "geo_shape":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.GeoShapeQuery?)value.Variant);
+				break;
+			case "has_child":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.HasChildQuery?)value.Variant);
+				break;
+			case "has_parent":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.HasParentQuery?)value.Variant);
+				break;
+			case "ids":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.IdsQuery?)value.Variant);
+				break;
+			case "intervals":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.IntervalsQuery?)value.Variant);
+				break;
+			case "knn":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.KnnQuery?)value.Variant);
+				break;
+			case "match":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.MatchQuery?)value.Variant);
+				break;
+			case "match_all":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.MatchAllQuery?)value.Variant);
+				break;
+			case "match_bool_prefix":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.MatchBoolPrefixQuery?)value.Variant);
+				break;
+			case "match_none":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.MatchNoneQuery?)value.Variant);
+				break;
+			case "match_phrase":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.MatchPhraseQuery?)value.Variant);
+				break;
+			case "match_phrase_prefix":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.MatchPhrasePrefixQuery?)value.Variant);
+				break;
+			case "more_like_this":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.MoreLikeThisQuery?)value.Variant);
+				break;
+			case "multi_match":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.MultiMatchQuery?)value.Variant);
+				break;
+			case "nested":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.NestedQuery?)value.Variant);
+				break;
+			case "parent_id":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.ParentIdQuery?)value.Variant);
+				break;
+			case "percolate":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.PercolateQuery?)value.Variant);
+				break;
+			case "pinned":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.PinnedQuery?)value.Variant);
+				break;
+			case "prefix":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.PrefixQuery?)value.Variant);
+				break;
+			case "query_string":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.QueryStringQuery?)value.Variant);
+				break;
+			case "range":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.IRangeQuery)value.Variant);
+				break;
+			case "rank_feature":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.RankFeatureQuery?)value.Variant);
+				break;
+			case "raw_json":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.RawJsonQuery?)value.Variant);
+				break;
+			case "regexp":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.RegexpQuery?)value.Variant);
+				break;
+			case "rule":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.RuleQuery?)value.Variant);
+				break;
+			case "script":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.ScriptQuery?)value.Variant);
+				break;
+			case "script_score":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.ScriptScoreQuery?)value.Variant);
+				break;
+			case "semantic":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.SemanticQuery?)value.Variant);
+				break;
+			case "shape":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.ShapeQuery?)value.Variant);
+				break;
+			case "simple_query_string":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.SimpleQueryStringQuery?)value.Variant);
+				break;
+			case "span_containing":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.SpanContainingQuery?)value.Variant);
+				break;
+			case "span_field_masking":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.SpanFieldMaskingQuery?)value.Variant);
+				break;
+			case "span_first":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.SpanFirstQuery?)value.Variant);
+				break;
+			case "span_multi":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.SpanMultiTermQuery?)value.Variant);
+				break;
+			case "span_near":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.SpanNearQuery?)value.Variant);
+				break;
+			case "span_not":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.SpanNotQuery?)value.Variant);
+				break;
+			case "span_or":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.SpanOrQuery?)value.Variant);
+				break;
+			case "span_term":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.SpanTermQuery?)value.Variant);
+				break;
+			case "span_within":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.SpanWithinQuery?)value.Variant);
+				break;
+			case "sparse_vector":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.SparseVectorQuery?)value.Variant);
+				break;
+			case "term":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.TermQuery?)value.Variant);
+				break;
+			case "terms":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.TermsQuery?)value.Variant);
+				break;
+			case "terms_set":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.TermsSetQuery?)value.Variant);
+				break;
+			case "wildcard":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.WildcardQuery?)value.Variant);
+				break;
+			case "wrapper":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.WrapperQuery?)value.Variant);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.VariantType}' is not supported for type '{nameof(Query)}'.");
 		}
 
 		writer.WriteEndObject();
@@ -774,6 +878,7 @@ private QueryDescriptor<TDocument> Set(object variant, string variantName)
 	public QueryDescriptor<TDocument> ConstantScore(Action<Elastic.Clients.Elasticsearch.QueryDsl.ConstantScoreQueryDescriptor<TDocument>> configure) => Set(configure, "constant_score");
 	public QueryDescriptor<TDocument> DisMax(Elastic.Clients.Elasticsearch.QueryDsl.DisMaxQuery disMaxQuery) => Set(disMaxQuery, "dis_max");
 	public QueryDescriptor<TDocument> DisMax(Action<Elastic.Clients.Elasticsearch.QueryDsl.DisMaxQueryDescriptor<TDocument>> configure) => Set(configure, "dis_max");
+	public QueryDescriptor<TDocument> DistanceFeature(Elastic.Clients.Elasticsearch.QueryDsl.IDistanceFeatureQuery distanceFeatureQuery) => Set(distanceFeatureQuery, "distance_feature");
 	public QueryDescriptor<TDocument> DistanceFeature(Elastic.Clients.Elasticsearch.QueryDsl.UntypedDistanceFeatureQuery distanceFeatureQuery) => Set(distanceFeatureQuery, "distance_feature");
 	public QueryDescriptor<TDocument> DistanceFeature(Elastic.Clients.Elasticsearch.QueryDsl.GeoDistanceFeatureQuery distanceFeatureQuery) => Set(distanceFeatureQuery, "distance_feature");
 	public QueryDescriptor<TDocument> DistanceFeature(Elastic.Clients.Elasticsearch.QueryDsl.DateDistanceFeatureQuery distanceFeatureQuery) => Set(distanceFeatureQuery, "distance_feature");
@@ -827,6 +932,7 @@ private QueryDescriptor<TDocument> Set(object variant, string variantName)
 	public QueryDescriptor<TDocument> Prefix(Action<Elastic.Clients.Elasticsearch.QueryDsl.PrefixQueryDescriptor<TDocument>> configure) => Set(configure, "prefix");
 	public QueryDescriptor<TDocument> QueryString(Elastic.Clients.Elasticsearch.QueryDsl.QueryStringQuery queryStringQuery) => Set(queryStringQuery, "query_string");
 	public QueryDescriptor<TDocument> QueryString(Action<Elastic.Clients.Elasticsearch.QueryDsl.QueryStringQueryDescriptor<TDocument>> configure) => Set(configure, "query_string");
+	public QueryDescriptor<TDocument> Range(Elastic.Clients.Elasticsearch.QueryDsl.IRangeQuery rangeQuery) => Set(rangeQuery, "range");
 	public QueryDescriptor<TDocument> Range(Elastic.Clients.Elasticsearch.QueryDsl.UntypedRangeQuery rangeQuery) => Set(rangeQuery, "range");
 	public QueryDescriptor<TDocument> Range(Elastic.Clients.Elasticsearch.QueryDsl.DateRangeQuery rangeQuery) => Set(rangeQuery, "range");
 	public QueryDescriptor<TDocument> Range(Elastic.Clients.Elasticsearch.QueryDsl.NumberRangeQuery rangeQuery) => Set(rangeQuery, "range");
@@ -940,6 +1046,7 @@ private QueryDescriptor Set(object variant, string variantName)
 	public QueryDescriptor ConstantScore<TDocument>(Action<Elastic.Clients.Elasticsearch.QueryDsl.ConstantScoreQueryDescriptor> configure) => Set(configure, "constant_score");
 	public QueryDescriptor DisMax(Elastic.Clients.Elasticsearch.QueryDsl.DisMaxQuery disMaxQuery) => Set(disMaxQuery, "dis_max");
 	public QueryDescriptor DisMax<TDocument>(Action<Elastic.Clients.Elasticsearch.QueryDsl.DisMaxQueryDescriptor> configure) => Set(configure, "dis_max");
+	public QueryDescriptor DistanceFeature(Elastic.Clients.Elasticsearch.QueryDsl.IDistanceFeatureQuery distanceFeatureQuery) => Set(distanceFeatureQuery, "distance_feature");
 	public QueryDescriptor DistanceFeature(Elastic.Clients.Elasticsearch.QueryDsl.UntypedDistanceFeatureQuery distanceFeatureQuery) => Set(distanceFeatureQuery, "distance_feature");
 	public QueryDescriptor DistanceFeature(Elastic.Clients.Elasticsearch.QueryDsl.GeoDistanceFeatureQuery distanceFeatureQuery) => Set(distanceFeatureQuery, "distance_feature");
 	public QueryDescriptor DistanceFeature(Elastic.Clients.Elasticsearch.QueryDsl.DateDistanceFeatureQuery distanceFeatureQuery) => Set(distanceFeatureQuery, "distance_feature");
@@ -993,6 +1100,7 @@ private QueryDescriptor Set(object variant, string variantName)
 	public QueryDescriptor Prefix<TDocument>(Action<Elastic.Clients.Elasticsearch.QueryDsl.PrefixQueryDescriptor> configure) => Set(configure, "prefix");
 	public QueryDescriptor QueryString(Elastic.Clients.Elasticsearch.QueryDsl.QueryStringQuery queryStringQuery) => Set(queryStringQuery, "query_string");
 	public QueryDescriptor QueryString<TDocument>(Action<Elastic.Clients.Elasticsearch.QueryDsl.QueryStringQueryDescriptor> configure) => Set(configure, "query_string");
+	public QueryDescriptor Range(Elastic.Clients.Elasticsearch.QueryDsl.IRangeQuery rangeQuery) => Set(rangeQuery, "range");
 	public QueryDescriptor Range(Elastic.Clients.Elasticsearch.QueryDsl.UntypedRangeQuery rangeQuery) => Set(rangeQuery, "range");
 	public QueryDescriptor Range(Elastic.Clients.Elasticsearch.QueryDsl.DateRangeQuery rangeQuery) => Set(rangeQuery, "range");
 	public QueryDescriptor Range(Elastic.Clients.Elasticsearch.QueryDsl.NumberRangeQuery rangeQuery) => Set(rangeQuery, "range");
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 c805604bc93..8b09bef0507 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/QueryStringQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/QueryStringQuery.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,300 @@
 
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
 
+internal sealed partial class QueryStringQueryConverter : System.Text.Json.Serialization.JsonConverter<QueryStringQuery>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAllowLeadingWildcard = System.Text.Json.JsonEncodedText.Encode("allow_leading_wildcard");
+	private static readonly System.Text.Json.JsonEncodedText PropAnalyzer = System.Text.Json.JsonEncodedText.Encode("analyzer");
+	private static readonly System.Text.Json.JsonEncodedText PropAnalyzeWildcard = System.Text.Json.JsonEncodedText.Encode("analyze_wildcard");
+	private static readonly System.Text.Json.JsonEncodedText PropAutoGenerateSynonymsPhraseQuery = System.Text.Json.JsonEncodedText.Encode("auto_generate_synonyms_phrase_query");
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropDefaultField = System.Text.Json.JsonEncodedText.Encode("default_field");
+	private static readonly System.Text.Json.JsonEncodedText PropDefaultOperator = System.Text.Json.JsonEncodedText.Encode("default_operator");
+	private static readonly System.Text.Json.JsonEncodedText PropEnablePositionIncrements = System.Text.Json.JsonEncodedText.Encode("enable_position_increments");
+	private static readonly System.Text.Json.JsonEncodedText PropEscape = System.Text.Json.JsonEncodedText.Encode("escape");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropFuzziness = System.Text.Json.JsonEncodedText.Encode("fuzziness");
+	private static readonly System.Text.Json.JsonEncodedText PropFuzzyMaxExpansions = System.Text.Json.JsonEncodedText.Encode("fuzzy_max_expansions");
+	private static readonly System.Text.Json.JsonEncodedText PropFuzzyPrefixLength = System.Text.Json.JsonEncodedText.Encode("fuzzy_prefix_length");
+	private static readonly System.Text.Json.JsonEncodedText PropFuzzyRewrite = System.Text.Json.JsonEncodedText.Encode("fuzzy_rewrite");
+	private static readonly System.Text.Json.JsonEncodedText PropFuzzyTranspositions = System.Text.Json.JsonEncodedText.Encode("fuzzy_transpositions");
+	private static readonly System.Text.Json.JsonEncodedText PropLenient = System.Text.Json.JsonEncodedText.Encode("lenient");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxDeterminizedStates = System.Text.Json.JsonEncodedText.Encode("max_determinized_states");
+	private static readonly System.Text.Json.JsonEncodedText PropMinimumShouldMatch = System.Text.Json.JsonEncodedText.Encode("minimum_should_match");
+	private static readonly System.Text.Json.JsonEncodedText PropPhraseSlop = System.Text.Json.JsonEncodedText.Encode("phrase_slop");
+	private static readonly System.Text.Json.JsonEncodedText PropQuery = System.Text.Json.JsonEncodedText.Encode("query");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryName = System.Text.Json.JsonEncodedText.Encode("_name");
+	private static readonly System.Text.Json.JsonEncodedText PropQuoteAnalyzer = System.Text.Json.JsonEncodedText.Encode("quote_analyzer");
+	private static readonly System.Text.Json.JsonEncodedText PropQuoteFieldSuffix = System.Text.Json.JsonEncodedText.Encode("quote_field_suffix");
+	private static readonly System.Text.Json.JsonEncodedText PropRewrite = System.Text.Json.JsonEncodedText.Encode("rewrite");
+	private static readonly System.Text.Json.JsonEncodedText PropTieBreaker = System.Text.Json.JsonEncodedText.Encode("tie_breaker");
+	private static readonly System.Text.Json.JsonEncodedText PropTimeZone = System.Text.Json.JsonEncodedText.Encode("time_zone");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override QueryStringQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool?> propAllowLeadingWildcard = default;
+		LocalJsonProperty<string?> propAnalyzer = default;
+		LocalJsonProperty<bool?> propAnalyzeWildcard = default;
+		LocalJsonProperty<bool?> propAutoGenerateSynonymsPhraseQuery = default;
+		LocalJsonProperty<float?> propBoost = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Field?> propDefaultField = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.QueryDsl.Operator?> propDefaultOperator = default;
+		LocalJsonProperty<bool?> propEnablePositionIncrements = default;
+		LocalJsonProperty<bool?> propEscape = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Fields?> propFields = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Fuzziness?> propFuzziness = default;
+		LocalJsonProperty<int?> propFuzzyMaxExpansions = default;
+		LocalJsonProperty<int?> propFuzzyPrefixLength = default;
+		LocalJsonProperty<string?> propFuzzyRewrite = default;
+		LocalJsonProperty<bool?> propFuzzyTranspositions = default;
+		LocalJsonProperty<bool?> propLenient = default;
+		LocalJsonProperty<int?> propMaxDeterminizedStates = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.MinimumShouldMatch?> propMinimumShouldMatch = default;
+		LocalJsonProperty<double?> propPhraseSlop = default;
+		LocalJsonProperty<string> propQuery = default;
+		LocalJsonProperty<string?> propQueryName = default;
+		LocalJsonProperty<string?> propQuoteAnalyzer = default;
+		LocalJsonProperty<string?> propQuoteFieldSuffix = default;
+		LocalJsonProperty<string?> propRewrite = default;
+		LocalJsonProperty<double?> propTieBreaker = default;
+		LocalJsonProperty<string?> propTimeZone = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.QueryDsl.TextQueryType?> propType = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAllowLeadingWildcard.TryRead(ref reader, options, PropAllowLeadingWildcard))
+			{
+				continue;
+			}
+
+			if (propAnalyzer.TryRead(ref reader, options, PropAnalyzer))
+			{
+				continue;
+			}
+
+			if (propAnalyzeWildcard.TryRead(ref reader, options, PropAnalyzeWildcard))
+			{
+				continue;
+			}
+
+			if (propAutoGenerateSynonymsPhraseQuery.TryRead(ref reader, options, PropAutoGenerateSynonymsPhraseQuery))
+			{
+				continue;
+			}
+
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
+
+			if (propDefaultField.TryRead(ref reader, options, PropDefaultField))
+			{
+				continue;
+			}
+
+			if (propDefaultOperator.TryRead(ref reader, options, PropDefaultOperator))
+			{
+				continue;
+			}
+
+			if (propEnablePositionIncrements.TryRead(ref reader, options, PropEnablePositionIncrements))
+			{
+				continue;
+			}
+
+			if (propEscape.TryRead(ref reader, options, PropEscape))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields, typeof(FieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propFuzziness.TryRead(ref reader, options, PropFuzziness))
+			{
+				continue;
+			}
+
+			if (propFuzzyMaxExpansions.TryRead(ref reader, options, PropFuzzyMaxExpansions))
+			{
+				continue;
+			}
+
+			if (propFuzzyPrefixLength.TryRead(ref reader, options, PropFuzzyPrefixLength))
+			{
+				continue;
+			}
+
+			if (propFuzzyRewrite.TryRead(ref reader, options, PropFuzzyRewrite))
+			{
+				continue;
+			}
+
+			if (propFuzzyTranspositions.TryRead(ref reader, options, PropFuzzyTranspositions))
+			{
+				continue;
+			}
+
+			if (propLenient.TryRead(ref reader, options, PropLenient))
+			{
+				continue;
+			}
+
+			if (propMaxDeterminizedStates.TryRead(ref reader, options, PropMaxDeterminizedStates))
+			{
+				continue;
+			}
+
+			if (propMinimumShouldMatch.TryRead(ref reader, options, PropMinimumShouldMatch))
+			{
+				continue;
+			}
+
+			if (propPhraseSlop.TryRead(ref reader, options, PropPhraseSlop))
+			{
+				continue;
+			}
+
+			if (propQuery.TryRead(ref reader, options, PropQuery))
+			{
+				continue;
+			}
+
+			if (propQueryName.TryRead(ref reader, options, PropQueryName))
+			{
+				continue;
+			}
+
+			if (propQuoteAnalyzer.TryRead(ref reader, options, PropQuoteAnalyzer))
+			{
+				continue;
+			}
+
+			if (propQuoteFieldSuffix.TryRead(ref reader, options, PropQuoteFieldSuffix))
+			{
+				continue;
+			}
+
+			if (propRewrite.TryRead(ref reader, options, PropRewrite))
+			{
+				continue;
+			}
+
+			if (propTieBreaker.TryRead(ref reader, options, PropTieBreaker))
+			{
+				continue;
+			}
+
+			if (propTimeZone.TryRead(ref reader, options, PropTimeZone))
+			{
+				continue;
+			}
+
+			if (propType.TryRead(ref reader, options, PropType))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new QueryStringQuery
+		{
+			AllowLeadingWildcard = propAllowLeadingWildcard.Value
+,
+			Analyzer = propAnalyzer.Value
+,
+			AnalyzeWildcard = propAnalyzeWildcard.Value
+,
+			AutoGenerateSynonymsPhraseQuery = propAutoGenerateSynonymsPhraseQuery.Value
+,
+			Boost = propBoost.Value
+,
+			DefaultField = propDefaultField.Value
+,
+			DefaultOperator = propDefaultOperator.Value
+,
+			EnablePositionIncrements = propEnablePositionIncrements.Value
+,
+			Escape = propEscape.Value
+,
+			Fields = propFields.Value
+,
+			Fuzziness = propFuzziness.Value
+,
+			FuzzyMaxExpansions = propFuzzyMaxExpansions.Value
+,
+			FuzzyPrefixLength = propFuzzyPrefixLength.Value
+,
+			FuzzyRewrite = propFuzzyRewrite.Value
+,
+			FuzzyTranspositions = propFuzzyTranspositions.Value
+,
+			Lenient = propLenient.Value
+,
+			MaxDeterminizedStates = propMaxDeterminizedStates.Value
+,
+			MinimumShouldMatch = propMinimumShouldMatch.Value
+,
+			PhraseSlop = propPhraseSlop.Value
+,
+			Query = propQuery.Value
+,
+			QueryName = propQueryName.Value
+,
+			QuoteAnalyzer = propQuoteAnalyzer.Value
+,
+			QuoteFieldSuffix = propQuoteFieldSuffix.Value
+,
+			Rewrite = propRewrite.Value
+,
+			TieBreaker = propTieBreaker.Value
+,
+			TimeZone = propTimeZone.Value
+,
+			Type = propType.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, QueryStringQuery value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAllowLeadingWildcard, value.AllowLeadingWildcard);
+		writer.WriteProperty(options, PropAnalyzer, value.Analyzer);
+		writer.WriteProperty(options, PropAnalyzeWildcard, value.AnalyzeWildcard);
+		writer.WriteProperty(options, PropAutoGenerateSynonymsPhraseQuery, value.AutoGenerateSynonymsPhraseQuery);
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropDefaultField, value.DefaultField);
+		writer.WriteProperty(options, PropDefaultOperator, value.DefaultOperator);
+		writer.WriteProperty(options, PropEnablePositionIncrements, value.EnablePositionIncrements);
+		writer.WriteProperty(options, PropEscape, value.Escape);
+		writer.WriteProperty(options, PropFields, value.Fields, typeof(FieldsMarker));
+		writer.WriteProperty(options, PropFuzziness, value.Fuzziness);
+		writer.WriteProperty(options, PropFuzzyMaxExpansions, value.FuzzyMaxExpansions);
+		writer.WriteProperty(options, PropFuzzyPrefixLength, value.FuzzyPrefixLength);
+		writer.WriteProperty(options, PropFuzzyRewrite, value.FuzzyRewrite);
+		writer.WriteProperty(options, PropFuzzyTranspositions, value.FuzzyTranspositions);
+		writer.WriteProperty(options, PropLenient, value.Lenient);
+		writer.WriteProperty(options, PropMaxDeterminizedStates, value.MaxDeterminizedStates);
+		writer.WriteProperty(options, PropMinimumShouldMatch, value.MinimumShouldMatch);
+		writer.WriteProperty(options, PropPhraseSlop, value.PhraseSlop);
+		writer.WriteProperty(options, PropQuery, value.Query);
+		writer.WriteProperty(options, PropQueryName, value.QueryName);
+		writer.WriteProperty(options, PropQuoteAnalyzer, value.QuoteAnalyzer);
+		writer.WriteProperty(options, PropQuoteFieldSuffix, value.QuoteFieldSuffix);
+		writer.WriteProperty(options, PropRewrite, value.Rewrite);
+		writer.WriteProperty(options, PropTieBreaker, value.TieBreaker);
+		writer.WriteProperty(options, PropTimeZone, value.TimeZone);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(QueryStringQueryConverter))]
 public sealed partial class QueryStringQuery
 {
 	/// <summary>
@@ -34,7 +329,6 @@ public sealed partial class QueryStringQuery
 	/// If <c>true</c>, the wildcard characters <c>*</c> and <c>?</c> are allowed as the first character of the query string.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("allow_leading_wildcard")]
 	public bool? AllowLeadingWildcard { get; set; }
 
 	/// <summary>
@@ -42,7 +336,6 @@ public sealed partial class QueryStringQuery
 	/// Analyzer used to convert text in the query string into tokens.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("analyzer")]
 	public string? Analyzer { get; set; }
 
 	/// <summary>
@@ -50,7 +343,6 @@ public sealed partial class QueryStringQuery
 	/// If <c>true</c>, the query attempts to analyze wildcard terms in the query string.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("analyze_wildcard")]
 	public bool? AnalyzeWildcard { get; set; }
 
 	/// <summary>
@@ -58,7 +350,6 @@ public sealed partial class QueryStringQuery
 	/// If <c>true</c>, match phrase queries are automatically created for multi-term synonyms.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("auto_generate_synonyms_phrase_query")]
 	public bool? AutoGenerateSynonymsPhraseQuery { get; set; }
 
 	/// <summary>
@@ -69,7 +360,6 @@ public sealed partial class QueryStringQuery
 	/// A value greater than 1.0 increases the relevance score.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("boost")]
 	public float? Boost { get; set; }
 
 	/// <summary>
@@ -79,7 +369,6 @@ public sealed partial class QueryStringQuery
 	/// Defaults to the <c>index.query.default_field</c> index setting, which has a default value of <c>*</c>.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("default_field")]
 	public Elastic.Clients.Elasticsearch.Field? DefaultField { get; set; }
 
 	/// <summary>
@@ -87,7 +376,6 @@ public sealed partial class QueryStringQuery
 	/// Default boolean logic used to interpret text in the query string if no operators are specified.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("default_operator")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.Operator? DefaultOperator { get; set; }
 
 	/// <summary>
@@ -95,9 +383,7 @@ public sealed partial class QueryStringQuery
 	/// If <c>true</c>, enable position increments in queries constructed from a <c>query_string</c> search.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("enable_position_increments")]
 	public bool? EnablePositionIncrements { get; set; }
-	[JsonInclude, JsonPropertyName("escape")]
 	public bool? Escape { get; set; }
 
 	/// <summary>
@@ -105,8 +391,6 @@ public sealed partial class QueryStringQuery
 	/// Array of fields to search. Supports wildcards (<c>*</c>).
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("fields")]
-	[JsonConverter(typeof(FieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Fields? Fields { get; set; }
 
 	/// <summary>
@@ -114,7 +398,6 @@ public sealed partial class QueryStringQuery
 	/// Maximum edit distance allowed for fuzzy matching.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("fuzziness")]
 	public Elastic.Clients.Elasticsearch.Fuzziness? Fuzziness { get; set; }
 
 	/// <summary>
@@ -122,7 +405,6 @@ public sealed partial class QueryStringQuery
 	/// Maximum number of terms to which the query expands for fuzzy matching.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("fuzzy_max_expansions")]
 	public int? FuzzyMaxExpansions { get; set; }
 
 	/// <summary>
@@ -130,7 +412,6 @@ public sealed partial class QueryStringQuery
 	/// Number of beginning characters left unchanged for fuzzy matching.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("fuzzy_prefix_length")]
 	public int? FuzzyPrefixLength { get; set; }
 
 	/// <summary>
@@ -138,7 +419,6 @@ public sealed partial class QueryStringQuery
 	/// Method used to rewrite the query.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("fuzzy_rewrite")]
 	public string? FuzzyRewrite { get; set; }
 
 	/// <summary>
@@ -146,7 +426,6 @@ public sealed partial class QueryStringQuery
 	/// If <c>true</c>, edits for fuzzy matching include transpositions of two adjacent characters (for example, <c>ab</c> to <c>ba</c>).
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("fuzzy_transpositions")]
 	public bool? FuzzyTranspositions { get; set; }
 
 	/// <summary>
@@ -154,7 +433,6 @@ public sealed partial class QueryStringQuery
 	/// If <c>true</c>, format-based errors, such as providing a text value for a numeric field, are ignored.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("lenient")]
 	public bool? Lenient { get; set; }
 
 	/// <summary>
@@ -162,7 +440,6 @@ public sealed partial class QueryStringQuery
 	/// Maximum number of automaton states required for the query.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("max_determinized_states")]
 	public int? MaxDeterminizedStates { get; set; }
 
 	/// <summary>
@@ -170,7 +447,6 @@ public sealed partial class QueryStringQuery
 	/// Minimum number of clauses that must match for a document to be returned.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("minimum_should_match")]
 	public Elastic.Clients.Elasticsearch.MinimumShouldMatch? MinimumShouldMatch { get; set; }
 
 	/// <summary>
@@ -178,7 +454,6 @@ public sealed partial class QueryStringQuery
 	/// Maximum number of positions allowed between matching tokens for phrases.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("phrase_slop")]
 	public double? PhraseSlop { get; set; }
 
 	/// <summary>
@@ -186,9 +461,7 @@ public sealed partial class QueryStringQuery
 	/// Query string you wish to parse and use for search.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("query")]
 	public string Query { get; set; }
-	[JsonInclude, JsonPropertyName("_name")]
 	public string? QueryName { get; set; }
 
 	/// <summary>
@@ -197,7 +470,6 @@ public sealed partial class QueryStringQuery
 	/// For quoted text, this parameter overrides the analyzer specified in the <c>analyzer</c> parameter.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("quote_analyzer")]
 	public string? QuoteAnalyzer { get; set; }
 
 	/// <summary>
@@ -206,7 +478,6 @@ public sealed partial class QueryStringQuery
 	/// You can use this suffix to use a different analysis method for exact matches.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("quote_field_suffix")]
 	public string? QuoteFieldSuffix { get; set; }
 
 	/// <summary>
@@ -214,7 +485,6 @@ public sealed partial class QueryStringQuery
 	/// Method used to rewrite the query.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("rewrite")]
 	public string? Rewrite { get; set; }
 
 	/// <summary>
@@ -222,7 +492,6 @@ public sealed partial class QueryStringQuery
 	/// How to combine the queries generated from the individual search terms in the resulting <c>dis_max</c> query.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("tie_breaker")]
 	public double? TieBreaker { get; set; }
 
 	/// <summary>
@@ -230,7 +499,6 @@ public sealed partial class QueryStringQuery
 	/// Coordinated Universal Time (UTC) offset or IANA time zone used to convert date values in the query string to UTC.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("time_zone")]
 	public string? TimeZone { get; set; }
 
 	/// <summary>
@@ -238,7 +506,6 @@ public sealed partial class QueryStringQuery
 	/// Determines how the query matches and scores documents.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("type")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.TextQueryType? Type { get; set; }
 
 	public static implicit operator Elastic.Clients.Elasticsearch.QueryDsl.Query(QueryStringQuery queryStringQuery) => Elastic.Clients.Elasticsearch.QueryDsl.Query.QueryString(queryStringQuery);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/RangeQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/RangeQuery.g.cs
new file mode 100644
index 00000000000..e3a39212f6c
--- /dev/null
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/RangeQuery.g.cs
@@ -0,0 +1,64 @@
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information.
+//
+// ███╗   ██╗ ██████╗ ████████╗██╗ ██████╗███████╗
+// ████╗  ██║██╔═══██╗╚══██╔══╝██║██╔════╝██╔════╝
+// ██╔██╗ ██║██║   ██║   ██║   ██║██║     █████╗
+// ██║╚██╗██║██║   ██║   ██║   ██║██║     ██╔══╝
+// ██║ ╚████║╚██████╔╝   ██║   ██║╚██████╗███████╗
+// ╚═╝  ╚═══╝ ╚═════╝    ╚═╝   ╚═╝ ╚═════╝╚══════╝
+// ------------------------------------------------
+//
+// This file is automatically generated.
+// Please do not edit these files manually.
+//
+// ------------------------------------------------
+
+#nullable restore
+
+using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
+using Elastic.Clients.Elasticsearch.Serialization;
+using System;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Elastic.Clients.Elasticsearch.QueryDsl;
+
+[JsonConverter(typeof(RangeQueryConverter))]
+public partial interface IRangeQuery
+{
+	public string? Type { get; }
+}
+
+internal sealed partial class RangeQueryConverter : System.Text.Json.Serialization.JsonConverter<IRangeQuery>
+{
+	public override IRangeQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		return reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.UntypedRangeQuery>(options);
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IRangeQuery value, System.Text.Json.JsonSerializerOptions options)
+	{
+		switch (value)
+		{
+			case Elastic.Clients.Elasticsearch.QueryDsl.DateRangeQuery v:
+				writer.WriteValue(options, v);
+				break;
+			case Elastic.Clients.Elasticsearch.QueryDsl.NumberRangeQuery v:
+				writer.WriteValue(options, v);
+				break;
+			case Elastic.Clients.Elasticsearch.QueryDsl.TermRangeQuery v:
+				writer.WriteValue(options, v);
+				break;
+			case Elastic.Clients.Elasticsearch.QueryDsl.UntypedRangeQuery v:
+				writer.WriteValue(options, v);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.Type}' is not supported for type '{nameof(IRangeQuery)}'.");
+		}
+	}
+}
\ No newline at end of file
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 4d47a0cbec5..7686acf3264 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/RegexpQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/RegexpQuery.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,116 +28,115 @@
 
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
 
-internal sealed partial class RegexpQueryConverter : JsonConverter<RegexpQuery>
+internal sealed partial class RegexpQueryConverter : System.Text.Json.Serialization.JsonConverter<RegexpQuery>
 {
-	public override RegexpQuery Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropCaseInsensitive = System.Text.Json.JsonEncodedText.Encode("case_insensitive");
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropFlags = System.Text.Json.JsonEncodedText.Encode("flags");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxDeterminizedStates = System.Text.Json.JsonEncodedText.Encode("max_determinized_states");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryName = System.Text.Json.JsonEncodedText.Encode("_name");
+	private static readonly System.Text.Json.JsonEncodedText PropRewrite = System.Text.Json.JsonEncodedText.Encode("rewrite");
+	private static readonly System.Text.Json.JsonEncodedText PropValue = System.Text.Json.JsonEncodedText.Encode("value");
+
+	public override RegexpQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Field> propField = default;
 		reader.Read();
-		var fieldName = reader.GetString();
+		propField.Value = reader.ReadValue<Elastic.Clients.Elasticsearch.Field>(options);
+		propField.Initialized = true;
 		reader.Read();
-		var variant = new RegexpQuery(fieldName);
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		if (reader.TokenType is not System.Text.Json.JsonTokenType.StartObject)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			var value = reader.ReadValue<string>(options);
+			reader.Read();
+			return new RegexpQuery { Value = value };
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<float?> propBoost = default;
+		LocalJsonProperty<bool?> propCaseInsensitive = default;
+		LocalJsonProperty<string?> propFlags = default;
+		LocalJsonProperty<int?> propMaxDeterminizedStates = default;
+		LocalJsonProperty<string?> propQueryName = default;
+		LocalJsonProperty<string?> propRewrite = default;
+		LocalJsonProperty<string> propValue = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBoost.TryRead(ref reader, options, PropBoost))
 			{
-				var property = reader.GetString();
-				if (property == "boost")
-				{
-					variant.Boost = JsonSerializer.Deserialize<float?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "case_insensitive")
-				{
-					variant.CaseInsensitive = JsonSerializer.Deserialize<bool?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "flags")
-				{
-					variant.Flags = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "max_determinized_states")
-				{
-					variant.MaxDeterminizedStates = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "_name")
-				{
-					variant.QueryName = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "rewrite")
-				{
-					variant.Rewrite = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "value")
-				{
-					variant.Value = JsonSerializer.Deserialize<string>(ref reader, options);
-					continue;
-				}
+				continue;
 			}
-		}
 
-		reader.Read();
-		return variant;
-	}
+			if (propCaseInsensitive.TryRead(ref reader, options, PropCaseInsensitive))
+			{
+				continue;
+			}
 
-	public override void Write(Utf8JsonWriter writer, RegexpQuery value, JsonSerializerOptions options)
-	{
-		if (value.Field is null)
-			throw new JsonException("Unable to serialize RegexpQuery because the `Field` property is not set. Field name queries must include a valid field name.");
-		if (!options.TryGetClientSettings(out var settings))
-			throw new JsonException("Unable to retrieve client settings required to infer field.");
-		writer.WriteStartObject();
-		writer.WritePropertyName(settings.Inferrer.Field(value.Field));
-		writer.WriteStartObject();
-		if (value.Boost.HasValue)
-		{
-			writer.WritePropertyName("boost");
-			writer.WriteNumberValue(value.Boost.Value);
-		}
+			if (propFlags.TryRead(ref reader, options, PropFlags))
+			{
+				continue;
+			}
 
-		if (value.CaseInsensitive.HasValue)
-		{
-			writer.WritePropertyName("case_insensitive");
-			writer.WriteBooleanValue(value.CaseInsensitive.Value);
-		}
+			if (propMaxDeterminizedStates.TryRead(ref reader, options, PropMaxDeterminizedStates))
+			{
+				continue;
+			}
 
-		if (!string.IsNullOrEmpty(value.Flags))
-		{
-			writer.WritePropertyName("flags");
-			writer.WriteStringValue(value.Flags);
-		}
+			if (propQueryName.TryRead(ref reader, options, PropQueryName))
+			{
+				continue;
+			}
 
-		if (value.MaxDeterminizedStates.HasValue)
-		{
-			writer.WritePropertyName("max_determinized_states");
-			writer.WriteNumberValue(value.MaxDeterminizedStates.Value);
-		}
+			if (propRewrite.TryRead(ref reader, options, PropRewrite))
+			{
+				continue;
+			}
 
-		if (!string.IsNullOrEmpty(value.QueryName))
-		{
-			writer.WritePropertyName("_name");
-			writer.WriteStringValue(value.QueryName);
+			if (propValue.TryRead(ref reader, options, PropValue))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		if (!string.IsNullOrEmpty(value.Rewrite))
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		reader.Read();
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new RegexpQuery
 		{
-			writer.WritePropertyName("rewrite");
-			writer.WriteStringValue(value.Rewrite);
-		}
+			Boost = propBoost.Value
+,
+			CaseInsensitive = propCaseInsensitive.Value
+,
+			Field = propField.Value
+,
+			Flags = propFlags.Value
+,
+			MaxDeterminizedStates = propMaxDeterminizedStates.Value
+,
+			QueryName = propQueryName.Value
+,
+			Rewrite = propRewrite.Value
+,
+			Value = propValue.Value
+		};
+	}
 
-		writer.WritePropertyName("value");
-		writer.WriteStringValue(value.Value);
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, RegexpQuery value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WritePropertyName(options, value.Field);
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropCaseInsensitive, value.CaseInsensitive);
+		writer.WriteProperty(options, PropFlags, value.Flags);
+		writer.WriteProperty(options, PropMaxDeterminizedStates, value.MaxDeterminizedStates);
+		writer.WriteProperty(options, PropQueryName, value.QueryName);
+		writer.WriteProperty(options, PropRewrite, value.Rewrite);
+		writer.WriteProperty(options, PropValue, value.Value);
 		writer.WriteEndObject();
 		writer.WriteEndObject();
 	}
@@ -152,6 +152,10 @@ public RegexpQuery(Elastic.Clients.Elasticsearch.Field field)
 		Field = field;
 	}
 
+	internal RegexpQuery()
+	{
+	}
+
 	/// <summary>
 	/// <para>
 	/// Floating point number used to decrease or increase the relevance scores of the query.
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/ShapeQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/ShapeQuery.g.cs
index 9b313e9a20a..da91356b03c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/ShapeQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/ShapeQuery.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,78 +28,65 @@
 
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
 
-internal sealed partial class ShapeQueryConverter : JsonConverter<ShapeQuery>
+internal sealed partial class ShapeQueryConverter : System.Text.Json.Serialization.JsonConverter<ShapeQuery>
 {
-	public override ShapeQuery Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropShape = System.Text.Json.JsonEncodedText.Encode("shape");
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropIgnoreUnmapped = System.Text.Json.JsonEncodedText.Encode("ignore_unmapped");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryName = System.Text.Json.JsonEncodedText.Encode("_name");
+
+	public override ShapeQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		var variant = new ShapeQuery();
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Field> propField = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.QueryDsl.ShapeFieldQuery> propShape = default;
+		LocalJsonProperty<float?> propBoost = default;
+		LocalJsonProperty<bool?> propIgnoreUnmapped = default;
+		LocalJsonProperty<string?> propQueryName = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propBoost.TryRead(ref reader, options, PropBoost))
 			{
-				var property = reader.GetString();
-				if (property == "boost")
-				{
-					variant.Boost = JsonSerializer.Deserialize<float?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "ignore_unmapped")
-				{
-					variant.IgnoreUnmapped = JsonSerializer.Deserialize<bool?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "_name")
-				{
-					variant.QueryName = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				variant.Field = property;
-				reader.Read();
-				variant.Shape = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.ShapeFieldQuery>(ref reader, options);
+				continue;
 			}
-		}
-
-		return variant;
-	}
 
-	public override void Write(Utf8JsonWriter writer, ShapeQuery value, JsonSerializerOptions options)
-	{
-		writer.WriteStartObject();
-		if (value.Field is not null && value.Shape is not null)
-		{
-			if (!options.TryGetClientSettings(out var settings))
+			if (propIgnoreUnmapped.TryRead(ref reader, options, PropIgnoreUnmapped))
 			{
-				ThrowHelper.ThrowJsonExceptionForMissingSettings();
+				continue;
 			}
 
-			var propertyName = settings.Inferrer.Field(value.Field);
-			writer.WritePropertyName(propertyName);
-			JsonSerializer.Serialize(writer, value.Shape, options);
-		}
-
-		if (value.Boost.HasValue)
-		{
-			writer.WritePropertyName("boost");
-			writer.WriteNumberValue(value.Boost.Value);
-		}
+			if (propQueryName.TryRead(ref reader, options, PropQueryName))
+			{
+				continue;
+			}
 
-		if (value.IgnoreUnmapped.HasValue)
-		{
-			writer.WritePropertyName("ignore_unmapped");
-			writer.WriteBooleanValue(value.IgnoreUnmapped.Value);
+			propField.Initialized = propShape.Initialized = true;
+			reader.ReadProperty(options, out propField.Value, out propShape.Value);
 		}
 
-		if (!string.IsNullOrEmpty(value.QueryName))
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ShapeQuery
 		{
-			writer.WritePropertyName("_name");
-			writer.WriteStringValue(value.QueryName);
-		}
+			Field = propField.Value
+,
+			Shape = propShape.Value
+,
+			Boost = propBoost.Value
+,
+			IgnoreUnmapped = propIgnoreUnmapped.Value
+,
+			QueryName = propQueryName.Value
+		};
+	}
 
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ShapeQuery value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropIgnoreUnmapped, value.IgnoreUnmapped);
+		writer.WriteProperty(options, PropQueryName, value.QueryName);
+		writer.WriteProperty(options, value.Field, value.Shape);
 		writer.WriteEndObject();
 	}
 }
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 14e77720775..6153032dda0 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SimpleQueryStringQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SimpleQueryStringQuery.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,180 @@
 
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
 
+internal sealed partial class SimpleQueryStringQueryConverter : System.Text.Json.Serialization.JsonConverter<SimpleQueryStringQuery>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAnalyzer = System.Text.Json.JsonEncodedText.Encode("analyzer");
+	private static readonly System.Text.Json.JsonEncodedText PropAnalyzeWildcard = System.Text.Json.JsonEncodedText.Encode("analyze_wildcard");
+	private static readonly System.Text.Json.JsonEncodedText PropAutoGenerateSynonymsPhraseQuery = System.Text.Json.JsonEncodedText.Encode("auto_generate_synonyms_phrase_query");
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropDefaultOperator = System.Text.Json.JsonEncodedText.Encode("default_operator");
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropFlags = System.Text.Json.JsonEncodedText.Encode("flags");
+	private static readonly System.Text.Json.JsonEncodedText PropFuzzyMaxExpansions = System.Text.Json.JsonEncodedText.Encode("fuzzy_max_expansions");
+	private static readonly System.Text.Json.JsonEncodedText PropFuzzyPrefixLength = System.Text.Json.JsonEncodedText.Encode("fuzzy_prefix_length");
+	private static readonly System.Text.Json.JsonEncodedText PropFuzzyTranspositions = System.Text.Json.JsonEncodedText.Encode("fuzzy_transpositions");
+	private static readonly System.Text.Json.JsonEncodedText PropLenient = System.Text.Json.JsonEncodedText.Encode("lenient");
+	private static readonly System.Text.Json.JsonEncodedText PropMinimumShouldMatch = System.Text.Json.JsonEncodedText.Encode("minimum_should_match");
+	private static readonly System.Text.Json.JsonEncodedText PropQuery = System.Text.Json.JsonEncodedText.Encode("query");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryName = System.Text.Json.JsonEncodedText.Encode("_name");
+	private static readonly System.Text.Json.JsonEncodedText PropQuoteFieldSuffix = System.Text.Json.JsonEncodedText.Encode("quote_field_suffix");
+
+	public override SimpleQueryStringQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string?> propAnalyzer = default;
+		LocalJsonProperty<bool?> propAnalyzeWildcard = default;
+		LocalJsonProperty<bool?> propAutoGenerateSynonymsPhraseQuery = default;
+		LocalJsonProperty<float?> propBoost = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.QueryDsl.Operator?> propDefaultOperator = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Fields?> propFields = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.QueryDsl.SimpleQueryStringFlag?> propFlags = default;
+		LocalJsonProperty<int?> propFuzzyMaxExpansions = default;
+		LocalJsonProperty<int?> propFuzzyPrefixLength = default;
+		LocalJsonProperty<bool?> propFuzzyTranspositions = default;
+		LocalJsonProperty<bool?> propLenient = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.MinimumShouldMatch?> propMinimumShouldMatch = default;
+		LocalJsonProperty<string> propQuery = default;
+		LocalJsonProperty<string?> propQueryName = default;
+		LocalJsonProperty<string?> propQuoteFieldSuffix = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAnalyzer.TryRead(ref reader, options, PropAnalyzer))
+			{
+				continue;
+			}
+
+			if (propAnalyzeWildcard.TryRead(ref reader, options, PropAnalyzeWildcard))
+			{
+				continue;
+			}
+
+			if (propAutoGenerateSynonymsPhraseQuery.TryRead(ref reader, options, PropAutoGenerateSynonymsPhraseQuery))
+			{
+				continue;
+			}
+
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
+
+			if (propDefaultOperator.TryRead(ref reader, options, PropDefaultOperator))
+			{
+				continue;
+			}
+
+			if (propFields.TryRead(ref reader, options, PropFields, typeof(FieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propFlags.TryRead(ref reader, options, PropFlags))
+			{
+				continue;
+			}
+
+			if (propFuzzyMaxExpansions.TryRead(ref reader, options, PropFuzzyMaxExpansions))
+			{
+				continue;
+			}
+
+			if (propFuzzyPrefixLength.TryRead(ref reader, options, PropFuzzyPrefixLength))
+			{
+				continue;
+			}
+
+			if (propFuzzyTranspositions.TryRead(ref reader, options, PropFuzzyTranspositions))
+			{
+				continue;
+			}
+
+			if (propLenient.TryRead(ref reader, options, PropLenient))
+			{
+				continue;
+			}
+
+			if (propMinimumShouldMatch.TryRead(ref reader, options, PropMinimumShouldMatch))
+			{
+				continue;
+			}
+
+			if (propQuery.TryRead(ref reader, options, PropQuery))
+			{
+				continue;
+			}
+
+			if (propQueryName.TryRead(ref reader, options, PropQueryName))
+			{
+				continue;
+			}
+
+			if (propQuoteFieldSuffix.TryRead(ref reader, options, PropQuoteFieldSuffix))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SimpleQueryStringQuery
+		{
+			Analyzer = propAnalyzer.Value
+,
+			AnalyzeWildcard = propAnalyzeWildcard.Value
+,
+			AutoGenerateSynonymsPhraseQuery = propAutoGenerateSynonymsPhraseQuery.Value
+,
+			Boost = propBoost.Value
+,
+			DefaultOperator = propDefaultOperator.Value
+,
+			Fields = propFields.Value
+,
+			Flags = propFlags.Value
+,
+			FuzzyMaxExpansions = propFuzzyMaxExpansions.Value
+,
+			FuzzyPrefixLength = propFuzzyPrefixLength.Value
+,
+			FuzzyTranspositions = propFuzzyTranspositions.Value
+,
+			Lenient = propLenient.Value
+,
+			MinimumShouldMatch = propMinimumShouldMatch.Value
+,
+			Query = propQuery.Value
+,
+			QueryName = propQueryName.Value
+,
+			QuoteFieldSuffix = propQuoteFieldSuffix.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SimpleQueryStringQuery value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAnalyzer, value.Analyzer);
+		writer.WriteProperty(options, PropAnalyzeWildcard, value.AnalyzeWildcard);
+		writer.WriteProperty(options, PropAutoGenerateSynonymsPhraseQuery, value.AutoGenerateSynonymsPhraseQuery);
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropDefaultOperator, value.DefaultOperator);
+		writer.WriteProperty(options, PropFields, value.Fields, typeof(FieldsMarker));
+		writer.WriteProperty(options, PropFlags, value.Flags);
+		writer.WriteProperty(options, PropFuzzyMaxExpansions, value.FuzzyMaxExpansions);
+		writer.WriteProperty(options, PropFuzzyPrefixLength, value.FuzzyPrefixLength);
+		writer.WriteProperty(options, PropFuzzyTranspositions, value.FuzzyTranspositions);
+		writer.WriteProperty(options, PropLenient, value.Lenient);
+		writer.WriteProperty(options, PropMinimumShouldMatch, value.MinimumShouldMatch);
+		writer.WriteProperty(options, PropQuery, value.Query);
+		writer.WriteProperty(options, PropQueryName, value.QueryName);
+		writer.WriteProperty(options, PropQuoteFieldSuffix, value.QuoteFieldSuffix);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(SimpleQueryStringQueryConverter))]
 public sealed partial class SimpleQueryStringQuery
 {
 	/// <summary>
@@ -34,7 +209,6 @@ public sealed partial class SimpleQueryStringQuery
 	/// Analyzer used to convert text in the query string into tokens.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("analyzer")]
 	public string? Analyzer { get; set; }
 
 	/// <summary>
@@ -42,7 +216,6 @@ public sealed partial class SimpleQueryStringQuery
 	/// If <c>true</c>, the query attempts to analyze wildcard terms in the query string.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("analyze_wildcard")]
 	public bool? AnalyzeWildcard { get; set; }
 
 	/// <summary>
@@ -50,7 +223,6 @@ public sealed partial class SimpleQueryStringQuery
 	/// If <c>true</c>, the parser creates a match_phrase query for each multi-position token.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("auto_generate_synonyms_phrase_query")]
 	public bool? AutoGenerateSynonymsPhraseQuery { get; set; }
 
 	/// <summary>
@@ -61,7 +233,6 @@ public sealed partial class SimpleQueryStringQuery
 	/// A value greater than 1.0 increases the relevance score.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("boost")]
 	public float? Boost { get; set; }
 
 	/// <summary>
@@ -69,7 +240,6 @@ public sealed partial class SimpleQueryStringQuery
 	/// Default boolean logic used to interpret text in the query string if no operators are specified.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("default_operator")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.Operator? DefaultOperator { get; set; }
 
 	/// <summary>
@@ -80,8 +250,6 @@ public sealed partial class SimpleQueryStringQuery
 	/// Defaults to the <c>index.query.default_field index</c> setting, which has a default value of <c>*</c>.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("fields")]
-	[JsonConverter(typeof(FieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Fields? Fields { get; set; }
 
 	/// <summary>
@@ -89,7 +257,6 @@ public sealed partial class SimpleQueryStringQuery
 	/// List of enabled operators for the simple query string syntax.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("flags")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.SimpleQueryStringFlag? Flags { get; set; }
 
 	/// <summary>
@@ -97,7 +264,6 @@ public sealed partial class SimpleQueryStringQuery
 	/// Maximum number of terms to which the query expands for fuzzy matching.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("fuzzy_max_expansions")]
 	public int? FuzzyMaxExpansions { get; set; }
 
 	/// <summary>
@@ -105,7 +271,6 @@ public sealed partial class SimpleQueryStringQuery
 	/// Number of beginning characters left unchanged for fuzzy matching.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("fuzzy_prefix_length")]
 	public int? FuzzyPrefixLength { get; set; }
 
 	/// <summary>
@@ -113,7 +278,6 @@ public sealed partial class SimpleQueryStringQuery
 	/// If <c>true</c>, edits for fuzzy matching include transpositions of two adjacent characters (for example, <c>ab</c> to <c>ba</c>).
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("fuzzy_transpositions")]
 	public bool? FuzzyTranspositions { get; set; }
 
 	/// <summary>
@@ -121,7 +285,6 @@ public sealed partial class SimpleQueryStringQuery
 	/// If <c>true</c>, format-based errors, such as providing a text value for a numeric field, are ignored.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("lenient")]
 	public bool? Lenient { get; set; }
 
 	/// <summary>
@@ -129,7 +292,6 @@ public sealed partial class SimpleQueryStringQuery
 	/// Minimum number of clauses that must match for a document to be returned.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("minimum_should_match")]
 	public Elastic.Clients.Elasticsearch.MinimumShouldMatch? MinimumShouldMatch { get; set; }
 
 	/// <summary>
@@ -137,9 +299,7 @@ public sealed partial class SimpleQueryStringQuery
 	/// Query string in the simple query string syntax you wish to parse and use for search.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("query")]
 	public string Query { get; set; }
-	[JsonInclude, JsonPropertyName("_name")]
 	public string? QueryName { get; set; }
 
 	/// <summary>
@@ -147,7 +307,6 @@ public sealed partial class SimpleQueryStringQuery
 	/// Suffix appended to quoted text in the query string.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("quote_field_suffix")]
 	public string? QuoteFieldSuffix { get; set; }
 
 	public static implicit operator Elastic.Clients.Elasticsearch.QueryDsl.Query(SimpleQueryStringQuery simpleQueryStringQuery) => Elastic.Clients.Elasticsearch.QueryDsl.Query.SimpleQueryString(simpleQueryStringQuery);
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 68096795d8c..586f8639e4c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanQuery.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -39,12 +40,16 @@ internal SpanQuery(string variantName, object variant)
 			throw new ArgumentNullException(nameof(variant));
 		if (string.IsNullOrWhiteSpace(variantName))
 			throw new ArgumentException("Variant name must not be empty or whitespace.");
-		VariantName = variantName;
+		VariantType = variantName;
 		Variant = variant;
 	}
 
-	internal object Variant { get; }
-	internal string VariantName { get; }
+	internal SpanQuery()
+	{
+	}
+
+	public object Variant { get; internal set; }
+	public string VariantType { get; internal set; }
 
 	public static SpanQuery SpanContaining(Elastic.Clients.Elasticsearch.QueryDsl.SpanContainingQuery spanContainingQuery) => new SpanQuery("span_containing", spanContainingQuery);
 	public static SpanQuery SpanFieldMasking(Elastic.Clients.Elasticsearch.QueryDsl.SpanFieldMaskingQuery spanFieldMaskingQuery) => new SpanQuery("span_field_masking", spanFieldMaskingQuery);
@@ -70,147 +75,152 @@ public bool TryGet<T>([NotNullWhen(true)] out T? result) where T : class
 	}
 }
 
-internal sealed partial class SpanQueryConverter : JsonConverter<SpanQuery>
+internal sealed partial class SpanQueryConverter : System.Text.Json.Serialization.JsonConverter<SpanQuery>
 {
-	public override SpanQuery Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText VariantSpanContaining = System.Text.Json.JsonEncodedText.Encode("span_containing");
+	private static readonly System.Text.Json.JsonEncodedText VariantSpanFieldMasking = System.Text.Json.JsonEncodedText.Encode("span_field_masking");
+	private static readonly System.Text.Json.JsonEncodedText VariantSpanFirst = System.Text.Json.JsonEncodedText.Encode("span_first");
+	private static readonly System.Text.Json.JsonEncodedText VariantSpanGap = System.Text.Json.JsonEncodedText.Encode("span_gap");
+	private static readonly System.Text.Json.JsonEncodedText VariantSpanMulti = System.Text.Json.JsonEncodedText.Encode("span_multi");
+	private static readonly System.Text.Json.JsonEncodedText VariantSpanNear = System.Text.Json.JsonEncodedText.Encode("span_near");
+	private static readonly System.Text.Json.JsonEncodedText VariantSpanNot = System.Text.Json.JsonEncodedText.Encode("span_not");
+	private static readonly System.Text.Json.JsonEncodedText VariantSpanOr = System.Text.Json.JsonEncodedText.Encode("span_or");
+	private static readonly System.Text.Json.JsonEncodedText VariantSpanTerm = System.Text.Json.JsonEncodedText.Encode("span_term");
+	private static readonly System.Text.Json.JsonEncodedText VariantSpanWithin = System.Text.Json.JsonEncodedText.Encode("span_within");
+
+	public override SpanQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		var variantType = string.Empty;
+		object? variant = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			throw new JsonException("Expected start token.");
-		}
-
-		object? variantValue = default;
-		string? variantNameValue = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
-		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token.");
-			}
-
-			if (reader.TokenType != JsonTokenType.PropertyName)
+			if (reader.ValueTextEquals(VariantSpanContaining))
 			{
-				throw new JsonException("Expected a property name token representing the name of an Elasticsearch field.");
-			}
-
-			var propertyName = reader.GetString();
-			reader.Read();
-			if (propertyName == "span_containing")
-			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.SpanContainingQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantSpanContaining.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.SpanContainingQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "span_field_masking")
+			if (reader.ValueTextEquals(VariantSpanFieldMasking))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.SpanFieldMaskingQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantSpanFieldMasking.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.SpanFieldMaskingQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "span_first")
+			if (reader.ValueTextEquals(VariantSpanFirst))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.SpanFirstQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantSpanFirst.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.SpanFirstQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "span_gap")
+			if (reader.ValueTextEquals(VariantSpanGap))
 			{
-				variantValue = JsonSerializer.Deserialize<KeyValuePair<Elastic.Clients.Elasticsearch.Field, int>?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantSpanGap.Value;
+				reader.Read();
+				variant = reader.ReadValue<KeyValuePair<Elastic.Clients.Elasticsearch.Field, int>?>(options);
 				continue;
 			}
 
-			if (propertyName == "span_multi")
+			if (reader.ValueTextEquals(VariantSpanMulti))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.SpanMultiTermQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantSpanMulti.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.SpanMultiTermQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "span_near")
+			if (reader.ValueTextEquals(VariantSpanNear))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.SpanNearQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantSpanNear.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.SpanNearQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "span_not")
+			if (reader.ValueTextEquals(VariantSpanNot))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.SpanNotQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantSpanNot.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.SpanNotQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "span_or")
+			if (reader.ValueTextEquals(VariantSpanOr))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.SpanOrQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantSpanOr.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.SpanOrQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "span_term")
+			if (reader.ValueTextEquals(VariantSpanTerm))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.SpanTermQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantSpanTerm.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.SpanTermQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "span_within")
+			if (reader.ValueTextEquals(VariantSpanWithin))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.SpanWithinQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantSpanWithin.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.SpanWithinQuery?>(options);
 				continue;
 			}
 
-			throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'SpanQuery' from the response.");
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		var result = new SpanQuery(variantNameValue, variantValue);
-		return result;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SpanQuery { VariantType = variantType, Variant = variant };
 	}
 
-	public override void Write(Utf8JsonWriter writer, SpanQuery value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SpanQuery value, System.Text.Json.JsonSerializerOptions options)
 	{
 		writer.WriteStartObject();
-		if (value.VariantName is not null && value.Variant is not null)
+		switch (value.VariantType)
 		{
-			writer.WritePropertyName(value.VariantName);
-			switch (value.VariantName)
-			{
-				case "span_containing":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.SpanContainingQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.SpanContainingQuery)value.Variant, options);
-					break;
-				case "span_field_masking":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.SpanFieldMaskingQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.SpanFieldMaskingQuery)value.Variant, options);
-					break;
-				case "span_first":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.SpanFirstQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.SpanFirstQuery)value.Variant, options);
-					break;
-				case "span_gap":
-					JsonSerializer.Serialize<KeyValuePair<Elastic.Clients.Elasticsearch.Field, int>>(writer, (KeyValuePair<Elastic.Clients.Elasticsearch.Field, int>)value.Variant, options);
-					break;
-				case "span_multi":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.SpanMultiTermQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.SpanMultiTermQuery)value.Variant, options);
-					break;
-				case "span_near":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.SpanNearQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.SpanNearQuery)value.Variant, options);
-					break;
-				case "span_not":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.SpanNotQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.SpanNotQuery)value.Variant, options);
-					break;
-				case "span_or":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.SpanOrQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.SpanOrQuery)value.Variant, options);
-					break;
-				case "span_term":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.SpanTermQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.SpanTermQuery)value.Variant, options);
-					break;
-				case "span_within":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.SpanWithinQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.SpanWithinQuery)value.Variant, options);
-					break;
-			}
+			case "":
+				break;
+			case "span_containing":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.SpanContainingQuery?)value.Variant);
+				break;
+			case "span_field_masking":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.SpanFieldMaskingQuery?)value.Variant);
+				break;
+			case "span_first":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.SpanFirstQuery?)value.Variant);
+				break;
+			case "span_gap":
+				writer.WriteProperty(options, value.VariantType, (KeyValuePair<Elastic.Clients.Elasticsearch.Field, int>?)value.Variant);
+				break;
+			case "span_multi":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.SpanMultiTermQuery?)value.Variant);
+				break;
+			case "span_near":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.SpanNearQuery?)value.Variant);
+				break;
+			case "span_not":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.SpanNotQuery?)value.Variant);
+				break;
+			case "span_or":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.SpanOrQuery?)value.Variant);
+				break;
+			case "span_term":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.SpanTermQuery?)value.Variant);
+				break;
+			case "span_within":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.SpanWithinQuery?)value.Variant);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.VariantType}' is not supported for type '{nameof(SpanQuery)}'.");
 		}
 
 		writer.WriteEndObject();
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 80695af511c..7b3d22e3c26 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanTermQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanTermQuery.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,68 +28,75 @@
 
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
 
-internal sealed partial class SpanTermQueryConverter : JsonConverter<SpanTermQuery>
+internal sealed partial class SpanTermQueryConverter : System.Text.Json.Serialization.JsonConverter<SpanTermQuery>
 {
-	public override SpanTermQuery Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryName = System.Text.Json.JsonEncodedText.Encode("_name");
+	private static readonly System.Text.Json.JsonEncodedText PropValue = System.Text.Json.JsonEncodedText.Encode("value");
+
+	public override SpanTermQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Field> propField = default;
 		reader.Read();
-		var fieldName = reader.GetString();
+		propField.Value = reader.ReadValue<Elastic.Clients.Elasticsearch.Field>(options);
+		propField.Initialized = true;
 		reader.Read();
-		var variant = new SpanTermQuery(fieldName);
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		if (reader.TokenType is not System.Text.Json.JsonTokenType.StartObject)
+		{
+			var value = reader.ReadValue<string>(options);
+			reader.Read();
+			return new SpanTermQuery { Value = value };
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<float?> propBoost = default;
+		LocalJsonProperty<string?> propQueryName = default;
+		LocalJsonProperty<string> propValue = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
+
+			if (propQueryName.TryRead(ref reader, options, PropQueryName))
+			{
+				continue;
+			}
+
+			if (propValue.TryRead(ref reader, options, PropValue))
 			{
-				var property = reader.GetString();
-				if (property == "boost")
-				{
-					variant.Boost = JsonSerializer.Deserialize<float?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "_name")
-				{
-					variant.QueryName = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "value")
-				{
-					variant.Value = JsonSerializer.Deserialize<string>(ref reader, options);
-					continue;
-				}
+				continue;
 			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
 		reader.Read();
-		return variant;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SpanTermQuery
+		{
+			Boost = propBoost.Value
+,
+			Field = propField.Value
+,
+			QueryName = propQueryName.Value
+,
+			Value = propValue.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, SpanTermQuery value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SpanTermQuery value, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (value.Field is null)
-			throw new JsonException("Unable to serialize SpanTermQuery because the `Field` property is not set. Field name queries must include a valid field name.");
-		if (!options.TryGetClientSettings(out var settings))
-			throw new JsonException("Unable to retrieve client settings required to infer field.");
 		writer.WriteStartObject();
-		writer.WritePropertyName(settings.Inferrer.Field(value.Field));
+		writer.WritePropertyName(options, value.Field);
 		writer.WriteStartObject();
-		if (value.Boost.HasValue)
-		{
-			writer.WritePropertyName("boost");
-			writer.WriteNumberValue(value.Boost.Value);
-		}
-
-		if (!string.IsNullOrEmpty(value.QueryName))
-		{
-			writer.WritePropertyName("_name");
-			writer.WriteStringValue(value.QueryName);
-		}
-
-		writer.WritePropertyName("value");
-		writer.WriteStringValue(value.Value);
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropQueryName, value.QueryName);
+		writer.WriteProperty(options, PropValue, value.Value);
 		writer.WriteEndObject();
 		writer.WriteEndObject();
 	}
@@ -104,6 +112,10 @@ public SpanTermQuery(Elastic.Clients.Elasticsearch.Field field)
 		Field = field;
 	}
 
+	internal SpanTermQuery()
+	{
+	}
+
 	/// <summary>
 	/// <para>
 	/// Floating point number used to decrease or increase the relevance scores of the query.
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SparseVectorQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SparseVectorQuery.g.cs
index cb6c959ad3d..14fce255d09 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SparseVectorQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SparseVectorQuery.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -39,12 +40,16 @@ internal SparseVectorQuery(string variantName, object variant)
 			throw new ArgumentNullException(nameof(variant));
 		if (string.IsNullOrWhiteSpace(variantName))
 			throw new ArgumentException("Variant name must not be empty or whitespace.");
-		VariantName = variantName;
+		VariantType = variantName;
 		Variant = variant;
 	}
 
-	internal object Variant { get; }
-	internal string VariantName { get; }
+	internal SparseVectorQuery()
+	{
+	}
+
+	public object Variant { get; internal set; }
+	public string VariantType { get; internal set; }
 
 	public static SparseVectorQuery InferenceId(Elastic.Clients.Elasticsearch.Id id) => new SparseVectorQuery("inference_id", id);
 
@@ -113,143 +118,109 @@ public bool TryGet<T>([NotNullWhen(true)] out T? result) where T : class
 	}
 }
 
-internal sealed partial class SparseVectorQueryConverter : JsonConverter<SparseVectorQuery>
+internal sealed partial class SparseVectorQueryConverter : System.Text.Json.Serialization.JsonConverter<SparseVectorQuery>
 {
-	public override SparseVectorQuery Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropPrune = System.Text.Json.JsonEncodedText.Encode("prune");
+	private static readonly System.Text.Json.JsonEncodedText PropPruningConfig = System.Text.Json.JsonEncodedText.Encode("pruning_config");
+	private static readonly System.Text.Json.JsonEncodedText PropQuery = System.Text.Json.JsonEncodedText.Encode("query");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryName = System.Text.Json.JsonEncodedText.Encode("_name");
+	private static readonly System.Text.Json.JsonEncodedText VariantInferenceId = System.Text.Json.JsonEncodedText.Encode("inference_id");
+
+	public override SparseVectorQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-		{
-			throw new JsonException("Expected start token.");
-		}
-
-		object? variantValue = default;
-		string? variantNameValue = default;
-		float? boostValue = default;
-		Elastic.Clients.Elasticsearch.Field fieldValue = default;
-		bool? pruneValue = default;
-		Elastic.Clients.Elasticsearch.QueryDsl.TokenPruningConfig? pruningConfigValue = default;
-		string? queryValue = default;
-		string? queryNameValue = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<float?> propBoost = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Field> propField = default;
+		LocalJsonProperty<bool?> propPrune = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.QueryDsl.TokenPruningConfig?> propPruningConfig = default;
+		LocalJsonProperty<string?> propQuery = default;
+		LocalJsonProperty<string?> propQueryName = default;
+		var variantType = string.Empty;
+		object? variant = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token.");
-			}
-
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token representing the name of an Elasticsearch field.");
-			}
-
-			var propertyName = reader.GetString();
-			reader.Read();
-			if (propertyName == "boost")
+			if (propBoost.TryRead(ref reader, options, PropBoost))
 			{
-				boostValue = JsonSerializer.Deserialize<float?>(ref reader, options);
 				continue;
 			}
 
-			if (propertyName == "field")
+			if (propField.TryRead(ref reader, options, PropField))
 			{
-				fieldValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Field>(ref reader, options);
 				continue;
 			}
 
-			if (propertyName == "prune")
+			if (propPrune.TryRead(ref reader, options, PropPrune))
 			{
-				pruneValue = JsonSerializer.Deserialize<bool?>(ref reader, options);
 				continue;
 			}
 
-			if (propertyName == "pruning_config")
+			if (propPruningConfig.TryRead(ref reader, options, PropPruningConfig))
 			{
-				pruningConfigValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.TokenPruningConfig?>(ref reader, options);
 				continue;
 			}
 
-			if (propertyName == "query")
+			if (propQuery.TryRead(ref reader, options, PropQuery))
 			{
-				queryValue = JsonSerializer.Deserialize<string?>(ref reader, options);
 				continue;
 			}
 
-			if (propertyName == "_name")
+			if (propQueryName.TryRead(ref reader, options, PropQueryName))
 			{
-				queryNameValue = JsonSerializer.Deserialize<string?>(ref reader, options);
 				continue;
 			}
 
-			if (propertyName == "inference_id")
+			if (reader.ValueTextEquals(VariantInferenceId))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Id?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantInferenceId.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Id?>(options);
 				continue;
 			}
 
-			throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'SparseVectorQuery' from the response.");
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		var result = new SparseVectorQuery(variantNameValue, variantValue);
-		result.Boost = boostValue;
-		result.Field = fieldValue;
-		result.Prune = pruneValue;
-		result.PruningConfig = pruningConfigValue;
-		result.Query = queryValue;
-		result.QueryName = queryNameValue;
-		return result;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SparseVectorQuery
+		{
+			VariantType = variantType,
+			Variant = variant,
+			Boost = propBoost.Value
+	,
+			Field = propField.Value
+	,
+			Prune = propPrune.Value
+	,
+			PruningConfig = propPruningConfig.Value
+	,
+			Query = propQuery.Value
+	,
+			QueryName = propQueryName.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, SparseVectorQuery value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SparseVectorQuery value, System.Text.Json.JsonSerializerOptions options)
 	{
 		writer.WriteStartObject();
-		if (value.Boost.HasValue)
-		{
-			writer.WritePropertyName("boost");
-			writer.WriteNumberValue(value.Boost.Value);
-		}
-
-		if (value.Field is not null)
+		switch (value.VariantType)
 		{
-			writer.WritePropertyName("field");
-			JsonSerializer.Serialize(writer, value.Field, options);
-		}
-
-		if (value.Prune.HasValue)
-		{
-			writer.WritePropertyName("prune");
-			writer.WriteBooleanValue(value.Prune.Value);
-		}
-
-		if (value.PruningConfig is not null)
-		{
-			writer.WritePropertyName("pruning_config");
-			JsonSerializer.Serialize(writer, value.PruningConfig, options);
-		}
-
-		if (!string.IsNullOrEmpty(value.Query))
-		{
-			writer.WritePropertyName("query");
-			writer.WriteStringValue(value.Query);
-		}
-
-		if (!string.IsNullOrEmpty(value.QueryName))
-		{
-			writer.WritePropertyName("_name");
-			writer.WriteStringValue(value.QueryName);
-		}
-
-		if (value.VariantName is not null && value.Variant is not null)
-		{
-			writer.WritePropertyName(value.VariantName);
-			switch (value.VariantName)
-			{
-				case "inference_id":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Id>(writer, (Elastic.Clients.Elasticsearch.Id)value.Variant, options);
-					break;
-			}
+			case "":
+				break;
+			case "inference_id":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Id?)value.Variant);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.VariantType}' is not supported for type '{nameof(SparseVectorQuery)}'.");
 		}
 
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropField, value.Field);
+		writer.WriteProperty(options, PropPrune, value.Prune);
+		writer.WriteProperty(options, PropPruningConfig, value.PruningConfig);
+		writer.WriteProperty(options, PropQuery, value.Query);
+		writer.WriteProperty(options, PropQueryName, value.QueryName);
 		writer.WriteEndObject();
 	}
 }
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 3a3e17909a0..eebd82fda6d 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/TermQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/TermQuery.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,80 +28,88 @@
 
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
 
-internal sealed partial class TermQueryConverter : JsonConverter<TermQuery>
+internal sealed partial class TermQueryConverter : System.Text.Json.Serialization.JsonConverter<TermQuery>
 {
-	public override TermQuery Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropCaseInsensitive = System.Text.Json.JsonEncodedText.Encode("case_insensitive");
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryName = System.Text.Json.JsonEncodedText.Encode("_name");
+	private static readonly System.Text.Json.JsonEncodedText PropValue = System.Text.Json.JsonEncodedText.Encode("value");
+
+	public override TermQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Field> propField = default;
 		reader.Read();
-		var fieldName = reader.GetString();
+		propField.Value = reader.ReadValue<Elastic.Clients.Elasticsearch.Field>(options);
+		propField.Initialized = true;
 		reader.Read();
-		var variant = new TermQuery(fieldName);
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		var readerSnapshot = reader;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<float?> propBoost = default;
+		LocalJsonProperty<bool?> propCaseInsensitive = default;
+		LocalJsonProperty<string?> propQueryName = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.FieldValue> propValue = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propBoost.TryRead(ref reader, options, PropBoost))
+			{
+				continue;
+			}
+
+			if (propCaseInsensitive.TryRead(ref reader, options, PropCaseInsensitive))
+			{
+				continue;
+			}
+
+			if (propQueryName.TryRead(ref reader, options, PropQueryName))
+			{
+				continue;
+			}
+
+			if (propValue.TryRead(ref reader, options, PropValue))
+			{
+				continue;
+			}
+
+			try
+			{
+				reader = readerSnapshot;
+				var result = reader.ReadValue<Elastic.Clients.Elasticsearch.FieldValue>(options);
+				return new TermQuery { Field = propField.Value, Value = result };
+			}
+			catch (System.Text.Json.JsonException)
 			{
-				var property = reader.GetString();
-				if (property == "boost")
-				{
-					variant.Boost = JsonSerializer.Deserialize<float?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "case_insensitive")
-				{
-					variant.CaseInsensitive = JsonSerializer.Deserialize<bool?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "_name")
-				{
-					variant.QueryName = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "value")
-				{
-					variant.Value = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.FieldValue>(ref reader, options);
-					continue;
-				}
+				throw;
 			}
 		}
 
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
 		reader.Read();
-		return variant;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new TermQuery
+		{
+			Boost = propBoost.Value
+,
+			CaseInsensitive = propCaseInsensitive.Value
+,
+			Field = propField.Value
+,
+			QueryName = propQueryName.Value
+,
+			Value = propValue.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, TermQuery value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, TermQuery value, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (value.Field is null)
-			throw new JsonException("Unable to serialize TermQuery because the `Field` property is not set. Field name queries must include a valid field name.");
-		if (!options.TryGetClientSettings(out var settings))
-			throw new JsonException("Unable to retrieve client settings required to infer field.");
 		writer.WriteStartObject();
-		writer.WritePropertyName(settings.Inferrer.Field(value.Field));
+		writer.WritePropertyName(options, value.Field);
 		writer.WriteStartObject();
-		if (value.Boost.HasValue)
-		{
-			writer.WritePropertyName("boost");
-			writer.WriteNumberValue(value.Boost.Value);
-		}
-
-		if (value.CaseInsensitive.HasValue)
-		{
-			writer.WritePropertyName("case_insensitive");
-			writer.WriteBooleanValue(value.CaseInsensitive.Value);
-		}
-
-		if (!string.IsNullOrEmpty(value.QueryName))
-		{
-			writer.WritePropertyName("_name");
-			writer.WriteStringValue(value.QueryName);
-		}
-
-		writer.WritePropertyName("value");
-		JsonSerializer.Serialize(writer, value.Value, options);
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropCaseInsensitive, value.CaseInsensitive);
+		writer.WriteProperty(options, PropQueryName, value.QueryName);
+		writer.WriteProperty(options, PropValue, value.Value);
 		writer.WriteEndObject();
 		writer.WriteEndObject();
 	}
@@ -116,6 +125,10 @@ public TermQuery(Elastic.Clients.Elasticsearch.Field field)
 		Field = field;
 	}
 
+	internal TermQuery()
+	{
+	}
+
 	/// <summary>
 	/// <para>
 	/// Floating point number used to decrease or increase the relevance scores of the query.
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/TermRangeQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/TermRangeQuery.g.cs
index 5e175e78f1b..834b9fd554e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/TermRangeQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/TermRangeQuery.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,127 +28,115 @@
 
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
 
-internal sealed partial class TermRangeQueryConverter : JsonConverter<TermRangeQuery>
+internal sealed partial class TermRangeQueryConverter : System.Text.Json.Serialization.JsonConverter<TermRangeQuery>
 {
-	public override TermRangeQuery Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropGt = System.Text.Json.JsonEncodedText.Encode("gt");
+	private static readonly System.Text.Json.JsonEncodedText PropGte = System.Text.Json.JsonEncodedText.Encode("gte");
+	private static readonly System.Text.Json.JsonEncodedText PropLt = System.Text.Json.JsonEncodedText.Encode("lt");
+	private static readonly System.Text.Json.JsonEncodedText PropLte = System.Text.Json.JsonEncodedText.Encode("lte");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryName = System.Text.Json.JsonEncodedText.Encode("_name");
+	private static readonly System.Text.Json.JsonEncodedText PropRelation = System.Text.Json.JsonEncodedText.Encode("relation");
+
+	public override TermRangeQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Field> propField = default;
 		reader.Read();
-		var fieldName = reader.GetString();
+		propField.Value = reader.ReadValue<Elastic.Clients.Elasticsearch.Field>(options);
+		propField.Initialized = true;
 		reader.Read();
-		var variant = new TermRangeQuery(fieldName);
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<float?> propBoost = default;
+		LocalJsonProperty<string?> propGt = default;
+		LocalJsonProperty<string?> propGte = default;
+		LocalJsonProperty<string?> propLt = default;
+		LocalJsonProperty<string?> propLte = default;
+		LocalJsonProperty<string?> propQueryName = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.QueryDsl.RangeRelation?> propRelation = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propBoost.TryRead(ref reader, options, PropBoost))
 			{
-				var property = reader.GetString();
-				if (property == "boost")
-				{
-					variant.Boost = JsonSerializer.Deserialize<float?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "gt")
-				{
-					variant.Gt = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "gte")
-				{
-					variant.Gte = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "lt")
-				{
-					variant.Lt = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "lte")
-				{
-					variant.Lte = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "_name")
-				{
-					variant.QueryName = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "relation")
-				{
-					variant.Relation = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.RangeRelation?>(ref reader, options);
-					continue;
-				}
+				continue;
 			}
-		}
 
-		reader.Read();
-		return variant;
-	}
+			if (propGt.TryRead(ref reader, options, PropGt))
+			{
+				continue;
+			}
 
-	public override void Write(Utf8JsonWriter writer, TermRangeQuery value, JsonSerializerOptions options)
-	{
-		if (value.Field is null)
-			throw new JsonException("Unable to serialize TermRangeQuery because the `Field` property is not set. Field name queries must include a valid field name.");
-		if (!options.TryGetClientSettings(out var settings))
-			throw new JsonException("Unable to retrieve client settings required to infer field.");
-		writer.WriteStartObject();
-		writer.WritePropertyName(settings.Inferrer.Field(value.Field));
-		writer.WriteStartObject();
-		if (value.Boost.HasValue)
-		{
-			writer.WritePropertyName("boost");
-			writer.WriteNumberValue(value.Boost.Value);
-		}
+			if (propGte.TryRead(ref reader, options, PropGte))
+			{
+				continue;
+			}
 
-		if (!string.IsNullOrEmpty(value.Gt))
-		{
-			writer.WritePropertyName("gt");
-			writer.WriteStringValue(value.Gt);
-		}
+			if (propLt.TryRead(ref reader, options, PropLt))
+			{
+				continue;
+			}
 
-		if (!string.IsNullOrEmpty(value.Gte))
-		{
-			writer.WritePropertyName("gte");
-			writer.WriteStringValue(value.Gte);
-		}
+			if (propLte.TryRead(ref reader, options, PropLte))
+			{
+				continue;
+			}
 
-		if (!string.IsNullOrEmpty(value.Lt))
-		{
-			writer.WritePropertyName("lt");
-			writer.WriteStringValue(value.Lt);
-		}
+			if (propQueryName.TryRead(ref reader, options, PropQueryName))
+			{
+				continue;
+			}
 
-		if (!string.IsNullOrEmpty(value.Lte))
-		{
-			writer.WritePropertyName("lte");
-			writer.WriteStringValue(value.Lte);
-		}
+			if (propRelation.TryRead(ref reader, options, PropRelation))
+			{
+				continue;
+			}
 
-		if (!string.IsNullOrEmpty(value.QueryName))
-		{
-			writer.WritePropertyName("_name");
-			writer.WriteStringValue(value.QueryName);
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		if (value.Relation is not null)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		reader.Read();
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new TermRangeQuery
 		{
-			writer.WritePropertyName("relation");
-			JsonSerializer.Serialize(writer, value.Relation, options);
-		}
+			Boost = propBoost.Value
+,
+			Field = propField.Value
+,
+			Gt = propGt.Value
+,
+			Gte = propGte.Value
+,
+			Lt = propLt.Value
+,
+			Lte = propLte.Value
+,
+			QueryName = propQueryName.Value
+,
+			Relation = propRelation.Value
+		};
+	}
 
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, TermRangeQuery value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WritePropertyName(options, value.Field);
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropGt, value.Gt);
+		writer.WriteProperty(options, PropGte, value.Gte);
+		writer.WriteProperty(options, PropLt, value.Lt);
+		writer.WriteProperty(options, PropLte, value.Lte);
+		writer.WriteProperty(options, PropQueryName, value.QueryName);
+		writer.WriteProperty(options, PropRelation, value.Relation);
 		writer.WriteEndObject();
 		writer.WriteEndObject();
 	}
 }
 
 [JsonConverter(typeof(TermRangeQueryConverter))]
-public sealed partial class TermRangeQuery
+public sealed partial class TermRangeQuery : IRangeQuery
 {
 	public TermRangeQuery(Elastic.Clients.Elasticsearch.Field field)
 	{
@@ -156,6 +145,10 @@ public TermRangeQuery(Elastic.Clients.Elasticsearch.Field field)
 		Field = field;
 	}
 
+	internal TermRangeQuery()
+	{
+	}
+
 	/// <summary>
 	/// <para>
 	/// Floating point number used to decrease or increase the relevance scores of the query.
@@ -202,6 +195,8 @@ public TermRangeQuery(Elastic.Clients.Elasticsearch.Field field)
 	/// </para>
 	/// </summary>
 	public Elastic.Clients.Elasticsearch.QueryDsl.RangeRelation? Relation { get; set; }
+
+	public string Type => "termrangequery";
 }
 
 public sealed partial class TermRangeQueryDescriptor<TDocument> : SerializableDescriptor<TermRangeQueryDescriptor<TDocument>>
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 a56cf458603..86dcc1264fb 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/TermsQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/TermsQuery.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,66 +28,55 @@
 
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
 
-internal sealed partial class TermsQueryConverter : JsonConverter<TermsQuery>
+internal sealed partial class TermsQueryConverter : System.Text.Json.Serialization.JsonConverter<TermsQuery>
 {
-	public override TermsQuery Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropTerms = System.Text.Json.JsonEncodedText.Encode("terms");
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryName = System.Text.Json.JsonEncodedText.Encode("_name");
+
+	public override TermsQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		var variant = new TermsQuery();
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Field> propField = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.QueryDsl.TermsQueryField> propTerms = default;
+		LocalJsonProperty<float?> propBoost = default;
+		LocalJsonProperty<string?> propQueryName = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propBoost.TryRead(ref reader, options, PropBoost))
 			{
-				var property = reader.GetString();
-				if (property == "boost")
-				{
-					variant.Boost = JsonSerializer.Deserialize<float?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "_name")
-				{
-					variant.QueryName = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				variant.Field = property;
-				reader.Read();
-				variant.Terms = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.TermsQueryField>(ref reader, options);
+				continue;
 			}
-		}
 
-		return variant;
-	}
-
-	public override void Write(Utf8JsonWriter writer, TermsQuery value, JsonSerializerOptions options)
-	{
-		writer.WriteStartObject();
-		if (value.Field is not null && value.Terms is not null)
-		{
-			if (!options.TryGetClientSettings(out var settings))
+			if (propQueryName.TryRead(ref reader, options, PropQueryName))
 			{
-				ThrowHelper.ThrowJsonExceptionForMissingSettings();
+				continue;
 			}
 
-			var propertyName = settings.Inferrer.Field(value.Field);
-			writer.WritePropertyName(propertyName);
-			JsonSerializer.Serialize(writer, value.Terms, options);
+			propField.Initialized = propTerms.Initialized = true;
+			reader.ReadProperty(options, out propField.Value, out propTerms.Value);
 		}
 
-		if (value.Boost.HasValue)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new TermsQuery
 		{
-			writer.WritePropertyName("boost");
-			writer.WriteNumberValue(value.Boost.Value);
-		}
-
-		if (!string.IsNullOrEmpty(value.QueryName))
-		{
-			writer.WritePropertyName("_name");
-			writer.WriteStringValue(value.QueryName);
-		}
+			Field = propField.Value
+,
+			Terms = propTerms.Value
+,
+			Boost = propBoost.Value
+,
+			QueryName = propQueryName.Value
+		};
+	}
 
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, TermsQuery value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropQueryName, value.QueryName);
+		writer.WriteProperty(options, value.Field, value.Terms);
 		writer.WriteEndObject();
 	}
 }
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 47cb8cf5415..31e6015924d 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/TermsSetQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/TermsSetQuery.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,104 +28,98 @@
 
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
 
-internal sealed partial class TermsSetQueryConverter : JsonConverter<TermsSetQuery>
+internal sealed partial class TermsSetQueryConverter : System.Text.Json.Serialization.JsonConverter<TermsSetQuery>
 {
-	public override TermsSetQuery Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropMinimumShouldMatch = System.Text.Json.JsonEncodedText.Encode("minimum_should_match");
+	private static readonly System.Text.Json.JsonEncodedText PropMinimumShouldMatchField = System.Text.Json.JsonEncodedText.Encode("minimum_should_match_field");
+	private static readonly System.Text.Json.JsonEncodedText PropMinimumShouldMatchScript = System.Text.Json.JsonEncodedText.Encode("minimum_should_match_script");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryName = System.Text.Json.JsonEncodedText.Encode("_name");
+	private static readonly System.Text.Json.JsonEncodedText PropTerms = System.Text.Json.JsonEncodedText.Encode("terms");
+
+	public override TermsSetQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Field> propField = default;
 		reader.Read();
-		var fieldName = reader.GetString();
+		propField.Value = reader.ReadValue<Elastic.Clients.Elasticsearch.Field>(options);
+		propField.Initialized = true;
 		reader.Read();
-		var variant = new TermsSetQuery(fieldName);
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<float?> propBoost = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.MinimumShouldMatch?> propMinimumShouldMatch = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Field?> propMinimumShouldMatchField = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Script?> propMinimumShouldMatchScript = default;
+		LocalJsonProperty<string?> propQueryName = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.FieldValue>> propTerms = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propBoost.TryRead(ref reader, options, PropBoost))
 			{
-				var property = reader.GetString();
-				if (property == "boost")
-				{
-					variant.Boost = JsonSerializer.Deserialize<float?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "minimum_should_match")
-				{
-					variant.MinimumShouldMatch = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.MinimumShouldMatch?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "minimum_should_match_field")
-				{
-					variant.MinimumShouldMatchField = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Field?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "minimum_should_match_script")
-				{
-					variant.MinimumShouldMatchScript = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Script?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "_name")
-				{
-					variant.QueryName = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "terms")
-				{
-					variant.Terms = JsonSerializer.Deserialize<ICollection<Elastic.Clients.Elasticsearch.FieldValue>>(ref reader, options);
-					continue;
-				}
+				continue;
 			}
-		}
 
-		reader.Read();
-		return variant;
-	}
+			if (propMinimumShouldMatch.TryRead(ref reader, options, PropMinimumShouldMatch))
+			{
+				continue;
+			}
 
-	public override void Write(Utf8JsonWriter writer, TermsSetQuery value, JsonSerializerOptions options)
-	{
-		if (value.Field is null)
-			throw new JsonException("Unable to serialize TermsSetQuery because the `Field` property is not set. Field name queries must include a valid field name.");
-		if (!options.TryGetClientSettings(out var settings))
-			throw new JsonException("Unable to retrieve client settings required to infer field.");
-		writer.WriteStartObject();
-		writer.WritePropertyName(settings.Inferrer.Field(value.Field));
-		writer.WriteStartObject();
-		if (value.Boost.HasValue)
-		{
-			writer.WritePropertyName("boost");
-			writer.WriteNumberValue(value.Boost.Value);
-		}
+			if (propMinimumShouldMatchField.TryRead(ref reader, options, PropMinimumShouldMatchField))
+			{
+				continue;
+			}
 
-		if (value.MinimumShouldMatch is not null)
-		{
-			writer.WritePropertyName("minimum_should_match");
-			JsonSerializer.Serialize(writer, value.MinimumShouldMatch, options);
-		}
+			if (propMinimumShouldMatchScript.TryRead(ref reader, options, PropMinimumShouldMatchScript))
+			{
+				continue;
+			}
 
-		if (value.MinimumShouldMatchField is not null)
-		{
-			writer.WritePropertyName("minimum_should_match_field");
-			JsonSerializer.Serialize(writer, value.MinimumShouldMatchField, options);
-		}
+			if (propQueryName.TryRead(ref reader, options, PropQueryName))
+			{
+				continue;
+			}
 
-		if (value.MinimumShouldMatchScript is not null)
-		{
-			writer.WritePropertyName("minimum_should_match_script");
-			JsonSerializer.Serialize(writer, value.MinimumShouldMatchScript, options);
-		}
+			if (propTerms.TryRead(ref reader, options, PropTerms))
+			{
+				continue;
+			}
 
-		if (!string.IsNullOrEmpty(value.QueryName))
-		{
-			writer.WritePropertyName("_name");
-			writer.WriteStringValue(value.QueryName);
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		writer.WritePropertyName("terms");
-		JsonSerializer.Serialize(writer, value.Terms, options);
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		reader.Read();
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new TermsSetQuery
+		{
+			Boost = propBoost.Value
+,
+			Field = propField.Value
+,
+			MinimumShouldMatch = propMinimumShouldMatch.Value
+,
+			MinimumShouldMatchField = propMinimumShouldMatchField.Value
+,
+			MinimumShouldMatchScript = propMinimumShouldMatchScript.Value
+,
+			QueryName = propQueryName.Value
+,
+			Terms = propTerms.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, TermsSetQuery value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WritePropertyName(options, value.Field);
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropMinimumShouldMatch, value.MinimumShouldMatch);
+		writer.WriteProperty(options, PropMinimumShouldMatchField, value.MinimumShouldMatchField);
+		writer.WriteProperty(options, PropMinimumShouldMatchScript, value.MinimumShouldMatchScript);
+		writer.WriteProperty(options, PropQueryName, value.QueryName);
+		writer.WriteProperty(options, PropTerms, value.Terms);
 		writer.WriteEndObject();
 		writer.WriteEndObject();
 	}
@@ -140,6 +135,10 @@ public TermsSetQuery(Elastic.Clients.Elasticsearch.Field field)
 		Field = field;
 	}
 
+	internal TermsSetQuery()
+	{
+	}
+
 	/// <summary>
 	/// <para>
 	/// Floating point number used to decrease or increase the relevance scores of the query.
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/UntypedDecayFunction.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/UntypedDecayFunction.g.cs
index 0972c6b4a4a..15a0ec3c12c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/UntypedDecayFunction.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/UntypedDecayFunction.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,60 +28,51 @@
 
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
 
-internal sealed partial class UntypedDecayFunctionConverter : JsonConverter<UntypedDecayFunction>
+internal sealed partial class UntypedDecayFunctionConverter : System.Text.Json.Serialization.JsonConverter<UntypedDecayFunction>
 {
-	public override UntypedDecayFunction Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		var variant = new UntypedDecayFunction();
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
-		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
-			{
-				var property = reader.GetString();
-				if (property == "multi_value_mode")
-				{
-					variant.MultiValueMode = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.MultiValueMode?>(ref reader, options);
-					continue;
-				}
-
-				variant.Field = property;
-				reader.Read();
-				variant.Placement = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.DecayPlacement<object, object>>(ref reader, options);
-			}
-		}
-
-		return variant;
-	}
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropPlacement = System.Text.Json.JsonEncodedText.Encode("placement");
+	private static readonly System.Text.Json.JsonEncodedText PropMultiValueMode = System.Text.Json.JsonEncodedText.Encode("multi_value_mode");
 
-	public override void Write(Utf8JsonWriter writer, UntypedDecayFunction value, JsonSerializerOptions options)
+	public override UntypedDecayFunction Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		writer.WriteStartObject();
-		if (value.Field is not null && value.Placement is not null)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Field> propField = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.QueryDsl.DecayPlacement<object, object>> propPlacement = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.QueryDsl.MultiValueMode?> propMultiValueMode = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (!options.TryGetClientSettings(out var settings))
+			if (propMultiValueMode.TryRead(ref reader, options, PropMultiValueMode))
 			{
-				ThrowHelper.ThrowJsonExceptionForMissingSettings();
+				continue;
 			}
 
-			var propertyName = settings.Inferrer.Field(value.Field);
-			writer.WritePropertyName(propertyName);
-			JsonSerializer.Serialize(writer, value.Placement, options);
+			propField.Initialized = propPlacement.Initialized = true;
+			reader.ReadProperty(options, out propField.Value, out propPlacement.Value);
 		}
 
-		if (value.MultiValueMode is not null)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new UntypedDecayFunction
 		{
-			writer.WritePropertyName("multi_value_mode");
-			JsonSerializer.Serialize(writer, value.MultiValueMode, options);
-		}
+			Field = propField.Value
+,
+			Placement = propPlacement.Value
+,
+			MultiValueMode = propMultiValueMode.Value
+		};
+	}
 
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, UntypedDecayFunction value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropMultiValueMode, value.MultiValueMode);
+		writer.WriteProperty(options, value.Field, value.Placement);
 		writer.WriteEndObject();
 	}
 }
 
 [JsonConverter(typeof(UntypedDecayFunctionConverter))]
-public sealed partial class UntypedDecayFunction
+public sealed partial class UntypedDecayFunction : IDecayFunction
 {
 	public Elastic.Clients.Elasticsearch.Field Field { get; set; }
 
@@ -91,6 +83,8 @@ public sealed partial class UntypedDecayFunction
 	/// </summary>
 	public Elastic.Clients.Elasticsearch.QueryDsl.MultiValueMode? MultiValueMode { get; set; }
 	public Elastic.Clients.Elasticsearch.QueryDsl.DecayPlacement<object, object> Placement { get; set; }
+
+	public string Type => "untypeddecayfunction";
 }
 
 public sealed partial class UntypedDecayFunctionDescriptor<TDocument> : SerializableDescriptor<UntypedDecayFunctionDescriptor<TDocument>>
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/UntypedDistanceFeatureQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/UntypedDistanceFeatureQuery.g.cs
index 728ae35facf..9df04c7c815 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/UntypedDistanceFeatureQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/UntypedDistanceFeatureQuery.g.cs
@@ -27,7 +27,7 @@
 
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
 
-public sealed partial class UntypedDistanceFeatureQuery
+public sealed partial class UntypedDistanceFeatureQuery : IDistanceFeatureQuery
 {
 	/// <summary>
 	/// <para>
@@ -72,6 +72,9 @@ public sealed partial class UntypedDistanceFeatureQuery
 	public object Pivot { get; set; }
 	[JsonInclude, JsonPropertyName("_name")]
 	public string? QueryName { get; set; }
+
+	[JsonInclude, JsonPropertyName("")]
+	public string Type => "untypeddistancefeaturequery";
 }
 
 public sealed partial class UntypedDistanceFeatureQueryDescriptor<TDocument> : SerializableDescriptor<UntypedDistanceFeatureQueryDescriptor<TDocument>>
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/UntypedRangeQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/UntypedRangeQuery.g.cs
index 582463372a6..3b3359cc29f 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/UntypedRangeQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/UntypedRangeQuery.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,151 +28,135 @@
 
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
 
-internal sealed partial class UntypedRangeQueryConverter : JsonConverter<UntypedRangeQuery>
+internal sealed partial class UntypedRangeQueryConverter : System.Text.Json.Serialization.JsonConverter<UntypedRangeQuery>
 {
-	public override UntypedRangeQuery Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropFormat = System.Text.Json.JsonEncodedText.Encode("format");
+	private static readonly System.Text.Json.JsonEncodedText PropGt = System.Text.Json.JsonEncodedText.Encode("gt");
+	private static readonly System.Text.Json.JsonEncodedText PropGte = System.Text.Json.JsonEncodedText.Encode("gte");
+	private static readonly System.Text.Json.JsonEncodedText PropLt = System.Text.Json.JsonEncodedText.Encode("lt");
+	private static readonly System.Text.Json.JsonEncodedText PropLte = System.Text.Json.JsonEncodedText.Encode("lte");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryName = System.Text.Json.JsonEncodedText.Encode("_name");
+	private static readonly System.Text.Json.JsonEncodedText PropRelation = System.Text.Json.JsonEncodedText.Encode("relation");
+	private static readonly System.Text.Json.JsonEncodedText PropTimeZone = System.Text.Json.JsonEncodedText.Encode("time_zone");
+
+	public override UntypedRangeQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Field> propField = default;
 		reader.Read();
-		var fieldName = reader.GetString();
+		propField.Value = reader.ReadValue<Elastic.Clients.Elasticsearch.Field>(options);
+		propField.Initialized = true;
 		reader.Read();
-		var variant = new UntypedRangeQuery(fieldName);
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<float?> propBoost = default;
+		LocalJsonProperty<string?> propFormat = default;
+		LocalJsonProperty<object?> propGt = default;
+		LocalJsonProperty<object?> propGte = default;
+		LocalJsonProperty<object?> propLt = default;
+		LocalJsonProperty<object?> propLte = default;
+		LocalJsonProperty<string?> propQueryName = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.QueryDsl.RangeRelation?> propRelation = default;
+		LocalJsonProperty<string?> propTimeZone = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propBoost.TryRead(ref reader, options, PropBoost))
 			{
-				var property = reader.GetString();
-				if (property == "boost")
-				{
-					variant.Boost = JsonSerializer.Deserialize<float?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "format")
-				{
-					variant.Format = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "gt")
-				{
-					variant.Gt = JsonSerializer.Deserialize<object?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "gte")
-				{
-					variant.Gte = JsonSerializer.Deserialize<object?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "lt")
-				{
-					variant.Lt = JsonSerializer.Deserialize<object?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "lte")
-				{
-					variant.Lte = JsonSerializer.Deserialize<object?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "_name")
-				{
-					variant.QueryName = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "relation")
-				{
-					variant.Relation = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.RangeRelation?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "time_zone")
-				{
-					variant.TimeZone = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
+				continue;
 			}
-		}
 
-		reader.Read();
-		return variant;
-	}
+			if (propFormat.TryRead(ref reader, options, PropFormat))
+			{
+				continue;
+			}
 
-	public override void Write(Utf8JsonWriter writer, UntypedRangeQuery value, JsonSerializerOptions options)
-	{
-		if (value.Field is null)
-			throw new JsonException("Unable to serialize UntypedRangeQuery because the `Field` property is not set. Field name queries must include a valid field name.");
-		if (!options.TryGetClientSettings(out var settings))
-			throw new JsonException("Unable to retrieve client settings required to infer field.");
-		writer.WriteStartObject();
-		writer.WritePropertyName(settings.Inferrer.Field(value.Field));
-		writer.WriteStartObject();
-		if (value.Boost.HasValue)
-		{
-			writer.WritePropertyName("boost");
-			writer.WriteNumberValue(value.Boost.Value);
-		}
+			if (propGt.TryRead(ref reader, options, PropGt))
+			{
+				continue;
+			}
 
-		if (!string.IsNullOrEmpty(value.Format))
-		{
-			writer.WritePropertyName("format");
-			writer.WriteStringValue(value.Format);
-		}
+			if (propGte.TryRead(ref reader, options, PropGte))
+			{
+				continue;
+			}
 
-		if (value.Gt is not null)
-		{
-			writer.WritePropertyName("gt");
-			JsonSerializer.Serialize(writer, value.Gt, options);
-		}
+			if (propLt.TryRead(ref reader, options, PropLt))
+			{
+				continue;
+			}
 
-		if (value.Gte is not null)
-		{
-			writer.WritePropertyName("gte");
-			JsonSerializer.Serialize(writer, value.Gte, options);
-		}
+			if (propLte.TryRead(ref reader, options, PropLte))
+			{
+				continue;
+			}
 
-		if (value.Lt is not null)
-		{
-			writer.WritePropertyName("lt");
-			JsonSerializer.Serialize(writer, value.Lt, options);
-		}
+			if (propQueryName.TryRead(ref reader, options, PropQueryName))
+			{
+				continue;
+			}
 
-		if (value.Lte is not null)
-		{
-			writer.WritePropertyName("lte");
-			JsonSerializer.Serialize(writer, value.Lte, options);
-		}
+			if (propRelation.TryRead(ref reader, options, PropRelation))
+			{
+				continue;
+			}
 
-		if (!string.IsNullOrEmpty(value.QueryName))
-		{
-			writer.WritePropertyName("_name");
-			writer.WriteStringValue(value.QueryName);
-		}
+			if (propTimeZone.TryRead(ref reader, options, PropTimeZone))
+			{
+				continue;
+			}
 
-		if (value.Relation is not null)
-		{
-			writer.WritePropertyName("relation");
-			JsonSerializer.Serialize(writer, value.Relation, options);
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		if (!string.IsNullOrEmpty(value.TimeZone))
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		reader.Read();
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new UntypedRangeQuery
 		{
-			writer.WritePropertyName("time_zone");
-			writer.WriteStringValue(value.TimeZone);
-		}
+			Boost = propBoost.Value
+,
+			Field = propField.Value
+,
+			Format = propFormat.Value
+,
+			Gt = propGt.Value
+,
+			Gte = propGte.Value
+,
+			Lt = propLt.Value
+,
+			Lte = propLte.Value
+,
+			QueryName = propQueryName.Value
+,
+			Relation = propRelation.Value
+,
+			TimeZone = propTimeZone.Value
+		};
+	}
 
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, UntypedRangeQuery value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WritePropertyName(options, value.Field);
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropFormat, value.Format);
+		writer.WriteProperty(options, PropGt, value.Gt);
+		writer.WriteProperty(options, PropGte, value.Gte);
+		writer.WriteProperty(options, PropLt, value.Lt);
+		writer.WriteProperty(options, PropLte, value.Lte);
+		writer.WriteProperty(options, PropQueryName, value.QueryName);
+		writer.WriteProperty(options, PropRelation, value.Relation);
+		writer.WriteProperty(options, PropTimeZone, value.TimeZone);
 		writer.WriteEndObject();
 		writer.WriteEndObject();
 	}
 }
 
 [JsonConverter(typeof(UntypedRangeQueryConverter))]
-public sealed partial class UntypedRangeQuery
+public sealed partial class UntypedRangeQuery : IRangeQuery
 {
 	public UntypedRangeQuery(Elastic.Clients.Elasticsearch.Field field)
 	{
@@ -180,6 +165,10 @@ public UntypedRangeQuery(Elastic.Clients.Elasticsearch.Field field)
 		Field = field;
 	}
 
+	internal UntypedRangeQuery()
+	{
+	}
+
 	/// <summary>
 	/// <para>
 	/// Floating point number used to decrease or increase the relevance scores of the query.
@@ -240,6 +229,8 @@ public UntypedRangeQuery(Elastic.Clients.Elasticsearch.Field field)
 	/// </para>
 	/// </summary>
 	public string? TimeZone { get; set; }
+
+	public string Type => "untypedrangequery";
 }
 
 public sealed partial class UntypedRangeQueryDescriptor<TDocument> : SerializableDescriptor<UntypedRangeQueryDescriptor<TDocument>>
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 5b449de8d98..498461f19c0 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/WildcardQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/WildcardQuery.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,108 +28,105 @@
 
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
 
-internal sealed partial class WildcardQueryConverter : JsonConverter<WildcardQuery>
+internal sealed partial class WildcardQueryConverter : System.Text.Json.Serialization.JsonConverter<WildcardQuery>
 {
-	public override WildcardQuery Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropBoost = System.Text.Json.JsonEncodedText.Encode("boost");
+	private static readonly System.Text.Json.JsonEncodedText PropCaseInsensitive = System.Text.Json.JsonEncodedText.Encode("case_insensitive");
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropQueryName = System.Text.Json.JsonEncodedText.Encode("_name");
+	private static readonly System.Text.Json.JsonEncodedText PropRewrite = System.Text.Json.JsonEncodedText.Encode("rewrite");
+	private static readonly System.Text.Json.JsonEncodedText PropValue = System.Text.Json.JsonEncodedText.Encode("value");
+	private static readonly System.Text.Json.JsonEncodedText PropWildcard = System.Text.Json.JsonEncodedText.Encode("wildcard");
+
+	public override WildcardQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Field> propField = default;
 		reader.Read();
-		var fieldName = reader.GetString();
+		propField.Value = reader.ReadValue<Elastic.Clients.Elasticsearch.Field>(options);
+		propField.Initialized = true;
 		reader.Read();
-		var variant = new WildcardQuery(fieldName);
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		if (reader.TokenType is not System.Text.Json.JsonTokenType.StartObject)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			var value = reader.ReadValue<string?>(options);
+			reader.Read();
+			return new WildcardQuery { Value = value };
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<float?> propBoost = default;
+		LocalJsonProperty<bool?> propCaseInsensitive = default;
+		LocalJsonProperty<string?> propQueryName = default;
+		LocalJsonProperty<string?> propRewrite = default;
+		LocalJsonProperty<string?> propValue = default;
+		LocalJsonProperty<string?> propWildcard = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propBoost.TryRead(ref reader, options, PropBoost))
 			{
-				var property = reader.GetString();
-				if (property == "boost")
-				{
-					variant.Boost = JsonSerializer.Deserialize<float?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "case_insensitive")
-				{
-					variant.CaseInsensitive = JsonSerializer.Deserialize<bool?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "_name")
-				{
-					variant.QueryName = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "rewrite")
-				{
-					variant.Rewrite = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "value")
-				{
-					variant.Value = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "wildcard")
-				{
-					variant.Wildcard = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
+				continue;
 			}
-		}
 
-		reader.Read();
-		return variant;
-	}
+			if (propCaseInsensitive.TryRead(ref reader, options, PropCaseInsensitive))
+			{
+				continue;
+			}
 
-	public override void Write(Utf8JsonWriter writer, WildcardQuery value, JsonSerializerOptions options)
-	{
-		if (value.Field is null)
-			throw new JsonException("Unable to serialize WildcardQuery because the `Field` property is not set. Field name queries must include a valid field name.");
-		if (!options.TryGetClientSettings(out var settings))
-			throw new JsonException("Unable to retrieve client settings required to infer field.");
-		writer.WriteStartObject();
-		writer.WritePropertyName(settings.Inferrer.Field(value.Field));
-		writer.WriteStartObject();
-		if (value.Boost.HasValue)
-		{
-			writer.WritePropertyName("boost");
-			writer.WriteNumberValue(value.Boost.Value);
-		}
+			if (propQueryName.TryRead(ref reader, options, PropQueryName))
+			{
+				continue;
+			}
 
-		if (value.CaseInsensitive.HasValue)
-		{
-			writer.WritePropertyName("case_insensitive");
-			writer.WriteBooleanValue(value.CaseInsensitive.Value);
-		}
+			if (propRewrite.TryRead(ref reader, options, PropRewrite))
+			{
+				continue;
+			}
 
-		if (!string.IsNullOrEmpty(value.QueryName))
-		{
-			writer.WritePropertyName("_name");
-			writer.WriteStringValue(value.QueryName);
-		}
+			if (propValue.TryRead(ref reader, options, PropValue))
+			{
+				continue;
+			}
 
-		if (!string.IsNullOrEmpty(value.Rewrite))
-		{
-			writer.WritePropertyName("rewrite");
-			writer.WriteStringValue(value.Rewrite);
-		}
+			if (propWildcard.TryRead(ref reader, options, PropWildcard))
+			{
+				continue;
+			}
 
-		if (!string.IsNullOrEmpty(value.Value))
-		{
-			writer.WritePropertyName("value");
-			writer.WriteStringValue(value.Value);
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		if (!string.IsNullOrEmpty(value.Wildcard))
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		reader.Read();
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new WildcardQuery
 		{
-			writer.WritePropertyName("wildcard");
-			writer.WriteStringValue(value.Wildcard);
-		}
+			Boost = propBoost.Value
+,
+			CaseInsensitive = propCaseInsensitive.Value
+,
+			Field = propField.Value
+,
+			QueryName = propQueryName.Value
+,
+			Rewrite = propRewrite.Value
+,
+			Value = propValue.Value
+,
+			Wildcard = propWildcard.Value
+		};
+	}
 
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, WildcardQuery value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WritePropertyName(options, value.Field);
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropBoost, value.Boost);
+		writer.WriteProperty(options, PropCaseInsensitive, value.CaseInsensitive);
+		writer.WriteProperty(options, PropQueryName, value.QueryName);
+		writer.WriteProperty(options, PropRewrite, value.Rewrite);
+		writer.WriteProperty(options, PropValue, value.Value);
+		writer.WriteProperty(options, PropWildcard, value.Wildcard);
 		writer.WriteEndObject();
 		writer.WriteEndObject();
 	}
@@ -144,6 +142,10 @@ public WildcardQuery(Elastic.Clients.Elasticsearch.Field field)
 		Field = field;
 	}
 
+	internal WildcardQuery()
+	{
+	}
+
 	/// <summary>
 	/// <para>
 	/// Floating point number used to decrease or increase the relevance scores of the query.
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryRules/QueryRule.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryRules/QueryRule.g.cs
index 157ded6328a..13de8b33fa7 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryRules/QueryRule.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryRules/QueryRule.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,80 @@
 
 namespace Elastic.Clients.Elasticsearch.QueryRules;
 
+internal sealed partial class QueryRuleConverter : System.Text.Json.Serialization.JsonConverter<QueryRule>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropActions = System.Text.Json.JsonEncodedText.Encode("actions");
+	private static readonly System.Text.Json.JsonEncodedText PropCriteria = System.Text.Json.JsonEncodedText.Encode("criteria");
+	private static readonly System.Text.Json.JsonEncodedText PropPriority = System.Text.Json.JsonEncodedText.Encode("priority");
+	private static readonly System.Text.Json.JsonEncodedText PropRuleId = System.Text.Json.JsonEncodedText.Encode("rule_id");
+	private static readonly System.Text.Json.JsonEncodedText PropType = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override QueryRule Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.QueryRules.QueryRuleActions> propActions = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.QueryRules.QueryRuleCriteria>> propCriteria = default;
+		LocalJsonProperty<int?> propPriority = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Id> propRuleId = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.QueryRules.QueryRuleType> propType = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propActions.TryRead(ref reader, options, PropActions))
+			{
+				continue;
+			}
+
+			if (propCriteria.TryRead(ref reader, options, PropCriteria, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.QueryRules.QueryRuleCriteria>, Elastic.Clients.Elasticsearch.QueryRules.QueryRuleCriteria>)))
+			{
+				continue;
+			}
+
+			if (propPriority.TryRead(ref reader, options, PropPriority))
+			{
+				continue;
+			}
+
+			if (propRuleId.TryRead(ref reader, options, PropRuleId))
+			{
+				continue;
+			}
+
+			if (propType.TryRead(ref reader, options, PropType))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new QueryRule
+		{
+			Actions = propActions.Value
+,
+			Criteria = propCriteria.Value
+,
+			Priority = propPriority.Value
+,
+			RuleId = propRuleId.Value
+,
+			Type = propType.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, QueryRule value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropActions, value.Actions);
+		writer.WriteProperty(options, PropCriteria, value.Criteria, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.QueryRules.QueryRuleCriteria>, Elastic.Clients.Elasticsearch.QueryRules.QueryRuleCriteria>));
+		writer.WriteProperty(options, PropPriority, value.Priority);
+		writer.WriteProperty(options, PropRuleId, value.RuleId);
+		writer.WriteProperty(options, PropType, value.Type);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(QueryRuleConverter))]
 public sealed partial class QueryRule
 {
 	/// <summary>
@@ -35,7 +110,6 @@ public sealed partial class QueryRule
 	/// The format of this action depends on the rule type.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("actions")]
 	public Elastic.Clients.Elasticsearch.QueryRules.QueryRuleActions Actions { get; set; }
 
 	/// <summary>
@@ -44,10 +118,7 @@ public sealed partial class QueryRule
 	/// If multiple criteria are specified for a rule, all criteria must be met for the rule to be applied.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("criteria")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.QueryRules.QueryRuleCriteria))]
 	public ICollection<Elastic.Clients.Elasticsearch.QueryRules.QueryRuleCriteria> Criteria { get; set; }
-	[JsonInclude, JsonPropertyName("priority")]
 	public int? Priority { get; set; }
 
 	/// <summary>
@@ -55,7 +126,6 @@ public sealed partial class QueryRule
 	/// A unique identifier for the rule.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("rule_id")]
 	public Elastic.Clients.Elasticsearch.Id RuleId { get; set; }
 
 	/// <summary>
@@ -65,7 +135,6 @@ public sealed partial class QueryRule
 	/// <c>exclude</c> will exclude specific documents from search results.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("type")]
 	public Elastic.Clients.Elasticsearch.QueryRules.QueryRuleType Type { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryVectorBuilder.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryVectorBuilder.g.cs
index 77354d637e6..1a94ebb2ed1 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryVectorBuilder.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryVectorBuilder.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -39,12 +40,16 @@ internal QueryVectorBuilder(string variantName, object variant)
 			throw new ArgumentNullException(nameof(variant));
 		if (string.IsNullOrWhiteSpace(variantName))
 			throw new ArgumentException("Variant name must not be empty or whitespace.");
-		VariantName = variantName;
+		VariantType = variantName;
 		Variant = variant;
 	}
 
-	internal object Variant { get; }
-	internal string VariantName { get; }
+	internal QueryVectorBuilder()
+	{
+	}
+
+	public object Variant { get; internal set; }
+	public string VariantType { get; internal set; }
 
 	public static QueryVectorBuilder TextEmbedding(Elastic.Clients.Elasticsearch.TextEmbedding textEmbedding) => new QueryVectorBuilder("text_embedding", textEmbedding);
 
@@ -61,57 +66,44 @@ public bool TryGet<T>([NotNullWhen(true)] out T? result) where T : class
 	}
 }
 
-internal sealed partial class QueryVectorBuilderConverter : JsonConverter<QueryVectorBuilder>
+internal sealed partial class QueryVectorBuilderConverter : System.Text.Json.Serialization.JsonConverter<QueryVectorBuilder>
 {
-	public override QueryVectorBuilder Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-		{
-			throw new JsonException("Expected start token.");
-		}
+	private static readonly System.Text.Json.JsonEncodedText VariantTextEmbedding = System.Text.Json.JsonEncodedText.Encode("text_embedding");
 
-		object? variantValue = default;
-		string? variantNameValue = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+	public override QueryVectorBuilder Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		var variantType = string.Empty;
+		object? variant = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
+			if (reader.ValueTextEquals(VariantTextEmbedding))
 			{
-				throw new JsonException("Expected a property name token.");
-			}
-
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token representing the name of an Elasticsearch field.");
-			}
-
-			var propertyName = reader.GetString();
-			reader.Read();
-			if (propertyName == "text_embedding")
-			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.TextEmbedding?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantTextEmbedding.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.TextEmbedding?>(options);
 				continue;
 			}
 
-			throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'QueryVectorBuilder' from the response.");
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		var result = new QueryVectorBuilder(variantNameValue, variantValue);
-		return result;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new QueryVectorBuilder { VariantType = variantType, Variant = variant };
 	}
 
-	public override void Write(Utf8JsonWriter writer, QueryVectorBuilder value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, QueryVectorBuilder value, System.Text.Json.JsonSerializerOptions options)
 	{
 		writer.WriteStartObject();
-		if (value.VariantName is not null && value.Variant is not null)
+		switch (value.VariantType)
 		{
-			writer.WritePropertyName(value.VariantName);
-			switch (value.VariantName)
-			{
-				case "text_embedding":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.TextEmbedding>(writer, (Elastic.Clients.Elasticsearch.TextEmbedding)value.Variant, options);
-					break;
-			}
+			case "":
+				break;
+			case "text_embedding":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.TextEmbedding?)value.Variant);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.VariantType}' is not supported for type '{nameof(QueryVectorBuilder)}'.");
 		}
 
 		writer.WriteEndObject();
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/RRFRetriever.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/RRFRetriever.g.cs
index 62c90d43295..64970237156 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/RRFRetriever.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/RRFRetriever.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,80 @@
 
 namespace Elastic.Clients.Elasticsearch;
 
+internal sealed partial class RRFRetrieverConverter : System.Text.Json.Serialization.JsonConverter<RRFRetriever>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropFilter = System.Text.Json.JsonEncodedText.Encode("filter");
+	private static readonly System.Text.Json.JsonEncodedText PropMinScore = System.Text.Json.JsonEncodedText.Encode("min_score");
+	private static readonly System.Text.Json.JsonEncodedText PropRankConstant = System.Text.Json.JsonEncodedText.Encode("rank_constant");
+	private static readonly System.Text.Json.JsonEncodedText PropRankWindowSize = System.Text.Json.JsonEncodedText.Encode("rank_window_size");
+	private static readonly System.Text.Json.JsonEncodedText PropRetrievers = System.Text.Json.JsonEncodedText.Encode("retrievers");
+
+	public override RRFRetriever Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.QueryDsl.Query>?> propFilter = default;
+		LocalJsonProperty<float?> propMinScore = default;
+		LocalJsonProperty<int?> propRankConstant = default;
+		LocalJsonProperty<int?> propRankWindowSize = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Retriever>> propRetrievers = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propFilter.TryRead(ref reader, options, PropFilter, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.QueryDsl.Query>?, Elastic.Clients.Elasticsearch.QueryDsl.Query>)))
+			{
+				continue;
+			}
+
+			if (propMinScore.TryRead(ref reader, options, PropMinScore))
+			{
+				continue;
+			}
+
+			if (propRankConstant.TryRead(ref reader, options, PropRankConstant))
+			{
+				continue;
+			}
+
+			if (propRankWindowSize.TryRead(ref reader, options, PropRankWindowSize))
+			{
+				continue;
+			}
+
+			if (propRetrievers.TryRead(ref reader, options, PropRetrievers))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new RRFRetriever
+		{
+			Filter = propFilter.Value
+,
+			MinScore = propMinScore.Value
+,
+			RankConstant = propRankConstant.Value
+,
+			RankWindowSize = propRankWindowSize.Value
+,
+			Retrievers = propRetrievers.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, RRFRetriever value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropFilter, value.Filter, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.QueryDsl.Query>?, Elastic.Clients.Elasticsearch.QueryDsl.Query>));
+		writer.WriteProperty(options, PropMinScore, value.MinScore);
+		writer.WriteProperty(options, PropRankConstant, value.RankConstant);
+		writer.WriteProperty(options, PropRankWindowSize, value.RankWindowSize);
+		writer.WriteProperty(options, PropRetrievers, value.Retrievers);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(RRFRetrieverConverter))]
 public sealed partial class RRFRetriever
 {
 	/// <summary>
@@ -34,8 +109,6 @@ public sealed partial class RRFRetriever
 	/// Query to filter the documents that can match.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("filter")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.QueryDsl.Query))]
 	public ICollection<Elastic.Clients.Elasticsearch.QueryDsl.Query>? Filter { get; set; }
 
 	/// <summary>
@@ -43,7 +116,6 @@ public sealed partial class RRFRetriever
 	/// Minimum _score for matching documents. Documents with a lower _score are not included in the top documents.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("min_score")]
 	public float? MinScore { get; set; }
 
 	/// <summary>
@@ -51,7 +123,6 @@ public sealed partial class RRFRetriever
 	/// This value determines how much influence documents in individual result sets per query have over the final ranked result set.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("rank_constant")]
 	public int? RankConstant { get; set; }
 
 	/// <summary>
@@ -59,7 +130,6 @@ public sealed partial class RRFRetriever
 	/// This value determines the size of the individual result sets per query.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("rank_window_size")]
 	public int? RankWindowSize { get; set; }
 
 	/// <summary>
@@ -67,7 +137,6 @@ public sealed partial class RRFRetriever
 	/// A list of child retrievers to specify which sets of returned top documents will have the RRF formula applied to them.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("retrievers")]
 	public ICollection<Elastic.Clients.Elasticsearch.Retriever> Retrievers { get; set; }
 
 	public static implicit operator Elastic.Clients.Elasticsearch.Retriever(RRFRetriever rRFRetriever) => Elastic.Clients.Elasticsearch.Retriever.Rrf(rRFRetriever);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Rank.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Rank.g.cs
index 272931dfaa7..95ae4b4620c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Rank.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Rank.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -39,12 +40,16 @@ internal Rank(string variantName, object variant)
 			throw new ArgumentNullException(nameof(variant));
 		if (string.IsNullOrWhiteSpace(variantName))
 			throw new ArgumentException("Variant name must not be empty or whitespace.");
-		VariantName = variantName;
+		VariantType = variantName;
 		Variant = variant;
 	}
 
-	internal object Variant { get; }
-	internal string VariantName { get; }
+	internal Rank()
+	{
+	}
+
+	public object Variant { get; internal set; }
+	public string VariantType { get; internal set; }
 
 	public static Rank Rrf(Elastic.Clients.Elasticsearch.RrfRank rrfRank) => new Rank("rrf", rrfRank);
 
@@ -61,57 +66,44 @@ public bool TryGet<T>([NotNullWhen(true)] out T? result) where T : class
 	}
 }
 
-internal sealed partial class RankConverter : JsonConverter<Rank>
+internal sealed partial class RankConverter : System.Text.Json.Serialization.JsonConverter<Rank>
 {
-	public override Rank Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-		{
-			throw new JsonException("Expected start token.");
-		}
+	private static readonly System.Text.Json.JsonEncodedText VariantRrf = System.Text.Json.JsonEncodedText.Encode("rrf");
 
-		object? variantValue = default;
-		string? variantNameValue = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+	public override Rank Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		var variantType = string.Empty;
+		object? variant = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
+			if (reader.ValueTextEquals(VariantRrf))
 			{
-				throw new JsonException("Expected a property name token.");
-			}
-
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token representing the name of an Elasticsearch field.");
-			}
-
-			var propertyName = reader.GetString();
-			reader.Read();
-			if (propertyName == "rrf")
-			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.RrfRank?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantRrf.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.RrfRank?>(options);
 				continue;
 			}
 
-			throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'Rank' from the response.");
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		var result = new Rank(variantNameValue, variantValue);
-		return result;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new Rank { VariantType = variantType, Variant = variant };
 	}
 
-	public override void Write(Utf8JsonWriter writer, Rank value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, Rank value, System.Text.Json.JsonSerializerOptions options)
 	{
 		writer.WriteStartObject();
-		if (value.VariantName is not null && value.Variant is not null)
+		switch (value.VariantType)
 		{
-			writer.WritePropertyName(value.VariantName);
-			switch (value.VariantName)
-			{
-				case "rrf":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.RrfRank>(writer, (Elastic.Clients.Elasticsearch.RrfRank)value.Variant, options);
-					break;
-			}
+			case "":
+				break;
+			case "rrf":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.RrfRank?)value.Variant);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.VariantType}' is not supported for type '{nameof(Rank)}'.");
 		}
 
 		writer.WriteEndObject();
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Retriever.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Retriever.g.cs
index 5a79a236a6a..31da5003392 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Retriever.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Retriever.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -39,12 +40,16 @@ internal Retriever(string variantName, object variant)
 			throw new ArgumentNullException(nameof(variant));
 		if (string.IsNullOrWhiteSpace(variantName))
 			throw new ArgumentException("Variant name must not be empty or whitespace.");
-		VariantName = variantName;
+		VariantType = variantName;
 		Variant = variant;
 	}
 
-	internal object Variant { get; }
-	internal string VariantName { get; }
+	internal Retriever()
+	{
+	}
+
+	public object Variant { get; internal set; }
+	public string VariantType { get; internal set; }
 
 	public static Retriever Knn(Elastic.Clients.Elasticsearch.KnnRetriever knnRetriever) => new Retriever("knn", knnRetriever);
 	public static Retriever Rrf(Elastic.Clients.Elasticsearch.RRFRetriever rRFRetriever) => new Retriever("rrf", rRFRetriever);
@@ -65,97 +70,92 @@ public bool TryGet<T>([NotNullWhen(true)] out T? result) where T : class
 	}
 }
 
-internal sealed partial class RetrieverConverter : JsonConverter<Retriever>
+internal sealed partial class RetrieverConverter : System.Text.Json.Serialization.JsonConverter<Retriever>
 {
-	public override Retriever Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-		{
-			throw new JsonException("Expected start token.");
-		}
+	private static readonly System.Text.Json.JsonEncodedText VariantKnn = System.Text.Json.JsonEncodedText.Encode("knn");
+	private static readonly System.Text.Json.JsonEncodedText VariantRrf = System.Text.Json.JsonEncodedText.Encode("rrf");
+	private static readonly System.Text.Json.JsonEncodedText VariantRule = System.Text.Json.JsonEncodedText.Encode("rule");
+	private static readonly System.Text.Json.JsonEncodedText VariantStandard = System.Text.Json.JsonEncodedText.Encode("standard");
+	private static readonly System.Text.Json.JsonEncodedText VariantTextSimilarityReranker = System.Text.Json.JsonEncodedText.Encode("text_similarity_reranker");
 
-		object? variantValue = default;
-		string? variantNameValue = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+	public override Retriever Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		var variantType = string.Empty;
+		object? variant = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
+			if (reader.ValueTextEquals(VariantKnn))
 			{
-				throw new JsonException("Expected a property name token.");
-			}
-
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token representing the name of an Elasticsearch field.");
-			}
-
-			var propertyName = reader.GetString();
-			reader.Read();
-			if (propertyName == "knn")
-			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.KnnRetriever?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantKnn.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.KnnRetriever?>(options);
 				continue;
 			}
 
-			if (propertyName == "rrf")
+			if (reader.ValueTextEquals(VariantRrf))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.RRFRetriever?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantRrf.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.RRFRetriever?>(options);
 				continue;
 			}
 
-			if (propertyName == "rule")
+			if (reader.ValueTextEquals(VariantRule))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.RuleRetriever?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantRule.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.RuleRetriever?>(options);
 				continue;
 			}
 
-			if (propertyName == "standard")
+			if (reader.ValueTextEquals(VariantStandard))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.StandardRetriever?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantStandard.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.StandardRetriever?>(options);
 				continue;
 			}
 
-			if (propertyName == "text_similarity_reranker")
+			if (reader.ValueTextEquals(VariantTextSimilarityReranker))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.TextSimilarityReranker?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantTextSimilarityReranker.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.TextSimilarityReranker?>(options);
 				continue;
 			}
 
-			throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'Retriever' from the response.");
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		var result = new Retriever(variantNameValue, variantValue);
-		return result;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new Retriever { VariantType = variantType, Variant = variant };
 	}
 
-	public override void Write(Utf8JsonWriter writer, Retriever value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, Retriever value, System.Text.Json.JsonSerializerOptions options)
 	{
 		writer.WriteStartObject();
-		if (value.VariantName is not null && value.Variant is not null)
+		switch (value.VariantType)
 		{
-			writer.WritePropertyName(value.VariantName);
-			switch (value.VariantName)
-			{
-				case "knn":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.KnnRetriever>(writer, (Elastic.Clients.Elasticsearch.KnnRetriever)value.Variant, options);
-					break;
-				case "rrf":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.RRFRetriever>(writer, (Elastic.Clients.Elasticsearch.RRFRetriever)value.Variant, options);
-					break;
-				case "rule":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.RuleRetriever>(writer, (Elastic.Clients.Elasticsearch.RuleRetriever)value.Variant, options);
-					break;
-				case "standard":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.StandardRetriever>(writer, (Elastic.Clients.Elasticsearch.StandardRetriever)value.Variant, options);
-					break;
-				case "text_similarity_reranker":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.TextSimilarityReranker>(writer, (Elastic.Clients.Elasticsearch.TextSimilarityReranker)value.Variant, options);
-					break;
-			}
+			case "":
+				break;
+			case "knn":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.KnnRetriever?)value.Variant);
+				break;
+			case "rrf":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.RRFRetriever?)value.Variant);
+				break;
+			case "rule":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.RuleRetriever?)value.Variant);
+				break;
+			case "standard":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.StandardRetriever?)value.Variant);
+				break;
+			case "text_similarity_reranker":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.TextSimilarityReranker?)value.Variant);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.VariantType}' is not supported for type '{nameof(Retriever)}'.");
 		}
 
 		writer.WriteEndObject();
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Rollup/HistogramGrouping.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Rollup/HistogramGrouping.g.cs
index 01f81c216af..c8ec3d2f5ac 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Rollup/HistogramGrouping.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Rollup/HistogramGrouping.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,50 @@
 
 namespace Elastic.Clients.Elasticsearch.Rollup;
 
+internal sealed partial class HistogramGroupingConverter : System.Text.Json.Serialization.JsonConverter<HistogramGrouping>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+	private static readonly System.Text.Json.JsonEncodedText PropInterval = System.Text.Json.JsonEncodedText.Encode("interval");
+
+	public override HistogramGrouping Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Fields> propFields = default;
+		LocalJsonProperty<long> propInterval = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propFields.TryRead(ref reader, options, PropFields, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propInterval.TryRead(ref reader, options, PropInterval))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new HistogramGrouping
+		{
+			Fields = propFields.Value
+,
+			Interval = propInterval.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, HistogramGrouping value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropFields, value.Fields, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropInterval, value.Interval);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(HistogramGroupingConverter))]
 public sealed partial class HistogramGrouping
 {
 	/// <summary>
@@ -36,8 +81,6 @@ public sealed partial class HistogramGrouping
 	/// Order does not matter.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("fields")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Fields Fields { get; set; }
 
 	/// <summary>
@@ -47,7 +90,6 @@ public sealed partial class HistogramGrouping
 	/// Note that only one interval can be specified in the histogram group, meaning that all fields being grouped via the histogram must share the same interval.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("interval")]
 	public long Interval { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Rollup/RollupCapabilitySummary.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Rollup/RollupCapabilitySummary.g.cs
index 45fffa5a070..f55d20afab7 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Rollup/RollupCapabilitySummary.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Rollup/RollupCapabilitySummary.g.cs
@@ -30,7 +30,6 @@ namespace Elastic.Clients.Elasticsearch.Rollup;
 public sealed partial class RollupCapabilitySummary
 {
 	[JsonInclude, JsonPropertyName("fields")]
-	[ReadOnlyFieldDictionaryConverter(typeof(IReadOnlyCollection<Elastic.Clients.Elasticsearch.Rollup.RollupFieldSummary>))]
 	public IReadOnlyDictionary<Elastic.Clients.Elasticsearch.Field, IReadOnlyCollection<Elastic.Clients.Elasticsearch.Rollup.RollupFieldSummary>> Fields { get; init; }
 	[JsonInclude, JsonPropertyName("index_pattern")]
 	public string IndexPattern { get; init; }
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Rollup/RollupJobSummary.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Rollup/RollupJobSummary.g.cs
index a015ca60a97..26a49395779 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Rollup/RollupJobSummary.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Rollup/RollupJobSummary.g.cs
@@ -30,7 +30,6 @@ namespace Elastic.Clients.Elasticsearch.Rollup;
 public sealed partial class RollupJobSummary
 {
 	[JsonInclude, JsonPropertyName("fields")]
-	[ReadOnlyFieldDictionaryConverter(typeof(IReadOnlyCollection<Elastic.Clients.Elasticsearch.Rollup.RollupJobSummaryField>))]
 	public IReadOnlyDictionary<Elastic.Clients.Elasticsearch.Field, IReadOnlyCollection<Elastic.Clients.Elasticsearch.Rollup.RollupJobSummaryField>> Fields { get; init; }
 	[JsonInclude, JsonPropertyName("index_pattern")]
 	public string IndexPattern { get; init; }
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Rollup/TermsGrouping.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Rollup/TermsGrouping.g.cs
index 5a0659a009a..5e1672a302e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Rollup/TermsGrouping.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Rollup/TermsGrouping.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,40 @@
 
 namespace Elastic.Clients.Elasticsearch.Rollup;
 
+internal sealed partial class TermsGroupingConverter : System.Text.Json.Serialization.JsonConverter<TermsGrouping>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropFields = System.Text.Json.JsonEncodedText.Encode("fields");
+
+	public override TermsGrouping Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Fields> propFields = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propFields.TryRead(ref reader, options, PropFields, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new TermsGrouping
+		{
+			Fields = propFields.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, TermsGrouping value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropFields, value.Fields, typeof(SingleOrManyFieldsMarker));
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(TermsGroupingConverter))]
 public sealed partial class TermsGrouping
 {
 	/// <summary>
@@ -36,8 +71,6 @@ public sealed partial class TermsGrouping
 	/// Order does not matter.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("fields")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Fields Fields { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/RuleRetriever.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/RuleRetriever.g.cs
index 34346cfb0ce..4ae7a71d848 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/RuleRetriever.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/RuleRetriever.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,90 @@
 
 namespace Elastic.Clients.Elasticsearch;
 
+internal sealed partial class RuleRetrieverConverter : System.Text.Json.Serialization.JsonConverter<RuleRetriever>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropFilter = System.Text.Json.JsonEncodedText.Encode("filter");
+	private static readonly System.Text.Json.JsonEncodedText PropMatchCriteria = System.Text.Json.JsonEncodedText.Encode("match_criteria");
+	private static readonly System.Text.Json.JsonEncodedText PropMinScore = System.Text.Json.JsonEncodedText.Encode("min_score");
+	private static readonly System.Text.Json.JsonEncodedText PropRankWindowSize = System.Text.Json.JsonEncodedText.Encode("rank_window_size");
+	private static readonly System.Text.Json.JsonEncodedText PropRetriever = System.Text.Json.JsonEncodedText.Encode("retriever");
+	private static readonly System.Text.Json.JsonEncodedText PropRulesetIds = System.Text.Json.JsonEncodedText.Encode("ruleset_ids");
+
+	public override RuleRetriever Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.QueryDsl.Query>?> propFilter = default;
+		LocalJsonProperty<object> propMatchCriteria = default;
+		LocalJsonProperty<float?> propMinScore = default;
+		LocalJsonProperty<int?> propRankWindowSize = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Retriever> propRetriever = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Id>> propRulesetIds = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propFilter.TryRead(ref reader, options, PropFilter, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.QueryDsl.Query>?, Elastic.Clients.Elasticsearch.QueryDsl.Query>)))
+			{
+				continue;
+			}
+
+			if (propMatchCriteria.TryRead(ref reader, options, PropMatchCriteria))
+			{
+				continue;
+			}
+
+			if (propMinScore.TryRead(ref reader, options, PropMinScore))
+			{
+				continue;
+			}
+
+			if (propRankWindowSize.TryRead(ref reader, options, PropRankWindowSize))
+			{
+				continue;
+			}
+
+			if (propRetriever.TryRead(ref reader, options, PropRetriever))
+			{
+				continue;
+			}
+
+			if (propRulesetIds.TryRead(ref reader, options, PropRulesetIds))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new RuleRetriever
+		{
+			Filter = propFilter.Value
+,
+			MatchCriteria = propMatchCriteria.Value
+,
+			MinScore = propMinScore.Value
+,
+			RankWindowSize = propRankWindowSize.Value
+,
+			Retriever = propRetriever.Value
+,
+			RulesetIds = propRulesetIds.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, RuleRetriever value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropFilter, value.Filter, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.QueryDsl.Query>?, Elastic.Clients.Elasticsearch.QueryDsl.Query>));
+		writer.WriteProperty(options, PropMatchCriteria, value.MatchCriteria);
+		writer.WriteProperty(options, PropMinScore, value.MinScore);
+		writer.WriteProperty(options, PropRankWindowSize, value.RankWindowSize);
+		writer.WriteProperty(options, PropRetriever, value.Retriever);
+		writer.WriteProperty(options, PropRulesetIds, value.RulesetIds);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(RuleRetrieverConverter))]
 public sealed partial class RuleRetriever
 {
 	/// <summary>
@@ -34,8 +119,6 @@ public sealed partial class RuleRetriever
 	/// Query to filter the documents that can match.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("filter")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.QueryDsl.Query))]
 	public ICollection<Elastic.Clients.Elasticsearch.QueryDsl.Query>? Filter { get; set; }
 
 	/// <summary>
@@ -43,7 +126,6 @@ public sealed partial class RuleRetriever
 	/// The match criteria that will determine if a rule in the provided rulesets should be applied.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("match_criteria")]
 	public object MatchCriteria { get; set; }
 
 	/// <summary>
@@ -51,7 +133,6 @@ public sealed partial class RuleRetriever
 	/// Minimum _score for matching documents. Documents with a lower _score are not included in the top documents.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("min_score")]
 	public float? MinScore { get; set; }
 
 	/// <summary>
@@ -59,7 +140,6 @@ public sealed partial class RuleRetriever
 	/// This value determines the size of the individual result set.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("rank_window_size")]
 	public int? RankWindowSize { get; set; }
 
 	/// <summary>
@@ -67,7 +147,6 @@ public sealed partial class RuleRetriever
 	/// The retriever whose results rules should be applied to.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("retriever")]
 	public Elastic.Clients.Elasticsearch.Retriever Retriever { get; set; }
 
 	/// <summary>
@@ -75,7 +154,6 @@ public sealed partial class RuleRetriever
 	/// The ruleset IDs containing the rules this retriever is evaluating against.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("ruleset_ids")]
 	public ICollection<Elastic.Clients.Elasticsearch.Id> RulesetIds { get; set; }
 
 	public static implicit operator Elastic.Clients.Elasticsearch.Retriever(RuleRetriever ruleRetriever) => Elastic.Clients.Elasticsearch.Retriever.Rule(ruleRetriever);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Script.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Script.g.cs
index bb90104b52e..d9c894862ce 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Script.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Script.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,86 @@
 
 namespace Elastic.Clients.Elasticsearch;
 
+internal sealed partial class ScriptConverter : System.Text.Json.Serialization.JsonConverter<Script>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("id");
+	private static readonly System.Text.Json.JsonEncodedText PropLang = System.Text.Json.JsonEncodedText.Encode("lang");
+	private static readonly System.Text.Json.JsonEncodedText PropOptions = System.Text.Json.JsonEncodedText.Encode("options");
+	private static readonly System.Text.Json.JsonEncodedText PropParams = System.Text.Json.JsonEncodedText.Encode("params");
+	private static readonly System.Text.Json.JsonEncodedText PropSource = System.Text.Json.JsonEncodedText.Encode("source");
+
+	public override Script Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		if (reader.TokenType is not System.Text.Json.JsonTokenType.StartObject)
+		{
+			var value = reader.ReadValue<string?>(options);
+			return new Script { Source = value };
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Id?> propId = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.ScriptLanguage?> propLang = default;
+		LocalJsonProperty<IDictionary<string, string>?> propOptions = default;
+		LocalJsonProperty<IDictionary<string, object>?> propParams = default;
+		LocalJsonProperty<string?> propSource = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propId.TryRead(ref reader, options, PropId))
+			{
+				continue;
+			}
+
+			if (propLang.TryRead(ref reader, options, PropLang))
+			{
+				continue;
+			}
+
+			if (propOptions.TryRead(ref reader, options, PropOptions))
+			{
+				continue;
+			}
+
+			if (propParams.TryRead(ref reader, options, PropParams))
+			{
+				continue;
+			}
+
+			if (propSource.TryRead(ref reader, options, PropSource))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new Script
+		{
+			Id = propId.Value
+,
+			Lang = propLang.Value
+,
+			Options = propOptions.Value
+,
+			Params = propParams.Value
+,
+			Source = propSource.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, Script value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropId, value.Id);
+		writer.WriteProperty(options, PropLang, value.Lang);
+		writer.WriteProperty(options, PropOptions, value.Options);
+		writer.WriteProperty(options, PropParams, value.Params);
+		writer.WriteProperty(options, PropSource, value.Source);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ScriptConverter))]
 public sealed partial class Script
 {
 	/// <summary>
@@ -34,7 +115,6 @@ public sealed partial class Script
 	/// The <c>id</c> for a stored script.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("id")]
 	public Elastic.Clients.Elasticsearch.Id? Id { get; set; }
 
 	/// <summary>
@@ -42,9 +122,7 @@ public sealed partial class Script
 	/// Specifies the language the script is written in.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("lang")]
 	public Elastic.Clients.Elasticsearch.ScriptLanguage? Lang { get; set; }
-	[JsonInclude, JsonPropertyName("options")]
 	public IDictionary<string, string>? Options { get; set; }
 
 	/// <summary>
@@ -53,7 +131,6 @@ public sealed partial class Script
 	/// Use parameters instead of hard-coded values to decrease compile time.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("params")]
 	public IDictionary<string, object>? Params { get; set; }
 
 	/// <summary>
@@ -61,7 +138,6 @@ public sealed partial class Script
 	/// The script source.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("source")]
 	public string? Source { get; set; }
 
 	public static implicit operator Elastic.Clients.Elasticsearch.QueryDsl.IntervalsFilter(Script script) => Elastic.Clients.Elasticsearch.QueryDsl.IntervalsFilter.Script(script);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/SearchableSnapshots/MountedSnapshot.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/SearchableSnapshots/MountedSnapshot.g.cs
index 09a36fd71df..6cfc5555241 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/SearchableSnapshots/MountedSnapshot.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/SearchableSnapshots/MountedSnapshot.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,13 +28,63 @@
 
 namespace Elastic.Clients.Elasticsearch.SearchableSnapshots;
 
+internal sealed partial class MountedSnapshotConverter : System.Text.Json.Serialization.JsonConverter<MountedSnapshot>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropIndices = System.Text.Json.JsonEncodedText.Encode("indices");
+	private static readonly System.Text.Json.JsonEncodedText PropShards = System.Text.Json.JsonEncodedText.Encode("shards");
+	private static readonly System.Text.Json.JsonEncodedText PropSnapshot = System.Text.Json.JsonEncodedText.Encode("snapshot");
+
+	public override MountedSnapshot Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<string>> propIndices = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.ShardStatistics> propShards = default;
+		LocalJsonProperty<string> propSnapshot = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propIndices.TryRead(ref reader, options, PropIndices, typeof(SingleOrManyMarker<IReadOnlyCollection<string>, string>)))
+			{
+				continue;
+			}
+
+			if (propShards.TryRead(ref reader, options, PropShards))
+			{
+				continue;
+			}
+
+			if (propSnapshot.TryRead(ref reader, options, PropSnapshot))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new MountedSnapshot
+		{
+			Indices = propIndices.Value
+,
+			Shards = propShards.Value
+,
+			Snapshot = propSnapshot.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, MountedSnapshot value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropIndices, value.Indices, typeof(SingleOrManyMarker<IReadOnlyCollection<string>, string>));
+		writer.WriteProperty(options, PropShards, value.Shards);
+		writer.WriteProperty(options, PropSnapshot, value.Snapshot);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(MountedSnapshotConverter))]
 public sealed partial class MountedSnapshot
 {
-	[JsonInclude, JsonPropertyName("indices")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public IReadOnlyCollection<string> Indices { get; init; }
-	[JsonInclude, JsonPropertyName("shards")]
 	public Elastic.Clients.Elasticsearch.ShardStatistics Shards { get; init; }
-	[JsonInclude, JsonPropertyName("snapshot")]
 	public string Snapshot { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Security/ApiKeyAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Security/ApiKeyAggregation.g.cs
index 89c73ae7bc7..371c2b916f6 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Security/ApiKeyAggregation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Security/ApiKeyAggregation.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -39,12 +40,16 @@ internal ApiKeyAggregation(string variantName, object variant)
 			throw new ArgumentNullException(nameof(variant));
 		if (string.IsNullOrWhiteSpace(variantName))
 			throw new ArgumentException("Variant name must not be empty or whitespace.");
-		VariantName = variantName;
+		VariantType = variantName;
 		Variant = variant;
 	}
 
-	internal object Variant { get; }
-	internal string VariantName { get; }
+	internal ApiKeyAggregation()
+	{
+	}
+
+	public object Variant { get; internal set; }
+	public string VariantType { get; internal set; }
 
 	public static ApiKeyAggregation Cardinality(Elastic.Clients.Elasticsearch.Aggregations.CardinalityAggregation cardinalityAggregation) => new ApiKeyAggregation("cardinality", cardinalityAggregation);
 	public static ApiKeyAggregation Composite(Elastic.Clients.Elasticsearch.Aggregations.CompositeAggregation compositeAggregation) => new ApiKeyAggregation("composite", compositeAggregation);
@@ -80,167 +85,166 @@ public bool TryGet<T>([NotNullWhen(true)] out T? result) where T : class
 	}
 }
 
-internal sealed partial class ApiKeyAggregationConverter : JsonConverter<ApiKeyAggregation>
+internal sealed partial class ApiKeyAggregationConverter : System.Text.Json.Serialization.JsonConverter<ApiKeyAggregation>
 {
-	public override ApiKeyAggregation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations1 = System.Text.Json.JsonEncodedText.Encode("aggs");
+	private static readonly System.Text.Json.JsonEncodedText PropMeta = System.Text.Json.JsonEncodedText.Encode("meta");
+	private static readonly System.Text.Json.JsonEncodedText VariantCardinality = System.Text.Json.JsonEncodedText.Encode("cardinality");
+	private static readonly System.Text.Json.JsonEncodedText VariantComposite = System.Text.Json.JsonEncodedText.Encode("composite");
+	private static readonly System.Text.Json.JsonEncodedText VariantDateRange = System.Text.Json.JsonEncodedText.Encode("date_range");
+	private static readonly System.Text.Json.JsonEncodedText VariantFilter = System.Text.Json.JsonEncodedText.Encode("filter");
+	private static readonly System.Text.Json.JsonEncodedText VariantFilters = System.Text.Json.JsonEncodedText.Encode("filters");
+	private static readonly System.Text.Json.JsonEncodedText VariantMissing = System.Text.Json.JsonEncodedText.Encode("missing");
+	private static readonly System.Text.Json.JsonEncodedText VariantRange = System.Text.Json.JsonEncodedText.Encode("range");
+	private static readonly System.Text.Json.JsonEncodedText VariantTerms = System.Text.Json.JsonEncodedText.Encode("terms");
+	private static readonly System.Text.Json.JsonEncodedText VariantValueCount = System.Text.Json.JsonEncodedText.Encode("value_count");
+
+	public override ApiKeyAggregation Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-		{
-			throw new JsonException("Expected start token.");
-		}
-
-		object? variantValue = default;
-		string? variantNameValue = default;
-		IDictionary<string, Elastic.Clients.Elasticsearch.Security.ApiKeyAggregation>? aggregationsValue = default;
-		IDictionary<string, object>? metaValue = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IDictionary<string, Elastic.Clients.Elasticsearch.Security.ApiKeyAggregation>?> propAggregations = default;
+		LocalJsonProperty<IDictionary<string, object>?> propMeta = default;
+		var variantType = string.Empty;
+		object? variant = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token.");
-			}
-
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token representing the name of an Elasticsearch field.");
-			}
-
-			var propertyName = reader.GetString();
-			reader.Read();
-			if (propertyName == "aggregations")
+			if (propAggregations.TryRead(ref reader, options, PropAggregations) || propAggregations.TryRead(ref reader, options, PropAggregations1))
 			{
-				aggregationsValue = JsonSerializer.Deserialize<IDictionary<string, Elastic.Clients.Elasticsearch.Security.ApiKeyAggregation>?>(ref reader, options);
 				continue;
 			}
 
-			if (propertyName == "meta")
+			if (propMeta.TryRead(ref reader, options, PropMeta))
 			{
-				metaValue = JsonSerializer.Deserialize<IDictionary<string, object>?>(ref reader, options);
 				continue;
 			}
 
-			if (propertyName == "cardinality")
+			if (reader.ValueTextEquals(VariantCardinality))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.CardinalityAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantCardinality.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.CardinalityAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "composite")
+			if (reader.ValueTextEquals(VariantComposite))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.CompositeAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantComposite.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.CompositeAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "date_range")
+			if (reader.ValueTextEquals(VariantDateRange))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.DateRangeAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantDateRange.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.DateRangeAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "filter")
+			if (reader.ValueTextEquals(VariantFilter))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Security.ApiKeyQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantFilter.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Security.ApiKeyQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "filters")
+			if (reader.ValueTextEquals(VariantFilters))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Security.ApiKeyFiltersAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantFilters.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Security.ApiKeyFiltersAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "missing")
+			if (reader.ValueTextEquals(VariantMissing))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.MissingAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantMissing.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.MissingAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "range")
+			if (reader.ValueTextEquals(VariantRange))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.RangeAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantRange.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.RangeAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "terms")
+			if (reader.ValueTextEquals(VariantTerms))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.TermsAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantTerms.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.TermsAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "value_count")
+			if (reader.ValueTextEquals(VariantValueCount))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.ValueCountAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantValueCount.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.ValueCountAggregation?>(options);
 				continue;
 			}
 
-			throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'ApiKeyAggregation' from the response.");
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		var result = new ApiKeyAggregation(variantNameValue, variantValue);
-		result.Aggregations = aggregationsValue;
-		result.Meta = metaValue;
-		return result;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ApiKeyAggregation
+		{
+			VariantType = variantType,
+			Variant = variant,
+			Aggregations = propAggregations.Value
+	,
+			Meta = propMeta.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, ApiKeyAggregation value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ApiKeyAggregation value, System.Text.Json.JsonSerializerOptions options)
 	{
 		writer.WriteStartObject();
-		if (value.Aggregations is not null)
-		{
-			writer.WritePropertyName("aggregations");
-			JsonSerializer.Serialize(writer, value.Aggregations, options);
-		}
-
-		if (value.Meta is not null)
+		switch (value.VariantType)
 		{
-			writer.WritePropertyName("meta");
-			JsonSerializer.Serialize(writer, value.Meta, options);
-		}
-
-		if (value.VariantName is not null && value.Variant is not null)
-		{
-			writer.WritePropertyName(value.VariantName);
-			switch (value.VariantName)
-			{
-				case "cardinality":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.CardinalityAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.CardinalityAggregation)value.Variant, options);
-					break;
-				case "composite":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.CompositeAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.CompositeAggregation)value.Variant, options);
-					break;
-				case "date_range":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.DateRangeAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.DateRangeAggregation)value.Variant, options);
-					break;
-				case "filter":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Security.ApiKeyQuery>(writer, (Elastic.Clients.Elasticsearch.Security.ApiKeyQuery)value.Variant, options);
-					break;
-				case "filters":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Security.ApiKeyFiltersAggregation>(writer, (Elastic.Clients.Elasticsearch.Security.ApiKeyFiltersAggregation)value.Variant, options);
-					break;
-				case "missing":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.MissingAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.MissingAggregation)value.Variant, options);
-					break;
-				case "range":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.RangeAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.RangeAggregation)value.Variant, options);
-					break;
-				case "terms":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.TermsAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.TermsAggregation)value.Variant, options);
-					break;
-				case "value_count":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.ValueCountAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.ValueCountAggregation)value.Variant, options);
-					break;
-			}
+			case "":
+				break;
+			case "cardinality":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.CardinalityAggregation?)value.Variant);
+				break;
+			case "composite":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.CompositeAggregation?)value.Variant);
+				break;
+			case "date_range":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.DateRangeAggregation?)value.Variant);
+				break;
+			case "filter":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Security.ApiKeyQuery?)value.Variant);
+				break;
+			case "filters":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Security.ApiKeyFiltersAggregation?)value.Variant);
+				break;
+			case "missing":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.MissingAggregation?)value.Variant);
+				break;
+			case "range":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.RangeAggregation?)value.Variant);
+				break;
+			case "terms":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.TermsAggregation?)value.Variant);
+				break;
+			case "value_count":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.ValueCountAggregation?)value.Variant);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.VariantType}' is not supported for type '{nameof(ApiKeyAggregation)}'.");
 		}
 
+		writer.WriteProperty(options, PropAggregations, value.Aggregations);
+		writer.WriteProperty(options, PropMeta, value.Meta);
 		writer.WriteEndObject();
 	}
 }
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Security/ApiKeyQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Security/ApiKeyQuery.g.cs
index c84a6c7b2b8..96faa7ccb40 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Security/ApiKeyQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Security/ApiKeyQuery.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -39,12 +40,16 @@ internal ApiKeyQuery(string variantName, object variant)
 			throw new ArgumentNullException(nameof(variant));
 		if (string.IsNullOrWhiteSpace(variantName))
 			throw new ArgumentException("Variant name must not be empty or whitespace.");
-		VariantName = variantName;
+		VariantType = variantName;
 		Variant = variant;
 	}
 
-	internal object Variant { get; }
-	internal string VariantName { get; }
+	internal ApiKeyQuery()
+	{
+	}
+
+	public object Variant { get; internal set; }
+	public string VariantType { get; internal set; }
 
 	public static ApiKeyQuery Bool(Elastic.Clients.Elasticsearch.QueryDsl.BoolQuery boolQuery) => new ApiKeyQuery("bool", boolQuery);
 	public static ApiKeyQuery Exists(Elastic.Clients.Elasticsearch.QueryDsl.ExistsQuery existsQuery) => new ApiKeyQuery("exists", existsQuery);
@@ -52,6 +57,7 @@ internal ApiKeyQuery(string variantName, object variant)
 	public static ApiKeyQuery Match(Elastic.Clients.Elasticsearch.QueryDsl.MatchQuery matchQuery) => new ApiKeyQuery("match", matchQuery);
 	public static ApiKeyQuery MatchAll(Elastic.Clients.Elasticsearch.QueryDsl.MatchAllQuery matchAllQuery) => new ApiKeyQuery("match_all", matchAllQuery);
 	public static ApiKeyQuery Prefix(Elastic.Clients.Elasticsearch.QueryDsl.PrefixQuery prefixQuery) => new ApiKeyQuery("prefix", prefixQuery);
+	public static ApiKeyQuery Range(Elastic.Clients.Elasticsearch.QueryDsl.IRangeQuery rangeQuery) => new ApiKeyQuery("range", rangeQuery);
 	public static ApiKeyQuery Range(Elastic.Clients.Elasticsearch.QueryDsl.UntypedRangeQuery rangeQuery) => new ApiKeyQuery("range", rangeQuery);
 	public static ApiKeyQuery Range(Elastic.Clients.Elasticsearch.QueryDsl.DateRangeQuery rangeQuery) => new ApiKeyQuery("range", rangeQuery);
 	public static ApiKeyQuery Range(Elastic.Clients.Elasticsearch.QueryDsl.NumberRangeQuery rangeQuery) => new ApiKeyQuery("range", rangeQuery);
@@ -74,157 +80,164 @@ public bool TryGet<T>([NotNullWhen(true)] out T? result) where T : class
 	}
 }
 
-internal sealed partial class ApiKeyQueryConverter : JsonConverter<ApiKeyQuery>
+internal sealed partial class ApiKeyQueryConverter : System.Text.Json.Serialization.JsonConverter<ApiKeyQuery>
 {
-	public override ApiKeyQuery Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText VariantBool = System.Text.Json.JsonEncodedText.Encode("bool");
+	private static readonly System.Text.Json.JsonEncodedText VariantExists = System.Text.Json.JsonEncodedText.Encode("exists");
+	private static readonly System.Text.Json.JsonEncodedText VariantIds = System.Text.Json.JsonEncodedText.Encode("ids");
+	private static readonly System.Text.Json.JsonEncodedText VariantMatch = System.Text.Json.JsonEncodedText.Encode("match");
+	private static readonly System.Text.Json.JsonEncodedText VariantMatchAll = System.Text.Json.JsonEncodedText.Encode("match_all");
+	private static readonly System.Text.Json.JsonEncodedText VariantPrefix = System.Text.Json.JsonEncodedText.Encode("prefix");
+	private static readonly System.Text.Json.JsonEncodedText VariantRange = System.Text.Json.JsonEncodedText.Encode("range");
+	private static readonly System.Text.Json.JsonEncodedText VariantSimpleQueryString = System.Text.Json.JsonEncodedText.Encode("simple_query_string");
+	private static readonly System.Text.Json.JsonEncodedText VariantTerm = System.Text.Json.JsonEncodedText.Encode("term");
+	private static readonly System.Text.Json.JsonEncodedText VariantTerms = System.Text.Json.JsonEncodedText.Encode("terms");
+	private static readonly System.Text.Json.JsonEncodedText VariantWildcard = System.Text.Json.JsonEncodedText.Encode("wildcard");
+
+	public override ApiKeyQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		var variantType = string.Empty;
+		object? variant = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			throw new JsonException("Expected start token.");
-		}
-
-		object? variantValue = default;
-		string? variantNameValue = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
-		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token.");
-			}
-
-			if (reader.TokenType != JsonTokenType.PropertyName)
+			if (reader.ValueTextEquals(VariantBool))
 			{
-				throw new JsonException("Expected a property name token representing the name of an Elasticsearch field.");
-			}
-
-			var propertyName = reader.GetString();
-			reader.Read();
-			if (propertyName == "bool")
-			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.BoolQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantBool.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.BoolQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "exists")
+			if (reader.ValueTextEquals(VariantExists))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.ExistsQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantExists.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.ExistsQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "ids")
+			if (reader.ValueTextEquals(VariantIds))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.IdsQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantIds.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.IdsQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "match")
+			if (reader.ValueTextEquals(VariantMatch))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.MatchQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantMatch.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.MatchQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "match_all")
+			if (reader.ValueTextEquals(VariantMatchAll))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.MatchAllQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantMatchAll.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.MatchAllQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "prefix")
+			if (reader.ValueTextEquals(VariantPrefix))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.PrefixQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantPrefix.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.PrefixQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "range")
+			if (reader.ValueTextEquals(VariantRange))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.UntypedRangeQuery>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantRange.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.IRangeQuery>(options);
 				continue;
 			}
 
-			if (propertyName == "simple_query_string")
+			if (reader.ValueTextEquals(VariantSimpleQueryString))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.SimpleQueryStringQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantSimpleQueryString.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.SimpleQueryStringQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "term")
+			if (reader.ValueTextEquals(VariantTerm))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.TermQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantTerm.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.TermQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "terms")
+			if (reader.ValueTextEquals(VariantTerms))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.TermsQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantTerms.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.TermsQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "wildcard")
+			if (reader.ValueTextEquals(VariantWildcard))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.WildcardQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantWildcard.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.WildcardQuery?>(options);
 				continue;
 			}
 
-			throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'ApiKeyQuery' from the response.");
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		var result = new ApiKeyQuery(variantNameValue, variantValue);
-		return result;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ApiKeyQuery { VariantType = variantType, Variant = variant };
 	}
 
-	public override void Write(Utf8JsonWriter writer, ApiKeyQuery value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ApiKeyQuery value, System.Text.Json.JsonSerializerOptions options)
 	{
 		writer.WriteStartObject();
-		if (value.VariantName is not null && value.Variant is not null)
+		switch (value.VariantType)
 		{
-			writer.WritePropertyName(value.VariantName);
-			switch (value.VariantName)
-			{
-				case "bool":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.BoolQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.BoolQuery)value.Variant, options);
-					break;
-				case "exists":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.ExistsQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.ExistsQuery)value.Variant, options);
-					break;
-				case "ids":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.IdsQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.IdsQuery)value.Variant, options);
-					break;
-				case "match":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.MatchQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.MatchQuery)value.Variant, options);
-					break;
-				case "match_all":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.MatchAllQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.MatchAllQuery)value.Variant, options);
-					break;
-				case "prefix":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.PrefixQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.PrefixQuery)value.Variant, options);
-					break;
-				case "range":
-					JsonSerializer.Serialize(writer, value.Variant, value.Variant.GetType(), options);
-					break;
-				case "simple_query_string":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.SimpleQueryStringQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.SimpleQueryStringQuery)value.Variant, options);
-					break;
-				case "term":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.TermQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.TermQuery)value.Variant, options);
-					break;
-				case "terms":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.TermsQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.TermsQuery)value.Variant, options);
-					break;
-				case "wildcard":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.WildcardQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.WildcardQuery)value.Variant, options);
-					break;
-			}
+			case "":
+				break;
+			case "bool":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.BoolQuery?)value.Variant);
+				break;
+			case "exists":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.ExistsQuery?)value.Variant);
+				break;
+			case "ids":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.IdsQuery?)value.Variant);
+				break;
+			case "match":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.MatchQuery?)value.Variant);
+				break;
+			case "match_all":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.MatchAllQuery?)value.Variant);
+				break;
+			case "prefix":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.PrefixQuery?)value.Variant);
+				break;
+			case "range":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.IRangeQuery)value.Variant);
+				break;
+			case "simple_query_string":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.SimpleQueryStringQuery?)value.Variant);
+				break;
+			case "term":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.TermQuery?)value.Variant);
+				break;
+			case "terms":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.TermsQuery?)value.Variant);
+				break;
+			case "wildcard":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.WildcardQuery?)value.Variant);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.VariantType}' is not supported for type '{nameof(ApiKeyQuery)}'.");
 		}
 
 		writer.WriteEndObject();
@@ -274,6 +287,7 @@ private ApiKeyQueryDescriptor<TDocument> Set(object variant, string variantName)
 	public ApiKeyQueryDescriptor<TDocument> MatchAll(Action<Elastic.Clients.Elasticsearch.QueryDsl.MatchAllQueryDescriptor> configure) => Set(configure, "match_all");
 	public ApiKeyQueryDescriptor<TDocument> Prefix(Elastic.Clients.Elasticsearch.QueryDsl.PrefixQuery prefixQuery) => Set(prefixQuery, "prefix");
 	public ApiKeyQueryDescriptor<TDocument> Prefix(Action<Elastic.Clients.Elasticsearch.QueryDsl.PrefixQueryDescriptor<TDocument>> configure) => Set(configure, "prefix");
+	public ApiKeyQueryDescriptor<TDocument> Range(Elastic.Clients.Elasticsearch.QueryDsl.IRangeQuery rangeQuery) => Set(rangeQuery, "range");
 	public ApiKeyQueryDescriptor<TDocument> Range(Elastic.Clients.Elasticsearch.QueryDsl.UntypedRangeQuery rangeQuery) => Set(rangeQuery, "range");
 	public ApiKeyQueryDescriptor<TDocument> Range(Elastic.Clients.Elasticsearch.QueryDsl.DateRangeQuery rangeQuery) => Set(rangeQuery, "range");
 	public ApiKeyQueryDescriptor<TDocument> Range(Elastic.Clients.Elasticsearch.QueryDsl.NumberRangeQuery rangeQuery) => Set(rangeQuery, "range");
@@ -350,6 +364,7 @@ private ApiKeyQueryDescriptor Set(object variant, string variantName)
 	public ApiKeyQueryDescriptor MatchAll(Action<Elastic.Clients.Elasticsearch.QueryDsl.MatchAllQueryDescriptor> configure) => Set(configure, "match_all");
 	public ApiKeyQueryDescriptor Prefix(Elastic.Clients.Elasticsearch.QueryDsl.PrefixQuery prefixQuery) => Set(prefixQuery, "prefix");
 	public ApiKeyQueryDescriptor Prefix<TDocument>(Action<Elastic.Clients.Elasticsearch.QueryDsl.PrefixQueryDescriptor> configure) => Set(configure, "prefix");
+	public ApiKeyQueryDescriptor Range(Elastic.Clients.Elasticsearch.QueryDsl.IRangeQuery rangeQuery) => Set(rangeQuery, "range");
 	public ApiKeyQueryDescriptor Range(Elastic.Clients.Elasticsearch.QueryDsl.UntypedRangeQuery rangeQuery) => Set(rangeQuery, "range");
 	public ApiKeyQueryDescriptor Range(Elastic.Clients.Elasticsearch.QueryDsl.DateRangeQuery rangeQuery) => Set(rangeQuery, "range");
 	public ApiKeyQueryDescriptor Range(Elastic.Clients.Elasticsearch.QueryDsl.NumberRangeQuery rangeQuery) => Set(rangeQuery, "range");
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Security/FieldRule.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Security/FieldRule.g.cs
index 60f44e7e5eb..4c75d25454c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Security/FieldRule.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Security/FieldRule.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -39,12 +40,16 @@ internal FieldRule(string variantName, object variant)
 			throw new ArgumentNullException(nameof(variant));
 		if (string.IsNullOrWhiteSpace(variantName))
 			throw new ArgumentException("Variant name must not be empty or whitespace.");
-		VariantName = variantName;
+		VariantType = variantName;
 		Variant = variant;
 	}
 
-	internal object Variant { get; }
-	internal string VariantName { get; }
+	internal FieldRule()
+	{
+	}
+
+	public object Variant { get; internal set; }
+	public string VariantType { get; internal set; }
 
 	public static FieldRule Dn(Elastic.Clients.Elasticsearch.Names names) => new FieldRule("dn", names);
 	public static FieldRule Groups(Elastic.Clients.Elasticsearch.Names names) => new FieldRule("groups", names);
@@ -63,77 +68,68 @@ public bool TryGet<T>([NotNullWhen(true)] out T? result) where T : class
 	}
 }
 
-internal sealed partial class FieldRuleConverter : JsonConverter<FieldRule>
+internal sealed partial class FieldRuleConverter : System.Text.Json.Serialization.JsonConverter<FieldRule>
 {
-	public override FieldRule Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-		{
-			throw new JsonException("Expected start token.");
-		}
+	private static readonly System.Text.Json.JsonEncodedText VariantDn = System.Text.Json.JsonEncodedText.Encode("dn");
+	private static readonly System.Text.Json.JsonEncodedText VariantGroups = System.Text.Json.JsonEncodedText.Encode("groups");
+	private static readonly System.Text.Json.JsonEncodedText VariantUsername = System.Text.Json.JsonEncodedText.Encode("username");
 
-		object? variantValue = default;
-		string? variantNameValue = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+	public override FieldRule Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		var variantType = string.Empty;
+		object? variant = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
+			if (reader.ValueTextEquals(VariantDn))
 			{
-				throw new JsonException("Expected a property name token.");
-			}
-
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token representing the name of an Elasticsearch field.");
-			}
-
-			var propertyName = reader.GetString();
-			reader.Read();
-			if (propertyName == "dn")
-			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Names?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantDn.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Names?>(options);
 				continue;
 			}
 
-			if (propertyName == "groups")
+			if (reader.ValueTextEquals(VariantGroups))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Names?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantGroups.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Names?>(options);
 				continue;
 			}
 
-			if (propertyName == "username")
+			if (reader.ValueTextEquals(VariantUsername))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Names?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantUsername.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Names?>(options);
 				continue;
 			}
 
-			throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'FieldRule' from the response.");
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		var result = new FieldRule(variantNameValue, variantValue);
-		return result;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new FieldRule { VariantType = variantType, Variant = variant };
 	}
 
-	public override void Write(Utf8JsonWriter writer, FieldRule value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, FieldRule value, System.Text.Json.JsonSerializerOptions options)
 	{
 		writer.WriteStartObject();
-		if (value.VariantName is not null && value.Variant is not null)
+		switch (value.VariantType)
 		{
-			writer.WritePropertyName(value.VariantName);
-			switch (value.VariantName)
-			{
-				case "dn":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Names>(writer, (Elastic.Clients.Elasticsearch.Names)value.Variant, options);
-					break;
-				case "groups":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Names>(writer, (Elastic.Clients.Elasticsearch.Names)value.Variant, options);
-					break;
-				case "username":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Names>(writer, (Elastic.Clients.Elasticsearch.Names)value.Variant, options);
-					break;
-			}
+			case "":
+				break;
+			case "dn":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Names?)value.Variant);
+				break;
+			case "groups":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Names?)value.Variant);
+				break;
+			case "username":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Names?)value.Variant);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.VariantType}' is not supported for type '{nameof(FieldRule)}'.");
 		}
 
 		writer.WriteEndObject();
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Security/FieldSecurity.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Security/FieldSecurity.g.cs
index 0876eb525c9..94b4a5f8aef 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Security/FieldSecurity.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Security/FieldSecurity.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,13 +28,53 @@
 
 namespace Elastic.Clients.Elasticsearch.Security;
 
+internal sealed partial class FieldSecurityConverter : System.Text.Json.Serialization.JsonConverter<FieldSecurity>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropExcept = System.Text.Json.JsonEncodedText.Encode("except");
+	private static readonly System.Text.Json.JsonEncodedText PropGrant = System.Text.Json.JsonEncodedText.Encode("grant");
+
+	public override FieldSecurity Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Fields?> propExcept = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Fields?> propGrant = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propExcept.TryRead(ref reader, options, PropExcept, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			if (propGrant.TryRead(ref reader, options, PropGrant, typeof(SingleOrManyFieldsMarker)))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new FieldSecurity
+		{
+			Except = propExcept.Value
+,
+			Grant = propGrant.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, FieldSecurity value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropExcept, value.Except, typeof(SingleOrManyFieldsMarker));
+		writer.WriteProperty(options, PropGrant, value.Grant, typeof(SingleOrManyFieldsMarker));
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(FieldSecurityConverter))]
 public sealed partial class FieldSecurity
 {
-	[JsonInclude, JsonPropertyName("except")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Fields? Except { get; set; }
-	[JsonInclude, JsonPropertyName("grant")]
-	[JsonConverter(typeof(SingleOrManyFieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Fields? Grant { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Security/GrantApiKey.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Security/GrantApiKey.g.cs
index 1014fb194b1..b9b493427e5 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Security/GrantApiKey.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Security/GrantApiKey.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,70 @@
 
 namespace Elastic.Clients.Elasticsearch.Security;
 
+internal sealed partial class GrantApiKeyConverter : System.Text.Json.Serialization.JsonConverter<GrantApiKey>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropExpiration = System.Text.Json.JsonEncodedText.Encode("expiration");
+	private static readonly System.Text.Json.JsonEncodedText PropMetadata = System.Text.Json.JsonEncodedText.Encode("metadata");
+	private static readonly System.Text.Json.JsonEncodedText PropName = System.Text.Json.JsonEncodedText.Encode("name");
+	private static readonly System.Text.Json.JsonEncodedText PropRoleDescriptors = System.Text.Json.JsonEncodedText.Encode("role_descriptors");
+
+	public override GrantApiKey Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string?> propExpiration = default;
+		LocalJsonProperty<IDictionary<string, object>?> propMetadata = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Name> propName = default;
+		LocalJsonProperty<ICollection<IDictionary<string, Elastic.Clients.Elasticsearch.Security.RoleDescriptor>>?> propRoleDescriptors = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propExpiration.TryRead(ref reader, options, PropExpiration))
+			{
+				continue;
+			}
+
+			if (propMetadata.TryRead(ref reader, options, PropMetadata))
+			{
+				continue;
+			}
+
+			if (propName.TryRead(ref reader, options, PropName))
+			{
+				continue;
+			}
+
+			if (propRoleDescriptors.TryRead(ref reader, options, PropRoleDescriptors, typeof(SingleOrManyMarker<IReadOnlyCollection<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Security.RoleDescriptor>>?, IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Security.RoleDescriptor>>)))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new GrantApiKey
+		{
+			Expiration = propExpiration.Value
+,
+			Metadata = propMetadata.Value
+,
+			Name = propName.Value
+,
+			RoleDescriptors = propRoleDescriptors.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, GrantApiKey value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropExpiration, value.Expiration);
+		writer.WriteProperty(options, PropMetadata, value.Metadata);
+		writer.WriteProperty(options, PropName, value.Name);
+		writer.WriteProperty(options, PropRoleDescriptors, value.RoleDescriptors, typeof(SingleOrManyMarker<IReadOnlyCollection<IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Security.RoleDescriptor>>?, IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Security.RoleDescriptor>>));
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(GrantApiKeyConverter))]
 public sealed partial class GrantApiKey
 {
 	/// <summary>
@@ -34,7 +99,6 @@ public sealed partial class GrantApiKey
 	/// Expiration time for the API key. By default, API keys never expire.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("expiration")]
 	public string? Expiration { get; set; }
 
 	/// <summary>
@@ -44,9 +108,7 @@ public sealed partial class GrantApiKey
 	/// Within the <c>metadata</c> object, keys beginning with <c>_</c> are reserved for system usage.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("metadata")]
 	public IDictionary<string, object>? Metadata { get; set; }
-	[JsonInclude, JsonPropertyName("name")]
 	public Elastic.Clients.Elasticsearch.Name Name { get; set; }
 
 	/// <summary>
@@ -57,8 +119,6 @@ public sealed partial class GrantApiKey
 	/// If you supply role descriptors, the resultant permissions are an intersection of API keys permissions and the permissions of the user or access token.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("role_descriptors")]
-	[SingleOrManyCollectionConverter(typeof(IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Security.RoleDescriptor>))]
 	public ICollection<IDictionary<string, Elastic.Clients.Elasticsearch.Security.RoleDescriptor>>? RoleDescriptors { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Security/IndicesPrivileges.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Security/IndicesPrivileges.g.cs
index 3be8e4dec8a..a550f16609c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Security/IndicesPrivileges.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Security/IndicesPrivileges.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,80 @@
 
 namespace Elastic.Clients.Elasticsearch.Security;
 
+internal sealed partial class IndicesPrivilegesConverter : System.Text.Json.Serialization.JsonConverter<IndicesPrivileges>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAllowRestrictedIndices = System.Text.Json.JsonEncodedText.Encode("allow_restricted_indices");
+	private static readonly System.Text.Json.JsonEncodedText PropFieldSecurity = System.Text.Json.JsonEncodedText.Encode("field_security");
+	private static readonly System.Text.Json.JsonEncodedText PropNames = System.Text.Json.JsonEncodedText.Encode("names");
+	private static readonly System.Text.Json.JsonEncodedText PropPrivileges = System.Text.Json.JsonEncodedText.Encode("privileges");
+	private static readonly System.Text.Json.JsonEncodedText PropQuery = System.Text.Json.JsonEncodedText.Encode("query");
+
+	public override IndicesPrivileges Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool?> propAllowRestrictedIndices = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Security.FieldSecurity?> propFieldSecurity = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.IndexName>> propNames = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Security.IndexPrivilege>> propPrivileges = default;
+		LocalJsonProperty<object?> propQuery = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAllowRestrictedIndices.TryRead(ref reader, options, PropAllowRestrictedIndices))
+			{
+				continue;
+			}
+
+			if (propFieldSecurity.TryRead(ref reader, options, PropFieldSecurity))
+			{
+				continue;
+			}
+
+			if (propNames.TryRead(ref reader, options, PropNames, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.IndexName>, Elastic.Clients.Elasticsearch.IndexName>)))
+			{
+				continue;
+			}
+
+			if (propPrivileges.TryRead(ref reader, options, PropPrivileges))
+			{
+				continue;
+			}
+
+			if (propQuery.TryRead(ref reader, options, PropQuery))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new IndicesPrivileges
+		{
+			AllowRestrictedIndices = propAllowRestrictedIndices.Value
+,
+			FieldSecurity = propFieldSecurity.Value
+,
+			Names = propNames.Value
+,
+			Privileges = propPrivileges.Value
+,
+			Query = propQuery.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IndicesPrivileges value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAllowRestrictedIndices, value.AllowRestrictedIndices);
+		writer.WriteProperty(options, PropFieldSecurity, value.FieldSecurity);
+		writer.WriteProperty(options, PropNames, value.Names, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.IndexName>, Elastic.Clients.Elasticsearch.IndexName>));
+		writer.WriteProperty(options, PropPrivileges, value.Privileges);
+		writer.WriteProperty(options, PropQuery, value.Query);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(IndicesPrivilegesConverter))]
 public sealed partial class IndicesPrivileges
 {
 	/// <summary>
@@ -34,7 +109,6 @@ public sealed partial class IndicesPrivileges
 	/// Set to <c>true</c> if using wildcard or regular expressions for patterns that cover restricted indices. Implicitly, restricted indices have limited privileges that can cause pattern tests to fail. If restricted indices are explicitly included in the <c>names</c> list, Elasticsearch checks privileges against these indices regardless of the value set for <c>allow_restricted_indices</c>.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("allow_restricted_indices")]
 	public bool? AllowRestrictedIndices { get; set; }
 
 	/// <summary>
@@ -42,7 +116,6 @@ public sealed partial class IndicesPrivileges
 	/// The document fields that the owners of the role have read access to.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("field_security")]
 	public Elastic.Clients.Elasticsearch.Security.FieldSecurity? FieldSecurity { get; set; }
 
 	/// <summary>
@@ -50,8 +123,6 @@ public sealed partial class IndicesPrivileges
 	/// A list of indices (or index name patterns) to which the permissions in this entry apply.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("names")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.IndexName))]
 	public ICollection<Elastic.Clients.Elasticsearch.IndexName> Names { get; set; }
 
 	/// <summary>
@@ -59,7 +130,6 @@ public sealed partial class IndicesPrivileges
 	/// The index level privileges that owners of the role have on the specified indices.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("privileges")]
 	public ICollection<Elastic.Clients.Elasticsearch.Security.IndexPrivilege> Privileges { get; set; }
 
 	/// <summary>
@@ -67,7 +137,6 @@ public sealed partial class IndicesPrivileges
 	/// A search query that defines the documents the owners of the role have access to. A document within the specified indices must match this query for it to be accessible by the owners of the role.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("query")]
 	public object? Query { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Security/QueryRole.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Security/QueryRole.g.cs
index e137275de92..6b7a1408141 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Security/QueryRole.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Security/QueryRole.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,116 +28,157 @@
 
 namespace Elastic.Clients.Elasticsearch.Security;
 
-internal sealed partial class QueryRoleConverter : JsonConverter<QueryRole>
+internal sealed partial class QueryRoleConverter : System.Text.Json.Serialization.JsonConverter<QueryRole>
 {
-	public override QueryRole Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropApplications = System.Text.Json.JsonEncodedText.Encode("applications");
+	private static readonly System.Text.Json.JsonEncodedText PropCluster = System.Text.Json.JsonEncodedText.Encode("cluster");
+	private static readonly System.Text.Json.JsonEncodedText PropDescription = System.Text.Json.JsonEncodedText.Encode("description");
+	private static readonly System.Text.Json.JsonEncodedText PropGlobal = System.Text.Json.JsonEncodedText.Encode("global");
+	private static readonly System.Text.Json.JsonEncodedText PropIndices = System.Text.Json.JsonEncodedText.Encode("indices");
+	private static readonly System.Text.Json.JsonEncodedText PropIndices1 = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropMetadata = System.Text.Json.JsonEncodedText.Encode("metadata");
+	private static readonly System.Text.Json.JsonEncodedText PropName = System.Text.Json.JsonEncodedText.Encode("name");
+	private static readonly System.Text.Json.JsonEncodedText PropRemoteCluster = System.Text.Json.JsonEncodedText.Encode("remote_cluster");
+	private static readonly System.Text.Json.JsonEncodedText PropRemoteIndices = System.Text.Json.JsonEncodedText.Encode("remote_indices");
+	private static readonly System.Text.Json.JsonEncodedText PropRestriction = System.Text.Json.JsonEncodedText.Encode("restriction");
+	private static readonly System.Text.Json.JsonEncodedText PropRunAs = System.Text.Json.JsonEncodedText.Encode("run_as");
+	private static readonly System.Text.Json.JsonEncodedText PropSort = System.Text.Json.JsonEncodedText.Encode("_sort");
+	private static readonly System.Text.Json.JsonEncodedText PropTransientMetadata = System.Text.Json.JsonEncodedText.Encode("transient_metadata");
+
+	public override QueryRole Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		IReadOnlyCollection<Elastic.Clients.Elasticsearch.Security.ApplicationPrivileges>? applications = default;
-		IReadOnlyCollection<Elastic.Clients.Elasticsearch.Security.ClusterPrivilege>? cluster = default;
-		string? description = default;
-		IReadOnlyCollection<Elastic.Clients.Elasticsearch.Security.GlobalPrivilege>? global = default;
-		IReadOnlyCollection<Elastic.Clients.Elasticsearch.Security.IndicesPrivileges>? indices = default;
-		IReadOnlyDictionary<string, object>? metadata = default;
-		string name = default;
-		IReadOnlyCollection<Elastic.Clients.Elasticsearch.Security.RemoteClusterPrivileges>? remoteCluster = default;
-		IReadOnlyCollection<Elastic.Clients.Elasticsearch.Security.RemoteIndicesPrivileges>? remoteIndices = default;
-		Elastic.Clients.Elasticsearch.Security.Restriction? restriction = default;
-		IReadOnlyCollection<string>? runAs = default;
-		IReadOnlyCollection<Elastic.Clients.Elasticsearch.FieldValue>? sort = default;
-		IReadOnlyDictionary<string, object>? transientMetadata = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Security.ApplicationPrivileges>?> propApplications = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Security.ClusterPrivilege>?> propCluster = default;
+		LocalJsonProperty<string?> propDescription = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Security.GlobalPrivilege>?> propGlobal = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Security.IndicesPrivileges>?> propIndices = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, object>?> propMetadata = default;
+		LocalJsonProperty<string> propName = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Security.RemoteClusterPrivileges>?> propRemoteCluster = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Security.RemoteIndicesPrivileges>?> propRemoteIndices = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Security.Restriction?> propRestriction = default;
+		LocalJsonProperty<IReadOnlyCollection<string>?> propRunAs = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.FieldValue>?> propSort = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, object>?> propTransientMetadata = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propApplications.TryRead(ref reader, options, PropApplications))
+			{
+				continue;
+			}
+
+			if (propCluster.TryRead(ref reader, options, PropCluster))
+			{
+				continue;
+			}
+
+			if (propDescription.TryRead(ref reader, options, PropDescription))
+			{
+				continue;
+			}
+
+			if (propGlobal.TryRead(ref reader, options, PropGlobal, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Security.GlobalPrivilege>?, Elastic.Clients.Elasticsearch.Security.GlobalPrivilege>)))
 			{
-				var property = reader.GetString();
-				if (property == "applications")
-				{
-					applications = JsonSerializer.Deserialize<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Security.ApplicationPrivileges>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "cluster")
-				{
-					cluster = JsonSerializer.Deserialize<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Security.ClusterPrivilege>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "description")
-				{
-					description = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "global")
-				{
-					global = SingleOrManySerializationHelper.Deserialize<Elastic.Clients.Elasticsearch.Security.GlobalPrivilege>(ref reader, options);
-					continue;
-				}
-
-				if (property == "indices" || property == "index")
-				{
-					indices = JsonSerializer.Deserialize<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Security.IndicesPrivileges>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "metadata")
-				{
-					metadata = JsonSerializer.Deserialize<IReadOnlyDictionary<string, object>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "name")
-				{
-					name = JsonSerializer.Deserialize<string>(ref reader, options);
-					continue;
-				}
-
-				if (property == "remote_cluster")
-				{
-					remoteCluster = JsonSerializer.Deserialize<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Security.RemoteClusterPrivileges>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "remote_indices")
-				{
-					remoteIndices = JsonSerializer.Deserialize<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Security.RemoteIndicesPrivileges>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "restriction")
-				{
-					restriction = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Security.Restriction?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "run_as")
-				{
-					runAs = JsonSerializer.Deserialize<IReadOnlyCollection<string>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "_sort")
-				{
-					sort = JsonSerializer.Deserialize<IReadOnlyCollection<Elastic.Clients.Elasticsearch.FieldValue>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "transient_metadata")
-				{
-					transientMetadata = JsonSerializer.Deserialize<IReadOnlyDictionary<string, object>?>(ref reader, options);
-					continue;
-				}
+				continue;
 			}
+
+			if (propIndices.TryRead(ref reader, options, PropIndices) || propIndices.TryRead(ref reader, options, PropIndices1))
+			{
+				continue;
+			}
+
+			if (propMetadata.TryRead(ref reader, options, PropMetadata))
+			{
+				continue;
+			}
+
+			if (propName.TryRead(ref reader, options, PropName))
+			{
+				continue;
+			}
+
+			if (propRemoteCluster.TryRead(ref reader, options, PropRemoteCluster))
+			{
+				continue;
+			}
+
+			if (propRemoteIndices.TryRead(ref reader, options, PropRemoteIndices))
+			{
+				continue;
+			}
+
+			if (propRestriction.TryRead(ref reader, options, PropRestriction))
+			{
+				continue;
+			}
+
+			if (propRunAs.TryRead(ref reader, options, PropRunAs))
+			{
+				continue;
+			}
+
+			if (propSort.TryRead(ref reader, options, PropSort))
+			{
+				continue;
+			}
+
+			if (propTransientMetadata.TryRead(ref reader, options, PropTransientMetadata))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		return new QueryRole { Applications = applications, Cluster = cluster, Description = description, Global = global, Indices = indices, Metadata = metadata, Name = name, RemoteCluster = remoteCluster, RemoteIndices = remoteIndices, Restriction = restriction, RunAs = runAs, Sort = sort, TransientMetadata = transientMetadata };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new QueryRole
+		{
+			Applications = propApplications.Value
+,
+			Cluster = propCluster.Value
+,
+			Description = propDescription.Value
+,
+			Global = propGlobal.Value
+,
+			Indices = propIndices.Value
+,
+			Metadata = propMetadata.Value
+,
+			Name = propName.Value
+,
+			RemoteCluster = propRemoteCluster.Value
+,
+			RemoteIndices = propRemoteIndices.Value
+,
+			Restriction = propRestriction.Value
+,
+			RunAs = propRunAs.Value
+,
+			Sort = propSort.Value
+,
+			TransientMetadata = propTransientMetadata.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, QueryRole value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, QueryRole value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'QueryRole' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropApplications, value.Applications);
+		writer.WriteProperty(options, PropCluster, value.Cluster);
+		writer.WriteProperty(options, PropDescription, value.Description);
+		writer.WriteProperty(options, PropGlobal, value.Global, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Security.GlobalPrivilege>?, Elastic.Clients.Elasticsearch.Security.GlobalPrivilege>));
+		writer.WriteProperty(options, PropIndices, value.Indices);
+		writer.WriteProperty(options, PropMetadata, value.Metadata);
+		writer.WriteProperty(options, PropName, value.Name);
+		writer.WriteProperty(options, PropRemoteCluster, value.RemoteCluster);
+		writer.WriteProperty(options, PropRemoteIndices, value.RemoteIndices);
+		writer.WriteProperty(options, PropRestriction, value.Restriction);
+		writer.WriteProperty(options, PropRunAs, value.RunAs);
+		writer.WriteProperty(options, PropSort, value.Sort);
+		writer.WriteProperty(options, PropTransientMetadata, value.TransientMetadata);
+		writer.WriteEndObject();
 	}
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Security/RemoteIndicesPrivileges.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Security/RemoteIndicesPrivileges.g.cs
index 61c9a3199b2..2f214a55534 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Security/RemoteIndicesPrivileges.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Security/RemoteIndicesPrivileges.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,11 +28,95 @@
 
 namespace Elastic.Clients.Elasticsearch.Security;
 
+internal sealed partial class RemoteIndicesPrivilegesConverter : System.Text.Json.Serialization.JsonConverter<RemoteIndicesPrivileges>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAllowRestrictedIndices = System.Text.Json.JsonEncodedText.Encode("allow_restricted_indices");
+	private static readonly System.Text.Json.JsonEncodedText PropClusters = System.Text.Json.JsonEncodedText.Encode("clusters");
+	private static readonly System.Text.Json.JsonEncodedText PropFieldSecurity = System.Text.Json.JsonEncodedText.Encode("field_security");
+	private static readonly System.Text.Json.JsonEncodedText PropNames = System.Text.Json.JsonEncodedText.Encode("names");
+	private static readonly System.Text.Json.JsonEncodedText PropPrivileges = System.Text.Json.JsonEncodedText.Encode("privileges");
+	private static readonly System.Text.Json.JsonEncodedText PropQuery = System.Text.Json.JsonEncodedText.Encode("query");
+
+	public override RemoteIndicesPrivileges Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool?> propAllowRestrictedIndices = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Names> propClusters = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Security.FieldSecurity?> propFieldSecurity = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.IndexName>> propNames = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Security.IndexPrivilege>> propPrivileges = default;
+		LocalJsonProperty<object?> propQuery = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAllowRestrictedIndices.TryRead(ref reader, options, PropAllowRestrictedIndices))
+			{
+				continue;
+			}
+
+			if (propClusters.TryRead(ref reader, options, PropClusters))
+			{
+				continue;
+			}
+
+			if (propFieldSecurity.TryRead(ref reader, options, PropFieldSecurity))
+			{
+				continue;
+			}
+
+			if (propNames.TryRead(ref reader, options, PropNames, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.IndexName>, Elastic.Clients.Elasticsearch.IndexName>)))
+			{
+				continue;
+			}
+
+			if (propPrivileges.TryRead(ref reader, options, PropPrivileges))
+			{
+				continue;
+			}
+
+			if (propQuery.TryRead(ref reader, options, PropQuery))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new RemoteIndicesPrivileges
+		{
+			AllowRestrictedIndices = propAllowRestrictedIndices.Value
+,
+			Clusters = propClusters.Value
+,
+			FieldSecurity = propFieldSecurity.Value
+,
+			Names = propNames.Value
+,
+			Privileges = propPrivileges.Value
+,
+			Query = propQuery.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, RemoteIndicesPrivileges value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAllowRestrictedIndices, value.AllowRestrictedIndices);
+		writer.WriteProperty(options, PropClusters, value.Clusters);
+		writer.WriteProperty(options, PropFieldSecurity, value.FieldSecurity);
+		writer.WriteProperty(options, PropNames, value.Names, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.IndexName>, Elastic.Clients.Elasticsearch.IndexName>));
+		writer.WriteProperty(options, PropPrivileges, value.Privileges);
+		writer.WriteProperty(options, PropQuery, value.Query);
+		writer.WriteEndObject();
+	}
+}
+
 /// <summary>
 /// <para>
 /// The subset of index level privileges that can be defined for remote clusters.
 /// </para>
 /// </summary>
+[JsonConverter(typeof(RemoteIndicesPrivilegesConverter))]
 public sealed partial class RemoteIndicesPrivileges
 {
 	/// <summary>
@@ -39,7 +124,6 @@ public sealed partial class RemoteIndicesPrivileges
 	/// Set to <c>true</c> if using wildcard or regular expressions for patterns that cover restricted indices. Implicitly, restricted indices have limited privileges that can cause pattern tests to fail. If restricted indices are explicitly included in the <c>names</c> list, Elasticsearch checks privileges against these indices regardless of the value set for <c>allow_restricted_indices</c>.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("allow_restricted_indices")]
 	public bool? AllowRestrictedIndices { get; set; }
 
 	/// <summary>
@@ -47,7 +131,6 @@ public sealed partial class RemoteIndicesPrivileges
 	/// A list of cluster aliases to which the permissions in this entry apply.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("clusters")]
 	public Elastic.Clients.Elasticsearch.Names Clusters { get; set; }
 
 	/// <summary>
@@ -55,7 +138,6 @@ public sealed partial class RemoteIndicesPrivileges
 	/// The document fields that the owners of the role have read access to.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("field_security")]
 	public Elastic.Clients.Elasticsearch.Security.FieldSecurity? FieldSecurity { get; set; }
 
 	/// <summary>
@@ -63,8 +145,6 @@ public sealed partial class RemoteIndicesPrivileges
 	/// A list of indices (or index name patterns) to which the permissions in this entry apply.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("names")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.IndexName))]
 	public ICollection<Elastic.Clients.Elasticsearch.IndexName> Names { get; set; }
 
 	/// <summary>
@@ -72,7 +152,6 @@ public sealed partial class RemoteIndicesPrivileges
 	/// The index level privileges that owners of the role have on the specified indices.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("privileges")]
 	public ICollection<Elastic.Clients.Elasticsearch.Security.IndexPrivilege> Privileges { get; set; }
 
 	/// <summary>
@@ -80,7 +159,6 @@ public sealed partial class RemoteIndicesPrivileges
 	/// A search query that defines the documents the owners of the role have access to. A document within the specified indices must match this query for it to be accessible by the owners of the role.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("query")]
 	public object? Query { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Security/ReplicationAccess.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Security/ReplicationAccess.g.cs
index 6a19a68c4ce..004488e7284 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Security/ReplicationAccess.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Security/ReplicationAccess.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,50 @@
 
 namespace Elastic.Clients.Elasticsearch.Security;
 
+internal sealed partial class ReplicationAccessConverter : System.Text.Json.Serialization.JsonConverter<ReplicationAccess>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAllowRestrictedIndices = System.Text.Json.JsonEncodedText.Encode("allow_restricted_indices");
+	private static readonly System.Text.Json.JsonEncodedText PropNames = System.Text.Json.JsonEncodedText.Encode("names");
+
+	public override ReplicationAccess Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool?> propAllowRestrictedIndices = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.IndexName>> propNames = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAllowRestrictedIndices.TryRead(ref reader, options, PropAllowRestrictedIndices))
+			{
+				continue;
+			}
+
+			if (propNames.TryRead(ref reader, options, PropNames, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.IndexName>, Elastic.Clients.Elasticsearch.IndexName>)))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new ReplicationAccess
+		{
+			AllowRestrictedIndices = propAllowRestrictedIndices.Value
+,
+			Names = propNames.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, ReplicationAccess value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAllowRestrictedIndices, value.AllowRestrictedIndices);
+		writer.WriteProperty(options, PropNames, value.Names, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.IndexName>, Elastic.Clients.Elasticsearch.IndexName>));
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(ReplicationAccessConverter))]
 public sealed partial class ReplicationAccess
 {
 	/// <summary>
@@ -34,7 +79,6 @@ public sealed partial class ReplicationAccess
 	/// This needs to be set to true if the patterns in the names field should cover system indices.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("allow_restricted_indices")]
 	public bool? AllowRestrictedIndices { get; set; }
 
 	/// <summary>
@@ -42,8 +86,6 @@ public sealed partial class ReplicationAccess
 	/// A list of indices (or index name patterns) to which the permissions in this entry apply.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("names")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.IndexName))]
 	public ICollection<Elastic.Clients.Elasticsearch.IndexName> Names { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Security/RoleDescriptor.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Security/RoleDescriptor.g.cs
index 3eaf8158d4c..292b1d16703 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Security/RoleDescriptor.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Security/RoleDescriptor.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,158 +28,136 @@
 
 namespace Elastic.Clients.Elasticsearch.Security;
 
-internal sealed partial class RoleDescriptorConverter : JsonConverter<RoleDescriptor>
+internal sealed partial class RoleDescriptorConverter : System.Text.Json.Serialization.JsonConverter<RoleDescriptor>
 {
-	public override RoleDescriptor Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropApplications = System.Text.Json.JsonEncodedText.Encode("applications");
+	private static readonly System.Text.Json.JsonEncodedText PropCluster = System.Text.Json.JsonEncodedText.Encode("cluster");
+	private static readonly System.Text.Json.JsonEncodedText PropDescription = System.Text.Json.JsonEncodedText.Encode("description");
+	private static readonly System.Text.Json.JsonEncodedText PropGlobal = System.Text.Json.JsonEncodedText.Encode("global");
+	private static readonly System.Text.Json.JsonEncodedText PropIndices = System.Text.Json.JsonEncodedText.Encode("indices");
+	private static readonly System.Text.Json.JsonEncodedText PropIndices1 = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropMetadata = System.Text.Json.JsonEncodedText.Encode("metadata");
+	private static readonly System.Text.Json.JsonEncodedText PropRemoteCluster = System.Text.Json.JsonEncodedText.Encode("remote_cluster");
+	private static readonly System.Text.Json.JsonEncodedText PropRemoteIndices = System.Text.Json.JsonEncodedText.Encode("remote_indices");
+	private static readonly System.Text.Json.JsonEncodedText PropRestriction = System.Text.Json.JsonEncodedText.Encode("restriction");
+	private static readonly System.Text.Json.JsonEncodedText PropRunAs = System.Text.Json.JsonEncodedText.Encode("run_as");
+	private static readonly System.Text.Json.JsonEncodedText PropTransientMetadata = System.Text.Json.JsonEncodedText.Encode("transient_metadata");
+
+	public override RoleDescriptor Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		var variant = new RoleDescriptor();
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
-		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Security.ApplicationPrivileges>?> propApplications = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Security.ClusterPrivilege>?> propCluster = default;
+		LocalJsonProperty<string?> propDescription = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Security.GlobalPrivilege>?> propGlobal = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Security.IndicesPrivileges>?> propIndices = default;
+		LocalJsonProperty<IDictionary<string, object>?> propMetadata = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Security.RemoteClusterPrivileges>?> propRemoteCluster = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.Security.RemoteIndicesPrivileges>?> propRemoteIndices = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Security.Restriction?> propRestriction = default;
+		LocalJsonProperty<ICollection<string>?> propRunAs = default;
+		LocalJsonProperty<IDictionary<string, object>?> propTransientMetadata = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propApplications.TryRead(ref reader, options, PropApplications))
 			{
-				var property = reader.GetString();
-				if (property == "applications")
-				{
-					variant.Applications = JsonSerializer.Deserialize<ICollection<Elastic.Clients.Elasticsearch.Security.ApplicationPrivileges>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "cluster")
-				{
-					variant.Cluster = JsonSerializer.Deserialize<ICollection<Elastic.Clients.Elasticsearch.Security.ClusterPrivilege>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "description")
-				{
-					variant.Description = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "global")
-				{
-					variant.Global = SingleOrManySerializationHelper.Deserialize<Elastic.Clients.Elasticsearch.Security.GlobalPrivilege>(ref reader, options);
-					continue;
-				}
-
-				if (property == "indices" || property == "index")
-				{
-					variant.Indices = JsonSerializer.Deserialize<ICollection<Elastic.Clients.Elasticsearch.Security.IndicesPrivileges>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "metadata")
-				{
-					variant.Metadata = JsonSerializer.Deserialize<IDictionary<string, object>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "remote_cluster")
-				{
-					variant.RemoteCluster = JsonSerializer.Deserialize<ICollection<Elastic.Clients.Elasticsearch.Security.RemoteClusterPrivileges>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "remote_indices")
-				{
-					variant.RemoteIndices = JsonSerializer.Deserialize<ICollection<Elastic.Clients.Elasticsearch.Security.RemoteIndicesPrivileges>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "restriction")
-				{
-					variant.Restriction = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Security.Restriction?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "run_as")
-				{
-					variant.RunAs = JsonSerializer.Deserialize<ICollection<string>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "transient_metadata")
-				{
-					variant.TransientMetadata = JsonSerializer.Deserialize<IDictionary<string, object>?>(ref reader, options);
-					continue;
-				}
+				continue;
 			}
-		}
-
-		return variant;
-	}
 
-	public override void Write(Utf8JsonWriter writer, RoleDescriptor value, JsonSerializerOptions options)
-	{
-		writer.WriteStartObject();
-		if (value.Applications is not null)
-		{
-			writer.WritePropertyName("applications");
-			JsonSerializer.Serialize(writer, value.Applications, options);
-		}
+			if (propCluster.TryRead(ref reader, options, PropCluster))
+			{
+				continue;
+			}
 
-		if (value.Cluster is not null)
-		{
-			writer.WritePropertyName("cluster");
-			JsonSerializer.Serialize(writer, value.Cluster, options);
-		}
+			if (propDescription.TryRead(ref reader, options, PropDescription))
+			{
+				continue;
+			}
 
-		if (!string.IsNullOrEmpty(value.Description))
-		{
-			writer.WritePropertyName("description");
-			writer.WriteStringValue(value.Description);
-		}
+			if (propGlobal.TryRead(ref reader, options, PropGlobal, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Security.GlobalPrivilege>?, Elastic.Clients.Elasticsearch.Security.GlobalPrivilege>)))
+			{
+				continue;
+			}
 
-		if (value.Global is not null)
-		{
-			writer.WritePropertyName("global");
-			JsonSerializer.Serialize(writer, value.Global, options);
-		}
+			if (propIndices.TryRead(ref reader, options, PropIndices) || propIndices.TryRead(ref reader, options, PropIndices1))
+			{
+				continue;
+			}
 
-		if (value.Indices is not null)
-		{
-			writer.WritePropertyName("indices");
-			JsonSerializer.Serialize(writer, value.Indices, options);
-		}
+			if (propMetadata.TryRead(ref reader, options, PropMetadata))
+			{
+				continue;
+			}
 
-		if (value.Metadata is not null)
-		{
-			writer.WritePropertyName("metadata");
-			JsonSerializer.Serialize(writer, value.Metadata, options);
-		}
+			if (propRemoteCluster.TryRead(ref reader, options, PropRemoteCluster))
+			{
+				continue;
+			}
 
-		if (value.RemoteCluster is not null)
-		{
-			writer.WritePropertyName("remote_cluster");
-			JsonSerializer.Serialize(writer, value.RemoteCluster, options);
-		}
+			if (propRemoteIndices.TryRead(ref reader, options, PropRemoteIndices))
+			{
+				continue;
+			}
 
-		if (value.RemoteIndices is not null)
-		{
-			writer.WritePropertyName("remote_indices");
-			JsonSerializer.Serialize(writer, value.RemoteIndices, options);
-		}
+			if (propRestriction.TryRead(ref reader, options, PropRestriction))
+			{
+				continue;
+			}
 
-		if (value.Restriction is not null)
-		{
-			writer.WritePropertyName("restriction");
-			JsonSerializer.Serialize(writer, value.Restriction, options);
-		}
+			if (propRunAs.TryRead(ref reader, options, PropRunAs))
+			{
+				continue;
+			}
 
-		if (value.RunAs is not null)
-		{
-			writer.WritePropertyName("run_as");
-			JsonSerializer.Serialize(writer, value.RunAs, options);
-		}
+			if (propTransientMetadata.TryRead(ref reader, options, PropTransientMetadata))
+			{
+				continue;
+			}
 
-		if (value.TransientMetadata is not null)
-		{
-			writer.WritePropertyName("transient_metadata");
-			JsonSerializer.Serialize(writer, value.TransientMetadata, options);
-		}
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new RoleDescriptor
+		{
+			Applications = propApplications.Value
+,
+			Cluster = propCluster.Value
+,
+			Description = propDescription.Value
+,
+			Global = propGlobal.Value
+,
+			Indices = propIndices.Value
+,
+			Metadata = propMetadata.Value
+,
+			RemoteCluster = propRemoteCluster.Value
+,
+			RemoteIndices = propRemoteIndices.Value
+,
+			Restriction = propRestriction.Value
+,
+			RunAs = propRunAs.Value
+,
+			TransientMetadata = propTransientMetadata.Value
+		};
+	}
 
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, RoleDescriptor value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropApplications, value.Applications);
+		writer.WriteProperty(options, PropCluster, value.Cluster);
+		writer.WriteProperty(options, PropDescription, value.Description);
+		writer.WriteProperty(options, PropGlobal, value.Global, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Security.GlobalPrivilege>?, Elastic.Clients.Elasticsearch.Security.GlobalPrivilege>));
+		writer.WriteProperty(options, PropIndices, value.Indices);
+		writer.WriteProperty(options, PropMetadata, value.Metadata);
+		writer.WriteProperty(options, PropRemoteCluster, value.RemoteCluster);
+		writer.WriteProperty(options, PropRemoteIndices, value.RemoteIndices);
+		writer.WriteProperty(options, PropRestriction, value.Restriction);
+		writer.WriteProperty(options, PropRunAs, value.RunAs);
+		writer.WriteProperty(options, PropTransientMetadata, value.TransientMetadata);
 		writer.WriteEndObject();
 	}
 }
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Security/RoleDescriptorRead.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Security/RoleDescriptorRead.g.cs
index 0cbba91ee67..75149d5cf1a 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Security/RoleDescriptorRead.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Security/RoleDescriptorRead.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,102 +28,137 @@
 
 namespace Elastic.Clients.Elasticsearch.Security;
 
-internal sealed partial class RoleDescriptorReadConverter : JsonConverter<RoleDescriptorRead>
+internal sealed partial class RoleDescriptorReadConverter : System.Text.Json.Serialization.JsonConverter<RoleDescriptorRead>
 {
-	public override RoleDescriptorRead Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropApplications = System.Text.Json.JsonEncodedText.Encode("applications");
+	private static readonly System.Text.Json.JsonEncodedText PropCluster = System.Text.Json.JsonEncodedText.Encode("cluster");
+	private static readonly System.Text.Json.JsonEncodedText PropDescription = System.Text.Json.JsonEncodedText.Encode("description");
+	private static readonly System.Text.Json.JsonEncodedText PropGlobal = System.Text.Json.JsonEncodedText.Encode("global");
+	private static readonly System.Text.Json.JsonEncodedText PropIndices = System.Text.Json.JsonEncodedText.Encode("indices");
+	private static readonly System.Text.Json.JsonEncodedText PropIndices1 = System.Text.Json.JsonEncodedText.Encode("index");
+	private static readonly System.Text.Json.JsonEncodedText PropMetadata = System.Text.Json.JsonEncodedText.Encode("metadata");
+	private static readonly System.Text.Json.JsonEncodedText PropRemoteCluster = System.Text.Json.JsonEncodedText.Encode("remote_cluster");
+	private static readonly System.Text.Json.JsonEncodedText PropRemoteIndices = System.Text.Json.JsonEncodedText.Encode("remote_indices");
+	private static readonly System.Text.Json.JsonEncodedText PropRestriction = System.Text.Json.JsonEncodedText.Encode("restriction");
+	private static readonly System.Text.Json.JsonEncodedText PropRunAs = System.Text.Json.JsonEncodedText.Encode("run_as");
+	private static readonly System.Text.Json.JsonEncodedText PropTransientMetadata = System.Text.Json.JsonEncodedText.Encode("transient_metadata");
+
+	public override RoleDescriptorRead Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		IReadOnlyCollection<Elastic.Clients.Elasticsearch.Security.ApplicationPrivileges>? applications = default;
-		IReadOnlyCollection<Elastic.Clients.Elasticsearch.Security.ClusterPrivilege> cluster = default;
-		string? description = default;
-		IReadOnlyCollection<Elastic.Clients.Elasticsearch.Security.GlobalPrivilege>? global = default;
-		IReadOnlyCollection<Elastic.Clients.Elasticsearch.Security.IndicesPrivileges> indices = default;
-		IReadOnlyDictionary<string, object>? metadata = default;
-		IReadOnlyCollection<Elastic.Clients.Elasticsearch.Security.RemoteClusterPrivileges>? remoteCluster = default;
-		IReadOnlyCollection<Elastic.Clients.Elasticsearch.Security.RemoteIndicesPrivileges>? remoteIndices = default;
-		Elastic.Clients.Elasticsearch.Security.Restriction? restriction = default;
-		IReadOnlyCollection<string>? runAs = default;
-		IReadOnlyDictionary<string, object>? transientMetadata = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Security.ApplicationPrivileges>?> propApplications = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Security.ClusterPrivilege>> propCluster = default;
+		LocalJsonProperty<string?> propDescription = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Security.GlobalPrivilege>?> propGlobal = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Security.IndicesPrivileges>> propIndices = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, object>?> propMetadata = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Security.RemoteClusterPrivileges>?> propRemoteCluster = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Security.RemoteIndicesPrivileges>?> propRemoteIndices = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Security.Restriction?> propRestriction = default;
+		LocalJsonProperty<IReadOnlyCollection<string>?> propRunAs = default;
+		LocalJsonProperty<IReadOnlyDictionary<string, object>?> propTransientMetadata = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propApplications.TryRead(ref reader, options, PropApplications))
 			{
-				var property = reader.GetString();
-				if (property == "applications")
-				{
-					applications = JsonSerializer.Deserialize<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Security.ApplicationPrivileges>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "cluster")
-				{
-					cluster = JsonSerializer.Deserialize<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Security.ClusterPrivilege>>(ref reader, options);
-					continue;
-				}
-
-				if (property == "description")
-				{
-					description = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "global")
-				{
-					global = SingleOrManySerializationHelper.Deserialize<Elastic.Clients.Elasticsearch.Security.GlobalPrivilege>(ref reader, options);
-					continue;
-				}
-
-				if (property == "indices" || property == "index")
-				{
-					indices = JsonSerializer.Deserialize<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Security.IndicesPrivileges>>(ref reader, options);
-					continue;
-				}
-
-				if (property == "metadata")
-				{
-					metadata = JsonSerializer.Deserialize<IReadOnlyDictionary<string, object>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "remote_cluster")
-				{
-					remoteCluster = JsonSerializer.Deserialize<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Security.RemoteClusterPrivileges>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "remote_indices")
-				{
-					remoteIndices = JsonSerializer.Deserialize<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Security.RemoteIndicesPrivileges>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "restriction")
-				{
-					restriction = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Security.Restriction?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "run_as")
-				{
-					runAs = JsonSerializer.Deserialize<IReadOnlyCollection<string>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "transient_metadata")
-				{
-					transientMetadata = JsonSerializer.Deserialize<IReadOnlyDictionary<string, object>?>(ref reader, options);
-					continue;
-				}
+				continue;
 			}
+
+			if (propCluster.TryRead(ref reader, options, PropCluster))
+			{
+				continue;
+			}
+
+			if (propDescription.TryRead(ref reader, options, PropDescription))
+			{
+				continue;
+			}
+
+			if (propGlobal.TryRead(ref reader, options, PropGlobal, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Security.GlobalPrivilege>?, Elastic.Clients.Elasticsearch.Security.GlobalPrivilege>)))
+			{
+				continue;
+			}
+
+			if (propIndices.TryRead(ref reader, options, PropIndices) || propIndices.TryRead(ref reader, options, PropIndices1))
+			{
+				continue;
+			}
+
+			if (propMetadata.TryRead(ref reader, options, PropMetadata))
+			{
+				continue;
+			}
+
+			if (propRemoteCluster.TryRead(ref reader, options, PropRemoteCluster))
+			{
+				continue;
+			}
+
+			if (propRemoteIndices.TryRead(ref reader, options, PropRemoteIndices))
+			{
+				continue;
+			}
+
+			if (propRestriction.TryRead(ref reader, options, PropRestriction))
+			{
+				continue;
+			}
+
+			if (propRunAs.TryRead(ref reader, options, PropRunAs))
+			{
+				continue;
+			}
+
+			if (propTransientMetadata.TryRead(ref reader, options, PropTransientMetadata))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		return new RoleDescriptorRead { Applications = applications, Cluster = cluster, Description = description, Global = global, Indices = indices, Metadata = metadata, RemoteCluster = remoteCluster, RemoteIndices = remoteIndices, Restriction = restriction, RunAs = runAs, TransientMetadata = transientMetadata };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new RoleDescriptorRead
+		{
+			Applications = propApplications.Value
+,
+			Cluster = propCluster.Value
+,
+			Description = propDescription.Value
+,
+			Global = propGlobal.Value
+,
+			Indices = propIndices.Value
+,
+			Metadata = propMetadata.Value
+,
+			RemoteCluster = propRemoteCluster.Value
+,
+			RemoteIndices = propRemoteIndices.Value
+,
+			Restriction = propRestriction.Value
+,
+			RunAs = propRunAs.Value
+,
+			TransientMetadata = propTransientMetadata.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, RoleDescriptorRead value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, RoleDescriptorRead value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'RoleDescriptorRead' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropApplications, value.Applications);
+		writer.WriteProperty(options, PropCluster, value.Cluster);
+		writer.WriteProperty(options, PropDescription, value.Description);
+		writer.WriteProperty(options, PropGlobal, value.Global, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Security.GlobalPrivilege>?, Elastic.Clients.Elasticsearch.Security.GlobalPrivilege>));
+		writer.WriteProperty(options, PropIndices, value.Indices);
+		writer.WriteProperty(options, PropMetadata, value.Metadata);
+		writer.WriteProperty(options, PropRemoteCluster, value.RemoteCluster);
+		writer.WriteProperty(options, PropRemoteIndices, value.RemoteIndices);
+		writer.WriteProperty(options, PropRestriction, value.Restriction);
+		writer.WriteProperty(options, PropRunAs, value.RunAs);
+		writer.WriteProperty(options, PropTransientMetadata, value.TransientMetadata);
+		writer.WriteEndObject();
 	}
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Security/RoleMappingRule.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Security/RoleMappingRule.g.cs
index 6a2b8369ad0..1fac8e61288 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Security/RoleMappingRule.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Security/RoleMappingRule.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -39,12 +40,16 @@ internal RoleMappingRule(string variantName, object variant)
 			throw new ArgumentNullException(nameof(variant));
 		if (string.IsNullOrWhiteSpace(variantName))
 			throw new ArgumentException("Variant name must not be empty or whitespace.");
-		VariantName = variantName;
+		VariantType = variantName;
 		Variant = variant;
 	}
 
-	internal object Variant { get; }
-	internal string VariantName { get; }
+	internal RoleMappingRule()
+	{
+	}
+
+	public object Variant { get; internal set; }
+	public string VariantType { get; internal set; }
 
 	public static RoleMappingRule All(IReadOnlyCollection<Elastic.Clients.Elasticsearch.Security.RoleMappingRule> roleMappingRule) => new RoleMappingRule("all", roleMappingRule);
 	public static RoleMappingRule Any(IReadOnlyCollection<Elastic.Clients.Elasticsearch.Security.RoleMappingRule> roleMappingRule) => new RoleMappingRule("any", roleMappingRule);
@@ -64,87 +69,80 @@ public bool TryGet<T>([NotNullWhen(true)] out T? result) where T : class
 	}
 }
 
-internal sealed partial class RoleMappingRuleConverter : JsonConverter<RoleMappingRule>
+internal sealed partial class RoleMappingRuleConverter : System.Text.Json.Serialization.JsonConverter<RoleMappingRule>
 {
-	public override RoleMappingRule Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-		{
-			throw new JsonException("Expected start token.");
-		}
+	private static readonly System.Text.Json.JsonEncodedText VariantAll = System.Text.Json.JsonEncodedText.Encode("all");
+	private static readonly System.Text.Json.JsonEncodedText VariantAny = System.Text.Json.JsonEncodedText.Encode("any");
+	private static readonly System.Text.Json.JsonEncodedText VariantExcept = System.Text.Json.JsonEncodedText.Encode("except");
+	private static readonly System.Text.Json.JsonEncodedText VariantField = System.Text.Json.JsonEncodedText.Encode("field");
 
-		object? variantValue = default;
-		string? variantNameValue = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+	public override RoleMappingRule Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		var variantType = string.Empty;
+		object? variant = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
+			if (reader.ValueTextEquals(VariantAll))
 			{
-				throw new JsonException("Expected a property name token.");
-			}
-
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token representing the name of an Elasticsearch field.");
-			}
-
-			var propertyName = reader.GetString();
-			reader.Read();
-			if (propertyName == "all")
-			{
-				variantValue = JsonSerializer.Deserialize<ICollection<Elastic.Clients.Elasticsearch.Security.RoleMappingRule>?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantAll.Value;
+				reader.Read();
+				variant = reader.ReadValue<ICollection<Elastic.Clients.Elasticsearch.Security.RoleMappingRule>?>(options);
 				continue;
 			}
 
-			if (propertyName == "any")
+			if (reader.ValueTextEquals(VariantAny))
 			{
-				variantValue = JsonSerializer.Deserialize<ICollection<Elastic.Clients.Elasticsearch.Security.RoleMappingRule>?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantAny.Value;
+				reader.Read();
+				variant = reader.ReadValue<ICollection<Elastic.Clients.Elasticsearch.Security.RoleMappingRule>?>(options);
 				continue;
 			}
 
-			if (propertyName == "except")
+			if (reader.ValueTextEquals(VariantExcept))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Security.RoleMappingRule?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantExcept.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Security.RoleMappingRule?>(options);
 				continue;
 			}
 
-			if (propertyName == "field")
+			if (reader.ValueTextEquals(VariantField))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Security.FieldRule?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantField.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Security.FieldRule?>(options);
 				continue;
 			}
 
-			throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'RoleMappingRule' from the response.");
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		var result = new RoleMappingRule(variantNameValue, variantValue);
-		return result;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new RoleMappingRule { VariantType = variantType, Variant = variant };
 	}
 
-	public override void Write(Utf8JsonWriter writer, RoleMappingRule value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, RoleMappingRule value, System.Text.Json.JsonSerializerOptions options)
 	{
 		writer.WriteStartObject();
-		if (value.VariantName is not null && value.Variant is not null)
+		switch (value.VariantType)
 		{
-			writer.WritePropertyName(value.VariantName);
-			switch (value.VariantName)
-			{
-				case "all":
-					JsonSerializer.Serialize<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Security.RoleMappingRule>>(writer, (IReadOnlyCollection<Elastic.Clients.Elasticsearch.Security.RoleMappingRule>)value.Variant, options);
-					break;
-				case "any":
-					JsonSerializer.Serialize<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Security.RoleMappingRule>>(writer, (IReadOnlyCollection<Elastic.Clients.Elasticsearch.Security.RoleMappingRule>)value.Variant, options);
-					break;
-				case "except":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Security.RoleMappingRule>(writer, (Elastic.Clients.Elasticsearch.Security.RoleMappingRule)value.Variant, options);
-					break;
-				case "field":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Security.FieldRule>(writer, (Elastic.Clients.Elasticsearch.Security.FieldRule)value.Variant, options);
-					break;
-			}
+			case "":
+				break;
+			case "all":
+				writer.WriteProperty(options, value.VariantType, (ICollection<Elastic.Clients.Elasticsearch.Security.RoleMappingRule>?)value.Variant);
+				break;
+			case "any":
+				writer.WriteProperty(options, value.VariantType, (ICollection<Elastic.Clients.Elasticsearch.Security.RoleMappingRule>?)value.Variant);
+				break;
+			case "except":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Security.RoleMappingRule?)value.Variant);
+				break;
+			case "field":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Security.FieldRule?)value.Variant);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.VariantType}' is not supported for type '{nameof(RoleMappingRule)}'.");
 		}
 
 		writer.WriteEndObject();
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Security/RoleQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Security/RoleQuery.g.cs
index 862b9b99044..920562e3f00 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Security/RoleQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Security/RoleQuery.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -39,12 +40,16 @@ internal RoleQuery(string variantName, object variant)
 			throw new ArgumentNullException(nameof(variant));
 		if (string.IsNullOrWhiteSpace(variantName))
 			throw new ArgumentException("Variant name must not be empty or whitespace.");
-		VariantName = variantName;
+		VariantType = variantName;
 		Variant = variant;
 	}
 
-	internal object Variant { get; }
-	internal string VariantName { get; }
+	internal RoleQuery()
+	{
+	}
+
+	public object Variant { get; internal set; }
+	public string VariantType { get; internal set; }
 
 	public static RoleQuery Bool(Elastic.Clients.Elasticsearch.QueryDsl.BoolQuery boolQuery) => new RoleQuery("bool", boolQuery);
 	public static RoleQuery Exists(Elastic.Clients.Elasticsearch.QueryDsl.ExistsQuery existsQuery) => new RoleQuery("exists", existsQuery);
@@ -52,6 +57,7 @@ internal RoleQuery(string variantName, object variant)
 	public static RoleQuery Match(Elastic.Clients.Elasticsearch.QueryDsl.MatchQuery matchQuery) => new RoleQuery("match", matchQuery);
 	public static RoleQuery MatchAll(Elastic.Clients.Elasticsearch.QueryDsl.MatchAllQuery matchAllQuery) => new RoleQuery("match_all", matchAllQuery);
 	public static RoleQuery Prefix(Elastic.Clients.Elasticsearch.QueryDsl.PrefixQuery prefixQuery) => new RoleQuery("prefix", prefixQuery);
+	public static RoleQuery Range(Elastic.Clients.Elasticsearch.QueryDsl.IRangeQuery rangeQuery) => new RoleQuery("range", rangeQuery);
 	public static RoleQuery Range(Elastic.Clients.Elasticsearch.QueryDsl.UntypedRangeQuery rangeQuery) => new RoleQuery("range", rangeQuery);
 	public static RoleQuery Range(Elastic.Clients.Elasticsearch.QueryDsl.DateRangeQuery rangeQuery) => new RoleQuery("range", rangeQuery);
 	public static RoleQuery Range(Elastic.Clients.Elasticsearch.QueryDsl.NumberRangeQuery rangeQuery) => new RoleQuery("range", rangeQuery);
@@ -74,157 +80,164 @@ public bool TryGet<T>([NotNullWhen(true)] out T? result) where T : class
 	}
 }
 
-internal sealed partial class RoleQueryConverter : JsonConverter<RoleQuery>
+internal sealed partial class RoleQueryConverter : System.Text.Json.Serialization.JsonConverter<RoleQuery>
 {
-	public override RoleQuery Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText VariantBool = System.Text.Json.JsonEncodedText.Encode("bool");
+	private static readonly System.Text.Json.JsonEncodedText VariantExists = System.Text.Json.JsonEncodedText.Encode("exists");
+	private static readonly System.Text.Json.JsonEncodedText VariantIds = System.Text.Json.JsonEncodedText.Encode("ids");
+	private static readonly System.Text.Json.JsonEncodedText VariantMatch = System.Text.Json.JsonEncodedText.Encode("match");
+	private static readonly System.Text.Json.JsonEncodedText VariantMatchAll = System.Text.Json.JsonEncodedText.Encode("match_all");
+	private static readonly System.Text.Json.JsonEncodedText VariantPrefix = System.Text.Json.JsonEncodedText.Encode("prefix");
+	private static readonly System.Text.Json.JsonEncodedText VariantRange = System.Text.Json.JsonEncodedText.Encode("range");
+	private static readonly System.Text.Json.JsonEncodedText VariantSimpleQueryString = System.Text.Json.JsonEncodedText.Encode("simple_query_string");
+	private static readonly System.Text.Json.JsonEncodedText VariantTerm = System.Text.Json.JsonEncodedText.Encode("term");
+	private static readonly System.Text.Json.JsonEncodedText VariantTerms = System.Text.Json.JsonEncodedText.Encode("terms");
+	private static readonly System.Text.Json.JsonEncodedText VariantWildcard = System.Text.Json.JsonEncodedText.Encode("wildcard");
+
+	public override RoleQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		var variantType = string.Empty;
+		object? variant = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			throw new JsonException("Expected start token.");
-		}
-
-		object? variantValue = default;
-		string? variantNameValue = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
-		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token.");
-			}
-
-			if (reader.TokenType != JsonTokenType.PropertyName)
+			if (reader.ValueTextEquals(VariantBool))
 			{
-				throw new JsonException("Expected a property name token representing the name of an Elasticsearch field.");
-			}
-
-			var propertyName = reader.GetString();
-			reader.Read();
-			if (propertyName == "bool")
-			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.BoolQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantBool.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.BoolQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "exists")
+			if (reader.ValueTextEquals(VariantExists))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.ExistsQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantExists.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.ExistsQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "ids")
+			if (reader.ValueTextEquals(VariantIds))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.IdsQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantIds.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.IdsQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "match")
+			if (reader.ValueTextEquals(VariantMatch))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.MatchQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantMatch.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.MatchQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "match_all")
+			if (reader.ValueTextEquals(VariantMatchAll))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.MatchAllQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantMatchAll.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.MatchAllQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "prefix")
+			if (reader.ValueTextEquals(VariantPrefix))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.PrefixQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantPrefix.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.PrefixQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "range")
+			if (reader.ValueTextEquals(VariantRange))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.UntypedRangeQuery>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantRange.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.IRangeQuery>(options);
 				continue;
 			}
 
-			if (propertyName == "simple_query_string")
+			if (reader.ValueTextEquals(VariantSimpleQueryString))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.SimpleQueryStringQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantSimpleQueryString.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.SimpleQueryStringQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "term")
+			if (reader.ValueTextEquals(VariantTerm))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.TermQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantTerm.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.TermQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "terms")
+			if (reader.ValueTextEquals(VariantTerms))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.TermsQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantTerms.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.TermsQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "wildcard")
+			if (reader.ValueTextEquals(VariantWildcard))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.WildcardQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantWildcard.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.WildcardQuery?>(options);
 				continue;
 			}
 
-			throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'RoleQuery' from the response.");
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		var result = new RoleQuery(variantNameValue, variantValue);
-		return result;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new RoleQuery { VariantType = variantType, Variant = variant };
 	}
 
-	public override void Write(Utf8JsonWriter writer, RoleQuery value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, RoleQuery value, System.Text.Json.JsonSerializerOptions options)
 	{
 		writer.WriteStartObject();
-		if (value.VariantName is not null && value.Variant is not null)
+		switch (value.VariantType)
 		{
-			writer.WritePropertyName(value.VariantName);
-			switch (value.VariantName)
-			{
-				case "bool":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.BoolQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.BoolQuery)value.Variant, options);
-					break;
-				case "exists":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.ExistsQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.ExistsQuery)value.Variant, options);
-					break;
-				case "ids":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.IdsQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.IdsQuery)value.Variant, options);
-					break;
-				case "match":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.MatchQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.MatchQuery)value.Variant, options);
-					break;
-				case "match_all":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.MatchAllQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.MatchAllQuery)value.Variant, options);
-					break;
-				case "prefix":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.PrefixQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.PrefixQuery)value.Variant, options);
-					break;
-				case "range":
-					JsonSerializer.Serialize(writer, value.Variant, value.Variant.GetType(), options);
-					break;
-				case "simple_query_string":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.SimpleQueryStringQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.SimpleQueryStringQuery)value.Variant, options);
-					break;
-				case "term":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.TermQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.TermQuery)value.Variant, options);
-					break;
-				case "terms":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.TermsQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.TermsQuery)value.Variant, options);
-					break;
-				case "wildcard":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.WildcardQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.WildcardQuery)value.Variant, options);
-					break;
-			}
+			case "":
+				break;
+			case "bool":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.BoolQuery?)value.Variant);
+				break;
+			case "exists":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.ExistsQuery?)value.Variant);
+				break;
+			case "ids":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.IdsQuery?)value.Variant);
+				break;
+			case "match":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.MatchQuery?)value.Variant);
+				break;
+			case "match_all":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.MatchAllQuery?)value.Variant);
+				break;
+			case "prefix":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.PrefixQuery?)value.Variant);
+				break;
+			case "range":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.IRangeQuery)value.Variant);
+				break;
+			case "simple_query_string":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.SimpleQueryStringQuery?)value.Variant);
+				break;
+			case "term":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.TermQuery?)value.Variant);
+				break;
+			case "terms":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.TermsQuery?)value.Variant);
+				break;
+			case "wildcard":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.WildcardQuery?)value.Variant);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.VariantType}' is not supported for type '{nameof(RoleQuery)}'.");
 		}
 
 		writer.WriteEndObject();
@@ -274,6 +287,7 @@ private RoleQueryDescriptor<TDocument> Set(object variant, string variantName)
 	public RoleQueryDescriptor<TDocument> MatchAll(Action<Elastic.Clients.Elasticsearch.QueryDsl.MatchAllQueryDescriptor> configure) => Set(configure, "match_all");
 	public RoleQueryDescriptor<TDocument> Prefix(Elastic.Clients.Elasticsearch.QueryDsl.PrefixQuery prefixQuery) => Set(prefixQuery, "prefix");
 	public RoleQueryDescriptor<TDocument> Prefix(Action<Elastic.Clients.Elasticsearch.QueryDsl.PrefixQueryDescriptor<TDocument>> configure) => Set(configure, "prefix");
+	public RoleQueryDescriptor<TDocument> Range(Elastic.Clients.Elasticsearch.QueryDsl.IRangeQuery rangeQuery) => Set(rangeQuery, "range");
 	public RoleQueryDescriptor<TDocument> Range(Elastic.Clients.Elasticsearch.QueryDsl.UntypedRangeQuery rangeQuery) => Set(rangeQuery, "range");
 	public RoleQueryDescriptor<TDocument> Range(Elastic.Clients.Elasticsearch.QueryDsl.DateRangeQuery rangeQuery) => Set(rangeQuery, "range");
 	public RoleQueryDescriptor<TDocument> Range(Elastic.Clients.Elasticsearch.QueryDsl.NumberRangeQuery rangeQuery) => Set(rangeQuery, "range");
@@ -350,6 +364,7 @@ private RoleQueryDescriptor Set(object variant, string variantName)
 	public RoleQueryDescriptor MatchAll(Action<Elastic.Clients.Elasticsearch.QueryDsl.MatchAllQueryDescriptor> configure) => Set(configure, "match_all");
 	public RoleQueryDescriptor Prefix(Elastic.Clients.Elasticsearch.QueryDsl.PrefixQuery prefixQuery) => Set(prefixQuery, "prefix");
 	public RoleQueryDescriptor Prefix<TDocument>(Action<Elastic.Clients.Elasticsearch.QueryDsl.PrefixQueryDescriptor> configure) => Set(configure, "prefix");
+	public RoleQueryDescriptor Range(Elastic.Clients.Elasticsearch.QueryDsl.IRangeQuery rangeQuery) => Set(rangeQuery, "range");
 	public RoleQueryDescriptor Range(Elastic.Clients.Elasticsearch.QueryDsl.UntypedRangeQuery rangeQuery) => Set(rangeQuery, "range");
 	public RoleQueryDescriptor Range(Elastic.Clients.Elasticsearch.QueryDsl.DateRangeQuery rangeQuery) => Set(rangeQuery, "range");
 	public RoleQueryDescriptor Range(Elastic.Clients.Elasticsearch.QueryDsl.NumberRangeQuery rangeQuery) => Set(rangeQuery, "range");
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Security/SearchAccess.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Security/SearchAccess.g.cs
index 04a4ac7ddc5..96bf5931c97 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Security/SearchAccess.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Security/SearchAccess.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,70 @@
 
 namespace Elastic.Clients.Elasticsearch.Security;
 
+internal sealed partial class SearchAccessConverter : System.Text.Json.Serialization.JsonConverter<SearchAccess>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAllowRestrictedIndices = System.Text.Json.JsonEncodedText.Encode("allow_restricted_indices");
+	private static readonly System.Text.Json.JsonEncodedText PropFieldSecurity = System.Text.Json.JsonEncodedText.Encode("field_security");
+	private static readonly System.Text.Json.JsonEncodedText PropNames = System.Text.Json.JsonEncodedText.Encode("names");
+	private static readonly System.Text.Json.JsonEncodedText PropQuery = System.Text.Json.JsonEncodedText.Encode("query");
+
+	public override SearchAccess Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool?> propAllowRestrictedIndices = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Security.FieldSecurity?> propFieldSecurity = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.IndexName>> propNames = default;
+		LocalJsonProperty<object?> propQuery = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAllowRestrictedIndices.TryRead(ref reader, options, PropAllowRestrictedIndices))
+			{
+				continue;
+			}
+
+			if (propFieldSecurity.TryRead(ref reader, options, PropFieldSecurity))
+			{
+				continue;
+			}
+
+			if (propNames.TryRead(ref reader, options, PropNames, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.IndexName>, Elastic.Clients.Elasticsearch.IndexName>)))
+			{
+				continue;
+			}
+
+			if (propQuery.TryRead(ref reader, options, PropQuery))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SearchAccess
+		{
+			AllowRestrictedIndices = propAllowRestrictedIndices.Value
+,
+			FieldSecurity = propFieldSecurity.Value
+,
+			Names = propNames.Value
+,
+			Query = propQuery.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SearchAccess value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAllowRestrictedIndices, value.AllowRestrictedIndices);
+		writer.WriteProperty(options, PropFieldSecurity, value.FieldSecurity);
+		writer.WriteProperty(options, PropNames, value.Names, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.IndexName>, Elastic.Clients.Elasticsearch.IndexName>));
+		writer.WriteProperty(options, PropQuery, value.Query);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(SearchAccessConverter))]
 public sealed partial class SearchAccess
 {
 	/// <summary>
@@ -34,7 +99,6 @@ public sealed partial class SearchAccess
 	/// Set to <c>true</c> if using wildcard or regular expressions for patterns that cover restricted indices. Implicitly, restricted indices have limited privileges that can cause pattern tests to fail. If restricted indices are explicitly included in the <c>names</c> list, Elasticsearch checks privileges against these indices regardless of the value set for <c>allow_restricted_indices</c>.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("allow_restricted_indices")]
 	public bool? AllowRestrictedIndices { get; set; }
 
 	/// <summary>
@@ -42,7 +106,6 @@ public sealed partial class SearchAccess
 	/// The document fields that the owners of the role have read access to.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("field_security")]
 	public Elastic.Clients.Elasticsearch.Security.FieldSecurity? FieldSecurity { get; set; }
 
 	/// <summary>
@@ -50,8 +113,6 @@ public sealed partial class SearchAccess
 	/// A list of indices (or index name patterns) to which the permissions in this entry apply.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("names")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.IndexName))]
 	public ICollection<Elastic.Clients.Elasticsearch.IndexName> Names { get; set; }
 
 	/// <summary>
@@ -59,7 +120,6 @@ public sealed partial class SearchAccess
 	/// A search query that defines the documents the owners of the role have access to. A document within the specified indices must match this query for it to be accessible by the owners of the role.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("query")]
 	public object? Query { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Security/UserIndicesPrivileges.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Security/UserIndicesPrivileges.g.cs
index 5bacdaccaa6..1a75f5935b9 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Security/UserIndicesPrivileges.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Security/UserIndicesPrivileges.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,80 @@
 
 namespace Elastic.Clients.Elasticsearch.Security;
 
+internal sealed partial class UserIndicesPrivilegesConverter : System.Text.Json.Serialization.JsonConverter<UserIndicesPrivileges>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropAllowRestrictedIndices = System.Text.Json.JsonEncodedText.Encode("allow_restricted_indices");
+	private static readonly System.Text.Json.JsonEncodedText PropFieldSecurity = System.Text.Json.JsonEncodedText.Encode("field_security");
+	private static readonly System.Text.Json.JsonEncodedText PropNames = System.Text.Json.JsonEncodedText.Encode("names");
+	private static readonly System.Text.Json.JsonEncodedText PropPrivileges = System.Text.Json.JsonEncodedText.Encode("privileges");
+	private static readonly System.Text.Json.JsonEncodedText PropQuery = System.Text.Json.JsonEncodedText.Encode("query");
+
+	public override UserIndicesPrivileges Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<bool> propAllowRestrictedIndices = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Security.FieldSecurity>?> propFieldSecurity = default;
+		LocalJsonProperty<IReadOnlyCollection<string>> propNames = default;
+		LocalJsonProperty<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Security.IndexPrivilege>> propPrivileges = default;
+		LocalJsonProperty<object?> propQuery = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propAllowRestrictedIndices.TryRead(ref reader, options, PropAllowRestrictedIndices))
+			{
+				continue;
+			}
+
+			if (propFieldSecurity.TryRead(ref reader, options, PropFieldSecurity))
+			{
+				continue;
+			}
+
+			if (propNames.TryRead(ref reader, options, PropNames, typeof(SingleOrManyMarker<IReadOnlyCollection<string>, string>)))
+			{
+				continue;
+			}
+
+			if (propPrivileges.TryRead(ref reader, options, PropPrivileges))
+			{
+				continue;
+			}
+
+			if (propQuery.TryRead(ref reader, options, PropQuery))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new UserIndicesPrivileges
+		{
+			AllowRestrictedIndices = propAllowRestrictedIndices.Value
+,
+			FieldSecurity = propFieldSecurity.Value
+,
+			Names = propNames.Value
+,
+			Privileges = propPrivileges.Value
+,
+			Query = propQuery.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, UserIndicesPrivileges value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAllowRestrictedIndices, value.AllowRestrictedIndices);
+		writer.WriteProperty(options, PropFieldSecurity, value.FieldSecurity);
+		writer.WriteProperty(options, PropNames, value.Names, typeof(SingleOrManyMarker<IReadOnlyCollection<string>, string>));
+		writer.WriteProperty(options, PropPrivileges, value.Privileges);
+		writer.WriteProperty(options, PropQuery, value.Query);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(UserIndicesPrivilegesConverter))]
 public sealed partial class UserIndicesPrivileges
 {
 	/// <summary>
@@ -34,7 +109,6 @@ public sealed partial class UserIndicesPrivileges
 	/// Set to <c>true</c> if using wildcard or regular expressions for patterns that cover restricted indices. Implicitly, restricted indices have limited privileges that can cause pattern tests to fail. If restricted indices are explicitly included in the <c>names</c> list, Elasticsearch checks privileges against these indices regardless of the value set for <c>allow_restricted_indices</c>.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("allow_restricted_indices")]
 	public bool AllowRestrictedIndices { get; init; }
 
 	/// <summary>
@@ -42,7 +116,6 @@ public sealed partial class UserIndicesPrivileges
 	/// The document fields that the owners of the role have read access to.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("field_security")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Security.FieldSecurity>? FieldSecurity { get; init; }
 
 	/// <summary>
@@ -50,8 +123,6 @@ public sealed partial class UserIndicesPrivileges
 	/// A list of indices (or index name patterns) to which the permissions in this entry apply.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("names")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public IReadOnlyCollection<string> Names { get; init; }
 
 	/// <summary>
@@ -59,7 +130,6 @@ public sealed partial class UserIndicesPrivileges
 	/// The index level privileges that owners of the role have on the specified indices.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("privileges")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Security.IndexPrivilege> Privileges { get; init; }
 
 	/// <summary>
@@ -67,6 +137,5 @@ public sealed partial class UserIndicesPrivileges
 	/// Search queries that define the documents the user has access to. A document within the specified indices must match these queries for it to be accessible by the owners of the role.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("query")]
 	public object? Query { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Security/UserQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Security/UserQuery.g.cs
index 28be18858ab..471f4891bc9 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Security/UserQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Security/UserQuery.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -39,12 +40,16 @@ internal UserQuery(string variantName, object variant)
 			throw new ArgumentNullException(nameof(variant));
 		if (string.IsNullOrWhiteSpace(variantName))
 			throw new ArgumentException("Variant name must not be empty or whitespace.");
-		VariantName = variantName;
+		VariantType = variantName;
 		Variant = variant;
 	}
 
-	internal object Variant { get; }
-	internal string VariantName { get; }
+	internal UserQuery()
+	{
+	}
+
+	public object Variant { get; internal set; }
+	public string VariantType { get; internal set; }
 
 	public static UserQuery Bool(Elastic.Clients.Elasticsearch.QueryDsl.BoolQuery boolQuery) => new UserQuery("bool", boolQuery);
 	public static UserQuery Exists(Elastic.Clients.Elasticsearch.QueryDsl.ExistsQuery existsQuery) => new UserQuery("exists", existsQuery);
@@ -52,6 +57,7 @@ internal UserQuery(string variantName, object variant)
 	public static UserQuery Match(Elastic.Clients.Elasticsearch.QueryDsl.MatchQuery matchQuery) => new UserQuery("match", matchQuery);
 	public static UserQuery MatchAll(Elastic.Clients.Elasticsearch.QueryDsl.MatchAllQuery matchAllQuery) => new UserQuery("match_all", matchAllQuery);
 	public static UserQuery Prefix(Elastic.Clients.Elasticsearch.QueryDsl.PrefixQuery prefixQuery) => new UserQuery("prefix", prefixQuery);
+	public static UserQuery Range(Elastic.Clients.Elasticsearch.QueryDsl.IRangeQuery rangeQuery) => new UserQuery("range", rangeQuery);
 	public static UserQuery Range(Elastic.Clients.Elasticsearch.QueryDsl.UntypedRangeQuery rangeQuery) => new UserQuery("range", rangeQuery);
 	public static UserQuery Range(Elastic.Clients.Elasticsearch.QueryDsl.DateRangeQuery rangeQuery) => new UserQuery("range", rangeQuery);
 	public static UserQuery Range(Elastic.Clients.Elasticsearch.QueryDsl.NumberRangeQuery rangeQuery) => new UserQuery("range", rangeQuery);
@@ -74,157 +80,164 @@ public bool TryGet<T>([NotNullWhen(true)] out T? result) where T : class
 	}
 }
 
-internal sealed partial class UserQueryConverter : JsonConverter<UserQuery>
+internal sealed partial class UserQueryConverter : System.Text.Json.Serialization.JsonConverter<UserQuery>
 {
-	public override UserQuery Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText VariantBool = System.Text.Json.JsonEncodedText.Encode("bool");
+	private static readonly System.Text.Json.JsonEncodedText VariantExists = System.Text.Json.JsonEncodedText.Encode("exists");
+	private static readonly System.Text.Json.JsonEncodedText VariantIds = System.Text.Json.JsonEncodedText.Encode("ids");
+	private static readonly System.Text.Json.JsonEncodedText VariantMatch = System.Text.Json.JsonEncodedText.Encode("match");
+	private static readonly System.Text.Json.JsonEncodedText VariantMatchAll = System.Text.Json.JsonEncodedText.Encode("match_all");
+	private static readonly System.Text.Json.JsonEncodedText VariantPrefix = System.Text.Json.JsonEncodedText.Encode("prefix");
+	private static readonly System.Text.Json.JsonEncodedText VariantRange = System.Text.Json.JsonEncodedText.Encode("range");
+	private static readonly System.Text.Json.JsonEncodedText VariantSimpleQueryString = System.Text.Json.JsonEncodedText.Encode("simple_query_string");
+	private static readonly System.Text.Json.JsonEncodedText VariantTerm = System.Text.Json.JsonEncodedText.Encode("term");
+	private static readonly System.Text.Json.JsonEncodedText VariantTerms = System.Text.Json.JsonEncodedText.Encode("terms");
+	private static readonly System.Text.Json.JsonEncodedText VariantWildcard = System.Text.Json.JsonEncodedText.Encode("wildcard");
+
+	public override UserQuery Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		var variantType = string.Empty;
+		object? variant = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			throw new JsonException("Expected start token.");
-		}
-
-		object? variantValue = default;
-		string? variantNameValue = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
-		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token.");
-			}
-
-			if (reader.TokenType != JsonTokenType.PropertyName)
+			if (reader.ValueTextEquals(VariantBool))
 			{
-				throw new JsonException("Expected a property name token representing the name of an Elasticsearch field.");
-			}
-
-			var propertyName = reader.GetString();
-			reader.Read();
-			if (propertyName == "bool")
-			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.BoolQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantBool.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.BoolQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "exists")
+			if (reader.ValueTextEquals(VariantExists))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.ExistsQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantExists.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.ExistsQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "ids")
+			if (reader.ValueTextEquals(VariantIds))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.IdsQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantIds.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.IdsQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "match")
+			if (reader.ValueTextEquals(VariantMatch))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.MatchQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantMatch.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.MatchQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "match_all")
+			if (reader.ValueTextEquals(VariantMatchAll))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.MatchAllQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantMatchAll.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.MatchAllQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "prefix")
+			if (reader.ValueTextEquals(VariantPrefix))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.PrefixQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantPrefix.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.PrefixQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "range")
+			if (reader.ValueTextEquals(VariantRange))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.UntypedRangeQuery>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantRange.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.IRangeQuery>(options);
 				continue;
 			}
 
-			if (propertyName == "simple_query_string")
+			if (reader.ValueTextEquals(VariantSimpleQueryString))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.SimpleQueryStringQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantSimpleQueryString.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.SimpleQueryStringQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "term")
+			if (reader.ValueTextEquals(VariantTerm))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.TermQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantTerm.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.TermQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "terms")
+			if (reader.ValueTextEquals(VariantTerms))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.TermsQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantTerms.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.TermsQuery?>(options);
 				continue;
 			}
 
-			if (propertyName == "wildcard")
+			if (reader.ValueTextEquals(VariantWildcard))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.QueryDsl.WildcardQuery?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantWildcard.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.QueryDsl.WildcardQuery?>(options);
 				continue;
 			}
 
-			throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'UserQuery' from the response.");
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		var result = new UserQuery(variantNameValue, variantValue);
-		return result;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new UserQuery { VariantType = variantType, Variant = variant };
 	}
 
-	public override void Write(Utf8JsonWriter writer, UserQuery value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, UserQuery value, System.Text.Json.JsonSerializerOptions options)
 	{
 		writer.WriteStartObject();
-		if (value.VariantName is not null && value.Variant is not null)
+		switch (value.VariantType)
 		{
-			writer.WritePropertyName(value.VariantName);
-			switch (value.VariantName)
-			{
-				case "bool":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.BoolQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.BoolQuery)value.Variant, options);
-					break;
-				case "exists":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.ExistsQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.ExistsQuery)value.Variant, options);
-					break;
-				case "ids":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.IdsQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.IdsQuery)value.Variant, options);
-					break;
-				case "match":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.MatchQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.MatchQuery)value.Variant, options);
-					break;
-				case "match_all":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.MatchAllQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.MatchAllQuery)value.Variant, options);
-					break;
-				case "prefix":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.PrefixQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.PrefixQuery)value.Variant, options);
-					break;
-				case "range":
-					JsonSerializer.Serialize(writer, value.Variant, value.Variant.GetType(), options);
-					break;
-				case "simple_query_string":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.SimpleQueryStringQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.SimpleQueryStringQuery)value.Variant, options);
-					break;
-				case "term":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.TermQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.TermQuery)value.Variant, options);
-					break;
-				case "terms":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.TermsQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.TermsQuery)value.Variant, options);
-					break;
-				case "wildcard":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.QueryDsl.WildcardQuery>(writer, (Elastic.Clients.Elasticsearch.QueryDsl.WildcardQuery)value.Variant, options);
-					break;
-			}
+			case "":
+				break;
+			case "bool":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.BoolQuery?)value.Variant);
+				break;
+			case "exists":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.ExistsQuery?)value.Variant);
+				break;
+			case "ids":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.IdsQuery?)value.Variant);
+				break;
+			case "match":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.MatchQuery?)value.Variant);
+				break;
+			case "match_all":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.MatchAllQuery?)value.Variant);
+				break;
+			case "prefix":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.PrefixQuery?)value.Variant);
+				break;
+			case "range":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.IRangeQuery)value.Variant);
+				break;
+			case "simple_query_string":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.SimpleQueryStringQuery?)value.Variant);
+				break;
+			case "term":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.TermQuery?)value.Variant);
+				break;
+			case "terms":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.TermsQuery?)value.Variant);
+				break;
+			case "wildcard":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.QueryDsl.WildcardQuery?)value.Variant);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.VariantType}' is not supported for type '{nameof(UserQuery)}'.");
 		}
 
 		writer.WriteEndObject();
@@ -274,6 +287,7 @@ private UserQueryDescriptor<TDocument> Set(object variant, string variantName)
 	public UserQueryDescriptor<TDocument> MatchAll(Action<Elastic.Clients.Elasticsearch.QueryDsl.MatchAllQueryDescriptor> configure) => Set(configure, "match_all");
 	public UserQueryDescriptor<TDocument> Prefix(Elastic.Clients.Elasticsearch.QueryDsl.PrefixQuery prefixQuery) => Set(prefixQuery, "prefix");
 	public UserQueryDescriptor<TDocument> Prefix(Action<Elastic.Clients.Elasticsearch.QueryDsl.PrefixQueryDescriptor<TDocument>> configure) => Set(configure, "prefix");
+	public UserQueryDescriptor<TDocument> Range(Elastic.Clients.Elasticsearch.QueryDsl.IRangeQuery rangeQuery) => Set(rangeQuery, "range");
 	public UserQueryDescriptor<TDocument> Range(Elastic.Clients.Elasticsearch.QueryDsl.UntypedRangeQuery rangeQuery) => Set(rangeQuery, "range");
 	public UserQueryDescriptor<TDocument> Range(Elastic.Clients.Elasticsearch.QueryDsl.DateRangeQuery rangeQuery) => Set(rangeQuery, "range");
 	public UserQueryDescriptor<TDocument> Range(Elastic.Clients.Elasticsearch.QueryDsl.NumberRangeQuery rangeQuery) => Set(rangeQuery, "range");
@@ -350,6 +364,7 @@ private UserQueryDescriptor Set(object variant, string variantName)
 	public UserQueryDescriptor MatchAll(Action<Elastic.Clients.Elasticsearch.QueryDsl.MatchAllQueryDescriptor> configure) => Set(configure, "match_all");
 	public UserQueryDescriptor Prefix(Elastic.Clients.Elasticsearch.QueryDsl.PrefixQuery prefixQuery) => Set(prefixQuery, "prefix");
 	public UserQueryDescriptor Prefix<TDocument>(Action<Elastic.Clients.Elasticsearch.QueryDsl.PrefixQueryDescriptor> configure) => Set(configure, "prefix");
+	public UserQueryDescriptor Range(Elastic.Clients.Elasticsearch.QueryDsl.IRangeQuery rangeQuery) => Set(rangeQuery, "range");
 	public UserQueryDescriptor Range(Elastic.Clients.Elasticsearch.QueryDsl.UntypedRangeQuery rangeQuery) => Set(rangeQuery, "range");
 	public UserQueryDescriptor Range(Elastic.Clients.Elasticsearch.QueryDsl.DateRangeQuery rangeQuery) => Set(rangeQuery, "range");
 	public UserQueryDescriptor Range(Elastic.Clients.Elasticsearch.QueryDsl.NumberRangeQuery rangeQuery) => Set(rangeQuery, "range");
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Snapshot/InfoFeatureState.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Snapshot/InfoFeatureState.g.cs
index f5dfd870fd6..9830adfa9ee 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Snapshot/InfoFeatureState.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Snapshot/InfoFeatureState.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,11 +28,52 @@
 
 namespace Elastic.Clients.Elasticsearch.Snapshot;
 
+internal sealed partial class InfoFeatureStateConverter : System.Text.Json.Serialization.JsonConverter<InfoFeatureState>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropFeatureName = System.Text.Json.JsonEncodedText.Encode("feature_name");
+	private static readonly System.Text.Json.JsonEncodedText PropIndices = System.Text.Json.JsonEncodedText.Encode("indices");
+
+	public override InfoFeatureState Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string> propFeatureName = default;
+		LocalJsonProperty<IReadOnlyCollection<string>> propIndices = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propFeatureName.TryRead(ref reader, options, PropFeatureName))
+			{
+				continue;
+			}
+
+			if (propIndices.TryRead(ref reader, options, PropIndices, typeof(SingleOrManyMarker<IReadOnlyCollection<string>, string>)))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new InfoFeatureState
+		{
+			FeatureName = propFeatureName.Value
+,
+			Indices = propIndices.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, InfoFeatureState value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropFeatureName, value.FeatureName);
+		writer.WriteProperty(options, PropIndices, value.Indices, typeof(SingleOrManyMarker<IReadOnlyCollection<string>, string>));
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(InfoFeatureStateConverter))]
 public sealed partial class InfoFeatureState
 {
-	[JsonInclude, JsonPropertyName("feature_name")]
 	public string FeatureName { get; init; }
-	[JsonInclude, JsonPropertyName("indices")]
-	[SingleOrManyCollectionConverter(typeof(string))]
 	public IReadOnlyCollection<string> Indices { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Snapshot/Repositories.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Snapshot/Repositories.g.cs
index 09ae30fd4b8..051bae66dfe 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Snapshot/Repositories.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Snapshot/Repositories.g.cs
@@ -19,6 +19,7 @@
 
 using Elastic.Clients.Elasticsearch.Core;
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport;
 using System;
@@ -86,70 +87,62 @@ public RepositoriesDescriptor() : base(new Repositories())
 	public RepositoriesDescriptor SourceOnly(string repositoryName, SourceOnlyRepository sourceOnlyRepository) => AssignVariant(repositoryName, sourceOnlyRepository);
 }
 
-internal sealed partial class RepositoryInterfaceConverter : JsonConverter<IRepository>
+internal sealed partial class RepositoryInterfaceConverter : System.Text.Json.Serialization.JsonConverter<IRepository>
 {
-	public override IRepository Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropDiscriminator = System.Text.Json.JsonEncodedText.Encode("type");
+
+	public override IRepository Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		var copiedReader = reader;
-		string? type = null;
-		using var jsonDoc = JsonDocument.ParseValue(ref copiedReader);
-		if (jsonDoc is not null && jsonDoc.RootElement.TryGetProperty("type", out var readType) && readType.ValueKind == JsonValueKind.String)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		var readerSnapshot = reader;
+		string? discriminator = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			type = readType.ToString();
+			if (reader.TryReadProperty(options, PropDiscriminator, ref discriminator))
+			{
+				break;
+			}
+
+			reader.Skip();
 		}
 
-		switch (type)
+		reader = readerSnapshot;
+		return discriminator switch
 		{
-			case "azure":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Snapshot.AzureRepository>(ref reader, options);
-			case "gcs":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Snapshot.GcsRepository>(ref reader, options);
-			case "url":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Snapshot.ReadOnlyUrlRepository>(ref reader, options);
-			case "s3":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Snapshot.S3Repository>(ref reader, options);
-			case "fs":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Snapshot.SharedFileSystemRepository>(ref reader, options);
-			case "source":
-				return JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Snapshot.SourceOnlyRepository>(ref reader, options);
-			default:
-				ThrowHelper.ThrowUnknownTaggedUnionVariantJsonException(type, typeof(IRepository));
-				return null;
-		}
+			"azure" => reader.ReadValue<Elastic.Clients.Elasticsearch.Snapshot.AzureRepository>(options),
+			"gcs" => reader.ReadValue<Elastic.Clients.Elasticsearch.Snapshot.GcsRepository>(options),
+			"url" => reader.ReadValue<Elastic.Clients.Elasticsearch.Snapshot.ReadOnlyUrlRepository>(options),
+			"s3" => reader.ReadValue<Elastic.Clients.Elasticsearch.Snapshot.S3Repository>(options),
+			"fs" => reader.ReadValue<Elastic.Clients.Elasticsearch.Snapshot.SharedFileSystemRepository>(options),
+			"source" => reader.ReadValue<Elastic.Clients.Elasticsearch.Snapshot.SourceOnlyRepository>(options),
+			_ => throw new System.Text.Json.JsonException($"Variant '{discriminator}' is not supported for type '{nameof(IRepository)}'.")
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, IRepository value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, IRepository value, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (value is null)
-		{
-			writer.WriteNullValue();
-			return;
-		}
-
 		switch (value.Type)
 		{
 			case "azure":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Snapshot.AzureRepository), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Snapshot.AzureRepository)value);
+				break;
 			case "gcs":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Snapshot.GcsRepository), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Snapshot.GcsRepository)value);
+				break;
 			case "url":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Snapshot.ReadOnlyUrlRepository), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Snapshot.ReadOnlyUrlRepository)value);
+				break;
 			case "s3":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Snapshot.S3Repository), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Snapshot.S3Repository)value);
+				break;
 			case "fs":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Snapshot.SharedFileSystemRepository), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Snapshot.SharedFileSystemRepository)value);
+				break;
 			case "source":
-				JsonSerializer.Serialize(writer, value, typeof(Elastic.Clients.Elasticsearch.Snapshot.SourceOnlyRepository), options);
-				return;
+				writer.WriteValue(options, (Elastic.Clients.Elasticsearch.Snapshot.SourceOnlyRepository)value);
+				break;
 			default:
-				var type = value.GetType();
-				JsonSerializer.Serialize(writer, value, type, options);
-				return;
+				throw new System.Text.Json.JsonException($"Variant '{value.Type}' is not supported for type '{nameof(IRepository)}'.");
 		}
 	}
 }
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Snapshot/SnapshotInfo.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Snapshot/SnapshotInfo.g.cs
index 0d1f801f65a..b9729be6bb0 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Snapshot/SnapshotInfo.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Snapshot/SnapshotInfo.g.cs
@@ -46,7 +46,6 @@ public sealed partial class SnapshotInfo
 	[JsonInclude, JsonPropertyName("include_global_state")]
 	public bool? IncludeGlobalState { get; init; }
 	[JsonInclude, JsonPropertyName("index_details")]
-	[ReadOnlyIndexNameDictionaryConverter(typeof(Elastic.Clients.Elasticsearch.Snapshot.IndexDetails))]
 	public IReadOnlyDictionary<Elastic.Clients.Elasticsearch.IndexName, Elastic.Clients.Elasticsearch.Snapshot.IndexDetails>? IndexDetails { get; init; }
 	[JsonInclude, JsonPropertyName("indices")]
 	public IReadOnlyCollection<string>? Indices { get; init; }
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Snapshot/SourceOnlyRepositorySettings.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Snapshot/SourceOnlyRepositorySettings.g.cs
index d0a7cc8db3e..30c3010cc2b 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Snapshot/SourceOnlyRepositorySettings.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Snapshot/SourceOnlyRepositorySettings.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,110 +28,96 @@
 
 namespace Elastic.Clients.Elasticsearch.Snapshot;
 
-internal sealed partial class SourceOnlyRepositorySettingsConverter : JsonConverter<SourceOnlyRepositorySettings>
+internal sealed partial class SourceOnlyRepositorySettingsConverter : System.Text.Json.Serialization.JsonConverter<SourceOnlyRepositorySettings>
 {
-	public override SourceOnlyRepositorySettings Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropChunkSize = System.Text.Json.JsonEncodedText.Encode("chunk_size");
+	private static readonly System.Text.Json.JsonEncodedText PropCompress = System.Text.Json.JsonEncodedText.Encode("compress");
+	private static readonly System.Text.Json.JsonEncodedText PropDelegateType = System.Text.Json.JsonEncodedText.Encode("delegate_type");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxNumberOfSnapshots = System.Text.Json.JsonEncodedText.Encode("max_number_of_snapshots");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxRestoreBytesPerSec = System.Text.Json.JsonEncodedText.Encode("max_restore_bytes_per_sec");
+	private static readonly System.Text.Json.JsonEncodedText PropMaxSnapshotBytesPerSec = System.Text.Json.JsonEncodedText.Encode("max_snapshot_bytes_per_sec");
+	private static readonly System.Text.Json.JsonEncodedText PropReadOnly = System.Text.Json.JsonEncodedText.Encode("read_only");
+	private static readonly System.Text.Json.JsonEncodedText PropReadOnly1 = System.Text.Json.JsonEncodedText.Encode("readonly");
+
+	public override SourceOnlyRepositorySettings Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		var variant = new SourceOnlyRepositorySettings();
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.ByteSize?> propChunkSize = default;
+		LocalJsonProperty<bool?> propCompress = default;
+		LocalJsonProperty<string?> propDelegateType = default;
+		LocalJsonProperty<int?> propMaxNumberOfSnapshots = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.ByteSize?> propMaxRestoreBytesPerSec = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.ByteSize?> propMaxSnapshotBytesPerSec = default;
+		LocalJsonProperty<bool?> propReadOnly = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propChunkSize.TryRead(ref reader, options, PropChunkSize))
 			{
-				var property = reader.GetString();
-				if (property == "chunk_size")
-				{
-					variant.ChunkSize = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.ByteSize?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "compress")
-				{
-					variant.Compress = JsonSerializer.Deserialize<bool?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "delegate_type")
-				{
-					variant.DelegateType = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "max_number_of_snapshots")
-				{
-					variant.MaxNumberOfSnapshots = JsonSerializer.Deserialize<int?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "max_restore_bytes_per_sec")
-				{
-					variant.MaxRestoreBytesPerSec = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.ByteSize?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "max_snapshot_bytes_per_sec")
-				{
-					variant.MaxSnapshotBytesPerSec = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.ByteSize?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "read_only" || property == "readonly")
-				{
-					variant.ReadOnly = JsonSerializer.Deserialize<bool?>(ref reader, options);
-					continue;
-				}
+				continue;
 			}
-		}
 
-		return variant;
-	}
+			if (propCompress.TryRead(ref reader, options, PropCompress))
+			{
+				continue;
+			}
 
-	public override void Write(Utf8JsonWriter writer, SourceOnlyRepositorySettings value, JsonSerializerOptions options)
-	{
-		writer.WriteStartObject();
-		if (value.ChunkSize is not null)
-		{
-			writer.WritePropertyName("chunk_size");
-			JsonSerializer.Serialize(writer, value.ChunkSize, options);
-		}
+			if (propDelegateType.TryRead(ref reader, options, PropDelegateType))
+			{
+				continue;
+			}
 
-		if (value.Compress.HasValue)
-		{
-			writer.WritePropertyName("compress");
-			writer.WriteBooleanValue(value.Compress.Value);
-		}
+			if (propMaxNumberOfSnapshots.TryRead(ref reader, options, PropMaxNumberOfSnapshots))
+			{
+				continue;
+			}
 
-		if (!string.IsNullOrEmpty(value.DelegateType))
-		{
-			writer.WritePropertyName("delegate_type");
-			writer.WriteStringValue(value.DelegateType);
-		}
+			if (propMaxRestoreBytesPerSec.TryRead(ref reader, options, PropMaxRestoreBytesPerSec))
+			{
+				continue;
+			}
 
-		if (value.MaxNumberOfSnapshots.HasValue)
-		{
-			writer.WritePropertyName("max_number_of_snapshots");
-			writer.WriteNumberValue(value.MaxNumberOfSnapshots.Value);
-		}
+			if (propMaxSnapshotBytesPerSec.TryRead(ref reader, options, PropMaxSnapshotBytesPerSec))
+			{
+				continue;
+			}
 
-		if (value.MaxRestoreBytesPerSec is not null)
-		{
-			writer.WritePropertyName("max_restore_bytes_per_sec");
-			JsonSerializer.Serialize(writer, value.MaxRestoreBytesPerSec, options);
-		}
+			if (propReadOnly.TryRead(ref reader, options, PropReadOnly) || propReadOnly.TryRead(ref reader, options, PropReadOnly1))
+			{
+				continue;
+			}
 
-		if (value.MaxSnapshotBytesPerSec is not null)
-		{
-			writer.WritePropertyName("max_snapshot_bytes_per_sec");
-			JsonSerializer.Serialize(writer, value.MaxSnapshotBytesPerSec, options);
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		if (value.ReadOnly.HasValue)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new SourceOnlyRepositorySettings
 		{
-			writer.WritePropertyName("read_only");
-			writer.WriteBooleanValue(value.ReadOnly.Value);
-		}
+			ChunkSize = propChunkSize.Value
+,
+			Compress = propCompress.Value
+,
+			DelegateType = propDelegateType.Value
+,
+			MaxNumberOfSnapshots = propMaxNumberOfSnapshots.Value
+,
+			MaxRestoreBytesPerSec = propMaxRestoreBytesPerSec.Value
+,
+			MaxSnapshotBytesPerSec = propMaxSnapshotBytesPerSec.Value
+,
+			ReadOnly = propReadOnly.Value
+		};
+	}
 
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, SourceOnlyRepositorySettings value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropChunkSize, value.ChunkSize);
+		writer.WriteProperty(options, PropCompress, value.Compress);
+		writer.WriteProperty(options, PropDelegateType, value.DelegateType);
+		writer.WriteProperty(options, PropMaxNumberOfSnapshots, value.MaxNumberOfSnapshots);
+		writer.WriteProperty(options, PropMaxRestoreBytesPerSec, value.MaxRestoreBytesPerSec);
+		writer.WriteProperty(options, PropMaxSnapshotBytesPerSec, value.MaxSnapshotBytesPerSec);
+		writer.WriteProperty(options, PropReadOnly, value.ReadOnly);
 		writer.WriteEndObject();
 	}
 }
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/SnapshotLifecycleManagement/Statistics.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/SnapshotLifecycleManagement/Statistics.g.cs
index 60a4d0467ae..7c16075b67e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/SnapshotLifecycleManagement/Statistics.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/SnapshotLifecycleManagement/Statistics.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,95 +28,130 @@
 
 namespace Elastic.Clients.Elasticsearch.SnapshotLifecycleManagement;
 
-internal sealed partial class StatisticsConverter : JsonConverter<Statistics>
+internal sealed partial class StatisticsConverter : System.Text.Json.Serialization.JsonConverter<Statistics>
 {
-	public override Statistics Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropPolicy = System.Text.Json.JsonEncodedText.Encode("policy");
+	private static readonly System.Text.Json.JsonEncodedText PropRetentionDeletionTime = System.Text.Json.JsonEncodedText.Encode("retention_deletion_time");
+	private static readonly System.Text.Json.JsonEncodedText PropRetentionDeletionTimeMillis = System.Text.Json.JsonEncodedText.Encode("retention_deletion_time_millis");
+	private static readonly System.Text.Json.JsonEncodedText PropRetentionFailed = System.Text.Json.JsonEncodedText.Encode("retention_failed");
+	private static readonly System.Text.Json.JsonEncodedText PropRetentionRuns = System.Text.Json.JsonEncodedText.Encode("retention_runs");
+	private static readonly System.Text.Json.JsonEncodedText PropRetentionTimedOut = System.Text.Json.JsonEncodedText.Encode("retention_timed_out");
+	private static readonly System.Text.Json.JsonEncodedText PropTotalSnapshotDeletionFailures = System.Text.Json.JsonEncodedText.Encode("total_snapshot_deletion_failures");
+	private static readonly System.Text.Json.JsonEncodedText PropTotalSnapshotDeletionFailures1 = System.Text.Json.JsonEncodedText.Encode("snapshot_deletion_failures");
+	private static readonly System.Text.Json.JsonEncodedText PropTotalSnapshotsDeleted = System.Text.Json.JsonEncodedText.Encode("total_snapshots_deleted");
+	private static readonly System.Text.Json.JsonEncodedText PropTotalSnapshotsDeleted1 = System.Text.Json.JsonEncodedText.Encode("snapshots_deleted");
+	private static readonly System.Text.Json.JsonEncodedText PropTotalSnapshotsFailed = System.Text.Json.JsonEncodedText.Encode("total_snapshots_failed");
+	private static readonly System.Text.Json.JsonEncodedText PropTotalSnapshotsFailed1 = System.Text.Json.JsonEncodedText.Encode("snapshots_failed");
+	private static readonly System.Text.Json.JsonEncodedText PropTotalSnapshotsTaken = System.Text.Json.JsonEncodedText.Encode("total_snapshots_taken");
+	private static readonly System.Text.Json.JsonEncodedText PropTotalSnapshotsTaken1 = System.Text.Json.JsonEncodedText.Encode("snapshots_taken");
+
+	public override Statistics Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		string? policy = default;
-		Elastic.Clients.Elasticsearch.Duration? retentionDeletionTime = default;
-		long? retentionDeletionTimeMillis = default;
-		long? retentionFailed = default;
-		long? retentionRuns = default;
-		long? retentionTimedOut = default;
-		long? totalSnapshotDeletionFailures = default;
-		long? totalSnapshotsDeleted = default;
-		long? totalSnapshotsFailed = default;
-		long? totalSnapshotsTaken = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string?> propPolicy = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Duration?> propRetentionDeletionTime = default;
+		LocalJsonProperty<long?> propRetentionDeletionTimeMillis = default;
+		LocalJsonProperty<long?> propRetentionFailed = default;
+		LocalJsonProperty<long?> propRetentionRuns = default;
+		LocalJsonProperty<long?> propRetentionTimedOut = default;
+		LocalJsonProperty<long?> propTotalSnapshotDeletionFailures = default;
+		LocalJsonProperty<long?> propTotalSnapshotsDeleted = default;
+		LocalJsonProperty<long?> propTotalSnapshotsFailed = default;
+		LocalJsonProperty<long?> propTotalSnapshotsTaken = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propPolicy.TryRead(ref reader, options, PropPolicy))
 			{
-				var property = reader.GetString();
-				if (property == "policy")
-				{
-					policy = JsonSerializer.Deserialize<string?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "retention_deletion_time")
-				{
-					retentionDeletionTime = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Duration?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "retention_deletion_time_millis")
-				{
-					retentionDeletionTimeMillis = JsonSerializer.Deserialize<long?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "retention_failed")
-				{
-					retentionFailed = JsonSerializer.Deserialize<long?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "retention_runs")
-				{
-					retentionRuns = JsonSerializer.Deserialize<long?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "retention_timed_out")
-				{
-					retentionTimedOut = JsonSerializer.Deserialize<long?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "total_snapshot_deletion_failures" || property == "snapshot_deletion_failures")
-				{
-					totalSnapshotDeletionFailures = JsonSerializer.Deserialize<long?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "total_snapshots_deleted" || property == "snapshots_deleted")
-				{
-					totalSnapshotsDeleted = JsonSerializer.Deserialize<long?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "total_snapshots_failed" || property == "snapshots_failed")
-				{
-					totalSnapshotsFailed = JsonSerializer.Deserialize<long?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "total_snapshots_taken" || property == "snapshots_taken")
-				{
-					totalSnapshotsTaken = JsonSerializer.Deserialize<long?>(ref reader, options);
-					continue;
-				}
+				continue;
 			}
+
+			if (propRetentionDeletionTime.TryRead(ref reader, options, PropRetentionDeletionTime))
+			{
+				continue;
+			}
+
+			if (propRetentionDeletionTimeMillis.TryRead(ref reader, options, PropRetentionDeletionTimeMillis))
+			{
+				continue;
+			}
+
+			if (propRetentionFailed.TryRead(ref reader, options, PropRetentionFailed))
+			{
+				continue;
+			}
+
+			if (propRetentionRuns.TryRead(ref reader, options, PropRetentionRuns))
+			{
+				continue;
+			}
+
+			if (propRetentionTimedOut.TryRead(ref reader, options, PropRetentionTimedOut))
+			{
+				continue;
+			}
+
+			if (propTotalSnapshotDeletionFailures.TryRead(ref reader, options, PropTotalSnapshotDeletionFailures) || propTotalSnapshotDeletionFailures.TryRead(ref reader, options, PropTotalSnapshotDeletionFailures1))
+			{
+				continue;
+			}
+
+			if (propTotalSnapshotsDeleted.TryRead(ref reader, options, PropTotalSnapshotsDeleted) || propTotalSnapshotsDeleted.TryRead(ref reader, options, PropTotalSnapshotsDeleted1))
+			{
+				continue;
+			}
+
+			if (propTotalSnapshotsFailed.TryRead(ref reader, options, PropTotalSnapshotsFailed) || propTotalSnapshotsFailed.TryRead(ref reader, options, PropTotalSnapshotsFailed1))
+			{
+				continue;
+			}
+
+			if (propTotalSnapshotsTaken.TryRead(ref reader, options, PropTotalSnapshotsTaken) || propTotalSnapshotsTaken.TryRead(ref reader, options, PropTotalSnapshotsTaken1))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		return new Statistics { Policy = policy, RetentionDeletionTime = retentionDeletionTime, RetentionDeletionTimeMillis = retentionDeletionTimeMillis, RetentionFailed = retentionFailed, RetentionRuns = retentionRuns, RetentionTimedOut = retentionTimedOut, TotalSnapshotDeletionFailures = totalSnapshotDeletionFailures, TotalSnapshotsDeleted = totalSnapshotsDeleted, TotalSnapshotsFailed = totalSnapshotsFailed, TotalSnapshotsTaken = totalSnapshotsTaken };
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new Statistics
+		{
+			Policy = propPolicy.Value
+,
+			RetentionDeletionTime = propRetentionDeletionTime.Value
+,
+			RetentionDeletionTimeMillis = propRetentionDeletionTimeMillis.Value
+,
+			RetentionFailed = propRetentionFailed.Value
+,
+			RetentionRuns = propRetentionRuns.Value
+,
+			RetentionTimedOut = propRetentionTimedOut.Value
+,
+			TotalSnapshotDeletionFailures = propTotalSnapshotDeletionFailures.Value
+,
+			TotalSnapshotsDeleted = propTotalSnapshotsDeleted.Value
+,
+			TotalSnapshotsFailed = propTotalSnapshotsFailed.Value
+,
+			TotalSnapshotsTaken = propTotalSnapshotsTaken.Value
+		};
 	}
 
-	public override void Write(Utf8JsonWriter writer, Statistics value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, Statistics value, System.Text.Json.JsonSerializerOptions options)
 	{
-		throw new NotImplementedException("'Statistics' is a readonly type, used only on responses and does not support being written to JSON.");
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropPolicy, value.Policy);
+		writer.WriteProperty(options, PropRetentionDeletionTime, value.RetentionDeletionTime);
+		writer.WriteProperty(options, PropRetentionDeletionTimeMillis, value.RetentionDeletionTimeMillis);
+		writer.WriteProperty(options, PropRetentionFailed, value.RetentionFailed);
+		writer.WriteProperty(options, PropRetentionRuns, value.RetentionRuns);
+		writer.WriteProperty(options, PropRetentionTimedOut, value.RetentionTimedOut);
+		writer.WriteProperty(options, PropTotalSnapshotDeletionFailures, value.TotalSnapshotDeletionFailures);
+		writer.WriteProperty(options, PropTotalSnapshotsDeleted, value.TotalSnapshotsDeleted);
+		writer.WriteProperty(options, PropTotalSnapshotsFailed, value.TotalSnapshotsFailed);
+		writer.WriteProperty(options, PropTotalSnapshotsTaken, value.TotalSnapshotsTaken);
+		writer.WriteEndObject();
 	}
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/StandardRetriever.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/StandardRetriever.g.cs
index 2cac0294e41..dc355147ffa 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/StandardRetriever.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/StandardRetriever.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,100 @@
 
 namespace Elastic.Clients.Elasticsearch;
 
+internal sealed partial class StandardRetrieverConverter : System.Text.Json.Serialization.JsonConverter<StandardRetriever>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropCollapse = System.Text.Json.JsonEncodedText.Encode("collapse");
+	private static readonly System.Text.Json.JsonEncodedText PropFilter = System.Text.Json.JsonEncodedText.Encode("filter");
+	private static readonly System.Text.Json.JsonEncodedText PropMinScore = System.Text.Json.JsonEncodedText.Encode("min_score");
+	private static readonly System.Text.Json.JsonEncodedText PropQuery = System.Text.Json.JsonEncodedText.Encode("query");
+	private static readonly System.Text.Json.JsonEncodedText PropSearchAfter = System.Text.Json.JsonEncodedText.Encode("search_after");
+	private static readonly System.Text.Json.JsonEncodedText PropSort = System.Text.Json.JsonEncodedText.Encode("sort");
+	private static readonly System.Text.Json.JsonEncodedText PropTerminateAfter = System.Text.Json.JsonEncodedText.Encode("terminate_after");
+
+	public override StandardRetriever Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Core.Search.FieldCollapse?> propCollapse = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.QueryDsl.Query>?> propFilter = default;
+		LocalJsonProperty<float?> propMinScore = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.QueryDsl.Query?> propQuery = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.FieldValue>?> propSearchAfter = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.SortOptions>?> propSort = default;
+		LocalJsonProperty<int?> propTerminateAfter = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propCollapse.TryRead(ref reader, options, PropCollapse))
+			{
+				continue;
+			}
+
+			if (propFilter.TryRead(ref reader, options, PropFilter, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.QueryDsl.Query>?, Elastic.Clients.Elasticsearch.QueryDsl.Query>)))
+			{
+				continue;
+			}
+
+			if (propMinScore.TryRead(ref reader, options, PropMinScore))
+			{
+				continue;
+			}
+
+			if (propQuery.TryRead(ref reader, options, PropQuery))
+			{
+				continue;
+			}
+
+			if (propSearchAfter.TryRead(ref reader, options, PropSearchAfter))
+			{
+				continue;
+			}
+
+			if (propSort.TryRead(ref reader, options, PropSort, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.SortOptions>?, Elastic.Clients.Elasticsearch.SortOptions>)))
+			{
+				continue;
+			}
+
+			if (propTerminateAfter.TryRead(ref reader, options, PropTerminateAfter))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new StandardRetriever
+		{
+			Collapse = propCollapse.Value
+,
+			Filter = propFilter.Value
+,
+			MinScore = propMinScore.Value
+,
+			Query = propQuery.Value
+,
+			SearchAfter = propSearchAfter.Value
+,
+			Sort = propSort.Value
+,
+			TerminateAfter = propTerminateAfter.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, StandardRetriever value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropCollapse, value.Collapse);
+		writer.WriteProperty(options, PropFilter, value.Filter, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.QueryDsl.Query>?, Elastic.Clients.Elasticsearch.QueryDsl.Query>));
+		writer.WriteProperty(options, PropMinScore, value.MinScore);
+		writer.WriteProperty(options, PropQuery, value.Query);
+		writer.WriteProperty(options, PropSearchAfter, value.SearchAfter);
+		writer.WriteProperty(options, PropSort, value.Sort, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.SortOptions>?, Elastic.Clients.Elasticsearch.SortOptions>));
+		writer.WriteProperty(options, PropTerminateAfter, value.TerminateAfter);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(StandardRetrieverConverter))]
 public sealed partial class StandardRetriever
 {
 	/// <summary>
@@ -34,7 +129,6 @@ public sealed partial class StandardRetriever
 	/// Collapses the top documents by a specified key into a single top document per key.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("collapse")]
 	public Elastic.Clients.Elasticsearch.Core.Search.FieldCollapse? Collapse { get; set; }
 
 	/// <summary>
@@ -42,8 +136,6 @@ public sealed partial class StandardRetriever
 	/// Query to filter the documents that can match.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("filter")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.QueryDsl.Query))]
 	public ICollection<Elastic.Clients.Elasticsearch.QueryDsl.Query>? Filter { get; set; }
 
 	/// <summary>
@@ -51,7 +143,6 @@ public sealed partial class StandardRetriever
 	/// Minimum _score for matching documents. Documents with a lower _score are not included in the top documents.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("min_score")]
 	public float? MinScore { get; set; }
 
 	/// <summary>
@@ -59,7 +150,6 @@ public sealed partial class StandardRetriever
 	/// Defines a query to retrieve a set of top documents.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("query")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.Query? Query { get; set; }
 
 	/// <summary>
@@ -67,7 +157,6 @@ public sealed partial class StandardRetriever
 	/// Defines a search after object parameter used for pagination.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("search_after")]
 	public ICollection<Elastic.Clients.Elasticsearch.FieldValue>? SearchAfter { get; set; }
 
 	/// <summary>
@@ -75,8 +164,6 @@ public sealed partial class StandardRetriever
 	/// A sort object that that specifies the order of matching documents.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("sort")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.SortOptions))]
 	public ICollection<Elastic.Clients.Elasticsearch.SortOptions>? Sort { get; set; }
 
 	/// <summary>
@@ -84,7 +171,6 @@ public sealed partial class StandardRetriever
 	/// Maximum number of documents to collect for each shard.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("terminate_after")]
 	public int? TerminateAfter { get; set; }
 
 	public static implicit operator Elastic.Clients.Elasticsearch.Retriever(StandardRetriever standardRetriever) => Elastic.Clients.Elasticsearch.Retriever.Standard(standardRetriever);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/TextSimilarityReranker.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/TextSimilarityReranker.g.cs
index 95ea8843489..f538c5d11d7 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/TextSimilarityReranker.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/TextSimilarityReranker.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,100 @@
 
 namespace Elastic.Clients.Elasticsearch;
 
+internal sealed partial class TextSimilarityRerankerConverter : System.Text.Json.Serialization.JsonConverter<TextSimilarityReranker>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropField = System.Text.Json.JsonEncodedText.Encode("field");
+	private static readonly System.Text.Json.JsonEncodedText PropFilter = System.Text.Json.JsonEncodedText.Encode("filter");
+	private static readonly System.Text.Json.JsonEncodedText PropInferenceId = System.Text.Json.JsonEncodedText.Encode("inference_id");
+	private static readonly System.Text.Json.JsonEncodedText PropInferenceText = System.Text.Json.JsonEncodedText.Encode("inference_text");
+	private static readonly System.Text.Json.JsonEncodedText PropMinScore = System.Text.Json.JsonEncodedText.Encode("min_score");
+	private static readonly System.Text.Json.JsonEncodedText PropRankWindowSize = System.Text.Json.JsonEncodedText.Encode("rank_window_size");
+	private static readonly System.Text.Json.JsonEncodedText PropRetriever = System.Text.Json.JsonEncodedText.Encode("retriever");
+
+	public override TextSimilarityReranker Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<string?> propField = default;
+		LocalJsonProperty<ICollection<Elastic.Clients.Elasticsearch.QueryDsl.Query>?> propFilter = default;
+		LocalJsonProperty<string?> propInferenceId = default;
+		LocalJsonProperty<string?> propInferenceText = default;
+		LocalJsonProperty<float?> propMinScore = default;
+		LocalJsonProperty<int?> propRankWindowSize = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Retriever> propRetriever = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propField.TryRead(ref reader, options, PropField))
+			{
+				continue;
+			}
+
+			if (propFilter.TryRead(ref reader, options, PropFilter, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.QueryDsl.Query>?, Elastic.Clients.Elasticsearch.QueryDsl.Query>)))
+			{
+				continue;
+			}
+
+			if (propInferenceId.TryRead(ref reader, options, PropInferenceId))
+			{
+				continue;
+			}
+
+			if (propInferenceText.TryRead(ref reader, options, PropInferenceText))
+			{
+				continue;
+			}
+
+			if (propMinScore.TryRead(ref reader, options, PropMinScore))
+			{
+				continue;
+			}
+
+			if (propRankWindowSize.TryRead(ref reader, options, PropRankWindowSize))
+			{
+				continue;
+			}
+
+			if (propRetriever.TryRead(ref reader, options, PropRetriever))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new TextSimilarityReranker
+		{
+			Field = propField.Value
+,
+			Filter = propFilter.Value
+,
+			InferenceId = propInferenceId.Value
+,
+			InferenceText = propInferenceText.Value
+,
+			MinScore = propMinScore.Value
+,
+			RankWindowSize = propRankWindowSize.Value
+,
+			Retriever = propRetriever.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, TextSimilarityReranker value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropField, value.Field);
+		writer.WriteProperty(options, PropFilter, value.Filter, typeof(SingleOrManyMarker<IReadOnlyCollection<Elastic.Clients.Elasticsearch.QueryDsl.Query>?, Elastic.Clients.Elasticsearch.QueryDsl.Query>));
+		writer.WriteProperty(options, PropInferenceId, value.InferenceId);
+		writer.WriteProperty(options, PropInferenceText, value.InferenceText);
+		writer.WriteProperty(options, PropMinScore, value.MinScore);
+		writer.WriteProperty(options, PropRankWindowSize, value.RankWindowSize);
+		writer.WriteProperty(options, PropRetriever, value.Retriever);
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(TextSimilarityRerankerConverter))]
 public sealed partial class TextSimilarityReranker
 {
 	/// <summary>
@@ -34,7 +129,6 @@ public sealed partial class TextSimilarityReranker
 	/// The document field to be used for text similarity comparisons. This field should contain the text that will be evaluated against the inference_text
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("field")]
 	public string? Field { get; set; }
 
 	/// <summary>
@@ -42,8 +136,6 @@ public sealed partial class TextSimilarityReranker
 	/// Query to filter the documents that can match.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("filter")]
-	[SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.QueryDsl.Query))]
 	public ICollection<Elastic.Clients.Elasticsearch.QueryDsl.Query>? Filter { get; set; }
 
 	/// <summary>
@@ -51,7 +143,6 @@ public sealed partial class TextSimilarityReranker
 	/// Unique identifier of the inference endpoint created using the inference API.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("inference_id")]
 	public string? InferenceId { get; set; }
 
 	/// <summary>
@@ -59,7 +150,6 @@ public sealed partial class TextSimilarityReranker
 	/// The text snippet used as the basis for similarity comparison
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("inference_text")]
 	public string? InferenceText { get; set; }
 
 	/// <summary>
@@ -67,7 +157,6 @@ public sealed partial class TextSimilarityReranker
 	/// Minimum _score for matching documents. Documents with a lower _score are not included in the top documents.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("min_score")]
 	public float? MinScore { get; set; }
 
 	/// <summary>
@@ -75,7 +164,6 @@ public sealed partial class TextSimilarityReranker
 	/// This value determines how many documents we will consider from the nested retriever.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("rank_window_size")]
 	public int? RankWindowSize { get; set; }
 
 	/// <summary>
@@ -83,7 +171,6 @@ public sealed partial class TextSimilarityReranker
 	/// The nested retriever which will produce the first-level results, that will later be used for reranking.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("retriever")]
 	public Elastic.Clients.Elasticsearch.Retriever Retriever { get; set; }
 
 	public static implicit operator Elastic.Clients.Elasticsearch.Retriever(TextSimilarityReranker textSimilarityReranker) => Elastic.Clients.Elasticsearch.Retriever.TextSimilarityReranker(textSimilarityReranker);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/TransformManagement/Latest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/TransformManagement/Latest.g.cs
index 825a95aa3d9..7e260bc2778 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/TransformManagement/Latest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/TransformManagement/Latest.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,6 +28,50 @@
 
 namespace Elastic.Clients.Elasticsearch.TransformManagement;
 
+internal sealed partial class LatestConverter : System.Text.Json.Serialization.JsonConverter<Latest>
+{
+	private static readonly System.Text.Json.JsonEncodedText PropSort = System.Text.Json.JsonEncodedText.Encode("sort");
+	private static readonly System.Text.Json.JsonEncodedText PropUniqueKey = System.Text.Json.JsonEncodedText.Encode("unique_key");
+
+	public override Latest Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Field> propSort = default;
+		LocalJsonProperty<Elastic.Clients.Elasticsearch.Fields> propUniqueKey = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
+		{
+			if (propSort.TryRead(ref reader, options, PropSort))
+			{
+				continue;
+			}
+
+			if (propUniqueKey.TryRead(ref reader, options, PropUniqueKey, typeof(FieldsMarker)))
+			{
+				continue;
+			}
+
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
+		}
+
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new Latest
+		{
+			Sort = propSort.Value
+,
+			UniqueKey = propUniqueKey.Value
+		};
+	}
+
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, Latest value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropSort, value.Sort);
+		writer.WriteProperty(options, PropUniqueKey, value.UniqueKey, typeof(FieldsMarker));
+		writer.WriteEndObject();
+	}
+}
+
+[JsonConverter(typeof(LatestConverter))]
 public sealed partial class Latest
 {
 	/// <summary>
@@ -34,7 +79,6 @@ public sealed partial class Latest
 	/// Specifies the date field that is used to identify the latest documents.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("sort")]
 	public Elastic.Clients.Elasticsearch.Field Sort { get; set; }
 
 	/// <summary>
@@ -42,8 +86,6 @@ public sealed partial class Latest
 	/// Specifies an array of one or more fields that are used to group the data.
 	/// </para>
 	/// </summary>
-	[JsonInclude, JsonPropertyName("unique_key")]
-	[JsonConverter(typeof(FieldsConverter))]
 	public Elastic.Clients.Elasticsearch.Fields UniqueKey { get; set; }
 }
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/TransformManagement/Pivot.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/TransformManagement/Pivot.g.cs
index 446ea9688d1..ac400fedf02 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/TransformManagement/Pivot.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/TransformManagement/Pivot.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -27,50 +28,46 @@
 
 namespace Elastic.Clients.Elasticsearch.TransformManagement;
 
-internal sealed partial class PivotConverter : JsonConverter<Pivot>
+internal sealed partial class PivotConverter : System.Text.Json.Serialization.JsonConverter<Pivot>
 {
-	public override Pivot Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations = System.Text.Json.JsonEncodedText.Encode("aggregations");
+	private static readonly System.Text.Json.JsonEncodedText PropAggregations1 = System.Text.Json.JsonEncodedText.Encode("aggs");
+	private static readonly System.Text.Json.JsonEncodedText PropGroupBy = System.Text.Json.JsonEncodedText.Encode("group_by");
+
+	public override Pivot Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
 	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-			throw new JsonException("Unexpected JSON detected.");
-		var variant = new Pivot();
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		LocalJsonProperty<IDictionary<string, Elastic.Clients.Elasticsearch.Aggregations.Aggregation>?> propAggregations = default;
+		LocalJsonProperty<IDictionary<string, Elastic.Clients.Elasticsearch.TransformManagement.PivotGroupBy>?> propGroupBy = default;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType == JsonTokenType.PropertyName)
+			if (propAggregations.TryRead(ref reader, options, PropAggregations) || propAggregations.TryRead(ref reader, options, PropAggregations1))
 			{
-				var property = reader.GetString();
-				if (property == "aggregations" || property == "aggs")
-				{
-					variant.Aggregations = JsonSerializer.Deserialize<IDictionary<string, Elastic.Clients.Elasticsearch.Aggregations.Aggregation>?>(ref reader, options);
-					continue;
-				}
-
-				if (property == "group_by")
-				{
-					variant.GroupBy = JsonSerializer.Deserialize<IDictionary<string, Elastic.Clients.Elasticsearch.TransformManagement.PivotGroupBy>?>(ref reader, options);
-					continue;
-				}
+				continue;
 			}
-		}
 
-		return variant;
-	}
+			if (propGroupBy.TryRead(ref reader, options, PropGroupBy))
+			{
+				continue;
+			}
 
-	public override void Write(Utf8JsonWriter writer, Pivot value, JsonSerializerOptions options)
-	{
-		writer.WriteStartObject();
-		if (value.Aggregations is not null)
-		{
-			writer.WritePropertyName("aggregations");
-			JsonSerializer.Serialize(writer, value.Aggregations, options);
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		if (value.GroupBy is not null)
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new Pivot
 		{
-			writer.WritePropertyName("group_by");
-			JsonSerializer.Serialize(writer, value.GroupBy, options);
-		}
+			Aggregations = propAggregations.Value
+,
+			GroupBy = propGroupBy.Value
+		};
+	}
 
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, Pivot value, System.Text.Json.JsonSerializerOptions options)
+	{
+		writer.WriteStartObject();
+		writer.WriteProperty(options, PropAggregations, value.Aggregations);
+		writer.WriteProperty(options, PropGroupBy, value.GroupBy);
 		writer.WriteEndObject();
 	}
 }
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 94ea8f60c65..84cdb1126ce 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/TransformManagement/PivotGroupBy.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/TransformManagement/PivotGroupBy.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -39,12 +40,16 @@ internal PivotGroupBy(string variantName, object variant)
 			throw new ArgumentNullException(nameof(variant));
 		if (string.IsNullOrWhiteSpace(variantName))
 			throw new ArgumentException("Variant name must not be empty or whitespace.");
-		VariantName = variantName;
+		VariantType = variantName;
 		Variant = variant;
 	}
 
-	internal object Variant { get; }
-	internal string VariantName { get; }
+	internal PivotGroupBy()
+	{
+	}
+
+	public object Variant { get; internal set; }
+	public string VariantType { get; internal set; }
 
 	public static PivotGroupBy DateHistogram(Elastic.Clients.Elasticsearch.Aggregations.DateHistogramAggregation dateHistogramAggregation) => new PivotGroupBy("date_histogram", dateHistogramAggregation);
 	public static PivotGroupBy GeotileGrid(Elastic.Clients.Elasticsearch.Aggregations.GeotileGridAggregation geotileGridAggregation) => new PivotGroupBy("geotile_grid", geotileGridAggregation);
@@ -64,87 +69,80 @@ public bool TryGet<T>([NotNullWhen(true)] out T? result) where T : class
 	}
 }
 
-internal sealed partial class PivotGroupByConverter : JsonConverter<PivotGroupBy>
+internal sealed partial class PivotGroupByConverter : System.Text.Json.Serialization.JsonConverter<PivotGroupBy>
 {
-	public override PivotGroupBy Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-		{
-			throw new JsonException("Expected start token.");
-		}
+	private static readonly System.Text.Json.JsonEncodedText VariantDateHistogram = System.Text.Json.JsonEncodedText.Encode("date_histogram");
+	private static readonly System.Text.Json.JsonEncodedText VariantGeotileGrid = System.Text.Json.JsonEncodedText.Encode("geotile_grid");
+	private static readonly System.Text.Json.JsonEncodedText VariantHistogram = System.Text.Json.JsonEncodedText.Encode("histogram");
+	private static readonly System.Text.Json.JsonEncodedText VariantTerms = System.Text.Json.JsonEncodedText.Encode("terms");
 
-		object? variantValue = default;
-		string? variantNameValue = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+	public override PivotGroupBy Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		var variantType = string.Empty;
+		object? variant = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
+			if (reader.ValueTextEquals(VariantDateHistogram))
 			{
-				throw new JsonException("Expected a property name token.");
-			}
-
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token representing the name of an Elasticsearch field.");
-			}
-
-			var propertyName = reader.GetString();
-			reader.Read();
-			if (propertyName == "date_histogram")
-			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.DateHistogramAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantDateHistogram.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.DateHistogramAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "geotile_grid")
+			if (reader.ValueTextEquals(VariantGeotileGrid))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.GeotileGridAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantGeotileGrid.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.GeotileGridAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "histogram")
+			if (reader.ValueTextEquals(VariantHistogram))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.HistogramAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantHistogram.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.HistogramAggregation?>(options);
 				continue;
 			}
 
-			if (propertyName == "terms")
+			if (reader.ValueTextEquals(VariantTerms))
 			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Aggregations.TermsAggregation?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantTerms.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.TermsAggregation?>(options);
 				continue;
 			}
 
-			throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'PivotGroupBy' from the response.");
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		var result = new PivotGroupBy(variantNameValue, variantValue);
-		return result;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new PivotGroupBy { VariantType = variantType, Variant = variant };
 	}
 
-	public override void Write(Utf8JsonWriter writer, PivotGroupBy value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, PivotGroupBy value, System.Text.Json.JsonSerializerOptions options)
 	{
 		writer.WriteStartObject();
-		if (value.VariantName is not null && value.Variant is not null)
+		switch (value.VariantType)
 		{
-			writer.WritePropertyName(value.VariantName);
-			switch (value.VariantName)
-			{
-				case "date_histogram":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.DateHistogramAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.DateHistogramAggregation)value.Variant, options);
-					break;
-				case "geotile_grid":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.GeotileGridAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.GeotileGridAggregation)value.Variant, options);
-					break;
-				case "histogram":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.HistogramAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.HistogramAggregation)value.Variant, options);
-					break;
-				case "terms":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.Aggregations.TermsAggregation>(writer, (Elastic.Clients.Elasticsearch.Aggregations.TermsAggregation)value.Variant, options);
-					break;
-			}
+			case "":
+				break;
+			case "date_histogram":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.DateHistogramAggregation?)value.Variant);
+				break;
+			case "geotile_grid":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.GeotileGridAggregation?)value.Variant);
+				break;
+			case "histogram":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.HistogramAggregation?)value.Variant);
+				break;
+			case "terms":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.TermsAggregation?)value.Variant);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.VariantType}' is not supported for type '{nameof(PivotGroupBy)}'.");
 		}
 
 		writer.WriteEndObject();
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/TransformManagement/RetentionPolicy.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/TransformManagement/RetentionPolicy.g.cs
index 3d3076933e0..f410a2ab74d 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/TransformManagement/RetentionPolicy.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/TransformManagement/RetentionPolicy.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -39,12 +40,16 @@ internal RetentionPolicy(string variantName, object variant)
 			throw new ArgumentNullException(nameof(variant));
 		if (string.IsNullOrWhiteSpace(variantName))
 			throw new ArgumentException("Variant name must not be empty or whitespace.");
-		VariantName = variantName;
+		VariantType = variantName;
 		Variant = variant;
 	}
 
-	internal object Variant { get; }
-	internal string VariantName { get; }
+	internal RetentionPolicy()
+	{
+	}
+
+	public object Variant { get; internal set; }
+	public string VariantType { get; internal set; }
 
 	public static RetentionPolicy Time(Elastic.Clients.Elasticsearch.TransformManagement.TimeRetentionPolicy retentionPolicy) => new RetentionPolicy("time", retentionPolicy);
 
@@ -61,57 +66,44 @@ public bool TryGet<T>([NotNullWhen(true)] out T? result) where T : class
 	}
 }
 
-internal sealed partial class RetentionPolicyConverter : JsonConverter<RetentionPolicy>
+internal sealed partial class RetentionPolicyConverter : System.Text.Json.Serialization.JsonConverter<RetentionPolicy>
 {
-	public override RetentionPolicy Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-		{
-			throw new JsonException("Expected start token.");
-		}
+	private static readonly System.Text.Json.JsonEncodedText VariantTime = System.Text.Json.JsonEncodedText.Encode("time");
 
-		object? variantValue = default;
-		string? variantNameValue = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+	public override RetentionPolicy Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		var variantType = string.Empty;
+		object? variant = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
+			if (reader.ValueTextEquals(VariantTime))
 			{
-				throw new JsonException("Expected a property name token.");
-			}
-
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token representing the name of an Elasticsearch field.");
-			}
-
-			var propertyName = reader.GetString();
-			reader.Read();
-			if (propertyName == "time")
-			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.TransformManagement.TimeRetentionPolicy?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantTime.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.TransformManagement.TimeRetentionPolicy?>(options);
 				continue;
 			}
 
-			throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'RetentionPolicy' from the response.");
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		var result = new RetentionPolicy(variantNameValue, variantValue);
-		return result;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new RetentionPolicy { VariantType = variantType, Variant = variant };
 	}
 
-	public override void Write(Utf8JsonWriter writer, RetentionPolicy value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, RetentionPolicy value, System.Text.Json.JsonSerializerOptions options)
 	{
 		writer.WriteStartObject();
-		if (value.VariantName is not null && value.Variant is not null)
+		switch (value.VariantType)
 		{
-			writer.WritePropertyName(value.VariantName);
-			switch (value.VariantName)
-			{
-				case "time":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.TransformManagement.TimeRetentionPolicy>(writer, (Elastic.Clients.Elasticsearch.TransformManagement.TimeRetentionPolicy)value.Variant, options);
-					break;
-			}
+			case "":
+				break;
+			case "time":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.TransformManagement.TimeRetentionPolicy?)value.Variant);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.VariantType}' is not supported for type '{nameof(RetentionPolicy)}'.");
 		}
 
 		writer.WriteEndObject();
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/TransformManagement/Sync.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/TransformManagement/Sync.g.cs
index 1cedf9c7a15..a87e005f315 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/TransformManagement/Sync.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/TransformManagement/Sync.g.cs
@@ -18,6 +18,7 @@
 #nullable restore
 
 using Elastic.Clients.Elasticsearch.Fluent;
+using Elastic.Clients.Elasticsearch.Next;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
 using System.Collections.Generic;
@@ -39,12 +40,16 @@ internal Sync(string variantName, object variant)
 			throw new ArgumentNullException(nameof(variant));
 		if (string.IsNullOrWhiteSpace(variantName))
 			throw new ArgumentException("Variant name must not be empty or whitespace.");
-		VariantName = variantName;
+		VariantType = variantName;
 		Variant = variant;
 	}
 
-	internal object Variant { get; }
-	internal string VariantName { get; }
+	internal Sync()
+	{
+	}
+
+	public object Variant { get; internal set; }
+	public string VariantType { get; internal set; }
 
 	public static Sync Time(Elastic.Clients.Elasticsearch.TransformManagement.TimeSync timeSync) => new Sync("time", timeSync);
 
@@ -61,57 +66,44 @@ public bool TryGet<T>([NotNullWhen(true)] out T? result) where T : class
 	}
 }
 
-internal sealed partial class SyncConverter : JsonConverter<Sync>
+internal sealed partial class SyncConverter : System.Text.Json.Serialization.JsonConverter<Sync>
 {
-	public override Sync Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		if (reader.TokenType != JsonTokenType.StartObject)
-		{
-			throw new JsonException("Expected start token.");
-		}
+	private static readonly System.Text.Json.JsonEncodedText VariantTime = System.Text.Json.JsonEncodedText.Encode("time");
 
-		object? variantValue = default;
-		string? variantNameValue = default;
-		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+	public override Sync Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
+	{
+		reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
+		var variantType = string.Empty;
+		object? variant = null;
+		while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
 		{
-			if (reader.TokenType != JsonTokenType.PropertyName)
+			if (reader.ValueTextEquals(VariantTime))
 			{
-				throw new JsonException("Expected a property name token.");
-			}
-
-			if (reader.TokenType != JsonTokenType.PropertyName)
-			{
-				throw new JsonException("Expected a property name token representing the name of an Elasticsearch field.");
-			}
-
-			var propertyName = reader.GetString();
-			reader.Read();
-			if (propertyName == "time")
-			{
-				variantValue = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.TransformManagement.TimeSync?>(ref reader, options);
-				variantNameValue = propertyName;
+				variantType = VariantTime.Value;
+				reader.Read();
+				variant = reader.ReadValue<Elastic.Clients.Elasticsearch.TransformManagement.TimeSync?>(options);
 				continue;
 			}
 
-			throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'Sync' from the response.");
+			throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
 		}
 
-		var result = new Sync(variantNameValue, variantValue);
-		return result;
+		reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
+		return new Sync { VariantType = variantType, Variant = variant };
 	}
 
-	public override void Write(Utf8JsonWriter writer, Sync value, JsonSerializerOptions options)
+	public override void Write(System.Text.Json.Utf8JsonWriter writer, Sync value, System.Text.Json.JsonSerializerOptions options)
 	{
 		writer.WriteStartObject();
-		if (value.VariantName is not null && value.Variant is not null)
+		switch (value.VariantType)
 		{
-			writer.WritePropertyName(value.VariantName);
-			switch (value.VariantName)
-			{
-				case "time":
-					JsonSerializer.Serialize<Elastic.Clients.Elasticsearch.TransformManagement.TimeSync>(writer, (Elastic.Clients.Elasticsearch.TransformManagement.TimeSync)value.Variant, options);
-					break;
-			}
+			case "":
+				break;
+			case "time":
+				writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.TransformManagement.TimeSync?)value.Variant);
+				break;
+			default:
+				throw new System.Text.Json.JsonException($"Variant '{value.VariantType}' is not supported for type '{nameof(Sync)}'.");
 		}
 
 		writer.WriteEndObject();
diff --git a/src/Elastic.Clients.Elasticsearch/_Shared/Api/GetSourceResponse.cs b/src/Elastic.Clients.Elasticsearch/_Shared/Api/GetSourceResponse.cs
index 3cc2eb06a73..b1d5583c8de 100644
--- a/src/Elastic.Clients.Elasticsearch/_Shared/Api/GetSourceResponse.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Shared/Api/GetSourceResponse.cs
@@ -3,36 +3,30 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Text.Json;
-using System.IO;
+
+using Elastic.Transport.Extensions;
+
 #if ELASTICSEARCH_SERVERLESS
 using Elastic.Clients.Elasticsearch.Serverless.Serialization;
 #else
+
 using Elastic.Clients.Elasticsearch.Serialization;
-#endif
 
+#endif
 #if ELASTICSEARCH_SERVERLESS
 namespace Elastic.Clients.Elasticsearch.Serverless;
 #else
+
 namespace Elastic.Clients.Elasticsearch;
 #endif
 
-public partial class GetSourceResponse<TDocument> : ISelfDeserializable
+public partial class GetSourceResponse<TDocument> : ISelfTwoWaySerializable
 {
 	public TDocument Body { get; set; }
 
-	public void Deserialize(ref Utf8JsonReader reader, JsonSerializerOptions options, IElasticsearchClientSettings settings)
-	{
-		using var jsonDoc = JsonSerializer.Deserialize<JsonDocument>(ref reader);
-
-		using var stream = new MemoryStream();
-
-		var writer = new Utf8JsonWriter(stream);
-		jsonDoc.WriteTo(writer);
-		writer.Flush();
-		stream.Position = 0;
-
-		var body = settings.SourceSerializer.Deserialize<TDocument>(stream);
+	public void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings) =>
+		settings.SourceSerializer.Serialize(Body, writer);
 
-		Body = body;
-	}
+	public void Deserialize(ref Utf8JsonReader reader, JsonSerializerOptions options, IElasticsearchClientSettings settings) =>
+		Body = settings.SourceSerializer.Deserialize<TDocument>(ref reader);
 }
diff --git a/src/Elastic.Clients.Elasticsearch/_Shared/Core/IEnumStruct.cs b/src/Elastic.Clients.Elasticsearch/_Shared/Core/IEnumStruct.cs
deleted file mode 100644
index 06ec5d57b8a..00000000000
--- a/src/Elastic.Clients.Elasticsearch/_Shared/Core/IEnumStruct.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information.
-
-#if ELASTICSEARCH_SERVERLESS
-namespace Elastic.Clients.Elasticsearch.Serverless.Core;
-#else
-namespace Elastic.Clients.Elasticsearch.Core;
-#endif
-
-internal interface IEnumStruct<TSelf> where TSelf : struct, IEnumStruct<TSelf>
-{
-	// TODO: Can be made static when targeting .NET 7 and higher
-	TSelf Create(string value);
-}
diff --git a/src/Elastic.Clients.Elasticsearch/_Shared/Core/Infer/Fields/FieldsConverter.cs b/src/Elastic.Clients.Elasticsearch/_Shared/Core/Infer/Fields/FieldsConverter.cs
index 2e7c514c3b3..e3b82989f48 100644
--- a/src/Elastic.Clients.Elasticsearch/_Shared/Core/Infer/Fields/FieldsConverter.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Shared/Core/Infer/Fields/FieldsConverter.cs
@@ -7,12 +7,42 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
+#if ELASTICSEARCH_SERVERLESS
+using Elastic.Clients.Elasticsearch.Serverless.Next;
+#else
+using Elastic.Clients.Elasticsearch.Next;
+#endif
+
 #if ELASTICSEARCH_SERVERLESS
 namespace Elastic.Clients.Elasticsearch.Serverless;
 #else
 namespace Elastic.Clients.Elasticsearch;
 #endif
 
+internal sealed class FieldsMarker;
+
+internal sealed class FieldsMarkerConverter :
+	JsonConverter<FieldsMarker>,
+	IMarkerTypeConverter
+{
+	public JsonConverter WrappedConverter { get; }
+
+	public FieldsMarkerConverter()
+	{
+		WrappedConverter = new FieldsConverter();
+	}
+
+	public override FieldsMarker? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	{
+		throw new InvalidOperationException();
+	}
+
+	public override void Write(Utf8JsonWriter writer, FieldsMarker value, JsonSerializerOptions options)
+	{
+		throw new InvalidOperationException();
+	}
+}
+
 internal sealed class FieldsConverter : JsonConverter<Fields>
 {
 	public override Fields? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -43,6 +73,30 @@ public override void Write(Utf8JsonWriter writer, Fields value, JsonSerializerOp
 	}
 }
 
+internal sealed class SingleOrManyFieldsMarker;
+
+internal sealed class SingleOrManyFieldsMarkerConverter :
+	JsonConverter<SingleOrManyFieldsMarker>,
+	IMarkerTypeConverter
+{
+	public JsonConverter WrappedConverter { get; }
+
+	public SingleOrManyFieldsMarkerConverter()
+	{
+		WrappedConverter = new SingleOrManyFieldsConverter();
+	}
+
+	public override SingleOrManyFieldsMarker? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	{
+		throw new InvalidOperationException();
+	}
+
+	public override void Write(Utf8JsonWriter writer, SingleOrManyFieldsMarker value, JsonSerializerOptions options)
+	{
+		throw new InvalidOperationException();
+	}
+}
+
 internal sealed class SingleOrManyFieldsConverter : JsonConverter<Fields>
 {
 	public override Fields? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
diff --git a/src/Elastic.Clients.Elasticsearch/_Shared/Core/ReadOnlyFieldDictionary.cs b/src/Elastic.Clients.Elasticsearch/_Shared/Core/ReadOnlyFieldDictionary.cs
deleted file mode 100644
index c75f89e23f0..00000000000
--- a/src/Elastic.Clients.Elasticsearch/_Shared/Core/ReadOnlyFieldDictionary.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information.
-
-using System.Collections;
-using System.Collections.Generic;
-using Elastic.Transport;
-
-#if ELASTICSEARCH_SERVERLESS
-namespace Elastic.Clients.Elasticsearch.Serverless;
-#else
-namespace Elastic.Clients.Elasticsearch;
-#endif
-
-/// <summary>
-/// A specialised readonly dictionary for <typeparamref name="TValue"/> data, keyed by <see cref="IndexName"/>.
-/// <para>This supports inferrence enabled lookups by ensuring keys are sanitized when storing the values and when performing lookups.</para>
-/// </summary>
-/// <typeparam name="TValue"></typeparam>
-internal readonly struct ReadOnlyFieldDictionary<TValue> : IReadOnlyDictionary<Field, TValue>
-{
-	private readonly Dictionary<Field, TValue> _backingDictionary;
-	private readonly IElasticsearchClientSettings? _settings;
-
-	public ReadOnlyFieldDictionary()
-	{
-		_backingDictionary = new Dictionary<Field, TValue>(0);
-		_settings = null;
-	}
-
-	internal ReadOnlyFieldDictionary(Dictionary<Field, TValue> source, IElasticsearchClientSettings settings)
-	{
-		_settings = settings;
-
-		// This is an "optimised version" which doesn't cause a second dictionary to be allocated.
-		// Since we expect this to be used only for deserialisation, the keys received will already have been strings,
-		// so no further sanitisation is required.
-
-		if (source == null)
-		{
-			_backingDictionary = new Dictionary<Field, TValue>(0);
-			return;
-		}
-
-		_backingDictionary = source;
-	}
-
-	private string Sanitize(Field key) => _settings is not null ? (key as IUrlParameter)?.GetString(_settings) : string.Empty;
-
-	public TValue this[Field key] => _backingDictionary.TryGetValue(Sanitize(key), out var v) ? v : default;
-	public TValue this[string key] => _backingDictionary.TryGetValue(key, out var v) ? v : default;
-
-	public IEnumerable<Field> Keys => _backingDictionary.Keys;
-	public IEnumerable<TValue> Values => _backingDictionary.Values;
-	public int Count => _backingDictionary.Count;
-	public bool ContainsKey(Field key) => _backingDictionary.ContainsKey(Sanitize(key));
-	public IEnumerator<KeyValuePair<Field, TValue>> GetEnumerator() => _backingDictionary.GetEnumerator();
-	public bool TryGetValue(Field key, out TValue value) => _backingDictionary.TryGetValue(Sanitize(key), out value);
-	IEnumerator IEnumerable.GetEnumerator() => _backingDictionary.GetEnumerator();
-}
diff --git a/src/Elastic.Clients.Elasticsearch/_Shared/Core/ReadOnlyIndexNameDictionary.cs b/src/Elastic.Clients.Elasticsearch/_Shared/Core/ReadOnlyIndexNameDictionary.cs
deleted file mode 100644
index 74a8155d6ab..00000000000
--- a/src/Elastic.Clients.Elasticsearch/_Shared/Core/ReadOnlyIndexNameDictionary.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information.
-
-using System.Collections;
-using System.Collections.Generic;
-using Elastic.Transport;
-
-#if ELASTICSEARCH_SERVERLESS
-namespace Elastic.Clients.Elasticsearch.Serverless;
-#else
-namespace Elastic.Clients.Elasticsearch;
-#endif
-
-/// <summary>
-/// A specialised readonly dictionary for <typeparamref name="TValue"/> data, keyed by <see cref="IndexName"/>.
-/// <para>This supports inferrence enabled lookups by ensuring keys are sanitized when storing the values and when performing lookups.</para>
-/// </summary>
-/// <typeparam name="TValue"></typeparam>
-internal readonly struct ReadOnlyIndexNameDictionary<TValue> : IReadOnlyDictionary<IndexName, TValue>
-{
-	private readonly Dictionary<IndexName, TValue> _backingDictionary;
-	private readonly IElasticsearchClientSettings? _settings;
-
-	public ReadOnlyIndexNameDictionary()
-	{
-		_backingDictionary = new Dictionary<IndexName,TValue>(0);
-		_settings = null;
-	}
-
-	internal ReadOnlyIndexNameDictionary(Dictionary<IndexName, TValue> source, IElasticsearchClientSettings settings)
-	{
-		_settings = settings;
-
-		// This is an "optimised version" which doesn't cause a second dictionary to be allocated.
-		// Since we expect this to be used only for deserialisation, the keys received will already have been strings,
-		// so no further sanitisation is required.
-
-		if (source == null)
-		{
-			_backingDictionary = new Dictionary<IndexName, TValue>(0);
-			return;
-		}
-
-		_backingDictionary = source;
-	}
-
-	private string Sanitize(IndexName key) => _settings is not null ? (key as IUrlParameter)?.GetString(_settings) : string.Empty;
-
-	public TValue this[IndexName key] => _backingDictionary.TryGetValue(Sanitize(key), out var v) ? v : default;
-	public TValue this[string key] => _backingDictionary.TryGetValue(key, out var v) ? v : default;
-
-	public IEnumerable<IndexName> Keys => _backingDictionary.Keys;
-	public IEnumerable<TValue> Values => _backingDictionary.Values;
-	public int Count => _backingDictionary.Count;
-	public bool ContainsKey(IndexName key) => _backingDictionary.ContainsKey(Sanitize(key));
-	public IEnumerator<KeyValuePair<IndexName, TValue>> GetEnumerator() => _backingDictionary.GetEnumerator();
-	public bool TryGetValue(IndexName key, out TValue value) => _backingDictionary.TryGetValue(Sanitize(key), out value);
-	IEnumerator IEnumerable.GetEnumerator() => _backingDictionary.GetEnumerator();
-}
diff --git a/src/Elastic.Clients.Elasticsearch/_Shared/CrossPlatform/IsExternalInit.cs b/src/Elastic.Clients.Elasticsearch/_Shared/CrossPlatform/IsExternalInit.cs
deleted file mode 100644
index 6ba267c1f1a..00000000000
--- a/src/Elastic.Clients.Elasticsearch/_Shared/CrossPlatform/IsExternalInit.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information.
-
-#if !NET5_0_OR_GREATER || NETSTANDARD2_0 || NET461
-
-namespace System.Runtime.CompilerServices;
-
-using System.ComponentModel;
-
-/// <summary>
-/// Reserved to be used by the compiler for tracking metadata.
-/// This class should not be used by developers in source code.
-/// </summary>
-[EditorBrowsable(EditorBrowsableState.Never)]
-internal static class IsExternalInit
-{
-}
-
-#endif
diff --git a/src/Elastic.Clients.Elasticsearch/_Shared/CrossPlatform/NullableAttributes.cs b/src/Elastic.Clients.Elasticsearch/_Shared/CrossPlatform/NullableAttributes.cs
deleted file mode 100644
index 8389e11206f..00000000000
--- a/src/Elastic.Clients.Elasticsearch/_Shared/CrossPlatform/NullableAttributes.cs
+++ /dev/null
@@ -1,142 +0,0 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information.
-
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-#define INTERNAL_NULLABLE_ATTRIBUTES
-
-#pragma warning disable SA1402 // File may only contain a single type
-#pragma warning disable SA1649 // File name should match first type name
-
-#if !NETCOREAPP3_1_OR_GREATER && !NETSTANDARD2_1_OR_GREATER || NET461
-namespace System.Diagnostics.CodeAnalysis;
-
-/// <summary>Specifies that null is allowed as an input even if the corresponding type disallows it.</summary>
-[AttributeUsage(AttributeTargets.Field | AttributeTargets.Parameter | AttributeTargets.Property, Inherited = false)]
-#if INTERNAL_NULLABLE_ATTRIBUTES
-internal
-#else
-    public
-#endif
-	sealed class AllowNullAttribute : Attribute
-{ }
-
-/// <summary>Specifies that null is disallowed as an input even if the corresponding type allows it.</summary>
-[AttributeUsage(AttributeTargets.Field | AttributeTargets.Parameter | AttributeTargets.Property, Inherited = false)]
-#if INTERNAL_NULLABLE_ATTRIBUTES
-internal
-#else
-    public
-#endif
-	sealed class DisallowNullAttribute : Attribute
-{ }
-
-/// <summary>Specifies that an output may be null even if the corresponding type disallows it.</summary>
-[AttributeUsage(AttributeTargets.Field | AttributeTargets.Parameter | AttributeTargets.Property | AttributeTargets.ReturnValue, Inherited = false)]
-#if INTERNAL_NULLABLE_ATTRIBUTES
-internal
-#else
-    public
-#endif
-	sealed class MaybeNullAttribute : Attribute
-{ }
-
-/// <summary>Specifies that an output will not be null even if the corresponding type allows it.</summary>
-[AttributeUsage(AttributeTargets.Field | AttributeTargets.Parameter | AttributeTargets.Property | AttributeTargets.ReturnValue, Inherited = false)]
-#if INTERNAL_NULLABLE_ATTRIBUTES
-internal
-#else
-    public
-#endif
-	sealed class NotNullAttribute : Attribute
-{ }
-
-/// <summary>Specifies that when a method returns <see cref="ReturnValue"/>, the parameter may be null even if the corresponding type disallows it.</summary>
-[AttributeUsage(AttributeTargets.Parameter, Inherited = false)]
-#if INTERNAL_NULLABLE_ATTRIBUTES
-internal
-#else
-    public
-#endif
-	sealed class MaybeNullWhenAttribute : Attribute
-{
-	/// <summary>Initializes the attribute with the specified return value condition.</summary>
-	/// <param name="returnValue">
-	/// The return value condition. If the method returns this value, the associated parameter may be null.
-	/// </param>
-	public MaybeNullWhenAttribute(bool returnValue) => ReturnValue = returnValue;
-
-	/// <summary>Gets the return value condition.</summary>
-	public bool ReturnValue { get; }
-}
-
-/// <summary>Specifies that when a method returns <see cref="ReturnValue"/>, the parameter will not be null even if the corresponding type allows it.</summary>
-[AttributeUsage(AttributeTargets.Parameter, Inherited = false)]
-#if INTERNAL_NULLABLE_ATTRIBUTES
-internal
-#else
-    public
-#endif
-	sealed class NotNullWhenAttribute : Attribute
-{
-	/// <summary>Initializes the attribute with the specified return value condition.</summary>
-	/// <param name="returnValue">
-	/// The return value condition. If the method returns this value, the associated parameter will not be null.
-	/// </param>
-	public NotNullWhenAttribute(bool returnValue) => ReturnValue = returnValue;
-
-	/// <summary>Gets the return value condition.</summary>
-	public bool ReturnValue { get; }
-}
-
-/// <summary>Specifies that the output will be non-null if the named parameter is non-null.</summary>
-[AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Property | AttributeTargets.ReturnValue, AllowMultiple = true, Inherited = false)]
-#if INTERNAL_NULLABLE_ATTRIBUTES
-internal
-#else
-    public
-#endif
-	sealed class NotNullIfNotNullAttribute : Attribute
-{
-	/// <summary>Initializes the attribute with the associated parameter name.</summary>
-	/// <param name="parameterName">
-	/// The associated parameter name.  The output will be non-null if the argument to the parameter specified is non-null.
-	/// </param>
-	public NotNullIfNotNullAttribute(string parameterName) => ParameterName = parameterName;
-
-	/// <summary>Gets the associated parameter name.</summary>
-	public string ParameterName { get; }
-}
-
-/// <summary>Applied to a method that will never return under any circumstance.</summary>
-[AttributeUsage(AttributeTargets.Method, Inherited = false)]
-#if INTERNAL_NULLABLE_ATTRIBUTES
-internal
-#else
-    public
-#endif
-	sealed class DoesNotReturnAttribute : Attribute
-{ }
-
-/// <summary>Specifies that the method will not return if the associated Boolean parameter is passed the specified value.</summary>
-[AttributeUsage(AttributeTargets.Parameter, Inherited = false)]
-#if INTERNAL_NULLABLE_ATTRIBUTES
-internal
-#else
-    public
-#endif
-	sealed class DoesNotReturnIfAttribute : Attribute
-{
-	/// <summary>Initializes the attribute with the specified parameter value.</summary>
-	/// <param name="parameterValue">
-	/// The condition parameter value. Code after the method will be considered unreachable by diagnostics if the argument to
-	/// the associated parameter matches this value.
-	/// </param>
-	public DoesNotReturnIfAttribute(bool parameterValue) => ParameterValue = parameterValue;
-
-	/// <summary>Gets the condition parameter value.</summary>
-	public bool ParameterValue { get; }
-}
-#endif
diff --git a/src/Elastic.Clients.Elasticsearch/_Shared/CrossPlatform/TypeExtensions.cs b/src/Elastic.Clients.Elasticsearch/_Shared/CrossPlatform/TypeExtensions.cs
deleted file mode 100644
index eeba6465023..00000000000
--- a/src/Elastic.Clients.Elasticsearch/_Shared/CrossPlatform/TypeExtensions.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-#if ELASTICSEARCH_SERVERLESS
-namespace Elastic.Clients.Elasticsearch.Serverless;
-#else
-namespace Elastic.Clients.Elasticsearch;
-#endif
-
-internal static class DotNetCoreTypeExtensions
-{
-	internal static bool TryGetGenericDictionaryArguments(this Type type, out Type[] genericArguments)
-	{
-		var genericDictionary = type.GetInterfaces()
-			.FirstOrDefault(t =>
-				t.IsGenericType && (
-					t.GetGenericTypeDefinition() == typeof(IDictionary<,>) ||
-					t.GetGenericTypeDefinition() == typeof(IReadOnlyDictionary<,>)));
-
-		if (genericDictionary == null)
-		{
-			genericArguments = new Type[0];
-			return false;
-		}
-
-		genericArguments = genericDictionary.GetGenericArguments();
-		return true;
-	}
-}
diff --git a/src/Elastic.Clients.Elasticsearch/_Shared/Next/DoubleWithFractionalPortionConverter.cs b/src/Elastic.Clients.Elasticsearch/_Shared/Next/DoubleWithFractionalPortionConverter.cs
new file mode 100644
index 00000000000..b3881eca9a6
--- /dev/null
+++ b/src/Elastic.Clients.Elasticsearch/_Shared/Next/DoubleWithFractionalPortionConverter.cs
@@ -0,0 +1,111 @@
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Buffers;
+using System.Buffers.Text;
+using System.Diagnostics;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+#if ELASTICSEARCH_SERVERLESS
+namespace Elastic.Clients.Elasticsearch.Serverless.Next;
+#else
+namespace Elastic.Clients.Elasticsearch.Next;
+#endif
+
+internal sealed class DoubleWithFractionalPortionConverter :
+    JsonConverter<double>
+{
+    // https://github.com/dotnet/runtime/blob/main/src/libraries/System.Text.Json/src/System/Text/Json/JsonConstants.cs#L78
+    public const int MaximumFormatLength = 128 + 2;
+
+    private static readonly StandardFormat DefaultFormat = StandardFormat.Parse("G17");
+    private static readonly JsonEncodedText NaN = JsonEncodedText.Encode("NaN"u8);
+    private static readonly JsonEncodedText PositiveInfinity = JsonEncodedText.Encode("Infinity"u8);
+    private static readonly JsonEncodedText NegativeInfinity = JsonEncodedText.Encode("-Infinity"u8);
+
+    public static ReadOnlySpan<byte> NonIntegerChars => "E."u8;
+
+    public override double Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        if (reader.TokenType is not JsonTokenType.String)
+        {
+            return reader.GetDouble();
+        }
+
+        if (options.NumberHandling.HasFlag(JsonNumberHandling.AllowNamedFloatingPointLiterals))
+        {
+            if (reader.ValueTextEquals(NaN))
+            {
+                return double.NaN;
+            }
+
+            if (reader.ValueTextEquals(PositiveInfinity))
+            {
+                return double.PositiveInfinity;
+            }
+
+            if (reader.ValueTextEquals(NegativeInfinity))
+            {
+                return double.NegativeInfinity;
+            }
+        }
+
+        if (!options.NumberHandling.HasFlag(JsonNumberHandling.AllowReadingFromString))
+        {
+            return reader.GetDouble();
+        }
+
+        Debug.Assert(!reader.HasValueSequence);
+
+        return Utf8Parser.TryParse(reader.ValueSpan, out double result, out var consumed) && (consumed == reader.ValueSpan.Length)
+            ? result
+            : throw new JsonException("Unable to convert JSON string value to 'double'.");
+    }
+
+    public override void Write(Utf8JsonWriter writer, double value, JsonSerializerOptions options)
+    {
+        if (options.NumberHandling.HasFlag(JsonNumberHandling.AllowNamedFloatingPointLiterals))
+        {
+            if (double.IsNaN(value))
+            {
+                writer.WriteStringValue(NaN);
+                return;
+            }
+
+            if (double.IsPositiveInfinity(value))
+            {
+                writer.WriteStringValue(PositiveInfinity);
+                return;
+            }
+
+            if (double.IsNegativeInfinity(value))
+            {
+                writer.WriteStringValue(NegativeInfinity);
+                return;
+            }
+        }
+
+        if (options.NumberHandling.HasFlag(JsonNumberHandling.WriteAsString))
+        {
+            throw new NotImplementedException("'JsonNumberHandling.WriteAsString' is currently not supported.");
+        }
+
+        Span<byte> buffer = stackalloc byte[MaximumFormatLength];
+
+        if (!Utf8Formatter.TryFormat(value, buffer, out var bytesWritten, DefaultFormat))
+        {
+            throw new JsonException($"Could not convert value '{value}' to JSON number.");
+        }
+
+        if (buffer.IndexOfAny(NonIntegerChars) == -1)
+        {
+            buffer[bytesWritten++] = (byte)'.';
+            buffer[bytesWritten++] = (byte)'0';
+        }
+
+        writer.WriteRawValue(buffer[..bytesWritten], true);
+    }
+}
diff --git a/src/Elastic.Clients.Elasticsearch/_Shared/Next/DynamicallyAccessed.cs b/src/Elastic.Clients.Elasticsearch/_Shared/Next/DynamicallyAccessed.cs
new file mode 100644
index 00000000000..8dfb8e646fc
--- /dev/null
+++ b/src/Elastic.Clients.Elasticsearch/_Shared/Next/DynamicallyAccessed.cs
@@ -0,0 +1,23 @@
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Diagnostics.CodeAnalysis;
+
+#if ELASTICSEARCH_SERVERLESS
+namespace Elastic.Clients.Elasticsearch.Serverless.Next;
+#else
+namespace Elastic.Clients.Elasticsearch.Next;
+#endif
+
+internal static class DynamicallyAccessed
+{
+    public static void PublicConstructors([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] Type type)
+    {
+    }
+
+    public static void Interfaces([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.Interfaces)] Type type)
+    {
+    }
+}
diff --git a/src/Elastic.Clients.Elasticsearch/_Shared/Next/EnumStructConverter.cs b/src/Elastic.Clients.Elasticsearch/_Shared/Next/EnumStructConverter.cs
new file mode 100644
index 00000000000..8dae4f110fa
--- /dev/null
+++ b/src/Elastic.Clients.Elasticsearch/_Shared/Next/EnumStructConverter.cs
@@ -0,0 +1,45 @@
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+#if ELASTICSEARCH_SERVERLESS
+namespace Elastic.Clients.Elasticsearch.Serverless.Next;
+#else
+namespace Elastic.Clients.Elasticsearch.Next;
+#endif
+
+internal sealed class EnumStructConverter<T> :
+    JsonConverter<T>
+    where T : struct, IEnumStruct<T>
+{
+    public override T Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        reader.ValidateToken(JsonTokenType.String);
+
+        var value = reader.GetString()!;
+
+#if NET7_0_OR_GREATER
+        var result = T.Create(value);
+#else
+        var result = default(T).Create(value);
+#endif
+
+        return result;
+    }
+
+    public override void Write(Utf8JsonWriter writer, T value, JsonSerializerOptions options)
+    {
+        if (!string.IsNullOrEmpty(value.Value))
+        {
+            writer.WriteStringValue(value.Value);
+        }
+        else
+        {
+            writer.WriteNullValue();
+        }
+    }
+}
diff --git a/src/Elastic.Clients.Elasticsearch/_Shared/Next/IEnumStruct.cs b/src/Elastic.Clients.Elasticsearch/_Shared/Next/IEnumStruct.cs
new file mode 100644
index 00000000000..37d0d269cc0
--- /dev/null
+++ b/src/Elastic.Clients.Elasticsearch/_Shared/Next/IEnumStruct.cs
@@ -0,0 +1,25 @@
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information.
+
+#if ELASTICSEARCH_SERVERLESS
+namespace Elastic.Clients.Elasticsearch.Serverless.Next;
+#else
+namespace Elastic.Clients.Elasticsearch.Next;
+#endif
+
+internal interface IEnumStruct<out TSelf>
+    where TSelf : struct, IEnumStruct<TSelf>
+{
+    public string Value { get; }
+
+#if NET7_0_OR_GREATER
+
+    public static abstract TSelf Create(string value);
+
+#else
+
+    public TSelf Create(string value);
+
+#endif
+}
diff --git a/src/Elastic.Clients.Elasticsearch/_Shared/Next/IMarkerTypeConverter.cs b/src/Elastic.Clients.Elasticsearch/_Shared/Next/IMarkerTypeConverter.cs
new file mode 100644
index 00000000000..8acc65496c8
--- /dev/null
+++ b/src/Elastic.Clients.Elasticsearch/_Shared/Next/IMarkerTypeConverter.cs
@@ -0,0 +1,22 @@
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information.
+
+using System.Text.Json.Serialization;
+
+#if ELASTICSEARCH_SERVERLESS
+namespace Elastic.Clients.Elasticsearch.Serverless.Next;
+#else
+namespace Elastic.Clients.Elasticsearch.Next;
+#endif
+
+/// <summary>
+/// Allows the code generator to use specialized converters on a per-property basis.
+/// </summary>
+/// <remarks>
+/// See e.g. <see cref="SingleOrManyConverter{TCollection,TElement}"/> or <see cref="SourceConverter{T}"/> for an example.
+/// </remarks>
+internal interface IMarkerTypeConverter
+{
+    public JsonConverter WrappedConverter { get; }
+}
diff --git a/src/Elastic.Clients.Elasticsearch/_Shared/Next/JsonReaderExtensions.cs b/src/Elastic.Clients.Elasticsearch/_Shared/Next/JsonReaderExtensions.cs
new file mode 100644
index 00000000000..afbc22ed73d
--- /dev/null
+++ b/src/Elastic.Clients.Elasticsearch/_Shared/Next/JsonReaderExtensions.cs
@@ -0,0 +1,210 @@
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Runtime.CompilerServices;
+using System.Text.Json;
+
+#if ELASTICSEARCH_SERVERLESS
+namespace Elastic.Clients.Elasticsearch.Serverless.Next;
+#else
+namespace Elastic.Clients.Elasticsearch.Next;
+#endif
+
+internal static class JsonReaderExtensions
+{
+    //// If the exception source is this value, the serializer will re-throw as JsonException.
+    //private const string ExceptionSourceValueToRethrowAsJsonException = "System.Text.Json.Rethrowable";
+
+    /// <summary>
+    /// TODO: TBC
+    /// </summary>
+    /// <param name="reader"></param>
+    /// <param name="expected"></param>
+    /// <exception cref="JsonException"></exception>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static void ValidateToken(this ref Utf8JsonReader reader, JsonTokenType expected)
+    {
+        if (reader.TokenType != expected)
+        {
+            throw new JsonException($"Expected JSON '{expected}' token, but got '{reader.TokenType}'.");
+        }
+    }
+
+    /// <summary>
+    ///
+    /// </summary>
+    /// <param name="reader"></param>
+    /// <param name="options"></param>
+    /// <param name="name"></param>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static void ReadPropertyName(this ref Utf8JsonReader reader, JsonSerializerOptions options, out string name)
+    {
+        // This parameter is kept to allow implicit specialization of the `ReadPropertyName<T>` method.
+        _ = options;
+
+        Debug.Assert(reader.TokenType is JsonTokenType.PropertyName);
+
+        name = reader.GetString()!;
+    }
+
+    /// <summary>
+    ///
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <param name="reader"></param>
+    /// <param name="options"></param>
+    /// <param name="markerType"></param>
+    /// <returns></returns>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static void ReadPropertyName<T>(this ref Utf8JsonReader reader, JsonSerializerOptions options, out T name, Type? markerType = null)
+    {
+        Debug.Assert(reader.TokenType is JsonTokenType.PropertyName);
+
+        name = options.GetConverter<T>(markerType).ReadAsPropertyName(ref reader, typeof(T), options);
+    }
+
+    /// <summary>
+    /// TODO: TBC
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <param name="reader"></param>
+    /// <param name="options"></param>
+    /// <param name="markerType"></param>
+    /// <returns></returns>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static T? ReadValue<T>(this ref Utf8JsonReader reader, JsonSerializerOptions options, Type? markerType = null)
+    {
+        var converter = options.GetConverter<T>(markerType);
+
+        if ((reader.TokenType is JsonTokenType.Null) && !converter.HandleNull)
+        {
+            return default;
+        }
+
+        return converter.Read(ref reader, typeof(T), options);
+    }
+
+    /// <summary>
+    ///
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <param name="reader"></param>
+    /// <param name="options"></param>
+    /// <param name="name"></param>
+    /// <param name="value"></param>
+    /// <param name="nameMarkerType"></param>
+    /// <param name="valueMarkerType"></param>
+    /// <returns></returns>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static void ReadProperty<T>(this ref Utf8JsonReader reader, JsonSerializerOptions options, out string name, out T? value,
+        Type? nameMarkerType = null, Type? valueMarkerType = null)
+    {
+        // This parameter is kept to allow implicit specialization of the `ReadProperty<TName, TValue>` method.
+        _ = nameMarkerType;
+
+        Debug.Assert(reader.TokenType is JsonTokenType.PropertyName);
+
+        reader.ReadPropertyName(options, out name);
+        reader.Read();
+        value = reader.ReadValue<T>(options, valueMarkerType);
+    }
+
+    /// <summary>
+    ///
+    /// </summary>
+    /// <typeparam name="TName"></typeparam>
+    /// <typeparam name="TValue"></typeparam>
+    /// <param name="reader"></param>
+    /// <param name="options"></param>
+    /// <param name="name"></param>
+    /// <param name="value"></param>
+    /// <param name="valueMarkerType"></param>
+    /// <param name="nameMarkerType"></param>
+    /// <returns></returns>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static void ReadProperty<TName, TValue>(this ref Utf8JsonReader reader, JsonSerializerOptions options, [DisallowNull] out TName name, out TValue? value,
+        Type? nameMarkerType = null, Type? valueMarkerType = null)
+    {
+        Debug.Assert(reader.TokenType is JsonTokenType.PropertyName);
+
+        reader.ReadPropertyName(options, out name, nameMarkerType);
+        reader.Read();
+        value = reader.ReadValue<TValue>(options, valueMarkerType);
+    }
+
+    /// <summary>
+    /// TODO: TBC
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <param name="reader"></param>
+    /// <param name="name"></param>
+    /// <param name="options"></param>
+    /// <param name="value"></param>
+    /// <param name="markerType"></param>
+    /// <returns></returns>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static bool TryReadProperty<T>(this ref Utf8JsonReader reader, JsonSerializerOptions options, JsonEncodedText name, ref T? value, Type? markerType = null)
+    {
+        Debug.Assert(reader.TokenType is JsonTokenType.PropertyName);
+
+        if (!reader.ValueTextEquals(name))
+        {
+            return false;
+        }
+
+        reader.Read();
+        value = reader.ReadValue<T>(options, markerType);
+
+        return true;
+    }
+
+    /// <summary>
+    /// Compares the JSON encoded text to the JSON token value in the source and returns true if they match.
+    /// </summary>
+    /// <param name="reader">A reference to the <see cref="Utf8JsonReader"/>.</param>
+    /// <param name="text">The JSON encoded text to compare against.</param>
+    /// <returns><see langword="true"/> if the JSON token value in the source matches the JSON encoded look up text.</returns>
+    /// <remarks>
+    ///     This is an alternative version of the built-in <see cref="Utf8JsonReader.ValueTextEquals(ReadOnlySpan{byte})"/> method
+    ///     that operates on pre-encoded JSON text.
+    /// </remarks>
+    public static bool ValueTextEquals(this ref Utf8JsonReader reader, JsonEncodedText text)
+    {
+        Debug.Assert(reader.TokenType is JsonTokenType.PropertyName or JsonTokenType.String);
+
+        return reader.HasValueSequence
+            ? CompareToSequence(ref reader, text.EncodedUtf8Bytes)
+            : reader.ValueSpan.SequenceEqual(text.EncodedUtf8Bytes);
+
+        static bool CompareToSequence(ref Utf8JsonReader reader, ReadOnlySpan<byte> other)
+        {
+            var localSequence = reader.ValueSequence;
+            if (localSequence.Length != other.Length)
+            {
+                return false;
+            }
+
+            var matchedSoFar = 0;
+
+            foreach (var memory in localSequence)
+            {
+                var span = memory.Span;
+
+                if (other[matchedSoFar..].StartsWith(span))
+                {
+                    matchedSoFar += span.Length;
+                }
+                else
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+    }
+}
diff --git a/src/Elastic.Clients.Elasticsearch/_Shared/Next/JsonSerializerOptionsExtensions.cs b/src/Elastic.Clients.Elasticsearch/_Shared/Next/JsonSerializerOptionsExtensions.cs
new file mode 100644
index 00000000000..7198fb8b2d1
--- /dev/null
+++ b/src/Elastic.Clients.Elasticsearch/_Shared/Next/JsonSerializerOptionsExtensions.cs
@@ -0,0 +1,33 @@
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information.
+
+using System;
+
+using System.Runtime.CompilerServices;
+
+using System.Text.Json.Serialization;
+using System.Text.Json;
+
+#if ELASTICSEARCH_SERVERLESS
+namespace Elastic.Clients.Elasticsearch.Serverless.Next;
+#else
+namespace Elastic.Clients.Elasticsearch.Next;
+#endif
+
+internal static class JsonSerializerOptionsExtensions
+{
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static JsonConverter<T> GetConverter<T>(this JsonSerializerOptions options, Type? markerType)
+    {
+#pragma warning disable IL2026, IL3050
+        var rawConverter = options.GetConverter(markerType ?? typeof(T));
+#pragma warning restore IL2026, IL3050
+
+        var converter = (JsonConverter<T>)(rawConverter is IMarkerTypeConverter markerTypeConverter
+            ? markerTypeConverter.WrappedConverter
+            : rawConverter);
+
+        return converter;
+    }
+}
diff --git a/src/Elastic.Clients.Elasticsearch/_Shared/Next/JsonWriterExtensions.cs b/src/Elastic.Clients.Elasticsearch/_Shared/Next/JsonWriterExtensions.cs
new file mode 100644
index 00000000000..e0d5b08f2eb
--- /dev/null
+++ b/src/Elastic.Clients.Elasticsearch/_Shared/Next/JsonWriterExtensions.cs
@@ -0,0 +1,196 @@
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Runtime.CompilerServices;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+#if ELASTICSEARCH_SERVERLESS
+namespace Elastic.Clients.Elasticsearch.Serverless.Next;
+#else
+namespace Elastic.Clients.Elasticsearch.Next;
+#endif
+
+internal static class JsonWriterExtensions
+{
+    /// <summary>
+    ///
+    /// </summary>
+    /// <param name="writer"></param>
+    /// <param name="options"></param>
+    /// <param name="name"></param>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static void WritePropertyName(this Utf8JsonWriter writer, JsonSerializerOptions options, JsonEncodedText name)
+    {
+        // This parameter is kept to allow implicit specialization of the `WritePropertyName<T>` method.
+        _ = options;
+
+        writer.WritePropertyName(name);
+    }
+
+    /// <summary>
+    ///
+    /// </summary>
+    /// <param name="writer"></param>
+    /// <param name="options"></param>
+    /// <param name="name"></param>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static void WritePropertyName(this Utf8JsonWriter writer, JsonSerializerOptions options, string name)
+    {
+        // This parameter is kept to allow implicit specialization of the `WritePropertyName<T>` method.
+        _ = options;
+
+        writer.WritePropertyName(name);
+    }
+
+    /// <summary>
+    ///
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <param name="writer"></param>
+    /// <param name="name"></param>
+    /// <param name="options"></param>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static void WritePropertyName<T>(this Utf8JsonWriter writer, JsonSerializerOptions options, [DisallowNull] T name, Type? markerType = null)
+    {
+        options.GetConverter<T>(markerType).WriteAsPropertyName(writer, name, options);
+    }
+
+    /// <summary>
+    /// Serializes the given <paramref name="value"/> to JSON using the appropriate <see cref="JsonConverter"/>.
+    /// </summary>
+    /// <typeparam name="T">The type of the value.</typeparam>
+    /// <param name="writer">The <see cref="Utf8JsonWriter"/> to use for writing the serialized value.</param>
+    /// <param name="value">The value to serialize.</param>
+    /// <param name="options">The <see cref="JsonSerializerOptions"/> to use.</param>
+    /// <param name="markerType">An optional type hint, used to retrieve a matching converter from the given <paramref name="options"/>.</param>
+    /// <remarks>
+    /// The matching converter for <paramref name="markerType"/> must implement <see cref="IMarkerTypeConverter"/>.
+    /// </remarks>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static void WriteValue<T>(this Utf8JsonWriter writer, JsonSerializerOptions options, T value, Type? markerType = null)
+    {
+        var converter = options.GetConverter<T>(markerType);
+
+        if ((value is null) && !converter.HandleNull)
+        {
+            writer.WriteNullValue();
+            return;
+        }
+
+        converter.Write(writer, value, options);
+    }
+
+    /// <summary>
+    /// TODO: TBC
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <param name="writer"></param>
+    /// <param name="name"></param>
+    /// <param name="value"></param>
+    /// <param name="options"></param>
+    /// <param name="nameMarkerType"></param>
+    /// <param name="valueMarkerType"></param>
+    /// <param name="ignoreCondition"></param>
+    /// <exception cref="NotSupportedException"></exception>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static void WriteProperty<T>(this Utf8JsonWriter writer, JsonSerializerOptions options, string name, T value,
+        Type? nameMarkerType = null, Type? valueMarkerType = null, JsonIgnoreCondition? ignoreCondition = null)
+    {
+        // This parameter is kept to allow implicit specialization of the `WriteProperty<TName, TValue>` method.
+        _ = nameMarkerType;
+
+        var shouldIgnore = (ignoreCondition ?? options.DefaultIgnoreCondition) switch
+        {
+            JsonIgnoreCondition.Never => false,
+            JsonIgnoreCondition.Always => true,
+            JsonIgnoreCondition.WhenWritingDefault => EqualityComparer<T>.Default.Equals(value, default!),
+            JsonIgnoreCondition.WhenWritingNull => (value is null),
+            _ => throw new NotSupportedException("Unsupported JSON ignore condition.")
+        };
+
+        if (shouldIgnore)
+        {
+            return;
+        }
+
+        writer.WritePropertyName(options, name);
+        writer.WriteValue(options, value, valueMarkerType);
+    }
+
+    /// <summary>
+    /// TODO: TBC
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <param name="writer"></param>
+    /// <param name="name"></param>
+    /// <param name="value"></param>
+    /// <param name="options"></param>
+    /// <param name="nameMarkerType"></param>
+    /// <param name="valueMarkerType"></param>
+    /// <param name="ignoreCondition"></param>
+    /// <exception cref="NotSupportedException"></exception>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static void WriteProperty<T>(this Utf8JsonWriter writer, JsonSerializerOptions options, JsonEncodedText name, T value,
+        Type? nameMarkerType = null, Type? valueMarkerType = null, JsonIgnoreCondition? ignoreCondition = null)
+    {
+        // This parameter is kept to allow implicit specialization of the `WriteProperty<TName, TValue>` method.
+        _ = nameMarkerType;
+
+        var shouldIgnore = (ignoreCondition ?? options.DefaultIgnoreCondition) switch
+        {
+            JsonIgnoreCondition.Never => false,
+            JsonIgnoreCondition.Always => true,
+            JsonIgnoreCondition.WhenWritingDefault => EqualityComparer<T>.Default.Equals(value, default!),
+            JsonIgnoreCondition.WhenWritingNull => (value is null),
+            _ => throw new NotSupportedException("Unsupported JSON ignore condition.")
+        };
+
+        if (shouldIgnore)
+        {
+            return;
+        }
+
+        writer.WritePropertyName(options, name);
+        writer.WriteValue(options, value, valueMarkerType);
+    }
+
+    /// <summary>
+    ///
+    /// </summary>
+    /// <typeparam name="TName"></typeparam>
+    /// <typeparam name="TValue"></typeparam>
+    /// <param name="writer"></param>
+    /// <param name="name"></param>
+    /// <param name="value"></param>
+    /// <param name="options"></param>
+    /// <param name="nameMarkerType"></param>
+    /// <param name="valueMarkerType"></param>
+    /// <param name="ignoreCondition"></param>
+    /// <exception cref="NotSupportedException"></exception>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static void WriteProperty<TName, TValue>(this Utf8JsonWriter writer, JsonSerializerOptions options, [DisallowNull] TName name, TValue value,
+        Type? nameMarkerType = null, Type? valueMarkerType = null, JsonIgnoreCondition? ignoreCondition = null)
+    {
+        var shouldIgnore = (ignoreCondition ?? options.DefaultIgnoreCondition) switch
+        {
+            JsonIgnoreCondition.Never => false,
+            JsonIgnoreCondition.Always => true,
+            JsonIgnoreCondition.WhenWritingDefault => EqualityComparer<TValue>.Default.Equals(value, default!),
+            JsonIgnoreCondition.WhenWritingNull => (value is null),
+            _ => throw new NotSupportedException("Unsupported JSON ignore condition.")
+        };
+
+        if (shouldIgnore)
+        {
+            return;
+        }
+
+        writer.WritePropertyName(options, name, nameMarkerType);
+        writer.WriteValue(options, value, valueMarkerType);
+    }
+}
diff --git a/src/Elastic.Clients.Elasticsearch/_Shared/Next/LocalJsonProperty.cs b/src/Elastic.Clients.Elasticsearch/_Shared/Next/LocalJsonProperty.cs
new file mode 100644
index 00000000000..e0f0e6037bd
--- /dev/null
+++ b/src/Elastic.Clients.Elasticsearch/_Shared/Next/LocalJsonProperty.cs
@@ -0,0 +1,40 @@
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Runtime.CompilerServices;
+using System.Text.Json;
+
+#if ELASTICSEARCH_SERVERLESS
+namespace Elastic.Clients.Elasticsearch.Serverless.Next;
+#else
+namespace Elastic.Clients.Elasticsearch.Next;
+#endif
+
+/// <summary>
+/// TODO: TBC
+/// </summary>
+/// <typeparam name="T"></typeparam>
+internal ref struct LocalJsonProperty<T>
+{
+	public T? Value;
+	public bool Initialized;
+
+	/// <summary>
+	/// TODO: TBC
+	/// </summary>
+	/// <param name="reader"></param>
+	/// <param name="options"></param>
+	/// <param name="name"></param>
+	/// <param name="markerType"></param>
+	/// <returns></returns>
+	[MethodImpl(MethodImplOptions.AggressiveInlining)]
+	public bool TryRead(ref Utf8JsonReader reader, JsonSerializerOptions options, JsonEncodedText name, Type? markerType = null)
+	{
+		var success = reader.TryReadProperty(options, name, ref Value, markerType);
+		Initialized |= success;
+
+		return success;
+	}
+}
diff --git a/src/Elastic.Clients.Elasticsearch/_Shared/Next/ObjectToInferredTypesConverter.cs b/src/Elastic.Clients.Elasticsearch/_Shared/Next/ObjectToInferredTypesConverter.cs
new file mode 100644
index 00000000000..44fd2605438
--- /dev/null
+++ b/src/Elastic.Clients.Elasticsearch/_Shared/Next/ObjectToInferredTypesConverter.cs
@@ -0,0 +1,41 @@
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+#if ELASTICSEARCH_SERVERLESS
+namespace Elastic.Clients.Elasticsearch.Serverless.Next;
+#else
+namespace Elastic.Clients.Elasticsearch.Next;
+#endif
+
+internal sealed class ObjectToInferredTypesConverter :
+    JsonConverter<object>
+{
+    public override object Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        return reader.TokenType switch
+        {
+            JsonTokenType.True => true,
+            JsonTokenType.False => false,
+            JsonTokenType.Number when reader.TryGetInt64(out var value) => value,
+            JsonTokenType.Number => reader.GetDouble(),
+            JsonTokenType.String when reader.TryGetDateTime(out var value) => value,
+            JsonTokenType.String when reader.TryGetDateTimeOffset(out var value) => value,
+            JsonTokenType.String => reader.GetString()!,
+            _ => JsonDocument.ParseValue(ref reader).RootElement.Clone()
+        };
+    }
+
+    public override void Write(Utf8JsonWriter writer, object value, JsonSerializerOptions options)
+    {
+        // TODO: Match `SourceMarker<T>` values and delegate to the `SourceSerializer`.
+
+#pragma warning disable IL2026, IL3050
+        JsonSerializer.Serialize(writer, value, value.GetType(), options);
+#pragma warning restore IL2026, IL3050
+    }
+}
diff --git a/src/Elastic.Clients.Elasticsearch/_Shared/Next/SingleOrManyConverter.cs b/src/Elastic.Clients.Elasticsearch/_Shared/Next/SingleOrManyConverter.cs
new file mode 100644
index 00000000000..5f2275b33f3
--- /dev/null
+++ b/src/Elastic.Clients.Elasticsearch/_Shared/Next/SingleOrManyConverter.cs
@@ -0,0 +1,111 @@
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+#if ELASTICSEARCH_SERVERLESS
+namespace Elastic.Clients.Elasticsearch.Serverless.Next;
+#else
+namespace Elastic.Clients.Elasticsearch.Next;
+#endif
+
+internal sealed class SingleOrManyMarker<TCollection, TElement>
+	where TCollection : class, IEnumerable<TElement>
+{
+	static SingleOrManyMarker()
+	{
+		DynamicallyAccessed.PublicConstructors(typeof(SingleOrManyMarkerConverter<TCollection, TElement>));
+	}
+}
+
+internal sealed class SingleOrManyMarkerConverter<TCollection, TElement> :
+	JsonConverter<SingleOrManyMarker<TCollection, TElement>>,
+	IMarkerTypeConverter
+	where TCollection : class, IEnumerable<TElement>
+{
+	public JsonConverter WrappedConverter { get; }
+
+	public SingleOrManyMarkerConverter()
+	{
+		WrappedConverter = new SingleOrManyConverter<TCollection, TElement>();
+	}
+
+	public override SingleOrManyMarker<TCollection, TElement>? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	{
+		throw new NotImplementedException();
+	}
+
+	public override void Write(Utf8JsonWriter writer, SingleOrManyMarker<TCollection, TElement> value, JsonSerializerOptions options)
+	{
+		throw new NotImplementedException();
+	}
+}
+
+internal sealed class SingleOrManyMarkerConverterFactory :
+	JsonConverterFactory
+{
+	public override bool CanConvert(Type typeToConvert)
+	{
+		return typeToConvert.IsGenericType &&
+			   typeToConvert.GetGenericTypeDefinition() == typeof(SingleOrManyMarker<,>);
+	}
+
+	public override JsonConverter? CreateConverter(Type typeToConvert, JsonSerializerOptions options)
+	{
+		var args = typeToConvert.GetGenericArguments();
+
+#pragma warning disable IL3050 // SingleOrManyMarker<,> static constructor roots SingleOrManyMarkerConverter<,>.
+
+		var converter = (JsonConverter)Activator.CreateInstance(
+			typeof(SingleOrManyMarkerConverter<,>).MakeGenericType(args[0], args[1]),
+			BindingFlags.Instance | BindingFlags.Public,
+			binder: null,
+			args: null,
+			culture: null)!;
+
+#pragma warning restore IL3050
+
+		return converter;
+	}
+}
+
+internal sealed class SingleOrManyConverter<TCollection, TElement> :
+	JsonConverter<TCollection>
+	where TCollection : class, IEnumerable<TElement>
+{
+	public override TCollection? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	{
+		if (reader.TokenType is JsonTokenType.StartArray)
+		{
+			return reader.ReadValue<TCollection>(options);
+		}
+
+		return new[] { reader.ReadValue<TElement>(options)! } as TCollection;
+	}
+
+	public override void Write(Utf8JsonWriter writer, TCollection value, JsonSerializerOptions options)
+	{
+		switch (value)
+		{
+			case ICollection<TElement> { Count: 1 }: writer.WriteValue(options, value.First()); return;
+			case ICollection<TElement>: writer.WriteValue(options, value); return;
+			case IReadOnlyCollection<TElement> { Count: 1 }: writer.WriteValue(options, value.First()); return;
+			case IReadOnlyCollection<TElement>: writer.WriteValue(options, value); return;
+		}
+
+		var collection = value.ToArray();
+		if (collection.Length is 1)
+		{
+			writer.WriteValue(options, value.First());
+			return;
+		}
+
+		writer.WriteValue(options, value);
+	}
+}
diff --git a/src/Elastic.Clients.Elasticsearch/_Shared/Next/SingleWithFractionalPortionConverter.cs b/src/Elastic.Clients.Elasticsearch/_Shared/Next/SingleWithFractionalPortionConverter.cs
new file mode 100644
index 00000000000..4d76ae02861
--- /dev/null
+++ b/src/Elastic.Clients.Elasticsearch/_Shared/Next/SingleWithFractionalPortionConverter.cs
@@ -0,0 +1,111 @@
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Buffers;
+using System.Buffers.Text;
+using System.Diagnostics;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+#if ELASTICSEARCH_SERVERLESS
+namespace Elastic.Clients.Elasticsearch.Serverless.Next;
+#else
+namespace Elastic.Clients.Elasticsearch.Next;
+#endif
+
+internal sealed class SingleWithFractionalPortionConverter :
+	JsonConverter<float>
+{
+	// https://github.com/dotnet/runtime/blob/main/src/libraries/System.Text.Json/src/System/Text/Json/JsonConstants.cs#L79
+	public const int MaximumFormatLength = 128 + 2;
+
+	private static readonly StandardFormat DefaultFormat = StandardFormat.Parse("G9");
+	private static readonly JsonEncodedText NaN = JsonEncodedText.Encode("NaN"u8);
+	private static readonly JsonEncodedText PositiveInfinity = JsonEncodedText.Encode("Infinity"u8);
+	private static readonly JsonEncodedText NegativeInfinity = JsonEncodedText.Encode("-Infinity"u8);
+
+	public static ReadOnlySpan<byte> NonIntegerChars => "E."u8;
+
+	public override float Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	{
+		if (reader.TokenType is not JsonTokenType.String)
+		{
+			return reader.GetSingle();
+		}
+
+		if (options.NumberHandling.HasFlag(JsonNumberHandling.AllowNamedFloatingPointLiterals))
+		{
+			if (reader.ValueTextEquals(NaN))
+			{
+				return float.NaN;
+			}
+
+			if (reader.ValueTextEquals(PositiveInfinity))
+			{
+				return float.PositiveInfinity;
+			}
+
+			if (reader.ValueTextEquals(NegativeInfinity))
+			{
+				return float.NegativeInfinity;
+			}
+		}
+
+		if (!options.NumberHandling.HasFlag(JsonNumberHandling.AllowReadingFromString))
+		{
+			return reader.GetSingle();
+		}
+
+		Debug.Assert(!reader.HasValueSequence);
+
+		return Utf8Parser.TryParse(reader.ValueSpan, out float result, out var consumed) && (consumed == reader.ValueSpan.Length)
+			? result
+			: throw new JsonException("Unable to convert JSON string value to 'float'.");
+	}
+
+	public override void Write(Utf8JsonWriter writer, float value, JsonSerializerOptions options)
+	{
+		if (options.NumberHandling.HasFlag(JsonNumberHandling.AllowNamedFloatingPointLiterals))
+		{
+			if (float.IsNaN(value))
+			{
+				writer.WriteStringValue(NaN);
+				return;
+			}
+
+			if (float.IsPositiveInfinity(value))
+			{
+				writer.WriteStringValue(PositiveInfinity);
+				return;
+			}
+
+			if (float.IsNegativeInfinity(value))
+			{
+				writer.WriteStringValue(NegativeInfinity);
+				return;
+			}
+		}
+
+		if (options.NumberHandling.HasFlag(JsonNumberHandling.WriteAsString))
+		{
+			throw new NotImplementedException("'JsonNumberHandling.WriteAsString' is currently not supported.");
+		}
+
+		Span<byte> buffer = stackalloc byte[MaximumFormatLength];
+
+		if (!Utf8Formatter.TryFormat(value, buffer, out var bytesWritten, DefaultFormat))
+		{
+			throw new JsonException($"Could not convert value '{value}' to JSON number.");
+		}
+
+		if (buffer.IndexOfAny(NonIntegerChars) == -1)
+		{
+			buffer[bytesWritten++] = (byte)'.';
+			buffer[bytesWritten++] = (byte)'0';
+		}
+
+		writer.WriteRawValue(buffer[..bytesWritten], true);
+	}
+}
diff --git a/src/Elastic.Clients.Elasticsearch/_Shared/Next/SourceConverter.cs b/src/Elastic.Clients.Elasticsearch/_Shared/Next/SourceConverter.cs
new file mode 100644
index 00000000000..bde7031076f
--- /dev/null
+++ b/src/Elastic.Clients.Elasticsearch/_Shared/Next/SourceConverter.cs
@@ -0,0 +1,104 @@
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Reflection;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+using Elastic.Transport.Extensions;
+
+#if ELASTICSEARCH_SERVERLESS
+namespace Elastic.Clients.Elasticsearch.Serverless.Next;
+#else
+namespace Elastic.Clients.Elasticsearch.Next;
+#endif
+
+public sealed class SourceMarker<T>
+{
+	static SourceMarker()
+	{
+		DynamicallyAccessed.PublicConstructors(typeof(SourceMarkerConverter<T>));
+	}
+}
+
+internal sealed class SourceMarkerConverter<T> :
+	JsonConverter<SourceMarker<T>>,
+	IMarkerTypeConverter
+{
+	public JsonConverter WrappedConverter { get; }
+
+	public SourceMarkerConverter(IElasticsearchClientSettings settings)
+	{
+		WrappedConverter = new SourceConverter<T>(settings);
+	}
+
+	public override SourceMarker<T>? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	{
+		throw new InvalidOperationException();
+	}
+
+	public override void Write(Utf8JsonWriter writer, SourceMarker<T> value, JsonSerializerOptions options)
+	{
+		throw new InvalidOperationException();
+	}
+}
+
+internal sealed class SourceMarkerConverterFactory(IElasticsearchClientSettings settings) :
+	JsonConverterFactory
+{
+	public override bool CanConvert(Type typeToConvert)
+	{
+		return typeToConvert.IsGenericType &&
+		       typeToConvert.GetGenericTypeDefinition() == typeof(SourceMarker<>);
+	}
+
+	public override JsonConverter? CreateConverter(Type typeToConvert, JsonSerializerOptions options)
+	{
+		var args = typeToConvert.GetGenericArguments();
+
+#pragma warning disable IL3050 // SourceMarker<T> static constructor roots SourceMarkerConverter<T>.
+
+		var converter = (JsonConverter)Activator.CreateInstance(
+			typeof(SourceMarkerConverter<>).MakeGenericType(args[0]),
+			BindingFlags.Instance | BindingFlags.Public,
+			binder: null,
+			args: [settings],
+			culture: null)!;
+
+#pragma warning restore IL3050
+
+		return converter;
+	}
+}
+
+internal sealed class SourceConverter<T> :
+	JsonConverter<T>
+{
+	private readonly IElasticsearchClientSettings _settings;
+
+	public SourceConverter(IElasticsearchClientSettings settings)
+	{
+		_settings = settings;
+	}
+
+	public override bool CanConvert(Type typeToConvert)
+	{
+		return typeToConvert == typeof(SourceMarker<T>);
+	}
+
+	public override T Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	{
+#pragma warning disable IL2026, IL3050
+		return _settings.SourceSerializer.Deserialize<T>(ref reader)!;
+#pragma warning restore IL2026, IL3050
+	}
+
+	public override void Write(Utf8JsonWriter writer, T value, JsonSerializerOptions options)
+	{
+#pragma warning disable IL2026, IL3050
+		_settings.SourceSerializer.Serialize(value, writer);
+#pragma warning restore IL2026, IL3050
+	}
+}
diff --git a/src/Elastic.Clients.Elasticsearch/_Shared/Next/StringifiedConverters.cs b/src/Elastic.Clients.Elasticsearch/_Shared/Next/StringifiedConverters.cs
new file mode 100644
index 00000000000..5821a0a95b4
--- /dev/null
+++ b/src/Elastic.Clients.Elasticsearch/_Shared/Next/StringifiedConverters.cs
@@ -0,0 +1,104 @@
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Buffers.Text;
+using System.Diagnostics;
+using System.Runtime.CompilerServices;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+#if ELASTICSEARCH_SERVERLESS
+namespace Elastic.Clients.Elasticsearch.Serverless.Next;
+#else
+namespace Elastic.Clients.Elasticsearch.Next;
+#endif
+
+internal sealed class StringifiedBoolConverter :
+    JsonConverter<bool>
+{
+    public override bool Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        return reader.TokenType switch
+        {
+            JsonTokenType.String => ParseValue(ref reader),
+            JsonTokenType.True => true,
+            JsonTokenType.False => false,
+            _ => throw new JsonException($"Expected JSON '{nameof(JsonTokenType.True)}' or '{JsonTokenType.False}' or '{JsonTokenType.String}' token, but got '{reader.TokenType}'.")
+        };
+    }
+
+    public override void Write(Utf8JsonWriter writer, bool value, JsonSerializerOptions options)
+    {
+        writer.WriteBooleanValue(value);
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    private static bool ParseValue(ref Utf8JsonReader reader)
+    {
+        Debug.Assert(!reader.HasValueSequence);
+
+        return Utf8Parser.TryParse(reader.ValueSpan, out bool result, out var consumed) && (consumed == reader.ValueSpan.Length)
+            ? result
+            : throw new JsonException($"Unable to convert string value to '{nameof(Boolean)}'.");
+    }
+}
+
+internal sealed class StringifiedIntConverter :
+    JsonConverter<int>
+{
+    public override int Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        return reader.TokenType switch
+        {
+            JsonTokenType.String => ParseValue(ref reader),
+            JsonTokenType.Number => reader.GetInt32(),
+            _ => throw new JsonException($"Expected JSON '{nameof(JsonTokenType.Number)}' or '{JsonTokenType.String}' token, but got '{reader.TokenType}'.")
+        };
+    }
+
+    public override void Write(Utf8JsonWriter writer, int value, JsonSerializerOptions options)
+    {
+        writer.WriteNumberValue(value);
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    private static int ParseValue(ref Utf8JsonReader reader)
+    {
+        Debug.Assert(!reader.HasValueSequence);
+
+        return Utf8Parser.TryParse(reader.ValueSpan, out int result, out var consumed) && (consumed == reader.ValueSpan.Length)
+            ? result
+            : throw new JsonException($"Unable to convert string value to '{nameof(Int32)}'.");
+    }
+}
+
+internal sealed class StringifiedLongConverter :
+    JsonConverter<long>
+{
+    public override long Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        return reader.TokenType switch
+        {
+            JsonTokenType.String => ParseValue(ref reader),
+            JsonTokenType.Number => reader.GetInt32(),
+            _ => throw new JsonException($"Expected JSON '{nameof(JsonTokenType.Number)}' or '{JsonTokenType.String}' token, but got '{reader.TokenType}'.")
+        };
+    }
+
+    public override void Write(Utf8JsonWriter writer, long value, JsonSerializerOptions options)
+    {
+        writer.WriteNumberValue(value);
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    private static long ParseValue(ref Utf8JsonReader reader)
+    {
+        Debug.Assert(!reader.HasValueSequence);
+
+        return Utf8Parser.TryParse(reader.ValueSpan, out long result, out var consumed) && (consumed == reader.ValueSpan.Length)
+            ? result
+            : throw new JsonException($"Unable to convert string value to '{nameof(Int64)}'.");
+    }
+}
diff --git a/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/DefaultRequestResponseSerializer.cs b/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/DefaultRequestResponseSerializer.cs
index 915c0552dcd..49919c85308 100644
--- a/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/DefaultRequestResponseSerializer.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/DefaultRequestResponseSerializer.cs
@@ -9,11 +9,18 @@
 using System.Threading;
 using System.Threading.Tasks;
 
+#if ELASTICSEARCH_SERVERLESS
+using Elastic.Clients.Elasticsearch.Serverless.Next;
+#else
+using Elastic.Clients.Elasticsearch.Next;
+#endif
+
 using Elastic.Transport;
 
 #if ELASTICSEARCH_SERVERLESS
 namespace Elastic.Clients.Elasticsearch.Serverless.Serialization;
 #else
+
 namespace Elastic.Clients.Elasticsearch.Serialization;
 #endif
 
@@ -99,12 +106,13 @@ internal DefaultRequestResponseSerializerOptionsProvider(IElasticsearchClientSet
 
 	private static IReadOnlyCollection<JsonConverter> CreateDefaultBuiltInConverters(IElasticsearchClientSettings settings) =>
 	[
+		new SelfSerializableConverterFactory(settings), // For descriptors
+		new SelfTwoWaySerializableConverterFactory(settings), // For some requests
 		new KeyValuePairConverterFactory(settings),
 		new ObjectToInferredTypesConverter(),
-		new SourceConverterFactory(settings),
-		new SelfSerializableConverterFactory(settings),
-		new SelfDeserializableConverterFactory(settings),
-		new SelfTwoWaySerializableConverterFactory(settings),
+		new SingleOrManyMarkerConverterFactory(),
+		new SourceMarkerConverterFactory(settings),
+
 		// Explicitly registered before `IsADictionaryConverterFactory` as we want this specialised converter to match
 		new FieldValuesConverter(),
 		new IsADictionaryConverterFactory(),
@@ -113,7 +121,7 @@ private static IReadOnlyCollection<JsonConverter> CreateDefaultBuiltInConverters
 		new UnionConverter(),
 		// TODO: Remove after https://github.com/elastic/elasticsearch-specification/issues/2238 is implemented
 		new StringifiedLongConverter(),
-		new StringifiedIntegerConverter(),
+		new StringifiedIntConverter(),
 		new StringifiedBoolConverter()
 	];
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/DefaultSourceSerializer.cs b/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/DefaultSourceSerializer.cs
index 2b986d4fa07..7fbb082cc8a 100644
--- a/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/DefaultSourceSerializer.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/DefaultSourceSerializer.cs
@@ -6,11 +6,18 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
+#if ELASTICSEARCH_SERVERLESS
+using Elastic.Clients.Elasticsearch.Serverless.Next;
+#else
+using Elastic.Clients.Elasticsearch.Next;
+#endif
+
 using Elastic.Transport;
 
 #if ELASTICSEARCH_SERVERLESS
 namespace Elastic.Clients.Elasticsearch.Serverless.Serialization;
 #else
+
 namespace Elastic.Clients.Elasticsearch.Serialization;
 #endif
 
@@ -80,7 +87,8 @@ public class DefaultSourceSerializerOptionsProvider :
 	[
 		new JsonStringEnumConverter(),
 		new DoubleWithFractionalPortionConverter(),
-		new SingleWithFractionalPortionConverter()
+		new SingleWithFractionalPortionConverter(),
+		// TODO: Add RequestResponseSerializer
 	];
 
 	public DefaultSourceSerializerOptionsProvider(Action<JsonSerializerOptions>? configureOptions = null) :
diff --git a/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/DoubleWithFractionalPortionConverter.cs b/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/DoubleWithFractionalPortionConverter.cs
deleted file mode 100644
index 6ccba78f21d..00000000000
--- a/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/DoubleWithFractionalPortionConverter.cs
+++ /dev/null
@@ -1,126 +0,0 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information.
-
-using System;
-
-#if NETCOREAPP
-
-using System.Buffers.Text;
-
-#endif
-
-using System.Globalization;
-
-#if !NETCOREAPP
-
-using System.Text;
-
-#endif
-
-using System.Text.Json;
-using System.Text.Json.Serialization;
-
-#if ELASTICSEARCH_SERVERLESS
-namespace Elastic.Clients.Elasticsearch.Serverless.Serialization;
-#else
-namespace Elastic.Clients.Elasticsearch.Serialization;
-#endif
-
-internal sealed class DoubleWithFractionalPortionConverter : JsonConverter<double>
-{
-	public override double Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		if (reader.TokenType != JsonTokenType.String)
-			return reader.GetDouble();
-
-		if (options.NumberHandling.HasFlag(JsonNumberHandling.AllowNamedFloatingPointLiterals))
-		{
-			// TODO: Handle 'reader.HasValueSequence'
-			if (reader.ValueSpan.SequenceEqual(JsonConstants.LiteralNaN))
-				return float.NaN;
-			if (reader.ValueSpan.SequenceEqual(JsonConstants.LiteralPositiveInfinity))
-				return float.PositiveInfinity;
-			if (reader.ValueSpan.SequenceEqual(JsonConstants.LiteralNegativeInfinity))
-				return float.NegativeInfinity;
-		}
-
-		if (options.NumberHandling.HasFlag(JsonNumberHandling.AllowReadingFromString))
-		{
-			var value = reader.GetString();
-
-			if (!double.TryParse(value, NumberStyles.Any, CultureInfo.InvariantCulture, out var result))
-				ThrowHelper.ThrowJsonException($"Unable to parse '{value}' as a double.");
-
-			return result;
-		}
-
-		return reader.GetDouble();
-	}
-
-	public override void Write(Utf8JsonWriter writer, double value, JsonSerializerOptions options)
-	{
-		if (options.NumberHandling.HasFlag(JsonNumberHandling.AllowNamedFloatingPointLiterals))
-		{
-			switch (value)
-			{
-				case double.NaN:
-					writer.WriteStringValue(JsonConstants.EncodedNaN);
-					return;
-
-				case double.PositiveInfinity:
-					writer.WriteStringValue(JsonConstants.EncodedPositiveInfinity);
-					return;
-
-				case double.NegativeInfinity:
-					writer.WriteStringValue(JsonConstants.EncodedNegativeInfinity);
-					return;
-			}
-		}
-
-		if (options.NumberHandling.HasFlag(JsonNumberHandling.WriteAsString))
-		{
-			// TODO: Implement as needed
-			throw new NotImplementedException("The 'JsonNumberHandling.WriteAsString' is currently not supported.");
-		}
-
-		// This code is based on:
-		// https://github.com/dotnet/runtime/blob/main/src/libraries/System.Text.Json/src/System/Text/Json/Writer/Utf8JsonWriter.WriteValues.Double.cs#L101
-
-#if NETCOREAPP
-		Span<byte> utf8Text = stackalloc byte[JsonConstants.MaximumFormatDoubleLength];
-
-		if (Utf8Formatter.TryFormat(value, utf8Text, out var bytesWritten, JsonConstants.DoubleStandardFormat))
-		{
-			if (utf8Text.IndexOfAny(JsonConstants.NonIntegerChars) == -1)
-			{
-				utf8Text[bytesWritten++] = (byte)'.';
-				utf8Text[bytesWritten++] = (byte)'0';
-			}
-
-			writer.WriteRawValue(utf8Text[..bytesWritten], true);
-			return;
-		}
-#else
-		var utf16Text = value.ToString(JsonConstants.DoubleFormatString, CultureInfo.InvariantCulture);
-		if (utf16Text.IndexOfAny(JsonConstants.NonIntegerChars) == -1)
-		{
-			utf16Text += ".0";
-		}
-
-		try
-		{
-			var utf8Text = Encoding.UTF8.GetBytes(utf16Text);
-
-			writer.WriteRawValue(utf8Text, true);
-			return;
-		}
-		catch
-		{
-			// Swallow this and fall through to our general exception.
-		}
-#endif
-
-		ThrowHelper.ThrowJsonException("Unable to serialize double value.");
-	}
-}
diff --git a/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/EnumStructConverter.cs b/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/EnumStructConverter.cs
deleted file mode 100644
index 80de1fa303d..00000000000
--- a/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/EnumStructConverter.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Text.Json;
-using System.Text.Json.Serialization;
-#if ELASTICSEARCH_SERVERLESS
-using Elastic.Clients.Elasticsearch.Serverless.Core;
-#else
-using Elastic.Clients.Elasticsearch.Core;
-#endif
-
-#if ELASTICSEARCH_SERVERLESS
-namespace Elastic.Clients.Elasticsearch.Serverless.Serialization;
-#else
-namespace Elastic.Clients.Elasticsearch.Serialization;
-#endif
-
-internal sealed class EnumStructConverter<T> : JsonConverter<T> where T : struct, IEnumStruct<T>
-{
-	public override T Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		var value = reader.GetString();
-		var instance = default(T).Create(value);
-
-		return instance;
-	}
-
-	public override void Write(Utf8JsonWriter writer, T value, JsonSerializerOptions options)
-	{
-		var enumValue = value.ToString();
-
-		if (!string.IsNullOrEmpty(enumValue))
-			writer.WriteStringValue(enumValue);
-		else
-			writer.WriteNullValue();
-	}
-}
diff --git a/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/GenericConverterAttribute.cs b/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/GenericConverterAttribute.cs
deleted file mode 100644
index 6812414709b..00000000000
--- a/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/GenericConverterAttribute.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Reflection;
-using System.Text.Json.Serialization;
-
-#if ELASTICSEARCH_SERVERLESS
-namespace Elastic.Clients.Elasticsearch.Serverless.Serialization;
-#else
-namespace Elastic.Clients.Elasticsearch.Serialization;
-#endif
-
-/// <summary>
-/// A custom <see cref="JsonConverterAttribute"/> used to dynamically create <see cref="JsonConverter"/>
-/// instances for generic classes and properties whose type arguments are unknown at compile time.
-/// </summary>
-internal class GenericConverterAttribute :
-	JsonConverterAttribute
-{
-	private readonly int _parameterCount;
-
-	/// <summary>
-	/// The constructor.
-	/// </summary>
-	/// <param name="genericConverterType">The open generic type of the JSON converter class.</param>
-	/// <param name="unwrap">
-	///		Set <c>true</c> to unwrap the generic type arguments of the source/target type before using them to create
-	///		the converter instance.
-	///		<para>
-	///			This is especially useful, if the base converter is e.g. defined as <c>MyBaseConverter{SomeType{T}}</c>
-	///			but the annotated property already has the concrete type <c>SomeType{T}</c>. Unwrapping the generic
-	///			arguments will make sure to not incorrectly instantiate a converter class of type
-	///			<c>MyBaseConverter{SomeType{SomeType{T}}}</c>.
-	///		</para>
-	/// </param>
-	/// <exception cref="ArgumentException">If <paramref name="genericConverterType"/> is not a compatible generic type definition.</exception>
-	public GenericConverterAttribute(Type genericConverterType, bool unwrap = false)
-	{
-		if (!genericConverterType.IsGenericTypeDefinition)
-		{
-			throw new ArgumentException(
-				$"The generic JSON converter type '{genericConverterType.Name}' is not a generic type definition.",
-				nameof(genericConverterType));
-		}
-
-		GenericConverterType = genericConverterType;
-		Unwrap = unwrap;
-
-		_parameterCount = GenericConverterType.GetTypeInfo().GenericTypeParameters.Length;
-
-		if (!unwrap && (_parameterCount != 1))
-		{
-			throw new ArgumentException(
-				$"The generic JSON converter type '{genericConverterType.Name}' must accept exactly 1 generic type " +
-				$"argument",
-				nameof(genericConverterType));
-		}
-	}
-
-	public Type GenericConverterType { get; }
-
-	public bool Unwrap { get; }
-
-	/// <inheritdoc cref="JsonConverterAttribute.CreateConverter"/>
-	public override JsonConverter? CreateConverter(Type typeToConvert)
-	{
-		if (!Unwrap)
-			return (JsonConverter)Activator.CreateInstance(GenericConverterType.MakeGenericType(typeToConvert));
-
-		var arguments = typeToConvert.GetGenericArguments();
-		if (arguments.Length != _parameterCount)
-		{
-			throw new ArgumentException(
-				$"The generic JSON converter type '{GenericConverterType.Name}' is not compatible with the target " +
-				$"type '{typeToConvert.Name}'.",
-				nameof(typeToConvert));
-		}
-
-		return (JsonConverter)Activator.CreateInstance(GenericConverterType.MakeGenericType(arguments));
-	}
-}
diff --git a/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/ISourceMarker.cs b/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/ISourceMarker.cs
deleted file mode 100644
index a8cf2520d1f..00000000000
--- a/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/ISourceMarker.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information.
-
-#if ELASTICSEARCH_SERVERLESS
-namespace Elastic.Clients.Elasticsearch.Serverless.Serialization;
-#else
-namespace Elastic.Clients.Elasticsearch.Serialization;
-#endif
-
-internal interface ISourceMarker<T> { }
diff --git a/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/InterfaceConverter.cs b/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/InterfaceConverter.cs
deleted file mode 100644
index 280ac0552c8..00000000000
--- a/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/InterfaceConverter.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Text.Json;
-using System.Text.Json.Serialization;
-
-#if ELASTICSEARCH_SERVERLESS
-namespace Elastic.Clients.Elasticsearch.Serverless.Serialization;
-#else
-namespace Elastic.Clients.Elasticsearch.Serialization;
-#endif
-
-internal sealed class InterfaceConverter<TInterface, TConcrete> : JsonConverter<TInterface>
-	where TConcrete : class, TInterface
-{
-	public override TInterface Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) =>
-		JsonSerializer.Deserialize<TConcrete>(ref reader, options);
-
-	public override void Write(Utf8JsonWriter writer, TInterface value, JsonSerializerOptions options) =>
-		JsonSerializer.Serialize(writer, value, value.GetType(), options);
-}
diff --git a/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/InterfaceConverterAttribute.cs b/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/InterfaceConverterAttribute.cs
deleted file mode 100644
index 8a0ae48f724..00000000000
--- a/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/InterfaceConverterAttribute.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information.
-
-using System;
-
-#if ELASTICSEARCH_SERVERLESS
-namespace Elastic.Clients.Elasticsearch.Serverless.Serialization;
-#else
-namespace Elastic.Clients.Elasticsearch.Serialization;
-#endif
-
-[AttributeUsage(AttributeTargets.Interface)]
-internal class InterfaceConverterAttribute : Attribute
-{
-	public InterfaceConverterAttribute(Type converterType) => ConverterType = converterType;
-
-	public Type ConverterType { get; }
-}
diff --git a/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/IntermediateSourceConverter.cs b/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/IntermediateSourceConverter.cs
deleted file mode 100644
index 691d1091337..00000000000
--- a/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/IntermediateSourceConverter.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Text.Json;
-using System.Text.Json.Serialization;
-
-#if ELASTICSEARCH_SERVERLESS
-namespace Elastic.Clients.Elasticsearch.Serverless.Serialization;
-#else
-namespace Elastic.Clients.Elasticsearch.Serialization;
-#endif
-
-internal sealed class IntermediateSourceConverter<T> : JsonConverter<T>
-{
-	public override T? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		var converter = options.GetConverter(typeof(SourceMarker<>).MakeGenericType(typeToConvert));
-
-		if (converter is SourceConverter<T> sourceConverter)
-		{
-			var source = sourceConverter.Read(ref reader, typeToConvert, options);
-			return source.Source;
-		}
-
-		return default;
-	}
-
-	public override void Write(Utf8JsonWriter writer, T value, JsonSerializerOptions options)
-	{
-		var converter = options.GetConverter(typeof(SourceMarker<>).MakeGenericType(typeof(T)));
-
-		if (converter is SourceConverter<T> sourceConverter)
-		{
-			sourceConverter.Write(writer, new SourceMarker<T> { Source = value }, options);
-		}
-	}
-}
diff --git a/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/JsonHelper.cs b/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/JsonHelper.cs
deleted file mode 100644
index 19d4e1252a8..00000000000
--- a/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/JsonHelper.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information.
-
-using System.Text.Json;
-
-#if ELASTICSEARCH_SERVERLESS
-namespace Elastic.Clients.Elasticsearch.Serverless.Serialization;
-#else
-namespace Elastic.Clients.Elasticsearch.Serialization;
-#endif
-
-internal static class JsonHelper
-{
-	public static bool TryReadUntilStringPropertyValue(ref Utf8JsonReader reader, byte[] propertyNameBytes)
-	{
-		while (reader.Read())
-		{
-			if (reader.TokenType == JsonTokenType.PropertyName && reader.ValueTextEquals(propertyNameBytes))
-			{
-				reader.Read();
-				return true;
-			}
-		}
-
-		return false;
-	}
-}
diff --git a/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/NumericAliasConverter.cs b/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/NumericAliasConverter.cs
deleted file mode 100644
index ed5c204ba62..00000000000
--- a/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/NumericAliasConverter.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Reflection;
-using System.Text.Json;
-using System.Text.Json.Serialization;
-
-#if ELASTICSEARCH_SERVERLESS
-namespace Elastic.Clients.Elasticsearch.Serverless.Serialization;
-#else
-namespace Elastic.Clients.Elasticsearch.Serialization;
-#endif
-
-internal sealed class NumericAliasConverter<T> : JsonConverter<T>
-{
-	public override T? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		var value = reader.GetInt64();
-
-		var instance = (T)Activator.CreateInstance(
-			typeof(T),
-			BindingFlags.Instance | BindingFlags.Public,
-			args: new object[] {value},
-			binder: null,
-			culture: null)!;
-
-		return instance;
-	}
-
-	public override void Write(Utf8JsonWriter writer, T value, JsonSerializerOptions options) =>
-		throw new NotImplementedException();
-}
diff --git a/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/ReadOnlyFieldDictionaryConverter.cs b/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/ReadOnlyFieldDictionaryConverter.cs
deleted file mode 100644
index 853f538fe62..00000000000
--- a/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/ReadOnlyFieldDictionaryConverter.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Collections.Generic;
-using System.Text.Json;
-using System.Text.Json.Serialization;
-
-#if ELASTICSEARCH_SERVERLESS
-namespace Elastic.Clients.Elasticsearch.Serverless.Serialization;
-#else
-namespace Elastic.Clients.Elasticsearch.Serialization;
-#endif
-
-internal sealed class ReadOnlyFieldDictionaryConverterAttribute : JsonConverterAttribute
-{
-	public ReadOnlyFieldDictionaryConverterAttribute(Type valueType) => ValueType = valueType;
-
-	public Type ValueType { get; }
-
-	public override JsonConverter? CreateConverter(Type typeToConvert) => (JsonConverter)Activator.CreateInstance(typeof(ReadOnlyFieldDictionaryConverter<>).MakeGenericType(ValueType));
-}
-
-internal sealed class ReadOnlyFieldDictionaryConverter<TValue> : JsonConverter<IReadOnlyDictionary<Field, TValue>>
-{
-	public override IReadOnlyDictionary<Field, TValue>? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		if (!options.TryGetClientSettings(out var clientSettings))
-		{
-			throw new JsonException("Unable to retrieve client settings required for deserialisation.");
-		}
-
-		var initialDictionary = JsonSerializer.Deserialize<Dictionary<Field, TValue>>(ref reader, options);
-
-		var readOnlyDictionary = new ReadOnlyFieldDictionary<TValue>(initialDictionary, clientSettings);
-
-		return readOnlyDictionary;
-	}
-
-	public override void Write(Utf8JsonWriter writer, IReadOnlyDictionary<Field, TValue> value, JsonSerializerOptions options) => throw new NotImplementedException();
-}
diff --git a/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/ReadOnlyIndexNameDictionaryConverter.cs b/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/ReadOnlyIndexNameDictionaryConverter.cs
deleted file mode 100644
index c1d29d6fe35..00000000000
--- a/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/ReadOnlyIndexNameDictionaryConverter.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Collections.Generic;
-using System.Text.Json;
-using System.Text.Json.Serialization;
-
-#if ELASTICSEARCH_SERVERLESS
-namespace Elastic.Clients.Elasticsearch.Serverless.Serialization;
-#else
-namespace Elastic.Clients.Elasticsearch.Serialization;
-#endif
-
-internal sealed class ReadOnlyIndexNameDictionaryConverter : JsonConverterAttribute
-{
-	public ReadOnlyIndexNameDictionaryConverter(Type valueType) => ValueType = valueType;
-
-	public Type ValueType { get; }
-
-	public override JsonConverter? CreateConverter(Type typeToConvert) => (JsonConverter)Activator.CreateInstance(typeof(ReadOnlyIndexNameDictionaryConverter<>).MakeGenericType(ValueType));
-}
-
-internal sealed class ReadOnlyIndexNameDictionaryConverter<TValue> : JsonConverter<IReadOnlyDictionary<IndexName, TValue>>
-{
-	public override IReadOnlyDictionary<IndexName, TValue>? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		if (!options.TryGetClientSettings(out var clientSettings))
-		{
-			throw new JsonException("Unable to retrieve client settings required for deserialisation.");
-		}
-
-		var initialDictionary = JsonSerializer.Deserialize<Dictionary<IndexName, TValue>>(ref reader, options);
-
-		var readOnlyDictionary = new ReadOnlyIndexNameDictionary<TValue>(initialDictionary, clientSettings);
-
-		return readOnlyDictionary;
-	}
-
-	public override void Write(Utf8JsonWriter writer, IReadOnlyDictionary<IndexName, TValue> value, JsonSerializerOptions options) => throw new NotImplementedException();
-}
diff --git a/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/ResolvableReadonlyDictionaryConverterFactory.cs b/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/ResolvableReadonlyDictionaryConverterFactory.cs
deleted file mode 100644
index bc58d7dada9..00000000000
--- a/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/ResolvableReadonlyDictionaryConverterFactory.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Collections.Generic;
-using System.Text.Json;
-using System.Text.Json.Serialization;
-using Elastic.Transport;
-
-#if ELASTICSEARCH_SERVERLESS
-namespace Elastic.Clients.Elasticsearch.Serverless.Serialization;
-#else
-namespace Elastic.Clients.Elasticsearch.Serialization;
-#endif
-
-internal sealed class ResolvableReadonlyDictionaryConverterFactory : JsonConverterFactory
-{
-	private readonly IElasticsearchClientSettings _settings;
-
-	public ResolvableReadonlyDictionaryConverterFactory(IElasticsearchClientSettings settings) => _settings = settings;
-
-	public override bool CanConvert(Type typeToConvert)
-	{
-		if (typeToConvert.BaseType is null || !typeToConvert.BaseType.IsGenericType || typeToConvert.BaseType.GetGenericTypeDefinition() != typeof(IsADictionary<,>))
-		{
-			return false;
-		}
-
-		var args = typeToConvert.BaseType.GetGenericArguments();
-
-		var keyType = args[0];
-
-		return keyType is not null && typeof(IUrlParameter).IsAssignableFrom(keyType);
-	}
-
-	public override JsonConverter? CreateConverter(Type typeToConvert, JsonSerializerOptions options)
-	{
-		var args = typeToConvert.BaseType.GetGenericArguments();
-
-		var keyType = args[0];
-		var valueType = args[1];
-
-		if (keyType.IsClass)
-		{
-			return (JsonConverter)Activator.CreateInstance(
-				typeof(ResolvableReadOnlyDictionaryConverterInner<,,>).MakeGenericType(typeToConvert, keyType, valueType), _settings);
-		}
-
-		return null;
-	}
-
-	private class ResolvableReadOnlyDictionaryConverterInner<TType, TKey, TValue> : JsonConverter<IReadOnlyDictionary<TKey, TValue>>
-		where TKey : class, IUrlParameter
-		where TType : IReadOnlyDictionary<TKey, TValue>
-	{
-		private readonly IElasticsearchClientSettings _settings;
-
-		public ResolvableReadOnlyDictionaryConverterInner(IElasticsearchClientSettings settings) => _settings = settings;
-
-		public override IReadOnlyDictionary<TKey, TValue>? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-		{
-			var dictionary = JsonSerializer.Deserialize<Dictionary<TKey, TValue>>(ref reader, options);
-
-			if (dictionary is null)
-				return default;
-
-			var dictionaryProxy = new ResolvableDictionaryProxy<TKey, TValue>(_settings, dictionary);
-
-			return dictionaryProxy;
-		}
-
-		public override void Write(Utf8JsonWriter writer, IReadOnlyDictionary<TKey, TValue> value, JsonSerializerOptions options) =>
-			throw new NotImplementedException($"Serialization is not supported for '{typeof(TType)}'.");
-	}
-}
diff --git a/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/SelfSerializable.cs b/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/SelfSerializable.cs
index 1a4fd1cf9ad..ed487fb8a20 100644
--- a/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/SelfSerializable.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/SelfSerializable.cs
@@ -10,20 +10,11 @@ namespace Elastic.Clients.Elasticsearch.Serverless.Serialization;
 namespace Elastic.Clients.Elasticsearch.Serialization;
 #endif
 
-/// <summary>
-/// Marks a type to provide it's own serialization code.
-/// <para><b>IMPORTANT:</b> This should only be used for types that are only ever serialized and never deserialised, such as descriptors.</para>
-/// </summary>
 internal interface ISelfSerializable
 {
 	void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings);
 }
 
-internal interface ISelfDeserializable
-{
-	void Deserialize(ref Utf8JsonReader reader, JsonSerializerOptions options, IElasticsearchClientSettings settings);
-}
-
 internal interface ISelfTwoWaySerializable
 {
 	void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings);
diff --git a/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/SelfSerializableConverterFactory.cs b/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/SelfSerializableConverterFactory.cs
index 8fb0b39a204..82de16c3285 100644
--- a/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/SelfSerializableConverterFactory.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/SelfSerializableConverterFactory.cs
@@ -9,6 +9,7 @@
 #if ELASTICSEARCH_SERVERLESS
 namespace Elastic.Clients.Elasticsearch.Serverless.Serialization;
 #else
+
 namespace Elastic.Clients.Elasticsearch.Serialization;
 #endif
 
@@ -70,35 +71,3 @@ private class SelfSerializableJsonConverter : JsonConverter<ISelfTwoWaySerializa
 		public override void Write(Utf8JsonWriter writer, ISelfTwoWaySerializable value, JsonSerializerOptions options) => value.Serialize(writer, options, _settings);
 	}
 }
-
-internal sealed class SelfDeserializableConverterFactory : JsonConverterFactory
-{
-	private readonly IElasticsearchClientSettings _settings;
-
-	public SelfDeserializableConverterFactory(IElasticsearchClientSettings settings) => _settings = settings;
-
-	public override bool CanConvert(Type typeToConvert)
-	{
-		var canSerialize = typeof(ISelfDeserializable).IsAssignableFrom(typeToConvert);
-		return canSerialize;
-	}
-
-	public override JsonConverter? CreateConverter(Type typeToConvert, JsonSerializerOptions options) =>
-		(JsonConverter)Activator.CreateInstance(typeof(SelfDeserializableJsonConverter), _settings);
-
-	private class SelfDeserializableJsonConverter : JsonConverter<ISelfDeserializable>
-	{
-		private readonly IElasticsearchClientSettings _settings;
-
-		public SelfDeserializableJsonConverter(IElasticsearchClientSettings settings) => _settings = settings;
-
-		public override ISelfDeserializable? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-		{
-			var instance = (ISelfDeserializable)Activator.CreateInstance(typeToConvert);
-			instance.Deserialize(ref reader, options, _settings);
-			return instance;
-		}
-
-		public override void Write(Utf8JsonWriter writer, ISelfDeserializable value, JsonSerializerOptions options) => throw new NotImplementedException();
-	}
-}
diff --git a/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/SimpleInterfaceConverter.cs b/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/SimpleInterfaceConverter.cs
deleted file mode 100644
index 4a4315f08db..00000000000
--- a/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/SimpleInterfaceConverter.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Text.Json;
-using System.Text.Json.Serialization;
-
-#if ELASTICSEARCH_SERVERLESS
-namespace Elastic.Clients.Elasticsearch.Serverless.Serialization;
-#else
-namespace Elastic.Clients.Elasticsearch.Serialization;
-#endif
-
-internal sealed class SimpleInterfaceConverter<TInterface, TConcrete> : JsonConverter<TInterface> where TConcrete : class, TInterface
-{
-	public override TInterface Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) =>
-		JsonSerializer.Deserialize<TConcrete>(ref reader, options);
-
-	public override void Write(Utf8JsonWriter writer, TInterface value, JsonSerializerOptions options)
-		=> JsonSerializer.Serialize(writer, value, typeof(TConcrete), options);
-}
diff --git a/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/SingleOrManyCollectionAttribute.cs b/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/SingleOrManyCollectionAttribute.cs
deleted file mode 100644
index 22581f4fc9e..00000000000
--- a/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/SingleOrManyCollectionAttribute.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Text.Json.Serialization;
-
-#if ELASTICSEARCH_SERVERLESS
-namespace Elastic.Clients.Elasticsearch.Serverless.Serialization;
-#else
-namespace Elastic.Clients.Elasticsearch.Serialization;
-#endif
-
-[AttributeUsage(AttributeTargets.Property)]
-internal class SingleOrManyCollectionConverterAttribute : JsonConverterAttribute
-{
-	public SingleOrManyCollectionConverterAttribute(Type convertType) => ConvertType = convertType;
-
-	public Type ConvertType { get; }
-
-	public override JsonConverter? CreateConverter(Type typeToConvert) => (JsonConverter)Activator.CreateInstance(typeof(SingleOrManyCollectionConverter<>).MakeGenericType(ConvertType));
-}
diff --git a/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/SingleOrManyCollectionConverter.cs b/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/SingleOrManyCollectionConverter.cs
deleted file mode 100644
index bb734416a2c..00000000000
--- a/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/SingleOrManyCollectionConverter.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Collections.Generic;
-using System.Text.Json;
-using System.Text.Json.Serialization;
-
-#if ELASTICSEARCH_SERVERLESS
-namespace Elastic.Clients.Elasticsearch.Serverless.Serialization;
-#else
-namespace Elastic.Clients.Elasticsearch.Serialization;
-#endif
-
-internal class SingleOrManyCollectionConverter<TItem> : JsonConverter<ICollection<TItem>>
-{
-	public override ICollection<TItem>? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) =>
-		SingleOrManySerializationHelper.Deserialize<TItem>(ref reader, options);
-
-	public override void Write(Utf8JsonWriter writer, ICollection<TItem> value, JsonSerializerOptions options) =>
-		SingleOrManySerializationHelper.Serialize<TItem>(value, writer, options);
-
-	public override bool CanConvert(Type typeToConvert) => true;
-}
diff --git a/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/SingleWithFractionalPortionConverter.cs b/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/SingleWithFractionalPortionConverter.cs
deleted file mode 100644
index 731b07d58a0..00000000000
--- a/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/SingleWithFractionalPortionConverter.cs
+++ /dev/null
@@ -1,126 +0,0 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information.
-
-using System;
-
-#if NETCOREAPP
-
-using System.Buffers.Text;
-
-#endif
-
-using System.Globalization;
-
-#if !NETCOREAPP
-
-using System.Text;
-
-#endif
-
-using System.Text.Json;
-using System.Text.Json.Serialization;
-
-#if ELASTICSEARCH_SERVERLESS
-namespace Elastic.Clients.Elasticsearch.Serverless.Serialization;
-#else
-namespace Elastic.Clients.Elasticsearch.Serialization;
-#endif
-
-internal sealed class SingleWithFractionalPortionConverter : JsonConverter<float>
-{
-	public override float Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		if (reader.TokenType != JsonTokenType.String)
-			return reader.GetSingle();
-
-		if (options.NumberHandling.HasFlag(JsonNumberHandling.AllowNamedFloatingPointLiterals))
-		{
-			// TODO: Handle 'reader.HasValueSequence'
-			if (reader.ValueSpan.SequenceEqual(JsonConstants.LiteralNaN))
-				return float.NaN;
-			if (reader.ValueSpan.SequenceEqual(JsonConstants.LiteralPositiveInfinity))
-				return float.PositiveInfinity;
-			if (reader.ValueSpan.SequenceEqual(JsonConstants.LiteralNegativeInfinity))
-				return float.NegativeInfinity;
-		}
-
-		if (options.NumberHandling.HasFlag(JsonNumberHandling.AllowReadingFromString))
-		{
-			var value = reader.GetString();
-
-			if (!float.TryParse(value, NumberStyles.Any, CultureInfo.InvariantCulture, out var result))
-				ThrowHelper.ThrowJsonException($"Unable to parse '{value}' as a single.");
-
-			return result;
-		}
-
-		return reader.GetSingle();
-	}
-
-	public override void Write(Utf8JsonWriter writer, float value, JsonSerializerOptions options)
-	{
-		if (options.NumberHandling.HasFlag(JsonNumberHandling.AllowNamedFloatingPointLiterals))
-		{
-			switch (value)
-			{
-				case float.NaN:
-					writer.WriteStringValue(JsonConstants.EncodedNaN);
-					return;
-
-				case float.PositiveInfinity:
-					writer.WriteStringValue(JsonConstants.EncodedPositiveInfinity);
-					return;
-
-				case float.NegativeInfinity:
-					writer.WriteStringValue(JsonConstants.EncodedNegativeInfinity);
-					return;
-			}
-		}
-
-		if (options.NumberHandling.HasFlag(JsonNumberHandling.WriteAsString))
-		{
-			// TODO: Implement as needed
-			throw new NotImplementedException("The 'JsonNumberHandling.WriteAsString' is currently not supported.");
-		}
-
-		// This code is based on:
-		// https://github.com/dotnet/runtime/blob/main/src/libraries/System.Text.Json/src/System/Text/Json/Writer/Utf8JsonWriter.WriteValues.Double.cs#L101
-
-#if NETCOREAPP
-		Span<byte> utf8Text = stackalloc byte[JsonConstants.MaximumFormatSingleLength];
-
-		if (Utf8Formatter.TryFormat(value, utf8Text, out var bytesWritten, JsonConstants.SingleStandardFormat))
-		{
-			if (utf8Text.IndexOfAny(JsonConstants.NonIntegerChars) == -1)
-			{
-				utf8Text[bytesWritten++] = (byte)'.';
-				utf8Text[bytesWritten++] = (byte)'0';
-			}
-
-			writer.WriteRawValue(utf8Text[..bytesWritten], true);
-			return;
-		}
-#else
-		var utf16Text = value.ToString(JsonConstants.SingleFormatString, CultureInfo.InvariantCulture);
-		if (utf16Text.IndexOfAny(JsonConstants.NonIntegerChars) == -1)
-		{
-			utf16Text += ".0";
-		}
-
-		try
-		{
-			var utf8Text = Encoding.UTF8.GetBytes(utf16Text);
-
-			writer.WriteRawValue(utf8Text, true);
-			return;
-		}
-		catch
-		{
-			// Swallow this and fall through to our general exception.
-		}
-#endif
-
-		ThrowHelper.ThrowJsonException("Unable to serialize single value.");
-	}
-}
diff --git a/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/SourceConverter.cs b/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/SourceConverter.cs
deleted file mode 100644
index 6c1e0295cd5..00000000000
--- a/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/SourceConverter.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Text.Json;
-using System.Text.Json.Serialization;
-
-#if ELASTICSEARCH_SERVERLESS
-namespace Elastic.Clients.Elasticsearch.Serverless.Serialization;
-#else
-namespace Elastic.Clients.Elasticsearch.Serialization;
-#endif
-
-using Elastic.Transport.Extensions;
-
-internal sealed class SourceConverter<T> : JsonConverter<SourceMarker<T>>
-{
-	private readonly IElasticsearchClientSettings _settings;
-
-	public SourceConverter(IElasticsearchClientSettings settings) => _settings = settings;
-
-	public override SourceMarker<T>? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) => new()
-	{
-		Source = _settings.SourceSerializer.Deserialize<T>(ref reader, null)
-	};
-
-	public override void Write(Utf8JsonWriter writer, SourceMarker<T> value, JsonSerializerOptions options) => _settings.SourceSerializer.Serialize(value.Source, writer, null);
-}
diff --git a/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/SourceConverterAttribute.cs b/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/SourceConverterAttribute.cs
deleted file mode 100644
index 2b166d3c612..00000000000
--- a/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/SourceConverterAttribute.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Text.Json.Serialization;
-
-#if ELASTICSEARCH_SERVERLESS
-namespace Elastic.Clients.Elasticsearch.Serverless.Serialization;
-#else
-namespace Elastic.Clients.Elasticsearch.Serialization;
-#endif
-
-internal sealed class SourceConverterAttribute : JsonConverterAttribute
-{
-	public override JsonConverter? CreateConverter(Type typeToConvert) => (JsonConverter)Activator.CreateInstance(typeof(IntermediateSourceConverter<>).MakeGenericType(typeToConvert));
-}
diff --git a/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/SourceConverterFactory.cs b/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/SourceConverterFactory.cs
deleted file mode 100644
index c0e5adc9ffd..00000000000
--- a/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/SourceConverterFactory.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Text.Json;
-using System.Text.Json.Serialization;
-
-#if ELASTICSEARCH_SERVERLESS
-namespace Elastic.Clients.Elasticsearch.Serverless.Serialization;
-#else
-namespace Elastic.Clients.Elasticsearch.Serialization;
-#endif
-
-internal sealed class SourceConverterFactory : JsonConverterFactory
-{
-	private readonly IElasticsearchClientSettings _settings;
-
-	public SourceConverterFactory(IElasticsearchClientSettings settings) => _settings = settings;
-
-	public override bool CanConvert(Type typeToConvert)
-	{
-		if (!typeToConvert.IsGenericType)
-			return false;
-
-		var canConvert = typeof(SourceMarker<>) == typeToConvert.GetGenericTypeDefinition();
-		return canConvert;
-	}
-
-	public override JsonConverter CreateConverter(Type type, JsonSerializerOptions options)
-	{
-		var valueType = type.GetGenericArguments()[0];
-		return (JsonConverter)Activator.CreateInstance(typeof(SourceConverter<>).MakeGenericType(valueType), _settings);
-	}
-}
diff --git a/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/SourceMarker.cs b/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/SourceMarker.cs
deleted file mode 100644
index 70ed8c5335f..00000000000
--- a/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/SourceMarker.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information.
-
-#if ELASTICSEARCH_SERVERLESS
-namespace Elastic.Clients.Elasticsearch.Serverless.Serialization;
-#else
-namespace Elastic.Clients.Elasticsearch.Serialization;
-#endif
-
-internal sealed class SourceMarker<T>
-{
-	public T Source { get; set; }
-}
diff --git a/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/Stringified.cs b/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/Stringified.cs
deleted file mode 100644
index 0d178e886f8..00000000000
--- a/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/Stringified.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Text.Json;
-using System.Text.Json.Serialization;
-
-#if ELASTICSEARCH_SERVERLESS
-namespace Elastic.Clients.Elasticsearch.Serverless.Serialization;
-#else
-namespace Elastic.Clients.Elasticsearch.Serialization;
-#endif
-
-internal sealed class StringifiedLongConverter : JsonConverter<long>
-{
-	public override long Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) => ReadStringifiedLong(ref reader);
-
-	public override void Write(Utf8JsonWriter writer, long value, JsonSerializerOptions options) => writer.WriteNumberValue(value);
-
-	public static long ReadStringifiedLong(ref Utf8JsonReader reader)
-	{
-		if (reader.TokenType == JsonTokenType.PropertyName)
-			reader.Read();
-
-		if (reader.TokenType == JsonTokenType.String)
-		{
-			var longString = reader.GetString();
-
-			if (!long.TryParse(longString, out var longValue))
-			{
-				throw new JsonException("Unable to parse string value to long.");
-			}
-
-			return longValue;
-		}
-
-		return reader.GetInt64();
-	}
-}
-
-internal sealed class StringifiedIntegerConverter : JsonConverter<int>
-{
-	public override int Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) => ReadStringifiedInteger(ref reader);
-
-	public override void Write(Utf8JsonWriter writer, int value, JsonSerializerOptions options) => writer.WriteNumberValue(value);
-
-	public static int ReadStringifiedInteger(ref Utf8JsonReader reader)
-	{
-		if (reader.TokenType == JsonTokenType.PropertyName)
-			reader.Read();
-
-		if (reader.TokenType == JsonTokenType.String)
-		{
-			var intString = reader.GetString();
-
-			if (!int.TryParse(intString, out var intValue))
-			{
-				throw new JsonException("Unable to parse string value to integer.");
-			}
-
-			return intValue;
-		}
-
-		return reader.GetInt32();
-	}
-}
-
-internal sealed class StringifiedBoolConverter : JsonConverter<bool>
-{
-	public override bool Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) => ReadStringifiedBool(ref reader);
-
-	public override void Write(Utf8JsonWriter writer, bool value, JsonSerializerOptions options) => writer.WriteBooleanValue(value);
-
-	public static bool ReadStringifiedBool(ref Utf8JsonReader reader)
-	{
-		if (reader.TokenType == JsonTokenType.PropertyName)
-			reader.Read();
-
-		if (reader.TokenType == JsonTokenType.String)
-		{
-			var boolString = reader.GetString();
-
-			if (!bool.TryParse(boolString, out var boolValue))
-			{
-				throw new JsonException("Unable to parse string value to bool.");
-			}
-
-			return boolValue;
-		}
-
-		return reader.GetBoolean();
-	}
-}
diff --git a/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/TermsAggregateSerializationHelper.cs b/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/TermsAggregateSerializationHelper.cs
deleted file mode 100644
index d3e0e72294f..00000000000
--- a/src/Elastic.Clients.Elasticsearch/_Shared/Serialization/TermsAggregateSerializationHelper.cs
+++ /dev/null
@@ -1,118 +0,0 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Text.Json;
-using System.Text;
-#if ELASTICSEARCH_SERVERLESS
-using Elastic.Clients.Elasticsearch.Serverless.Aggregations;
-#else
-using Elastic.Clients.Elasticsearch.Aggregations;
-#endif
-
-#if ELASTICSEARCH_SERVERLESS
-namespace Elastic.Clients.Elasticsearch.Serverless.Serialization;
-#else
-namespace Elastic.Clients.Elasticsearch.Serialization;
-#endif
-
-internal static class TermsAggregateSerializationHelper
-{
-	private static readonly byte[] s_buckets = Encoding.UTF8.GetBytes("buckets");
-	private static readonly byte[] s_key = Encoding.UTF8.GetBytes("key");
-	private static readonly byte s_period = (byte)'.';
-
-	public static bool TryDeserializeTermsAggregate(string aggregateName, ref Utf8JsonReader reader, JsonSerializerOptions options, out IAggregate? aggregate)
-	{
-		aggregate = null;
-
-		// We take a copy here so we can read forward to establish the term key type before we resume with final deserialization.
-		var readerCopy = reader;
-
-		if (JsonHelper.TryReadUntilStringPropertyValue(ref readerCopy, s_buckets))
-		{
-			if (readerCopy.TokenType != JsonTokenType.StartArray)
-				throw new Exception("TODO");
-
-			readerCopy.Read();
-
-			if (readerCopy.TokenType == JsonTokenType.EndArray) // We have no buckets
-			{
-				if (aggregateName.Equals("sterms", StringComparison.Ordinal))
-				{
-					var agg = JsonSerializer.Deserialize<StringTermsAggregate>(ref reader, options);
-					aggregate = agg;
-					return true;
-				}
-
-				if (aggregateName.Equals("lterms", StringComparison.Ordinal))
-				{
-					var agg = JsonSerializer.Deserialize<LongTermsAggregate>(ref reader, options);
-					aggregate = agg;
-					return true;
-				}
-
-				if (aggregateName.Equals("dterms", StringComparison.Ordinal))
-				{
-					var agg = JsonSerializer.Deserialize<DoubleTermsAggregate>(ref reader, options);
-					aggregate = agg;
-					return true;
-				}
-
-				if (aggregateName.Equals("multi_terms", StringComparison.Ordinal))
-				{
-					var agg = JsonSerializer.Deserialize<DoubleTermsAggregate>(ref reader, options);
-					aggregate = agg;
-					return true;
-				}
-
-				throw new JsonException($"Unable to deserialize empty terms aggregate for '{aggregateName}'.");
-			}
-			else
-			{
-				if (readerCopy.TokenType != JsonTokenType.StartObject)
-					throw new Exception("TODO"); // TODO!
-
-				if (JsonHelper.TryReadUntilStringPropertyValue(ref readerCopy, s_key))
-				{
-					if (readerCopy.TokenType == JsonTokenType.String)
-					{
-						var agg = JsonSerializer.Deserialize<StringTermsAggregate>(ref reader, options);
-						aggregate = agg;
-						return true;
-					}
-					else if (readerCopy.TokenType == JsonTokenType.Number)
-					{
-						var value = readerCopy.ValueSpan; // TODO - May need to check for sequence
-
-						if (value.IndexOf(s_period) > -1 && readerCopy.TryGetDouble(out _))
-						{
-							var agg = JsonSerializer.Deserialize<DoubleTermsAggregate>(ref reader, options);
-							aggregate = agg;
-							return true;
-						}
-						else if (readerCopy.TryGetInt64(out _))
-						{
-							var agg = JsonSerializer.Deserialize<LongTermsAggregate>(ref reader, options);
-							aggregate = agg;
-							return true;
-						}
-					}
-					else if (readerCopy.TokenType == JsonTokenType.StartArray)
-					{
-						var agg = JsonSerializer.Deserialize<MultiTermsAggregate>(ref reader, options);
-						aggregate = agg;
-						return true;
-					}
-					else
-					{
-						throw new JsonException("Unhandled token type when parsing the terms aggregate response");
-					}
-				}
-			}
-		}
-
-		return false;
-	}
-}
diff --git a/src/Elastic.Clients.Elasticsearch/_Shared/Temp.cs b/src/Elastic.Clients.Elasticsearch/_Shared/Temp.cs
new file mode 100644
index 00000000000..546bf68428b
--- /dev/null
+++ b/src/Elastic.Clients.Elasticsearch/_Shared/Temp.cs
@@ -0,0 +1,102 @@
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information.
+
+// Contains internal parameterless constructors used by the deserializer.
+
+#if ELASTICSEARCH_SERVERLESS
+namespace Elastic.Clients.Elasticsearch.Serverless
+#else
+namespace Elastic.Clients.Elasticsearch
+#endif
+{
+	namespace Eql
+	{
+		public partial class EqlSearchRequest
+		{
+			internal EqlSearchRequest()
+			{ }
+		}
+	}
+
+	namespace IndexManagement
+	{
+		public partial class PutMappingRequest
+		{
+			internal PutMappingRequest()
+			{ }
+		}
+	}
+
+	namespace IndexManagement
+	{
+		public partial class PutTemplateRequest
+		{
+			internal PutTemplateRequest()
+			{ }
+		}
+	}
+
+	namespace Inference
+	{
+		public partial class InferenceRequest
+		{
+			internal InferenceRequest()
+			{ }
+		}
+	}
+
+	namespace QueryRules
+	{
+		public partial class PutRuleRequest
+		{
+			internal PutRuleRequest()
+			{ }
+		}
+	}
+
+	namespace QueryRules
+	{
+		public partial class PutRulesetRequest
+		{
+			internal PutRulesetRequest()
+			{ }
+		}
+	}
+
+	public partial class SearchMvtRequest
+	{
+		internal SearchMvtRequest()
+		{ }
+	}
+
+	namespace Snapshot
+	{
+		public partial class CreateSnapshotRequest
+		{
+			internal CreateSnapshotRequest()
+			{ }
+		}
+	}
+
+	namespace Synonyms
+	{
+		public partial class PutSynonymRequest
+		{
+			internal PutSynonymRequest()
+			{ }
+		}
+	}
+
+	public partial class TermVectorsRequest<TDocument>
+	{
+		internal TermVectorsRequest()
+		{ }
+	}
+
+	public sealed partial class UpdateRequest<TDocument, TPartialDocument>
+	{
+		internal UpdateRequest()
+		{ }
+	}
+}
diff --git a/src/Elastic.Clients.Elasticsearch/_Shared/Types/FieldSort.cs b/src/Elastic.Clients.Elasticsearch/_Shared/Types/FieldSort.cs
index facf19d1b8b..a989d999d67 100644
--- a/src/Elastic.Clients.Elasticsearch/_Shared/Types/FieldSort.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Shared/Types/FieldSort.cs
@@ -17,138 +17,7 @@ namespace Elastic.Clients.Elasticsearch.Serverless;
 namespace Elastic.Clients.Elasticsearch;
 #endif
 
-[JsonConverter(typeof(FieldSortConverter))]
 public partial class FieldSort
 {
 	public static FieldSort Empty { get; } = new();
 }
-
-internal sealed class FieldSortConverter : JsonConverter<FieldSort>
-{
-	// This is temporarily a manual converter until we code-gen for shortcut properties.
-	// This serves as the template for those converters.
-
-	public override FieldSort? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		if (reader.TokenType == JsonTokenType.StartObject)
-		{
-			string? format = null;
-			FieldValue? missing = null;
-			SortMode? mode = null;
-			NestedSortValue? nested = null;
-			FieldSortNumericType? numericType = null;
-			SortOrder? order = null;
-			FieldType? unmappedType = null;
-
-			while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
-			{
-				if (reader.TokenType == JsonTokenType.PropertyName)
-				{
-					var propertyName = reader.GetString();
-					reader.Read();
-
-					switch (propertyName)
-					{
-						case "format":
-							format = reader.GetString();
-							break;
-						case "missing":
-							missing = JsonSerializer.Deserialize<FieldValue>(ref reader, options);
-							break;
-						case "mode":
-							mode = JsonSerializer.Deserialize<SortMode>(ref reader, options);
-							break;
-						case "nested":
-							nested = JsonSerializer.Deserialize<NestedSortValue>(ref reader, options);
-							break;
-						case "numeric_type":
-							numericType = JsonSerializer.Deserialize<FieldSortNumericType>(ref reader, options);
-							break;
-						case "order":
-							order = JsonSerializer.Deserialize<SortOrder>(ref reader, options);
-							break;
-						case "unmapped_type":
-							unmappedType = JsonSerializer.Deserialize<FieldType>(ref reader, options);
-							break;
-						default:
-							throw new JsonException("Unexpected property while reading `Field`.");
-					}
-				}
-			}
-
-			return new FieldSort
-			{
-				Format = format,
-				Missing = missing,
-				Mode = mode,
-				Nested = nested,
-				NumericType = numericType,
-				Order = order,
-				UnmappedType = unmappedType
-			};
-		}
-
-		else if (reader.TokenType == JsonTokenType.String) // Shortcut property
-		{
-			var sortOrder = JsonSerializer.Deserialize<SortOrder>(ref reader, options);
-			return new FieldSort { Order = sortOrder };
-		}
-
-		throw new JsonException($"Unexpected JSON token '{reader.TokenType}' encountered while deserializing FieldSort.");
-	}
-
-	public override void Write(Utf8JsonWriter writer, FieldSort value, JsonSerializerOptions options)
-	{
-		if (value is null)
-		{
-			writer.WriteNullValue();
-			return;
-		}
-
-		writer.WriteStartObject();
-
-		if (value.Format is not null)
-		{
-			writer.WritePropertyName("format");
-			writer.WriteStringValue(value.Format);
-		}
-
-		if (value.Missing.HasValue)
-		{
-			writer.WritePropertyName("missing");
-			JsonSerializer.Serialize(writer, value.Missing.Value, options);
-		}
-
-		if (value.Mode.HasValue)
-		{
-			writer.WritePropertyName("mode");
-			JsonSerializer.Serialize(writer, value.Mode.Value, options);
-		}
-
-		if (value.Nested is not null)
-		{
-			writer.WritePropertyName("nested");
-			JsonSerializer.Serialize(writer, value.Nested, options);
-		}
-
-		if (value.NumericType.HasValue)
-		{
-			writer.WritePropertyName("numeric_type");
-			JsonSerializer.Serialize(writer, value.NumericType.Value, options);
-		}
-
-		if (value.Order.HasValue)
-		{
-			writer.WritePropertyName("order");
-			JsonSerializer.Serialize(writer, value.Order.Value, options);
-		}
-
-		if (value.UnmappedType.HasValue)
-		{
-			writer.WritePropertyName("unmapped_type");
-			JsonSerializer.Serialize(writer, value.UnmappedType.Value, options);
-		}
-
-		writer.WriteEndObject();
-	}
-}
diff --git a/src/Elastic.Clients.Elasticsearch/_Shared/Types/QueryDsl/FunctionScore.cs b/src/Elastic.Clients.Elasticsearch/_Shared/Types/QueryDsl/FunctionScore.cs
index ca170eba4bf..8dfc5bc7966 100644
--- a/src/Elastic.Clients.Elasticsearch/_Shared/Types/QueryDsl/FunctionScore.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Shared/Types/QueryDsl/FunctionScore.cs
@@ -12,8 +12,6 @@ namespace Elastic.Clients.Elasticsearch.QueryDsl;
 
 public partial class FunctionScore
 {
-	internal FunctionScore() { }
-
 	/// <summary>
 	/// The weight score allows you to multiply the score by the provided weight.
 	/// </summary>
diff --git a/src/Playground/Playground.csproj b/src/Playground/Playground.csproj
index 004205ffb13..d86afdc3f27 100644
--- a/src/Playground/Playground.csproj
+++ b/src/Playground/Playground.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>